diff --git a/compiler/testData/codegen/box/diagnostics/functions/inference/kt6176.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/inference/kt6176.lazy.log
index f5549154168..8228fce7122 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/inference/kt6176.lazy.log
+++ b/compiler/testData/codegen/box/diagnostics/functions/inference/kt6176.lazy.log
@@ -25,39 +25,168 @@ LazyJavaPackageFragment@4['<root>'] {
     classes('equals': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
     classes('f': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
     classes('foo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('invoke': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('some': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('some1': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('equals': Name@23) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('f': Name@24) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('foo': Name@25) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('invoke': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('some': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('some1': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('some': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('some1': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('equals': Name@23) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('f': Name@24) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('foo': Name@25) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('some': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('some1': Name@27) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@22
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('lang': Name@34) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('lang': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('lang': Name@33) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@32
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('equals': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('f': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('foo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('invoke': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('some': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('some1': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('equals': Name@23) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('f': Name@24) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('foo': Name@25) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('invoke': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('some': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('some1': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('equals': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    classes('f': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    classes('foo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    classes('some': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    classes('some1': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('equals': Name@23) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('f': Name@24) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('foo': Name@25) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('some': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('some1': Name@27) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
+    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@35
+}
+
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+    <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+    <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
+    <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
+}
+
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
+}
+
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
+}
+
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
+}
+
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
+}
+
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
+}
+
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
+}
+
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
+}
+
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
+}
+
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
+}
+
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
+}
+
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
+}
+
+null {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@91 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
 }
diff --git a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObject1.lazy.log b/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObject1.lazy.log
index 7bc2b74c6fa..8bf577381fc 100644
--- a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObject1.lazy.log
+++ b/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObject1.lazy.log
@@ -40,31 +40,34 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@29 {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
+}
+
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
 }
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+null {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@39 }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
 }
diff --git a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObject2.lazy.log b/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObject2.lazy.log
index 69104247468..ff651fab6e5 100644
--- a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObject2.lazy.log
+++ b/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObject2.lazy.log
@@ -47,33 +47,36 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@33 {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
     <name not found> = EmptyList@25[empty]
 }
 
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
+}
+
 ResolutionTaskHolder@44 {
     <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+null {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@49 }
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
 }
diff --git a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass1.lazy.log b/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass1.lazy.log
index e1b1864eb71..7d589621862 100644
--- a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass1.lazy.log
+++ b/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass1.lazy.log
@@ -36,38 +36,28 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
+}
+
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
 }
 
 ResolutionTaskHolder@39 {
     <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@45 {
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
@@ -77,3 +67,16 @@ ResolutionTaskHolder@51 {
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
+
+null {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@38 }
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+}
diff --git a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass2.lazy.log b/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass2.lazy.log
index 0c7d3dbf773..bb02cd89778 100644
--- a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass2.lazy.log
+++ b/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass2.lazy.log
@@ -42,31 +42,34 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+}
+
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
 }
 
 ResolutionTaskHolder@42 {
     <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
+null {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@38 }
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
 }
diff --git a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnEnum1.lazy.log b/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnEnum1.lazy.log
index 1e805835a8b..61f3d1de737 100644
--- a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnEnum1.lazy.log
+++ b/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnEnum1.lazy.log
@@ -36,38 +36,28 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
 }
 
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
+}
+
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
 }
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@43 {
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
@@ -77,3 +67,16 @@ ResolutionTaskHolder@48 {
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
+
+null {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@33 }
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+}
diff --git a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnEnum2.lazy.log b/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnEnum2.lazy.log
index 874131ca86a..62ee7e0702e 100644
--- a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnEnum2.lazy.log
+++ b/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnEnum2.lazy.log
@@ -42,40 +42,29 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@23[empty]
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
     <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
 }
 
 ResolutionTaskHolder@43 {
     <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
+ResolutionTaskHolder@46 {
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
@@ -85,3 +74,17 @@ ResolutionTaskHolder@51 {
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
 }
+
+null {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@39 }
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+}
diff --git a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnImportedEnum1.lazy.log b/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnImportedEnum1.lazy.log
index 657ec72c0bc..c87d65b6bf2 100644
--- a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnImportedEnum1.lazy.log
+++ b/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnImportedEnum1.lazy.log
@@ -42,31 +42,34 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
 }
 
 ResolutionTaskHolder@43 {
     <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+null {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@45 }
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
 }
diff --git a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnImportedEnum2.lazy.log b/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnImportedEnum2.lazy.log
index cfc3e7c9d9b..4239e3bdb6c 100644
--- a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnImportedEnum2.lazy.log
+++ b/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnImportedEnum2.lazy.log
@@ -48,33 +48,36 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@34 {
     <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+}
+
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
 }
 
 ResolutionTaskHolder@46 {
     <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
+null {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@48 }
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
 }
diff --git a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnObject1.lazy.log b/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnObject1.lazy.log
index 83f59d8e824..81885d74a50 100644
--- a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnObject1.lazy.log
+++ b/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnObject1.lazy.log
@@ -46,33 +46,36 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@32 {
     <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
+}
+
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
 }
 
 ResolutionTaskHolder@44 {
     <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+null {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@46 }
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
 }
diff --git a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnObject2.lazy.log b/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnObject2.lazy.log
index dfe172b774a..e712aaf2f0d 100644
--- a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnObject2.lazy.log
+++ b/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnObject2.lazy.log
@@ -40,31 +40,34 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@29 {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+}
+
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
 }
 
 ResolutionTaskHolder@41 {
     <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+null {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@43 }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/defaultArgs.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/defaultArgs.lazy.log
index 74a6e096225..de1519eb0b9 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/defaultArgs.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/defaultArgs.lazy.log
@@ -61,14 +61,14 @@ LazyJavaClassifierType@33['String'] {
 
 LazyJavaClassifierType@36['String'] {
     arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@30['String']
+    classifier = JavaClassImpl@35['String']
     nullable = 'true': Boolean@38
     typeConstructor = DeserializedClassTypeConstructor@32
 }
 
 LazyJavaClassifierType@39['String'] {
     arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@35['String']
+    classifier = JavaClassImpl@30['String']
     nullable = 'true': Boolean@38
     typeConstructor = DeserializedClassTypeConstructor@32
 }
@@ -89,14 +89,14 @@ LazyJavaClassifierType@45['Throwable'] {
 
 LazyJavaClassifierType@48['Throwable'] {
     arguments = ArrayList@49[empty]
-    classifier = JavaClassImpl@43['Throwable']
+    classifier = JavaClassImpl@47['Throwable']
     nullable = 'true': Boolean@38
     typeConstructor = DeserializedClassTypeConstructor@44
 }
 
 LazyJavaClassifierType@50['Throwable'] {
     arguments = ArrayList@51[empty]
-    classifier = JavaClassImpl@47['Throwable']
+    classifier = JavaClassImpl@43['Throwable']
     nullable = 'true': Boolean@38
     typeConstructor = DeserializedClassTypeConstructor@44
 }
@@ -162,67 +162,70 @@ LazyJavaPackageFragment@63['lang'] {
 
 ResolutionTaskHolder@93 {
     <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@85[empty]
-    <name not found> = EmptyList@85[empty]
     <name not found> = EmptyList@85[empty]
     <name not found> = EmptyList@85[empty]
 }
 
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
-    <name not found> = EmptyList@85[empty]
-    <name not found> = EmptyList@85[empty]
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
     <name not found> = EmptyList@85[empty]
     <name not found> = EmptyList@85[empty]
 }
 
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
+}
+
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
 }
 
 ResolutionTaskHolder@105 {
     <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
 }
 
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
 }
 
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
+ResolutionTaskHolder@111 {
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
+}
+
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
 }
 
 ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@118[4] { ResolutionCandidate@119, ResolutionCandidate@120, ResolutionCandidate@121, ... }
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
 }
 
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
+ResolutionTaskHolder@122 {
+    <name not found> = ArrayList@123[7] { ResolutionCandidate@124, ResolutionCandidate@125, ResolutionCandidate@126, ... }
 }
 
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[4] { ResolutionCandidate@127, ResolutionCandidate@128, ResolutionCandidate@129, ... }
-    <name not found> = ArrayList@130[4] { ResolutionCandidate@127, ResolutionCandidate@128, ResolutionCandidate@129, ... }
+ResolutionTaskHolder@127 {
+    <name not found> = ArrayList@128[8] { ResolutionCandidate@129, ResolutionCandidate@130, ResolutionCandidate@131, ... }
+}
+
+null {
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@113 }
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@140[4] { ResolutionCandidate@119, ResolutionCandidate@120, ResolutionCandidate@121, ... }
+    <name not found> = ArrayList@141[7] { ResolutionCandidate@124, ResolutionCandidate@125, ResolutionCandidate@126, ... }
+    <name not found> = ArrayList@142[8] { ResolutionCandidate@129, ResolutionCandidate@130, ResolutionCandidate@131, ... }
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
     <name not found> = EmptyList@85[empty]
     <name not found> = EmptyList@85[empty]
     <name not found> = EmptyList@85[empty]
     <name not found> = EmptyList@85[empty]
 }
-
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[7] { ResolutionCandidate@133, ResolutionCandidate@134, ResolutionCandidate@135, ... }
-    <name not found> = ArrayList@136[7] { ResolutionCandidate@133, ResolutionCandidate@134, ResolutionCandidate@135, ... }
-}
-
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[8] { ResolutionCandidate@139, ResolutionCandidate@140, ResolutionCandidate@141, ... }
-    <name not found> = ArrayList@142[8] { ResolutionCandidate@139, ResolutionCandidate@140, ResolutionCandidate@141, ... }
-}
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/extensionTailCall.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/extensionTailCall.lazy.log
index ad526d184c6..d923409b4ee 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/extensionTailCall.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/extensionTailCall.lazy.log
@@ -47,45 +47,48 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@36 {
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
+}
+
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
 }
 
 ResolutionTaskHolder@48 {
     <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[8] { ResolutionCandidate@56, ResolutionCandidate@57, ResolutionCandidate@58, ... }
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[8] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64, ... }
-    <name not found> = ArrayList@65[8] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64, ... }
+null {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@65[8] { ResolutionCandidate@56, ResolutionCandidate@57, ResolutionCandidate@58, ... }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/functionWithNoTails.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/functionWithNoTails.lazy.log
index 4a85eeb8988..610c6b1465f 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/functionWithNoTails.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/functionWithNoTails.lazy.log
@@ -43,14 +43,17 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@32 {
     <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+}
+
+null {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@34 }
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/functionWithNonTailRecursions.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/functionWithNonTailRecursions.lazy.log
index 025fe763225..7f27f513e7a 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/functionWithNonTailRecursions.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/functionWithNonTailRecursions.lazy.log
@@ -57,146 +57,149 @@ LazyJavaPackageFragment@16['lang'] {
 
 ResolutionTaskHolder@45 {
     <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
 ResolutionTaskHolder@57 {
     <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
+}
+
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
 }
 
 ResolutionTaskHolder@69 {
     <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
+}
+
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
 }
 
 ResolutionTaskHolder@81 {
     <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
 }
 
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
+}
+
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
 }
 
 ResolutionTaskHolder@93 {
     <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
 }
 
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
 }
 
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[7] { ResolutionCandidate@101, ResolutionCandidate@102, ResolutionCandidate@103, ... }
 }
 
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[7] { ResolutionCandidate@106, ResolutionCandidate@107, ResolutionCandidate@108, ... }
 }
 
 ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@110[7] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113, ... }
 }
 
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[8] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
 }
 
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[7] { ResolutionCandidate@119, ResolutionCandidate@120, ResolutionCandidate@121, ... }
-    <name not found> = ArrayList@122[7] { ResolutionCandidate@119, ResolutionCandidate@120, ResolutionCandidate@121, ... }
+ResolutionTaskHolder@119 {
+    <name not found> = ArrayList@120[8] { ResolutionCandidate@121, ResolutionCandidate@122, ResolutionCandidate@123, ... }
 }
 
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[7] { ResolutionCandidate@125, ResolutionCandidate@126, ResolutionCandidate@127, ... }
-    <name not found> = ArrayList@128[7] { ResolutionCandidate@125, ResolutionCandidate@126, ResolutionCandidate@127, ... }
+ResolutionTaskHolder@124 {
+    <name not found> = ArrayList@125[8] { ResolutionCandidate@126, ResolutionCandidate@127, ResolutionCandidate@128, ... }
 }
 
 ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[7] { ResolutionCandidate@131, ResolutionCandidate@132, ResolutionCandidate@133, ... }
-    <name not found> = ArrayList@134[7] { ResolutionCandidate@131, ResolutionCandidate@132, ResolutionCandidate@133, ... }
+    <name not found> = ArrayList@130[8] { ResolutionCandidate@131, ResolutionCandidate@132, ResolutionCandidate@133, ... }
 }
 
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[8] { ResolutionCandidate@137, ResolutionCandidate@138, ResolutionCandidate@139, ... }
-    <name not found> = ArrayList@140[8] { ResolutionCandidate@137, ResolutionCandidate@138, ResolutionCandidate@139, ... }
+ResolutionTaskHolder@134 {
+    <name not found> = ArrayList@135[8] { ResolutionCandidate@136, ResolutionCandidate@137, ResolutionCandidate@138, ... }
 }
 
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[8] { ResolutionCandidate@143, ResolutionCandidate@144, ResolutionCandidate@145, ... }
-    <name not found> = ArrayList@146[8] { ResolutionCandidate@143, ResolutionCandidate@144, ResolutionCandidate@145, ... }
-}
-
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[8] { ResolutionCandidate@149, ResolutionCandidate@150, ResolutionCandidate@151, ... }
-    <name not found> = ArrayList@152[8] { ResolutionCandidate@149, ResolutionCandidate@150, ResolutionCandidate@151, ... }
-}
-
-ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[8] { ResolutionCandidate@155, ResolutionCandidate@156, ResolutionCandidate@157, ... }
-    <name not found> = ArrayList@158[8] { ResolutionCandidate@155, ResolutionCandidate@156, ResolutionCandidate@157, ... }
-}
-
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[8] { ResolutionCandidate@161, ResolutionCandidate@162, ResolutionCandidate@163, ... }
-    <name not found> = ArrayList@164[8] { ResolutionCandidate@161, ResolutionCandidate@162, ResolutionCandidate@163, ... }
+null {
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@157[7] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113, ... }
+    <name not found> = ArrayList@158[7] { ResolutionCandidate@101, ResolutionCandidate@102, ResolutionCandidate@103, ... }
+    <name not found> = ArrayList@159[7] { ResolutionCandidate@106, ResolutionCandidate@107, ResolutionCandidate@108, ... }
+    <name not found> = ArrayList@160[8] { ResolutionCandidate@121, ResolutionCandidate@122, ResolutionCandidate@123, ... }
+    <name not found> = ArrayList@161[8] { ResolutionCandidate@126, ResolutionCandidate@127, ResolutionCandidate@128, ... }
+    <name not found> = ArrayList@162[8] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
+    <name not found> = ArrayList@163[8] { ResolutionCandidate@131, ResolutionCandidate@132, ResolutionCandidate@133, ... }
+    <name not found> = ArrayList@164[8] { ResolutionCandidate@136, ResolutionCandidate@137, ResolutionCandidate@138, ... }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/functionWithoutAnnotation.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/functionWithoutAnnotation.lazy.log
index 8a7e363abc3..6b276b3b07b 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/functionWithoutAnnotation.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/functionWithoutAnnotation.lazy.log
@@ -42,58 +42,61 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@30 {
     <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+}
+
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
 }
 
 ResolutionTaskHolder@42 {
     <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[7] { ResolutionCandidate@53, ResolutionCandidate@54, ResolutionCandidate@55, ... }
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[7] { ResolutionCandidate@60, ResolutionCandidate@61, ResolutionCandidate@62, ... }
-    <name not found> = ArrayList@63[7] { ResolutionCandidate@60, ResolutionCandidate@61, ResolutionCandidate@62, ... }
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[8] { ResolutionCandidate@58, ResolutionCandidate@59, ResolutionCandidate@60, ... }
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[8] { ResolutionCandidate@66, ResolutionCandidate@67, ResolutionCandidate@68, ... }
-    <name not found> = ArrayList@69[8] { ResolutionCandidate@66, ResolutionCandidate@67, ResolutionCandidate@68, ... }
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[8] { ResolutionCandidate@63, ResolutionCandidate@64, ResolutionCandidate@65, ... }
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[8] { ResolutionCandidate@72, ResolutionCandidate@73, ResolutionCandidate@74, ... }
-    <name not found> = ArrayList@75[8] { ResolutionCandidate@72, ResolutionCandidate@73, ResolutionCandidate@74, ... }
+null {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@73[7] { ResolutionCandidate@53, ResolutionCandidate@54, ResolutionCandidate@55, ... }
+    <name not found> = ArrayList@74[8] { ResolutionCandidate@58, ResolutionCandidate@59, ResolutionCandidate@60, ... }
+    <name not found> = ArrayList@75[8] { ResolutionCandidate@63, ResolutionCandidate@64, ResolutionCandidate@65, ... }
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/infixCall.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/infixCall.lazy.log
index 457c5571f10..185c2d52ed7 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/infixCall.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/infixCall.lazy.log
@@ -47,50 +47,53 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@36 {
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
+}
+
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
 }
 
 ResolutionTaskHolder@48 {
     <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[7] { ResolutionCandidate@56, ResolutionCandidate@57, ResolutionCandidate@58, ... }
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[7] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64, ... }
-    <name not found> = ArrayList@65[7] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64, ... }
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[8] { ResolutionCandidate@61, ResolutionCandidate@62, ResolutionCandidate@63, ... }
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[8] { ResolutionCandidate@68, ResolutionCandidate@69, ResolutionCandidate@70, ... }
-    <name not found> = ArrayList@71[8] { ResolutionCandidate@68, ResolutionCandidate@69, ResolutionCandidate@70, ... }
+null {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@70[7] { ResolutionCandidate@56, ResolutionCandidate@57, ResolutionCandidate@58, ... }
+    <name not found> = ArrayList@71[8] { ResolutionCandidate@61, ResolutionCandidate@62, ResolutionCandidate@63, ... }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/infixRecursiveCall.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/infixRecursiveCall.lazy.log
index 03674d240f8..b5039d714f4 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/infixRecursiveCall.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/infixRecursiveCall.lazy.log
@@ -51,50 +51,53 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@37 {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+}
+
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
 }
 
 ResolutionTaskHolder@49 {
     <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[8] { ResolutionCandidate@60, ResolutionCandidate@61, ResolutionCandidate@62, ... }
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[8] { ResolutionCandidate@67, ResolutionCandidate@68, ResolutionCandidate@69, ... }
-    <name not found> = ArrayList@70[8] { ResolutionCandidate@67, ResolutionCandidate@68, ResolutionCandidate@69, ... }
+null {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@70[8] { ResolutionCandidate@60, ResolutionCandidate@61, ResolutionCandidate@62, ... }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/insideElvis.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/insideElvis.lazy.log
index b9e532ada2b..dc21b54f353 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/insideElvis.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/insideElvis.lazy.log
@@ -51,105 +51,108 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@37 {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+    <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
 ResolutionTaskHolder@48 {
     <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+}
+
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
 }
 
 ResolutionTaskHolder@60 {
     <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
+}
+
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
 }
 
 ResolutionTaskHolder@72 {
     <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
 }
 
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[7] { ResolutionCandidate@80, ResolutionCandidate@81, ResolutionCandidate@82, ... }
 }
 
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[8] { ResolutionCandidate@85, ResolutionCandidate@86, ResolutionCandidate@87, ... }
 }
 
 ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@89[8] { ResolutionCandidate@90, ResolutionCandidate@91, ResolutionCandidate@92, ... }
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[7] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
-    <name not found> = ArrayList@97[7] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[8] { ResolutionCandidate@95, ResolutionCandidate@96, ResolutionCandidate@97, ... }
 }
 
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[8] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102, ... }
-    <name not found> = ArrayList@103[8] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102, ... }
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[8] { ResolutionCandidate@106, ResolutionCandidate@107, ResolutionCandidate@108, ... }
-    <name not found> = ArrayList@109[8] { ResolutionCandidate@106, ResolutionCandidate@107, ResolutionCandidate@108, ... }
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[8] { ResolutionCandidate@112, ResolutionCandidate@113, ResolutionCandidate@114, ... }
-    <name not found> = ArrayList@115[8] { ResolutionCandidate@112, ResolutionCandidate@113, ResolutionCandidate@114, ... }
+null {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@112[7] { ResolutionCandidate@80, ResolutionCandidate@81, ResolutionCandidate@82, ... }
+    <name not found> = ArrayList@113[8] { ResolutionCandidate@95, ResolutionCandidate@96, ResolutionCandidate@97, ... }
+    <name not found> = ArrayList@114[8] { ResolutionCandidate@90, ResolutionCandidate@91, ResolutionCandidate@92, ... }
+    <name not found> = ArrayList@115[8] { ResolutionCandidate@85, ResolutionCandidate@86, ResolutionCandidate@87, ... }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/labeledThisReferences.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/labeledThisReferences.lazy.log
index 02faff70efb..f32a7e0d05d 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/labeledThisReferences.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/labeledThisReferences.lazy.log
@@ -64,87 +64,90 @@ LazyJavaPackageFragment@17['lang'] {
 
 ResolutionTaskHolder@48 {
     <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
 }
 
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
+}
+
 ResolutionTaskHolder@60 {
     <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
+}
+
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
 }
 
 ResolutionTaskHolder@72 {
     <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
 }
 
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
+}
+
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
 }
 
 ResolutionTaskHolder@84 {
     <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
 }
 
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[7] { ResolutionCandidate@89, ResolutionCandidate@90, ResolutionCandidate@91, ... }
 }
 
 ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@93[8] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
 }
 
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[7] { ResolutionCandidate@102, ResolutionCandidate@103, ResolutionCandidate@104, ... }
-    <name not found> = ArrayList@105[7] { ResolutionCandidate@102, ResolutionCandidate@103, ResolutionCandidate@104, ... }
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[8] { ResolutionCandidate@108, ResolutionCandidate@109, ResolutionCandidate@110, ... }
-    <name not found> = ArrayList@111[8] { ResolutionCandidate@108, ResolutionCandidate@109, ResolutionCandidate@110, ... }
+null {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@110[7] { ResolutionCandidate@89, ResolutionCandidate@90, ResolutionCandidate@91, ... }
+    <name not found> = ArrayList@111[8] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/loops.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/loops.lazy.log
index 76a990f519b..60582dcafe6 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/loops.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/loops.lazy.log
@@ -47,107 +47,110 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@36 {
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
 
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+}
+
 ResolutionTaskHolder@48 {
     <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+}
+
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
 }
 
 ResolutionTaskHolder@60 {
     <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
+}
+
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
 }
 
 ResolutionTaskHolder@72 {
     <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
 }
 
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[7] { ResolutionCandidate@80, ResolutionCandidate@81, ResolutionCandidate@82, ... }
 }
 
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[7] { ResolutionCandidate@85, ResolutionCandidate@86, ResolutionCandidate@87, ... }
 }
 
 ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@89[7] { ResolutionCandidate@90, ResolutionCandidate@91, ResolutionCandidate@92, ... }
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[7] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
-    <name not found> = ArrayList@97[7] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[8] { ResolutionCandidate@95, ResolutionCandidate@96, ResolutionCandidate@97, ... }
 }
 
 ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[7] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102, ... }
-    <name not found> = ArrayList@103[7] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102, ... }
+    <name not found> = ArrayList@99[8] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102, ... }
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[7] { ResolutionCandidate@106, ResolutionCandidate@107, ResolutionCandidate@108, ... }
-    <name not found> = ArrayList@109[7] { ResolutionCandidate@106, ResolutionCandidate@107, ResolutionCandidate@108, ... }
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[8] { ResolutionCandidate@112, ResolutionCandidate@113, ResolutionCandidate@114, ... }
-    <name not found> = ArrayList@115[8] { ResolutionCandidate@112, ResolutionCandidate@113, ResolutionCandidate@114, ... }
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[8] { ResolutionCandidate@118, ResolutionCandidate@119, ResolutionCandidate@120, ... }
-    <name not found> = ArrayList@121[8] { ResolutionCandidate@118, ResolutionCandidate@119, ResolutionCandidate@120, ... }
+null {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@117[7] { ResolutionCandidate@85, ResolutionCandidate@86, ResolutionCandidate@87, ... }
+    <name not found> = ArrayList@118[7] { ResolutionCandidate@80, ResolutionCandidate@81, ResolutionCandidate@82, ... }
+    <name not found> = ArrayList@119[7] { ResolutionCandidate@90, ResolutionCandidate@91, ResolutionCandidate@92, ... }
+    <name not found> = ArrayList@120[8] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102, ... }
+    <name not found> = ArrayList@121[8] { ResolutionCandidate@95, ResolutionCandidate@96, ResolutionCandidate@97, ... }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/multilevelBlocks.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/multilevelBlocks.lazy.log
index f7c0fc5735b..e13d6d5fb7c 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/multilevelBlocks.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/multilevelBlocks.lazy.log
@@ -47,139 +47,142 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@36 {
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
+}
+
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
 
 ResolutionTaskHolder@48 {
     <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+}
+
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
 }
 
 ResolutionTaskHolder@60 {
     <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
+}
+
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
 }
 
 ResolutionTaskHolder@72 {
     <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
 }
 
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
+}
+
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
 }
 
 ResolutionTaskHolder@84 {
     <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
 }
 
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[7] { ResolutionCandidate@92, ResolutionCandidate@93, ResolutionCandidate@94, ... }
 }
 
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[8] { ResolutionCandidate@97, ResolutionCandidate@98, ResolutionCandidate@99, ... }
 }
 
 ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@101[8] { ResolutionCandidate@102, ResolutionCandidate@103, ResolutionCandidate@104, ... }
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[8] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
 }
 
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[7] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
-    <name not found> = ArrayList@113[7] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[8] { ResolutionCandidate@112, ResolutionCandidate@113, ResolutionCandidate@114, ... }
 }
 
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[8] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
-    <name not found> = ArrayList@119[8] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[8] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
-    <name not found> = ArrayList@125[8] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[8] { ResolutionCandidate@128, ResolutionCandidate@129, ResolutionCandidate@130, ... }
-    <name not found> = ArrayList@131[8] { ResolutionCandidate@128, ResolutionCandidate@129, ResolutionCandidate@130, ... }
-}
-
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[8] { ResolutionCandidate@134, ResolutionCandidate@135, ResolutionCandidate@136, ... }
-    <name not found> = ArrayList@137[8] { ResolutionCandidate@134, ResolutionCandidate@135, ResolutionCandidate@136, ... }
+null {
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@133[7] { ResolutionCandidate@92, ResolutionCandidate@93, ResolutionCandidate@94, ... }
+    <name not found> = ArrayList@134[8] { ResolutionCandidate@102, ResolutionCandidate@103, ResolutionCandidate@104, ... }
+    <name not found> = ArrayList@135[8] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
+    <name not found> = ArrayList@136[8] { ResolutionCandidate@97, ResolutionCandidate@98, ResolutionCandidate@99, ... }
+    <name not found> = ArrayList@137[8] { ResolutionCandidate@112, ResolutionCandidate@113, ResolutionCandidate@114, ... }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/realIteratorFoldl.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/realIteratorFoldl.lazy.log
index b0a62a09201..7e85d2f88b2 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/realIteratorFoldl.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/realIteratorFoldl.lazy.log
@@ -77,12 +77,6 @@ LazyJavaPackageFragment@16['lang'] {
 
 ResolutionTaskHolder@54 {
     <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
@@ -90,116 +84,125 @@ ResolutionTaskHolder@54 {
     <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
+}
+
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
 }
 
 ResolutionTaskHolder@66 {
     <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
+}
+
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
 }
 
 ResolutionTaskHolder@78 {
     <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
 }
 
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
 }
 
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
+}
+
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
 }
 
 ResolutionTaskHolder@90 {
     <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
 }
 
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
+}
+
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
 }
 
 ResolutionTaskHolder@102 {
     <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
 }
 
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
 }
 
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
 }
 
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
+ResolutionTaskHolder@111 {
+    <name not found> = ArrayList@112[7] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
 }
 
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[8] { ResolutionCandidate@118, ResolutionCandidate@119, ResolutionCandidate@120, ... }
 }
 
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[7] { ResolutionCandidate@132, ResolutionCandidate@133, ResolutionCandidate@134, ... }
-    <name not found> = ArrayList@135[7] { ResolutionCandidate@132, ResolutionCandidate@133, ResolutionCandidate@134, ... }
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[8] { ResolutionCandidate@138, ResolutionCandidate@139, ResolutionCandidate@140, ... }
-    <name not found> = ArrayList@141[8] { ResolutionCandidate@138, ResolutionCandidate@139, ResolutionCandidate@140, ... }
+null {
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@140[7] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
+    <name not found> = ArrayList@141[8] { ResolutionCandidate@118, ResolutionCandidate@119, ResolutionCandidate@120, ... }
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/realStringEscape.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/realStringEscape.lazy.log
index 3172e882561..c238f97c061 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/realStringEscape.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/realStringEscape.lazy.log
@@ -174,91 +174,91 @@ LazyJavaClassifierType@119['AbstractStringBuilder'] {
 
 LazyJavaClassifierType@122['AbstractStringBuilder'] {
     arguments = ArrayList@123[empty]
-    classifier = JavaClassImpl@91['AbstractStringBuilder']
+    classifier = JavaClassImpl@109['AbstractStringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@125['AbstractStringBuilder'] {
     arguments = ArrayList@126[empty]
-    classifier = JavaClassImpl@103['AbstractStringBuilder']
+    classifier = JavaClassImpl@112['AbstractStringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@127['AbstractStringBuilder'] {
     arguments = ArrayList@128[empty]
-    classifier = JavaClassImpl@97['AbstractStringBuilder']
+    classifier = JavaClassImpl@118['AbstractStringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@129['AbstractStringBuilder'] {
     arguments = ArrayList@130[empty]
-    classifier = JavaClassImpl@109['AbstractStringBuilder']
+    classifier = JavaClassImpl@106['AbstractStringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@131['AbstractStringBuilder'] {
     arguments = ArrayList@132[empty]
-    classifier = JavaClassImpl@94['AbstractStringBuilder']
+    classifier = JavaClassImpl@88['AbstractStringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@133['AbstractStringBuilder'] {
     arguments = ArrayList@134[empty]
-    classifier = JavaClassImpl@88['AbstractStringBuilder']
+    classifier = JavaClassImpl@97['AbstractStringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@135['AbstractStringBuilder'] {
     arguments = ArrayList@136[empty]
-    classifier = JavaClassImpl@106['AbstractStringBuilder']
+    classifier = JavaClassImpl@84['AbstractStringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@137['AbstractStringBuilder'] {
     arguments = ArrayList@138[empty]
-    classifier = JavaClassImpl@115['AbstractStringBuilder']
+    classifier = JavaClassImpl@121['AbstractStringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@139['AbstractStringBuilder'] {
     arguments = ArrayList@140[empty]
-    classifier = JavaClassImpl@118['AbstractStringBuilder']
+    classifier = JavaClassImpl@91['AbstractStringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@141['AbstractStringBuilder'] {
     arguments = ArrayList@142[empty]
-    classifier = JavaClassImpl@121['AbstractStringBuilder']
+    classifier = JavaClassImpl@94['AbstractStringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@143['AbstractStringBuilder'] {
     arguments = ArrayList@144[empty]
-    classifier = JavaClassImpl@100['AbstractStringBuilder']
+    classifier = JavaClassImpl@115['AbstractStringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@145['AbstractStringBuilder'] {
     arguments = ArrayList@146[empty]
-    classifier = JavaClassImpl@112['AbstractStringBuilder']
+    classifier = JavaClassImpl@100['AbstractStringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@147['AbstractStringBuilder'] {
     arguments = ArrayList@148[empty]
-    classifier = JavaClassImpl@84['AbstractStringBuilder']
+    classifier = JavaClassImpl@103['AbstractStringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
@@ -299,14 +299,14 @@ LazyJavaClassifierType@159['Appendable'] {
 
 LazyJavaClassifierType@162['Appendable'] {
     arguments = ArrayList@163[empty]
-    classifier = JavaClassImpl@161['Appendable']
+    classifier = JavaClassImpl@158['Appendable']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@30['Appendable']
 }
 
 LazyJavaClassifierType@164['Appendable'] {
     arguments = ArrayList@165[empty]
-    classifier = JavaClassImpl@158['Appendable']
+    classifier = JavaClassImpl@161['Appendable']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@30['Appendable']
 }
@@ -383,49 +383,49 @@ LazyJavaClassifierType@192['CharSequence'] {
 
 LazyJavaClassifierType@195['CharSequence'] {
     arguments = ArrayList@196[empty]
-    classifier = JavaClassImpl@191['CharSequence']
+    classifier = JavaClassImpl@188['CharSequence']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@171
 }
 
 LazyJavaClassifierType@197['CharSequence'] {
     arguments = ArrayList@198[empty]
-    classifier = JavaClassImpl@179['CharSequence']
+    classifier = JavaClassImpl@191['CharSequence']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@171
 }
 
 LazyJavaClassifierType@199['CharSequence'] {
     arguments = ArrayList@200[empty]
-    classifier = JavaClassImpl@182['CharSequence']
+    classifier = JavaClassImpl@176['CharSequence']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@171
 }
 
 LazyJavaClassifierType@201['CharSequence'] {
     arguments = ArrayList@202[empty]
-    classifier = JavaClassImpl@185['CharSequence']
+    classifier = JavaClassImpl@182['CharSequence']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@171
 }
 
 LazyJavaClassifierType@203['CharSequence'] {
     arguments = ArrayList@204[empty]
-    classifier = JavaClassImpl@188['CharSequence']
+    classifier = JavaClassImpl@194['CharSequence']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@171
 }
 
 LazyJavaClassifierType@205['CharSequence'] {
     arguments = ArrayList@206[empty]
-    classifier = JavaClassImpl@176['CharSequence']
+    classifier = JavaClassImpl@179['CharSequence']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@171
 }
 
 LazyJavaClassifierType@207['CharSequence'] {
     arguments = ArrayList@208[empty]
-    classifier = JavaClassImpl@194['CharSequence']
+    classifier = JavaClassImpl@185['CharSequence']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@171
 }
@@ -527,21 +527,21 @@ LazyJavaClassifierType@243['String'] {
 
 LazyJavaClassifierType@246['String'] {
     arguments = ArrayList@247[empty]
-    classifier = JavaClassImpl@242['String']
+    classifier = JavaClassImpl@232['String']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@233
 }
 
 LazyJavaClassifierType@248['String'] {
     arguments = ArrayList@249[empty]
-    classifier = JavaClassImpl@232['String']
+    classifier = JavaClassImpl@239['String']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@233
 }
 
 LazyJavaClassifierType@250['String'] {
     arguments = ArrayList@251[empty]
-    classifier = JavaClassImpl@239['String']
+    classifier = JavaClassImpl@236['String']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@233
 }
@@ -555,7 +555,7 @@ LazyJavaClassifierType@252['String'] {
 
 LazyJavaClassifierType@254['String'] {
     arguments = ArrayList@255[empty]
-    classifier = JavaClassImpl@236['String']
+    classifier = JavaClassImpl@242['String']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@233
 }
@@ -576,14 +576,14 @@ LazyJavaClassifierType@259['StringBuffer'] {
 
 LazyJavaClassifierType@262['StringBuffer'] {
     arguments = ArrayList@263[empty]
-    classifier = JavaClassImpl@258['StringBuffer']
+    classifier = JavaClassImpl@261['StringBuffer']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@40['StringBuffer']
 }
 
 LazyJavaClassifierType@264['StringBuffer'] {
     arguments = ArrayList@265[empty]
-    classifier = JavaClassImpl@261['StringBuffer']
+    classifier = JavaClassImpl@258['StringBuffer']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@40['StringBuffer']
 }
@@ -695,35 +695,35 @@ LazyJavaClassifierType@308['StringBuilder'] {
 
 LazyJavaClassifierType@311['StringBuilder'] {
     arguments = ArrayList@312[empty]
-    classifier = JavaClassImpl@286['StringBuilder']
+    classifier = JavaClassImpl@304['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@313['StringBuilder'] {
     arguments = ArrayList@314[empty]
-    classifier = JavaClassImpl@292['StringBuilder']
+    classifier = JavaClassImpl@286['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@315['StringBuilder'] {
     arguments = ArrayList@316[empty]
-    classifier = JavaClassImpl@307['StringBuilder']
+    classifier = JavaClassImpl@292['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@317['StringBuilder'] {
     arguments = ArrayList@318[empty]
-    classifier = JavaClassImpl@289['StringBuilder']
+    classifier = JavaClassImpl@268['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@319['StringBuilder'] {
     arguments = ArrayList@320[empty]
-    classifier = JavaClassImpl@277['StringBuilder']
+    classifier = JavaClassImpl@283['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
@@ -737,63 +737,63 @@ LazyJavaClassifierType@321['StringBuilder'] {
 
 LazyJavaClassifierType@323['StringBuilder'] {
     arguments = ArrayList@324[empty]
-    classifier = JavaClassImpl@271['StringBuilder']
+    classifier = JavaClassImpl@280['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@325['StringBuilder'] {
     arguments = ArrayList@326[empty]
-    classifier = JavaClassImpl@301['StringBuilder']
+    classifier = JavaClassImpl@310['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@327['StringBuilder'] {
     arguments = ArrayList@328[empty]
-    classifier = JavaClassImpl@274['StringBuilder']
+    classifier = JavaClassImpl@295['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@329['StringBuilder'] {
     arguments = ArrayList@330[empty]
-    classifier = JavaClassImpl@268['StringBuilder']
+    classifier = JavaClassImpl@301['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@331['StringBuilder'] {
     arguments = ArrayList@332[empty]
-    classifier = JavaClassImpl@295['StringBuilder']
+    classifier = JavaClassImpl@307['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@333['StringBuilder'] {
     arguments = ArrayList@334[empty]
-    classifier = JavaClassImpl@280['StringBuilder']
+    classifier = JavaClassImpl@271['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@335['StringBuilder'] {
     arguments = ArrayList@336[empty]
-    classifier = JavaClassImpl@310['StringBuilder']
+    classifier = JavaClassImpl@277['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@337['StringBuilder'] {
     arguments = ArrayList@338[empty]
-    classifier = JavaClassImpl@283['StringBuilder']
+    classifier = JavaClassImpl@274['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@339['StringBuilder'] {
     arguments = ArrayList@340[empty]
-    classifier = JavaClassImpl@304['StringBuilder']
+    classifier = JavaClassImpl@289['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
@@ -824,7 +824,7 @@ LazyJavaPackageFragmentProvider@341 {
     topLevelClasses(JavaClassImpl@81['AbstractStringBuilder']) = LazyJavaClassDescriptor@3['AbstractStringBuilder']
     topLevelClasses(JavaClassImpl@152['Appendable']) = LazyJavaClassDescriptor@17['Appendable']
     topLevelClasses(JavaClassImpl@228['Serializable']) = LazyJavaClassDescriptor@31['Serializable']
-    topLevelClasses(JavaClassImpl@261['StringBuffer']) = LazyJavaClassDescriptor@39['StringBuffer']
+    topLevelClasses(JavaClassImpl@258['StringBuffer']) = LazyJavaClassDescriptor@39['StringBuffer']
     topLevelClasses(JavaClassImpl@368['StringBuilder']) = LazyJavaClassDescriptor@41['StringBuilder']
 }
 
@@ -869,15 +869,10 @@ LazyJavaPackageFragment@353['lang'] {
 
 ResolutionTaskHolder@388 {
     <name not found> = ArrayList@389[13] { ResolutionCandidate@390, ResolutionCandidate@391, ResolutionCandidate@392, ... }
-    <name not found> = ArrayList@393[14] { ResolutionCandidate@390, ResolutionCandidate@391, ResolutionCandidate@394, ... }
 }
 
-ResolutionTaskHolder@395 {
-    <name not found> = ArrayList@396[1] { ResolutionCandidate@397 }
-    <name not found> = ArrayList@398[1] { ResolutionCandidate@397 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@393 {
+    <name not found> = ArrayList@394[1] { ResolutionCandidate@395 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
@@ -886,6 +881,10 @@ ResolutionTaskHolder@395 {
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
+}
+
+ResolutionTaskHolder@396 {
+    <name not found> = ArrayList@397[1] { ResolutionCandidate@398 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
@@ -895,115 +894,71 @@ ResolutionTaskHolder@395 {
 
 ResolutionTaskHolder@399 {
     <name not found> = ArrayList@400[1] { ResolutionCandidate@401 }
-    <name not found> = ArrayList@402[1] { ResolutionCandidate@401 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@403 {
-    <name not found> = ArrayList@404[1] { ResolutionCandidate@405 }
-    <name not found> = ArrayList@406[1] { ResolutionCandidate@405 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@402 {
+    <name not found> = ArrayList@403[1] { ResolutionCandidate@404 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@407 {
-    <name not found> = ArrayList@408[1] { ResolutionCandidate@409 }
-    <name not found> = ArrayList@410[1] { ResolutionCandidate@409 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@405 {
+    <name not found> = ArrayList@406[1] { ResolutionCandidate@407 }
     <name not found> = EmptyList@33[empty]
 }
 
+ResolutionTaskHolder@408 {
+    <name not found> = ArrayList@409[1] { ResolutionCandidate@410 }
+}
+
 ResolutionTaskHolder@411 {
     <name not found> = ArrayList@412[1] { ResolutionCandidate@413 }
-    <name not found> = ArrayList@414[1] { ResolutionCandidate@413 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@415 {
-    <name not found> = ArrayList@416[1] { ResolutionCandidate@417 }
-    <name not found> = ArrayList@418[1] { ResolutionCandidate@417 }
+ResolutionTaskHolder@414 {
+    <name not found> = ArrayList@415[1] { ResolutionCandidate@416 }
 }
 
-ResolutionTaskHolder@419 {
-    <name not found> = ArrayList@420[1] { ResolutionCandidate@421 }
-    <name not found> = ArrayList@422[1] { ResolutionCandidate@421 }
+ResolutionTaskHolder@417 {
+    <name not found> = ArrayList@418[1] { ResolutionCandidate@419 }
+}
+
+ResolutionTaskHolder@420 {
+    <name not found> = ArrayList@421[1] { ResolutionCandidate@422 }
 }
 
 ResolutionTaskHolder@423 {
     <name not found> = ArrayList@424[1] { ResolutionCandidate@425 }
-    <name not found> = ArrayList@426[1] { ResolutionCandidate@425 }
 }
 
-ResolutionTaskHolder@427 {
-    <name not found> = ArrayList@428[1] { ResolutionCandidate@429 }
-    <name not found> = ArrayList@430[1] { ResolutionCandidate@429 }
+ResolutionTaskHolder@426 {
+    <name not found> = ArrayList@427[1] { ResolutionCandidate@428 }
 }
 
-ResolutionTaskHolder@431 {
-    <name not found> = ArrayList@432[1] { ResolutionCandidate@433 }
-    <name not found> = ArrayList@434[1] { ResolutionCandidate@433 }
+ResolutionTaskHolder@429 {
+    <name not found> = ArrayList@430[1] { ResolutionCandidate@431 }
+}
+
+ResolutionTaskHolder@432 {
+    <name not found> = ArrayList@433[1] { ResolutionCandidate@434 }
 }
 
 ResolutionTaskHolder@435 {
     <name not found> = ArrayList@436[1] { ResolutionCandidate@437 }
-    <name not found> = ArrayList@438[1] { ResolutionCandidate@437 }
 }
 
-ResolutionTaskHolder@439 {
-    <name not found> = ArrayList@440[1] { ResolutionCandidate@441 }
-    <name not found> = ArrayList@442[1] { ResolutionCandidate@441 }
+ResolutionTaskHolder@438 {
+    <name not found> = ArrayList@439[1] { ResolutionCandidate@440 }
 }
 
-ResolutionTaskHolder@443 {
-    <name not found> = ArrayList@444[1] { ResolutionCandidate@445 }
-    <name not found> = ArrayList@446[1] { ResolutionCandidate@445 }
+ResolutionTaskHolder@441 {
+    <name not found> = ArrayList@442[1] { ResolutionCandidate@443 }
 }
 
-ResolutionTaskHolder@447 {
-    <name not found> = ArrayList@448[1] { ResolutionCandidate@449 }
-    <name not found> = ArrayList@450[1] { ResolutionCandidate@449 }
-}
-
-ResolutionTaskHolder@451 {
-    <name not found> = ArrayList@452[1] { ResolutionCandidate@453 }
-    <name not found> = ArrayList@454[1] { ResolutionCandidate@453 }
-}
-
-ResolutionTaskHolder@455 {
-    <name not found> = ArrayList@456[1] { ResolutionCandidate@457 }
-    <name not found> = ArrayList@458[1] { ResolutionCandidate@457 }
-}
-
-ResolutionTaskHolder@459 {
-    <name not found> = ArrayList@460[1] { ResolutionCandidate@461 }
-    <name not found> = ArrayList@462[1] { ResolutionCandidate@461 }
-}
-
-ResolutionTaskHolder@463 {
-    <name not found> = ArrayList@464[4] { ResolutionCandidate@465, ResolutionCandidate@466, ResolutionCandidate@467, ... }
-    <name not found> = ArrayList@468[4] { ResolutionCandidate@465, ResolutionCandidate@466, ResolutionCandidate@467, ... }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@444 {
+    <name not found> = ArrayList@445[4] { ResolutionCandidate@446, ResolutionCandidate@447, ResolutionCandidate@448, ... }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
@@ -1014,7 +969,55 @@ ResolutionTaskHolder@463 {
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@469 {
-    <name not found> = ArrayList@470[8] { ResolutionCandidate@471, ResolutionCandidate@472, ResolutionCandidate@473, ... }
-    <name not found> = ArrayList@474[8] { ResolutionCandidate@471, ResolutionCandidate@472, ResolutionCandidate@473, ... }
+ResolutionTaskHolder@449 {
+    <name not found> = ArrayList@450[8] { ResolutionCandidate@451, ResolutionCandidate@452, ResolutionCandidate@453, ... }
+}
+
+null {
+    <name not found> = ArrayList@454[14] { ResolutionCandidate@390, ResolutionCandidate@391, ResolutionCandidate@455, ... }
+    <name not found> = ArrayList@456[1] { ResolutionCandidate@416 }
+    <name not found> = ArrayList@457[1] { ResolutionCandidate@425 }
+    <name not found> = ArrayList@458[1] { ResolutionCandidate@431 }
+    <name not found> = ArrayList@459[1] { ResolutionCandidate@434 }
+    <name not found> = ArrayList@460[1] { ResolutionCandidate@419 }
+    <name not found> = ArrayList@461[1] { ResolutionCandidate@407 }
+    <name not found> = ArrayList@462[1] { ResolutionCandidate@440 }
+    <name not found> = ArrayList@463[1] { ResolutionCandidate@410 }
+    <name not found> = ArrayList@464[1] { ResolutionCandidate@422 }
+    <name not found> = ArrayList@465[1] { ResolutionCandidate@437 }
+    <name not found> = ArrayList@466[1] { ResolutionCandidate@428 }
+    <name not found> = ArrayList@467[1] { ResolutionCandidate@443 }
+    <name not found> = ArrayList@468[1] { ResolutionCandidate@401 }
+    <name not found> = ArrayList@469[1] { ResolutionCandidate@395 }
+    <name not found> = ArrayList@470[1] { ResolutionCandidate@398 }
+    <name not found> = ArrayList@471[1] { ResolutionCandidate@413 }
+    <name not found> = ArrayList@472[1] { ResolutionCandidate@404 }
+    <name not found> = ArrayList@473[4] { ResolutionCandidate@446, ResolutionCandidate@447, ResolutionCandidate@448, ... }
+    <name not found> = ArrayList@474[8] { ResolutionCandidate@451, ResolutionCandidate@452, ResolutionCandidate@453, ... }
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/realStringRepeat.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/realStringRepeat.lazy.log
index 22deaf738d8..5c7b33f42c7 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/realStringRepeat.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/realStringRepeat.lazy.log
@@ -174,91 +174,91 @@ LazyJavaClassifierType@119['AbstractStringBuilder'] {
 
 LazyJavaClassifierType@122['AbstractStringBuilder'] {
     arguments = ArrayList@123[empty]
-    classifier = JavaClassImpl@106['AbstractStringBuilder']
+    classifier = JavaClassImpl@91['AbstractStringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@125['AbstractStringBuilder'] {
     arguments = ArrayList@126[empty]
-    classifier = JavaClassImpl@88['AbstractStringBuilder']
+    classifier = JavaClassImpl@84['AbstractStringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@127['AbstractStringBuilder'] {
     arguments = ArrayList@128[empty]
-    classifier = JavaClassImpl@118['AbstractStringBuilder']
+    classifier = JavaClassImpl@97['AbstractStringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@129['AbstractStringBuilder'] {
     arguments = ArrayList@130[empty]
-    classifier = JavaClassImpl@84['AbstractStringBuilder']
+    classifier = JavaClassImpl@103['AbstractStringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@131['AbstractStringBuilder'] {
     arguments = ArrayList@132[empty]
-    classifier = JavaClassImpl@109['AbstractStringBuilder']
+    classifier = JavaClassImpl@112['AbstractStringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@133['AbstractStringBuilder'] {
     arguments = ArrayList@134[empty]
-    classifier = JavaClassImpl@121['AbstractStringBuilder']
+    classifier = JavaClassImpl@94['AbstractStringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@135['AbstractStringBuilder'] {
     arguments = ArrayList@136[empty]
-    classifier = JavaClassImpl@100['AbstractStringBuilder']
+    classifier = JavaClassImpl@118['AbstractStringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@137['AbstractStringBuilder'] {
     arguments = ArrayList@138[empty]
-    classifier = JavaClassImpl@103['AbstractStringBuilder']
+    classifier = JavaClassImpl@115['AbstractStringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@139['AbstractStringBuilder'] {
     arguments = ArrayList@140[empty]
-    classifier = JavaClassImpl@94['AbstractStringBuilder']
+    classifier = JavaClassImpl@121['AbstractStringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@141['AbstractStringBuilder'] {
     arguments = ArrayList@142[empty]
-    classifier = JavaClassImpl@112['AbstractStringBuilder']
+    classifier = JavaClassImpl@106['AbstractStringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@143['AbstractStringBuilder'] {
     arguments = ArrayList@144[empty]
-    classifier = JavaClassImpl@97['AbstractStringBuilder']
+    classifier = JavaClassImpl@109['AbstractStringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@145['AbstractStringBuilder'] {
     arguments = ArrayList@146[empty]
-    classifier = JavaClassImpl@115['AbstractStringBuilder']
+    classifier = JavaClassImpl@100['AbstractStringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@147['AbstractStringBuilder'] {
     arguments = ArrayList@148[empty]
-    classifier = JavaClassImpl@91['AbstractStringBuilder']
+    classifier = JavaClassImpl@88['AbstractStringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
@@ -299,14 +299,14 @@ LazyJavaClassifierType@159['Appendable'] {
 
 LazyJavaClassifierType@162['Appendable'] {
     arguments = ArrayList@163[empty]
-    classifier = JavaClassImpl@161['Appendable']
+    classifier = JavaClassImpl@158['Appendable']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@30['Appendable']
 }
 
 LazyJavaClassifierType@164['Appendable'] {
     arguments = ArrayList@165[empty]
-    classifier = JavaClassImpl@158['Appendable']
+    classifier = JavaClassImpl@161['Appendable']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@30['Appendable']
 }
@@ -383,7 +383,7 @@ LazyJavaClassifierType@192['CharSequence'] {
 
 LazyJavaClassifierType@195['CharSequence'] {
     arguments = ArrayList@196[empty]
-    classifier = JavaClassImpl@182['CharSequence']
+    classifier = JavaClassImpl@176['CharSequence']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@171
 }
@@ -404,14 +404,14 @@ LazyJavaClassifierType@199['CharSequence'] {
 
 LazyJavaClassifierType@201['CharSequence'] {
     arguments = ArrayList@202[empty]
-    classifier = JavaClassImpl@185['CharSequence']
+    classifier = JavaClassImpl@188['CharSequence']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@171
 }
 
 LazyJavaClassifierType@203['CharSequence'] {
     arguments = ArrayList@204[empty]
-    classifier = JavaClassImpl@176['CharSequence']
+    classifier = JavaClassImpl@182['CharSequence']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@171
 }
@@ -425,7 +425,7 @@ LazyJavaClassifierType@205['CharSequence'] {
 
 LazyJavaClassifierType@207['CharSequence'] {
     arguments = ArrayList@208[empty]
-    classifier = JavaClassImpl@188['CharSequence']
+    classifier = JavaClassImpl@185['CharSequence']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@171
 }
@@ -451,14 +451,14 @@ LazyJavaClassifierType@214['Object'] {
 
 LazyJavaClassifierType@217['Object'] {
     arguments = ArrayList@218[empty]
-    classifier = JavaClassImpl@216['Object']
+    classifier = JavaClassImpl@212['Object']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@213
 }
 
 LazyJavaClassifierType@219['Object'] {
     arguments = ArrayList@220[empty]
-    classifier = JavaClassImpl@212['Object']
+    classifier = JavaClassImpl@216['Object']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@213
 }
@@ -527,14 +527,14 @@ LazyJavaClassifierType@243['String'] {
 
 LazyJavaClassifierType@246['String'] {
     arguments = ArrayList@247[empty]
-    classifier = JavaClassImpl@242['String']
+    classifier = JavaClassImpl@232['String']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@233
 }
 
 LazyJavaClassifierType@248['String'] {
     arguments = ArrayList@249[empty]
-    classifier = JavaClassImpl@236['String']
+    classifier = JavaClassImpl@239['String']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@233
 }
@@ -548,14 +548,14 @@ LazyJavaClassifierType@250['String'] {
 
 LazyJavaClassifierType@252['String'] {
     arguments = ArrayList@253[empty]
-    classifier = JavaClassImpl@239['String']
+    classifier = JavaClassImpl@242['String']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@233
 }
 
 LazyJavaClassifierType@254['String'] {
     arguments = ArrayList@255[empty]
-    classifier = JavaClassImpl@232['String']
+    classifier = JavaClassImpl@236['String']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@233
 }
@@ -576,14 +576,14 @@ LazyJavaClassifierType@259['StringBuffer'] {
 
 LazyJavaClassifierType@262['StringBuffer'] {
     arguments = ArrayList@263[empty]
-    classifier = JavaClassImpl@261['StringBuffer']
+    classifier = JavaClassImpl@258['StringBuffer']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@40['StringBuffer']
 }
 
 LazyJavaClassifierType@264['StringBuffer'] {
     arguments = ArrayList@265[empty]
-    classifier = JavaClassImpl@258['StringBuffer']
+    classifier = JavaClassImpl@261['StringBuffer']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@40['StringBuffer']
 }
@@ -695,28 +695,28 @@ LazyJavaClassifierType@308['StringBuilder'] {
 
 LazyJavaClassifierType@311['StringBuilder'] {
     arguments = ArrayList@312[empty]
-    classifier = JavaClassImpl@274['StringBuilder']
+    classifier = JavaClassImpl@283['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@313['StringBuilder'] {
     arguments = ArrayList@314[empty]
-    classifier = JavaClassImpl@283['StringBuilder']
+    classifier = JavaClassImpl@274['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@315['StringBuilder'] {
     arguments = ArrayList@316[empty]
-    classifier = JavaClassImpl@304['StringBuilder']
+    classifier = JavaClassImpl@286['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@317['StringBuilder'] {
     arguments = ArrayList@318[empty]
-    classifier = JavaClassImpl@286['StringBuilder']
+    classifier = JavaClassImpl@304['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
@@ -730,70 +730,70 @@ LazyJavaClassifierType@319['StringBuilder'] {
 
 LazyJavaClassifierType@321['StringBuilder'] {
     arguments = ArrayList@322[empty]
-    classifier = JavaClassImpl@298['StringBuilder']
+    classifier = JavaClassImpl@295['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@323['StringBuilder'] {
     arguments = ArrayList@324[empty]
-    classifier = JavaClassImpl@271['StringBuilder']
+    classifier = JavaClassImpl@268['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@325['StringBuilder'] {
     arguments = ArrayList@326[empty]
-    classifier = JavaClassImpl@307['StringBuilder']
+    classifier = JavaClassImpl@298['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@327['StringBuilder'] {
     arguments = ArrayList@328[empty]
-    classifier = JavaClassImpl@295['StringBuilder']
+    classifier = JavaClassImpl@280['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@329['StringBuilder'] {
     arguments = ArrayList@330[empty]
-    classifier = JavaClassImpl@280['StringBuilder']
+    classifier = JavaClassImpl@292['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@331['StringBuilder'] {
     arguments = ArrayList@332[empty]
-    classifier = JavaClassImpl@268['StringBuilder']
+    classifier = JavaClassImpl@289['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@333['StringBuilder'] {
     arguments = ArrayList@334[empty]
-    classifier = JavaClassImpl@310['StringBuilder']
+    classifier = JavaClassImpl@307['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@335['StringBuilder'] {
     arguments = ArrayList@336[empty]
-    classifier = JavaClassImpl@292['StringBuilder']
+    classifier = JavaClassImpl@271['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@337['StringBuilder'] {
     arguments = ArrayList@338[empty]
-    classifier = JavaClassImpl@277['StringBuilder']
+    classifier = JavaClassImpl@310['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@339['StringBuilder'] {
     arguments = ArrayList@340[empty]
-    classifier = JavaClassImpl@289['StringBuilder']
+    classifier = JavaClassImpl@277['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
@@ -821,7 +821,7 @@ LazyJavaPackageFragmentProvider@341 {
     topLevelClasses(JavaClassImpl@81['AbstractStringBuilder']) = LazyJavaClassDescriptor@3['AbstractStringBuilder']
     topLevelClasses(JavaClassImpl@152['Appendable']) = LazyJavaClassDescriptor@17['Appendable']
     topLevelClasses(JavaClassImpl@228['Serializable']) = LazyJavaClassDescriptor@31['Serializable']
-    topLevelClasses(JavaClassImpl@261['StringBuffer']) = LazyJavaClassDescriptor@39['StringBuffer']
+    topLevelClasses(JavaClassImpl@258['StringBuffer']) = LazyJavaClassDescriptor@39['StringBuffer']
     topLevelClasses(JavaClassImpl@365['StringBuilder']) = LazyJavaClassDescriptor@41['StringBuilder']
 }
 
@@ -855,114 +855,81 @@ LazyJavaPackageFragment@352['lang'] {
 
 ResolutionTaskHolder@381 {
     <name not found> = ArrayList@382[13] { ResolutionCandidate@383, ResolutionCandidate@384, ResolutionCandidate@385, ... }
-    <name not found> = ArrayList@386[14] { ResolutionCandidate@383, ResolutionCandidate@384, ResolutionCandidate@387, ... }
 }
 
-ResolutionTaskHolder@388 {
-    <name not found> = ArrayList@389[1] { ResolutionCandidate@390 }
-    <name not found> = ArrayList@391[1] { ResolutionCandidate@390 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@386 {
+    <name not found> = ArrayList@387[1] { ResolutionCandidate@388 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
+}
+
+ResolutionTaskHolder@389 {
+    <name not found> = ArrayList@390[1] { ResolutionCandidate@391 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
 ResolutionTaskHolder@392 {
     <name not found> = ArrayList@393[1] { ResolutionCandidate@394 }
-    <name not found> = ArrayList@395[1] { ResolutionCandidate@394 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@396 {
-    <name not found> = ArrayList@397[1] { ResolutionCandidate@398 }
-    <name not found> = ArrayList@399[1] { ResolutionCandidate@398 }
+ResolutionTaskHolder@395 {
+    <name not found> = ArrayList@396[1] { ResolutionCandidate@397 }
 }
 
-ResolutionTaskHolder@400 {
-    <name not found> = ArrayList@401[1] { ResolutionCandidate@402 }
-    <name not found> = ArrayList@403[1] { ResolutionCandidate@402 }
+ResolutionTaskHolder@398 {
+    <name not found> = ArrayList@399[1] { ResolutionCandidate@400 }
+}
+
+ResolutionTaskHolder@401 {
+    <name not found> = ArrayList@402[1] { ResolutionCandidate@403 }
 }
 
 ResolutionTaskHolder@404 {
     <name not found> = ArrayList@405[1] { ResolutionCandidate@406 }
-    <name not found> = ArrayList@407[1] { ResolutionCandidate@406 }
 }
 
-ResolutionTaskHolder@408 {
-    <name not found> = ArrayList@409[1] { ResolutionCandidate@410 }
-    <name not found> = ArrayList@411[1] { ResolutionCandidate@410 }
+ResolutionTaskHolder@407 {
+    <name not found> = ArrayList@408[1] { ResolutionCandidate@409 }
 }
 
-ResolutionTaskHolder@412 {
-    <name not found> = ArrayList@413[1] { ResolutionCandidate@414 }
-    <name not found> = ArrayList@415[1] { ResolutionCandidate@414 }
+ResolutionTaskHolder@410 {
+    <name not found> = ArrayList@411[1] { ResolutionCandidate@412 }
+}
+
+ResolutionTaskHolder@413 {
+    <name not found> = ArrayList@414[1] { ResolutionCandidate@415 }
 }
 
 ResolutionTaskHolder@416 {
     <name not found> = ArrayList@417[1] { ResolutionCandidate@418 }
-    <name not found> = ArrayList@419[1] { ResolutionCandidate@418 }
 }
 
-ResolutionTaskHolder@420 {
-    <name not found> = ArrayList@421[1] { ResolutionCandidate@422 }
-    <name not found> = ArrayList@423[1] { ResolutionCandidate@422 }
+ResolutionTaskHolder@419 {
+    <name not found> = ArrayList@420[1] { ResolutionCandidate@421 }
 }
 
-ResolutionTaskHolder@424 {
-    <name not found> = ArrayList@425[1] { ResolutionCandidate@426 }
-    <name not found> = ArrayList@427[1] { ResolutionCandidate@426 }
+ResolutionTaskHolder@422 {
+    <name not found> = ArrayList@423[1] { ResolutionCandidate@424 }
+}
+
+ResolutionTaskHolder@425 {
+    <name not found> = ArrayList@426[1] { ResolutionCandidate@427 }
 }
 
 ResolutionTaskHolder@428 {
     <name not found> = ArrayList@429[1] { ResolutionCandidate@430 }
-    <name not found> = ArrayList@431[1] { ResolutionCandidate@430 }
 }
 
-ResolutionTaskHolder@432 {
-    <name not found> = ArrayList@433[1] { ResolutionCandidate@434 }
-    <name not found> = ArrayList@435[1] { ResolutionCandidate@434 }
+ResolutionTaskHolder@431 {
+    <name not found> = ArrayList@432[1] { ResolutionCandidate@433 }
 }
 
-ResolutionTaskHolder@436 {
-    <name not found> = ArrayList@437[1] { ResolutionCandidate@438 }
-    <name not found> = ArrayList@439[1] { ResolutionCandidate@438 }
-}
-
-ResolutionTaskHolder@440 {
-    <name not found> = ArrayList@441[1] { ResolutionCandidate@442 }
-    <name not found> = ArrayList@443[1] { ResolutionCandidate@442 }
-}
-
-ResolutionTaskHolder@444 {
-    <name not found> = ArrayList@445[1] { ResolutionCandidate@446 }
-    <name not found> = ArrayList@447[1] { ResolutionCandidate@446 }
-}
-
-ResolutionTaskHolder@448 {
-    <name not found> = ArrayList@449[1] { ResolutionCandidate@450 }
-    <name not found> = ArrayList@451[1] { ResolutionCandidate@450 }
-}
-
-ResolutionTaskHolder@452 {
-    <name not found> = ArrayList@453[4] { ResolutionCandidate@454, ResolutionCandidate@455, ResolutionCandidate@456, ... }
-    <name not found> = ArrayList@457[4] { ResolutionCandidate@454, ResolutionCandidate@455, ResolutionCandidate@456, ... }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@434 {
+    <name not found> = ArrayList@435[4] { ResolutionCandidate@436, ResolutionCandidate@437, ResolutionCandidate@438, ... }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
@@ -973,7 +940,43 @@ ResolutionTaskHolder@452 {
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@458 {
-    <name not found> = ArrayList@459[8] { ResolutionCandidate@460, ResolutionCandidate@461, ResolutionCandidate@462, ... }
-    <name not found> = ArrayList@463[8] { ResolutionCandidate@460, ResolutionCandidate@461, ResolutionCandidate@462, ... }
+ResolutionTaskHolder@439 {
+    <name not found> = ArrayList@440[8] { ResolutionCandidate@441, ResolutionCandidate@442, ResolutionCandidate@443, ... }
+}
+
+null {
+    <name not found> = ArrayList@444[14] { ResolutionCandidate@383, ResolutionCandidate@384, ResolutionCandidate@445, ... }
+    <name not found> = ArrayList@446[1] { ResolutionCandidate@424 }
+    <name not found> = ArrayList@447[1] { ResolutionCandidate@415 }
+    <name not found> = ArrayList@448[1] { ResolutionCandidate@406 }
+    <name not found> = ArrayList@449[1] { ResolutionCandidate@409 }
+    <name not found> = ArrayList@450[1] { ResolutionCandidate@418 }
+    <name not found> = ArrayList@451[1] { ResolutionCandidate@427 }
+    <name not found> = ArrayList@452[1] { ResolutionCandidate@403 }
+    <name not found> = ArrayList@453[1] { ResolutionCandidate@388 }
+    <name not found> = ArrayList@454[1] { ResolutionCandidate@421 }
+    <name not found> = ArrayList@455[1] { ResolutionCandidate@391 }
+    <name not found> = ArrayList@456[1] { ResolutionCandidate@394 }
+    <name not found> = ArrayList@457[1] { ResolutionCandidate@433 }
+    <name not found> = ArrayList@458[1] { ResolutionCandidate@397 }
+    <name not found> = ArrayList@459[1] { ResolutionCandidate@400 }
+    <name not found> = ArrayList@460[1] { ResolutionCandidate@412 }
+    <name not found> = ArrayList@461[1] { ResolutionCandidate@430 }
+    <name not found> = ArrayList@462[4] { ResolutionCandidate@436, ResolutionCandidate@437, ResolutionCandidate@438, ... }
+    <name not found> = ArrayList@463[8] { ResolutionCandidate@441, ResolutionCandidate@442, ResolutionCandidate@443, ... }
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/recursiveCallInLambda.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/recursiveCallInLambda.lazy.log
index 7b9d8fb8be3..5523d1148a6 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/recursiveCallInLambda.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/recursiveCallInLambda.lazy.log
@@ -51,32 +51,35 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@37 {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+}
+
+null {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@42 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/recursiveCallInLocalFunction.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/recursiveCallInLocalFunction.lazy.log
index 8eb267341b9..f7ca2043272 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/recursiveCallInLocalFunction.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/recursiveCallInLocalFunction.lazy.log
@@ -43,23 +43,26 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@32 {
     <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
+}
+
+null {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@34 }
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/recursiveInnerFunction.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/recursiveInnerFunction.lazy.log
index 3d5ed9af623..f6686573531 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/recursiveInnerFunction.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/recursiveInnerFunction.lazy.log
@@ -51,44 +51,47 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@37 {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+}
+
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
 }
 
 ResolutionTaskHolder@49 {
     <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[7] { ResolutionCandidate@57, ResolutionCandidate@58, ResolutionCandidate@59, ... }
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[7] { ResolutionCandidate@63, ResolutionCandidate@64, ResolutionCandidate@65, ... }
-    <name not found> = ArrayList@66[7] { ResolutionCandidate@63, ResolutionCandidate@64, ResolutionCandidate@65, ... }
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[8] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64, ... }
 }
 
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[8] { ResolutionCandidate@69, ResolutionCandidate@70, ResolutionCandidate@71, ... }
-    <name not found> = ArrayList@72[8] { ResolutionCandidate@69, ResolutionCandidate@70, ResolutionCandidate@71, ... }
+null {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@71[7] { ResolutionCandidate@57, ResolutionCandidate@58, ResolutionCandidate@59, ... }
+    <name not found> = ArrayList@72[8] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64, ... }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/returnIf.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/returnIf.lazy.log
index 618a2cc3a40..824a3eed5b2 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/returnIf.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/returnIf.lazy.log
@@ -47,116 +47,119 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@36 {
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
+}
+
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
 
 ResolutionTaskHolder@48 {
     <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+}
+
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
 }
 
 ResolutionTaskHolder@60 {
     <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
+}
+
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
 }
 
 ResolutionTaskHolder@72 {
     <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
 }
 
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
 }
 
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[7] { ResolutionCandidate@83, ResolutionCandidate@84, ResolutionCandidate@85, ... }
 }
 
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[8] { ResolutionCandidate@88, ResolutionCandidate@89, ResolutionCandidate@90, ... }
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[8] { ResolutionCandidate@93, ResolutionCandidate@94, ResolutionCandidate@95, ... }
 }
 
 ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[7] { ResolutionCandidate@98, ResolutionCandidate@99, ResolutionCandidate@100, ... }
-    <name not found> = ArrayList@101[7] { ResolutionCandidate@98, ResolutionCandidate@99, ResolutionCandidate@100, ... }
+    <name not found> = ArrayList@97[8] { ResolutionCandidate@98, ResolutionCandidate@99, ResolutionCandidate@100, ... }
 }
 
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[8] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
-    <name not found> = ArrayList@107[8] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[8] { ResolutionCandidate@103, ResolutionCandidate@104, ResolutionCandidate@105, ... }
 }
 
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[8] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
-    <name not found> = ArrayList@113[8] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[8] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
-    <name not found> = ArrayList@119[8] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[8] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
-    <name not found> = ArrayList@125[8] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
+null {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@121[7] { ResolutionCandidate@83, ResolutionCandidate@84, ResolutionCandidate@85, ... }
+    <name not found> = ArrayList@122[8] { ResolutionCandidate@88, ResolutionCandidate@89, ResolutionCandidate@90, ... }
+    <name not found> = ArrayList@123[8] { ResolutionCandidate@98, ResolutionCandidate@99, ResolutionCandidate@100, ... }
+    <name not found> = ArrayList@124[8] { ResolutionCandidate@93, ResolutionCandidate@94, ResolutionCandidate@95, ... }
+    <name not found> = ArrayList@125[8] { ResolutionCandidate@103, ResolutionCandidate@104, ResolutionCandidate@105, ... }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/returnInCatch.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/returnInCatch.lazy.log
index 21d505b2887..7f4bfcc2805 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/returnInCatch.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/returnInCatch.lazy.log
@@ -38,14 +38,14 @@ LazyJavaClassifierType@22['String'] {
 
 LazyJavaClassifierType@25['String'] {
     arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@24['String']
+    classifier = JavaClassImpl@16['String']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@18
 }
 
 LazyJavaClassifierType@28['String'] {
     arguments = ArrayList@29[empty]
-    classifier = JavaClassImpl@16['String']
+    classifier = JavaClassImpl@24['String']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@18
 }
@@ -80,14 +80,14 @@ LazyJavaClassifierType@39['Throwable'] {
 
 LazyJavaClassifierType@42['Throwable'] {
     arguments = ArrayList@43[empty]
-    classifier = JavaClassImpl@34['Throwable']
+    classifier = JavaClassImpl@38['Throwable']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@35
 }
 
 LazyJavaClassifierType@44['Throwable'] {
     arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@38['Throwable']
+    classifier = JavaClassImpl@34['Throwable']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@35
 }
@@ -157,62 +157,65 @@ LazyJavaPackageFragment@59['lang'] {
 
 ResolutionTaskHolder@89 {
     <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
     <name not found> = EmptyList@81[empty]
     <name not found> = EmptyList@81[empty]
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
     <name not found> = EmptyList@81[empty]
     <name not found> = EmptyList@81[empty]
 }
 
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
+}
+
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
 }
 
 ResolutionTaskHolder@101 {
     <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
 }
 
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
 }
 
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
+}
+
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
 }
 
 ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[4] { ResolutionCandidate@123, ResolutionCandidate@124, ResolutionCandidate@125, ... }
-    <name not found> = ArrayList@126[5] { ResolutionCandidate@123, ResolutionCandidate@124, ResolutionCandidate@125, ... }
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
+    <name not found> = ArrayList@114[4] { ResolutionCandidate@115, ResolutionCandidate@116, ResolutionCandidate@117, ... }
     <name not found> = EmptyList@81[empty]
     <name not found> = EmptyList@81[empty]
 }
 
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[8] { ResolutionCandidate@129, ResolutionCandidate@130, ResolutionCandidate@131, ... }
-    <name not found> = ArrayList@132[8] { ResolutionCandidate@129, ResolutionCandidate@130, ResolutionCandidate@131, ... }
+ResolutionTaskHolder@118 {
+    <name not found> = ArrayList@119[8] { ResolutionCandidate@120, ResolutionCandidate@121, ResolutionCandidate@122, ... }
+}
+
+null {
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@131[5] { ResolutionCandidate@115, ResolutionCandidate@116, ResolutionCandidate@117, ... }
+    <name not found> = ArrayList@132[8] { ResolutionCandidate@120, ResolutionCandidate@121, ResolutionCandidate@122, ... }
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/returnInFinally.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/returnInFinally.lazy.log
index 73733e30dec..bc67d0d09e3 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/returnInFinally.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/returnInFinally.lazy.log
@@ -47,53 +47,56 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@36 {
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
+}
+
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
 }
 
 ResolutionTaskHolder@48 {
     <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+}
+
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
 }
 
 ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@61[8] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64, ... }
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[8] { ResolutionCandidate@70, ResolutionCandidate@71, ResolutionCandidate@72, ... }
-    <name not found> = ArrayList@73[8] { ResolutionCandidate@70, ResolutionCandidate@71, ResolutionCandidate@72, ... }
+null {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@73[8] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64, ... }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/returnInIfInFinally.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/returnInIfInFinally.lazy.log
index 06fece897a3..04faeb9572b 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/returnInIfInFinally.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/returnInIfInFinally.lazy.log
@@ -47,68 +47,71 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@36 {
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
+}
+
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
 }
 
 ResolutionTaskHolder@48 {
     <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+}
+
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
 }
 
 ResolutionTaskHolder@60 {
     <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[7] { ResolutionCandidate@65, ResolutionCandidate@66, ResolutionCandidate@67, ... }
 }
 
 ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@69[8] { ResolutionCandidate@70, ResolutionCandidate@71, ResolutionCandidate@72, ... }
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[7] { ResolutionCandidate@74, ResolutionCandidate@75, ResolutionCandidate@76, ... }
-    <name not found> = ArrayList@77[7] { ResolutionCandidate@74, ResolutionCandidate@75, ResolutionCandidate@76, ... }
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[8] { ResolutionCandidate@75, ResolutionCandidate@76, ResolutionCandidate@77, ... }
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[8] { ResolutionCandidate@80, ResolutionCandidate@81, ResolutionCandidate@82, ... }
-    <name not found> = ArrayList@83[8] { ResolutionCandidate@80, ResolutionCandidate@81, ResolutionCandidate@82, ... }
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[8] { ResolutionCandidate@86, ResolutionCandidate@87, ResolutionCandidate@88, ... }
-    <name not found> = ArrayList@89[8] { ResolutionCandidate@86, ResolutionCandidate@87, ResolutionCandidate@88, ... }
+null {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@87[7] { ResolutionCandidate@65, ResolutionCandidate@66, ResolutionCandidate@67, ... }
+    <name not found> = ArrayList@88[8] { ResolutionCandidate@70, ResolutionCandidate@71, ResolutionCandidate@72, ... }
+    <name not found> = ArrayList@89[8] { ResolutionCandidate@75, ResolutionCandidate@76, ResolutionCandidate@77, ... }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/returnInParentheses.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/returnInParentheses.lazy.log
index 1f2bf4f295d..15ff9aecfbe 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/returnInParentheses.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/returnInParentheses.lazy.log
@@ -47,43 +47,46 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@36 {
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
+}
+
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
 }
 
 ResolutionTaskHolder@48 {
     <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[8] { ResolutionCandidate@56, ResolutionCandidate@57, ResolutionCandidate@58, ... }
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[8] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64, ... }
-    <name not found> = ArrayList@65[8] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64, ... }
+null {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@65[8] { ResolutionCandidate@56, ResolutionCandidate@57, ResolutionCandidate@58, ... }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/returnInTry.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/returnInTry.lazy.log
index 795ce8974e9..48e633749e9 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/returnInTry.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/returnInTry.lazy.log
@@ -51,58 +51,61 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
 }
 
 ResolutionTaskHolder@52 {
     <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
+}
+
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
 }
 
 ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@65[8] { ResolutionCandidate@66, ResolutionCandidate@67, ResolutionCandidate@68, ... }
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[8] { ResolutionCandidate@71, ResolutionCandidate@72, ResolutionCandidate@73, ... }
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[8] { ResolutionCandidate@74, ResolutionCandidate@75, ResolutionCandidate@76, ... }
-    <name not found> = ArrayList@77[8] { ResolutionCandidate@74, ResolutionCandidate@75, ResolutionCandidate@76, ... }
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[8] { ResolutionCandidate@80, ResolutionCandidate@81, ResolutionCandidate@82, ... }
-    <name not found> = ArrayList@83[8] { ResolutionCandidate@80, ResolutionCandidate@81, ResolutionCandidate@82, ... }
+null {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@82[8] { ResolutionCandidate@66, ResolutionCandidate@67, ResolutionCandidate@68, ... }
+    <name not found> = ArrayList@83[8] { ResolutionCandidate@71, ResolutionCandidate@72, ResolutionCandidate@73, ... }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/simpleBlock.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/simpleBlock.lazy.log
index 618a2cc3a40..dd6ecac5ef8 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/simpleBlock.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/simpleBlock.lazy.log
@@ -47,116 +47,119 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@36 {
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
+}
+
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
 
 ResolutionTaskHolder@48 {
     <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+}
+
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
 }
 
 ResolutionTaskHolder@60 {
     <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
+}
+
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
 }
 
 ResolutionTaskHolder@72 {
     <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
 }
 
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
 }
 
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[7] { ResolutionCandidate@83, ResolutionCandidate@84, ResolutionCandidate@85, ... }
 }
 
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[8] { ResolutionCandidate@88, ResolutionCandidate@89, ResolutionCandidate@90, ... }
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[8] { ResolutionCandidate@93, ResolutionCandidate@94, ResolutionCandidate@95, ... }
 }
 
 ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[7] { ResolutionCandidate@98, ResolutionCandidate@99, ResolutionCandidate@100, ... }
-    <name not found> = ArrayList@101[7] { ResolutionCandidate@98, ResolutionCandidate@99, ResolutionCandidate@100, ... }
+    <name not found> = ArrayList@97[8] { ResolutionCandidate@98, ResolutionCandidate@99, ResolutionCandidate@100, ... }
 }
 
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[8] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
-    <name not found> = ArrayList@107[8] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[8] { ResolutionCandidate@103, ResolutionCandidate@104, ResolutionCandidate@105, ... }
 }
 
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[8] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
-    <name not found> = ArrayList@113[8] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[8] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
-    <name not found> = ArrayList@119[8] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[8] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
-    <name not found> = ArrayList@125[8] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
+null {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@121[7] { ResolutionCandidate@83, ResolutionCandidate@84, ResolutionCandidate@85, ... }
+    <name not found> = ArrayList@122[8] { ResolutionCandidate@88, ResolutionCandidate@89, ResolutionCandidate@90, ... }
+    <name not found> = ArrayList@123[8] { ResolutionCandidate@98, ResolutionCandidate@99, ResolutionCandidate@100, ... }
+    <name not found> = ArrayList@124[8] { ResolutionCandidate@103, ResolutionCandidate@104, ResolutionCandidate@105, ... }
+    <name not found> = ArrayList@125[8] { ResolutionCandidate@93, ResolutionCandidate@94, ResolutionCandidate@95, ... }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/simpleReturn.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/simpleReturn.lazy.log
index 3ee3286a4a4..c19a4361bd4 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/simpleReturn.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/simpleReturn.lazy.log
@@ -47,87 +47,90 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@36 {
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
 
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+}
+
 ResolutionTaskHolder@48 {
     <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+}
+
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
 }
 
 ResolutionTaskHolder@60 {
     <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[7] { ResolutionCandidate@71, ResolutionCandidate@72, ResolutionCandidate@73, ... }
 }
 
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[8] { ResolutionCandidate@76, ResolutionCandidate@77, ResolutionCandidate@78, ... }
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[7] { ResolutionCandidate@82, ResolutionCandidate@83, ResolutionCandidate@84, ... }
-    <name not found> = ArrayList@85[7] { ResolutionCandidate@82, ResolutionCandidate@83, ResolutionCandidate@84, ... }
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[8] { ResolutionCandidate@81, ResolutionCandidate@82, ResolutionCandidate@83, ... }
 }
 
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[8] { ResolutionCandidate@88, ResolutionCandidate@89, ResolutionCandidate@90, ... }
-    <name not found> = ArrayList@91[8] { ResolutionCandidate@88, ResolutionCandidate@89, ResolutionCandidate@90, ... }
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[8] { ResolutionCandidate@86, ResolutionCandidate@87, ResolutionCandidate@88, ... }
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[8] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
-    <name not found> = ArrayList@97[8] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[8] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102, ... }
-    <name not found> = ArrayList@103[8] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102, ... }
+null {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@100[7] { ResolutionCandidate@71, ResolutionCandidate@72, ResolutionCandidate@73, ... }
+    <name not found> = ArrayList@101[8] { ResolutionCandidate@86, ResolutionCandidate@87, ResolutionCandidate@88, ... }
+    <name not found> = ArrayList@102[8] { ResolutionCandidate@76, ResolutionCandidate@77, ResolutionCandidate@78, ... }
+    <name not found> = ArrayList@103[8] { ResolutionCandidate@81, ResolutionCandidate@82, ResolutionCandidate@83, ... }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/simpleReturnWithElse.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/simpleReturnWithElse.lazy.log
index 8bde06b5304..7353ec4e88b 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/simpleReturnWithElse.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/simpleReturnWithElse.lazy.log
@@ -47,106 +47,109 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@36 {
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
+}
+
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
 
 ResolutionTaskHolder@48 {
     <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+}
+
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
 }
 
 ResolutionTaskHolder@60 {
     <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
+}
+
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
 }
 
 ResolutionTaskHolder@72 {
     <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
 }
 
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
 }
 
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[8] { ResolutionCandidate@83, ResolutionCandidate@84, ResolutionCandidate@85, ... }
 }
 
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[8] { ResolutionCandidate@88, ResolutionCandidate@89, ResolutionCandidate@90, ... }
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[8] { ResolutionCandidate@93, ResolutionCandidate@94, ResolutionCandidate@95, ... }
 }
 
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[8] { ResolutionCandidate@98, ResolutionCandidate@99, ResolutionCandidate@100, ... }
-    <name not found> = ArrayList@101[8] { ResolutionCandidate@98, ResolutionCandidate@99, ResolutionCandidate@100, ... }
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[8] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
-    <name not found> = ArrayList@107[8] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[8] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
-    <name not found> = ArrayList@113[8] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
+null {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@111[8] { ResolutionCandidate@83, ResolutionCandidate@84, ResolutionCandidate@85, ... }
+    <name not found> = ArrayList@112[8] { ResolutionCandidate@88, ResolutionCandidate@89, ResolutionCandidate@90, ... }
+    <name not found> = ArrayList@113[8] { ResolutionCandidate@93, ResolutionCandidate@94, ResolutionCandidate@95, ... }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/sum.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/sum.lazy.log
index b22dfdc7e54..7ced8869eac 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/sum.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/sum.lazy.log
@@ -55,95 +55,73 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@38 {
     <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+    <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
 }
 
 ResolutionTaskHolder@49 {
     <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
+}
+
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
 }
 
 ResolutionTaskHolder@61 {
     <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
+}
+
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
 }
 
 ResolutionTaskHolder@73 {
     <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
 }
 
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
 }
 
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[8] { ResolutionCandidate@84, ResolutionCandidate@85, ResolutionCandidate@86, ... }
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[8] { ResolutionCandidate@89, ResolutionCandidate@90, ResolutionCandidate@91, ... }
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[8] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
-    <name not found> = ArrayList@102[8] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[8] { ResolutionCandidate@105, ResolutionCandidate@106, ResolutionCandidate@107, ... }
-    <name not found> = ArrayList@108[8] { ResolutionCandidate@105, ResolutionCandidate@106, ResolutionCandidate@107, ... }
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@92 {
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -153,3 +131,28 @@ ResolutionTaskHolder@109 {
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
+
+null {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@108[8] { ResolutionCandidate@89, ResolutionCandidate@90, ResolutionCandidate@91, ... }
+    <name not found> = ArrayList@109[8] { ResolutionCandidate@84, ResolutionCandidate@85, ResolutionCandidate@86, ... }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+}
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/tailCallInBlockInParentheses.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/tailCallInBlockInParentheses.lazy.log
index 9d065af37a2..fe03c9f6c23 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/tailCallInBlockInParentheses.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/tailCallInBlockInParentheses.lazy.log
@@ -48,55 +48,58 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@37 {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@29[empty]
 }
 
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+}
+
 ResolutionTaskHolder@49 {
     <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[7] { ResolutionCandidate@60, ResolutionCandidate@61, ResolutionCandidate@62, ... }
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[7] { ResolutionCandidate@67, ResolutionCandidate@68, ResolutionCandidate@69, ... }
-    <name not found> = ArrayList@70[7] { ResolutionCandidate@67, ResolutionCandidate@68, ResolutionCandidate@69, ... }
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[8] { ResolutionCandidate@65, ResolutionCandidate@66, ResolutionCandidate@67, ... }
 }
 
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[8] { ResolutionCandidate@73, ResolutionCandidate@74, ResolutionCandidate@75, ... }
-    <name not found> = ArrayList@76[8] { ResolutionCandidate@73, ResolutionCandidate@74, ResolutionCandidate@75, ... }
+null {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@75[7] { ResolutionCandidate@60, ResolutionCandidate@61, ResolutionCandidate@62, ... }
+    <name not found> = ArrayList@76[8] { ResolutionCandidate@65, ResolutionCandidate@66, ResolutionCandidate@67, ... }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/tailCallInParentheses.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/tailCallInParentheses.lazy.log
index 1f2bf4f295d..0c8330264e6 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/tailCallInParentheses.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/tailCallInParentheses.lazy.log
@@ -47,43 +47,46 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@36 {
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
+}
+
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
 }
 
 ResolutionTaskHolder@48 {
     <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[8] { ResolutionCandidate@56, ResolutionCandidate@57, ResolutionCandidate@58, ... }
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[8] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64, ... }
-    <name not found> = ArrayList@65[8] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64, ... }
+null {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@65[8] { ResolutionCandidate@56, ResolutionCandidate@57, ResolutionCandidate@58, ... }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/tailRecursionInFinally.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/tailRecursionInFinally.lazy.log
index d67b7e222c7..dd153a61b2a 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/tailRecursionInFinally.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/tailRecursionInFinally.lazy.log
@@ -72,51 +72,54 @@ LazyJavaPackageFragment@21['lang'] {
 
 ResolutionTaskHolder@53 {
     <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
     <name not found> = EmptyList@45[empty]
     <name not found> = EmptyList@45[empty]
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
     <name not found> = EmptyList@45[empty]
     <name not found> = EmptyList@45[empty]
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
     <name not found> = EmptyList@45[empty]
     <name not found> = EmptyList@45[empty]
+}
+
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
     <name not found> = EmptyList@45[empty]
     <name not found> = EmptyList@45[empty]
 }
 
 ResolutionTaskHolder@65 {
     <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
+null {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@58 }
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/thisReferences.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/thisReferences.lazy.log
index cb97da3c136..fea1aedf608 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/thisReferences.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/thisReferences.lazy.log
@@ -64,112 +64,115 @@ LazyJavaPackageFragment@18['lang'] {
 
 ResolutionTaskHolder@46 {
     <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
+}
+
 ResolutionTaskHolder@58 {
     <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
+}
+
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
 }
 
 ResolutionTaskHolder@70 {
     <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
+}
+
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
 }
 
 ResolutionTaskHolder@82 {
     <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
 }
 
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
+}
+
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
 }
 
 ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@95[7] { ResolutionCandidate@96, ResolutionCandidate@97, ResolutionCandidate@98, ... }
 }
 
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[7] { ResolutionCandidate@101, ResolutionCandidate@102, ResolutionCandidate@103, ... }
 }
 
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[8] { ResolutionCandidate@106, ResolutionCandidate@107, ResolutionCandidate@108, ... }
 }
 
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[8] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113, ... }
 }
 
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[7] { ResolutionCandidate@112, ResolutionCandidate@113, ResolutionCandidate@114, ... }
-    <name not found> = ArrayList@115[7] { ResolutionCandidate@112, ResolutionCandidate@113, ResolutionCandidate@114, ... }
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[7] { ResolutionCandidate@118, ResolutionCandidate@119, ResolutionCandidate@120, ... }
-    <name not found> = ArrayList@121[7] { ResolutionCandidate@118, ResolutionCandidate@119, ResolutionCandidate@120, ... }
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[8] { ResolutionCandidate@124, ResolutionCandidate@125, ResolutionCandidate@126, ... }
-    <name not found> = ArrayList@127[8] { ResolutionCandidate@124, ResolutionCandidate@125, ResolutionCandidate@126, ... }
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[8] { ResolutionCandidate@130, ResolutionCandidate@131, ResolutionCandidate@132, ... }
-    <name not found> = ArrayList@133[8] { ResolutionCandidate@130, ResolutionCandidate@131, ResolutionCandidate@132, ... }
+null {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@130[7] { ResolutionCandidate@96, ResolutionCandidate@97, ResolutionCandidate@98, ... }
+    <name not found> = ArrayList@131[7] { ResolutionCandidate@101, ResolutionCandidate@102, ResolutionCandidate@103, ... }
+    <name not found> = ArrayList@132[8] { ResolutionCandidate@106, ResolutionCandidate@107, ResolutionCandidate@108, ... }
+    <name not found> = ArrayList@133[8] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113, ... }
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/unitBlocks.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/unitBlocks.lazy.log
index 41c5d2b2d58..9f01e5d5179 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/unitBlocks.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/unitBlocks.lazy.log
@@ -51,174 +51,177 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
 ResolutionTaskHolder@52 {
     <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
+}
+
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
 }
 
 ResolutionTaskHolder@64 {
     <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
+}
+
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
 }
 
 ResolutionTaskHolder@76 {
     <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
 }
 
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
+}
+
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
 }
 
 ResolutionTaskHolder@88 {
     <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
 }
 
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
+}
+
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
 }
 
 ResolutionTaskHolder@100 {
     <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
 }
 
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
+}
+
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
 }
 
 ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@113[7] { ResolutionCandidate@114, ResolutionCandidate@115, ResolutionCandidate@116, ... }
 }
 
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[8] { ResolutionCandidate@119, ResolutionCandidate@120, ResolutionCandidate@121, ... }
 }
 
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
+ResolutionTaskHolder@122 {
+    <name not found> = ArrayList@123[8] { ResolutionCandidate@124, ResolutionCandidate@125, ResolutionCandidate@126, ... }
 }
 
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@126 }
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
+ResolutionTaskHolder@127 {
+    <name not found> = ArrayList@128[8] { ResolutionCandidate@129, ResolutionCandidate@130, ResolutionCandidate@131, ... }
 }
 
 ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
+    <name not found> = ArrayList@133[8] { ResolutionCandidate@134, ResolutionCandidate@135, ResolutionCandidate@136, ... }
 }
 
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[7] { ResolutionCandidate@138, ResolutionCandidate@139, ResolutionCandidate@140, ... }
-    <name not found> = ArrayList@141[7] { ResolutionCandidate@138, ResolutionCandidate@139, ResolutionCandidate@140, ... }
+ResolutionTaskHolder@137 {
+    <name not found> = ArrayList@138[8] { ResolutionCandidate@139, ResolutionCandidate@140, ResolutionCandidate@141, ... }
 }
 
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[8] { ResolutionCandidate@144, ResolutionCandidate@145, ResolutionCandidate@146, ... }
-    <name not found> = ArrayList@147[8] { ResolutionCandidate@144, ResolutionCandidate@145, ResolutionCandidate@146, ... }
-}
-
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[8] { ResolutionCandidate@150, ResolutionCandidate@151, ResolutionCandidate@152, ... }
-    <name not found> = ArrayList@153[8] { ResolutionCandidate@150, ResolutionCandidate@151, ResolutionCandidate@152, ... }
-}
-
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[8] { ResolutionCandidate@156, ResolutionCandidate@157, ResolutionCandidate@158, ... }
-    <name not found> = ArrayList@159[8] { ResolutionCandidate@156, ResolutionCandidate@157, ResolutionCandidate@158, ... }
-}
-
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[8] { ResolutionCandidate@162, ResolutionCandidate@163, ResolutionCandidate@164, ... }
-    <name not found> = ArrayList@165[8] { ResolutionCandidate@162, ResolutionCandidate@163, ResolutionCandidate@164, ... }
-}
-
-ResolutionTaskHolder@166 {
-    <name not found> = ArrayList@167[8] { ResolutionCandidate@168, ResolutionCandidate@169, ResolutionCandidate@170, ... }
-    <name not found> = ArrayList@171[8] { ResolutionCandidate@168, ResolutionCandidate@169, ResolutionCandidate@170, ... }
+null {
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@166[7] { ResolutionCandidate@114, ResolutionCandidate@115, ResolutionCandidate@116, ... }
+    <name not found> = ArrayList@167[8] { ResolutionCandidate@119, ResolutionCandidate@120, ResolutionCandidate@121, ... }
+    <name not found> = ArrayList@168[8] { ResolutionCandidate@139, ResolutionCandidate@140, ResolutionCandidate@141, ... }
+    <name not found> = ArrayList@169[8] { ResolutionCandidate@129, ResolutionCandidate@130, ResolutionCandidate@131, ... }
+    <name not found> = ArrayList@170[8] { ResolutionCandidate@134, ResolutionCandidate@135, ResolutionCandidate@136, ... }
+    <name not found> = ArrayList@171[8] { ResolutionCandidate@124, ResolutionCandidate@125, ResolutionCandidate@126, ... }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/whenWithCondition.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/whenWithCondition.lazy.log
index b718253cf43..15b32b2b26a 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/whenWithCondition.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/whenWithCondition.lazy.log
@@ -47,77 +47,80 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@36 {
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
 
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+}
+
 ResolutionTaskHolder@48 {
     <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+}
+
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
 }
 
 ResolutionTaskHolder@60 {
     <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[8] { ResolutionCandidate@68, ResolutionCandidate@69, ResolutionCandidate@70, ... }
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[8] { ResolutionCandidate@73, ResolutionCandidate@74, ResolutionCandidate@75, ... }
 }
 
 ResolutionTaskHolder@76 {
     <name not found> = ArrayList@77[8] { ResolutionCandidate@78, ResolutionCandidate@79, ResolutionCandidate@80, ... }
-    <name not found> = ArrayList@81[8] { ResolutionCandidate@78, ResolutionCandidate@79, ResolutionCandidate@80, ... }
 }
 
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[8] { ResolutionCandidate@84, ResolutionCandidate@85, ResolutionCandidate@86, ... }
-    <name not found> = ArrayList@87[8] { ResolutionCandidate@84, ResolutionCandidate@85, ResolutionCandidate@86, ... }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[8] { ResolutionCandidate@90, ResolutionCandidate@91, ResolutionCandidate@92, ... }
-    <name not found> = ArrayList@93[8] { ResolutionCandidate@90, ResolutionCandidate@91, ResolutionCandidate@92, ... }
+null {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@91[8] { ResolutionCandidate@73, ResolutionCandidate@74, ResolutionCandidate@75, ... }
+    <name not found> = ArrayList@92[8] { ResolutionCandidate@68, ResolutionCandidate@69, ResolutionCandidate@70, ... }
+    <name not found> = ArrayList@93[8] { ResolutionCandidate@78, ResolutionCandidate@79, ResolutionCandidate@80, ... }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/whenWithInRange.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/whenWithInRange.lazy.log
index b5709719718..f8dbeb9cb96 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/whenWithInRange.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/whenWithInRange.lazy.log
@@ -51,154 +51,157 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
 ResolutionTaskHolder@52 {
     <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
+}
+
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
 }
 
 ResolutionTaskHolder@64 {
     <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
+}
+
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
 }
 
 ResolutionTaskHolder@76 {
     <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
 }
 
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
+}
+
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
 }
 
 ResolutionTaskHolder@88 {
     <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
 }
 
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[7] { ResolutionCandidate@96, ResolutionCandidate@97, ResolutionCandidate@98, ... }
 }
 
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[7] { ResolutionCandidate@101, ResolutionCandidate@102, ResolutionCandidate@103, ... }
 }
 
 ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@105[8] { ResolutionCandidate@106, ResolutionCandidate@107, ResolutionCandidate@108, ... }
 }
 
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[8] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113, ... }
 }
 
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[7] { ResolutionCandidate@114, ResolutionCandidate@115, ResolutionCandidate@116, ... }
-    <name not found> = ArrayList@117[7] { ResolutionCandidate@114, ResolutionCandidate@115, ResolutionCandidate@116, ... }
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[8] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
 }
 
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[7] { ResolutionCandidate@120, ResolutionCandidate@121, ResolutionCandidate@122, ... }
-    <name not found> = ArrayList@123[7] { ResolutionCandidate@120, ResolutionCandidate@121, ResolutionCandidate@122, ... }
+ResolutionTaskHolder@119 {
+    <name not found> = ArrayList@120[8] { ResolutionCandidate@121, ResolutionCandidate@122, ResolutionCandidate@123, ... }
 }
 
 ResolutionTaskHolder@124 {
     <name not found> = ArrayList@125[8] { ResolutionCandidate@126, ResolutionCandidate@127, ResolutionCandidate@128, ... }
-    <name not found> = ArrayList@129[8] { ResolutionCandidate@126, ResolutionCandidate@127, ResolutionCandidate@128, ... }
 }
 
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[8] { ResolutionCandidate@132, ResolutionCandidate@133, ResolutionCandidate@134, ... }
-    <name not found> = ArrayList@135[8] { ResolutionCandidate@132, ResolutionCandidate@133, ResolutionCandidate@134, ... }
+ResolutionTaskHolder@129 {
+    <name not found> = ArrayList@130[8] { ResolutionCandidate@131, ResolutionCandidate@132, ResolutionCandidate@133, ... }
 }
 
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[8] { ResolutionCandidate@138, ResolutionCandidate@139, ResolutionCandidate@140, ... }
-    <name not found> = ArrayList@141[8] { ResolutionCandidate@138, ResolutionCandidate@139, ResolutionCandidate@140, ... }
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[8] { ResolutionCandidate@144, ResolutionCandidate@145, ResolutionCandidate@146, ... }
-    <name not found> = ArrayList@147[8] { ResolutionCandidate@144, ResolutionCandidate@145, ResolutionCandidate@146, ... }
-}
-
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[8] { ResolutionCandidate@150, ResolutionCandidate@151, ResolutionCandidate@152, ... }
-    <name not found> = ArrayList@153[8] { ResolutionCandidate@150, ResolutionCandidate@151, ResolutionCandidate@152, ... }
-}
-
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[8] { ResolutionCandidate@156, ResolutionCandidate@157, ResolutionCandidate@158, ... }
-    <name not found> = ArrayList@159[8] { ResolutionCandidate@156, ResolutionCandidate@157, ResolutionCandidate@158, ... }
+null {
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@152[7] { ResolutionCandidate@101, ResolutionCandidate@102, ResolutionCandidate@103, ... }
+    <name not found> = ArrayList@153[7] { ResolutionCandidate@96, ResolutionCandidate@97, ResolutionCandidate@98, ... }
+    <name not found> = ArrayList@154[8] { ResolutionCandidate@131, ResolutionCandidate@132, ResolutionCandidate@133, ... }
+    <name not found> = ArrayList@155[8] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113, ... }
+    <name not found> = ArrayList@156[8] { ResolutionCandidate@121, ResolutionCandidate@122, ResolutionCandidate@123, ... }
+    <name not found> = ArrayList@157[8] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
+    <name not found> = ArrayList@158[8] { ResolutionCandidate@126, ResolutionCandidate@127, ResolutionCandidate@128, ... }
+    <name not found> = ArrayList@159[8] { ResolutionCandidate@106, ResolutionCandidate@107, ResolutionCandidate@108, ... }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/whenWithIs.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/whenWithIs.lazy.log
index eb7281fbd91..5bb94fde9b4 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/whenWithIs.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/whenWithIs.lazy.log
@@ -61,14 +61,14 @@ LazyJavaClassifierType@33['String'] {
 
 LazyJavaClassifierType@36['String'] {
     arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@30['String']
+    classifier = JavaClassImpl@35['String']
     nullable = 'true': Boolean@38
     typeConstructor = DeserializedClassTypeConstructor@32
 }
 
 LazyJavaClassifierType@39['String'] {
     arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@35['String']
+    classifier = JavaClassImpl@30['String']
     nullable = 'true': Boolean@38
     typeConstructor = DeserializedClassTypeConstructor@32
 }
@@ -89,14 +89,14 @@ LazyJavaClassifierType@45['Throwable'] {
 
 LazyJavaClassifierType@48['Throwable'] {
     arguments = ArrayList@49[empty]
-    classifier = JavaClassImpl@47['Throwable']
+    classifier = JavaClassImpl@43['Throwable']
     nullable = 'true': Boolean@38
     typeConstructor = DeserializedClassTypeConstructor@44
 }
 
 LazyJavaClassifierType@50['Throwable'] {
     arguments = ArrayList@51[empty]
-    classifier = JavaClassImpl@43['Throwable']
+    classifier = JavaClassImpl@47['Throwable']
     nullable = 'true': Boolean@38
     typeConstructor = DeserializedClassTypeConstructor@44
 }
@@ -166,120 +166,123 @@ LazyJavaPackageFragment@64['lang'] {
 
 ResolutionTaskHolder@97 {
     <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]
 }
 
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
     <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]
 }
 
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
     <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]
+}
+
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
     <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]
 }
 
 ResolutionTaskHolder@109 {
     <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
 }
 
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
 }
 
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
+ResolutionTaskHolder@115 {
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
+}
+
+ResolutionTaskHolder@118 {
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
 }
 
 ResolutionTaskHolder@121 {
     <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
 }
 
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@127 }
+ResolutionTaskHolder@124 {
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
 }
 
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@131 }
+ResolutionTaskHolder@127 {
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
+}
+
+ResolutionTaskHolder@130 {
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
 }
 
 ResolutionTaskHolder@133 {
     <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@135 }
 }
 
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@139 }
+ResolutionTaskHolder@136 {
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
 }
 
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@143 }
+ResolutionTaskHolder@139 {
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
+}
+
+ResolutionTaskHolder@142 {
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
 }
 
 ResolutionTaskHolder@145 {
     <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@147 }
 }
 
-ResolutionTaskHolder@149 {
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@151 }
+ResolutionTaskHolder@148 {
+    <name not found> = ArrayList@149[4] { ResolutionCandidate@150, ResolutionCandidate@151, ResolutionCandidate@152, ... }
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
 }
 
 ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@155 }
+    <name not found> = ArrayList@154[8] { ResolutionCandidate@155, ResolutionCandidate@156, ResolutionCandidate@157, ... }
 }
 
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@159 }
+ResolutionTaskHolder@158 {
+    <name not found> = ArrayList@159[8] { ResolutionCandidate@160, ResolutionCandidate@161, ResolutionCandidate@162, ... }
 }
 
-ResolutionTaskHolder@161 {
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@163 }
-}
-
-ResolutionTaskHolder@165 {
-    <name not found> = ArrayList@166[4] { ResolutionCandidate@167, ResolutionCandidate@168, ResolutionCandidate@169, ... }
-    <name not found> = ArrayList@170[4] { ResolutionCandidate@167, ResolutionCandidate@168, ResolutionCandidate@169, ... }
+null {
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@147 }
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@166[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@141 }
+    <name not found> = ArrayList@168[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@170[1] { ResolutionCandidate@132 }
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@135 }
+    <name not found> = ArrayList@176[1] { ResolutionCandidate@129 }
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@126 }
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@180[4] { ResolutionCandidate@150, ResolutionCandidate@151, ResolutionCandidate@152, ... }
+    <name not found> = ArrayList@181[8] { ResolutionCandidate@155, ResolutionCandidate@156, ResolutionCandidate@157, ... }
+    <name not found> = ArrayList@182[8] { ResolutionCandidate@160, ResolutionCandidate@161, ResolutionCandidate@162, ... }
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]
 }
-
-ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[8] { ResolutionCandidate@173, ResolutionCandidate@174, ResolutionCandidate@175, ... }
-    <name not found> = ArrayList@176[8] { ResolutionCandidate@173, ResolutionCandidate@174, ResolutionCandidate@175, ... }
-}
-
-ResolutionTaskHolder@177 {
-    <name not found> = ArrayList@178[8] { ResolutionCandidate@179, ResolutionCandidate@180, ResolutionCandidate@181, ... }
-    <name not found> = ArrayList@182[8] { ResolutionCandidate@179, ResolutionCandidate@180, ResolutionCandidate@181, ... }
-}
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/whenWithoutCondition.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/whenWithoutCondition.lazy.log
index 0800d6e888d..908aab0811b 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/whenWithoutCondition.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/whenWithoutCondition.lazy.log
@@ -47,106 +47,109 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@36 {
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
+}
+
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
 
 ResolutionTaskHolder@48 {
     <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+}
+
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
 }
 
 ResolutionTaskHolder@60 {
     <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
+}
+
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
 }
 
 ResolutionTaskHolder@72 {
     <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
 }
 
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
 }
 
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[8] { ResolutionCandidate@83, ResolutionCandidate@84, ResolutionCandidate@85, ... }
 }
 
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[8] { ResolutionCandidate@88, ResolutionCandidate@89, ResolutionCandidate@90, ... }
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[8] { ResolutionCandidate@93, ResolutionCandidate@94, ResolutionCandidate@95, ... }
 }
 
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[8] { ResolutionCandidate@98, ResolutionCandidate@99, ResolutionCandidate@100, ... }
-    <name not found> = ArrayList@101[8] { ResolutionCandidate@98, ResolutionCandidate@99, ResolutionCandidate@100, ... }
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[8] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
-    <name not found> = ArrayList@107[8] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[8] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
-    <name not found> = ArrayList@113[8] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
+null {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@111[8] { ResolutionCandidate@88, ResolutionCandidate@89, ResolutionCandidate@90, ... }
+    <name not found> = ArrayList@112[8] { ResolutionCandidate@93, ResolutionCandidate@94, ResolutionCandidate@95, ... }
+    <name not found> = ArrayList@113[8] { ResolutionCandidate@83, ResolutionCandidate@84, ResolutionCandidate@85, ... }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
 }
diff --git a/compiler/testData/diagnostics/checkerTestUtil/test_with_diagnostic.lazy.log b/compiler/testData/diagnostics/checkerTestUtil/test_with_diagnostic.lazy.log
index 016dc8d1998..eac3f803a79 100644
--- a/compiler/testData/diagnostics/checkerTestUtil/test_with_diagnostic.lazy.log
+++ b/compiler/testData/diagnostics/checkerTestUtil/test_with_diagnostic.lazy.log
@@ -58,7 +58,6 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@38 {
     <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -106,6 +105,111 @@ ResolutionTaskHolder@38 {
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[8] { ResolutionCandidate@49, ResolutionCandidate@50, ResolutionCandidate@51, ... }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -119,59 +223,7 @@ ResolutionTaskHolder@38 {
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[8] { ResolutionCandidate@52, ResolutionCandidate@53, ResolutionCandidate@54, ... }
-    <name not found> = ArrayList@55[8] { ResolutionCandidate@52, ResolutionCandidate@53, ResolutionCandidate@54, ... }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@53 {
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -198,27 +250,11 @@ ResolutionTaskHolder@50 {
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+null {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@57[8] { ResolutionCandidate@49, ResolutionCandidate@50, ResolutionCandidate@51, ... }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -260,36 +296,3 @@ ResolutionTaskHolder@56 {
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
-
-ResolutionTaskHolder@57 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/Abstract.lazy.log b/compiler/testData/diagnostics/tests/Abstract.lazy.log
index 64d2874e96e..a10a7de6d29 100644
--- a/compiler/testData/diagnostics/tests/Abstract.lazy.log
+++ b/compiler/testData/diagnostics/tests/Abstract.lazy.log
@@ -89,113 +89,116 @@ LazyJavaPackageFragment@43['lang'] {
 
 ResolutionTaskHolder@75 {
     <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
     <name not found> = EmptyList@61[empty]
     <name not found> = EmptyList@61[empty]
 }
 
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
     <name not found> = EmptyList@61[empty]
     <name not found> = EmptyList@61[empty]
 }
 
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
     <name not found> = EmptyList@61[empty]
+}
+
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
     <name not found> = EmptyList@61[empty]
 }
 
 ResolutionTaskHolder@87 {
     <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
-    <name not found> = EmptyList@61[empty]
     <name not found> = EmptyList@61[empty]
 }
 
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@61[empty]
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
     <name not found> = EmptyList@61[empty]
 }
 
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
     <name not found> = EmptyList@61[empty]
+}
+
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
     <name not found> = EmptyList@61[empty]
 }
 
 ResolutionTaskHolder@99 {
     <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
-    <name not found> = EmptyList@61[empty]
     <name not found> = EmptyList@61[empty]
 }
 
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
-    <name not found> = EmptyList@61[empty]
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
     <name not found> = EmptyList@61[empty]
 }
 
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
     <name not found> = EmptyList@61[empty]
+}
+
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
     <name not found> = EmptyList@61[empty]
 }
 
 ResolutionTaskHolder@111 {
     <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@113 }
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
 }
 
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@117 }
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
 }
 
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@121 }
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
+}
+
+ResolutionTaskHolder@120 {
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
 }
 
 ResolutionTaskHolder@123 {
     <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@125 }
 }
 
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@129 }
-}
-
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@133 }
-}
-
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@137 }
-}
-
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@141 }
+null {
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@122 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@113 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@125 }
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@77 }
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/AbstractInAbstractClass.lazy.log b/compiler/testData/diagnostics/tests/AbstractInAbstractClass.lazy.log
index 6f48b077786..22e707f8733 100644
--- a/compiler/testData/diagnostics/tests/AbstractInAbstractClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/AbstractInAbstractClass.lazy.log
@@ -39,90 +39,93 @@ LazyJavaPackageFragment@15['lang'] {
 
 ResolutionTaskHolder@34 {
     <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@25[empty]
+}
+
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@25[empty]
 }
 
 ResolutionTaskHolder@46 {
     <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
     <name not found> = EmptyList@25[empty]
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@25[empty]
 }
 
 ResolutionTaskHolder@58 {
     <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
+}
+
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
 }
 
 ResolutionTaskHolder@70 {
     <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+}
+
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
+}
+
+null {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@39 }
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
-}
diff --git a/compiler/testData/diagnostics/tests/AbstractInClass.lazy.log b/compiler/testData/diagnostics/tests/AbstractInClass.lazy.log
index 260507481cb..4e3955cd3a3 100644
--- a/compiler/testData/diagnostics/tests/AbstractInClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/AbstractInClass.lazy.log
@@ -39,90 +39,93 @@ LazyJavaPackageFragment@15['lang'] {
 
 ResolutionTaskHolder@34 {
     <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@25[empty]
+}
+
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@25[empty]
 }
 
 ResolutionTaskHolder@46 {
     <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
     <name not found> = EmptyList@25[empty]
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@25[empty]
 }
 
 ResolutionTaskHolder@58 {
     <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
+}
+
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
 }
 
 ResolutionTaskHolder@70 {
     <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+}
+
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
+}
+
+null {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@39 }
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
-}
diff --git a/compiler/testData/diagnostics/tests/AbstractInTrait.lazy.log b/compiler/testData/diagnostics/tests/AbstractInTrait.lazy.log
index 809c50ebc64..949961d1ed7 100644
--- a/compiler/testData/diagnostics/tests/AbstractInTrait.lazy.log
+++ b/compiler/testData/diagnostics/tests/AbstractInTrait.lazy.log
@@ -32,90 +32,93 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@29 {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
     <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
     <name not found> = EmptyList@20[empty]
 }
 
 ResolutionTaskHolder@41 {
     <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
     <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
     <name not found> = EmptyList@20[empty]
 }
 
 ResolutionTaskHolder@53 {
     <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
+}
+
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
 }
 
 ResolutionTaskHolder@65 {
     <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+}
+
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
+}
+
+null {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@43 }
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
-}
diff --git a/compiler/testData/diagnostics/tests/AnonymousInitializerVarAndConstructor.lazy.log b/compiler/testData/diagnostics/tests/AnonymousInitializerVarAndConstructor.lazy.log
index e0d1f57c65a..91fe7e10661 100644
--- a/compiler/testData/diagnostics/tests/AnonymousInitializerVarAndConstructor.lazy.log
+++ b/compiler/testData/diagnostics/tests/AnonymousInitializerVarAndConstructor.lazy.log
@@ -35,12 +35,15 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@26 {
     <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
+ResolutionTaskHolder@29 {
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
+}
+
+null {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@28 }
+    <name not found> = EmptyList@23[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/AnonymousInitializers.lazy.log b/compiler/testData/diagnostics/tests/AnonymousInitializers.lazy.log
index ccb40f08636..bf5707e7d5f 100644
--- a/compiler/testData/diagnostics/tests/AnonymousInitializers.lazy.log
+++ b/compiler/testData/diagnostics/tests/AnonymousInitializers.lazy.log
@@ -52,45 +52,25 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@39 {
     <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
     <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
     <name not found> = EmptyList@30[empty]
 }
 
 ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -141,19 +121,7 @@ ResolutionTaskHolder@55 {
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@52 {
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -204,13 +172,7 @@ ResolutionTaskHolder@56 {
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@53 {
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -237,7 +199,48 @@ ResolutionTaskHolder@57 {
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@58 {
+ResolutionTaskHolder@54 {
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+}
+
+null {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@44 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
diff --git a/compiler/testData/diagnostics/tests/AutoCreatedIt.lazy.log b/compiler/testData/diagnostics/tests/AutoCreatedIt.lazy.log
index 45a16f6d84d..75db2772d93 100644
--- a/compiler/testData/diagnostics/tests/AutoCreatedIt.lazy.log
+++ b/compiler/testData/diagnostics/tests/AutoCreatedIt.lazy.log
@@ -76,10 +76,6 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@50 {
     <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
@@ -97,17 +93,8 @@ ResolutionTaskHolder@50 {
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
@@ -118,175 +105,125 @@ ResolutionTaskHolder@54 {
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
+}
+
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
 }
 
 ResolutionTaskHolder@62 {
     <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
+}
+
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
 }
 
 ResolutionTaskHolder@74 {
     <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
+}
+
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
 }
 
 ResolutionTaskHolder@86 {
     <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
+}
+
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
 }
 
 ResolutionTaskHolder@98 {
     <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
 }
 
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
+}
+
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
 }
 
 ResolutionTaskHolder@110 {
     <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
 }
 
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
+ResolutionTaskHolder@113 {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
 }
 
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
+}
+
+ResolutionTaskHolder@119 {
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
 }
 
 ResolutionTaskHolder@122 {
     <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
 }
 
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
+ResolutionTaskHolder@125 {
+    <name not found> = ArrayList@126[8] { ResolutionCandidate@127, ResolutionCandidate@128, ResolutionCandidate@129, ... }
 }
 
 ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@132 }
-}
-
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@136 }
-}
-
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@140 }
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@144 }
-}
-
-ResolutionTaskHolder@146 {
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@148 }
-}
-
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[8] { ResolutionCandidate@152, ResolutionCandidate@153, ResolutionCandidate@154, ... }
-    <name not found> = ArrayList@155[8] { ResolutionCandidate@152, ResolutionCandidate@153, ResolutionCandidate@154, ... }
-}
-
-ResolutionTaskHolder@156 {
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
@@ -305,11 +242,7 @@ ResolutionTaskHolder@156 {
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@157 {
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
+ResolutionTaskHolder@131 {
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
@@ -328,9 +261,7 @@ ResolutionTaskHolder@157 {
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@158 {
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
+ResolutionTaskHolder@132 {
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
@@ -341,7 +272,79 @@ ResolutionTaskHolder@158 {
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@159 {
+ResolutionTaskHolder@133 {
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+}
+
+null {
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@124 }
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@159[8] { ResolutionCandidate@127, ResolutionCandidate@128, ResolutionCandidate@129, ... }
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
diff --git a/compiler/testData/diagnostics/tests/Basic.lazy.log b/compiler/testData/diagnostics/tests/Basic.lazy.log
index 016dc8d1998..eac3f803a79 100644
--- a/compiler/testData/diagnostics/tests/Basic.lazy.log
+++ b/compiler/testData/diagnostics/tests/Basic.lazy.log
@@ -58,7 +58,6 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@38 {
     <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -106,6 +105,111 @@ ResolutionTaskHolder@38 {
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[8] { ResolutionCandidate@49, ResolutionCandidate@50, ResolutionCandidate@51, ... }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -119,59 +223,7 @@ ResolutionTaskHolder@38 {
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[8] { ResolutionCandidate@52, ResolutionCandidate@53, ResolutionCandidate@54, ... }
-    <name not found> = ArrayList@55[8] { ResolutionCandidate@52, ResolutionCandidate@53, ResolutionCandidate@54, ... }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@53 {
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -198,27 +250,11 @@ ResolutionTaskHolder@50 {
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+null {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@57[8] { ResolutionCandidate@49, ResolutionCandidate@50, ResolutionCandidate@51, ... }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -260,36 +296,3 @@ ResolutionTaskHolder@56 {
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
-
-ResolutionTaskHolder@57 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/BinaryCallsOnNullableValues.lazy.log b/compiler/testData/diagnostics/tests/BinaryCallsOnNullableValues.lazy.log
index 370aecd8e27..50003c3d27b 100644
--- a/compiler/testData/diagnostics/tests/BinaryCallsOnNullableValues.lazy.log
+++ b/compiler/testData/diagnostics/tests/BinaryCallsOnNullableValues.lazy.log
@@ -75,31 +75,19 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@46 {
     <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@38[empty]
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@53 {
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
     <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+    <name not found> = EmptyList@38[empty]
+}
+
+ResolutionTaskHolder@56 {
     <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@64[8] { ResolutionCandidate@65, ResolutionCandidate@66, ResolutionCandidate@67, ... }
-    <name not found> = ArrayList@68[8] { ResolutionCandidate@65, ResolutionCandidate@66, ResolutionCandidate@67, ... }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
+    <name not found> = ArrayList@59[8] { ResolutionCandidate@60, ResolutionCandidate@61, ResolutionCandidate@62, ... }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
@@ -124,11 +112,36 @@ ResolutionTaskHolder@60 {
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@66[8] { ResolutionCandidate@67, ResolutionCandidate@68, ResolutionCandidate@69, ... }
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+}
+
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
     <name not found> = ArrayList@73[8] { ResolutionCandidate@74, ResolutionCandidate@75, ResolutionCandidate@76, ... }
-    <name not found> = ArrayList@77[8] { ResolutionCandidate@74, ResolutionCandidate@75, ResolutionCandidate@76, ... }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
@@ -151,175 +164,138 @@ ResolutionTaskHolder@69 {
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
+}
+
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@82[8] { ResolutionCandidate@83, ResolutionCandidate@84, ResolutionCandidate@85, ... }
-    <name not found> = ArrayList@86[8] { ResolutionCandidate@83, ResolutionCandidate@84, ResolutionCandidate@85, ... }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
 }
 
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
+}
+
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
+}
+
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
 }
 
 ResolutionTaskHolder@95 {
     <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
 }
 
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
 }
 
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
+}
+
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
 }
 
 ResolutionTaskHolder@107 {
     <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
 }
 
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@113 }
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
 }
 
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@117 }
+ResolutionTaskHolder@113 {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
+}
+
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
 }
 
 ResolutionTaskHolder@119 {
     <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@121 }
 }
 
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@125 }
+ResolutionTaskHolder@122 {
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
 }
 
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@129 }
+ResolutionTaskHolder@125 {
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
+}
+
+ResolutionTaskHolder@128 {
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
 }
 
 ResolutionTaskHolder@131 {
     <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@133 }
 }
 
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@137 }
+ResolutionTaskHolder@134 {
+    <name not found> = ArrayList@135[7] { ResolutionCandidate@136, ResolutionCandidate@137, ResolutionCandidate@138, ... }
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
 }
 
 ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@141 }
-}
-
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@145 }
-}
-
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@149 }
-}
-
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@153 }
-}
-
-ResolutionTaskHolder@155 {
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@157 }
-}
-
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@161 }
-}
-
-ResolutionTaskHolder@163 {
-    <name not found> = ArrayList@164[7] { ResolutionCandidate@165, ResolutionCandidate@166, ResolutionCandidate@167, ... }
-    <name not found> = ArrayList@168[7] { ResolutionCandidate@165, ResolutionCandidate@166, ResolutionCandidate@167, ... }
+    <name not found> = ArrayList@140[7] { ResolutionCandidate@141, ResolutionCandidate@142, ResolutionCandidate@143, ... }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
@@ -343,6 +319,32 @@ ResolutionTaskHolder@163 {
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
+}
+
+ResolutionTaskHolder@144 {
+    <name not found> = ArrayList@145[7] { ResolutionCandidate@146, ResolutionCandidate@147, ResolutionCandidate@148, ... }
+}
+
+ResolutionTaskHolder@149 {
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
@@ -350,9 +352,44 @@ ResolutionTaskHolder@163 {
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@169 {
-    <name not found> = ArrayList@170[7] { ResolutionCandidate@171, ResolutionCandidate@172, ResolutionCandidate@173, ... }
-    <name not found> = ArrayList@174[7] { ResolutionCandidate@171, ResolutionCandidate@172, ResolutionCandidate@173, ... }
+null {
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@127 }
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@166[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@168[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@124 }
+    <name not found> = ArrayList@170[1] { ResolutionCandidate@133 }
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@176[7] { ResolutionCandidate@141, ResolutionCandidate@142, ResolutionCandidate@143, ... }
+    <name not found> = ArrayList@177[7] { ResolutionCandidate@136, ResolutionCandidate@137, ResolutionCandidate@138, ... }
+    <name not found> = ArrayList@178[7] { ResolutionCandidate@146, ResolutionCandidate@147, ResolutionCandidate@148, ... }
+    <name not found> = ArrayList@179[8] { ResolutionCandidate@74, ResolutionCandidate@75, ResolutionCandidate@76, ... }
+    <name not found> = ArrayList@180[8] { ResolutionCandidate@60, ResolutionCandidate@61, ResolutionCandidate@62, ... }
+    <name not found> = ArrayList@181[8] { ResolutionCandidate@67, ResolutionCandidate@68, ResolutionCandidate@69, ... }
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
@@ -381,40 +418,6 @@ ResolutionTaskHolder@169 {
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@175 {
-    <name not found> = ArrayList@176[7] { ResolutionCandidate@177, ResolutionCandidate@178, ResolutionCandidate@179, ... }
-    <name not found> = ArrayList@180[7] { ResolutionCandidate@177, ResolutionCandidate@178, ResolutionCandidate@179, ... }
-}
-
-ResolutionTaskHolder@181 {
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
diff --git a/compiler/testData/diagnostics/tests/Bounds.lazy.log b/compiler/testData/diagnostics/tests/Bounds.lazy.log
index 0dd15fa6028..ac7e783365a 100644
--- a/compiler/testData/diagnostics/tests/Bounds.lazy.log
+++ b/compiler/testData/diagnostics/tests/Bounds.lazy.log
@@ -104,15 +104,6 @@ LazyJavaPackageFragment@37['lang'] {
 
 ResolutionTaskHolder@83 {
     <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
     <name not found> = EmptyList@74[empty]
     <name not found> = EmptyList@74[empty]
     <name not found> = EmptyList@74[empty]
@@ -123,120 +114,132 @@ ResolutionTaskHolder@83 {
     <name not found> = EmptyList@74[empty]
 }
 
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
     <name not found> = EmptyList@74[empty]
     <name not found> = EmptyList@74[empty]
 }
 
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
     <name not found> = EmptyList@74[empty]
     <name not found> = EmptyList@74[empty]
+}
+
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
     <name not found> = EmptyList@74[empty]
     <name not found> = EmptyList@74[empty]
 }
 
 ResolutionTaskHolder@95 {
     <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
     <name not found> = EmptyList@74[empty]
     <name not found> = EmptyList@74[empty]
 }
 
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
     <name not found> = EmptyList@74[empty]
     <name not found> = EmptyList@74[empty]
 }
 
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
     <name not found> = EmptyList@74[empty]
     <name not found> = EmptyList@74[empty]
+}
+
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
     <name not found> = EmptyList@74[empty]
     <name not found> = EmptyList@74[empty]
 }
 
 ResolutionTaskHolder@107 {
     <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
     <name not found> = EmptyList@74[empty]
     <name not found> = EmptyList@74[empty]
 }
 
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@113 }
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
     <name not found> = EmptyList@74[empty]
     <name not found> = EmptyList@74[empty]
 }
 
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@117 }
+ResolutionTaskHolder@113 {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
     <name not found> = EmptyList@74[empty]
     <name not found> = EmptyList@74[empty]
+}
+
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
     <name not found> = EmptyList@74[empty]
     <name not found> = EmptyList@74[empty]
 }
 
 ResolutionTaskHolder@119 {
     <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@121 }
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
     <name not found> = EmptyList@74[empty]
     <name not found> = EmptyList@74[empty]
 }
 
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@125 }
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
+ResolutionTaskHolder@122 {
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
 }
 
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@129 }
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
+ResolutionTaskHolder@125 {
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
 }
 
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@133 }
+null {
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@124 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@127 }
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@94 }
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
     <name not found> = EmptyList@74[empty]
     <name not found> = EmptyList@74[empty]
     <name not found> = EmptyList@74[empty]
     <name not found> = EmptyList@74[empty]
 }
-
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@137 }
-}
-
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@141 }
-}
diff --git a/compiler/testData/diagnostics/tests/BreakContinue.lazy.log b/compiler/testData/diagnostics/tests/BreakContinue.lazy.log
index 7c459a171ca..71e88b75354 100644
--- a/compiler/testData/diagnostics/tests/BreakContinue.lazy.log
+++ b/compiler/testData/diagnostics/tests/BreakContinue.lazy.log
@@ -51,373 +51,376 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@39 {
     <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@46 {
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
     <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+}
+
+ResolutionTaskHolder@49 {
     <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
     <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
+}
+
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
 ResolutionTaskHolder@74 {
     <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@81 {
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
     <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+}
+
+ResolutionTaskHolder@84 {
     <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+}
+
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
+}
+
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
+}
+
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
 }
 
 ResolutionTaskHolder@102 {
     <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
 }
 
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
+}
+
+ResolutionTaskHolder@111 {
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
 }
 
 ResolutionTaskHolder@114 {
     <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
 }
 
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
 }
 
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
+ResolutionTaskHolder@120 {
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
+}
+
+ResolutionTaskHolder@123 {
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
 }
 
 ResolutionTaskHolder@126 {
     <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
 }
 
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@132 }
+ResolutionTaskHolder@129 {
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
 }
 
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@136 }
+ResolutionTaskHolder@132 {
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
+}
+
+ResolutionTaskHolder@135 {
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
 }
 
 ResolutionTaskHolder@138 {
     <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@140 }
 }
 
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@144 }
+ResolutionTaskHolder@141 {
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
 }
 
-ResolutionTaskHolder@146 {
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@148 }
+ResolutionTaskHolder@144 {
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
+}
+
+ResolutionTaskHolder@147 {
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
 }
 
 ResolutionTaskHolder@150 {
     <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@152 }
 }
 
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@156 }
+ResolutionTaskHolder@153 {
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
 }
 
-ResolutionTaskHolder@158 {
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@160 }
+ResolutionTaskHolder@156 {
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
+}
+
+ResolutionTaskHolder@159 {
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
 }
 
 ResolutionTaskHolder@162 {
     <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@164 }
 }
 
-ResolutionTaskHolder@166 {
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@168 }
+ResolutionTaskHolder@165 {
+    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
 }
 
-ResolutionTaskHolder@170 {
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@172 }
+ResolutionTaskHolder@168 {
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
 }
 
-ResolutionTaskHolder@174 {
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@176 }
+ResolutionTaskHolder@171 {
+    <name not found> = ArrayList@172[2] { ResolutionCandidate@173, ResolutionCandidate@174 }
 }
 
-ResolutionTaskHolder@178 {
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@180 }
+ResolutionTaskHolder@175 {
+    <name not found> = ArrayList@176[2] { ResolutionCandidate@177, ResolutionCandidate@178 }
 }
 
-ResolutionTaskHolder@182 {
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@184 }
+ResolutionTaskHolder@179 {
+    <name not found> = ArrayList@180[2] { ResolutionCandidate@181, ResolutionCandidate@182 }
 }
 
-ResolutionTaskHolder@186 {
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@188 }
-}
-
-ResolutionTaskHolder@190 {
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@192 }
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@192 }
-}
-
-ResolutionTaskHolder@194 {
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@196 }
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@196 }
-}
-
-ResolutionTaskHolder@198 {
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@200 }
-}
-
-ResolutionTaskHolder@202 {
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@204 }
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@204 }
-}
-
-ResolutionTaskHolder@206 {
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@208 }
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@208 }
-}
-
-ResolutionTaskHolder@210 {
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@212 }
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@212 }
-}
-
-ResolutionTaskHolder@214 {
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@216 }
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@216 }
-}
-
-ResolutionTaskHolder@218 {
-    <name not found> = ArrayList@219[2] { ResolutionCandidate@220, ResolutionCandidate@221 }
-    <name not found> = ArrayList@222[2] { ResolutionCandidate@220, ResolutionCandidate@221 }
-}
-
-ResolutionTaskHolder@223 {
-    <name not found> = ArrayList@224[2] { ResolutionCandidate@225, ResolutionCandidate@226 }
-    <name not found> = ArrayList@227[2] { ResolutionCandidate@225, ResolutionCandidate@226 }
-}
-
-ResolutionTaskHolder@228 {
-    <name not found> = ArrayList@229[2] { ResolutionCandidate@230, ResolutionCandidate@231 }
-    <name not found> = ArrayList@232[2] { ResolutionCandidate@230, ResolutionCandidate@231 }
+null {
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@161 }
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@134 }
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@131 }
+    <name not found> = ArrayList@189[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@192[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@194[1] { ResolutionCandidate@122 }
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@155 }
+    <name not found> = ArrayList@196[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@197[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@198[1] { ResolutionCandidate@113 }
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@149 }
+    <name not found> = ArrayList@200[1] { ResolutionCandidate@128 }
+    <name not found> = ArrayList@201[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@202[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@203[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@204[1] { ResolutionCandidate@170 }
+    <name not found> = ArrayList@205[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@206[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@207[1] { ResolutionCandidate@152 }
+    <name not found> = ArrayList@208[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@209[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@210[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@211[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@212[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@213[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@214[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@215[1] { ResolutionCandidate@146 }
+    <name not found> = ArrayList@216[1] { ResolutionCandidate@125 }
+    <name not found> = ArrayList@217[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@218[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@219[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@220[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@221[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@222[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@223[1] { ResolutionCandidate@143 }
+    <name not found> = ArrayList@224[1] { ResolutionCandidate@140 }
+    <name not found> = ArrayList@225[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@226[1] { ResolutionCandidate@167 }
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@164 }
+    <name not found> = ArrayList@228[1] { ResolutionCandidate@137 }
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@230[2] { ResolutionCandidate@177, ResolutionCandidate@178 }
+    <name not found> = ArrayList@231[2] { ResolutionCandidate@181, ResolutionCandidate@182 }
+    <name not found> = ArrayList@232[2] { ResolutionCandidate@173, ResolutionCandidate@174 }
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/Builders.lazy.log b/compiler/testData/diagnostics/tests/Builders.lazy.log
index a22059b672c..61e91c27536 100644
--- a/compiler/testData/diagnostics/tests/Builders.lazy.log
+++ b/compiler/testData/diagnostics/tests/Builders.lazy.log
@@ -389,84 +389,84 @@ LazyJavaClassifierType@318['AbstractStringBuilder'] {
 
 LazyJavaClassifierType@321['AbstractStringBuilder'] {
     arguments = ArrayList@322[empty]
-    classifier = JavaClassImpl@317['AbstractStringBuilder']
+    classifier = JavaClassImpl@299['AbstractStringBuilder']
     nullable = 'true': Boolean@323
     typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@324['AbstractStringBuilder'] {
     arguments = ArrayList@325[empty]
-    classifier = JavaClassImpl@308['AbstractStringBuilder']
+    classifier = JavaClassImpl@305['AbstractStringBuilder']
     nullable = 'true': Boolean@323
     typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@326['AbstractStringBuilder'] {
     arguments = ArrayList@327[empty]
-    classifier = JavaClassImpl@320['AbstractStringBuilder']
+    classifier = JavaClassImpl@314['AbstractStringBuilder']
     nullable = 'true': Boolean@323
     typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@328['AbstractStringBuilder'] {
     arguments = ArrayList@329[empty]
-    classifier = JavaClassImpl@290['AbstractStringBuilder']
+    classifier = JavaClassImpl@296['AbstractStringBuilder']
     nullable = 'true': Boolean@323
     typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@330['AbstractStringBuilder'] {
     arguments = ArrayList@331[empty]
-    classifier = JavaClassImpl@283['AbstractStringBuilder']
+    classifier = JavaClassImpl@320['AbstractStringBuilder']
     nullable = 'true': Boolean@323
     typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@332['AbstractStringBuilder'] {
     arguments = ArrayList@333[empty]
-    classifier = JavaClassImpl@305['AbstractStringBuilder']
+    classifier = JavaClassImpl@283['AbstractStringBuilder']
     nullable = 'true': Boolean@323
     typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@334['AbstractStringBuilder'] {
     arguments = ArrayList@335[empty]
-    classifier = JavaClassImpl@314['AbstractStringBuilder']
+    classifier = JavaClassImpl@287['AbstractStringBuilder']
     nullable = 'true': Boolean@323
     typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@336['AbstractStringBuilder'] {
     arguments = ArrayList@337[empty]
-    classifier = JavaClassImpl@302['AbstractStringBuilder']
+    classifier = JavaClassImpl@317['AbstractStringBuilder']
     nullable = 'true': Boolean@323
     typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@338['AbstractStringBuilder'] {
     arguments = ArrayList@339[empty]
-    classifier = JavaClassImpl@311['AbstractStringBuilder']
+    classifier = JavaClassImpl@308['AbstractStringBuilder']
     nullable = 'true': Boolean@323
     typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@340['AbstractStringBuilder'] {
     arguments = ArrayList@341[empty]
-    classifier = JavaClassImpl@296['AbstractStringBuilder']
+    classifier = JavaClassImpl@302['AbstractStringBuilder']
     nullable = 'true': Boolean@323
     typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@342['AbstractStringBuilder'] {
     arguments = ArrayList@343[empty]
-    classifier = JavaClassImpl@287['AbstractStringBuilder']
+    classifier = JavaClassImpl@290['AbstractStringBuilder']
     nullable = 'true': Boolean@323
     typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@344['AbstractStringBuilder'] {
     arguments = ArrayList@345[empty]
-    classifier = JavaClassImpl@299['AbstractStringBuilder']
+    classifier = JavaClassImpl@311['AbstractStringBuilder']
     nullable = 'true': Boolean@323
     typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
 }
@@ -521,14 +521,14 @@ LazyJavaClassifierType@360['Appendable'] {
 
 LazyJavaClassifierType@363['Appendable'] {
     arguments = ArrayList@364[empty]
-    classifier = JavaClassImpl@356['Appendable']
+    classifier = JavaClassImpl@362['Appendable']
     nullable = 'true': Boolean@323
     typeConstructor = LazyJavaClassTypeConstructor@82['Appendable']
 }
 
 LazyJavaClassifierType@365['Appendable'] {
     arguments = ArrayList@366[empty]
-    classifier = JavaClassImpl@362['Appendable']
+    classifier = JavaClassImpl@356['Appendable']
     nullable = 'true': Boolean@323
     typeConstructor = LazyJavaClassTypeConstructor@82['Appendable']
 }
@@ -547,14 +547,14 @@ LazyJavaClassifierType@232['AutoCloseable'] {
     typeConstructor = LazyJavaClassTypeConstructor@105['AutoCloseable']
 }
 
-LazyJavaClassifierType@218['CharSequence'] {
+LazyJavaClassifierType@264['CharSequence'] {
     arguments = ArrayList@371[empty]
     classifier = JavaClassImpl@372['CharSequence']
     memberScope = DeserializedClassMemberScope@373
     typeConstructor = DeserializedClassTypeConstructor@374
 }
 
-LazyJavaClassifierType@264['CharSequence'] {
+LazyJavaClassifierType@218['CharSequence'] {
     arguments = ArrayList@375[empty]
     classifier = JavaClassImpl@376['CharSequence']
     memberScope = DeserializedClassMemberScope@373
@@ -619,7 +619,7 @@ LazyJavaClassifierType@398['CharSequence'] {
 
 LazyJavaClassifierType@400['CharSequence'] {
     arguments = ArrayList@401[empty]
-    classifier = JavaClassImpl@394['CharSequence']
+    classifier = JavaClassImpl@397['CharSequence']
     nullable = 'true': Boolean@323
     typeConstructor = DeserializedClassTypeConstructor@374
 }
@@ -633,28 +633,28 @@ LazyJavaClassifierType@402['CharSequence'] {
 
 LazyJavaClassifierType@404['CharSequence'] {
     arguments = ArrayList@405[empty]
-    classifier = JavaClassImpl@379['CharSequence']
+    classifier = JavaClassImpl@388['CharSequence']
     nullable = 'true': Boolean@323
     typeConstructor = DeserializedClassTypeConstructor@374
 }
 
 LazyJavaClassifierType@406['CharSequence'] {
     arguments = ArrayList@407[empty]
-    classifier = JavaClassImpl@397['CharSequence']
+    classifier = JavaClassImpl@391['CharSequence']
     nullable = 'true': Boolean@323
     typeConstructor = DeserializedClassTypeConstructor@374
 }
 
 LazyJavaClassifierType@408['CharSequence'] {
     arguments = ArrayList@409[empty]
-    classifier = JavaClassImpl@391['CharSequence']
+    classifier = JavaClassImpl@379['CharSequence']
     nullable = 'true': Boolean@323
     typeConstructor = DeserializedClassTypeConstructor@374
 }
 
 LazyJavaClassifierType@410['CharSequence'] {
     arguments = ArrayList@411[empty]
-    classifier = JavaClassImpl@388['CharSequence']
+    classifier = JavaClassImpl@394['CharSequence']
     nullable = 'true': Boolean@323
     typeConstructor = DeserializedClassTypeConstructor@374
 }
@@ -664,18 +664,18 @@ LazyJavaClassifierType@259['CharSequence'] {
     typeConstructor = DeserializedClassTypeConstructor@374
 }
 
-LazyJavaClassifierType@242['Cloneable'] {
-    arguments = ArrayList@413[empty]
-    classifier = JavaClassImpl@414['Cloneable']
-    memberScope = DeserializedClassMemberScope@415
-    typeConstructor = DeserializedClassTypeConstructor@416
+LazyJavaClassifierType@413['Cloneable'] {
+    arguments = ArrayList@414[empty]
+    classifier = JavaClassImpl@415['Cloneable']
+    memberScope = DeserializedClassMemberScope@416
+    typeConstructor = DeserializedClassTypeConstructor@417
 }
 
-LazyJavaClassifierType@417['Cloneable'] {
+LazyJavaClassifierType@242['Cloneable'] {
     arguments = ArrayList@418[empty]
     classifier = JavaClassImpl@419['Cloneable']
-    memberScope = DeserializedClassMemberScope@415
-    typeConstructor = DeserializedClassTypeConstructor@416
+    memberScope = DeserializedClassMemberScope@416
+    typeConstructor = DeserializedClassTypeConstructor@417
 }
 
 LazyJavaClassifierType@250['Closeable'] {
@@ -733,236 +733,236 @@ LazyJavaClassifierType@447['E'] {
     arguments = ArrayList@448[empty]
     classifier = JavaTypeParameterImpl@449['E']
     nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@450
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@442
 }
 
-LazyJavaClassifierType@451['E'] {
-    arguments = ArrayList@452[empty]
-    classifier = JavaTypeParameterImpl@453['E']
+LazyJavaClassifierType@450['E'] {
+    arguments = ArrayList@451[empty]
+    classifier = JavaTypeParameterImpl@452['E']
     nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@453
 }
 
 LazyJavaClassifierType@454['E'] {
     arguments = ArrayList@455[empty]
     classifier = JavaTypeParameterImpl@456['E']
     nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@450
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
 }
 
 LazyJavaClassifierType@457['E'] {
     arguments = ArrayList@458[empty]
     classifier = JavaTypeParameterImpl@459['E']
     nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@450
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@442
 }
 
 LazyJavaClassifierType@460['E'] {
     arguments = ArrayList@461[empty]
     classifier = JavaTypeParameterImpl@462['E']
     nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@442
 }
 
 LazyJavaClassifierType@463['E'] {
     arguments = ArrayList@464[empty]
     classifier = JavaTypeParameterImpl@465['E']
     nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@450
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
 }
 
 LazyJavaClassifierType@466['E'] {
     arguments = ArrayList@467[empty]
     classifier = JavaTypeParameterImpl@468['E']
     nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@442
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
 }
 
 LazyJavaClassifierType@469['E'] {
     arguments = ArrayList@470[empty]
     classifier = JavaTypeParameterImpl@471['E']
     nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@442
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@453
 }
 
 LazyJavaClassifierType@472['E'] {
     arguments = ArrayList@473[empty]
     classifier = JavaTypeParameterImpl@474['E']
     nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@442
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
 }
 
 LazyJavaClassifierType@475['E'] {
     arguments = ArrayList@476[empty]
     classifier = JavaTypeParameterImpl@477['E']
     nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@442
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
 }
 
 LazyJavaClassifierType@478['E'] {
     arguments = ArrayList@479[empty]
     classifier = JavaTypeParameterImpl@480['E']
     nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@442
 }
 
 LazyJavaClassifierType@481['E'] {
     arguments = ArrayList@482[empty]
     classifier = JavaTypeParameterImpl@483['E']
     nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@450
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@442
 }
 
 LazyJavaClassifierType@484['E'] {
     arguments = ArrayList@485[empty]
     classifier = JavaTypeParameterImpl@486['E']
     nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@442
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
 }
 
 LazyJavaClassifierType@487['E'] {
     arguments = ArrayList@488[empty]
     classifier = JavaTypeParameterImpl@489['E']
     nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@450
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@453
 }
 
 LazyJavaClassifierType@490['E'] {
     arguments = ArrayList@491[empty]
     classifier = JavaTypeParameterImpl@492['E']
     nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@450
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
 }
 
 LazyJavaClassifierType@493['E'] {
     arguments = ArrayList@494[empty]
     classifier = JavaTypeParameterImpl@495['E']
     nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@450
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@453
 }
 
 LazyJavaClassifierType@496['E'] {
     arguments = ArrayList@497[empty]
+    classifier = JavaTypeParameterImpl@465['E']
+    nullable = 'true': Boolean@323
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
+}
+
+LazyJavaClassifierType@498['E'] {
+    arguments = ArrayList@499[empty]
     classifier = JavaTypeParameterImpl@441['E']
     nullable = 'true': Boolean@323
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@442
 }
 
-LazyJavaClassifierType@498['E'] {
-    arguments = ArrayList@499[empty]
-    classifier = JavaTypeParameterImpl@465['E']
-    nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@450
-}
-
 LazyJavaClassifierType@500['E'] {
     arguments = ArrayList@501[empty]
-    classifier = JavaTypeParameterImpl@480['E']
+    classifier = JavaTypeParameterImpl@495['E']
     nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@453
 }
 
 LazyJavaClassifierType@502['E'] {
     arguments = ArrayList@503[empty]
-    classifier = JavaTypeParameterImpl@462['E']
-    nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
-}
-
-LazyJavaClassifierType@504['E'] {
-    arguments = ArrayList@505[empty]
-    classifier = JavaTypeParameterImpl@486['E']
+    classifier = JavaTypeParameterImpl@459['E']
     nullable = 'true': Boolean@323
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@442
 }
 
+LazyJavaClassifierType@504['E'] {
+    arguments = ArrayList@505[empty]
+    classifier = JavaTypeParameterImpl@471['E']
+    nullable = 'true': Boolean@323
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@453
+}
+
 LazyJavaClassifierType@506['E'] {
     arguments = ArrayList@507[empty]
-    classifier = JavaTypeParameterImpl@489['E']
+    classifier = JavaTypeParameterImpl@462['E']
     nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@450
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@442
 }
 
 LazyJavaClassifierType@508['E'] {
     arguments = ArrayList@509[empty]
-    classifier = JavaTypeParameterImpl@468['E']
+    classifier = JavaTypeParameterImpl@449['E']
     nullable = 'true': Boolean@323
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@442
 }
 
 LazyJavaClassifierType@510['E'] {
     arguments = ArrayList@511[empty]
-    classifier = JavaTypeParameterImpl@449['E']
-    nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@450
-}
-
-LazyJavaClassifierType@512['E'] {
-    arguments = ArrayList@513[empty]
-    classifier = JavaTypeParameterImpl@456['E']
-    nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@450
-}
-
-LazyJavaClassifierType@514['E'] {
-    arguments = ArrayList@515[empty]
-    classifier = JavaTypeParameterImpl@453['E']
+    classifier = JavaTypeParameterImpl@486['E']
     nullable = 'true': Boolean@323
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
 }
 
-LazyJavaClassifierType@516['E'] {
-    arguments = ArrayList@517[empty]
-    classifier = JavaTypeParameterImpl@474['E']
+LazyJavaClassifierType@512['E'] {
+    arguments = ArrayList@513[empty]
+    classifier = JavaTypeParameterImpl@480['E']
     nullable = 'true': Boolean@323
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@442
 }
 
+LazyJavaClassifierType@514['E'] {
+    arguments = ArrayList@515[empty]
+    classifier = JavaTypeParameterImpl@452['E']
+    nullable = 'true': Boolean@323
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@453
+}
+
+LazyJavaClassifierType@516['E'] {
+    arguments = ArrayList@517[empty]
+    classifier = JavaTypeParameterImpl@489['E']
+    nullable = 'true': Boolean@323
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@453
+}
+
 LazyJavaClassifierType@518['E'] {
     arguments = ArrayList@519[empty]
-    classifier = JavaTypeParameterImpl@459['E']
+    classifier = JavaTypeParameterImpl@456['E']
     nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@450
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
 }
 
 LazyJavaClassifierType@520['E'] {
     arguments = ArrayList@521[empty]
-    classifier = JavaTypeParameterImpl@492['E']
+    classifier = JavaTypeParameterImpl@468['E']
     nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@450
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
 }
 
 LazyJavaClassifierType@522['E'] {
     arguments = ArrayList@523[empty]
-    classifier = JavaTypeParameterImpl@445['E']
+    classifier = JavaTypeParameterImpl@477['E']
     nullable = 'true': Boolean@323
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
 }
 
 LazyJavaClassifierType@524['E'] {
     arguments = ArrayList@525[empty]
-    classifier = JavaTypeParameterImpl@495['E']
+    classifier = JavaTypeParameterImpl@445['E']
     nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@450
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
 }
 
 LazyJavaClassifierType@526['E'] {
     arguments = ArrayList@527[empty]
-    classifier = JavaTypeParameterImpl@477['E']
+    classifier = JavaTypeParameterImpl@474['E']
     nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@442
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
 }
 
 LazyJavaClassifierType@528['E'] {
     arguments = ArrayList@529[empty]
-    classifier = JavaTypeParameterImpl@483['E']
+    classifier = JavaTypeParameterImpl@492['E']
     nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@450
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
 }
 
 LazyJavaClassifierType@530['E'] {
     arguments = ArrayList@531[empty]
-    classifier = JavaTypeParameterImpl@471['E']
+    classifier = JavaTypeParameterImpl@483['E']
     nullable = 'true': Boolean@323
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@442
 }
@@ -1005,7 +1005,7 @@ LazyJavaClassifierType@547['Iterator<E>'] {
 
 LazyJavaClassifierType@552['Iterator<E>'] {
     arguments = ArrayList@553[1] { TypeProjectionImpl@554 }
-    classifier = JavaClassImpl@539['Iterator']
+    classifier = JavaClassImpl@545['Iterator']
     memberScope = SubstitutingScope@555
     nullable = 'true': Boolean@323
     typeConstructor = DeserializedClassTypeConstructor@556
@@ -1013,7 +1013,7 @@ LazyJavaClassifierType@552['Iterator<E>'] {
 
 LazyJavaClassifierType@557['Iterator<E>'] {
     arguments = ArrayList@558[1] { TypeProjectionImpl@559 }
-    classifier = JavaClassImpl@545['Iterator']
+    classifier = JavaClassImpl@539['Iterator']
     memberScope = SubstitutingScope@560
     nullable = 'true': Boolean@323
     typeConstructor = DeserializedClassTypeConstructor@556
@@ -1038,28 +1038,28 @@ LazyJavaClassifierType@569['K'] {
     arguments = ArrayList@570[empty]
     classifier = JavaTypeParameterImpl@571['K']
     nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@568
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@572
 }
 
-LazyJavaClassifierType@572['K'] {
-    arguments = ArrayList@573[empty]
-    classifier = JavaTypeParameterImpl@574['K']
+LazyJavaClassifierType@573['K'] {
+    arguments = ArrayList@574[empty]
+    classifier = JavaTypeParameterImpl@575['K']
     nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@575
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@568
 }
 
 LazyJavaClassifierType@576['K'] {
     arguments = ArrayList@577[empty]
     classifier = JavaTypeParameterImpl@578['K']
     nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@575
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@568
 }
 
 LazyJavaClassifierType@579['K'] {
     arguments = ArrayList@580[empty]
     classifier = JavaTypeParameterImpl@581['K']
     nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@575
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@568
 }
 
 LazyJavaClassifierType@582['K'] {
@@ -1080,115 +1080,115 @@ LazyJavaClassifierType@588['K'] {
     arguments = ArrayList@589[empty]
     classifier = JavaTypeParameterImpl@590['K']
     nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@568
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@572
 }
 
 LazyJavaClassifierType@591['K'] {
     arguments = ArrayList@592[empty]
     classifier = JavaTypeParameterImpl@593['K']
     nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@575
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@568
 }
 
 LazyJavaClassifierType@594['K'] {
     arguments = ArrayList@595[empty]
     classifier = JavaTypeParameterImpl@596['K']
     nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@568
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@572
 }
 
 LazyJavaClassifierType@597['K'] {
     arguments = ArrayList@598[empty]
     classifier = JavaTypeParameterImpl@599['K']
     nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@568
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@572
 }
 
 LazyJavaClassifierType@600['K'] {
     arguments = ArrayList@601[empty]
-    classifier = JavaTypeParameterImpl@593['K']
+    classifier = JavaTypeParameterImpl@567['K']
     nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@575
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@568
 }
 
 LazyJavaClassifierType@602['K'] {
     arguments = ArrayList@603[empty]
-    classifier = JavaTypeParameterImpl@567['K']
+    classifier = JavaTypeParameterImpl@584['K']
     nullable = 'true': Boolean@323
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@568
 }
 
 LazyJavaClassifierType@604['K'] {
     arguments = ArrayList@605[empty]
-    classifier = JavaTypeParameterImpl@581['K']
+    classifier = JavaTypeParameterImpl@599['K']
     nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@575
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@572
 }
 
 LazyJavaClassifierType@606['K'] {
     arguments = ArrayList@607[empty]
-    classifier = JavaTypeParameterImpl@596['K']
+    classifier = JavaTypeParameterImpl@593['K']
     nullable = 'true': Boolean@323
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@568
 }
 
 LazyJavaClassifierType@608['K'] {
     arguments = ArrayList@609[empty]
-    classifier = JavaTypeParameterImpl@574['K']
+    classifier = JavaTypeParameterImpl@587['K']
     nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@575
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@568
 }
 
 LazyJavaClassifierType@610['K'] {
     arguments = ArrayList@611[empty]
-    classifier = JavaTypeParameterImpl@584['K']
+    classifier = JavaTypeParameterImpl@578['K']
     nullable = 'true': Boolean@323
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@568
 }
 
 LazyJavaClassifierType@612['K'] {
     arguments = ArrayList@613[empty]
-    classifier = JavaTypeParameterImpl@578['K']
+    classifier = JavaTypeParameterImpl@590['K']
     nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@575
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@572
 }
 
 LazyJavaClassifierType@614['K'] {
     arguments = ArrayList@615[empty]
-    classifier = JavaTypeParameterImpl@599['K']
+    classifier = JavaTypeParameterImpl@571['K']
     nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@568
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@572
 }
 
 LazyJavaClassifierType@616['K'] {
     arguments = ArrayList@617[empty]
-    classifier = JavaTypeParameterImpl@571['K']
+    classifier = JavaTypeParameterImpl@596['K']
     nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@568
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@572
 }
 
 LazyJavaClassifierType@618['K'] {
     arguments = ArrayList@619[empty]
-    classifier = JavaTypeParameterImpl@587['K']
+    classifier = JavaTypeParameterImpl@575['K']
     nullable = 'true': Boolean@323
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@568
 }
 
 LazyJavaClassifierType@620['K'] {
     arguments = ArrayList@621[empty]
-    classifier = JavaTypeParameterImpl@590['K']
+    classifier = JavaTypeParameterImpl@581['K']
     nullable = 'true': Boolean@323
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@568
 }
 
-LazyJavaClassifierType@209['List<E>'] {
+LazyJavaClassifierType@226['List<E>'] {
     arguments = ArrayList@622[1] { TypeProjectionImpl@623 }
     classifier = JavaClassImpl@624['List']
     memberScope = SubstitutingScope@625
     typeConstructor = DeserializedClassTypeConstructor@626
 }
 
-LazyJavaClassifierType@226['List<E>'] {
+LazyJavaClassifierType@209['List<E>'] {
     arguments = ArrayList@627[1] { TypeProjectionImpl@628 }
     classifier = JavaClassImpl@629['List']
     memberScope = SubstitutingScope@630
@@ -1243,7 +1243,7 @@ LazyJavaClassifierType@659['Object'] {
 
 LazyJavaClassifierType@662['Object'] {
     arguments = ArrayList@663[empty]
-    classifier = JavaClassImpl@661['Object']
+    classifier = JavaClassImpl@656['Object']
     memberScope = DeserializedClassMemberScope@657
     nullable = 'true': Boolean@323
     typeConstructor = DeserializedClassTypeConstructor@658
@@ -1251,7 +1251,7 @@ LazyJavaClassifierType@662['Object'] {
 
 LazyJavaClassifierType@664['Object'] {
     arguments = ArrayList@665[empty]
-    classifier = JavaClassImpl@656['Object']
+    classifier = JavaClassImpl@661['Object']
     memberScope = DeserializedClassMemberScope@657
     nullable = 'true': Boolean@323
     typeConstructor = DeserializedClassTypeConstructor@658
@@ -1294,21 +1294,21 @@ LazyJavaClassifierType@678['Object'] {
 
 LazyJavaClassifierType@680['Object'] {
     arguments = ArrayList@681[empty]
-    classifier = JavaClassImpl@668['Object']
+    classifier = JavaClassImpl@677['Object']
     nullable = 'true': Boolean@323
     typeConstructor = DeserializedClassTypeConstructor@658
 }
 
 LazyJavaClassifierType@682['Object'] {
     arguments = ArrayList@683[empty]
-    classifier = JavaClassImpl@677['Object']
+    classifier = JavaClassImpl@674['Object']
     nullable = 'true': Boolean@323
     typeConstructor = DeserializedClassTypeConstructor@658
 }
 
 LazyJavaClassifierType@684['Object'] {
     arguments = ArrayList@685[empty]
-    classifier = JavaClassImpl@674['Object']
+    classifier = JavaClassImpl@668['Object']
     nullable = 'true': Boolean@323
     typeConstructor = DeserializedClassTypeConstructor@658
 }
@@ -1394,14 +1394,14 @@ LazyJavaClassifierType@713['Serializable'] {
     typeConstructor = LazyJavaClassTypeConstructor@167['Serializable']
 }
 
-LazyJavaClassifierType@263['Serializable'] {
-    arguments = ArrayList@716[empty]
-    classifier = JavaClassImpl@717['Serializable']
+LazyJavaClassifierType@716['Serializable'] {
+    arguments = ArrayList@717[empty]
+    classifier = JavaClassImpl@718['Serializable']
     memberScope = LazyJavaClassMemberScope@163
     typeConstructor = LazyJavaClassTypeConstructor@167['Serializable']
 }
 
-LazyJavaClassifierType@718['Serializable'] {
+LazyJavaClassifierType@263['Serializable'] {
     arguments = ArrayList@719[empty]
     classifier = JavaClassImpl@720['Serializable']
     memberScope = LazyJavaClassMemberScope@163
@@ -1503,28 +1503,28 @@ LazyJavaClassifierType@764['String'] {
 
 LazyJavaClassifierType@766['String'] {
     arguments = ArrayList@767[empty]
-    classifier = JavaClassImpl@760['String']
+    classifier = JavaClassImpl@744['String']
     nullable = 'true': Boolean@323
     typeConstructor = DeserializedClassTypeConstructor@745
 }
 
 LazyJavaClassifierType@768['String'] {
     arguments = ArrayList@769[empty]
-    classifier = JavaClassImpl@754['String']
+    classifier = JavaClassImpl@760['String']
     nullable = 'true': Boolean@323
     typeConstructor = DeserializedClassTypeConstructor@745
 }
 
 LazyJavaClassifierType@770['String'] {
     arguments = ArrayList@771[empty]
-    classifier = JavaClassImpl@751['String']
+    classifier = JavaClassImpl@748['String']
     nullable = 'true': Boolean@323
     typeConstructor = DeserializedClassTypeConstructor@745
 }
 
 LazyJavaClassifierType@772['String'] {
     arguments = ArrayList@773[empty]
-    classifier = JavaClassImpl@744['String']
+    classifier = JavaClassImpl@751['String']
     nullable = 'true': Boolean@323
     typeConstructor = DeserializedClassTypeConstructor@745
 }
@@ -1538,7 +1538,7 @@ LazyJavaClassifierType@774['String'] {
 
 LazyJavaClassifierType@776['String'] {
     arguments = ArrayList@777[empty]
-    classifier = JavaClassImpl@748['String']
+    classifier = JavaClassImpl@754['String']
     nullable = 'true': Boolean@323
     typeConstructor = DeserializedClassTypeConstructor@745
 }
@@ -1678,105 +1678,105 @@ LazyJavaClassifierType@830['StringBuilder'] {
 
 LazyJavaClassifierType@833['StringBuilder'] {
     arguments = ArrayList@834[empty]
-    classifier = JavaClassImpl@796['StringBuilder']
+    classifier = JavaClassImpl@829['StringBuilder']
     nullable = 'true': Boolean@323
     typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
 }
 
 LazyJavaClassifierType@835['StringBuilder'] {
     arguments = ArrayList@836[empty]
-    classifier = JavaClassImpl@814['StringBuilder']
+    classifier = JavaClassImpl@796['StringBuilder']
     nullable = 'true': Boolean@323
     typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
 }
 
 LazyJavaClassifierType@837['StringBuilder'] {
     arguments = ArrayList@838[empty]
-    classifier = JavaClassImpl@790['StringBuilder']
+    classifier = JavaClassImpl@805['StringBuilder']
     nullable = 'true': Boolean@323
     typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
 }
 
 LazyJavaClassifierType@839['StringBuilder'] {
     arguments = ArrayList@840[empty]
-    classifier = JavaClassImpl@802['StringBuilder']
+    classifier = JavaClassImpl@832['StringBuilder']
     nullable = 'true': Boolean@323
     typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
 }
 
 LazyJavaClassifierType@841['StringBuilder'] {
     arguments = ArrayList@842[empty]
-    classifier = JavaClassImpl@805['StringBuilder']
+    classifier = JavaClassImpl@811['StringBuilder']
     nullable = 'true': Boolean@323
     typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
 }
 
 LazyJavaClassifierType@843['StringBuilder'] {
     arguments = ArrayList@844[empty]
-    classifier = JavaClassImpl@808['StringBuilder']
+    classifier = JavaClassImpl@802['StringBuilder']
     nullable = 'true': Boolean@323
     typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
 }
 
 LazyJavaClassifierType@845['StringBuilder'] {
     arguments = ArrayList@846[empty]
-    classifier = JavaClassImpl@829['StringBuilder']
+    classifier = JavaClassImpl@808['StringBuilder']
     nullable = 'true': Boolean@323
     typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
 }
 
 LazyJavaClassifierType@847['StringBuilder'] {
     arguments = ArrayList@848[empty]
-    classifier = JavaClassImpl@826['StringBuilder']
+    classifier = JavaClassImpl@793['StringBuilder']
     nullable = 'true': Boolean@323
     typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
 }
 
 LazyJavaClassifierType@849['StringBuilder'] {
     arguments = ArrayList@850[empty]
-    classifier = JavaClassImpl@820['StringBuilder']
+    classifier = JavaClassImpl@817['StringBuilder']
     nullable = 'true': Boolean@323
     typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
 }
 
 LazyJavaClassifierType@851['StringBuilder'] {
     arguments = ArrayList@852[empty]
-    classifier = JavaClassImpl@823['StringBuilder']
+    classifier = JavaClassImpl@814['StringBuilder']
     nullable = 'true': Boolean@323
     typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
 }
 
 LazyJavaClassifierType@853['StringBuilder'] {
     arguments = ArrayList@854[empty]
-    classifier = JavaClassImpl@799['StringBuilder']
+    classifier = JavaClassImpl@820['StringBuilder']
     nullable = 'true': Boolean@323
     typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
 }
 
 LazyJavaClassifierType@855['StringBuilder'] {
     arguments = ArrayList@856[empty]
-    classifier = JavaClassImpl@793['StringBuilder']
+    classifier = JavaClassImpl@823['StringBuilder']
     nullable = 'true': Boolean@323
     typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
 }
 
 LazyJavaClassifierType@857['StringBuilder'] {
     arguments = ArrayList@858[empty]
-    classifier = JavaClassImpl@832['StringBuilder']
+    classifier = JavaClassImpl@790['StringBuilder']
     nullable = 'true': Boolean@323
     typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
 }
 
 LazyJavaClassifierType@859['StringBuilder'] {
     arguments = ArrayList@860[empty]
-    classifier = JavaClassImpl@817['StringBuilder']
+    classifier = JavaClassImpl@826['StringBuilder']
     nullable = 'true': Boolean@323
     typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
 }
 
 LazyJavaClassifierType@861['StringBuilder'] {
     arguments = ArrayList@862[empty]
-    classifier = JavaClassImpl@811['StringBuilder']
+    classifier = JavaClassImpl@799['StringBuilder']
     nullable = 'true': Boolean@323
     typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
 }
@@ -1799,28 +1799,28 @@ LazyJavaClassifierType@871['V'] {
     arguments = ArrayList@872[empty]
     classifier = JavaTypeParameterImpl@873['V']
     nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@870
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@866
 }
 
 LazyJavaClassifierType@874['V'] {
     arguments = ArrayList@875[empty]
     classifier = JavaTypeParameterImpl@876['V']
     nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@870
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@866
 }
 
 LazyJavaClassifierType@877['V'] {
     arguments = ArrayList@878[empty]
     classifier = JavaTypeParameterImpl@879['V']
     nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@866
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@870
 }
 
 LazyJavaClassifierType@880['V'] {
     arguments = ArrayList@881[empty]
     classifier = JavaTypeParameterImpl@882['V']
     nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@870
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@866
 }
 
 LazyJavaClassifierType@883['V'] {
@@ -1834,14 +1834,14 @@ LazyJavaClassifierType@886['V'] {
     arguments = ArrayList@887[empty]
     classifier = JavaTypeParameterImpl@888['V']
     nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@870
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@866
 }
 
 LazyJavaClassifierType@889['V'] {
     arguments = ArrayList@890[empty]
     classifier = JavaTypeParameterImpl@891['V']
     nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@866
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@870
 }
 
 LazyJavaClassifierType@892['V'] {
@@ -1855,14 +1855,14 @@ LazyJavaClassifierType@895['V'] {
     arguments = ArrayList@896[empty]
     classifier = JavaTypeParameterImpl@897['V']
     nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@870
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@866
 }
 
 LazyJavaClassifierType@898['V'] {
     arguments = ArrayList@899[empty]
-    classifier = JavaTypeParameterImpl@885['V']
+    classifier = JavaTypeParameterImpl@897['V']
     nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@870
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@866
 }
 
 LazyJavaClassifierType@900['V'] {
@@ -1874,35 +1874,35 @@ LazyJavaClassifierType@900['V'] {
 
 LazyJavaClassifierType@902['V'] {
     arguments = ArrayList@903[empty]
-    classifier = JavaTypeParameterImpl@897['V']
+    classifier = JavaTypeParameterImpl@865['V']
     nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@870
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@866
 }
 
 LazyJavaClassifierType@904['V'] {
     arguments = ArrayList@905[empty]
-    classifier = JavaTypeParameterImpl@869['V']
+    classifier = JavaTypeParameterImpl@882['V']
     nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@870
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@866
 }
 
 LazyJavaClassifierType@906['V'] {
     arguments = ArrayList@907[empty]
-    classifier = JavaTypeParameterImpl@882['V']
+    classifier = JavaTypeParameterImpl@888['V']
     nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@870
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@866
 }
 
 LazyJavaClassifierType@908['V'] {
     arguments = ArrayList@909[empty]
-    classifier = JavaTypeParameterImpl@873['V']
+    classifier = JavaTypeParameterImpl@891['V']
     nullable = 'true': Boolean@323
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@870
 }
 
 LazyJavaClassifierType@910['V'] {
     arguments = ArrayList@911[empty]
-    classifier = JavaTypeParameterImpl@888['V']
+    classifier = JavaTypeParameterImpl@869['V']
     nullable = 'true': Boolean@323
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@870
 }
@@ -1911,19 +1911,19 @@ LazyJavaClassifierType@912['V'] {
     arguments = ArrayList@913[empty]
     classifier = JavaTypeParameterImpl@876['V']
     nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@870
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@866
 }
 
 LazyJavaClassifierType@914['V'] {
     arguments = ArrayList@915[empty]
-    classifier = JavaTypeParameterImpl@891['V']
+    classifier = JavaTypeParameterImpl@885['V']
     nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@866
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@870
 }
 
 LazyJavaClassifierType@916['V'] {
     arguments = ArrayList@917[empty]
-    classifier = JavaTypeParameterImpl@865['V']
+    classifier = JavaTypeParameterImpl@873['V']
     nullable = 'true': Boolean@323
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@866
 }
@@ -1932,7 +1932,7 @@ LazyJavaClassifierType@918['V'] {
     arguments = ArrayList@919[empty]
     classifier = JavaTypeParameterImpl@879['V']
     nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@866
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@870
 }
 
 LazyJavaPackageFragmentProvider@920 {
@@ -2079,7 +2079,7 @@ LazyJavaPackageFragmentProvider@920 {
     topLevelClasses(JavaClassImpl@705['OutputStream']) = LazyJavaClassDescriptor@135['OutputStream']
     topLevelClasses(JavaClassImpl@708['PrintStream']) = LazyJavaClassDescriptor@139['PrintStream']
     topLevelClasses(JavaClassImpl@712['RandomAccess']) = LazyJavaClassDescriptor@157['RandomAccess']
-    topLevelClasses(JavaClassImpl@720['Serializable']) = LazyJavaClassDescriptor@161['Serializable']
+    topLevelClasses(JavaClassImpl@718['Serializable']) = LazyJavaClassDescriptor@161['Serializable']
     topLevelClasses(JavaClassImpl@780['StringBuffer']) = LazyJavaClassDescriptor@168['StringBuffer']
     topLevelClasses(JavaClassImpl@1058['StringBuilder']) = LazyJavaClassDescriptor@170['StringBuilder']
     topLevelClasses(JavaClassImpl@1059['System']) = LazyJavaClassDescriptor@190['System']
@@ -2243,23 +2243,23 @@ LazyJavaPackageFragment@1004['util'] {
     memberIndex = computeMemberIndex$1@1112 // through LazyPackageFragmentScopeForJavaPackage@1106
 }
 
-LazyJavaTypeParameterDescriptor@202['E'] {
+LazyJavaTypeParameterDescriptor@223['E'] {
     defaultType = JetTypeImpl@1113['E']
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
     upperBounds = LinkedHashSet@1114[1] { NullableType@1115 }
     upperBoundsAsType = NullableType@1115
 }
 
-LazyJavaTypeParameterDescriptor@206['E'] {
+LazyJavaTypeParameterDescriptor@202['E'] {
     defaultType = JetTypeImpl@1116['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@442
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@453
     upperBounds = LinkedHashSet@1117[1] { NullableType@1118 }
     upperBoundsAsType = NullableType@1118
 }
 
-LazyJavaTypeParameterDescriptor@223['E'] {
+LazyJavaTypeParameterDescriptor@206['E'] {
     defaultType = JetTypeImpl@1119['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@450
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@442
     upperBounds = LinkedHashSet@1120[1] { NullableType@1121 }
     upperBoundsAsType = NullableType@1121
 }
@@ -2273,19 +2273,19 @@ LazyJavaTypeParameterDescriptor@237['K'] {
 
 LazyJavaTypeParameterDescriptor@211['K'] {
     defaultType = JetTypeImpl@1125['K']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@575
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@572
     upperBounds = LinkedHashSet@1126[1] { NullableType@1127 }
     upperBoundsAsType = NullableType@1127
 }
 
-LazyJavaTypeParameterDescriptor@238['V'] {
+LazyJavaTypeParameterDescriptor@212['V'] {
     defaultType = JetTypeImpl@1128['V']
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@870
     upperBounds = LinkedHashSet@1129[1] { NullableType@1130 }
     upperBoundsAsType = NullableType@1130
 }
 
-LazyJavaTypeParameterDescriptor@212['V'] {
+LazyJavaTypeParameterDescriptor@238['V'] {
     defaultType = JetTypeImpl@1131['V']
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@866
     upperBounds = LinkedHashSet@1132[1] { NullableType@1133 }
@@ -2297,35 +2297,35 @@ LazyJavaTypeParameterResolver@1134 {
 }
 
 LazyJavaTypeParameterResolver@1136 {
-    resolve(JavaTypeParameterImpl@1137['E']) = LazyJavaTypeParameterDescriptor@223['E']
+    resolve(JavaTypeParameterImpl@1137['E']) = LazyJavaTypeParameterDescriptor@202['E']
 }
 
 LazyJavaTypeParameterResolver@1138 {
-    resolve(JavaTypeParameterImpl@1139['E']) = LazyJavaTypeParameterDescriptor@202['E']
+    resolve(JavaTypeParameterImpl@1139['E']) = LazyJavaTypeParameterDescriptor@223['E']
 }
 
 LazyJavaTypeParameterResolver@1140 {
-    resolve(JavaTypeParameterImpl@480['E']) = null
+    resolve(JavaTypeParameterImpl@462['E']) = null
 }
 
 LazyJavaTypeParameterResolver@1141 {
-    resolve(JavaTypeParameterImpl@486['E']) = null
+    resolve(JavaTypeParameterImpl@474['E']) = null
 }
 
 LazyJavaTypeParameterResolver@1142 {
-    resolve(JavaTypeParameterImpl@471['E']) = null
+    resolve(JavaTypeParameterImpl@489['E']) = null
 }
 
 LazyJavaTypeParameterResolver@1143 {
-    resolve(JavaTypeParameterImpl@441['E']) = null
+    resolve(JavaTypeParameterImpl@449['E']) = null
 }
 
 LazyJavaTypeParameterResolver@1144 {
-    resolve(JavaTypeParameterImpl@453['E']) = null
+    resolve(JavaTypeParameterImpl@471['E']) = null
 }
 
 LazyJavaTypeParameterResolver@1145 {
-    resolve(JavaTypeParameterImpl@489['E']) = null
+    resolve(JavaTypeParameterImpl@492['E']) = null
 }
 
 LazyJavaTypeParameterResolver@1146 {
@@ -2333,31 +2333,31 @@ LazyJavaTypeParameterResolver@1146 {
 }
 
 LazyJavaTypeParameterResolver@1147 {
-    resolve(JavaTypeParameterImpl@492['E']) = null
+    resolve(JavaTypeParameterImpl@445['E']) = null
 }
 
 LazyJavaTypeParameterResolver@1148 {
-    resolve(JavaTypeParameterImpl@1149['K']) = LazyJavaTypeParameterDescriptor@211['K']
-    resolve(JavaTypeParameterImpl@1150['V']) = LazyJavaTypeParameterDescriptor@212['V']
+    resolve(JavaTypeParameterImpl@1149['K']) = LazyJavaTypeParameterDescriptor@237['K']
+    resolve(JavaTypeParameterImpl@1150['V']) = LazyJavaTypeParameterDescriptor@238['V']
 }
 
 LazyJavaTypeParameterResolver@1151 {
-    resolve(JavaTypeParameterImpl@1152['K']) = LazyJavaTypeParameterDescriptor@237['K']
-    resolve(JavaTypeParameterImpl@1153['V']) = LazyJavaTypeParameterDescriptor@238['V']
+    resolve(JavaTypeParameterImpl@1152['K']) = LazyJavaTypeParameterDescriptor@211['K']
+    resolve(JavaTypeParameterImpl@1153['V']) = LazyJavaTypeParameterDescriptor@212['V']
 }
 
 LazyJavaTypeParameterResolver@1154 {
-    resolve(JavaTypeParameterImpl@596['K']) = null
-    resolve(JavaTypeParameterImpl@876['V']) = null
+    resolve(JavaTypeParameterImpl@599['K']) = null
+    resolve(JavaTypeParameterImpl@869['V']) = null
 }
 
 LazyJavaTypeParameterResolver@1155 {
-    resolve(JavaTypeParameterImpl@578['K']) = null
-    resolve(JavaTypeParameterImpl@894['V']) = null
+    resolve(JavaTypeParameterImpl@587['K']) = null
+    resolve(JavaTypeParameterImpl@882['V']) = null
 }
 
 LazyJavaTypeParameterResolver@1156 {
-    resolve(JavaTypeParameterImpl@567['K']) = null
+    resolve(JavaTypeParameterImpl@571['K']) = null
 }
 
 LazyJavaTypeParameterResolver@1157 {
@@ -2365,1172 +2365,848 @@ LazyJavaTypeParameterResolver@1157 {
 }
 
 LazyJavaTypeParameterResolver@1158 {
-    resolve(JavaTypeParameterImpl@865['V']) = null
+    resolve(JavaTypeParameterImpl@885['V']) = null
 }
 
 LazyJavaTypeParameterResolver@1159 {
-    resolve(JavaTypeParameterImpl@885['V']) = null
+    resolve(JavaTypeParameterImpl@876['V']) = null
 }
 
 ResolutionTaskHolder@1160 {
     <name not found> = ArrayList@1161[10] { ResolutionCandidate@1162, ResolutionCandidate@1163, ResolutionCandidate@1164, ... }
-    <name not found> = ArrayList@1165[10] { ResolutionCandidate@1162, ResolutionCandidate@1163, ResolutionCandidate@1164, ... }
 }
 
-ResolutionTaskHolder@1166 {
-    <name not found> = ArrayList@1167[13] { ResolutionCandidate@1168, ResolutionCandidate@1169, ResolutionCandidate@1170, ... }
-    <name not found> = ArrayList@1171[14] { ResolutionCandidate@1168, ResolutionCandidate@1169, ResolutionCandidate@1172, ... }
+ResolutionTaskHolder@1165 {
+    <name not found> = ArrayList@1166[13] { ResolutionCandidate@1167, ResolutionCandidate@1168, ResolutionCandidate@1169, ... }
 }
 
-ResolutionTaskHolder@1173 {
-    <name not found> = ArrayList@1174[13] { ResolutionCandidate@1175, ResolutionCandidate@1176, ResolutionCandidate@1177, ... }
-    <name not found> = ArrayList@1178[14] { ResolutionCandidate@1175, ResolutionCandidate@1176, ResolutionCandidate@1179, ... }
+ResolutionTaskHolder@1170 {
+    <name not found> = ArrayList@1171[13] { ResolutionCandidate@1172, ResolutionCandidate@1173, ResolutionCandidate@1174, ... }
+}
+
+ResolutionTaskHolder@1175 {
+    <name not found> = ArrayList@1176[13] { ResolutionCandidate@1177, ResolutionCandidate@1178, ResolutionCandidate@1179, ... }
 }
 
 ResolutionTaskHolder@1180 {
     <name not found> = ArrayList@1181[13] { ResolutionCandidate@1182, ResolutionCandidate@1183, ResolutionCandidate@1184, ... }
-    <name not found> = ArrayList@1185[14] { ResolutionCandidate@1182, ResolutionCandidate@1183, ResolutionCandidate@1186, ... }
 }
 
-ResolutionTaskHolder@1187 {
-    <name not found> = ArrayList@1188[13] { ResolutionCandidate@1189, ResolutionCandidate@1190, ResolutionCandidate@1191, ... }
-    <name not found> = ArrayList@1192[14] { ResolutionCandidate@1189, ResolutionCandidate@1190, ResolutionCandidate@1193, ... }
+ResolutionTaskHolder@1185 {
+    <name not found> = ArrayList@1186[1] { ResolutionCandidate@1187 }
+    <name not found> = ArrayList@1188[1] { ResolutionCandidate@1189 }
+    <name not found> = ArrayList@1190[1] { ResolutionCandidate@1191 }
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
 }
 
-ResolutionTaskHolder@1194 {
+ResolutionTaskHolder@1192 {
+    <name not found> = ArrayList@1193[1] { ResolutionCandidate@1194 }
     <name not found> = ArrayList@1195[1] { ResolutionCandidate@1196 }
-    <name not found> = ArrayList@1197[1] { ResolutionCandidate@1196 }
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+}
+
+ResolutionTaskHolder@1197 {
     <name not found> = ArrayList@1198[1] { ResolutionCandidate@1199 }
-    <name not found> = ArrayList@1200[1] { ResolutionCandidate@1199 }
-    <name not found> = ArrayList@1201[1] { ResolutionCandidate@1202 }
-    <name not found> = ArrayList@1203[1] { ResolutionCandidate@1202 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
+    <name not found> = ArrayList@1200[1] { ResolutionCandidate@1201 }
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
 }
 
-ResolutionTaskHolder@1204 {
+ResolutionTaskHolder@1202 {
+    <name not found> = ArrayList@1203[1] { ResolutionCandidate@1204 }
     <name not found> = ArrayList@1205[1] { ResolutionCandidate@1206 }
-    <name not found> = ArrayList@1207[1] { ResolutionCandidate@1206 }
+    <name not found> = EmptyList@75[empty]
+}
+
+ResolutionTaskHolder@1207 {
     <name not found> = ArrayList@1208[1] { ResolutionCandidate@1209 }
-    <name not found> = ArrayList@1210[1] { ResolutionCandidate@1209 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
+    <name not found> = ArrayList@1210[1] { ResolutionCandidate@1211 }
     <name not found> = EmptyList@75[empty]
 }
 
-ResolutionTaskHolder@1211 {
-    <name not found> = ArrayList@1212[1] { ResolutionCandidate@1213 }
-    <name not found> = ArrayList@1214[1] { ResolutionCandidate@1213 }
+ResolutionTaskHolder@1212 {
+    <name not found> = ArrayList@1213[1] { ResolutionCandidate@1214 }
     <name not found> = ArrayList@1215[1] { ResolutionCandidate@1216 }
-    <name not found> = ArrayList@1217[1] { ResolutionCandidate@1216 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
 }
 
-ResolutionTaskHolder@1218 {
-    <name not found> = ArrayList@1219[1] { ResolutionCandidate@1220 }
-    <name not found> = ArrayList@1221[1] { ResolutionCandidate@1220 }
-    <name not found> = ArrayList@1222[1] { ResolutionCandidate@1223 }
-    <name not found> = ArrayList@1224[1] { ResolutionCandidate@1223 }
-    <name not found> = EmptyList@75[empty]
+ResolutionTaskHolder@1217 {
+    <name not found> = ArrayList@1218[1] { ResolutionCandidate@1219 }
+    <name not found> = ArrayList@1220[1] { ResolutionCandidate@1221 }
     <name not found> = EmptyList@75[empty]
 }
 
-ResolutionTaskHolder@1225 {
-    <name not found> = ArrayList@1226[1] { ResolutionCandidate@1227 }
-    <name not found> = ArrayList@1228[1] { ResolutionCandidate@1227 }
-    <name not found> = ArrayList@1229[1] { ResolutionCandidate@1230 }
-    <name not found> = ArrayList@1231[1] { ResolutionCandidate@1230 }
+ResolutionTaskHolder@1222 {
+    <name not found> = ArrayList@1223[1] { ResolutionCandidate@1224 }
+    <name not found> = ArrayList@1225[1] { ResolutionCandidate@1226 }
     <name not found> = EmptyList@75[empty]
+}
+
+ResolutionTaskHolder@1227 {
+    <name not found> = ArrayList@1228[1] { ResolutionCandidate@1229 }
+    <name not found> = ArrayList@1230[1] { ResolutionCandidate@1231 }
     <name not found> = EmptyList@75[empty]
 }
 
 ResolutionTaskHolder@1232 {
     <name not found> = ArrayList@1233[1] { ResolutionCandidate@1234 }
-    <name not found> = ArrayList@1235[1] { ResolutionCandidate@1234 }
-    <name not found> = ArrayList@1236[1] { ResolutionCandidate@1237 }
-    <name not found> = ArrayList@1238[1] { ResolutionCandidate@1237 }
-    <name not found> = EmptyList@75[empty]
+    <name not found> = ArrayList@1235[1] { ResolutionCandidate@1236 }
     <name not found> = EmptyList@75[empty]
 }
 
-ResolutionTaskHolder@1239 {
+ResolutionTaskHolder@1237 {
+    <name not found> = ArrayList@1238[1] { ResolutionCandidate@1239 }
     <name not found> = ArrayList@1240[1] { ResolutionCandidate@1241 }
-    <name not found> = ArrayList@1242[1] { ResolutionCandidate@1241 }
+    <name not found> = EmptyList@75[empty]
+}
+
+ResolutionTaskHolder@1242 {
     <name not found> = ArrayList@1243[1] { ResolutionCandidate@1244 }
-    <name not found> = ArrayList@1245[1] { ResolutionCandidate@1244 }
-    <name not found> = EmptyList@75[empty]
+    <name not found> = ArrayList@1245[1] { ResolutionCandidate@1246 }
     <name not found> = EmptyList@75[empty]
 }
 
-ResolutionTaskHolder@1246 {
-    <name not found> = ArrayList@1247[1] { ResolutionCandidate@1248 }
-    <name not found> = ArrayList@1249[1] { ResolutionCandidate@1248 }
+ResolutionTaskHolder@1247 {
+    <name not found> = ArrayList@1248[1] { ResolutionCandidate@1249 }
     <name not found> = ArrayList@1250[1] { ResolutionCandidate@1251 }
-    <name not found> = ArrayList@1252[1] { ResolutionCandidate@1251 }
+    <name not found> = EmptyList@75[empty]
+}
+
+ResolutionTaskHolder@1252 {
+    <name not found> = ArrayList@1253[1] { ResolutionCandidate@1254 }
+    <name not found> = ArrayList@1255[1] { ResolutionCandidate@1256 }
+    <name not found> = EmptyList@75[empty]
+}
+
+ResolutionTaskHolder@1257 {
+    <name not found> = ArrayList@1258[1] { ResolutionCandidate@1259 }
+    <name not found> = ArrayList@1260[1] { ResolutionCandidate@1261 }
+    <name not found> = EmptyList@75[empty]
+}
+
+ResolutionTaskHolder@1262 {
+    <name not found> = ArrayList@1263[1] { ResolutionCandidate@1264 }
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
 }
 
-ResolutionTaskHolder@1253 {
-    <name not found> = ArrayList@1254[1] { ResolutionCandidate@1255 }
-    <name not found> = ArrayList@1256[1] { ResolutionCandidate@1255 }
-    <name not found> = ArrayList@1257[1] { ResolutionCandidate@1258 }
-    <name not found> = ArrayList@1259[1] { ResolutionCandidate@1258 }
+ResolutionTaskHolder@1265 {
+    <name not found> = ArrayList@1266[1] { ResolutionCandidate@1267 }
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
 }
 
-ResolutionTaskHolder@1260 {
-    <name not found> = ArrayList@1261[1] { ResolutionCandidate@1262 }
-    <name not found> = ArrayList@1263[1] { ResolutionCandidate@1262 }
-    <name not found> = ArrayList@1264[1] { ResolutionCandidate@1265 }
-    <name not found> = ArrayList@1266[1] { ResolutionCandidate@1265 }
+ResolutionTaskHolder@1268 {
+    <name not found> = ArrayList@1269[1] { ResolutionCandidate@1270 }
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
 }
 
-ResolutionTaskHolder@1267 {
-    <name not found> = ArrayList@1268[1] { ResolutionCandidate@1269 }
-    <name not found> = ArrayList@1270[1] { ResolutionCandidate@1269 }
-    <name not found> = ArrayList@1271[1] { ResolutionCandidate@1272 }
-    <name not found> = ArrayList@1273[1] { ResolutionCandidate@1272 }
+ResolutionTaskHolder@1271 {
+    <name not found> = ArrayList@1272[1] { ResolutionCandidate@1273 }
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
 }
 
 ResolutionTaskHolder@1274 {
     <name not found> = ArrayList@1275[1] { ResolutionCandidate@1276 }
-    <name not found> = ArrayList@1277[1] { ResolutionCandidate@1276 }
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+}
+
+ResolutionTaskHolder@1277 {
     <name not found> = ArrayList@1278[1] { ResolutionCandidate@1279 }
-    <name not found> = ArrayList@1280[1] { ResolutionCandidate@1279 }
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
 }
 
-ResolutionTaskHolder@1281 {
-    <name not found> = ArrayList@1282[1] { ResolutionCandidate@1283 }
-    <name not found> = ArrayList@1284[1] { ResolutionCandidate@1283 }
-    <name not found> = ArrayList@1285[1] { ResolutionCandidate@1286 }
-    <name not found> = ArrayList@1287[1] { ResolutionCandidate@1286 }
+ResolutionTaskHolder@1280 {
+    <name not found> = ArrayList@1281[1] { ResolutionCandidate@1282 }
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
 }
 
-ResolutionTaskHolder@1288 {
-    <name not found> = ArrayList@1289[1] { ResolutionCandidate@1290 }
-    <name not found> = ArrayList@1291[1] { ResolutionCandidate@1290 }
-    <name not found> = ArrayList@1292[1] { ResolutionCandidate@1293 }
-    <name not found> = ArrayList@1294[1] { ResolutionCandidate@1293 }
+ResolutionTaskHolder@1283 {
+    <name not found> = ArrayList@1284[1] { ResolutionCandidate@1285 }
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+}
+
+ResolutionTaskHolder@1286 {
+    <name not found> = ArrayList@1287[1] { ResolutionCandidate@1288 }
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+}
+
+ResolutionTaskHolder@1289 {
+    <name not found> = ArrayList@1290[1] { ResolutionCandidate@1291 }
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+}
+
+ResolutionTaskHolder@1292 {
+    <name not found> = ArrayList@1293[1] { ResolutionCandidate@1294 }
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
 }
 
 ResolutionTaskHolder@1295 {
     <name not found> = ArrayList@1296[1] { ResolutionCandidate@1297 }
-    <name not found> = ArrayList@1298[1] { ResolutionCandidate@1297 }
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+}
+
+ResolutionTaskHolder@1298 {
     <name not found> = ArrayList@1299[1] { ResolutionCandidate@1300 }
-    <name not found> = ArrayList@1301[1] { ResolutionCandidate@1300 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1302 {
-    <name not found> = ArrayList@1303[1] { ResolutionCandidate@1304 }
-    <name not found> = ArrayList@1305[1] { ResolutionCandidate@1304 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
 }
 
-ResolutionTaskHolder@1306 {
-    <name not found> = ArrayList@1307[1] { ResolutionCandidate@1308 }
-    <name not found> = ArrayList@1309[1] { ResolutionCandidate@1308 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
+ResolutionTaskHolder@1301 {
+    <name not found> = ArrayList@1302[1] { ResolutionCandidate@1303 }
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
+}
+
+ResolutionTaskHolder@1304 {
+    <name not found> = ArrayList@1305[1] { ResolutionCandidate@1306 }
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
+}
+
+ResolutionTaskHolder@1307 {
+    <name not found> = ArrayList@1308[1] { ResolutionCandidate@1309 }
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
 }
 
 ResolutionTaskHolder@1310 {
     <name not found> = ArrayList@1311[1] { ResolutionCandidate@1312 }
-    <name not found> = ArrayList@1313[1] { ResolutionCandidate@1312 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
 }
 
-ResolutionTaskHolder@1314 {
-    <name not found> = ArrayList@1315[1] { ResolutionCandidate@1316 }
-    <name not found> = ArrayList@1317[1] { ResolutionCandidate@1316 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
+ResolutionTaskHolder@1313 {
+    <name not found> = ArrayList@1314[1] { ResolutionCandidate@1315 }
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
 }
 
-ResolutionTaskHolder@1318 {
-    <name not found> = ArrayList@1319[1] { ResolutionCandidate@1320 }
-    <name not found> = ArrayList@1321[1] { ResolutionCandidate@1320 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
+ResolutionTaskHolder@1316 {
+    <name not found> = ArrayList@1317[1] { ResolutionCandidate@1318 }
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
+}
+
+ResolutionTaskHolder@1319 {
+    <name not found> = ArrayList@1320[1] { ResolutionCandidate@1321 }
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
 }
 
 ResolutionTaskHolder@1322 {
     <name not found> = ArrayList@1323[1] { ResolutionCandidate@1324 }
-    <name not found> = ArrayList@1325[1] { ResolutionCandidate@1324 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
 }
 
-ResolutionTaskHolder@1326 {
-    <name not found> = ArrayList@1327[1] { ResolutionCandidate@1328 }
-    <name not found> = ArrayList@1329[1] { ResolutionCandidate@1328 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
+ResolutionTaskHolder@1325 {
+    <name not found> = ArrayList@1326[1] { ResolutionCandidate@1327 }
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
 }
 
-ResolutionTaskHolder@1330 {
-    <name not found> = ArrayList@1331[1] { ResolutionCandidate@1332 }
-    <name not found> = ArrayList@1333[1] { ResolutionCandidate@1332 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
+ResolutionTaskHolder@1328 {
+    <name not found> = ArrayList@1329[1] { ResolutionCandidate@1330 }
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
+}
+
+ResolutionTaskHolder@1331 {
+    <name not found> = ArrayList@1332[1] { ResolutionCandidate@1333 }
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
 }
 
 ResolutionTaskHolder@1334 {
     <name not found> = ArrayList@1335[1] { ResolutionCandidate@1336 }
-    <name not found> = ArrayList@1337[1] { ResolutionCandidate@1336 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
 }
 
-ResolutionTaskHolder@1338 {
-    <name not found> = ArrayList@1339[1] { ResolutionCandidate@1340 }
-    <name not found> = ArrayList@1341[1] { ResolutionCandidate@1340 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
+ResolutionTaskHolder@1337 {
+    <name not found> = ArrayList@1338[1] { ResolutionCandidate@1339 }
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
 }
 
-ResolutionTaskHolder@1342 {
-    <name not found> = ArrayList@1343[1] { ResolutionCandidate@1344 }
-    <name not found> = ArrayList@1345[1] { ResolutionCandidate@1344 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
+ResolutionTaskHolder@1340 {
+    <name not found> = ArrayList@1341[1] { ResolutionCandidate@1342 }
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
+}
+
+ResolutionTaskHolder@1343 {
+    <name not found> = ArrayList@1344[1] { ResolutionCandidate@1345 }
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
 }
 
 ResolutionTaskHolder@1346 {
     <name not found> = ArrayList@1347[1] { ResolutionCandidate@1348 }
-    <name not found> = ArrayList@1349[1] { ResolutionCandidate@1348 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
 }
 
-ResolutionTaskHolder@1350 {
-    <name not found> = ArrayList@1351[1] { ResolutionCandidate@1352 }
-    <name not found> = ArrayList@1353[1] { ResolutionCandidate@1352 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
+ResolutionTaskHolder@1349 {
+    <name not found> = ArrayList@1350[1] { ResolutionCandidate@1351 }
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
 }
 
-ResolutionTaskHolder@1354 {
-    <name not found> = ArrayList@1355[1] { ResolutionCandidate@1356 }
-    <name not found> = ArrayList@1357[1] { ResolutionCandidate@1356 }
+ResolutionTaskHolder@1352 {
+    <name not found> = ArrayList@1353[1] { ResolutionCandidate@1354 }
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
+}
+
+ResolutionTaskHolder@1355 {
+    <name not found> = ArrayList@1356[1] { ResolutionCandidate@1357 }
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
 }
 
 ResolutionTaskHolder@1358 {
     <name not found> = ArrayList@1359[1] { ResolutionCandidate@1360 }
-    <name not found> = ArrayList@1361[1] { ResolutionCandidate@1360 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
 }
 
-ResolutionTaskHolder@1362 {
-    <name not found> = ArrayList@1363[1] { ResolutionCandidate@1364 }
-    <name not found> = ArrayList@1365[1] { ResolutionCandidate@1364 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
+ResolutionTaskHolder@1361 {
+    <name not found> = ArrayList@1362[1] { ResolutionCandidate@1363 }
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
 }
 
-ResolutionTaskHolder@1366 {
-    <name not found> = ArrayList@1367[1] { ResolutionCandidate@1368 }
-    <name not found> = ArrayList@1369[1] { ResolutionCandidate@1368 }
+ResolutionTaskHolder@1364 {
+    <name not found> = ArrayList@1365[1] { ResolutionCandidate@1366 }
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
+}
+
+ResolutionTaskHolder@1367 {
+    <name not found> = ArrayList@1368[1] { ResolutionCandidate@1369 }
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
 }
 
 ResolutionTaskHolder@1370 {
     <name not found> = ArrayList@1371[1] { ResolutionCandidate@1372 }
-    <name not found> = ArrayList@1373[1] { ResolutionCandidate@1372 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
 }
 
-ResolutionTaskHolder@1374 {
-    <name not found> = ArrayList@1375[1] { ResolutionCandidate@1376 }
-    <name not found> = ArrayList@1377[1] { ResolutionCandidate@1376 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
+ResolutionTaskHolder@1373 {
+    <name not found> = ArrayList@1374[1] { ResolutionCandidate@1375 }
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
 }
 
-ResolutionTaskHolder@1378 {
-    <name not found> = ArrayList@1379[1] { ResolutionCandidate@1380 }
-    <name not found> = ArrayList@1381[1] { ResolutionCandidate@1380 }
+ResolutionTaskHolder@1376 {
+    <name not found> = ArrayList@1377[1] { ResolutionCandidate@1378 }
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
+}
+
+ResolutionTaskHolder@1379 {
+    <name not found> = ArrayList@1380[1] { ResolutionCandidate@1381 }
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
 }
 
 ResolutionTaskHolder@1382 {
     <name not found> = ArrayList@1383[1] { ResolutionCandidate@1384 }
-    <name not found> = ArrayList@1385[1] { ResolutionCandidate@1384 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
 }
 
-ResolutionTaskHolder@1386 {
-    <name not found> = ArrayList@1387[1] { ResolutionCandidate@1388 }
-    <name not found> = ArrayList@1389[1] { ResolutionCandidate@1388 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
+ResolutionTaskHolder@1385 {
+    <name not found> = ArrayList@1386[1] { ResolutionCandidate@1387 }
     <name not found> = EmptyList@75[empty]
 }
 
-ResolutionTaskHolder@1390 {
-    <name not found> = ArrayList@1391[1] { ResolutionCandidate@1392 }
-    <name not found> = ArrayList@1393[1] { ResolutionCandidate@1392 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
+ResolutionTaskHolder@1388 {
+    <name not found> = ArrayList@1389[1] { ResolutionCandidate@1390 }
     <name not found> = EmptyList@75[empty]
+}
+
+ResolutionTaskHolder@1391 {
+    <name not found> = ArrayList@1392[1] { ResolutionCandidate@1393 }
     <name not found> = EmptyList@75[empty]
 }
 
 ResolutionTaskHolder@1394 {
     <name not found> = ArrayList@1395[1] { ResolutionCandidate@1396 }
-    <name not found> = ArrayList@1397[1] { ResolutionCandidate@1396 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
 }
 
-ResolutionTaskHolder@1398 {
-    <name not found> = ArrayList@1399[1] { ResolutionCandidate@1400 }
-    <name not found> = ArrayList@1401[1] { ResolutionCandidate@1400 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
+ResolutionTaskHolder@1397 {
+    <name not found> = ArrayList@1398[1] { ResolutionCandidate@1399 }
     <name not found> = EmptyList@75[empty]
 }
 
-ResolutionTaskHolder@1402 {
-    <name not found> = ArrayList@1403[1] { ResolutionCandidate@1404 }
-    <name not found> = ArrayList@1405[1] { ResolutionCandidate@1404 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
+ResolutionTaskHolder@1400 {
+    <name not found> = ArrayList@1401[1] { ResolutionCandidate@1402 }
     <name not found> = EmptyList@75[empty]
+}
+
+ResolutionTaskHolder@1403 {
+    <name not found> = ArrayList@1404[1] { ResolutionCandidate@1405 }
     <name not found> = EmptyList@75[empty]
 }
 
 ResolutionTaskHolder@1406 {
     <name not found> = ArrayList@1407[1] { ResolutionCandidate@1408 }
-    <name not found> = ArrayList@1409[1] { ResolutionCandidate@1408 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
 }
 
-ResolutionTaskHolder@1410 {
-    <name not found> = ArrayList@1411[1] { ResolutionCandidate@1412 }
-    <name not found> = ArrayList@1413[1] { ResolutionCandidate@1412 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
+ResolutionTaskHolder@1409 {
+    <name not found> = ArrayList@1410[1] { ResolutionCandidate@1411 }
     <name not found> = EmptyList@75[empty]
 }
 
-ResolutionTaskHolder@1414 {
-    <name not found> = ArrayList@1415[1] { ResolutionCandidate@1416 }
-    <name not found> = ArrayList@1417[1] { ResolutionCandidate@1416 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
+ResolutionTaskHolder@1412 {
+    <name not found> = ArrayList@1413[1] { ResolutionCandidate@1414 }
     <name not found> = EmptyList@75[empty]
 }
 
+ResolutionTaskHolder@1415 {
+    <name not found> = ArrayList@1416[1] { ResolutionCandidate@1417 }
+}
+
 ResolutionTaskHolder@1418 {
     <name not found> = ArrayList@1419[1] { ResolutionCandidate@1420 }
-    <name not found> = ArrayList@1421[1] { ResolutionCandidate@1420 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
 }
 
-ResolutionTaskHolder@1422 {
-    <name not found> = ArrayList@1423[1] { ResolutionCandidate@1424 }
-    <name not found> = ArrayList@1425[1] { ResolutionCandidate@1424 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
+ResolutionTaskHolder@1421 {
+    <name not found> = ArrayList@1422[1] { ResolutionCandidate@1423 }
 }
 
-ResolutionTaskHolder@1426 {
-    <name not found> = ArrayList@1427[1] { ResolutionCandidate@1428 }
-    <name not found> = ArrayList@1429[1] { ResolutionCandidate@1428 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
+ResolutionTaskHolder@1424 {
+    <name not found> = ArrayList@1425[1] { ResolutionCandidate@1426 }
+}
+
+ResolutionTaskHolder@1427 {
+    <name not found> = ArrayList@1428[1] { ResolutionCandidate@1429 }
 }
 
 ResolutionTaskHolder@1430 {
     <name not found> = ArrayList@1431[1] { ResolutionCandidate@1432 }
-    <name not found> = ArrayList@1433[1] { ResolutionCandidate@1432 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
 }
 
-ResolutionTaskHolder@1434 {
-    <name not found> = ArrayList@1435[1] { ResolutionCandidate@1436 }
-    <name not found> = ArrayList@1437[1] { ResolutionCandidate@1436 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
+ResolutionTaskHolder@1433 {
+    <name not found> = ArrayList@1434[1] { ResolutionCandidate@1435 }
 }
 
-ResolutionTaskHolder@1438 {
-    <name not found> = ArrayList@1439[1] { ResolutionCandidate@1440 }
-    <name not found> = ArrayList@1441[1] { ResolutionCandidate@1440 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
+ResolutionTaskHolder@1436 {
+    <name not found> = ArrayList@1437[1] { ResolutionCandidate@1438 }
+}
+
+ResolutionTaskHolder@1439 {
+    <name not found> = ArrayList@1440[1] { ResolutionCandidate@1441 }
 }
 
 ResolutionTaskHolder@1442 {
     <name not found> = ArrayList@1443[1] { ResolutionCandidate@1444 }
-    <name not found> = ArrayList@1445[1] { ResolutionCandidate@1444 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
 }
 
-ResolutionTaskHolder@1446 {
-    <name not found> = ArrayList@1447[1] { ResolutionCandidate@1448 }
-    <name not found> = ArrayList@1449[1] { ResolutionCandidate@1448 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
+ResolutionTaskHolder@1445 {
+    <name not found> = ArrayList@1446[1] { ResolutionCandidate@1447 }
 }
 
-ResolutionTaskHolder@1450 {
-    <name not found> = ArrayList@1451[1] { ResolutionCandidate@1452 }
-    <name not found> = ArrayList@1453[1] { ResolutionCandidate@1452 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
+ResolutionTaskHolder@1448 {
+    <name not found> = ArrayList@1449[1] { ResolutionCandidate@1450 }
+}
+
+ResolutionTaskHolder@1451 {
+    <name not found> = ArrayList@1452[1] { ResolutionCandidate@1453 }
 }
 
 ResolutionTaskHolder@1454 {
     <name not found> = ArrayList@1455[1] { ResolutionCandidate@1456 }
-    <name not found> = ArrayList@1457[1] { ResolutionCandidate@1456 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
 }
 
-ResolutionTaskHolder@1458 {
-    <name not found> = ArrayList@1459[1] { ResolutionCandidate@1460 }
-    <name not found> = ArrayList@1461[1] { ResolutionCandidate@1460 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
+ResolutionTaskHolder@1457 {
+    <name not found> = ArrayList@1458[1] { ResolutionCandidate@1459 }
 }
 
-ResolutionTaskHolder@1462 {
-    <name not found> = ArrayList@1463[1] { ResolutionCandidate@1464 }
-    <name not found> = ArrayList@1465[1] { ResolutionCandidate@1464 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
+ResolutionTaskHolder@1460 {
+    <name not found> = ArrayList@1461[1] { ResolutionCandidate@1462 }
+}
+
+ResolutionTaskHolder@1463 {
+    <name not found> = ArrayList@1464[1] { ResolutionCandidate@1465 }
 }
 
 ResolutionTaskHolder@1466 {
     <name not found> = ArrayList@1467[1] { ResolutionCandidate@1468 }
-    <name not found> = ArrayList@1469[1] { ResolutionCandidate@1468 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
 }
 
-ResolutionTaskHolder@1470 {
-    <name not found> = ArrayList@1471[1] { ResolutionCandidate@1472 }
-    <name not found> = ArrayList@1473[1] { ResolutionCandidate@1472 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
+ResolutionTaskHolder@1469 {
+    <name not found> = ArrayList@1470[1] { ResolutionCandidate@1471 }
 }
 
-ResolutionTaskHolder@1474 {
-    <name not found> = ArrayList@1475[1] { ResolutionCandidate@1476 }
-    <name not found> = ArrayList@1477[1] { ResolutionCandidate@1476 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
+ResolutionTaskHolder@1472 {
+    <name not found> = ArrayList@1473[1] { ResolutionCandidate@1474 }
+}
+
+ResolutionTaskHolder@1475 {
+    <name not found> = ArrayList@1476[1] { ResolutionCandidate@1477 }
 }
 
 ResolutionTaskHolder@1478 {
     <name not found> = ArrayList@1479[1] { ResolutionCandidate@1480 }
-    <name not found> = ArrayList@1481[1] { ResolutionCandidate@1480 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
 }
 
-ResolutionTaskHolder@1482 {
-    <name not found> = ArrayList@1483[1] { ResolutionCandidate@1484 }
-    <name not found> = ArrayList@1485[1] { ResolutionCandidate@1484 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
+ResolutionTaskHolder@1481 {
+    <name not found> = ArrayList@1482[1] { ResolutionCandidate@1483 }
 }
 
-ResolutionTaskHolder@1486 {
-    <name not found> = ArrayList@1487[1] { ResolutionCandidate@1488 }
-    <name not found> = ArrayList@1489[1] { ResolutionCandidate@1488 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
+ResolutionTaskHolder@1484 {
+    <name not found> = ArrayList@1485[1] { ResolutionCandidate@1486 }
+}
+
+ResolutionTaskHolder@1487 {
+    <name not found> = ArrayList@1488[1] { ResolutionCandidate@1489 }
 }
 
 ResolutionTaskHolder@1490 {
     <name not found> = ArrayList@1491[1] { ResolutionCandidate@1492 }
-    <name not found> = ArrayList@1493[1] { ResolutionCandidate@1492 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
 }
 
-ResolutionTaskHolder@1494 {
-    <name not found> = ArrayList@1495[1] { ResolutionCandidate@1496 }
-    <name not found> = ArrayList@1497[1] { ResolutionCandidate@1496 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
+ResolutionTaskHolder@1493 {
+    <name not found> = ArrayList@1494[1] { ResolutionCandidate@1495 }
 }
 
-ResolutionTaskHolder@1498 {
-    <name not found> = ArrayList@1499[1] { ResolutionCandidate@1500 }
-    <name not found> = ArrayList@1501[1] { ResolutionCandidate@1500 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
+ResolutionTaskHolder@1496 {
+    <name not found> = ArrayList@1497[1] { ResolutionCandidate@1498 }
+}
+
+ResolutionTaskHolder@1499 {
+    <name not found> = ArrayList@1500[1] { ResolutionCandidate@1501 }
 }
 
 ResolutionTaskHolder@1502 {
     <name not found> = ArrayList@1503[1] { ResolutionCandidate@1504 }
-    <name not found> = ArrayList@1505[1] { ResolutionCandidate@1504 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
 }
 
-ResolutionTaskHolder@1506 {
-    <name not found> = ArrayList@1507[1] { ResolutionCandidate@1508 }
-    <name not found> = ArrayList@1509[1] { ResolutionCandidate@1508 }
+ResolutionTaskHolder@1505 {
+    <name not found> = ArrayList@1506[1] { ResolutionCandidate@1507 }
 }
 
-ResolutionTaskHolder@1510 {
-    <name not found> = ArrayList@1511[1] { ResolutionCandidate@1512 }
-    <name not found> = ArrayList@1513[1] { ResolutionCandidate@1512 }
+ResolutionTaskHolder@1508 {
+    <name not found> = ArrayList@1509[1] { ResolutionCandidate@1510 }
+}
+
+ResolutionTaskHolder@1511 {
+    <name not found> = ArrayList@1512[1] { ResolutionCandidate@1513 }
 }
 
 ResolutionTaskHolder@1514 {
     <name not found> = ArrayList@1515[1] { ResolutionCandidate@1516 }
-    <name not found> = ArrayList@1517[1] { ResolutionCandidate@1516 }
 }
 
-ResolutionTaskHolder@1518 {
-    <name not found> = ArrayList@1519[1] { ResolutionCandidate@1520 }
-    <name not found> = ArrayList@1521[1] { ResolutionCandidate@1520 }
+ResolutionTaskHolder@1517 {
+    <name not found> = ArrayList@1518[1] { ResolutionCandidate@1519 }
 }
 
-ResolutionTaskHolder@1522 {
-    <name not found> = ArrayList@1523[1] { ResolutionCandidate@1524 }
-    <name not found> = ArrayList@1525[1] { ResolutionCandidate@1524 }
+ResolutionTaskHolder@1520 {
+    <name not found> = ArrayList@1521[1] { ResolutionCandidate@1522 }
+}
+
+ResolutionTaskHolder@1523 {
+    <name not found> = ArrayList@1524[1] { ResolutionCandidate@1525 }
 }
 
 ResolutionTaskHolder@1526 {
     <name not found> = ArrayList@1527[1] { ResolutionCandidate@1528 }
-    <name not found> = ArrayList@1529[1] { ResolutionCandidate@1528 }
 }
 
-ResolutionTaskHolder@1530 {
-    <name not found> = ArrayList@1531[1] { ResolutionCandidate@1532 }
-    <name not found> = ArrayList@1533[1] { ResolutionCandidate@1532 }
+ResolutionTaskHolder@1529 {
+    <name not found> = ArrayList@1530[1] { ResolutionCandidate@1531 }
 }
 
-ResolutionTaskHolder@1534 {
-    <name not found> = ArrayList@1535[1] { ResolutionCandidate@1536 }
-    <name not found> = ArrayList@1537[1] { ResolutionCandidate@1536 }
+ResolutionTaskHolder@1532 {
+    <name not found> = ArrayList@1533[1] { ResolutionCandidate@1534 }
+}
+
+ResolutionTaskHolder@1535 {
+    <name not found> = ArrayList@1536[1] { ResolutionCandidate@1537 }
 }
 
 ResolutionTaskHolder@1538 {
     <name not found> = ArrayList@1539[1] { ResolutionCandidate@1540 }
-    <name not found> = ArrayList@1541[1] { ResolutionCandidate@1540 }
 }
 
-ResolutionTaskHolder@1542 {
-    <name not found> = ArrayList@1543[1] { ResolutionCandidate@1544 }
-    <name not found> = ArrayList@1545[1] { ResolutionCandidate@1544 }
+ResolutionTaskHolder@1541 {
+    <name not found> = ArrayList@1542[1] { ResolutionCandidate@1543 }
 }
 
-ResolutionTaskHolder@1546 {
-    <name not found> = ArrayList@1547[1] { ResolutionCandidate@1548 }
-    <name not found> = ArrayList@1549[1] { ResolutionCandidate@1548 }
+ResolutionTaskHolder@1544 {
+    <name not found> = ArrayList@1545[1] { ResolutionCandidate@1546 }
+}
+
+ResolutionTaskHolder@1547 {
+    <name not found> = ArrayList@1548[1] { ResolutionCandidate@1549 }
 }
 
 ResolutionTaskHolder@1550 {
     <name not found> = ArrayList@1551[1] { ResolutionCandidate@1552 }
-    <name not found> = ArrayList@1553[1] { ResolutionCandidate@1552 }
 }
 
-ResolutionTaskHolder@1554 {
-    <name not found> = ArrayList@1555[1] { ResolutionCandidate@1556 }
-    <name not found> = ArrayList@1557[1] { ResolutionCandidate@1556 }
+ResolutionTaskHolder@1553 {
+    <name not found> = ArrayList@1554[1] { ResolutionCandidate@1555 }
 }
 
-ResolutionTaskHolder@1558 {
-    <name not found> = ArrayList@1559[1] { ResolutionCandidate@1560 }
-    <name not found> = ArrayList@1561[1] { ResolutionCandidate@1560 }
+ResolutionTaskHolder@1556 {
+    <name not found> = ArrayList@1557[1] { ResolutionCandidate@1558 }
+}
+
+ResolutionTaskHolder@1559 {
+    <name not found> = ArrayList@1560[1] { ResolutionCandidate@1561 }
 }
 
 ResolutionTaskHolder@1562 {
     <name not found> = ArrayList@1563[1] { ResolutionCandidate@1564 }
-    <name not found> = ArrayList@1565[1] { ResolutionCandidate@1564 }
 }
 
-ResolutionTaskHolder@1566 {
-    <name not found> = ArrayList@1567[1] { ResolutionCandidate@1568 }
-    <name not found> = ArrayList@1569[1] { ResolutionCandidate@1568 }
+ResolutionTaskHolder@1565 {
+    <name not found> = ArrayList@1566[1] { ResolutionCandidate@1567 }
 }
 
-ResolutionTaskHolder@1570 {
-    <name not found> = ArrayList@1571[1] { ResolutionCandidate@1572 }
-    <name not found> = ArrayList@1573[1] { ResolutionCandidate@1572 }
+ResolutionTaskHolder@1568 {
+    <name not found> = ArrayList@1569[1] { ResolutionCandidate@1570 }
+}
+
+ResolutionTaskHolder@1571 {
+    <name not found> = ArrayList@1572[1] { ResolutionCandidate@1573 }
 }
 
 ResolutionTaskHolder@1574 {
     <name not found> = ArrayList@1575[1] { ResolutionCandidate@1576 }
-    <name not found> = ArrayList@1577[1] { ResolutionCandidate@1576 }
 }
 
-ResolutionTaskHolder@1578 {
-    <name not found> = ArrayList@1579[1] { ResolutionCandidate@1580 }
-    <name not found> = ArrayList@1581[1] { ResolutionCandidate@1580 }
+ResolutionTaskHolder@1577 {
+    <name not found> = ArrayList@1578[1] { ResolutionCandidate@1579 }
 }
 
-ResolutionTaskHolder@1582 {
-    <name not found> = ArrayList@1583[1] { ResolutionCandidate@1584 }
-    <name not found> = ArrayList@1585[1] { ResolutionCandidate@1584 }
+ResolutionTaskHolder@1580 {
+    <name not found> = ArrayList@1581[1] { ResolutionCandidate@1582 }
+}
+
+ResolutionTaskHolder@1583 {
+    <name not found> = ArrayList@1584[1] { ResolutionCandidate@1585 }
 }
 
 ResolutionTaskHolder@1586 {
     <name not found> = ArrayList@1587[1] { ResolutionCandidate@1588 }
-    <name not found> = ArrayList@1589[1] { ResolutionCandidate@1588 }
 }
 
-ResolutionTaskHolder@1590 {
-    <name not found> = ArrayList@1591[1] { ResolutionCandidate@1592 }
-    <name not found> = ArrayList@1593[1] { ResolutionCandidate@1592 }
+ResolutionTaskHolder@1589 {
+    <name not found> = ArrayList@1590[1] { ResolutionCandidate@1591 }
 }
 
-ResolutionTaskHolder@1594 {
-    <name not found> = ArrayList@1595[1] { ResolutionCandidate@1596 }
-    <name not found> = ArrayList@1597[1] { ResolutionCandidate@1596 }
+ResolutionTaskHolder@1592 {
+    <name not found> = ArrayList@1593[1] { ResolutionCandidate@1594 }
+}
+
+ResolutionTaskHolder@1595 {
+    <name not found> = ArrayList@1596[1] { ResolutionCandidate@1597 }
 }
 
 ResolutionTaskHolder@1598 {
     <name not found> = ArrayList@1599[1] { ResolutionCandidate@1600 }
-    <name not found> = ArrayList@1601[1] { ResolutionCandidate@1600 }
 }
 
-ResolutionTaskHolder@1602 {
-    <name not found> = ArrayList@1603[1] { ResolutionCandidate@1604 }
-    <name not found> = ArrayList@1605[1] { ResolutionCandidate@1604 }
+ResolutionTaskHolder@1601 {
+    <name not found> = ArrayList@1602[1] { ResolutionCandidate@1603 }
 }
 
-ResolutionTaskHolder@1606 {
-    <name not found> = ArrayList@1607[1] { ResolutionCandidate@1608 }
-    <name not found> = ArrayList@1609[1] { ResolutionCandidate@1608 }
+ResolutionTaskHolder@1604 {
+    <name not found> = ArrayList@1605[1] { ResolutionCandidate@1606 }
+}
+
+ResolutionTaskHolder@1607 {
+    <name not found> = ArrayList@1608[1] { ResolutionCandidate@1609 }
 }
 
 ResolutionTaskHolder@1610 {
     <name not found> = ArrayList@1611[1] { ResolutionCandidate@1612 }
-    <name not found> = ArrayList@1613[1] { ResolutionCandidate@1612 }
 }
 
-ResolutionTaskHolder@1614 {
-    <name not found> = ArrayList@1615[1] { ResolutionCandidate@1616 }
-    <name not found> = ArrayList@1617[1] { ResolutionCandidate@1616 }
+ResolutionTaskHolder@1613 {
+    <name not found> = ArrayList@1614[1] { ResolutionCandidate@1615 }
 }
 
-ResolutionTaskHolder@1618 {
-    <name not found> = ArrayList@1619[1] { ResolutionCandidate@1620 }
-    <name not found> = ArrayList@1621[1] { ResolutionCandidate@1620 }
+ResolutionTaskHolder@1616 {
+    <name not found> = ArrayList@1617[1] { ResolutionCandidate@1618 }
+}
+
+ResolutionTaskHolder@1619 {
+    <name not found> = ArrayList@1620[1] { ResolutionCandidate@1621 }
 }
 
 ResolutionTaskHolder@1622 {
     <name not found> = ArrayList@1623[1] { ResolutionCandidate@1624 }
-    <name not found> = ArrayList@1625[1] { ResolutionCandidate@1624 }
 }
 
-ResolutionTaskHolder@1626 {
-    <name not found> = ArrayList@1627[1] { ResolutionCandidate@1628 }
-    <name not found> = ArrayList@1629[1] { ResolutionCandidate@1628 }
+ResolutionTaskHolder@1625 {
+    <name not found> = ArrayList@1626[1] { ResolutionCandidate@1627 }
 }
 
-ResolutionTaskHolder@1630 {
-    <name not found> = ArrayList@1631[1] { ResolutionCandidate@1632 }
-    <name not found> = ArrayList@1633[1] { ResolutionCandidate@1632 }
+ResolutionTaskHolder@1628 {
+    <name not found> = ArrayList@1629[1] { ResolutionCandidate@1630 }
+}
+
+ResolutionTaskHolder@1631 {
+    <name not found> = ArrayList@1632[1] { ResolutionCandidate@1633 }
 }
 
 ResolutionTaskHolder@1634 {
     <name not found> = ArrayList@1635[1] { ResolutionCandidate@1636 }
-    <name not found> = ArrayList@1637[1] { ResolutionCandidate@1636 }
 }
 
-ResolutionTaskHolder@1638 {
-    <name not found> = ArrayList@1639[1] { ResolutionCandidate@1640 }
-    <name not found> = ArrayList@1641[1] { ResolutionCandidate@1640 }
+ResolutionTaskHolder@1637 {
+    <name not found> = ArrayList@1638[1] { ResolutionCandidate@1639 }
 }
 
-ResolutionTaskHolder@1642 {
-    <name not found> = ArrayList@1643[1] { ResolutionCandidate@1644 }
-    <name not found> = ArrayList@1645[1] { ResolutionCandidate@1644 }
+ResolutionTaskHolder@1640 {
+    <name not found> = ArrayList@1641[2] { ResolutionCandidate@1642, ResolutionCandidate@1643 }
 }
 
-ResolutionTaskHolder@1646 {
-    <name not found> = ArrayList@1647[1] { ResolutionCandidate@1648 }
-    <name not found> = ArrayList@1649[1] { ResolutionCandidate@1648 }
+ResolutionTaskHolder@1644 {
+    <name not found> = ArrayList@1645[2] { ResolutionCandidate@1646, ResolutionCandidate@1647 }
 }
 
-ResolutionTaskHolder@1650 {
-    <name not found> = ArrayList@1651[1] { ResolutionCandidate@1652 }
-    <name not found> = ArrayList@1653[1] { ResolutionCandidate@1652 }
+ResolutionTaskHolder@1648 {
+    <name not found> = ArrayList@1649[3] { ResolutionCandidate@1650, ResolutionCandidate@1651, ResolutionCandidate@1652 }
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
 }
 
-ResolutionTaskHolder@1654 {
-    <name not found> = ArrayList@1655[1] { ResolutionCandidate@1656 }
-    <name not found> = ArrayList@1657[1] { ResolutionCandidate@1656 }
+ResolutionTaskHolder@1653 {
+    <name not found> = ArrayList@1654[4] { ResolutionCandidate@1655, ResolutionCandidate@1656, ResolutionCandidate@1657, ... }
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
 }
 
 ResolutionTaskHolder@1658 {
-    <name not found> = ArrayList@1659[1] { ResolutionCandidate@1660 }
-    <name not found> = ArrayList@1661[1] { ResolutionCandidate@1660 }
-}
-
-ResolutionTaskHolder@1662 {
-    <name not found> = ArrayList@1663[1] { ResolutionCandidate@1664 }
-    <name not found> = ArrayList@1665[1] { ResolutionCandidate@1664 }
-}
-
-ResolutionTaskHolder@1666 {
-    <name not found> = ArrayList@1667[1] { ResolutionCandidate@1668 }
-    <name not found> = ArrayList@1669[1] { ResolutionCandidate@1668 }
-}
-
-ResolutionTaskHolder@1670 {
-    <name not found> = ArrayList@1671[1] { ResolutionCandidate@1672 }
-    <name not found> = ArrayList@1673[1] { ResolutionCandidate@1672 }
-}
-
-ResolutionTaskHolder@1674 {
-    <name not found> = ArrayList@1675[1] { ResolutionCandidate@1676 }
-    <name not found> = ArrayList@1677[1] { ResolutionCandidate@1676 }
-}
-
-ResolutionTaskHolder@1678 {
-    <name not found> = ArrayList@1679[1] { ResolutionCandidate@1680 }
-    <name not found> = ArrayList@1681[1] { ResolutionCandidate@1680 }
-}
-
-ResolutionTaskHolder@1682 {
-    <name not found> = ArrayList@1683[1] { ResolutionCandidate@1684 }
-    <name not found> = ArrayList@1685[1] { ResolutionCandidate@1684 }
-}
-
-ResolutionTaskHolder@1686 {
-    <name not found> = ArrayList@1687[1] { ResolutionCandidate@1688 }
-    <name not found> = ArrayList@1689[1] { ResolutionCandidate@1688 }
-}
-
-ResolutionTaskHolder@1690 {
-    <name not found> = ArrayList@1691[1] { ResolutionCandidate@1692 }
-    <name not found> = ArrayList@1693[1] { ResolutionCandidate@1692 }
-}
-
-ResolutionTaskHolder@1694 {
-    <name not found> = ArrayList@1695[1] { ResolutionCandidate@1696 }
-    <name not found> = ArrayList@1697[1] { ResolutionCandidate@1696 }
-}
-
-ResolutionTaskHolder@1698 {
-    <name not found> = ArrayList@1699[1] { ResolutionCandidate@1700 }
-    <name not found> = ArrayList@1701[1] { ResolutionCandidate@1700 }
-}
-
-ResolutionTaskHolder@1702 {
-    <name not found> = ArrayList@1703[1] { ResolutionCandidate@1704 }
-    <name not found> = ArrayList@1705[1] { ResolutionCandidate@1704 }
-}
-
-ResolutionTaskHolder@1706 {
-    <name not found> = ArrayList@1707[1] { ResolutionCandidate@1708 }
-    <name not found> = ArrayList@1709[1] { ResolutionCandidate@1708 }
-}
-
-ResolutionTaskHolder@1710 {
-    <name not found> = ArrayList@1711[1] { ResolutionCandidate@1712 }
-    <name not found> = ArrayList@1713[1] { ResolutionCandidate@1712 }
-}
-
-ResolutionTaskHolder@1714 {
-    <name not found> = ArrayList@1715[1] { ResolutionCandidate@1716 }
-    <name not found> = ArrayList@1717[1] { ResolutionCandidate@1716 }
-}
-
-ResolutionTaskHolder@1718 {
-    <name not found> = ArrayList@1719[1] { ResolutionCandidate@1720 }
-    <name not found> = ArrayList@1721[1] { ResolutionCandidate@1720 }
-}
-
-ResolutionTaskHolder@1722 {
-    <name not found> = ArrayList@1723[1] { ResolutionCandidate@1724 }
-    <name not found> = ArrayList@1725[1] { ResolutionCandidate@1724 }
-}
-
-ResolutionTaskHolder@1726 {
-    <name not found> = ArrayList@1727[1] { ResolutionCandidate@1728 }
-    <name not found> = ArrayList@1729[1] { ResolutionCandidate@1728 }
-}
-
-ResolutionTaskHolder@1730 {
-    <name not found> = ArrayList@1731[1] { ResolutionCandidate@1732 }
-    <name not found> = ArrayList@1733[1] { ResolutionCandidate@1732 }
-}
-
-ResolutionTaskHolder@1734 {
-    <name not found> = ArrayList@1735[1] { ResolutionCandidate@1736 }
-    <name not found> = ArrayList@1737[1] { ResolutionCandidate@1736 }
-}
-
-ResolutionTaskHolder@1738 {
-    <name not found> = ArrayList@1739[1] { ResolutionCandidate@1740 }
-    <name not found> = ArrayList@1741[1] { ResolutionCandidate@1740 }
-}
-
-ResolutionTaskHolder@1742 {
-    <name not found> = ArrayList@1743[1] { ResolutionCandidate@1744 }
-    <name not found> = ArrayList@1745[1] { ResolutionCandidate@1744 }
-}
-
-ResolutionTaskHolder@1746 {
-    <name not found> = ArrayList@1747[1] { ResolutionCandidate@1748 }
-    <name not found> = ArrayList@1749[1] { ResolutionCandidate@1748 }
-}
-
-ResolutionTaskHolder@1750 {
-    <name not found> = ArrayList@1751[1] { ResolutionCandidate@1752 }
-    <name not found> = ArrayList@1753[1] { ResolutionCandidate@1752 }
-}
-
-ResolutionTaskHolder@1754 {
-    <name not found> = ArrayList@1755[1] { ResolutionCandidate@1756 }
-    <name not found> = ArrayList@1757[1] { ResolutionCandidate@1756 }
-}
-
-ResolutionTaskHolder@1758 {
-    <name not found> = ArrayList@1759[1] { ResolutionCandidate@1760 }
-    <name not found> = ArrayList@1761[1] { ResolutionCandidate@1760 }
-}
-
-ResolutionTaskHolder@1762 {
-    <name not found> = ArrayList@1763[1] { ResolutionCandidate@1764 }
-    <name not found> = ArrayList@1765[1] { ResolutionCandidate@1764 }
-}
-
-ResolutionTaskHolder@1766 {
-    <name not found> = ArrayList@1767[1] { ResolutionCandidate@1768 }
-    <name not found> = ArrayList@1769[1] { ResolutionCandidate@1768 }
-}
-
-ResolutionTaskHolder@1770 {
-    <name not found> = ArrayList@1771[1] { ResolutionCandidate@1772 }
-    <name not found> = ArrayList@1773[1] { ResolutionCandidate@1772 }
-}
-
-ResolutionTaskHolder@1774 {
-    <name not found> = ArrayList@1775[1] { ResolutionCandidate@1776 }
-    <name not found> = ArrayList@1777[1] { ResolutionCandidate@1776 }
-}
-
-ResolutionTaskHolder@1778 {
-    <name not found> = ArrayList@1779[1] { ResolutionCandidate@1780 }
-    <name not found> = ArrayList@1781[1] { ResolutionCandidate@1780 }
-}
-
-ResolutionTaskHolder@1782 {
-    <name not found> = ArrayList@1783[1] { ResolutionCandidate@1784 }
-    <name not found> = ArrayList@1785[1] { ResolutionCandidate@1784 }
-}
-
-ResolutionTaskHolder@1786 {
-    <name not found> = ArrayList@1787[1] { ResolutionCandidate@1788 }
-    <name not found> = ArrayList@1789[1] { ResolutionCandidate@1788 }
-}
-
-ResolutionTaskHolder@1790 {
-    <name not found> = ArrayList@1791[1] { ResolutionCandidate@1792 }
-    <name not found> = ArrayList@1793[1] { ResolutionCandidate@1792 }
-}
-
-ResolutionTaskHolder@1794 {
-    <name not found> = ArrayList@1795[1] { ResolutionCandidate@1796 }
-    <name not found> = ArrayList@1797[1] { ResolutionCandidate@1796 }
-}
-
-ResolutionTaskHolder@1798 {
-    <name not found> = ArrayList@1799[1] { ResolutionCandidate@1800 }
-    <name not found> = ArrayList@1801[1] { ResolutionCandidate@1800 }
-}
-
-ResolutionTaskHolder@1802 {
-    <name not found> = ArrayList@1803[1] { ResolutionCandidate@1804 }
-    <name not found> = ArrayList@1805[1] { ResolutionCandidate@1804 }
-}
-
-ResolutionTaskHolder@1806 {
-    <name not found> = ArrayList@1807[2] { ResolutionCandidate@1808, ResolutionCandidate@1809 }
-    <name not found> = ArrayList@1810[2] { ResolutionCandidate@1808, ResolutionCandidate@1809 }
-}
-
-ResolutionTaskHolder@1811 {
-    <name not found> = ArrayList@1812[2] { ResolutionCandidate@1813, ResolutionCandidate@1814 }
-    <name not found> = ArrayList@1815[2] { ResolutionCandidate@1813, ResolutionCandidate@1814 }
-}
-
-ResolutionTaskHolder@1816 {
-    <name not found> = ArrayList@1817[3] { ResolutionCandidate@1818, ResolutionCandidate@1819, ResolutionCandidate@1820 }
-    <name not found> = ArrayList@1821[3] { ResolutionCandidate@1818, ResolutionCandidate@1819, ResolutionCandidate@1820 }
+    <name not found> = ArrayList@1659[4] { ResolutionCandidate@1660, ResolutionCandidate@1661, ResolutionCandidate@1662, ... }
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
@@ -3539,6 +3215,25 @@ ResolutionTaskHolder@1816 {
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
+}
+
+ResolutionTaskHolder@1663 {
+    <name not found> = ArrayList@1664[4] { ResolutionCandidate@1665, ResolutionCandidate@1666, ResolutionCandidate@1667, ... }
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+}
+
+ResolutionTaskHolder@1668 {
+    <name not found> = ArrayList@1669[9] { ResolutionCandidate@1670, ResolutionCandidate@1671, ResolutionCandidate@1672, ... }
+}
+
+ResolutionTaskHolder@1673 {
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
@@ -3549,17 +3244,7 @@ ResolutionTaskHolder@1816 {
     <name not found> = EmptyList@75[empty]
 }
 
-ResolutionTaskHolder@1822 {
-    <name not found> = ArrayList@1823[4] { ResolutionCandidate@1824, ResolutionCandidate@1825, ResolutionCandidate@1826, ... }
-    <name not found> = ArrayList@1827[4] { ResolutionCandidate@1824, ResolutionCandidate@1825, ResolutionCandidate@1826, ... }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
+ResolutionTaskHolder@1674 {
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
@@ -3570,9 +3255,379 @@ ResolutionTaskHolder@1822 {
     <name not found> = EmptyList@75[empty]
 }
 
-ResolutionTaskHolder@1828 {
-    <name not found> = ArrayList@1829[4] { ResolutionCandidate@1830, ResolutionCandidate@1831, ResolutionCandidate@1832, ... }
-    <name not found> = ArrayList@1833[4] { ResolutionCandidate@1830, ResolutionCandidate@1831, ResolutionCandidate@1832, ... }
+null {
+    <name not found> = ArrayList@1675[10] { ResolutionCandidate@1162, ResolutionCandidate@1163, ResolutionCandidate@1164, ... }
+    <name not found> = ArrayList@1676[14] { ResolutionCandidate@1172, ResolutionCandidate@1173, ResolutionCandidate@1677, ... }
+    <name not found> = ArrayList@1678[14] { ResolutionCandidate@1182, ResolutionCandidate@1183, ResolutionCandidate@1679, ... }
+    <name not found> = ArrayList@1680[14] { ResolutionCandidate@1177, ResolutionCandidate@1178, ResolutionCandidate@1681, ... }
+    <name not found> = ArrayList@1682[14] { ResolutionCandidate@1167, ResolutionCandidate@1168, ResolutionCandidate@1683, ... }
+    <name not found> = ArrayList@1684[1] { ResolutionCandidate@1279 }
+    <name not found> = ArrayList@1685[1] { ResolutionCandidate@1504 }
+    <name not found> = ArrayList@1686[1] { ResolutionCandidate@1351 }
+    <name not found> = ArrayList@1687[1] { ResolutionCandidate@1291 }
+    <name not found> = ArrayList@1688[1] { ResolutionCandidate@1594 }
+    <name not found> = ArrayList@1689[1] { ResolutionCandidate@1309 }
+    <name not found> = ArrayList@1690[1] { ResolutionCandidate@1282 }
+    <name not found> = ArrayList@1691[1] { ResolutionCandidate@1627 }
+    <name not found> = ArrayList@1692[1] { ResolutionCandidate@1363 }
+    <name not found> = ArrayList@1693[1] { ResolutionCandidate@1270 }
+    <name not found> = ArrayList@1694[1] { ResolutionCandidate@1585 }
+    <name not found> = ArrayList@1695[1] { ResolutionCandidate@1345 }
+    <name not found> = ArrayList@1696[1] { ResolutionCandidate@1489 }
+    <name not found> = ArrayList@1697[1] { ResolutionCandidate@1516 }
+    <name not found> = ArrayList@1698[1] { ResolutionCandidate@1417 }
+    <name not found> = ArrayList@1699[1] { ResolutionCandidate@1534 }
+    <name not found> = ArrayList@1700[1] { ResolutionCandidate@1435 }
+    <name not found> = ArrayList@1701[1] { ResolutionCandidate@1624 }
+    <name not found> = ArrayList@1702[1] { ResolutionCandidate@1465 }
+    <name not found> = ArrayList@1703[1] { ResolutionCandidate@1636 }
+    <name not found> = ArrayList@1704[1] { ResolutionCandidate@1621 }
+    <name not found> = ArrayList@1705[1] { ResolutionCandidate@1609 }
+    <name not found> = ArrayList@1706[1] { ResolutionCandidate@1612 }
+    <name not found> = ArrayList@1707[1] { ResolutionCandidate@1552 }
+    <name not found> = ArrayList@1708[1] { ResolutionCandidate@1471 }
+    <name not found> = ArrayList@1709[1] { ResolutionCandidate@1450 }
+    <name not found> = ArrayList@1710[1] { ResolutionCandidate@1384 }
+    <name not found> = ArrayList@1711[1] { ResolutionCandidate@1579 }
+    <name not found> = ArrayList@1712[1] { ResolutionCandidate@1477 }
+    <name not found> = ArrayList@1713[1] { ResolutionCandidate@1199 }
+    <name not found> = ArrayList@1714[1] { ResolutionCandidate@1201 }
+    <name not found> = ArrayList@1715[1] { ResolutionCandidate@1393 }
+    <name not found> = ArrayList@1716[1] { ResolutionCandidate@1507 }
+    <name not found> = ArrayList@1717[1] { ResolutionCandidate@1543 }
+    <name not found> = ArrayList@1718[1] { ResolutionCandidate@1357 }
+    <name not found> = ArrayList@1719[1] { ResolutionCandidate@1339 }
+    <name not found> = ArrayList@1720[1] { ResolutionCandidate@1366 }
+    <name not found> = ArrayList@1721[1] { ResolutionCandidate@1234 }
+    <name not found> = ArrayList@1722[1] { ResolutionCandidate@1236 }
+    <name not found> = ArrayList@1723[1] { ResolutionCandidate@1276 }
+    <name not found> = ArrayList@1724[1] { ResolutionCandidate@1588 }
+    <name not found> = ArrayList@1725[1] { ResolutionCandidate@1315 }
+    <name not found> = ArrayList@1726[1] { ResolutionCandidate@1273 }
+    <name not found> = ArrayList@1727[1] { ResolutionCandidate@1603 }
+    <name not found> = ArrayList@1728[1] { ResolutionCandidate@1303 }
+    <name not found> = ArrayList@1729[1] { ResolutionCandidate@1342 }
+    <name not found> = ArrayList@1730[1] { ResolutionCandidate@1378 }
+    <name not found> = ArrayList@1731[1] { ResolutionCandidate@1239 }
+    <name not found> = ArrayList@1732[1] { ResolutionCandidate@1241 }
+    <name not found> = ArrayList@1733[1] { ResolutionCandidate@1348 }
+    <name not found> = ArrayList@1734[1] { ResolutionCandidate@1254 }
+    <name not found> = ArrayList@1735[1] { ResolutionCandidate@1256 }
+    <name not found> = ArrayList@1736[1] { ResolutionCandidate@1354 }
+    <name not found> = ArrayList@1737[1] { ResolutionCandidate@1219 }
+    <name not found> = ArrayList@1738[1] { ResolutionCandidate@1221 }
+    <name not found> = ArrayList@1739[1] { ResolutionCandidate@1306 }
+    <name not found> = ArrayList@1740[1] { ResolutionCandidate@1229 }
+    <name not found> = ArrayList@1741[1] { ResolutionCandidate@1231 }
+    <name not found> = ArrayList@1742[1] { ResolutionCandidate@1324 }
+    <name not found> = ArrayList@1743[1] { ResolutionCandidate@1259 }
+    <name not found> = ArrayList@1744[1] { ResolutionCandidate@1261 }
+    <name not found> = ArrayList@1745[1] { ResolutionCandidate@1214 }
+    <name not found> = ArrayList@1746[1] { ResolutionCandidate@1216 }
+    <name not found> = ArrayList@1747[1] { ResolutionCandidate@1330 }
+    <name not found> = ArrayList@1748[1] { ResolutionCandidate@1209 }
+    <name not found> = ArrayList@1749[1] { ResolutionCandidate@1211 }
+    <name not found> = ArrayList@1750[1] { ResolutionCandidate@1244 }
+    <name not found> = ArrayList@1751[1] { ResolutionCandidate@1246 }
+    <name not found> = ArrayList@1752[1] { ResolutionCandidate@1321 }
+    <name not found> = ArrayList@1753[1] { ResolutionCandidate@1224 }
+    <name not found> = ArrayList@1754[1] { ResolutionCandidate@1226 }
+    <name not found> = ArrayList@1755[1] { ResolutionCandidate@1369 }
+    <name not found> = ArrayList@1756[1] { ResolutionCandidate@1204 }
+    <name not found> = ArrayList@1757[1] { ResolutionCandidate@1206 }
+    <name not found> = ArrayList@1758[1] { ResolutionCandidate@1360 }
+    <name not found> = ArrayList@1759[1] { ResolutionCandidate@1561 }
+    <name not found> = ArrayList@1760[1] { ResolutionCandidate@1456 }
+    <name not found> = ArrayList@1761[1] { ResolutionCandidate@1600 }
+    <name not found> = ArrayList@1762[1] { ResolutionCandidate@1462 }
+    <name not found> = ArrayList@1763[1] { ResolutionCandidate@1333 }
+    <name not found> = ArrayList@1764[1] { ResolutionCandidate@1606 }
+    <name not found> = ArrayList@1765[1] { ResolutionCandidate@1249 }
+    <name not found> = ArrayList@1766[1] { ResolutionCandidate@1251 }
+    <name not found> = ArrayList@1767[1] { ResolutionCandidate@1288 }
+    <name not found> = ArrayList@1768[1] { ResolutionCandidate@1570 }
+    <name not found> = ArrayList@1769[1] { ResolutionCandidate@1372 }
+    <name not found> = ArrayList@1770[1] { ResolutionCandidate@1285 }
+    <name not found> = ArrayList@1771[1] { ResolutionCandidate@1540 }
+    <name not found> = ArrayList@1772[1] { ResolutionCandidate@1381 }
+    <name not found> = ArrayList@1773[1] { ResolutionCandidate@1510 }
+    <name not found> = ArrayList@1774[1] { ResolutionCandidate@1318 }
+    <name not found> = ArrayList@1775[1] { ResolutionCandidate@1336 }
+    <name not found> = ArrayList@1776[1] { ResolutionCandidate@1522 }
+    <name not found> = ArrayList@1777[1] { ResolutionCandidate@1300 }
+    <name not found> = ArrayList@1778[1] { ResolutionCandidate@1294 }
+    <name not found> = ArrayList@1779[1] { ResolutionCandidate@1492 }
+    <name not found> = ArrayList@1780[1] { ResolutionCandidate@1444 }
+    <name not found> = ArrayList@1781[1] { ResolutionCandidate@1438 }
+    <name not found> = ArrayList@1782[1] { ResolutionCandidate@1486 }
+    <name not found> = ArrayList@1783[1] { ResolutionCandidate@1567 }
+    <name not found> = ArrayList@1784[1] { ResolutionCandidate@1411 }
+    <name not found> = ArrayList@1785[1] { ResolutionCandidate@1513 }
+    <name not found> = ArrayList@1786[1] { ResolutionCandidate@1402 }
+    <name not found> = ArrayList@1787[1] { ResolutionCandidate@1420 }
+    <name not found> = ArrayList@1788[1] { ResolutionCandidate@1558 }
+    <name not found> = ArrayList@1789[1] { ResolutionCandidate@1312 }
+    <name not found> = ArrayList@1790[1] { ResolutionCandidate@1453 }
+    <name not found> = ArrayList@1791[1] { ResolutionCandidate@1432 }
+    <name not found> = ArrayList@1792[1] { ResolutionCandidate@1630 }
+    <name not found> = ArrayList@1793[1] { ResolutionCandidate@1639 }
+    <name not found> = ArrayList@1794[1] { ResolutionCandidate@1405 }
+    <name not found> = ArrayList@1795[1] { ResolutionCandidate@1564 }
+    <name not found> = ArrayList@1796[1] { ResolutionCandidate@1297 }
+    <name not found> = ArrayList@1797[1] { ResolutionCandidate@1194 }
+    <name not found> = ArrayList@1798[1] { ResolutionCandidate@1196 }
+    <name not found> = ArrayList@1799[1] { ResolutionCandidate@1483 }
+    <name not found> = ArrayList@1800[1] { ResolutionCandidate@1396 }
+    <name not found> = ArrayList@1801[1] { ResolutionCandidate@1618 }
+    <name not found> = ArrayList@1802[1] { ResolutionCandidate@1429 }
+    <name not found> = ArrayList@1803[1] { ResolutionCandidate@1468 }
+    <name not found> = ArrayList@1804[1] { ResolutionCandidate@1615 }
+    <name not found> = ArrayList@1805[1] { ResolutionCandidate@1387 }
+    <name not found> = ArrayList@1806[1] { ResolutionCandidate@1327 }
+    <name not found> = ArrayList@1807[1] { ResolutionCandidate@1390 }
+    <name not found> = ArrayList@1808[1] { ResolutionCandidate@1447 }
+    <name not found> = ArrayList@1809[1] { ResolutionCandidate@1531 }
+    <name not found> = ArrayList@1810[1] { ResolutionCandidate@1474 }
+    <name not found> = ArrayList@1811[1] { ResolutionCandidate@1528 }
+    <name not found> = ArrayList@1812[1] { ResolutionCandidate@1525 }
+    <name not found> = ArrayList@1813[1] { ResolutionCandidate@1546 }
+    <name not found> = ArrayList@1814[1] { ResolutionCandidate@1582 }
+    <name not found> = ArrayList@1815[1] { ResolutionCandidate@1519 }
+    <name not found> = ArrayList@1816[1] { ResolutionCandidate@1480 }
+    <name not found> = ArrayList@1817[1] { ResolutionCandidate@1555 }
+    <name not found> = ArrayList@1818[1] { ResolutionCandidate@1414 }
+    <name not found> = ArrayList@1819[1] { ResolutionCandidate@1399 }
+    <name not found> = ArrayList@1820[1] { ResolutionCandidate@1633 }
+    <name not found> = ArrayList@1821[1] { ResolutionCandidate@1597 }
+    <name not found> = ArrayList@1822[1] { ResolutionCandidate@1459 }
+    <name not found> = ArrayList@1823[1] { ResolutionCandidate@1501 }
+    <name not found> = ArrayList@1824[1] { ResolutionCandidate@1495 }
+    <name not found> = ArrayList@1825[1] { ResolutionCandidate@1498 }
+    <name not found> = ArrayList@1826[1] { ResolutionCandidate@1408 }
+    <name not found> = ArrayList@1827[1] { ResolutionCandidate@1549 }
+    <name not found> = ArrayList@1828[1] { ResolutionCandidate@1423 }
+    <name not found> = ArrayList@1829[1] { ResolutionCandidate@1537 }
+    <name not found> = ArrayList@1830[1] { ResolutionCandidate@1426 }
+    <name not found> = ArrayList@1831[1] { ResolutionCandidate@1187 }
+    <name not found> = ArrayList@1832[1] { ResolutionCandidate@1189 }
+    <name not found> = ArrayList@1833[1] { ResolutionCandidate@1191 }
+    <name not found> = ArrayList@1834[1] { ResolutionCandidate@1264 }
+    <name not found> = ArrayList@1835[1] { ResolutionCandidate@1267 }
+    <name not found> = ArrayList@1836[1] { ResolutionCandidate@1576 }
+    <name not found> = ArrayList@1837[1] { ResolutionCandidate@1375 }
+    <name not found> = ArrayList@1838[1] { ResolutionCandidate@1573 }
+    <name not found> = ArrayList@1839[1] { ResolutionCandidate@1591 }
+    <name not found> = ArrayList@1840[1] { ResolutionCandidate@1441 }
+    <name not found> = ArrayList@1841[2] { ResolutionCandidate@1646, ResolutionCandidate@1647 }
+    <name not found> = ArrayList@1842[2] { ResolutionCandidate@1642, ResolutionCandidate@1643 }
+    <name not found> = ArrayList@1843[3] { ResolutionCandidate@1650, ResolutionCandidate@1651, ResolutionCandidate@1652 }
+    <name not found> = ArrayList@1844[4] { ResolutionCandidate@1655, ResolutionCandidate@1656, ResolutionCandidate@1657, ... }
+    <name not found> = ArrayList@1845[4] { ResolutionCandidate@1665, ResolutionCandidate@1666, ResolutionCandidate@1667, ... }
+    <name not found> = ArrayList@1846[4] { ResolutionCandidate@1660, ResolutionCandidate@1661, ResolutionCandidate@1662, ... }
+    <name not found> = ArrayList@1847[9] { ResolutionCandidate@1670, ResolutionCandidate@1671, ResolutionCandidate@1672, ... }
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
@@ -3590,55 +3645,3 @@ ResolutionTaskHolder@1828 {
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
 }
-
-ResolutionTaskHolder@1834 {
-    <name not found> = ArrayList@1835[4] { ResolutionCandidate@1836, ResolutionCandidate@1837, ResolutionCandidate@1838, ... }
-    <name not found> = ArrayList@1839[4] { ResolutionCandidate@1836, ResolutionCandidate@1837, ResolutionCandidate@1838, ... }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1840 {
-    <name not found> = ArrayList@1841[9] { ResolutionCandidate@1842, ResolutionCandidate@1843, ResolutionCandidate@1844, ... }
-    <name not found> = ArrayList@1845[9] { ResolutionCandidate@1842, ResolutionCandidate@1843, ResolutionCandidate@1844, ... }
-}
-
-ResolutionTaskHolder@1846 {
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1847 {
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/Casts.lazy.log b/compiler/testData/diagnostics/tests/Casts.lazy.log
index cd2d4f677a9..e2980adac58 100644
--- a/compiler/testData/diagnostics/tests/Casts.lazy.log
+++ b/compiler/testData/diagnostics/tests/Casts.lazy.log
@@ -32,57 +32,60 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@26 {
     <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
+ResolutionTaskHolder@29 {
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
 }
 
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
+}
+
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
 }
 
 ResolutionTaskHolder@38 {
     <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+}
+
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
 }
 
 ResolutionTaskHolder@50 {
     <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+null {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@28 }
+    <name not found> = EmptyList@23[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/CharacterLiterals.lazy.log b/compiler/testData/diagnostics/tests/CharacterLiterals.lazy.log
index 71a1edac199..2bde4e38102 100644
--- a/compiler/testData/diagnostics/tests/CharacterLiterals.lazy.log
+++ b/compiler/testData/diagnostics/tests/CharacterLiterals.lazy.log
@@ -34,61 +34,79 @@ LazyJavaPackageFragment@7['lang'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
+}
+
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
 }
 
 ResolutionTaskHolder@37 {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
+}
+
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
 }
 
 ResolutionTaskHolder@49 {
     <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
@@ -96,30 +114,6 @@ ResolutionTaskHolder@49 {
 }
 
 ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
@@ -146,7 +140,16 @@ ResolutionTaskHolder@61 {
     <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@62 {
+null {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@27 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@36 }
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
diff --git a/compiler/testData/diagnostics/tests/CompareToWithErrorType.lazy.log b/compiler/testData/diagnostics/tests/CompareToWithErrorType.lazy.log
index 19e570f67c1..88f66fce9b6 100644
--- a/compiler/testData/diagnostics/tests/CompareToWithErrorType.lazy.log
+++ b/compiler/testData/diagnostics/tests/CompareToWithErrorType.lazy.log
@@ -33,14 +33,9 @@ LazyJavaPackageFragment@6['lang'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
+ResolutionTaskHolder@28 {
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
@@ -59,9 +54,7 @@ ResolutionTaskHolder@29 {
     <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@30 {
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
+ResolutionTaskHolder@29 {
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
@@ -71,3 +64,13 @@ ResolutionTaskHolder@30 {
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
 }
+
+null {
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@27 }
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/Constants.lazy.log b/compiler/testData/diagnostics/tests/Constants.lazy.log
index 5bcbdb79555..e51527199fe 100644
--- a/compiler/testData/diagnostics/tests/Constants.lazy.log
+++ b/compiler/testData/diagnostics/tests/Constants.lazy.log
@@ -90,10 +90,6 @@ LazyJavaPackageFragment@20['lang'] {
 
 ResolutionTaskHolder@61 {
     <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
@@ -111,12 +107,8 @@ ResolutionTaskHolder@61 {
     <name not found> = EmptyList@53[empty]
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
@@ -134,9 +126,8 @@ ResolutionTaskHolder@65 {
     <name not found> = EmptyList@53[empty]
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
@@ -152,6 +143,22 @@ ResolutionTaskHolder@69 {
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
+}
+
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
@@ -159,10 +166,6 @@ ResolutionTaskHolder@69 {
 
 ResolutionTaskHolder@73 {
     <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
@@ -180,12 +183,8 @@ ResolutionTaskHolder@73 {
     <name not found> = EmptyList@53[empty]
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
@@ -203,131 +202,135 @@ ResolutionTaskHolder@77 {
     <name not found> = EmptyList@53[empty]
 }
 
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
+}
+
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
 }
 
 ResolutionTaskHolder@85 {
     <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
+}
+
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
 }
 
 ResolutionTaskHolder@97 {
     <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
 }
 
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
 }
 
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
+}
+
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
 }
 
 ResolutionTaskHolder@109 {
     <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
 }
 
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
 }
 
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
+ResolutionTaskHolder@115 {
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
+}
+
+ResolutionTaskHolder@118 {
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
 }
 
 ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@122[8] { ResolutionCandidate@123, ResolutionCandidate@124, ResolutionCandidate@125, ... }
 }
 
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@127 }
+ResolutionTaskHolder@126 {
+    <name not found> = ArrayList@127[8] { ResolutionCandidate@128, ResolutionCandidate@129, ResolutionCandidate@130, ... }
 }
 
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@131 }
+ResolutionTaskHolder@131 {
+    <name not found> = ArrayList@132[8] { ResolutionCandidate@133, ResolutionCandidate@134, ResolutionCandidate@135, ... }
 }
 
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@135 }
+ResolutionTaskHolder@136 {
+    <name not found> = ArrayList@137[8] { ResolutionCandidate@138, ResolutionCandidate@139, ResolutionCandidate@140, ... }
 }
 
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@139 }
-}
-
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[8] { ResolutionCandidate@143, ResolutionCandidate@144, ResolutionCandidate@145, ... }
-    <name not found> = ArrayList@146[8] { ResolutionCandidate@143, ResolutionCandidate@144, ResolutionCandidate@145, ... }
-}
-
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[8] { ResolutionCandidate@149, ResolutionCandidate@150, ResolutionCandidate@151, ... }
-    <name not found> = ArrayList@152[8] { ResolutionCandidate@149, ResolutionCandidate@150, ResolutionCandidate@151, ... }
-}
-
-ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[8] { ResolutionCandidate@155, ResolutionCandidate@156, ResolutionCandidate@157, ... }
-    <name not found> = ArrayList@158[8] { ResolutionCandidate@155, ResolutionCandidate@156, ResolutionCandidate@157, ... }
-}
-
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[8] { ResolutionCandidate@161, ResolutionCandidate@162, ResolutionCandidate@163, ... }
-    <name not found> = ArrayList@164[8] { ResolutionCandidate@161, ResolutionCandidate@162, ResolutionCandidate@163, ... }
+null {
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@161[8] { ResolutionCandidate@128, ResolutionCandidate@129, ResolutionCandidate@130, ... }
+    <name not found> = ArrayList@162[8] { ResolutionCandidate@133, ResolutionCandidate@134, ResolutionCandidate@135, ... }
+    <name not found> = ArrayList@163[8] { ResolutionCandidate@123, ResolutionCandidate@124, ResolutionCandidate@125, ... }
+    <name not found> = ArrayList@164[8] { ResolutionCandidate@138, ResolutionCandidate@139, ResolutionCandidate@140, ... }
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/Constructors.lazy.log b/compiler/testData/diagnostics/tests/Constructors.lazy.log
index f33e25c6b8a..cb4ad7644b5 100644
--- a/compiler/testData/diagnostics/tests/Constructors.lazy.log
+++ b/compiler/testData/diagnostics/tests/Constructors.lazy.log
@@ -59,22 +59,25 @@ LazyJavaPackageFragment@25['lang'] {
 
 ResolutionTaskHolder@47 {
     <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+}
+
+null {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@58 }
+    <name not found> = EmptyList@44[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/ConstructorsOfPrimitives.lazy.log b/compiler/testData/diagnostics/tests/ConstructorsOfPrimitives.lazy.log
index 963af4ef679..1185b2edd3a 100644
--- a/compiler/testData/diagnostics/tests/ConstructorsOfPrimitives.lazy.log
+++ b/compiler/testData/diagnostics/tests/ConstructorsOfPrimitives.lazy.log
@@ -88,10 +88,6 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -109,12 +105,8 @@ ResolutionTaskHolder@40 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -132,9 +124,8 @@ ResolutionTaskHolder@44 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -150,6 +141,22 @@ ResolutionTaskHolder@48 {
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -157,10 +164,6 @@ ResolutionTaskHolder@48 {
 
 ResolutionTaskHolder@52 {
     <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -178,12 +181,8 @@ ResolutionTaskHolder@52 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -201,12 +200,8 @@ ResolutionTaskHolder@56 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -224,12 +219,8 @@ ResolutionTaskHolder@60 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -247,9 +238,21 @@ ResolutionTaskHolder@64 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+null {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@45 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
diff --git a/compiler/testData/diagnostics/tests/CovariantOverrideType.lazy.log b/compiler/testData/diagnostics/tests/CovariantOverrideType.lazy.log
index 6a8614e7092..6eff766e901 100644
--- a/compiler/testData/diagnostics/tests/CovariantOverrideType.lazy.log
+++ b/compiler/testData/diagnostics/tests/CovariantOverrideType.lazy.log
@@ -55,10 +55,13 @@ LazyJavaPackageFragment@17['java'] {
 
 ResolutionTaskHolder@51 {
     <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+}
+
+null {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@56 }
 }
diff --git a/compiler/testData/diagnostics/tests/DefaultValuesTypechecking.lazy.log b/compiler/testData/diagnostics/tests/DefaultValuesTypechecking.lazy.log
index 46171885fcc..0f9794e6261 100644
--- a/compiler/testData/diagnostics/tests/DefaultValuesTypechecking.lazy.log
+++ b/compiler/testData/diagnostics/tests/DefaultValuesTypechecking.lazy.log
@@ -48,62 +48,65 @@ LazyJavaPackageFragment@15['lang'] {
 
 ResolutionTaskHolder@39 {
     <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
 }
 
 ResolutionTaskHolder@51 {
     <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
 }
 
 ResolutionTaskHolder@63 {
     <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
 }
 
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
 }
 
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
 }
 
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[8] { ResolutionCandidate@74, ResolutionCandidate@75, ResolutionCandidate@76, ... }
 }
 
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[8] { ResolutionCandidate@85, ResolutionCandidate@86, ResolutionCandidate@87, ... }
-    <name not found> = ArrayList@88[8] { ResolutionCandidate@85, ResolutionCandidate@86, ResolutionCandidate@87, ... }
+null {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@88[8] { ResolutionCandidate@74, ResolutionCandidate@75, ResolutionCandidate@76, ... }
+    <name not found> = EmptyList@36[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/DeferredTypes.lazy.log b/compiler/testData/diagnostics/tests/DeferredTypes.lazy.log
index f959b9d17b7..b6eae51cca7 100644
--- a/compiler/testData/diagnostics/tests/DeferredTypes.lazy.log
+++ b/compiler/testData/diagnostics/tests/DeferredTypes.lazy.log
@@ -38,22 +38,9 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
 }
 
-ResolutionTaskHolder@32 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@31 {
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
@@ -104,13 +91,7 @@ ResolutionTaskHolder@32 {
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@32 {
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
@@ -136,3 +117,25 @@ ResolutionTaskHolder@33 {
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
+
+null {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@30 }
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/DiamondFunction.lazy.log b/compiler/testData/diagnostics/tests/DiamondFunction.lazy.log
index 6094ecb6c94..88fcef4a3ef 100644
--- a/compiler/testData/diagnostics/tests/DiamondFunction.lazy.log
+++ b/compiler/testData/diagnostics/tests/DiamondFunction.lazy.log
@@ -30,10 +30,13 @@ LazyJavaPackageFragment@10['java'] {
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
 }
 
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+}
+
+null {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@30 }
 }
diff --git a/compiler/testData/diagnostics/tests/DiamondFunctionGeneric.lazy.log b/compiler/testData/diagnostics/tests/DiamondFunctionGeneric.lazy.log
index 0f4d8a27177..4a10da143a2 100644
--- a/compiler/testData/diagnostics/tests/DiamondFunctionGeneric.lazy.log
+++ b/compiler/testData/diagnostics/tests/DiamondFunctionGeneric.lazy.log
@@ -33,10 +33,13 @@ LazyJavaPackageFragment@11['java'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
+}
+
+null {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@33 }
 }
diff --git a/compiler/testData/diagnostics/tests/DiamondProperty.lazy.log b/compiler/testData/diagnostics/tests/DiamondProperty.lazy.log
index 2357c85b5ea..e2942054201 100644
--- a/compiler/testData/diagnostics/tests/DiamondProperty.lazy.log
+++ b/compiler/testData/diagnostics/tests/DiamondProperty.lazy.log
@@ -33,10 +33,13 @@ LazyJavaPackageFragment@9['java'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
+}
+
+null {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@36 }
 }
diff --git a/compiler/testData/diagnostics/tests/Dollar.lazy.log b/compiler/testData/diagnostics/tests/Dollar.lazy.log
index 479090f234d..ca64ce90763 100644
--- a/compiler/testData/diagnostics/tests/Dollar.lazy.log
+++ b/compiler/testData/diagnostics/tests/Dollar.lazy.log
@@ -31,24 +31,27 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
+}
+
+null {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@33 }
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/ForRangeConventions.lazy.log b/compiler/testData/diagnostics/tests/ForRangeConventions.lazy.log
index 7b64477b0a2..3bbba540f36 100644
--- a/compiler/testData/diagnostics/tests/ForRangeConventions.lazy.log
+++ b/compiler/testData/diagnostics/tests/ForRangeConventions.lazy.log
@@ -90,21 +90,21 @@ LazyJavaClassifierType@58['E'] {
     arguments = ArrayList@59[empty]
     classifier = JavaTypeParameterImpl@60['E']
     nullable = 'false': Boolean@41
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
 }
 
 LazyJavaClassifierType@61['E'] {
     arguments = ArrayList@62[empty]
     classifier = JavaTypeParameterImpl@63['E']
     nullable = 'false': Boolean@41
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
 }
 
 LazyJavaClassifierType@64['E'] {
     arguments = ArrayList@65[empty]
     classifier = JavaTypeParameterImpl@63['E']
     nullable = 'true': Boolean@47
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
 }
 
 LazyJavaClassifierType@66['E'] {
@@ -125,7 +125,7 @@ LazyJavaClassifierType@70['E'] {
     arguments = ArrayList@71[empty]
     classifier = JavaTypeParameterImpl@60['E']
     nullable = 'true': Boolean@47
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
 }
 
 LazyJavaClassifierType@22['List<E>'] {
@@ -331,12 +331,12 @@ LazyJavaPackageFragment@138['util'] {
 
 LazyJavaTypeParameterDescriptor@24['E'] {
     defaultType = JetTypeImpl@218['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
     upperBounds = LinkedHashSet@219[1] { NullableType@220 }
 }
 
 LazyJavaTypeParameterDescriptor@19['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
 }
 
 LazyJavaTypeParameterResolver@221 {
@@ -344,17 +344,11 @@ LazyJavaTypeParameterResolver@221 {
 }
 
 LazyJavaTypeParameterResolver@223 {
-    resolve(JavaTypeParameterImpl@52['E']) = LazyJavaTypeParameterDescriptor@19['E']
+    resolve(JavaTypeParameterImpl@56['E']) = LazyJavaTypeParameterDescriptor@19['E']
 }
 
 ResolutionTaskHolder@224 {
     <name not found> = ArrayList@225[1] { ResolutionCandidate@226 }
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@226 }
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
     <name not found> = EmptyList@205[empty]
     <name not found> = EmptyList@205[empty]
     <name not found> = EmptyList@205[empty]
@@ -380,191 +374,153 @@ ResolutionTaskHolder@224 {
     <name not found> = EmptyList@205[empty]
 }
 
-ResolutionTaskHolder@228 {
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@230 }
+ResolutionTaskHolder@227 {
+    <name not found> = ArrayList@228[1] { ResolutionCandidate@229 }
 }
 
-ResolutionTaskHolder@232 {
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@234 }
+ResolutionTaskHolder@230 {
+    <name not found> = ArrayList@231[1] { ResolutionCandidate@232 }
+}
+
+ResolutionTaskHolder@233 {
+    <name not found> = ArrayList@234[1] { ResolutionCandidate@235 }
 }
 
 ResolutionTaskHolder@236 {
     <name not found> = ArrayList@237[1] { ResolutionCandidate@238 }
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@238 }
 }
 
-ResolutionTaskHolder@240 {
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
-    <name not found> = ArrayList@243[1] { ResolutionCandidate@242 }
+ResolutionTaskHolder@239 {
+    <name not found> = ArrayList@240[1] { ResolutionCandidate@241 }
 }
 
-ResolutionTaskHolder@244 {
-    <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@246 }
+ResolutionTaskHolder@242 {
+    <name not found> = ArrayList@243[1] { ResolutionCandidate@244 }
+}
+
+ResolutionTaskHolder@245 {
+    <name not found> = ArrayList@246[1] { ResolutionCandidate@247 }
 }
 
 ResolutionTaskHolder@248 {
     <name not found> = ArrayList@249[1] { ResolutionCandidate@250 }
-    <name not found> = ArrayList@251[1] { ResolutionCandidate@250 }
 }
 
-ResolutionTaskHolder@252 {
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
-    <name not found> = ArrayList@255[1] { ResolutionCandidate@254 }
+ResolutionTaskHolder@251 {
+    <name not found> = ArrayList@252[1] { ResolutionCandidate@253 }
 }
 
-ResolutionTaskHolder@256 {
-    <name not found> = ArrayList@257[1] { ResolutionCandidate@258 }
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@258 }
+ResolutionTaskHolder@254 {
+    <name not found> = ArrayList@255[1] { ResolutionCandidate@256 }
+}
+
+ResolutionTaskHolder@257 {
+    <name not found> = ArrayList@258[1] { ResolutionCandidate@259 }
 }
 
 ResolutionTaskHolder@260 {
     <name not found> = ArrayList@261[1] { ResolutionCandidate@262 }
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@262 }
 }
 
-ResolutionTaskHolder@264 {
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
-    <name not found> = ArrayList@267[1] { ResolutionCandidate@266 }
+ResolutionTaskHolder@263 {
+    <name not found> = ArrayList@264[1] { ResolutionCandidate@265 }
 }
 
-ResolutionTaskHolder@268 {
-    <name not found> = ArrayList@269[1] { ResolutionCandidate@270 }
-    <name not found> = ArrayList@271[1] { ResolutionCandidate@270 }
+ResolutionTaskHolder@266 {
+    <name not found> = ArrayList@267[1] { ResolutionCandidate@268 }
+}
+
+ResolutionTaskHolder@269 {
+    <name not found> = ArrayList@270[1] { ResolutionCandidate@271 }
 }
 
 ResolutionTaskHolder@272 {
     <name not found> = ArrayList@273[1] { ResolutionCandidate@274 }
-    <name not found> = ArrayList@275[1] { ResolutionCandidate@274 }
 }
 
-ResolutionTaskHolder@276 {
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
-    <name not found> = ArrayList@279[1] { ResolutionCandidate@278 }
+ResolutionTaskHolder@275 {
+    <name not found> = ArrayList@276[1] { ResolutionCandidate@277 }
 }
 
-ResolutionTaskHolder@280 {
-    <name not found> = ArrayList@281[1] { ResolutionCandidate@282 }
-    <name not found> = ArrayList@283[1] { ResolutionCandidate@282 }
+ResolutionTaskHolder@278 {
+    <name not found> = ArrayList@279[1] { ResolutionCandidate@280 }
+}
+
+ResolutionTaskHolder@281 {
+    <name not found> = ArrayList@282[1] { ResolutionCandidate@283 }
 }
 
 ResolutionTaskHolder@284 {
     <name not found> = ArrayList@285[1] { ResolutionCandidate@286 }
-    <name not found> = ArrayList@287[1] { ResolutionCandidate@286 }
 }
 
-ResolutionTaskHolder@288 {
-    <name not found> = ArrayList@289[1] { ResolutionCandidate@290 }
-    <name not found> = ArrayList@291[1] { ResolutionCandidate@290 }
+ResolutionTaskHolder@287 {
+    <name not found> = ArrayList@288[1] { ResolutionCandidate@289 }
 }
 
-ResolutionTaskHolder@292 {
-    <name not found> = ArrayList@293[1] { ResolutionCandidate@294 }
-    <name not found> = ArrayList@295[1] { ResolutionCandidate@294 }
+ResolutionTaskHolder@290 {
+    <name not found> = ArrayList@291[1] { ResolutionCandidate@292 }
+}
+
+ResolutionTaskHolder@293 {
+    <name not found> = ArrayList@294[1] { ResolutionCandidate@295 }
 }
 
 ResolutionTaskHolder@296 {
     <name not found> = ArrayList@297[1] { ResolutionCandidate@298 }
-    <name not found> = ArrayList@299[1] { ResolutionCandidate@298 }
 }
 
-ResolutionTaskHolder@300 {
-    <name not found> = ArrayList@301[1] { ResolutionCandidate@302 }
-    <name not found> = ArrayList@303[1] { ResolutionCandidate@302 }
+ResolutionTaskHolder@299 {
+    <name not found> = ArrayList@300[1] { ResolutionCandidate@301 }
 }
 
-ResolutionTaskHolder@304 {
-    <name not found> = ArrayList@305[1] { ResolutionCandidate@306 }
-    <name not found> = ArrayList@307[1] { ResolutionCandidate@306 }
+ResolutionTaskHolder@302 {
+    <name not found> = ArrayList@303[1] { ResolutionCandidate@304 }
+}
+
+ResolutionTaskHolder@305 {
+    <name not found> = ArrayList@306[1] { ResolutionCandidate@307 }
 }
 
 ResolutionTaskHolder@308 {
     <name not found> = ArrayList@309[1] { ResolutionCandidate@310 }
-    <name not found> = ArrayList@311[1] { ResolutionCandidate@310 }
 }
 
-ResolutionTaskHolder@312 {
-    <name not found> = ArrayList@313[1] { ResolutionCandidate@314 }
-    <name not found> = ArrayList@315[1] { ResolutionCandidate@314 }
+ResolutionTaskHolder@311 {
+    <name not found> = ArrayList@312[1] { ResolutionCandidate@313 }
 }
 
-ResolutionTaskHolder@316 {
-    <name not found> = ArrayList@317[1] { ResolutionCandidate@318 }
-    <name not found> = ArrayList@319[1] { ResolutionCandidate@318 }
+ResolutionTaskHolder@314 {
+    <name not found> = ArrayList@315[1] { ResolutionCandidate@316 }
+}
+
+ResolutionTaskHolder@317 {
+    <name not found> = ArrayList@318[1] { ResolutionCandidate@319 }
 }
 
 ResolutionTaskHolder@320 {
     <name not found> = ArrayList@321[1] { ResolutionCandidate@322 }
-    <name not found> = ArrayList@323[1] { ResolutionCandidate@322 }
 }
 
-ResolutionTaskHolder@324 {
-    <name not found> = ArrayList@325[1] { ResolutionCandidate@326 }
-    <name not found> = ArrayList@327[1] { ResolutionCandidate@326 }
+ResolutionTaskHolder@323 {
+    <name not found> = ArrayList@324[1] { ResolutionCandidate@325 }
 }
 
-ResolutionTaskHolder@328 {
-    <name not found> = ArrayList@329[1] { ResolutionCandidate@330 }
-    <name not found> = ArrayList@331[1] { ResolutionCandidate@330 }
+ResolutionTaskHolder@326 {
+    <name not found> = ArrayList@327[1] { ResolutionCandidate@328 }
+}
+
+ResolutionTaskHolder@329 {
+    <name not found> = ArrayList@330[1] { ResolutionCandidate@331 }
 }
 
 ResolutionTaskHolder@332 {
-    <name not found> = ArrayList@333[1] { ResolutionCandidate@334 }
-    <name not found> = ArrayList@335[1] { ResolutionCandidate@334 }
-}
-
-ResolutionTaskHolder@336 {
-    <name not found> = ArrayList@337[1] { ResolutionCandidate@338 }
-    <name not found> = ArrayList@339[1] { ResolutionCandidate@338 }
-}
-
-ResolutionTaskHolder@340 {
-    <name not found> = ArrayList@341[1] { ResolutionCandidate@342 }
-    <name not found> = ArrayList@343[1] { ResolutionCandidate@342 }
-}
-
-ResolutionTaskHolder@344 {
-    <name not found> = ArrayList@345[1] { ResolutionCandidate@346 }
-    <name not found> = ArrayList@347[1] { ResolutionCandidate@346 }
-}
-
-ResolutionTaskHolder@348 {
-    <name not found> = ArrayList@349[1] { ResolutionCandidate@350 }
-    <name not found> = ArrayList@351[1] { ResolutionCandidate@350 }
-}
-
-ResolutionTaskHolder@352 {
-    <name not found> = ArrayList@353[1] { ResolutionCandidate@354 }
-    <name not found> = ArrayList@355[1] { ResolutionCandidate@354 }
-}
-
-ResolutionTaskHolder@356 {
-    <name not found> = ArrayList@357[1] { ResolutionCandidate@358 }
-    <name not found> = ArrayList@359[1] { ResolutionCandidate@358 }
-}
-
-ResolutionTaskHolder@360 {
-    <name not found> = ArrayList@361[1] { ResolutionCandidate@362 }
-    <name not found> = ArrayList@363[1] { ResolutionCandidate@362 }
-}
-
-ResolutionTaskHolder@364 {
-    <name not found> = ArrayList@365[1] { ResolutionCandidate@366 }
-    <name not found> = ArrayList@367[1] { ResolutionCandidate@366 }
-}
-
-ResolutionTaskHolder@368 {
-    <name not found> = ArrayList@369[3] { ResolutionCandidate@370, ResolutionCandidate@371, ResolutionCandidate@372 }
-    <name not found> = ArrayList@373[3] { ResolutionCandidate@370, ResolutionCandidate@371, ResolutionCandidate@372 }
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
+    <name not found> = ArrayList@333[3] { ResolutionCandidate@334, ResolutionCandidate@335, ResolutionCandidate@336 }
     <name not found> = EmptyList@205[empty]
     <name not found> = EmptyList@205[empty]
 }
 
-ResolutionTaskHolder@374 {
+ResolutionTaskHolder@337 {
     <name not found> = EmptyList@205[empty]
     <name not found> = EmptyList@205[empty]
     <name not found> = EmptyList@205[empty]
@@ -589,6 +545,54 @@ ResolutionTaskHolder@374 {
     <name not found> = EmptyList@205[empty]
     <name not found> = EmptyList@205[empty]
     <name not found> = EmptyList@205[empty]
+}
+
+ResolutionTaskHolder@338 {
+    <name not found> = EmptyList@205[empty]
+    <name not found> = EmptyList@205[empty]
+    <name not found> = EmptyList@205[empty]
+    <name not found> = EmptyList@205[empty]
+    <name not found> = EmptyList@205[empty]
+    <name not found> = EmptyList@205[empty]
+    <name not found> = EmptyList@205[empty]
+    <name not found> = EmptyList@205[empty]
+    <name not found> = EmptyList@205[empty]
+    <name not found> = EmptyList@205[empty]
+    <name not found> = EmptyList@205[empty]
+    <name not found> = EmptyList@205[empty]
+    <name not found> = EmptyList@205[empty]
+    <name not found> = EmptyList@205[empty]
+    <name not found> = EmptyList@205[empty]
+    <name not found> = EmptyList@205[empty]
+    <name not found> = EmptyList@205[empty]
+    <name not found> = EmptyList@205[empty]
+    <name not found> = EmptyList@205[empty]
+    <name not found> = EmptyList@205[empty]
+    <name not found> = EmptyList@205[empty]
+    <name not found> = EmptyList@205[empty]
+    <name not found> = EmptyList@205[empty]
+    <name not found> = EmptyList@205[empty]
+}
+
+ResolutionTaskHolder@339 {
+    <name not found> = EmptyList@205[empty]
+    <name not found> = EmptyList@205[empty]
+    <name not found> = EmptyList@205[empty]
+    <name not found> = EmptyList@205[empty]
+    <name not found> = EmptyList@205[empty]
+    <name not found> = EmptyList@205[empty]
+    <name not found> = EmptyList@205[empty]
+    <name not found> = EmptyList@205[empty]
+    <name not found> = EmptyList@205[empty]
+    <name not found> = EmptyList@205[empty]
+    <name not found> = EmptyList@205[empty]
+    <name not found> = EmptyList@205[empty]
+    <name not found> = EmptyList@205[empty]
+    <name not found> = EmptyList@205[empty]
+    <name not found> = EmptyList@205[empty]
+    <name not found> = EmptyList@205[empty]
+    <name not found> = EmptyList@205[empty]
+    <name not found> = EmptyList@205[empty]
     <name not found> = EmptyList@205[empty]
     <name not found> = EmptyList@205[empty]
     <name not found> = EmptyList@205[empty]
@@ -597,13 +601,7 @@ ResolutionTaskHolder@374 {
     <name not found> = EmptyList@205[empty]
 }
 
-ResolutionTaskHolder@375 {
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
+ResolutionTaskHolder@340 {
     <name not found> = EmptyList@205[empty]
     <name not found> = EmptyList@205[empty]
     <name not found> = EmptyList@205[empty]
@@ -630,13 +628,7 @@ ResolutionTaskHolder@375 {
     <name not found> = EmptyList@205[empty]
 }
 
-ResolutionTaskHolder@376 {
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
+ResolutionTaskHolder@341 {
     <name not found> = EmptyList@205[empty]
     <name not found> = EmptyList@205[empty]
     <name not found> = EmptyList@205[empty]
@@ -663,29 +655,7 @@ ResolutionTaskHolder@376 {
     <name not found> = EmptyList@205[empty]
 }
 
-ResolutionTaskHolder@377 {
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
+ResolutionTaskHolder@342 {
     <name not found> = EmptyList@205[empty]
     <name not found> = EmptyList@205[empty]
     <name not found> = EmptyList@205[empty]
@@ -696,7 +666,53 @@ ResolutionTaskHolder@377 {
     <name not found> = EmptyList@205[empty]
 }
 
-ResolutionTaskHolder@378 {
+null {
+    <name not found> = ArrayList@343[1] { ResolutionCandidate@301 }
+    <name not found> = ArrayList@344[1] { ResolutionCandidate@262 }
+    <name not found> = ArrayList@345[1] { ResolutionCandidate@265 }
+    <name not found> = ArrayList@346[1] { ResolutionCandidate@331 }
+    <name not found> = ArrayList@347[1] { ResolutionCandidate@283 }
+    <name not found> = ArrayList@348[1] { ResolutionCandidate@259 }
+    <name not found> = ArrayList@349[1] { ResolutionCandidate@232 }
+    <name not found> = ArrayList@350[1] { ResolutionCandidate@247 }
+    <name not found> = ArrayList@351[1] { ResolutionCandidate@229 }
+    <name not found> = ArrayList@352[1] { ResolutionCandidate@280 }
+    <name not found> = ArrayList@353[1] { ResolutionCandidate@292 }
+    <name not found> = ArrayList@354[1] { ResolutionCandidate@277 }
+    <name not found> = ArrayList@355[1] { ResolutionCandidate@295 }
+    <name not found> = ArrayList@356[1] { ResolutionCandidate@286 }
+    <name not found> = ArrayList@357[1] { ResolutionCandidate@250 }
+    <name not found> = ArrayList@358[1] { ResolutionCandidate@328 }
+    <name not found> = ArrayList@359[1] { ResolutionCandidate@319 }
+    <name not found> = ArrayList@360[1] { ResolutionCandidate@238 }
+    <name not found> = ArrayList@361[1] { ResolutionCandidate@268 }
+    <name not found> = ArrayList@362[1] { ResolutionCandidate@298 }
+    <name not found> = ArrayList@363[1] { ResolutionCandidate@241 }
+    <name not found> = ArrayList@364[1] { ResolutionCandidate@271 }
+    <name not found> = ArrayList@365[1] { ResolutionCandidate@313 }
+    <name not found> = ArrayList@366[1] { ResolutionCandidate@226 }
+    <name not found> = ArrayList@367[1] { ResolutionCandidate@244 }
+    <name not found> = ArrayList@368[1] { ResolutionCandidate@274 }
+    <name not found> = ArrayList@369[1] { ResolutionCandidate@253 }
+    <name not found> = ArrayList@370[1] { ResolutionCandidate@316 }
+    <name not found> = ArrayList@371[1] { ResolutionCandidate@289 }
+    <name not found> = ArrayList@372[1] { ResolutionCandidate@256 }
+    <name not found> = ArrayList@373[1] { ResolutionCandidate@325 }
+    <name not found> = ArrayList@374[1] { ResolutionCandidate@235 }
+    <name not found> = ArrayList@375[1] { ResolutionCandidate@322 }
+    <name not found> = ArrayList@376[1] { ResolutionCandidate@307 }
+    <name not found> = ArrayList@377[1] { ResolutionCandidate@310 }
+    <name not found> = ArrayList@378[1] { ResolutionCandidate@304 }
+    <name not found> = ArrayList@379[3] { ResolutionCandidate@334, ResolutionCandidate@335, ResolutionCandidate@336 }
+    <name not found> = EmptyList@205[empty]
+    <name not found> = EmptyList@205[empty]
+    <name not found> = EmptyList@205[empty]
+    <name not found> = EmptyList@205[empty]
+    <name not found> = EmptyList@205[empty]
+    <name not found> = EmptyList@205[empty]
+    <name not found> = EmptyList@205[empty]
+    <name not found> = EmptyList@205[empty]
+    <name not found> = EmptyList@205[empty]
     <name not found> = EmptyList@205[empty]
     <name not found> = EmptyList@205[empty]
     <name not found> = EmptyList@205[empty]
@@ -728,16 +744,3 @@ ResolutionTaskHolder@378 {
     <name not found> = EmptyList@205[empty]
     <name not found> = EmptyList@205[empty]
 }
-
-ResolutionTaskHolder@379 {
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/FunctionCalleeExpressions.lazy.log b/compiler/testData/diagnostics/tests/FunctionCalleeExpressions.lazy.log
index 3b127853588..a89a7464787 100644
--- a/compiler/testData/diagnostics/tests/FunctionCalleeExpressions.lazy.log
+++ b/compiler/testData/diagnostics/tests/FunctionCalleeExpressions.lazy.log
@@ -66,10 +66,6 @@ LazyJavaPackageFragment@21['lang'] {
 
 ResolutionTaskHolder@56 {
     <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
@@ -87,10 +83,8 @@ ResolutionTaskHolder@56 {
     <name not found> = EmptyList@43[empty]
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@43[empty]
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
@@ -100,9 +94,8 @@ ResolutionTaskHolder@60 {
     <name not found> = EmptyList@43[empty]
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
@@ -110,13 +103,21 @@ ResolutionTaskHolder@64 {
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
+}
+
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
 }
 
 ResolutionTaskHolder@68 {
     <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
@@ -126,10 +127,8 @@ ResolutionTaskHolder@68 {
     <name not found> = EmptyList@43[empty]
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@43[empty]
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
@@ -139,9 +138,8 @@ ResolutionTaskHolder@72 {
     <name not found> = EmptyList@43[empty]
 }
 
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
@@ -149,387 +147,431 @@ ResolutionTaskHolder@76 {
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
+}
+
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
 }
 
 ResolutionTaskHolder@80 {
     <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
 }
 
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
 }
 
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
+}
+
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
 }
 
 ResolutionTaskHolder@92 {
     <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
 }
 
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
 }
 
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
+}
+
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
 }
 
 ResolutionTaskHolder@104 {
     <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
 }
 
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
 }
 
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
+}
+
+ResolutionTaskHolder@113 {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
 }
 
 ResolutionTaskHolder@116 {
     <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
 }
 
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
+ResolutionTaskHolder@119 {
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
 }
 
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@126 }
+ResolutionTaskHolder@122 {
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
+}
+
+ResolutionTaskHolder@125 {
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
 }
 
 ResolutionTaskHolder@128 {
     <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
 }
 
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
+ResolutionTaskHolder@131 {
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
 }
 
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
+ResolutionTaskHolder@134 {
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
+}
+
+ResolutionTaskHolder@137 {
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
 }
 
 ResolutionTaskHolder@140 {
     <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
 }
 
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
+ResolutionTaskHolder@143 {
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
 }
 
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
+ResolutionTaskHolder@146 {
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
+}
+
+ResolutionTaskHolder@149 {
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
 }
 
 ResolutionTaskHolder@152 {
     <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
 }
 
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
+ResolutionTaskHolder@155 {
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
 }
 
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@162 }
+ResolutionTaskHolder@158 {
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
+}
+
+ResolutionTaskHolder@161 {
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
 }
 
 ResolutionTaskHolder@164 {
     <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@166 }
 }
 
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@170 }
+ResolutionTaskHolder@167 {
+    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
 }
 
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@174 }
+ResolutionTaskHolder@170 {
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
+}
+
+ResolutionTaskHolder@173 {
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
 }
 
 ResolutionTaskHolder@176 {
     <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@178 }
 }
 
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@182 }
+ResolutionTaskHolder@179 {
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
 }
 
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@186 }
+ResolutionTaskHolder@182 {
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
+}
+
+ResolutionTaskHolder@185 {
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
 }
 
 ResolutionTaskHolder@188 {
     <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@190 }
 }
 
-ResolutionTaskHolder@192 {
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@194 }
+ResolutionTaskHolder@191 {
+    <name not found> = ArrayList@192[1] { ResolutionCandidate@193 }
 }
 
-ResolutionTaskHolder@196 {
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@198 }
+ResolutionTaskHolder@194 {
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@196 }
+}
+
+ResolutionTaskHolder@197 {
+    <name not found> = ArrayList@198[1] { ResolutionCandidate@199 }
 }
 
 ResolutionTaskHolder@200 {
     <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@202 }
 }
 
-ResolutionTaskHolder@204 {
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@206 }
+ResolutionTaskHolder@203 {
+    <name not found> = ArrayList@204[1] { ResolutionCandidate@205 }
 }
 
-ResolutionTaskHolder@208 {
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@210 }
+ResolutionTaskHolder@206 {
+    <name not found> = ArrayList@207[1] { ResolutionCandidate@208 }
+}
+
+ResolutionTaskHolder@209 {
+    <name not found> = ArrayList@210[1] { ResolutionCandidate@211 }
 }
 
 ResolutionTaskHolder@212 {
     <name not found> = ArrayList@213[1] { ResolutionCandidate@214 }
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@214 }
 }
 
-ResolutionTaskHolder@216 {
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@218 }
+ResolutionTaskHolder@215 {
+    <name not found> = ArrayList@216[1] { ResolutionCandidate@217 }
 }
 
-ResolutionTaskHolder@220 {
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@222 }
+ResolutionTaskHolder@218 {
+    <name not found> = ArrayList@219[1] { ResolutionCandidate@220 }
+}
+
+ResolutionTaskHolder@221 {
+    <name not found> = ArrayList@222[1] { ResolutionCandidate@223 }
 }
 
 ResolutionTaskHolder@224 {
     <name not found> = ArrayList@225[1] { ResolutionCandidate@226 }
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@226 }
 }
 
-ResolutionTaskHolder@228 {
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@230 }
+ResolutionTaskHolder@227 {
+    <name not found> = ArrayList@228[1] { ResolutionCandidate@229 }
 }
 
-ResolutionTaskHolder@232 {
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@234 }
+ResolutionTaskHolder@230 {
+    <name not found> = ArrayList@231[1] { ResolutionCandidate@232 }
+}
+
+ResolutionTaskHolder@233 {
+    <name not found> = ArrayList@234[1] { ResolutionCandidate@235 }
 }
 
 ResolutionTaskHolder@236 {
     <name not found> = ArrayList@237[1] { ResolutionCandidate@238 }
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@238 }
 }
 
-ResolutionTaskHolder@240 {
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
-    <name not found> = ArrayList@243[1] { ResolutionCandidate@242 }
+ResolutionTaskHolder@239 {
+    <name not found> = ArrayList@240[1] { ResolutionCandidate@241 }
 }
 
-ResolutionTaskHolder@244 {
-    <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@246 }
+ResolutionTaskHolder@242 {
+    <name not found> = ArrayList@243[1] { ResolutionCandidate@244 }
+}
+
+ResolutionTaskHolder@245 {
+    <name not found> = ArrayList@246[1] { ResolutionCandidate@247 }
 }
 
 ResolutionTaskHolder@248 {
     <name not found> = ArrayList@249[1] { ResolutionCandidate@250 }
-    <name not found> = ArrayList@251[1] { ResolutionCandidate@250 }
+}
+
+ResolutionTaskHolder@251 {
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
 }
 
 ResolutionTaskHolder@252 {
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
-    <name not found> = ArrayList@255[1] { ResolutionCandidate@254 }
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+}
+
+ResolutionTaskHolder@253 {
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+}
+
+ResolutionTaskHolder@254 {
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+}
+
+ResolutionTaskHolder@255 {
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
 }
 
 ResolutionTaskHolder@256 {
-    <name not found> = ArrayList@257[1] { ResolutionCandidate@258 }
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@258 }
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+}
+
+ResolutionTaskHolder@257 {
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+}
+
+ResolutionTaskHolder@258 {
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+}
+
+ResolutionTaskHolder@259 {
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
 }
 
 ResolutionTaskHolder@260 {
-    <name not found> = ArrayList@261[1] { ResolutionCandidate@262 }
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@262 }
-}
-
-ResolutionTaskHolder@264 {
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
-    <name not found> = ArrayList@267[1] { ResolutionCandidate@266 }
-}
-
-ResolutionTaskHolder@268 {
-    <name not found> = ArrayList@269[1] { ResolutionCandidate@270 }
-    <name not found> = ArrayList@271[1] { ResolutionCandidate@270 }
-}
-
-ResolutionTaskHolder@272 {
-    <name not found> = ArrayList@273[1] { ResolutionCandidate@274 }
-    <name not found> = ArrayList@275[1] { ResolutionCandidate@274 }
-}
-
-ResolutionTaskHolder@276 {
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
-    <name not found> = ArrayList@279[1] { ResolutionCandidate@278 }
-}
-
-ResolutionTaskHolder@280 {
-    <name not found> = ArrayList@281[1] { ResolutionCandidate@282 }
-    <name not found> = ArrayList@283[1] { ResolutionCandidate@282 }
-}
-
-ResolutionTaskHolder@284 {
-    <name not found> = ArrayList@285[1] { ResolutionCandidate@286 }
-    <name not found> = ArrayList@287[1] { ResolutionCandidate@286 }
-}
-
-ResolutionTaskHolder@288 {
-    <name not found> = ArrayList@289[1] { ResolutionCandidate@290 }
-    <name not found> = ArrayList@291[1] { ResolutionCandidate@290 }
-}
-
-ResolutionTaskHolder@292 {
-    <name not found> = ArrayList@293[1] { ResolutionCandidate@294 }
-    <name not found> = ArrayList@295[1] { ResolutionCandidate@294 }
-}
-
-ResolutionTaskHolder@296 {
-    <name not found> = ArrayList@297[1] { ResolutionCandidate@298 }
-    <name not found> = ArrayList@299[1] { ResolutionCandidate@298 }
-}
-
-ResolutionTaskHolder@300 {
-    <name not found> = ArrayList@301[1] { ResolutionCandidate@302 }
-    <name not found> = ArrayList@303[1] { ResolutionCandidate@302 }
-}
-
-ResolutionTaskHolder@304 {
-    <name not found> = ArrayList@305[1] { ResolutionCandidate@306 }
-    <name not found> = ArrayList@307[1] { ResolutionCandidate@306 }
-}
-
-ResolutionTaskHolder@308 {
-    <name not found> = ArrayList@309[1] { ResolutionCandidate@310 }
-    <name not found> = ArrayList@311[1] { ResolutionCandidate@310 }
-}
-
-ResolutionTaskHolder@312 {
-    <name not found> = ArrayList@313[1] { ResolutionCandidate@314 }
-    <name not found> = ArrayList@315[1] { ResolutionCandidate@314 }
-}
-
-ResolutionTaskHolder@316 {
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
@@ -538,6 +580,9 @@ ResolutionTaskHolder@316 {
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
+}
+
+ResolutionTaskHolder@261 {
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
@@ -546,25 +591,31 @@ ResolutionTaskHolder@316 {
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
+}
+
+ResolutionTaskHolder@262 {
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+}
+
+ResolutionTaskHolder@263 {
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
 }
 
-ResolutionTaskHolder@317 {
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
+ResolutionTaskHolder@264 {
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
@@ -575,19 +626,7 @@ ResolutionTaskHolder@317 {
     <name not found> = EmptyList@43[empty]
 }
 
-ResolutionTaskHolder@318 {
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
+ResolutionTaskHolder@265 {
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
@@ -598,53 +637,150 @@ ResolutionTaskHolder@318 {
     <name not found> = EmptyList@43[empty]
 }
 
-ResolutionTaskHolder@319 {
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
+ResolutionTaskHolder@266 {
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
 }
 
-ResolutionTaskHolder@320 {
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
+ResolutionTaskHolder@267 {
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
 }
 
-ResolutionTaskHolder@321 {
+null {
+    <name not found> = ArrayList@268[1] { ResolutionCandidate@139 }
+    <name not found> = ArrayList@269[1] { ResolutionCandidate@202 }
+    <name not found> = ArrayList@270[1] { ResolutionCandidate@199 }
+    <name not found> = ArrayList@271[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@272[1] { ResolutionCandidate@208 }
+    <name not found> = ArrayList@273[1] { ResolutionCandidate@160 }
+    <name not found> = ArrayList@274[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@275[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@276[1] { ResolutionCandidate@214 }
+    <name not found> = ArrayList@277[1] { ResolutionCandidate@205 }
+    <name not found> = ArrayList@278[1] { ResolutionCandidate@181 }
+    <name not found> = ArrayList@279[1] { ResolutionCandidate@193 }
+    <name not found> = ArrayList@280[1] { ResolutionCandidate@190 }
+    <name not found> = ArrayList@281[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@282[1] { ResolutionCandidate@238 }
+    <name not found> = ArrayList@283[1] { ResolutionCandidate@211 }
+    <name not found> = ArrayList@284[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@285[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@286[1] { ResolutionCandidate@247 }
+    <name not found> = ArrayList@287[1] { ResolutionCandidate@175 }
+    <name not found> = ArrayList@288[1] { ResolutionCandidate@136 }
+    <name not found> = ArrayList@289[1] { ResolutionCandidate@250 }
+    <name not found> = ArrayList@290[1] { ResolutionCandidate@124 }
+    <name not found> = ArrayList@291[1] { ResolutionCandidate@142 }
+    <name not found> = ArrayList@292[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@293[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@294[1] { ResolutionCandidate@220 }
+    <name not found> = ArrayList@295[1] { ResolutionCandidate@127 }
+    <name not found> = ArrayList@296[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@297[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@298[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@299[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@300[1] { ResolutionCandidate@151 }
+    <name not found> = ArrayList@301[1] { ResolutionCandidate@235 }
+    <name not found> = ArrayList@302[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@303[1] { ResolutionCandidate@178 }
+    <name not found> = ArrayList@304[1] { ResolutionCandidate@196 }
+    <name not found> = ArrayList@305[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@306[1] { ResolutionCandidate@229 }
+    <name not found> = ArrayList@307[1] { ResolutionCandidate@169 }
+    <name not found> = ArrayList@308[1] { ResolutionCandidate@145 }
+    <name not found> = ArrayList@309[1] { ResolutionCandidate@133 }
+    <name not found> = ArrayList@310[1] { ResolutionCandidate@187 }
+    <name not found> = ArrayList@311[1] { ResolutionCandidate@241 }
+    <name not found> = ArrayList@312[1] { ResolutionCandidate@184 }
+    <name not found> = ArrayList@313[1] { ResolutionCandidate@232 }
+    <name not found> = ArrayList@314[1] { ResolutionCandidate@172 }
+    <name not found> = ArrayList@315[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@316[1] { ResolutionCandidate@157 }
+    <name not found> = ArrayList@317[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@318[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@319[1] { ResolutionCandidate@154 }
+    <name not found> = ArrayList@320[1] { ResolutionCandidate@163 }
+    <name not found> = ArrayList@321[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@322[1] { ResolutionCandidate@217 }
+    <name not found> = ArrayList@323[1] { ResolutionCandidate@148 }
+    <name not found> = ArrayList@324[1] { ResolutionCandidate@166 }
+    <name not found> = ArrayList@325[1] { ResolutionCandidate@223 }
+    <name not found> = ArrayList@326[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@327[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@328[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@329[1] { ResolutionCandidate@226 }
+    <name not found> = ArrayList@330[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@331[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@332[1] { ResolutionCandidate@244 }
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
@@ -666,136 +802,3 @@ ResolutionTaskHolder@321 {
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
 }
-
-ResolutionTaskHolder@322 {
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@323 {
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@324 {
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@325 {
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@326 {
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@327 {
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@328 {
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@329 {
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@330 {
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@331 {
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@332 {
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/FunctionReturnTypes.lazy.log b/compiler/testData/diagnostics/tests/FunctionReturnTypes.lazy.log
index 92e50529dcc..07fb1284664 100644
--- a/compiler/testData/diagnostics/tests/FunctionReturnTypes.lazy.log
+++ b/compiler/testData/diagnostics/tests/FunctionReturnTypes.lazy.log
@@ -56,14 +56,14 @@ LazyJavaClassifierType@30['String'] {
 
 LazyJavaClassifierType@33['String'] {
     arguments = ArrayList@34[empty]
-    classifier = JavaClassImpl@26['String']
+    classifier = JavaClassImpl@29['String']
     nullable = 'true': Boolean@32
     typeConstructor = DeserializedClassTypeConstructor@23
 }
 
 LazyJavaClassifierType@35['String'] {
     arguments = ArrayList@36[empty]
-    classifier = JavaClassImpl@29['String']
+    classifier = JavaClassImpl@26['String']
     nullable = 'true': Boolean@32
     typeConstructor = DeserializedClassTypeConstructor@23
 }
@@ -91,21 +91,21 @@ LazyJavaClassifierType@44['Throwable'] {
 
 LazyJavaClassifierType@47['Throwable'] {
     arguments = ArrayList@48[empty]
-    classifier = JavaClassImpl@39['Throwable']
+    classifier = JavaClassImpl@46['Throwable']
     nullable = 'true': Boolean@32
     typeConstructor = DeserializedClassTypeConstructor@40
 }
 
 LazyJavaClassifierType@49['Throwable'] {
     arguments = ArrayList@50[empty]
-    classifier = JavaClassImpl@43['Throwable']
+    classifier = JavaClassImpl@39['Throwable']
     nullable = 'true': Boolean@32
     typeConstructor = DeserializedClassTypeConstructor@40
 }
 
 LazyJavaClassifierType@51['Throwable'] {
     arguments = ArrayList@52[empty]
-    classifier = JavaClassImpl@46['Throwable']
+    classifier = JavaClassImpl@43['Throwable']
     nullable = 'true': Boolean@32
     typeConstructor = DeserializedClassTypeConstructor@40
 }
@@ -194,298 +194,228 @@ LazyJavaPackageFragment@72['lang'] {
 
 ResolutionTaskHolder@115 {
     <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@117 }
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
     <name not found> = EmptyList@107[empty]
     <name not found> = EmptyList@107[empty]
 }
 
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@121 }
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
+ResolutionTaskHolder@118 {
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
     <name not found> = EmptyList@107[empty]
     <name not found> = EmptyList@107[empty]
 }
 
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@125 }
+ResolutionTaskHolder@121 {
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
     <name not found> = EmptyList@107[empty]
+}
+
+ResolutionTaskHolder@124 {
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
     <name not found> = EmptyList@107[empty]
 }
 
 ResolutionTaskHolder@127 {
     <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@129 }
-    <name not found> = EmptyList@107[empty]
     <name not found> = EmptyList@107[empty]
 }
 
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@133 }
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
+ResolutionTaskHolder@130 {
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
 }
 
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@137 }
+ResolutionTaskHolder@133 {
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
+}
+
+ResolutionTaskHolder@136 {
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
 }
 
 ResolutionTaskHolder@139 {
     <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@141 }
 }
 
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@145 }
+ResolutionTaskHolder@142 {
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
 }
 
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@149 }
+ResolutionTaskHolder@145 {
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
+}
+
+ResolutionTaskHolder@148 {
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
 }
 
 ResolutionTaskHolder@151 {
     <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@153 }
 }
 
-ResolutionTaskHolder@155 {
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@157 }
+ResolutionTaskHolder@154 {
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
 }
 
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@161 }
+ResolutionTaskHolder@157 {
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
+}
+
+ResolutionTaskHolder@160 {
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
 }
 
 ResolutionTaskHolder@163 {
     <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@165 }
 }
 
-ResolutionTaskHolder@167 {
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@169 }
+ResolutionTaskHolder@166 {
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
 }
 
-ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@173 }
+ResolutionTaskHolder@169 {
+    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
+}
+
+ResolutionTaskHolder@172 {
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
 }
 
 ResolutionTaskHolder@175 {
     <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@177 }
 }
 
-ResolutionTaskHolder@179 {
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@181 }
+ResolutionTaskHolder@178 {
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
 }
 
-ResolutionTaskHolder@183 {
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@185 }
+ResolutionTaskHolder@181 {
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
+}
+
+ResolutionTaskHolder@184 {
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
 }
 
 ResolutionTaskHolder@187 {
     <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@189 }
 }
 
-ResolutionTaskHolder@191 {
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@193 }
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@193 }
+ResolutionTaskHolder@190 {
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@192 }
 }
 
-ResolutionTaskHolder@195 {
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@197 }
+ResolutionTaskHolder@193 {
+    <name not found> = ArrayList@194[1] { ResolutionCandidate@195 }
+}
+
+ResolutionTaskHolder@196 {
+    <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
 }
 
 ResolutionTaskHolder@199 {
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@201 }
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@201 }
+    <name not found> = ArrayList@200[4] { ResolutionCandidate@201, ResolutionCandidate@202, ResolutionCandidate@203, ... }
+    <name not found> = EmptyList@107[empty]
+    <name not found> = EmptyList@107[empty]
 }
 
-ResolutionTaskHolder@203 {
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@205 }
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@205 }
+ResolutionTaskHolder@204 {
+    <name not found> = ArrayList@205[4] { ResolutionCandidate@206, ResolutionCandidate@207, ResolutionCandidate@208, ... }
+    <name not found> = EmptyList@107[empty]
+    <name not found> = EmptyList@107[empty]
 }
 
-ResolutionTaskHolder@207 {
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@209 }
+ResolutionTaskHolder@209 {
+    <name not found> = ArrayList@210[7] { ResolutionCandidate@211, ResolutionCandidate@212, ResolutionCandidate@213, ... }
 }
 
-ResolutionTaskHolder@211 {
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@213 }
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@213 }
-}
-
-ResolutionTaskHolder@215 {
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@217 }
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@217 }
+ResolutionTaskHolder@214 {
+    <name not found> = ArrayList@215[7] { ResolutionCandidate@216, ResolutionCandidate@217, ResolutionCandidate@218, ... }
 }
 
 ResolutionTaskHolder@219 {
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@221 }
+    <name not found> = ArrayList@220[7] { ResolutionCandidate@221, ResolutionCandidate@222, ResolutionCandidate@223, ... }
 }
 
-ResolutionTaskHolder@223 {
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@225 }
+ResolutionTaskHolder@224 {
+    <name not found> = ArrayList@225[7] { ResolutionCandidate@226, ResolutionCandidate@227, ResolutionCandidate@228, ... }
 }
 
-ResolutionTaskHolder@227 {
-    <name not found> = ArrayList@228[4] { ResolutionCandidate@229, ResolutionCandidate@230, ResolutionCandidate@231, ... }
-    <name not found> = ArrayList@232[5] { ResolutionCandidate@229, ResolutionCandidate@230, ResolutionCandidate@231, ... }
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
+ResolutionTaskHolder@229 {
+    <name not found> = ArrayList@230[7] { ResolutionCandidate@231, ResolutionCandidate@232, ResolutionCandidate@233, ... }
 }
 
-ResolutionTaskHolder@233 {
-    <name not found> = ArrayList@234[4] { ResolutionCandidate@235, ResolutionCandidate@236, ResolutionCandidate@237, ... }
-    <name not found> = ArrayList@238[5] { ResolutionCandidate@235, ResolutionCandidate@236, ResolutionCandidate@237, ... }
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
+ResolutionTaskHolder@234 {
+    <name not found> = ArrayList@235[7] { ResolutionCandidate@236, ResolutionCandidate@237, ResolutionCandidate@238, ... }
 }
 
 ResolutionTaskHolder@239 {
     <name not found> = ArrayList@240[7] { ResolutionCandidate@241, ResolutionCandidate@242, ResolutionCandidate@243, ... }
-    <name not found> = ArrayList@244[7] { ResolutionCandidate@241, ResolutionCandidate@242, ResolutionCandidate@243, ... }
 }
 
-ResolutionTaskHolder@245 {
-    <name not found> = ArrayList@246[7] { ResolutionCandidate@247, ResolutionCandidate@248, ResolutionCandidate@249, ... }
-    <name not found> = ArrayList@250[7] { ResolutionCandidate@247, ResolutionCandidate@248, ResolutionCandidate@249, ... }
+ResolutionTaskHolder@244 {
+    <name not found> = ArrayList@245[7] { ResolutionCandidate@246, ResolutionCandidate@247, ResolutionCandidate@248, ... }
 }
 
-ResolutionTaskHolder@251 {
-    <name not found> = ArrayList@252[7] { ResolutionCandidate@253, ResolutionCandidate@254, ResolutionCandidate@255, ... }
-    <name not found> = ArrayList@256[7] { ResolutionCandidate@253, ResolutionCandidate@254, ResolutionCandidate@255, ... }
+ResolutionTaskHolder@249 {
+    <name not found> = ArrayList@250[7] { ResolutionCandidate@251, ResolutionCandidate@252, ResolutionCandidate@253, ... }
 }
 
-ResolutionTaskHolder@257 {
-    <name not found> = ArrayList@258[7] { ResolutionCandidate@259, ResolutionCandidate@260, ResolutionCandidate@261, ... }
-    <name not found> = ArrayList@262[7] { ResolutionCandidate@259, ResolutionCandidate@260, ResolutionCandidate@261, ... }
+ResolutionTaskHolder@254 {
+    <name not found> = ArrayList@255[7] { ResolutionCandidate@256, ResolutionCandidate@257, ResolutionCandidate@258, ... }
 }
 
-ResolutionTaskHolder@263 {
-    <name not found> = ArrayList@264[7] { ResolutionCandidate@265, ResolutionCandidate@266, ResolutionCandidate@267, ... }
-    <name not found> = ArrayList@268[7] { ResolutionCandidate@265, ResolutionCandidate@266, ResolutionCandidate@267, ... }
+ResolutionTaskHolder@259 {
+    <name not found> = ArrayList@260[7] { ResolutionCandidate@261, ResolutionCandidate@262, ResolutionCandidate@263, ... }
+}
+
+ResolutionTaskHolder@264 {
+    <name not found> = ArrayList@265[7] { ResolutionCandidate@266, ResolutionCandidate@267, ResolutionCandidate@268, ... }
 }
 
 ResolutionTaskHolder@269 {
     <name not found> = ArrayList@270[7] { ResolutionCandidate@271, ResolutionCandidate@272, ResolutionCandidate@273, ... }
-    <name not found> = ArrayList@274[7] { ResolutionCandidate@271, ResolutionCandidate@272, ResolutionCandidate@273, ... }
 }
 
-ResolutionTaskHolder@275 {
-    <name not found> = ArrayList@276[7] { ResolutionCandidate@277, ResolutionCandidate@278, ResolutionCandidate@279, ... }
-    <name not found> = ArrayList@280[7] { ResolutionCandidate@277, ResolutionCandidate@278, ResolutionCandidate@279, ... }
+ResolutionTaskHolder@274 {
+    <name not found> = ArrayList@275[7] { ResolutionCandidate@276, ResolutionCandidate@277, ResolutionCandidate@278, ... }
 }
 
-ResolutionTaskHolder@281 {
-    <name not found> = ArrayList@282[7] { ResolutionCandidate@283, ResolutionCandidate@284, ResolutionCandidate@285, ... }
-    <name not found> = ArrayList@286[7] { ResolutionCandidate@283, ResolutionCandidate@284, ResolutionCandidate@285, ... }
+ResolutionTaskHolder@279 {
+    <name not found> = ArrayList@280[7] { ResolutionCandidate@281, ResolutionCandidate@282, ResolutionCandidate@283, ... }
 }
 
-ResolutionTaskHolder@287 {
-    <name not found> = ArrayList@288[7] { ResolutionCandidate@289, ResolutionCandidate@290, ResolutionCandidate@291, ... }
-    <name not found> = ArrayList@292[7] { ResolutionCandidate@289, ResolutionCandidate@290, ResolutionCandidate@291, ... }
+ResolutionTaskHolder@284 {
+    <name not found> = ArrayList@285[7] { ResolutionCandidate@286, ResolutionCandidate@287, ResolutionCandidate@288, ... }
 }
 
-ResolutionTaskHolder@293 {
-    <name not found> = ArrayList@294[7] { ResolutionCandidate@295, ResolutionCandidate@296, ResolutionCandidate@297, ... }
-    <name not found> = ArrayList@298[7] { ResolutionCandidate@295, ResolutionCandidate@296, ResolutionCandidate@297, ... }
+ResolutionTaskHolder@289 {
+    <name not found> = ArrayList@290[7] { ResolutionCandidate@291, ResolutionCandidate@292, ResolutionCandidate@293, ... }
+}
+
+ResolutionTaskHolder@294 {
+    <name not found> = ArrayList@295[7] { ResolutionCandidate@296, ResolutionCandidate@297, ResolutionCandidate@298, ... }
 }
 
 ResolutionTaskHolder@299 {
     <name not found> = ArrayList@300[7] { ResolutionCandidate@301, ResolutionCandidate@302, ResolutionCandidate@303, ... }
-    <name not found> = ArrayList@304[7] { ResolutionCandidate@301, ResolutionCandidate@302, ResolutionCandidate@303, ... }
 }
 
-ResolutionTaskHolder@305 {
-    <name not found> = ArrayList@306[7] { ResolutionCandidate@307, ResolutionCandidate@308, ResolutionCandidate@309, ... }
-    <name not found> = ArrayList@310[7] { ResolutionCandidate@307, ResolutionCandidate@308, ResolutionCandidate@309, ... }
+ResolutionTaskHolder@304 {
+    <name not found> = ArrayList@305[7] { ResolutionCandidate@306, ResolutionCandidate@307, ResolutionCandidate@308, ... }
 }
 
-ResolutionTaskHolder@311 {
-    <name not found> = ArrayList@312[7] { ResolutionCandidate@313, ResolutionCandidate@314, ResolutionCandidate@315, ... }
-    <name not found> = ArrayList@316[7] { ResolutionCandidate@313, ResolutionCandidate@314, ResolutionCandidate@315, ... }
+ResolutionTaskHolder@309 {
+    <name not found> = ArrayList@310[7] { ResolutionCandidate@311, ResolutionCandidate@312, ResolutionCandidate@313, ... }
 }
 
-ResolutionTaskHolder@317 {
-    <name not found> = ArrayList@318[7] { ResolutionCandidate@319, ResolutionCandidate@320, ResolutionCandidate@321, ... }
-    <name not found> = ArrayList@322[7] { ResolutionCandidate@319, ResolutionCandidate@320, ResolutionCandidate@321, ... }
+ResolutionTaskHolder@314 {
+    <name not found> = ArrayList@315[7] { ResolutionCandidate@316, ResolutionCandidate@317, ResolutionCandidate@318, ... }
 }
 
-ResolutionTaskHolder@323 {
-    <name not found> = ArrayList@324[7] { ResolutionCandidate@325, ResolutionCandidate@326, ResolutionCandidate@327, ... }
-    <name not found> = ArrayList@328[7] { ResolutionCandidate@325, ResolutionCandidate@326, ResolutionCandidate@327, ... }
+ResolutionTaskHolder@319 {
+    <name not found> = ArrayList@320[8] { ResolutionCandidate@321, ResolutionCandidate@322, ResolutionCandidate@323, ... }
 }
 
-ResolutionTaskHolder@329 {
-    <name not found> = ArrayList@330[7] { ResolutionCandidate@331, ResolutionCandidate@332, ResolutionCandidate@333, ... }
-    <name not found> = ArrayList@334[7] { ResolutionCandidate@331, ResolutionCandidate@332, ResolutionCandidate@333, ... }
-}
-
-ResolutionTaskHolder@335 {
-    <name not found> = ArrayList@336[7] { ResolutionCandidate@337, ResolutionCandidate@338, ResolutionCandidate@339, ... }
-    <name not found> = ArrayList@340[7] { ResolutionCandidate@337, ResolutionCandidate@338, ResolutionCandidate@339, ... }
-}
-
-ResolutionTaskHolder@341 {
-    <name not found> = ArrayList@342[7] { ResolutionCandidate@343, ResolutionCandidate@344, ResolutionCandidate@345, ... }
-    <name not found> = ArrayList@346[7] { ResolutionCandidate@343, ResolutionCandidate@344, ResolutionCandidate@345, ... }
-}
-
-ResolutionTaskHolder@347 {
-    <name not found> = ArrayList@348[7] { ResolutionCandidate@349, ResolutionCandidate@350, ResolutionCandidate@351, ... }
-    <name not found> = ArrayList@352[7] { ResolutionCandidate@349, ResolutionCandidate@350, ResolutionCandidate@351, ... }
-}
-
-ResolutionTaskHolder@353 {
-    <name not found> = ArrayList@354[7] { ResolutionCandidate@355, ResolutionCandidate@356, ResolutionCandidate@357, ... }
-    <name not found> = ArrayList@358[7] { ResolutionCandidate@355, ResolutionCandidate@356, ResolutionCandidate@357, ... }
-}
-
-ResolutionTaskHolder@359 {
-    <name not found> = ArrayList@360[7] { ResolutionCandidate@361, ResolutionCandidate@362, ResolutionCandidate@363, ... }
-    <name not found> = ArrayList@364[7] { ResolutionCandidate@361, ResolutionCandidate@362, ResolutionCandidate@363, ... }
-}
-
-ResolutionTaskHolder@365 {
-    <name not found> = ArrayList@366[7] { ResolutionCandidate@367, ResolutionCandidate@368, ResolutionCandidate@369, ... }
-    <name not found> = ArrayList@370[7] { ResolutionCandidate@367, ResolutionCandidate@368, ResolutionCandidate@369, ... }
-}
-
-ResolutionTaskHolder@371 {
-    <name not found> = ArrayList@372[8] { ResolutionCandidate@373, ResolutionCandidate@374, ResolutionCandidate@375, ... }
-    <name not found> = ArrayList@376[8] { ResolutionCandidate@373, ResolutionCandidate@374, ResolutionCandidate@375, ... }
-}
-
-ResolutionTaskHolder@377 {
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
+ResolutionTaskHolder@324 {
     <name not found> = EmptyList@107[empty]
     <name not found> = EmptyList@107[empty]
     <name not found> = EmptyList@107[empty]
@@ -511,3 +441,76 @@ ResolutionTaskHolder@377 {
     <name not found> = EmptyList@107[empty]
     <name not found> = EmptyList@107[empty]
 }
+
+null {
+    <name not found> = ArrayList@325[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@326[1] { ResolutionCandidate@156 }
+    <name not found> = ArrayList@327[1] { ResolutionCandidate@177 }
+    <name not found> = ArrayList@328[1] { ResolutionCandidate@165 }
+    <name not found> = ArrayList@329[1] { ResolutionCandidate@186 }
+    <name not found> = ArrayList@330[1] { ResolutionCandidate@126 }
+    <name not found> = ArrayList@331[1] { ResolutionCandidate@129 }
+    <name not found> = ArrayList@332[1] { ResolutionCandidate@168 }
+    <name not found> = ArrayList@333[1] { ResolutionCandidate@141 }
+    <name not found> = ArrayList@334[1] { ResolutionCandidate@171 }
+    <name not found> = ArrayList@335[1] { ResolutionCandidate@174 }
+    <name not found> = ArrayList@336[1] { ResolutionCandidate@153 }
+    <name not found> = ArrayList@337[1] { ResolutionCandidate@192 }
+    <name not found> = ArrayList@338[1] { ResolutionCandidate@198 }
+    <name not found> = ArrayList@339[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@340[1] { ResolutionCandidate@132 }
+    <name not found> = ArrayList@341[1] { ResolutionCandidate@189 }
+    <name not found> = ArrayList@342[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@343[1] { ResolutionCandidate@135 }
+    <name not found> = ArrayList@344[1] { ResolutionCandidate@159 }
+    <name not found> = ArrayList@345[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@346[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@347[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@348[1] { ResolutionCandidate@183 }
+    <name not found> = ArrayList@349[1] { ResolutionCandidate@162 }
+    <name not found> = ArrayList@350[1] { ResolutionCandidate@195 }
+    <name not found> = ArrayList@351[1] { ResolutionCandidate@147 }
+    <name not found> = ArrayList@352[1] { ResolutionCandidate@180 }
+    <name not found> = ArrayList@353[5] { ResolutionCandidate@206, ResolutionCandidate@207, ResolutionCandidate@208, ... }
+    <name not found> = ArrayList@354[5] { ResolutionCandidate@201, ResolutionCandidate@202, ResolutionCandidate@203, ... }
+    <name not found> = ArrayList@355[7] { ResolutionCandidate@211, ResolutionCandidate@212, ResolutionCandidate@213, ... }
+    <name not found> = ArrayList@356[7] { ResolutionCandidate@251, ResolutionCandidate@252, ResolutionCandidate@253, ... }
+    <name not found> = ArrayList@357[7] { ResolutionCandidate@276, ResolutionCandidate@277, ResolutionCandidate@278, ... }
+    <name not found> = ArrayList@358[7] { ResolutionCandidate@226, ResolutionCandidate@227, ResolutionCandidate@228, ... }
+    <name not found> = ArrayList@359[7] { ResolutionCandidate@296, ResolutionCandidate@297, ResolutionCandidate@298, ... }
+    <name not found> = ArrayList@360[7] { ResolutionCandidate@311, ResolutionCandidate@312, ResolutionCandidate@313, ... }
+    <name not found> = ArrayList@361[7] { ResolutionCandidate@221, ResolutionCandidate@222, ResolutionCandidate@223, ... }
+    <name not found> = ArrayList@362[7] { ResolutionCandidate@316, ResolutionCandidate@317, ResolutionCandidate@318, ... }
+    <name not found> = ArrayList@363[7] { ResolutionCandidate@291, ResolutionCandidate@292, ResolutionCandidate@293, ... }
+    <name not found> = ArrayList@364[7] { ResolutionCandidate@261, ResolutionCandidate@262, ResolutionCandidate@263, ... }
+    <name not found> = ArrayList@365[7] { ResolutionCandidate@301, ResolutionCandidate@302, ResolutionCandidate@303, ... }
+    <name not found> = ArrayList@366[7] { ResolutionCandidate@266, ResolutionCandidate@267, ResolutionCandidate@268, ... }
+    <name not found> = ArrayList@367[7] { ResolutionCandidate@271, ResolutionCandidate@272, ResolutionCandidate@273, ... }
+    <name not found> = ArrayList@368[7] { ResolutionCandidate@306, ResolutionCandidate@307, ResolutionCandidate@308, ... }
+    <name not found> = ArrayList@369[7] { ResolutionCandidate@241, ResolutionCandidate@242, ResolutionCandidate@243, ... }
+    <name not found> = ArrayList@370[7] { ResolutionCandidate@231, ResolutionCandidate@232, ResolutionCandidate@233, ... }
+    <name not found> = ArrayList@371[7] { ResolutionCandidate@281, ResolutionCandidate@282, ResolutionCandidate@283, ... }
+    <name not found> = ArrayList@372[7] { ResolutionCandidate@256, ResolutionCandidate@257, ResolutionCandidate@258, ... }
+    <name not found> = ArrayList@373[7] { ResolutionCandidate@286, ResolutionCandidate@287, ResolutionCandidate@288, ... }
+    <name not found> = ArrayList@374[7] { ResolutionCandidate@216, ResolutionCandidate@217, ResolutionCandidate@218, ... }
+    <name not found> = ArrayList@375[7] { ResolutionCandidate@246, ResolutionCandidate@247, ResolutionCandidate@248, ... }
+    <name not found> = ArrayList@376[7] { ResolutionCandidate@236, ResolutionCandidate@237, ResolutionCandidate@238, ... }
+    <name not found> = ArrayList@377[8] { ResolutionCandidate@321, ResolutionCandidate@322, ResolutionCandidate@323, ... }
+    <name not found> = EmptyList@107[empty]
+    <name not found> = EmptyList@107[empty]
+    <name not found> = EmptyList@107[empty]
+    <name not found> = EmptyList@107[empty]
+    <name not found> = EmptyList@107[empty]
+    <name not found> = EmptyList@107[empty]
+    <name not found> = EmptyList@107[empty]
+    <name not found> = EmptyList@107[empty]
+    <name not found> = EmptyList@107[empty]
+    <name not found> = EmptyList@107[empty]
+    <name not found> = EmptyList@107[empty]
+    <name not found> = EmptyList@107[empty]
+    <name not found> = EmptyList@107[empty]
+    <name not found> = EmptyList@107[empty]
+    <name not found> = EmptyList@107[empty]
+    <name not found> = EmptyList@107[empty]
+    <name not found> = EmptyList@107[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/GenericFunctionIsLessSpecific.lazy.log b/compiler/testData/diagnostics/tests/GenericFunctionIsLessSpecific.lazy.log
index d9df4d56e3b..21155b4c817 100644
--- a/compiler/testData/diagnostics/tests/GenericFunctionIsLessSpecific.lazy.log
+++ b/compiler/testData/diagnostics/tests/GenericFunctionIsLessSpecific.lazy.log
@@ -41,16 +41,19 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@32 {
     <name not found> = ArrayList@33[2] { ResolutionCandidate@34, ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[2] { ResolutionCandidate@34, ResolutionCandidate@35 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[2] { ResolutionCandidate@39, ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[2] { ResolutionCandidate@39, ResolutionCandidate@40 }
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[2] { ResolutionCandidate@38, ResolutionCandidate@39 }
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+}
+
+null {
+    <name not found> = ArrayList@40[2] { ResolutionCandidate@38, ResolutionCandidate@39 }
+    <name not found> = ArrayList@41[2] { ResolutionCandidate@34, ResolutionCandidate@35 }
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
diff --git a/compiler/testData/diagnostics/tests/IllegalModifiers.lazy.log b/compiler/testData/diagnostics/tests/IllegalModifiers.lazy.log
index df54b5f0634..50fec51af5e 100644
--- a/compiler/testData/diagnostics/tests/IllegalModifiers.lazy.log
+++ b/compiler/testData/diagnostics/tests/IllegalModifiers.lazy.log
@@ -121,47 +121,50 @@ LazyJavaPackageFragment@66['lang'] {
 
 ResolutionTaskHolder@90 {
     <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@85[empty]
     <name not found> = EmptyList@85[empty]
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
 }
 
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
+}
+
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
 }
 
 ResolutionTaskHolder@102 {
     <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
 }
 
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
 }
 
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
+}
+
+ResolutionTaskHolder@111 {
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
 }
 
 ResolutionTaskHolder@114 {
     <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
 }
 
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
+null {
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@113 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@95 }
+    <name not found> = EmptyList@85[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/IncDec.lazy.log b/compiler/testData/diagnostics/tests/IncDec.lazy.log
index d1fd613cd19..bab7ccca78e 100644
--- a/compiler/testData/diagnostics/tests/IncDec.lazy.log
+++ b/compiler/testData/diagnostics/tests/IncDec.lazy.log
@@ -51,267 +51,270 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@36 {
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
 
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+}
+
 ResolutionTaskHolder@48 {
     <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+}
+
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
 }
 
 ResolutionTaskHolder@60 {
     <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
+}
+
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
 }
 
 ResolutionTaskHolder@72 {
     <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
 }
 
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
+}
+
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
 }
 
 ResolutionTaskHolder@84 {
     <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
 }
 
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
+}
+
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
 }
 
 ResolutionTaskHolder@96 {
     <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
 }
 
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
+}
+
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
 }
 
 ResolutionTaskHolder@108 {
     <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
 }
 
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
+ResolutionTaskHolder@111 {
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
 }
 
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
+}
+
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
 }
 
 ResolutionTaskHolder@120 {
     <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
 }
 
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@126 }
+ResolutionTaskHolder@123 {
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
 }
 
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
+ResolutionTaskHolder@126 {
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
+}
+
+ResolutionTaskHolder@129 {
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
 }
 
 ResolutionTaskHolder@132 {
     <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
 }
 
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
+ResolutionTaskHolder@135 {
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
 }
 
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
+ResolutionTaskHolder@138 {
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
+}
+
+ResolutionTaskHolder@141 {
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
 }
 
 ResolutionTaskHolder@144 {
     <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
 }
 
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
+ResolutionTaskHolder@147 {
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
 }
 
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
+ResolutionTaskHolder@150 {
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
+}
+
+ResolutionTaskHolder@153 {
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
 }
 
 ResolutionTaskHolder@156 {
     <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
 }
 
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@162 }
+ResolutionTaskHolder@159 {
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
 }
 
-ResolutionTaskHolder@164 {
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@166 }
+ResolutionTaskHolder@162 {
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
+}
+
+ResolutionTaskHolder@165 {
+    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
 }
 
 ResolutionTaskHolder@168 {
     <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@170 }
 }
 
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@174 }
+ResolutionTaskHolder@171 {
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
 }
 
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@178 }
+ResolutionTaskHolder@174 {
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
+}
+
+ResolutionTaskHolder@177 {
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
 }
 
 ResolutionTaskHolder@180 {
     <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@182 }
 }
 
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@186 }
+ResolutionTaskHolder@183 {
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
 }
 
-ResolutionTaskHolder@188 {
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@190 }
+ResolutionTaskHolder@186 {
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
 }
 
-ResolutionTaskHolder@192 {
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@194 }
-}
-
-ResolutionTaskHolder@196 {
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@198 }
-}
-
-ResolutionTaskHolder@200 {
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@202 }
-}
-
-ResolutionTaskHolder@204 {
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@206 }
-}
-
-ResolutionTaskHolder@208 {
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@210 }
-}
-
-ResolutionTaskHolder@212 {
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@214 }
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@214 }
-}
-
-ResolutionTaskHolder@216 {
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@218 }
-}
-
-ResolutionTaskHolder@220 {
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@222 }
-}
-
-ResolutionTaskHolder@224 {
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@226 }
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@226 }
-}
-
-ResolutionTaskHolder@228 {
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@230 }
-}
-
-ResolutionTaskHolder@232 {
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@234 }
-}
-
-ResolutionTaskHolder@236 {
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@238 }
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@238 }
+null {
+    <name not found> = ArrayList@189[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@192[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@194[1] { ResolutionCandidate@167 }
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@125 }
+    <name not found> = ArrayList@196[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@197[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@198[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@149 }
+    <name not found> = ArrayList@200[1] { ResolutionCandidate@161 }
+    <name not found> = ArrayList@201[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@202[1] { ResolutionCandidate@143 }
+    <name not found> = ArrayList@203[1] { ResolutionCandidate@122 }
+    <name not found> = ArrayList@204[1] { ResolutionCandidate@113 }
+    <name not found> = ArrayList@205[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@206[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@207[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@208[1] { ResolutionCandidate@164 }
+    <name not found> = ArrayList@209[1] { ResolutionCandidate@170 }
+    <name not found> = ArrayList@210[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@211[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@212[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@213[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@214[1] { ResolutionCandidate@128 }
+    <name not found> = ArrayList@215[1] { ResolutionCandidate@182 }
+    <name not found> = ArrayList@216[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@217[1] { ResolutionCandidate@137 }
+    <name not found> = ArrayList@218[1] { ResolutionCandidate@188 }
+    <name not found> = ArrayList@219[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@220[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@221[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@222[1] { ResolutionCandidate@131 }
+    <name not found> = ArrayList@223[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@224[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@225[1] { ResolutionCandidate@176 }
+    <name not found> = ArrayList@226[1] { ResolutionCandidate@140 }
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@228[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@231[1] { ResolutionCandidate@173 }
+    <name not found> = ArrayList@232[1] { ResolutionCandidate@152 }
+    <name not found> = ArrayList@233[1] { ResolutionCandidate@146 }
+    <name not found> = ArrayList@234[1] { ResolutionCandidate@134 }
+    <name not found> = ArrayList@235[1] { ResolutionCandidate@155 }
+    <name not found> = ArrayList@236[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@237[1] { ResolutionCandidate@179 }
+    <name not found> = ArrayList@238[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@239[1] { ResolutionCandidate@185 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/InferNullabilityInThenBlock.lazy.log b/compiler/testData/diagnostics/tests/InferNullabilityInThenBlock.lazy.log
index d402f1228d5..04e80f0dd9a 100644
--- a/compiler/testData/diagnostics/tests/InferNullabilityInThenBlock.lazy.log
+++ b/compiler/testData/diagnostics/tests/InferNullabilityInThenBlock.lazy.log
@@ -43,28 +43,31 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@29 {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+    <name not found> = EmptyList@21[empty]
+}
+
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
 }
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+null {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@36 }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/LValueAssignment.lazy.log b/compiler/testData/diagnostics/tests/LValueAssignment.lazy.log
index cf8f5725e43..54407a258ca 100644
--- a/compiler/testData/diagnostics/tests/LValueAssignment.lazy.log
+++ b/compiler/testData/diagnostics/tests/LValueAssignment.lazy.log
@@ -79,25 +79,6 @@ LazyJavaPackageFragment@16['lang'] {
 
 ResolutionTaskHolder@66 {
     <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
@@ -118,17 +99,8 @@ ResolutionTaskHolder@66 {
     <name not found> = EmptyList@53[empty]
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
@@ -139,9 +111,8 @@ ResolutionTaskHolder@70 {
     <name not found> = EmptyList@53[empty]
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
@@ -150,6 +121,10 @@ ResolutionTaskHolder@74 {
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
+}
+
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
@@ -162,15 +137,6 @@ ResolutionTaskHolder@74 {
 
 ResolutionTaskHolder@78 {
     <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
@@ -181,17 +147,8 @@ ResolutionTaskHolder@78 {
     <name not found> = EmptyList@53[empty]
 }
 
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
@@ -202,9 +159,8 @@ ResolutionTaskHolder@82 {
     <name not found> = EmptyList@53[empty]
 }
 
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
@@ -213,6 +169,10 @@ ResolutionTaskHolder@86 {
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
+}
+
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
@@ -225,560 +185,795 @@ ResolutionTaskHolder@86 {
 
 ResolutionTaskHolder@90 {
     <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
 }
 
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
+}
+
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
 }
 
 ResolutionTaskHolder@102 {
     <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
 }
 
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
 }
 
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
+}
+
+ResolutionTaskHolder@111 {
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
 }
 
 ResolutionTaskHolder@114 {
     <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
 }
 
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
 }
 
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
+ResolutionTaskHolder@120 {
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
+}
+
+ResolutionTaskHolder@123 {
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
 }
 
 ResolutionTaskHolder@126 {
     <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
 }
 
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@132 }
+ResolutionTaskHolder@129 {
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
 }
 
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@136 }
+ResolutionTaskHolder@132 {
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
+}
+
+ResolutionTaskHolder@135 {
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
 }
 
 ResolutionTaskHolder@138 {
     <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@140 }
 }
 
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@144 }
+ResolutionTaskHolder@141 {
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
 }
 
-ResolutionTaskHolder@146 {
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@148 }
+ResolutionTaskHolder@144 {
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
+}
+
+ResolutionTaskHolder@147 {
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
 }
 
 ResolutionTaskHolder@150 {
     <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@152 }
 }
 
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@156 }
+ResolutionTaskHolder@153 {
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
 }
 
-ResolutionTaskHolder@158 {
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@160 }
+ResolutionTaskHolder@156 {
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
+}
+
+ResolutionTaskHolder@159 {
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
 }
 
 ResolutionTaskHolder@162 {
     <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@164 }
 }
 
-ResolutionTaskHolder@166 {
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@168 }
+ResolutionTaskHolder@165 {
+    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
 }
 
-ResolutionTaskHolder@170 {
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@172 }
+ResolutionTaskHolder@168 {
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
+}
+
+ResolutionTaskHolder@171 {
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
 }
 
 ResolutionTaskHolder@174 {
     <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@176 }
 }
 
-ResolutionTaskHolder@178 {
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@180 }
+ResolutionTaskHolder@177 {
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
 }
 
-ResolutionTaskHolder@182 {
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@184 }
+ResolutionTaskHolder@180 {
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
+}
+
+ResolutionTaskHolder@183 {
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
 }
 
 ResolutionTaskHolder@186 {
     <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@188 }
 }
 
-ResolutionTaskHolder@190 {
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@192 }
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@192 }
+ResolutionTaskHolder@189 {
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
 }
 
-ResolutionTaskHolder@194 {
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@196 }
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@196 }
+ResolutionTaskHolder@192 {
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
+}
+
+ResolutionTaskHolder@195 {
+    <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
 }
 
 ResolutionTaskHolder@198 {
     <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@200 }
 }
 
-ResolutionTaskHolder@202 {
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@204 }
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@204 }
+ResolutionTaskHolder@201 {
+    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
 }
 
-ResolutionTaskHolder@206 {
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@208 }
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@208 }
+ResolutionTaskHolder@204 {
+    <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
+}
+
+ResolutionTaskHolder@207 {
+    <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
 }
 
 ResolutionTaskHolder@210 {
     <name not found> = ArrayList@211[1] { ResolutionCandidate@212 }
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@212 }
 }
 
-ResolutionTaskHolder@214 {
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@216 }
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@216 }
+ResolutionTaskHolder@213 {
+    <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
 }
 
-ResolutionTaskHolder@218 {
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@220 }
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@220 }
+ResolutionTaskHolder@216 {
+    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
+}
+
+ResolutionTaskHolder@219 {
+    <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
 }
 
 ResolutionTaskHolder@222 {
     <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@224 }
 }
 
-ResolutionTaskHolder@226 {
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@228 }
+ResolutionTaskHolder@225 {
+    <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
 }
 
-ResolutionTaskHolder@230 {
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@232 }
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@232 }
+ResolutionTaskHolder@228 {
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
+}
+
+ResolutionTaskHolder@231 {
+    <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
 }
 
 ResolutionTaskHolder@234 {
     <name not found> = ArrayList@235[1] { ResolutionCandidate@236 }
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@236 }
 }
 
-ResolutionTaskHolder@238 {
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@240 }
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@240 }
+ResolutionTaskHolder@237 {
+    <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
 }
 
-ResolutionTaskHolder@242 {
-    <name not found> = ArrayList@243[1] { ResolutionCandidate@244 }
-    <name not found> = ArrayList@245[1] { ResolutionCandidate@244 }
+ResolutionTaskHolder@240 {
+    <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
+}
+
+ResolutionTaskHolder@243 {
+    <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
 }
 
 ResolutionTaskHolder@246 {
     <name not found> = ArrayList@247[1] { ResolutionCandidate@248 }
-    <name not found> = ArrayList@249[1] { ResolutionCandidate@248 }
 }
 
-ResolutionTaskHolder@250 {
-    <name not found> = ArrayList@251[1] { ResolutionCandidate@252 }
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@252 }
+ResolutionTaskHolder@249 {
+    <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
 }
 
-ResolutionTaskHolder@254 {
-    <name not found> = ArrayList@255[1] { ResolutionCandidate@256 }
-    <name not found> = ArrayList@257[1] { ResolutionCandidate@256 }
+ResolutionTaskHolder@252 {
+    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
+}
+
+ResolutionTaskHolder@255 {
+    <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
 }
 
 ResolutionTaskHolder@258 {
     <name not found> = ArrayList@259[1] { ResolutionCandidate@260 }
-    <name not found> = ArrayList@261[1] { ResolutionCandidate@260 }
 }
 
-ResolutionTaskHolder@262 {
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@264 }
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@264 }
+ResolutionTaskHolder@261 {
+    <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
 }
 
-ResolutionTaskHolder@266 {
-    <name not found> = ArrayList@267[1] { ResolutionCandidate@268 }
-    <name not found> = ArrayList@269[1] { ResolutionCandidate@268 }
+ResolutionTaskHolder@264 {
+    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
+}
+
+ResolutionTaskHolder@267 {
+    <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
 }
 
 ResolutionTaskHolder@270 {
     <name not found> = ArrayList@271[1] { ResolutionCandidate@272 }
-    <name not found> = ArrayList@273[1] { ResolutionCandidate@272 }
 }
 
-ResolutionTaskHolder@274 {
-    <name not found> = ArrayList@275[1] { ResolutionCandidate@276 }
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@276 }
+ResolutionTaskHolder@273 {
+    <name not found> = ArrayList@274[1] { ResolutionCandidate@275 }
 }
 
-ResolutionTaskHolder@278 {
-    <name not found> = ArrayList@279[1] { ResolutionCandidate@280 }
-    <name not found> = ArrayList@281[1] { ResolutionCandidate@280 }
+ResolutionTaskHolder@276 {
+    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
+}
+
+ResolutionTaskHolder@279 {
+    <name not found> = ArrayList@280[1] { ResolutionCandidate@281 }
 }
 
 ResolutionTaskHolder@282 {
     <name not found> = ArrayList@283[1] { ResolutionCandidate@284 }
-    <name not found> = ArrayList@285[1] { ResolutionCandidate@284 }
 }
 
-ResolutionTaskHolder@286 {
-    <name not found> = ArrayList@287[1] { ResolutionCandidate@288 }
-    <name not found> = ArrayList@289[1] { ResolutionCandidate@288 }
+ResolutionTaskHolder@285 {
+    <name not found> = ArrayList@286[1] { ResolutionCandidate@287 }
 }
 
-ResolutionTaskHolder@290 {
-    <name not found> = ArrayList@291[1] { ResolutionCandidate@292 }
-    <name not found> = ArrayList@293[1] { ResolutionCandidate@292 }
+ResolutionTaskHolder@288 {
+    <name not found> = ArrayList@289[1] { ResolutionCandidate@290 }
+}
+
+ResolutionTaskHolder@291 {
+    <name not found> = ArrayList@292[1] { ResolutionCandidate@293 }
 }
 
 ResolutionTaskHolder@294 {
     <name not found> = ArrayList@295[1] { ResolutionCandidate@296 }
-    <name not found> = ArrayList@297[1] { ResolutionCandidate@296 }
 }
 
-ResolutionTaskHolder@298 {
-    <name not found> = ArrayList@299[1] { ResolutionCandidate@300 }
-    <name not found> = ArrayList@301[1] { ResolutionCandidate@300 }
+ResolutionTaskHolder@297 {
+    <name not found> = ArrayList@298[1] { ResolutionCandidate@299 }
 }
 
-ResolutionTaskHolder@302 {
-    <name not found> = ArrayList@303[1] { ResolutionCandidate@304 }
-    <name not found> = ArrayList@305[1] { ResolutionCandidate@304 }
+ResolutionTaskHolder@300 {
+    <name not found> = ArrayList@301[1] { ResolutionCandidate@302 }
+}
+
+ResolutionTaskHolder@303 {
+    <name not found> = ArrayList@304[1] { ResolutionCandidate@305 }
 }
 
 ResolutionTaskHolder@306 {
     <name not found> = ArrayList@307[1] { ResolutionCandidate@308 }
-    <name not found> = ArrayList@309[1] { ResolutionCandidate@308 }
 }
 
-ResolutionTaskHolder@310 {
-    <name not found> = ArrayList@311[1] { ResolutionCandidate@312 }
-    <name not found> = ArrayList@313[1] { ResolutionCandidate@312 }
+ResolutionTaskHolder@309 {
+    <name not found> = ArrayList@310[1] { ResolutionCandidate@311 }
 }
 
-ResolutionTaskHolder@314 {
-    <name not found> = ArrayList@315[1] { ResolutionCandidate@316 }
-    <name not found> = ArrayList@317[1] { ResolutionCandidate@316 }
+ResolutionTaskHolder@312 {
+    <name not found> = ArrayList@313[1] { ResolutionCandidate@314 }
+}
+
+ResolutionTaskHolder@315 {
+    <name not found> = ArrayList@316[1] { ResolutionCandidate@317 }
 }
 
 ResolutionTaskHolder@318 {
     <name not found> = ArrayList@319[1] { ResolutionCandidate@320 }
-    <name not found> = ArrayList@321[1] { ResolutionCandidate@320 }
 }
 
-ResolutionTaskHolder@322 {
-    <name not found> = ArrayList@323[1] { ResolutionCandidate@324 }
-    <name not found> = ArrayList@325[1] { ResolutionCandidate@324 }
+ResolutionTaskHolder@321 {
+    <name not found> = ArrayList@322[1] { ResolutionCandidate@323 }
 }
 
-ResolutionTaskHolder@326 {
-    <name not found> = ArrayList@327[1] { ResolutionCandidate@328 }
-    <name not found> = ArrayList@329[1] { ResolutionCandidate@328 }
+ResolutionTaskHolder@324 {
+    <name not found> = ArrayList@325[1] { ResolutionCandidate@326 }
+}
+
+ResolutionTaskHolder@327 {
+    <name not found> = ArrayList@328[1] { ResolutionCandidate@329 }
 }
 
 ResolutionTaskHolder@330 {
     <name not found> = ArrayList@331[1] { ResolutionCandidate@332 }
-    <name not found> = ArrayList@333[1] { ResolutionCandidate@332 }
 }
 
-ResolutionTaskHolder@334 {
-    <name not found> = ArrayList@335[1] { ResolutionCandidate@336 }
-    <name not found> = ArrayList@337[1] { ResolutionCandidate@336 }
+ResolutionTaskHolder@333 {
+    <name not found> = ArrayList@334[1] { ResolutionCandidate@335 }
 }
 
-ResolutionTaskHolder@338 {
-    <name not found> = ArrayList@339[1] { ResolutionCandidate@340 }
-    <name not found> = ArrayList@341[1] { ResolutionCandidate@340 }
+ResolutionTaskHolder@336 {
+    <name not found> = ArrayList@337[1] { ResolutionCandidate@338 }
 }
 
-ResolutionTaskHolder@342 {
-    <name not found> = ArrayList@343[1] { ResolutionCandidate@344 }
-    <name not found> = ArrayList@345[1] { ResolutionCandidate@344 }
+ResolutionTaskHolder@339 {
+    <name not found> = ArrayList@340[8] { ResolutionCandidate@341, ResolutionCandidate@342, ResolutionCandidate@343, ... }
 }
 
-ResolutionTaskHolder@346 {
-    <name not found> = ArrayList@347[1] { ResolutionCandidate@348 }
-    <name not found> = ArrayList@349[1] { ResolutionCandidate@348 }
+ResolutionTaskHolder@344 {
+    <name not found> = ArrayList@345[8] { ResolutionCandidate@346, ResolutionCandidate@347, ResolutionCandidate@348, ... }
 }
 
-ResolutionTaskHolder@350 {
-    <name not found> = ArrayList@351[1] { ResolutionCandidate@352 }
-    <name not found> = ArrayList@353[1] { ResolutionCandidate@352 }
+ResolutionTaskHolder@349 {
+    <name not found> = ArrayList@350[8] { ResolutionCandidate@351, ResolutionCandidate@352, ResolutionCandidate@353, ... }
 }
 
 ResolutionTaskHolder@354 {
-    <name not found> = ArrayList@355[1] { ResolutionCandidate@356 }
-    <name not found> = ArrayList@357[1] { ResolutionCandidate@356 }
+    <name not found> = ArrayList@355[8] { ResolutionCandidate@356, ResolutionCandidate@357, ResolutionCandidate@358, ... }
 }
 
-ResolutionTaskHolder@358 {
-    <name not found> = ArrayList@359[1] { ResolutionCandidate@360 }
-    <name not found> = ArrayList@361[1] { ResolutionCandidate@360 }
+ResolutionTaskHolder@359 {
+    <name not found> = ArrayList@360[8] { ResolutionCandidate@361, ResolutionCandidate@362, ResolutionCandidate@363, ... }
 }
 
-ResolutionTaskHolder@362 {
-    <name not found> = ArrayList@363[1] { ResolutionCandidate@364 }
-    <name not found> = ArrayList@365[1] { ResolutionCandidate@364 }
+ResolutionTaskHolder@364 {
+    <name not found> = ArrayList@365[8] { ResolutionCandidate@366, ResolutionCandidate@367, ResolutionCandidate@368, ... }
 }
 
-ResolutionTaskHolder@366 {
-    <name not found> = ArrayList@367[1] { ResolutionCandidate@368 }
-    <name not found> = ArrayList@369[1] { ResolutionCandidate@368 }
-}
-
-ResolutionTaskHolder@370 {
-    <name not found> = ArrayList@371[1] { ResolutionCandidate@372 }
-    <name not found> = ArrayList@373[1] { ResolutionCandidate@372 }
+ResolutionTaskHolder@369 {
+    <name not found> = ArrayList@370[8] { ResolutionCandidate@371, ResolutionCandidate@372, ResolutionCandidate@373, ... }
 }
 
 ResolutionTaskHolder@374 {
-    <name not found> = ArrayList@375[1] { ResolutionCandidate@376 }
-    <name not found> = ArrayList@377[1] { ResolutionCandidate@376 }
+    <name not found> = ArrayList@375[8] { ResolutionCandidate@376, ResolutionCandidate@377, ResolutionCandidate@378, ... }
 }
 
-ResolutionTaskHolder@378 {
-    <name not found> = ArrayList@379[1] { ResolutionCandidate@380 }
-    <name not found> = ArrayList@381[1] { ResolutionCandidate@380 }
+ResolutionTaskHolder@379 {
+    <name not found> = ArrayList@380[8] { ResolutionCandidate@381, ResolutionCandidate@382, ResolutionCandidate@383, ... }
 }
 
-ResolutionTaskHolder@382 {
-    <name not found> = ArrayList@383[1] { ResolutionCandidate@384 }
-    <name not found> = ArrayList@385[1] { ResolutionCandidate@384 }
+ResolutionTaskHolder@384 {
+    <name not found> = ArrayList@385[8] { ResolutionCandidate@386, ResolutionCandidate@387, ResolutionCandidate@388, ... }
 }
 
-ResolutionTaskHolder@386 {
-    <name not found> = ArrayList@387[1] { ResolutionCandidate@388 }
-    <name not found> = ArrayList@389[1] { ResolutionCandidate@388 }
-}
-
-ResolutionTaskHolder@390 {
-    <name not found> = ArrayList@391[1] { ResolutionCandidate@392 }
-    <name not found> = ArrayList@393[1] { ResolutionCandidate@392 }
+ResolutionTaskHolder@389 {
+    <name not found> = ArrayList@390[8] { ResolutionCandidate@391, ResolutionCandidate@392, ResolutionCandidate@393, ... }
 }
 
 ResolutionTaskHolder@394 {
-    <name not found> = ArrayList@395[1] { ResolutionCandidate@396 }
-    <name not found> = ArrayList@397[1] { ResolutionCandidate@396 }
+    <name not found> = ArrayList@395[8] { ResolutionCandidate@396, ResolutionCandidate@397, ResolutionCandidate@398, ... }
 }
 
-ResolutionTaskHolder@398 {
-    <name not found> = ArrayList@399[1] { ResolutionCandidate@400 }
-    <name not found> = ArrayList@401[1] { ResolutionCandidate@400 }
+ResolutionTaskHolder@399 {
+    <name not found> = ArrayList@400[8] { ResolutionCandidate@401, ResolutionCandidate@402, ResolutionCandidate@403, ... }
 }
 
-ResolutionTaskHolder@402 {
-    <name not found> = ArrayList@403[1] { ResolutionCandidate@404 }
-    <name not found> = ArrayList@405[1] { ResolutionCandidate@404 }
+ResolutionTaskHolder@404 {
+    <name not found> = ArrayList@405[8] { ResolutionCandidate@406, ResolutionCandidate@407, ResolutionCandidate@408, ... }
 }
 
-ResolutionTaskHolder@406 {
-    <name not found> = ArrayList@407[1] { ResolutionCandidate@408 }
-    <name not found> = ArrayList@409[1] { ResolutionCandidate@408 }
-}
-
-ResolutionTaskHolder@410 {
-    <name not found> = ArrayList@411[1] { ResolutionCandidate@412 }
-    <name not found> = ArrayList@413[1] { ResolutionCandidate@412 }
+ResolutionTaskHolder@409 {
+    <name not found> = ArrayList@410[8] { ResolutionCandidate@411, ResolutionCandidate@412, ResolutionCandidate@413, ... }
 }
 
 ResolutionTaskHolder@414 {
-    <name not found> = ArrayList@415[1] { ResolutionCandidate@416 }
-    <name not found> = ArrayList@417[1] { ResolutionCandidate@416 }
+    <name not found> = ArrayList@415[8] { ResolutionCandidate@416, ResolutionCandidate@417, ResolutionCandidate@418, ... }
 }
 
-ResolutionTaskHolder@418 {
-    <name not found> = ArrayList@419[1] { ResolutionCandidate@420 }
-    <name not found> = ArrayList@421[1] { ResolutionCandidate@420 }
+ResolutionTaskHolder@419 {
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+}
+
+ResolutionTaskHolder@420 {
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+}
+
+ResolutionTaskHolder@421 {
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
 }
 
 ResolutionTaskHolder@422 {
-    <name not found> = ArrayList@423[1] { ResolutionCandidate@424 }
-    <name not found> = ArrayList@425[1] { ResolutionCandidate@424 }
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+}
+
+ResolutionTaskHolder@423 {
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+}
+
+ResolutionTaskHolder@424 {
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+}
+
+ResolutionTaskHolder@425 {
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
 }
 
 ResolutionTaskHolder@426 {
-    <name not found> = ArrayList@427[1] { ResolutionCandidate@428 }
-    <name not found> = ArrayList@429[1] { ResolutionCandidate@428 }
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+}
+
+ResolutionTaskHolder@427 {
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+}
+
+ResolutionTaskHolder@428 {
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+}
+
+ResolutionTaskHolder@429 {
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
 }
 
 ResolutionTaskHolder@430 {
-    <name not found> = ArrayList@431[8] { ResolutionCandidate@432, ResolutionCandidate@433, ResolutionCandidate@434, ... }
-    <name not found> = ArrayList@435[8] { ResolutionCandidate@432, ResolutionCandidate@433, ResolutionCandidate@434, ... }
-}
-
-ResolutionTaskHolder@436 {
-    <name not found> = ArrayList@437[8] { ResolutionCandidate@438, ResolutionCandidate@439, ResolutionCandidate@440, ... }
-    <name not found> = ArrayList@441[8] { ResolutionCandidate@438, ResolutionCandidate@439, ResolutionCandidate@440, ... }
-}
-
-ResolutionTaskHolder@442 {
-    <name not found> = ArrayList@443[8] { ResolutionCandidate@444, ResolutionCandidate@445, ResolutionCandidate@446, ... }
-    <name not found> = ArrayList@447[8] { ResolutionCandidate@444, ResolutionCandidate@445, ResolutionCandidate@446, ... }
-}
-
-ResolutionTaskHolder@448 {
-    <name not found> = ArrayList@449[8] { ResolutionCandidate@450, ResolutionCandidate@451, ResolutionCandidate@452, ... }
-    <name not found> = ArrayList@453[8] { ResolutionCandidate@450, ResolutionCandidate@451, ResolutionCandidate@452, ... }
-}
-
-ResolutionTaskHolder@454 {
-    <name not found> = ArrayList@455[8] { ResolutionCandidate@456, ResolutionCandidate@457, ResolutionCandidate@458, ... }
-    <name not found> = ArrayList@459[8] { ResolutionCandidate@456, ResolutionCandidate@457, ResolutionCandidate@458, ... }
-}
-
-ResolutionTaskHolder@460 {
-    <name not found> = ArrayList@461[8] { ResolutionCandidate@462, ResolutionCandidate@463, ResolutionCandidate@464, ... }
-    <name not found> = ArrayList@465[8] { ResolutionCandidate@462, ResolutionCandidate@463, ResolutionCandidate@464, ... }
-}
-
-ResolutionTaskHolder@466 {
-    <name not found> = ArrayList@467[8] { ResolutionCandidate@468, ResolutionCandidate@469, ResolutionCandidate@470, ... }
-    <name not found> = ArrayList@471[8] { ResolutionCandidate@468, ResolutionCandidate@469, ResolutionCandidate@470, ... }
-}
-
-ResolutionTaskHolder@472 {
-    <name not found> = ArrayList@473[8] { ResolutionCandidate@474, ResolutionCandidate@475, ResolutionCandidate@476, ... }
-    <name not found> = ArrayList@477[8] { ResolutionCandidate@474, ResolutionCandidate@475, ResolutionCandidate@476, ... }
-}
-
-ResolutionTaskHolder@478 {
-    <name not found> = ArrayList@479[8] { ResolutionCandidate@480, ResolutionCandidate@481, ResolutionCandidate@482, ... }
-    <name not found> = ArrayList@483[8] { ResolutionCandidate@480, ResolutionCandidate@481, ResolutionCandidate@482, ... }
-}
-
-ResolutionTaskHolder@484 {
-    <name not found> = ArrayList@485[8] { ResolutionCandidate@486, ResolutionCandidate@487, ResolutionCandidate@488, ... }
-    <name not found> = ArrayList@489[8] { ResolutionCandidate@486, ResolutionCandidate@487, ResolutionCandidate@488, ... }
-}
-
-ResolutionTaskHolder@490 {
-    <name not found> = ArrayList@491[8] { ResolutionCandidate@492, ResolutionCandidate@493, ResolutionCandidate@494, ... }
-    <name not found> = ArrayList@495[8] { ResolutionCandidate@492, ResolutionCandidate@493, ResolutionCandidate@494, ... }
-}
-
-ResolutionTaskHolder@496 {
-    <name not found> = ArrayList@497[8] { ResolutionCandidate@498, ResolutionCandidate@499, ResolutionCandidate@500, ... }
-    <name not found> = ArrayList@501[8] { ResolutionCandidate@498, ResolutionCandidate@499, ResolutionCandidate@500, ... }
-}
-
-ResolutionTaskHolder@502 {
-    <name not found> = ArrayList@503[8] { ResolutionCandidate@504, ResolutionCandidate@505, ResolutionCandidate@506, ... }
-    <name not found> = ArrayList@507[8] { ResolutionCandidate@504, ResolutionCandidate@505, ResolutionCandidate@506, ... }
-}
-
-ResolutionTaskHolder@508 {
-    <name not found> = ArrayList@509[8] { ResolutionCandidate@510, ResolutionCandidate@511, ResolutionCandidate@512, ... }
-    <name not found> = ArrayList@513[8] { ResolutionCandidate@510, ResolutionCandidate@511, ResolutionCandidate@512, ... }
-}
-
-ResolutionTaskHolder@514 {
-    <name not found> = ArrayList@515[8] { ResolutionCandidate@516, ResolutionCandidate@517, ResolutionCandidate@518, ... }
-    <name not found> = ArrayList@519[8] { ResolutionCandidate@516, ResolutionCandidate@517, ResolutionCandidate@518, ... }
-}
-
-ResolutionTaskHolder@520 {
-    <name not found> = ArrayList@521[8] { ResolutionCandidate@522, ResolutionCandidate@523, ResolutionCandidate@524, ... }
-    <name not found> = ArrayList@525[8] { ResolutionCandidate@522, ResolutionCandidate@523, ResolutionCandidate@524, ... }
-}
-
-ResolutionTaskHolder@526 {
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
@@ -811,6 +1006,173 @@ ResolutionTaskHolder@526 {
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
+}
+
+ResolutionTaskHolder@431 {
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+}
+
+ResolutionTaskHolder@432 {
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+}
+
+ResolutionTaskHolder@433 {
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+}
+
+ResolutionTaskHolder@434 {
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+}
+
+ResolutionTaskHolder@435 {
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
@@ -821,15 +1183,7 @@ ResolutionTaskHolder@526 {
     <name not found> = EmptyList@53[empty]
 }
 
-ResolutionTaskHolder@527 {
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
+ResolutionTaskHolder@436 {
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
@@ -864,15 +1218,7 @@ ResolutionTaskHolder@527 {
     <name not found> = EmptyList@53[empty]
 }
 
-ResolutionTaskHolder@528 {
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
+ResolutionTaskHolder@437 {
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
@@ -907,15 +1253,7 @@ ResolutionTaskHolder@528 {
     <name not found> = EmptyList@53[empty]
 }
 
-ResolutionTaskHolder@529 {
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
+ResolutionTaskHolder@438 {
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
@@ -950,15 +1288,7 @@ ResolutionTaskHolder@529 {
     <name not found> = EmptyList@53[empty]
 }
 
-ResolutionTaskHolder@530 {
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
+ResolutionTaskHolder@439 {
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
@@ -993,31 +1323,7 @@ ResolutionTaskHolder@530 {
     <name not found> = EmptyList@53[empty]
 }
 
-ResolutionTaskHolder@531 {
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
+ResolutionTaskHolder@440 {
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
@@ -1036,39 +1342,7 @@ ResolutionTaskHolder@531 {
     <name not found> = EmptyList@53[empty]
 }
 
-ResolutionTaskHolder@532 {
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
+ResolutionTaskHolder@441 {
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
@@ -1079,7 +1353,331 @@ ResolutionTaskHolder@532 {
     <name not found> = EmptyList@53[empty]
 }
 
-ResolutionTaskHolder@533 {
+null {
+    <name not found> = ArrayList@442[1] { ResolutionCandidate@206 }
+    <name not found> = ArrayList@443[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@444[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@445[1] { ResolutionCandidate@317 }
+    <name not found> = ArrayList@446[1] { ResolutionCandidate@176 }
+    <name not found> = ArrayList@447[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@448[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@449[1] { ResolutionCandidate@311 }
+    <name not found> = ArrayList@450[1] { ResolutionCandidate@173 }
+    <name not found> = ArrayList@451[1] { ResolutionCandidate@185 }
+    <name not found> = ArrayList@452[1] { ResolutionCandidate@332 }
+    <name not found> = ArrayList@453[1] { ResolutionCandidate@299 }
+    <name not found> = ArrayList@454[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@455[1] { ResolutionCandidate@218 }
+    <name not found> = ArrayList@456[1] { ResolutionCandidate@233 }
+    <name not found> = ArrayList@457[1] { ResolutionCandidate@140 }
+    <name not found> = ArrayList@458[1] { ResolutionCandidate@281 }
+    <name not found> = ArrayList@459[1] { ResolutionCandidate@152 }
+    <name not found> = ArrayList@460[1] { ResolutionCandidate@221 }
+    <name not found> = ArrayList@461[1] { ResolutionCandidate@248 }
+    <name not found> = ArrayList@462[1] { ResolutionCandidate@203 }
+    <name not found> = ArrayList@463[1] { ResolutionCandidate@113 }
+    <name not found> = ArrayList@464[1] { ResolutionCandidate@293 }
+    <name not found> = ArrayList@465[1] { ResolutionCandidate@128 }
+    <name not found> = ArrayList@466[1] { ResolutionCandidate@296 }
+    <name not found> = ArrayList@467[1] { ResolutionCandidate@200 }
+    <name not found> = ArrayList@468[1] { ResolutionCandidate@302 }
+    <name not found> = ArrayList@469[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@470[1] { ResolutionCandidate@335 }
+    <name not found> = ArrayList@471[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@472[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@473[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@474[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@475[1] { ResolutionCandidate@161 }
+    <name not found> = ArrayList@476[1] { ResolutionCandidate@131 }
+    <name not found> = ArrayList@477[1] { ResolutionCandidate@224 }
+    <name not found> = ArrayList@478[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@479[1] { ResolutionCandidate@245 }
+    <name not found> = ArrayList@480[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@481[1] { ResolutionCandidate@251 }
+    <name not found> = ArrayList@482[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@483[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@484[1] { ResolutionCandidate@122 }
+    <name not found> = ArrayList@485[1] { ResolutionCandidate@227 }
+    <name not found> = ArrayList@486[1] { ResolutionCandidate@182 }
+    <name not found> = ArrayList@487[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@488[1] { ResolutionCandidate@254 }
+    <name not found> = ArrayList@489[1] { ResolutionCandidate@323 }
+    <name not found> = ArrayList@490[1] { ResolutionCandidate@179 }
+    <name not found> = ArrayList@491[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@492[1] { ResolutionCandidate@278 }
+    <name not found> = ArrayList@493[1] { ResolutionCandidate@155 }
+    <name not found> = ArrayList@494[1] { ResolutionCandidate@326 }
+    <name not found> = ArrayList@495[1] { ResolutionCandidate@266 }
+    <name not found> = ArrayList@496[1] { ResolutionCandidate@236 }
+    <name not found> = ArrayList@497[1] { ResolutionCandidate@338 }
+    <name not found> = ArrayList@498[1] { ResolutionCandidate@212 }
+    <name not found> = ArrayList@499[1] { ResolutionCandidate@275 }
+    <name not found> = ArrayList@500[1] { ResolutionCandidate@269 }
+    <name not found> = ArrayList@501[1] { ResolutionCandidate@242 }
+    <name not found> = ArrayList@502[1] { ResolutionCandidate@305 }
+    <name not found> = ArrayList@503[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@504[1] { ResolutionCandidate@209 }
+    <name not found> = ArrayList@505[1] { ResolutionCandidate@146 }
+    <name not found> = ArrayList@506[1] { ResolutionCandidate@191 }
+    <name not found> = ArrayList@507[1] { ResolutionCandidate@329 }
+    <name not found> = ArrayList@508[1] { ResolutionCandidate@257 }
+    <name not found> = ArrayList@509[1] { ResolutionCandidate@320 }
+    <name not found> = ArrayList@510[1] { ResolutionCandidate@230 }
+    <name not found> = ArrayList@511[1] { ResolutionCandidate@272 }
+    <name not found> = ArrayList@512[1] { ResolutionCandidate@239 }
+    <name not found> = ArrayList@513[1] { ResolutionCandidate@308 }
+    <name not found> = ArrayList@514[1] { ResolutionCandidate@188 }
+    <name not found> = ArrayList@515[1] { ResolutionCandidate@260 }
+    <name not found> = ArrayList@516[1] { ResolutionCandidate@170 }
+    <name not found> = ArrayList@517[1] { ResolutionCandidate@290 }
+    <name not found> = ArrayList@518[1] { ResolutionCandidate@197 }
+    <name not found> = ArrayList@519[1] { ResolutionCandidate@215 }
+    <name not found> = ArrayList@520[1] { ResolutionCandidate@137 }
+    <name not found> = ArrayList@521[1] { ResolutionCandidate@314 }
+    <name not found> = ArrayList@522[1] { ResolutionCandidate@167 }
+    <name not found> = ArrayList@523[1] { ResolutionCandidate@134 }
+    <name not found> = ArrayList@524[1] { ResolutionCandidate@143 }
+    <name not found> = ArrayList@525[1] { ResolutionCandidate@263 }
+    <name not found> = ArrayList@526[1] { ResolutionCandidate@149 }
+    <name not found> = ArrayList@527[1] { ResolutionCandidate@284 }
+    <name not found> = ArrayList@528[1] { ResolutionCandidate@164 }
+    <name not found> = ArrayList@529[1] { ResolutionCandidate@287 }
+    <name not found> = ArrayList@530[1] { ResolutionCandidate@194 }
+    <name not found> = ArrayList@531[1] { ResolutionCandidate@125 }
+    <name not found> = ArrayList@532[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@533[8] { ResolutionCandidate@376, ResolutionCandidate@377, ResolutionCandidate@378, ... }
+    <name not found> = ArrayList@534[8] { ResolutionCandidate@346, ResolutionCandidate@347, ResolutionCandidate@348, ... }
+    <name not found> = ArrayList@535[8] { ResolutionCandidate@351, ResolutionCandidate@352, ResolutionCandidate@353, ... }
+    <name not found> = ArrayList@536[8] { ResolutionCandidate@406, ResolutionCandidate@407, ResolutionCandidate@408, ... }
+    <name not found> = ArrayList@537[8] { ResolutionCandidate@411, ResolutionCandidate@412, ResolutionCandidate@413, ... }
+    <name not found> = ArrayList@538[8] { ResolutionCandidate@416, ResolutionCandidate@417, ResolutionCandidate@418, ... }
+    <name not found> = ArrayList@539[8] { ResolutionCandidate@401, ResolutionCandidate@402, ResolutionCandidate@403, ... }
+    <name not found> = ArrayList@540[8] { ResolutionCandidate@396, ResolutionCandidate@397, ResolutionCandidate@398, ... }
+    <name not found> = ArrayList@541[8] { ResolutionCandidate@381, ResolutionCandidate@382, ResolutionCandidate@383, ... }
+    <name not found> = ArrayList@542[8] { ResolutionCandidate@361, ResolutionCandidate@362, ResolutionCandidate@363, ... }
+    <name not found> = ArrayList@543[8] { ResolutionCandidate@341, ResolutionCandidate@342, ResolutionCandidate@343, ... }
+    <name not found> = ArrayList@544[8] { ResolutionCandidate@391, ResolutionCandidate@392, ResolutionCandidate@393, ... }
+    <name not found> = ArrayList@545[8] { ResolutionCandidate@356, ResolutionCandidate@357, ResolutionCandidate@358, ... }
+    <name not found> = ArrayList@546[8] { ResolutionCandidate@386, ResolutionCandidate@387, ResolutionCandidate@388, ... }
+    <name not found> = ArrayList@547[8] { ResolutionCandidate@371, ResolutionCandidate@372, ResolutionCandidate@373, ... }
+    <name not found> = ArrayList@548[8] { ResolutionCandidate@366, ResolutionCandidate@367, ResolutionCandidate@368, ... }
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
@@ -1121,598 +1719,3 @@ ResolutionTaskHolder@533 {
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
 }
-
-ResolutionTaskHolder@534 {
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@535 {
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@536 {
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@537 {
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@538 {
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@539 {
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@540 {
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@541 {
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@542 {
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@543 {
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@544 {
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@545 {
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@546 {
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@547 {
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@548 {
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/MergePackagesWithJava.lazy.log b/compiler/testData/diagnostics/tests/MergePackagesWithJava.lazy.log
index 1ef3fee925e..8061295fc83 100644
--- a/compiler/testData/diagnostics/tests/MergePackagesWithJava.lazy.log
+++ b/compiler/testData/diagnostics/tests/MergePackagesWithJava.lazy.log
@@ -136,31 +136,17 @@ LazyJavaTypeParameterResolver@85 {
 
 ResolutionTaskHolder@87 {
     <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
 }
 
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[2] { ResolutionCandidate@100, ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[2] { ResolutionCandidate@100, ResolutionCandidate@101 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[2] { ResolutionCandidate@97, ResolutionCandidate@98 }
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
@@ -171,7 +157,24 @@ ResolutionTaskHolder@98 {
     <name not found> = EmptyList@75[empty]
 }
 
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[2] { ResolutionCandidate@105, ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[2] { ResolutionCandidate@105, ResolutionCandidate@106 }
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[2] { ResolutionCandidate@101, ResolutionCandidate@102 }
+}
+
+null {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@106[2] { ResolutionCandidate@101, ResolutionCandidate@102 }
+    <name not found> = ArrayList@107[2] { ResolutionCandidate@97, ResolutionCandidate@98 }
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/MultilineStringTemplates.lazy.log b/compiler/testData/diagnostics/tests/MultilineStringTemplates.lazy.log
index 2f381c78075..56aa8c2d3ba 100644
--- a/compiler/testData/diagnostics/tests/MultilineStringTemplates.lazy.log
+++ b/compiler/testData/diagnostics/tests/MultilineStringTemplates.lazy.log
@@ -56,155 +56,125 @@ LazyJavaPackageFragment@18['lang'] {
 
 ResolutionTaskHolder@43 {
     <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
 }
 
 ResolutionTaskHolder@55 {
     <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
+}
+
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
 }
 
 ResolutionTaskHolder@67 {
     <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
 }
 
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
 }
 
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
+}
+
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
 }
 
 ResolutionTaskHolder@79 {
     <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
 }
 
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
 }
 
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
+}
+
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
 }
 
 ResolutionTaskHolder@91 {
     <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
 }
 
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
 }
 
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
+}
+
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
 }
 
 ResolutionTaskHolder@103 {
     <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
 }
 
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
 }
 
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@113 }
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
+}
+
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
 }
 
 ResolutionTaskHolder@115 {
     <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@117 }
 }
 
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@121 }
+ResolutionTaskHolder@118 {
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
 }
 
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@125 }
+ResolutionTaskHolder@121 {
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
+}
+
+ResolutionTaskHolder@124 {
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
 }
 
 ResolutionTaskHolder@127 {
     <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@129 }
 }
 
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@133 }
+ResolutionTaskHolder@130 {
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
 }
 
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@137 }
-}
-
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@141 }
-}
-
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@145 }
-}
-
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@149 }
-}
-
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@153 }
-}
-
-ResolutionTaskHolder@155 {
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@157 }
-}
-
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@161 }
-}
-
-ResolutionTaskHolder@163 {
+ResolutionTaskHolder@133 {
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
@@ -221,25 +191,28 @@ ResolutionTaskHolder@163 {
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
+}
+
+ResolutionTaskHolder@134 {
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@164 {
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
+ResolutionTaskHolder@135 {
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
@@ -250,9 +223,7 @@ ResolutionTaskHolder@164 {
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@165 {
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
+ResolutionTaskHolder@136 {
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
@@ -263,7 +234,39 @@ ResolutionTaskHolder@165 {
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@166 {
+null {
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@126 }
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@129 }
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@132 }
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@166[1] { ResolutionCandidate@81 }
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
diff --git a/compiler/testData/diagnostics/tests/MultipleBounds.lazy.log b/compiler/testData/diagnostics/tests/MultipleBounds.lazy.log
index cb287ee517c..50ef8bce1ed 100644
--- a/compiler/testData/diagnostics/tests/MultipleBounds.lazy.log
+++ b/compiler/testData/diagnostics/tests/MultipleBounds.lazy.log
@@ -85,158 +85,273 @@ LazyJavaPackageFragment@40['lang'] {
 
 ResolutionTaskHolder@76 {
     <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
 }
 
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
+}
+
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
 }
 
 ResolutionTaskHolder@88 {
     <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
 }
 
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
+}
+
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
 }
 
 ResolutionTaskHolder@100 {
     <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
 }
 
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
+}
+
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
 }
 
 ResolutionTaskHolder@112 {
     <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
 }
 
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
+ResolutionTaskHolder@115 {
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
 }
 
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
+ResolutionTaskHolder@118 {
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
+}
+
+ResolutionTaskHolder@121 {
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
 }
 
 ResolutionTaskHolder@124 {
     <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@126 }
 }
 
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
+ResolutionTaskHolder@127 {
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
 }
 
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
+ResolutionTaskHolder@130 {
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
+}
+
+ResolutionTaskHolder@133 {
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+}
+
+ResolutionTaskHolder@134 {
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+}
+
+ResolutionTaskHolder@135 {
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
 }
 
 ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+}
+
+ResolutionTaskHolder@137 {
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+}
+
+ResolutionTaskHolder@138 {
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+}
+
+ResolutionTaskHolder@139 {
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
 }
 
 ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
 }
 
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
+ResolutionTaskHolder@141 {
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
 }
 
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
+ResolutionTaskHolder@142 {
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
 }
 
-ResolutionTaskHolder@152 {
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
+ResolutionTaskHolder@143 {
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
@@ -247,29 +362,7 @@ ResolutionTaskHolder@152 {
     <name not found> = EmptyList@67[empty]
 }
 
-ResolutionTaskHolder@153 {
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
+ResolutionTaskHolder@144 {
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
@@ -280,7 +373,64 @@ ResolutionTaskHolder@153 {
     <name not found> = EmptyList@67[empty]
 }
 
-ResolutionTaskHolder@154 {
+null {
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@126 }
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@132 }
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@129 }
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@105 }
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
@@ -302,150 +452,3 @@ ResolutionTaskHolder@154 {
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
 }
-
-ResolutionTaskHolder@155 {
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@156 {
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@157 {
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@158 {
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@159 {
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@160 {
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@161 {
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@162 {
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@163 {
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/Nullability.lazy.log b/compiler/testData/diagnostics/tests/Nullability.lazy.log
index 7f9f8192637..b8a4b425540 100644
--- a/compiler/testData/diagnostics/tests/Nullability.lazy.log
+++ b/compiler/testData/diagnostics/tests/Nullability.lazy.log
@@ -295,12 +295,6 @@ LazyJavaPackageFragment@143['lang'] {
 
 ResolutionTaskHolder@171 {
     <name not found> = ArrayList@172[10] { ResolutionCandidate@173, ResolutionCandidate@174, ResolutionCandidate@175, ... }
-    <name not found> = ArrayList@176[10] { ResolutionCandidate@173, ResolutionCandidate@174, ResolutionCandidate@175, ... }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
@@ -326,14 +320,8 @@ ResolutionTaskHolder@171 {
     <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@177 {
-    <name not found> = ArrayList@178[10] { ResolutionCandidate@179, ResolutionCandidate@180, ResolutionCandidate@181, ... }
-    <name not found> = ArrayList@182[10] { ResolutionCandidate@179, ResolutionCandidate@180, ResolutionCandidate@181, ... }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
+ResolutionTaskHolder@176 {
+    <name not found> = ArrayList@177[10] { ResolutionCandidate@178, ResolutionCandidate@179, ResolutionCandidate@180, ... }
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
@@ -359,14 +347,8 @@ ResolutionTaskHolder@177 {
     <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@183 {
-    <name not found> = ArrayList@184[10] { ResolutionCandidate@185, ResolutionCandidate@186, ResolutionCandidate@187, ... }
-    <name not found> = ArrayList@188[10] { ResolutionCandidate@185, ResolutionCandidate@186, ResolutionCandidate@187, ... }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
+ResolutionTaskHolder@181 {
+    <name not found> = ArrayList@182[10] { ResolutionCandidate@183, ResolutionCandidate@184, ResolutionCandidate@185, ... }
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
@@ -392,14 +374,8 @@ ResolutionTaskHolder@183 {
     <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@189 {
-    <name not found> = ArrayList@190[10] { ResolutionCandidate@191, ResolutionCandidate@192, ResolutionCandidate@193, ... }
-    <name not found> = ArrayList@194[10] { ResolutionCandidate@191, ResolutionCandidate@192, ResolutionCandidate@193, ... }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
+ResolutionTaskHolder@186 {
+    <name not found> = ArrayList@187[10] { ResolutionCandidate@188, ResolutionCandidate@189, ResolutionCandidate@190, ... }
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
@@ -425,9 +401,8 @@ ResolutionTaskHolder@189 {
     <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@195 {
-    <name not found> = ArrayList@196[10] { ResolutionCandidate@197, ResolutionCandidate@198, ResolutionCandidate@199, ... }
-    <name not found> = ArrayList@200[10] { ResolutionCandidate@197, ResolutionCandidate@198, ResolutionCandidate@199, ... }
+ResolutionTaskHolder@191 {
+    <name not found> = ArrayList@192[10] { ResolutionCandidate@193, ResolutionCandidate@194, ResolutionCandidate@195, ... }
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
@@ -451,6 +426,28 @@ ResolutionTaskHolder@195 {
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
+}
+
+ResolutionTaskHolder@196 {
+    <name not found> = ArrayList@197[10] { ResolutionCandidate@198, ResolutionCandidate@199, ResolutionCandidate@200, ... }
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
@@ -460,12 +457,6 @@ ResolutionTaskHolder@195 {
 
 ResolutionTaskHolder@201 {
     <name not found> = ArrayList@202[10] { ResolutionCandidate@203, ResolutionCandidate@204, ResolutionCandidate@205, ... }
-    <name not found> = ArrayList@206[10] { ResolutionCandidate@203, ResolutionCandidate@204, ResolutionCandidate@205, ... }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
@@ -491,14 +482,8 @@ ResolutionTaskHolder@201 {
     <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@207 {
-    <name not found> = ArrayList@208[10] { ResolutionCandidate@209, ResolutionCandidate@210, ResolutionCandidate@211, ... }
-    <name not found> = ArrayList@212[10] { ResolutionCandidate@209, ResolutionCandidate@210, ResolutionCandidate@211, ... }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
+ResolutionTaskHolder@206 {
+    <name not found> = ArrayList@207[10] { ResolutionCandidate@208, ResolutionCandidate@209, ResolutionCandidate@210, ... }
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
@@ -524,14 +509,8 @@ ResolutionTaskHolder@207 {
     <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@213 {
-    <name not found> = ArrayList@214[10] { ResolutionCandidate@215, ResolutionCandidate@216, ResolutionCandidate@217, ... }
-    <name not found> = ArrayList@218[10] { ResolutionCandidate@215, ResolutionCandidate@216, ResolutionCandidate@217, ... }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
+ResolutionTaskHolder@211 {
+    <name not found> = ArrayList@212[10] { ResolutionCandidate@213, ResolutionCandidate@214, ResolutionCandidate@215, ... }
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
@@ -557,2030 +536,2164 @@ ResolutionTaskHolder@213 {
     <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@219 {
-    <name not found> = ArrayList@220[10] { ResolutionCandidate@221, ResolutionCandidate@222, ResolutionCandidate@223, ... }
-    <name not found> = ArrayList@224[10] { ResolutionCandidate@221, ResolutionCandidate@222, ResolutionCandidate@223, ... }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
+ResolutionTaskHolder@216 {
+    <name not found> = ArrayList@217[10] { ResolutionCandidate@218, ResolutionCandidate@219, ResolutionCandidate@220, ... }
 }
 
-ResolutionTaskHolder@225 {
-    <name not found> = ArrayList@226[10] { ResolutionCandidate@227, ResolutionCandidate@228, ResolutionCandidate@229, ... }
-    <name not found> = ArrayList@230[10] { ResolutionCandidate@227, ResolutionCandidate@228, ResolutionCandidate@229, ... }
+ResolutionTaskHolder@221 {
+    <name not found> = ArrayList@222[10] { ResolutionCandidate@223, ResolutionCandidate@224, ResolutionCandidate@225, ... }
+}
+
+ResolutionTaskHolder@226 {
+    <name not found> = ArrayList@227[10] { ResolutionCandidate@228, ResolutionCandidate@229, ResolutionCandidate@230, ... }
 }
 
 ResolutionTaskHolder@231 {
     <name not found> = ArrayList@232[10] { ResolutionCandidate@233, ResolutionCandidate@234, ResolutionCandidate@235, ... }
-    <name not found> = ArrayList@236[10] { ResolutionCandidate@233, ResolutionCandidate@234, ResolutionCandidate@235, ... }
 }
 
-ResolutionTaskHolder@237 {
-    <name not found> = ArrayList@238[10] { ResolutionCandidate@239, ResolutionCandidate@240, ResolutionCandidate@241, ... }
-    <name not found> = ArrayList@242[10] { ResolutionCandidate@239, ResolutionCandidate@240, ResolutionCandidate@241, ... }
+ResolutionTaskHolder@236 {
+    <name not found> = ArrayList@237[10] { ResolutionCandidate@238, ResolutionCandidate@239, ResolutionCandidate@240, ... }
 }
 
-ResolutionTaskHolder@243 {
-    <name not found> = ArrayList@244[10] { ResolutionCandidate@245, ResolutionCandidate@246, ResolutionCandidate@247, ... }
-    <name not found> = ArrayList@248[10] { ResolutionCandidate@245, ResolutionCandidate@246, ResolutionCandidate@247, ... }
+ResolutionTaskHolder@241 {
+    <name not found> = ArrayList@242[10] { ResolutionCandidate@243, ResolutionCandidate@244, ResolutionCandidate@245, ... }
 }
 
-ResolutionTaskHolder@249 {
-    <name not found> = ArrayList@250[10] { ResolutionCandidate@251, ResolutionCandidate@252, ResolutionCandidate@253, ... }
-    <name not found> = ArrayList@254[10] { ResolutionCandidate@251, ResolutionCandidate@252, ResolutionCandidate@253, ... }
+ResolutionTaskHolder@246 {
+    <name not found> = ArrayList@247[10] { ResolutionCandidate@248, ResolutionCandidate@249, ResolutionCandidate@250, ... }
 }
 
-ResolutionTaskHolder@255 {
-    <name not found> = ArrayList@256[10] { ResolutionCandidate@257, ResolutionCandidate@258, ResolutionCandidate@259, ... }
-    <name not found> = ArrayList@260[10] { ResolutionCandidate@257, ResolutionCandidate@258, ResolutionCandidate@259, ... }
+ResolutionTaskHolder@251 {
+    <name not found> = ArrayList@252[10] { ResolutionCandidate@253, ResolutionCandidate@254, ResolutionCandidate@255, ... }
+}
+
+ResolutionTaskHolder@256 {
+    <name not found> = ArrayList@257[10] { ResolutionCandidate@258, ResolutionCandidate@259, ResolutionCandidate@260, ... }
 }
 
 ResolutionTaskHolder@261 {
     <name not found> = ArrayList@262[10] { ResolutionCandidate@263, ResolutionCandidate@264, ResolutionCandidate@265, ... }
-    <name not found> = ArrayList@266[10] { ResolutionCandidate@263, ResolutionCandidate@264, ResolutionCandidate@265, ... }
 }
 
-ResolutionTaskHolder@267 {
-    <name not found> = ArrayList@268[10] { ResolutionCandidate@269, ResolutionCandidate@270, ResolutionCandidate@271, ... }
-    <name not found> = ArrayList@272[10] { ResolutionCandidate@269, ResolutionCandidate@270, ResolutionCandidate@271, ... }
+ResolutionTaskHolder@266 {
+    <name not found> = ArrayList@267[10] { ResolutionCandidate@268, ResolutionCandidate@269, ResolutionCandidate@270, ... }
 }
 
-ResolutionTaskHolder@273 {
-    <name not found> = ArrayList@274[10] { ResolutionCandidate@275, ResolutionCandidate@276, ResolutionCandidate@277, ... }
-    <name not found> = ArrayList@278[10] { ResolutionCandidate@275, ResolutionCandidate@276, ResolutionCandidate@277, ... }
+ResolutionTaskHolder@271 {
+    <name not found> = ArrayList@272[10] { ResolutionCandidate@273, ResolutionCandidate@274, ResolutionCandidate@275, ... }
 }
 
-ResolutionTaskHolder@279 {
-    <name not found> = ArrayList@280[10] { ResolutionCandidate@281, ResolutionCandidate@282, ResolutionCandidate@283, ... }
-    <name not found> = ArrayList@284[10] { ResolutionCandidate@281, ResolutionCandidate@282, ResolutionCandidate@283, ... }
+ResolutionTaskHolder@276 {
+    <name not found> = ArrayList@277[10] { ResolutionCandidate@278, ResolutionCandidate@279, ResolutionCandidate@280, ... }
 }
 
-ResolutionTaskHolder@285 {
-    <name not found> = ArrayList@286[10] { ResolutionCandidate@287, ResolutionCandidate@288, ResolutionCandidate@289, ... }
-    <name not found> = ArrayList@290[10] { ResolutionCandidate@287, ResolutionCandidate@288, ResolutionCandidate@289, ... }
+ResolutionTaskHolder@281 {
+    <name not found> = ArrayList@282[10] { ResolutionCandidate@283, ResolutionCandidate@284, ResolutionCandidate@285, ... }
+}
+
+ResolutionTaskHolder@286 {
+    <name not found> = ArrayList@287[10] { ResolutionCandidate@288, ResolutionCandidate@289, ResolutionCandidate@290, ... }
 }
 
 ResolutionTaskHolder@291 {
     <name not found> = ArrayList@292[10] { ResolutionCandidate@293, ResolutionCandidate@294, ResolutionCandidate@295, ... }
-    <name not found> = ArrayList@296[10] { ResolutionCandidate@293, ResolutionCandidate@294, ResolutionCandidate@295, ... }
 }
 
-ResolutionTaskHolder@297 {
-    <name not found> = ArrayList@298[10] { ResolutionCandidate@299, ResolutionCandidate@300, ResolutionCandidate@301, ... }
-    <name not found> = ArrayList@302[10] { ResolutionCandidate@299, ResolutionCandidate@300, ResolutionCandidate@301, ... }
+ResolutionTaskHolder@296 {
+    <name not found> = ArrayList@297[10] { ResolutionCandidate@298, ResolutionCandidate@299, ResolutionCandidate@300, ... }
 }
 
-ResolutionTaskHolder@303 {
-    <name not found> = ArrayList@304[10] { ResolutionCandidate@305, ResolutionCandidate@306, ResolutionCandidate@307, ... }
-    <name not found> = ArrayList@308[10] { ResolutionCandidate@305, ResolutionCandidate@306, ResolutionCandidate@307, ... }
+ResolutionTaskHolder@301 {
+    <name not found> = ArrayList@302[10] { ResolutionCandidate@303, ResolutionCandidate@304, ResolutionCandidate@305, ... }
 }
 
-ResolutionTaskHolder@309 {
-    <name not found> = ArrayList@310[10] { ResolutionCandidate@311, ResolutionCandidate@312, ResolutionCandidate@313, ... }
-    <name not found> = ArrayList@314[10] { ResolutionCandidate@311, ResolutionCandidate@312, ResolutionCandidate@313, ... }
+ResolutionTaskHolder@306 {
+    <name not found> = ArrayList@307[10] { ResolutionCandidate@308, ResolutionCandidate@309, ResolutionCandidate@310, ... }
 }
 
-ResolutionTaskHolder@315 {
-    <name not found> = ArrayList@316[10] { ResolutionCandidate@317, ResolutionCandidate@318, ResolutionCandidate@319, ... }
-    <name not found> = ArrayList@320[10] { ResolutionCandidate@317, ResolutionCandidate@318, ResolutionCandidate@319, ... }
+ResolutionTaskHolder@311 {
+    <name not found> = ArrayList@312[16] { ResolutionCandidate@313, ResolutionCandidate@314, ResolutionCandidate@315, ... }
+}
+
+ResolutionTaskHolder@316 {
+    <name not found> = ArrayList@317[1] { ResolutionCandidate@318 }
+    <name not found> = ArrayList@319[1] { ResolutionCandidate@320 }
+    <name not found> = EmptyList@9[empty]
 }
 
 ResolutionTaskHolder@321 {
-    <name not found> = ArrayList@322[10] { ResolutionCandidate@323, ResolutionCandidate@324, ResolutionCandidate@325, ... }
-    <name not found> = ArrayList@326[10] { ResolutionCandidate@323, ResolutionCandidate@324, ResolutionCandidate@325, ... }
+    <name not found> = ArrayList@322[1] { ResolutionCandidate@323 }
+    <name not found> = ArrayList@324[1] { ResolutionCandidate@325 }
+    <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@327 {
-    <name not found> = ArrayList@328[10] { ResolutionCandidate@329, ResolutionCandidate@330, ResolutionCandidate@331, ... }
-    <name not found> = ArrayList@332[10] { ResolutionCandidate@329, ResolutionCandidate@330, ResolutionCandidate@331, ... }
+ResolutionTaskHolder@326 {
+    <name not found> = ArrayList@327[1] { ResolutionCandidate@328 }
+    <name not found> = ArrayList@329[1] { ResolutionCandidate@330 }
+    <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@333 {
-    <name not found> = ArrayList@334[10] { ResolutionCandidate@335, ResolutionCandidate@336, ResolutionCandidate@337, ... }
-    <name not found> = ArrayList@338[10] { ResolutionCandidate@335, ResolutionCandidate@336, ResolutionCandidate@337, ... }
+ResolutionTaskHolder@331 {
+    <name not found> = ArrayList@332[1] { ResolutionCandidate@333 }
+    <name not found> = ArrayList@334[1] { ResolutionCandidate@335 }
+    <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@339 {
-    <name not found> = ArrayList@340[16] { ResolutionCandidate@341, ResolutionCandidate@342, ResolutionCandidate@343, ... }
-    <name not found> = ArrayList@344[16] { ResolutionCandidate@341, ResolutionCandidate@342, ResolutionCandidate@343, ... }
+ResolutionTaskHolder@336 {
+    <name not found> = ArrayList@337[1] { ResolutionCandidate@338 }
+    <name not found> = ArrayList@339[1] { ResolutionCandidate@340 }
+    <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@345 {
-    <name not found> = ArrayList@346[1] { ResolutionCandidate@347 }
-    <name not found> = ArrayList@348[1] { ResolutionCandidate@347 }
+ResolutionTaskHolder@341 {
+    <name not found> = ArrayList@342[1] { ResolutionCandidate@343 }
+    <name not found> = ArrayList@344[1] { ResolutionCandidate@345 }
+    <name not found> = EmptyList@9[empty]
+}
+
+ResolutionTaskHolder@346 {
+    <name not found> = ArrayList@347[1] { ResolutionCandidate@348 }
     <name not found> = ArrayList@349[1] { ResolutionCandidate@350 }
-    <name not found> = ArrayList@351[1] { ResolutionCandidate@350 }
-    <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@352 {
-    <name not found> = ArrayList@353[1] { ResolutionCandidate@354 }
-    <name not found> = ArrayList@355[1] { ResolutionCandidate@354 }
-    <name not found> = ArrayList@356[1] { ResolutionCandidate@357 }
-    <name not found> = ArrayList@358[1] { ResolutionCandidate@357 }
-    <name not found> = EmptyList@9[empty]
+ResolutionTaskHolder@351 {
+    <name not found> = ArrayList@352[1] { ResolutionCandidate@353 }
+    <name not found> = ArrayList@354[1] { ResolutionCandidate@355 }
     <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@359 {
-    <name not found> = ArrayList@360[1] { ResolutionCandidate@361 }
-    <name not found> = ArrayList@362[1] { ResolutionCandidate@361 }
-    <name not found> = ArrayList@363[1] { ResolutionCandidate@364 }
-    <name not found> = ArrayList@365[1] { ResolutionCandidate@364 }
+ResolutionTaskHolder@356 {
+    <name not found> = ArrayList@357[1] { ResolutionCandidate@358 }
+    <name not found> = ArrayList@359[1] { ResolutionCandidate@360 }
     <name not found> = EmptyList@9[empty]
+}
+
+ResolutionTaskHolder@361 {
+    <name not found> = ArrayList@362[1] { ResolutionCandidate@363 }
+    <name not found> = ArrayList@364[1] { ResolutionCandidate@365 }
     <name not found> = EmptyList@9[empty]
 }
 
 ResolutionTaskHolder@366 {
     <name not found> = ArrayList@367[1] { ResolutionCandidate@368 }
-    <name not found> = ArrayList@369[1] { ResolutionCandidate@368 }
-    <name not found> = ArrayList@370[1] { ResolutionCandidate@371 }
-    <name not found> = ArrayList@372[1] { ResolutionCandidate@371 }
-    <name not found> = EmptyList@9[empty]
+    <name not found> = ArrayList@369[1] { ResolutionCandidate@370 }
     <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@373 {
+ResolutionTaskHolder@371 {
+    <name not found> = ArrayList@372[1] { ResolutionCandidate@373 }
     <name not found> = ArrayList@374[1] { ResolutionCandidate@375 }
-    <name not found> = ArrayList@376[1] { ResolutionCandidate@375 }
+    <name not found> = EmptyList@9[empty]
+}
+
+ResolutionTaskHolder@376 {
     <name not found> = ArrayList@377[1] { ResolutionCandidate@378 }
-    <name not found> = ArrayList@379[1] { ResolutionCandidate@378 }
-    <name not found> = EmptyList@9[empty]
+    <name not found> = ArrayList@379[1] { ResolutionCandidate@380 }
     <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@380 {
-    <name not found> = ArrayList@381[1] { ResolutionCandidate@382 }
-    <name not found> = ArrayList@383[1] { ResolutionCandidate@382 }
+ResolutionTaskHolder@381 {
+    <name not found> = ArrayList@382[1] { ResolutionCandidate@383 }
     <name not found> = ArrayList@384[1] { ResolutionCandidate@385 }
-    <name not found> = ArrayList@386[1] { ResolutionCandidate@385 }
-    <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@387 {
-    <name not found> = ArrayList@388[1] { ResolutionCandidate@389 }
-    <name not found> = ArrayList@390[1] { ResolutionCandidate@389 }
-    <name not found> = ArrayList@391[1] { ResolutionCandidate@392 }
-    <name not found> = ArrayList@393[1] { ResolutionCandidate@392 }
-    <name not found> = EmptyList@9[empty]
+ResolutionTaskHolder@386 {
+    <name not found> = ArrayList@387[1] { ResolutionCandidate@388 }
+    <name not found> = ArrayList@389[1] { ResolutionCandidate@390 }
     <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@394 {
-    <name not found> = ArrayList@395[1] { ResolutionCandidate@396 }
-    <name not found> = ArrayList@397[1] { ResolutionCandidate@396 }
-    <name not found> = ArrayList@398[1] { ResolutionCandidate@399 }
-    <name not found> = ArrayList@400[1] { ResolutionCandidate@399 }
+ResolutionTaskHolder@391 {
+    <name not found> = ArrayList@392[1] { ResolutionCandidate@393 }
+    <name not found> = ArrayList@394[1] { ResolutionCandidate@395 }
     <name not found> = EmptyList@9[empty]
+}
+
+ResolutionTaskHolder@396 {
+    <name not found> = ArrayList@397[1] { ResolutionCandidate@398 }
+    <name not found> = ArrayList@399[1] { ResolutionCandidate@400 }
     <name not found> = EmptyList@9[empty]
 }
 
 ResolutionTaskHolder@401 {
     <name not found> = ArrayList@402[1] { ResolutionCandidate@403 }
-    <name not found> = ArrayList@404[1] { ResolutionCandidate@403 }
-    <name not found> = ArrayList@405[1] { ResolutionCandidate@406 }
-    <name not found> = ArrayList@407[1] { ResolutionCandidate@406 }
-    <name not found> = EmptyList@9[empty]
+    <name not found> = ArrayList@404[1] { ResolutionCandidate@405 }
     <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@408 {
+ResolutionTaskHolder@406 {
+    <name not found> = ArrayList@407[1] { ResolutionCandidate@408 }
     <name not found> = ArrayList@409[1] { ResolutionCandidate@410 }
-    <name not found> = ArrayList@411[1] { ResolutionCandidate@410 }
+    <name not found> = EmptyList@9[empty]
+}
+
+ResolutionTaskHolder@411 {
     <name not found> = ArrayList@412[1] { ResolutionCandidate@413 }
-    <name not found> = ArrayList@414[1] { ResolutionCandidate@413 }
-    <name not found> = EmptyList@9[empty]
+    <name not found> = ArrayList@414[1] { ResolutionCandidate@415 }
     <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@415 {
-    <name not found> = ArrayList@416[1] { ResolutionCandidate@417 }
-    <name not found> = ArrayList@418[1] { ResolutionCandidate@417 }
+ResolutionTaskHolder@416 {
+    <name not found> = ArrayList@417[1] { ResolutionCandidate@418 }
     <name not found> = ArrayList@419[1] { ResolutionCandidate@420 }
-    <name not found> = ArrayList@421[1] { ResolutionCandidate@420 }
-    <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@422 {
-    <name not found> = ArrayList@423[1] { ResolutionCandidate@424 }
-    <name not found> = ArrayList@425[1] { ResolutionCandidate@424 }
-    <name not found> = ArrayList@426[1] { ResolutionCandidate@427 }
-    <name not found> = ArrayList@428[1] { ResolutionCandidate@427 }
-    <name not found> = EmptyList@9[empty]
+ResolutionTaskHolder@421 {
+    <name not found> = ArrayList@422[1] { ResolutionCandidate@423 }
+    <name not found> = ArrayList@424[1] { ResolutionCandidate@425 }
     <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@429 {
-    <name not found> = ArrayList@430[1] { ResolutionCandidate@431 }
-    <name not found> = ArrayList@432[1] { ResolutionCandidate@431 }
-    <name not found> = ArrayList@433[1] { ResolutionCandidate@434 }
-    <name not found> = ArrayList@435[1] { ResolutionCandidate@434 }
+ResolutionTaskHolder@426 {
+    <name not found> = ArrayList@427[1] { ResolutionCandidate@428 }
+    <name not found> = ArrayList@429[1] { ResolutionCandidate@430 }
     <name not found> = EmptyList@9[empty]
+}
+
+ResolutionTaskHolder@431 {
+    <name not found> = ArrayList@432[1] { ResolutionCandidate@433 }
+    <name not found> = ArrayList@434[1] { ResolutionCandidate@435 }
     <name not found> = EmptyList@9[empty]
 }
 
 ResolutionTaskHolder@436 {
     <name not found> = ArrayList@437[1] { ResolutionCandidate@438 }
-    <name not found> = ArrayList@439[1] { ResolutionCandidate@438 }
-    <name not found> = ArrayList@440[1] { ResolutionCandidate@441 }
-    <name not found> = ArrayList@442[1] { ResolutionCandidate@441 }
-    <name not found> = EmptyList@9[empty]
+    <name not found> = ArrayList@439[1] { ResolutionCandidate@440 }
     <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@443 {
+ResolutionTaskHolder@441 {
+    <name not found> = ArrayList@442[1] { ResolutionCandidate@443 }
     <name not found> = ArrayList@444[1] { ResolutionCandidate@445 }
-    <name not found> = ArrayList@446[1] { ResolutionCandidate@445 }
+    <name not found> = EmptyList@9[empty]
+}
+
+ResolutionTaskHolder@446 {
     <name not found> = ArrayList@447[1] { ResolutionCandidate@448 }
-    <name not found> = ArrayList@449[1] { ResolutionCandidate@448 }
-    <name not found> = EmptyList@9[empty]
+    <name not found> = ArrayList@449[1] { ResolutionCandidate@450 }
     <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@450 {
-    <name not found> = ArrayList@451[1] { ResolutionCandidate@452 }
-    <name not found> = ArrayList@453[1] { ResolutionCandidate@452 }
+ResolutionTaskHolder@451 {
+    <name not found> = ArrayList@452[1] { ResolutionCandidate@453 }
     <name not found> = ArrayList@454[1] { ResolutionCandidate@455 }
-    <name not found> = ArrayList@456[1] { ResolutionCandidate@455 }
-    <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@457 {
-    <name not found> = ArrayList@458[1] { ResolutionCandidate@459 }
-    <name not found> = ArrayList@460[1] { ResolutionCandidate@459 }
-    <name not found> = ArrayList@461[1] { ResolutionCandidate@462 }
-    <name not found> = ArrayList@463[1] { ResolutionCandidate@462 }
-    <name not found> = EmptyList@9[empty]
+ResolutionTaskHolder@456 {
+    <name not found> = ArrayList@457[1] { ResolutionCandidate@458 }
+    <name not found> = ArrayList@459[1] { ResolutionCandidate@460 }
     <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@464 {
-    <name not found> = ArrayList@465[1] { ResolutionCandidate@466 }
-    <name not found> = ArrayList@467[1] { ResolutionCandidate@466 }
-    <name not found> = ArrayList@468[1] { ResolutionCandidate@469 }
-    <name not found> = ArrayList@470[1] { ResolutionCandidate@469 }
+ResolutionTaskHolder@461 {
+    <name not found> = ArrayList@462[1] { ResolutionCandidate@463 }
+    <name not found> = ArrayList@464[1] { ResolutionCandidate@465 }
     <name not found> = EmptyList@9[empty]
+}
+
+ResolutionTaskHolder@466 {
+    <name not found> = ArrayList@467[1] { ResolutionCandidate@468 }
+    <name not found> = ArrayList@469[1] { ResolutionCandidate@470 }
     <name not found> = EmptyList@9[empty]
 }
 
 ResolutionTaskHolder@471 {
     <name not found> = ArrayList@472[1] { ResolutionCandidate@473 }
-    <name not found> = ArrayList@474[1] { ResolutionCandidate@473 }
-    <name not found> = ArrayList@475[1] { ResolutionCandidate@476 }
-    <name not found> = ArrayList@477[1] { ResolutionCandidate@476 }
-    <name not found> = EmptyList@9[empty]
+    <name not found> = ArrayList@474[1] { ResolutionCandidate@475 }
     <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@478 {
+ResolutionTaskHolder@476 {
+    <name not found> = ArrayList@477[1] { ResolutionCandidate@478 }
     <name not found> = ArrayList@479[1] { ResolutionCandidate@480 }
-    <name not found> = ArrayList@481[1] { ResolutionCandidate@480 }
+    <name not found> = EmptyList@9[empty]
+}
+
+ResolutionTaskHolder@481 {
     <name not found> = ArrayList@482[1] { ResolutionCandidate@483 }
-    <name not found> = ArrayList@484[1] { ResolutionCandidate@483 }
-    <name not found> = EmptyList@9[empty]
+    <name not found> = ArrayList@484[1] { ResolutionCandidate@485 }
     <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@485 {
-    <name not found> = ArrayList@486[1] { ResolutionCandidate@487 }
-    <name not found> = ArrayList@488[1] { ResolutionCandidate@487 }
+ResolutionTaskHolder@486 {
+    <name not found> = ArrayList@487[1] { ResolutionCandidate@488 }
     <name not found> = ArrayList@489[1] { ResolutionCandidate@490 }
-    <name not found> = ArrayList@491[1] { ResolutionCandidate@490 }
-    <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@492 {
-    <name not found> = ArrayList@493[1] { ResolutionCandidate@494 }
-    <name not found> = ArrayList@495[1] { ResolutionCandidate@494 }
-    <name not found> = ArrayList@496[1] { ResolutionCandidate@497 }
-    <name not found> = ArrayList@498[1] { ResolutionCandidate@497 }
-    <name not found> = EmptyList@9[empty]
+ResolutionTaskHolder@491 {
+    <name not found> = ArrayList@492[1] { ResolutionCandidate@493 }
+    <name not found> = ArrayList@494[1] { ResolutionCandidate@495 }
     <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@499 {
-    <name not found> = ArrayList@500[1] { ResolutionCandidate@501 }
-    <name not found> = ArrayList@502[1] { ResolutionCandidate@501 }
-    <name not found> = ArrayList@503[1] { ResolutionCandidate@504 }
-    <name not found> = ArrayList@505[1] { ResolutionCandidate@504 }
+ResolutionTaskHolder@496 {
+    <name not found> = ArrayList@497[1] { ResolutionCandidate@498 }
+    <name not found> = ArrayList@499[1] { ResolutionCandidate@500 }
     <name not found> = EmptyList@9[empty]
+}
+
+ResolutionTaskHolder@501 {
+    <name not found> = ArrayList@502[1] { ResolutionCandidate@503 }
+    <name not found> = ArrayList@504[1] { ResolutionCandidate@505 }
     <name not found> = EmptyList@9[empty]
 }
 
 ResolutionTaskHolder@506 {
     <name not found> = ArrayList@507[1] { ResolutionCandidate@508 }
-    <name not found> = ArrayList@509[1] { ResolutionCandidate@508 }
-    <name not found> = ArrayList@510[1] { ResolutionCandidate@511 }
-    <name not found> = ArrayList@512[1] { ResolutionCandidate@511 }
-    <name not found> = EmptyList@9[empty]
+    <name not found> = ArrayList@509[1] { ResolutionCandidate@510 }
     <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@513 {
+ResolutionTaskHolder@511 {
+    <name not found> = ArrayList@512[1] { ResolutionCandidate@513 }
     <name not found> = ArrayList@514[1] { ResolutionCandidate@515 }
-    <name not found> = ArrayList@516[1] { ResolutionCandidate@515 }
+    <name not found> = EmptyList@9[empty]
+}
+
+ResolutionTaskHolder@516 {
     <name not found> = ArrayList@517[1] { ResolutionCandidate@518 }
-    <name not found> = ArrayList@519[1] { ResolutionCandidate@518 }
-    <name not found> = EmptyList@9[empty]
+    <name not found> = ArrayList@519[1] { ResolutionCandidate@520 }
     <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@520 {
-    <name not found> = ArrayList@521[1] { ResolutionCandidate@522 }
-    <name not found> = ArrayList@523[1] { ResolutionCandidate@522 }
+ResolutionTaskHolder@521 {
+    <name not found> = ArrayList@522[1] { ResolutionCandidate@523 }
     <name not found> = ArrayList@524[1] { ResolutionCandidate@525 }
-    <name not found> = ArrayList@526[1] { ResolutionCandidate@525 }
-    <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@527 {
-    <name not found> = ArrayList@528[1] { ResolutionCandidate@529 }
-    <name not found> = ArrayList@530[1] { ResolutionCandidate@529 }
-    <name not found> = ArrayList@531[1] { ResolutionCandidate@532 }
-    <name not found> = ArrayList@533[1] { ResolutionCandidate@532 }
-    <name not found> = EmptyList@9[empty]
+ResolutionTaskHolder@526 {
+    <name not found> = ArrayList@527[1] { ResolutionCandidate@528 }
+    <name not found> = ArrayList@529[1] { ResolutionCandidate@530 }
     <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@534 {
-    <name not found> = ArrayList@535[1] { ResolutionCandidate@536 }
-    <name not found> = ArrayList@537[1] { ResolutionCandidate@536 }
-    <name not found> = ArrayList@538[1] { ResolutionCandidate@539 }
-    <name not found> = ArrayList@540[1] { ResolutionCandidate@539 }
+ResolutionTaskHolder@531 {
+    <name not found> = ArrayList@532[1] { ResolutionCandidate@533 }
+    <name not found> = ArrayList@534[1] { ResolutionCandidate@535 }
     <name not found> = EmptyList@9[empty]
+}
+
+ResolutionTaskHolder@536 {
+    <name not found> = ArrayList@537[1] { ResolutionCandidate@538 }
+    <name not found> = ArrayList@539[1] { ResolutionCandidate@540 }
     <name not found> = EmptyList@9[empty]
 }
 
 ResolutionTaskHolder@541 {
     <name not found> = ArrayList@542[1] { ResolutionCandidate@543 }
-    <name not found> = ArrayList@544[1] { ResolutionCandidate@543 }
-    <name not found> = ArrayList@545[1] { ResolutionCandidate@546 }
-    <name not found> = ArrayList@547[1] { ResolutionCandidate@546 }
+    <name not found> = ArrayList@544[1] { ResolutionCandidate@545 }
+    <name not found> = EmptyList@9[empty]
+}
+
+ResolutionTaskHolder@546 {
+    <name not found> = ArrayList@547[1] { ResolutionCandidate@548 }
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@548 {
-    <name not found> = ArrayList@549[1] { ResolutionCandidate@550 }
-    <name not found> = ArrayList@551[1] { ResolutionCandidate@550 }
-    <name not found> = ArrayList@552[1] { ResolutionCandidate@553 }
-    <name not found> = ArrayList@554[1] { ResolutionCandidate@553 }
+ResolutionTaskHolder@549 {
+    <name not found> = ArrayList@550[1] { ResolutionCandidate@551 }
     <name not found> = EmptyList@9[empty]
+}
+
+ResolutionTaskHolder@552 {
+    <name not found> = ArrayList@553[1] { ResolutionCandidate@554 }
     <name not found> = EmptyList@9[empty]
 }
 
 ResolutionTaskHolder@555 {
     <name not found> = ArrayList@556[1] { ResolutionCandidate@557 }
-    <name not found> = ArrayList@558[1] { ResolutionCandidate@557 }
+    <name not found> = EmptyList@9[empty]
+}
+
+ResolutionTaskHolder@558 {
     <name not found> = ArrayList@559[1] { ResolutionCandidate@560 }
-    <name not found> = ArrayList@561[1] { ResolutionCandidate@560 }
-    <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@562 {
-    <name not found> = ArrayList@563[1] { ResolutionCandidate@564 }
-    <name not found> = ArrayList@565[1] { ResolutionCandidate@564 }
-    <name not found> = ArrayList@566[1] { ResolutionCandidate@567 }
-    <name not found> = ArrayList@568[1] { ResolutionCandidate@567 }
-    <name not found> = EmptyList@9[empty]
+ResolutionTaskHolder@561 {
+    <name not found> = ArrayList@562[1] { ResolutionCandidate@563 }
     <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@569 {
-    <name not found> = ArrayList@570[1] { ResolutionCandidate@571 }
-    <name not found> = ArrayList@572[1] { ResolutionCandidate@571 }
-    <name not found> = ArrayList@573[1] { ResolutionCandidate@574 }
-    <name not found> = ArrayList@575[1] { ResolutionCandidate@574 }
+ResolutionTaskHolder@564 {
+    <name not found> = ArrayList@565[1] { ResolutionCandidate@566 }
     <name not found> = EmptyList@9[empty]
+}
+
+ResolutionTaskHolder@567 {
+    <name not found> = ArrayList@568[1] { ResolutionCandidate@569 }
     <name not found> = EmptyList@9[empty]
 }
 
+ResolutionTaskHolder@570 {
+    <name not found> = ArrayList@571[1] { ResolutionCandidate@572 }
+    <name not found> = EmptyList@9[empty]
+}
+
+ResolutionTaskHolder@573 {
+    <name not found> = ArrayList@574[1] { ResolutionCandidate@575 }
+}
+
 ResolutionTaskHolder@576 {
     <name not found> = ArrayList@577[1] { ResolutionCandidate@578 }
-    <name not found> = ArrayList@579[1] { ResolutionCandidate@578 }
+}
+
+ResolutionTaskHolder@579 {
     <name not found> = ArrayList@580[1] { ResolutionCandidate@581 }
-    <name not found> = ArrayList@582[1] { ResolutionCandidate@581 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@583 {
-    <name not found> = ArrayList@584[1] { ResolutionCandidate@585 }
-    <name not found> = ArrayList@586[1] { ResolutionCandidate@585 }
-    <name not found> = ArrayList@587[1] { ResolutionCandidate@588 }
-    <name not found> = ArrayList@589[1] { ResolutionCandidate@588 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
+ResolutionTaskHolder@582 {
+    <name not found> = ArrayList@583[1] { ResolutionCandidate@584 }
 }
 
-ResolutionTaskHolder@590 {
-    <name not found> = ArrayList@591[1] { ResolutionCandidate@592 }
-    <name not found> = ArrayList@593[1] { ResolutionCandidate@592 }
-    <name not found> = ArrayList@594[1] { ResolutionCandidate@595 }
-    <name not found> = ArrayList@596[1] { ResolutionCandidate@595 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
+ResolutionTaskHolder@585 {
+    <name not found> = ArrayList@586[1] { ResolutionCandidate@587 }
+}
+
+ResolutionTaskHolder@588 {
+    <name not found> = ArrayList@589[1] { ResolutionCandidate@590 }
+}
+
+ResolutionTaskHolder@591 {
+    <name not found> = ArrayList@592[1] { ResolutionCandidate@593 }
+}
+
+ResolutionTaskHolder@594 {
+    <name not found> = ArrayList@595[1] { ResolutionCandidate@596 }
 }
 
 ResolutionTaskHolder@597 {
     <name not found> = ArrayList@598[1] { ResolutionCandidate@599 }
-    <name not found> = ArrayList@600[1] { ResolutionCandidate@599 }
+}
+
+ResolutionTaskHolder@600 {
     <name not found> = ArrayList@601[1] { ResolutionCandidate@602 }
-    <name not found> = ArrayList@603[1] { ResolutionCandidate@602 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@604 {
-    <name not found> = ArrayList@605[1] { ResolutionCandidate@606 }
-    <name not found> = ArrayList@607[1] { ResolutionCandidate@606 }
-    <name not found> = ArrayList@608[1] { ResolutionCandidate@609 }
-    <name not found> = ArrayList@610[1] { ResolutionCandidate@609 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
+ResolutionTaskHolder@603 {
+    <name not found> = ArrayList@604[1] { ResolutionCandidate@605 }
 }
 
-ResolutionTaskHolder@611 {
-    <name not found> = ArrayList@612[1] { ResolutionCandidate@613 }
-    <name not found> = ArrayList@614[1] { ResolutionCandidate@613 }
-    <name not found> = ArrayList@615[1] { ResolutionCandidate@616 }
-    <name not found> = ArrayList@617[1] { ResolutionCandidate@616 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
+ResolutionTaskHolder@606 {
+    <name not found> = ArrayList@607[1] { ResolutionCandidate@608 }
+}
+
+ResolutionTaskHolder@609 {
+    <name not found> = ArrayList@610[1] { ResolutionCandidate@611 }
+}
+
+ResolutionTaskHolder@612 {
+    <name not found> = ArrayList@613[1] { ResolutionCandidate@614 }
+}
+
+ResolutionTaskHolder@615 {
+    <name not found> = ArrayList@616[1] { ResolutionCandidate@617 }
 }
 
 ResolutionTaskHolder@618 {
     <name not found> = ArrayList@619[1] { ResolutionCandidate@620 }
-    <name not found> = ArrayList@621[1] { ResolutionCandidate@620 }
+}
+
+ResolutionTaskHolder@621 {
     <name not found> = ArrayList@622[1] { ResolutionCandidate@623 }
-    <name not found> = ArrayList@624[1] { ResolutionCandidate@623 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@625 {
-    <name not found> = ArrayList@626[1] { ResolutionCandidate@627 }
-    <name not found> = ArrayList@628[1] { ResolutionCandidate@627 }
-    <name not found> = ArrayList@629[1] { ResolutionCandidate@630 }
-    <name not found> = ArrayList@631[1] { ResolutionCandidate@630 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
+ResolutionTaskHolder@624 {
+    <name not found> = ArrayList@625[1] { ResolutionCandidate@626 }
 }
 
-ResolutionTaskHolder@632 {
-    <name not found> = ArrayList@633[1] { ResolutionCandidate@634 }
-    <name not found> = ArrayList@635[1] { ResolutionCandidate@634 }
-    <name not found> = ArrayList@636[1] { ResolutionCandidate@637 }
-    <name not found> = ArrayList@638[1] { ResolutionCandidate@637 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
+ResolutionTaskHolder@627 {
+    <name not found> = ArrayList@628[1] { ResolutionCandidate@629 }
+}
+
+ResolutionTaskHolder@630 {
+    <name not found> = ArrayList@631[1] { ResolutionCandidate@632 }
+}
+
+ResolutionTaskHolder@633 {
+    <name not found> = ArrayList@634[1] { ResolutionCandidate@635 }
+}
+
+ResolutionTaskHolder@636 {
+    <name not found> = ArrayList@637[1] { ResolutionCandidate@638 }
 }
 
 ResolutionTaskHolder@639 {
     <name not found> = ArrayList@640[1] { ResolutionCandidate@641 }
-    <name not found> = ArrayList@642[1] { ResolutionCandidate@641 }
+}
+
+ResolutionTaskHolder@642 {
     <name not found> = ArrayList@643[1] { ResolutionCandidate@644 }
-    <name not found> = ArrayList@645[1] { ResolutionCandidate@644 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@646 {
-    <name not found> = ArrayList@647[1] { ResolutionCandidate@648 }
-    <name not found> = ArrayList@649[1] { ResolutionCandidate@648 }
-    <name not found> = ArrayList@650[1] { ResolutionCandidate@651 }
-    <name not found> = ArrayList@652[1] { ResolutionCandidate@651 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
+ResolutionTaskHolder@645 {
+    <name not found> = ArrayList@646[1] { ResolutionCandidate@647 }
 }
 
-ResolutionTaskHolder@653 {
-    <name not found> = ArrayList@654[1] { ResolutionCandidate@655 }
-    <name not found> = ArrayList@656[1] { ResolutionCandidate@655 }
-    <name not found> = ArrayList@657[1] { ResolutionCandidate@658 }
-    <name not found> = ArrayList@659[1] { ResolutionCandidate@658 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
+ResolutionTaskHolder@648 {
+    <name not found> = ArrayList@649[1] { ResolutionCandidate@650 }
+}
+
+ResolutionTaskHolder@651 {
+    <name not found> = ArrayList@652[1] { ResolutionCandidate@653 }
+}
+
+ResolutionTaskHolder@654 {
+    <name not found> = ArrayList@655[1] { ResolutionCandidate@656 }
+}
+
+ResolutionTaskHolder@657 {
+    <name not found> = ArrayList@658[1] { ResolutionCandidate@659 }
 }
 
 ResolutionTaskHolder@660 {
     <name not found> = ArrayList@661[1] { ResolutionCandidate@662 }
-    <name not found> = ArrayList@663[1] { ResolutionCandidate@662 }
+}
+
+ResolutionTaskHolder@663 {
     <name not found> = ArrayList@664[1] { ResolutionCandidate@665 }
-    <name not found> = ArrayList@666[1] { ResolutionCandidate@665 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@667 {
-    <name not found> = ArrayList@668[1] { ResolutionCandidate@669 }
-    <name not found> = ArrayList@670[1] { ResolutionCandidate@669 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
+ResolutionTaskHolder@666 {
+    <name not found> = ArrayList@667[1] { ResolutionCandidate@668 }
 }
 
-ResolutionTaskHolder@671 {
-    <name not found> = ArrayList@672[1] { ResolutionCandidate@673 }
-    <name not found> = ArrayList@674[1] { ResolutionCandidate@673 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
+ResolutionTaskHolder@669 {
+    <name not found> = ArrayList@670[1] { ResolutionCandidate@671 }
+}
+
+ResolutionTaskHolder@672 {
+    <name not found> = ArrayList@673[1] { ResolutionCandidate@674 }
 }
 
 ResolutionTaskHolder@675 {
     <name not found> = ArrayList@676[1] { ResolutionCandidate@677 }
-    <name not found> = ArrayList@678[1] { ResolutionCandidate@677 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@679 {
-    <name not found> = ArrayList@680[1] { ResolutionCandidate@681 }
-    <name not found> = ArrayList@682[1] { ResolutionCandidate@681 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
+ResolutionTaskHolder@678 {
+    <name not found> = ArrayList@679[1] { ResolutionCandidate@680 }
 }
 
-ResolutionTaskHolder@683 {
-    <name not found> = ArrayList@684[1] { ResolutionCandidate@685 }
-    <name not found> = ArrayList@686[1] { ResolutionCandidate@685 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
+ResolutionTaskHolder@681 {
+    <name not found> = ArrayList@682[1] { ResolutionCandidate@683 }
+}
+
+ResolutionTaskHolder@684 {
+    <name not found> = ArrayList@685[1] { ResolutionCandidate@686 }
 }
 
 ResolutionTaskHolder@687 {
     <name not found> = ArrayList@688[1] { ResolutionCandidate@689 }
-    <name not found> = ArrayList@690[1] { ResolutionCandidate@689 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@691 {
-    <name not found> = ArrayList@692[1] { ResolutionCandidate@693 }
-    <name not found> = ArrayList@694[1] { ResolutionCandidate@693 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
+ResolutionTaskHolder@690 {
+    <name not found> = ArrayList@691[1] { ResolutionCandidate@692 }
 }
 
-ResolutionTaskHolder@695 {
-    <name not found> = ArrayList@696[1] { ResolutionCandidate@697 }
-    <name not found> = ArrayList@698[1] { ResolutionCandidate@697 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
+ResolutionTaskHolder@693 {
+    <name not found> = ArrayList@694[1] { ResolutionCandidate@695 }
+}
+
+ResolutionTaskHolder@696 {
+    <name not found> = ArrayList@697[1] { ResolutionCandidate@698 }
 }
 
 ResolutionTaskHolder@699 {
     <name not found> = ArrayList@700[1] { ResolutionCandidate@701 }
-    <name not found> = ArrayList@702[1] { ResolutionCandidate@701 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@703 {
-    <name not found> = ArrayList@704[1] { ResolutionCandidate@705 }
-    <name not found> = ArrayList@706[1] { ResolutionCandidate@705 }
+ResolutionTaskHolder@702 {
+    <name not found> = ArrayList@703[1] { ResolutionCandidate@704 }
 }
 
-ResolutionTaskHolder@707 {
-    <name not found> = ArrayList@708[1] { ResolutionCandidate@709 }
-    <name not found> = ArrayList@710[1] { ResolutionCandidate@709 }
+ResolutionTaskHolder@705 {
+    <name not found> = ArrayList@706[1] { ResolutionCandidate@707 }
+}
+
+ResolutionTaskHolder@708 {
+    <name not found> = ArrayList@709[1] { ResolutionCandidate@710 }
 }
 
 ResolutionTaskHolder@711 {
     <name not found> = ArrayList@712[1] { ResolutionCandidate@713 }
-    <name not found> = ArrayList@714[1] { ResolutionCandidate@713 }
 }
 
-ResolutionTaskHolder@715 {
-    <name not found> = ArrayList@716[1] { ResolutionCandidate@717 }
-    <name not found> = ArrayList@718[1] { ResolutionCandidate@717 }
+ResolutionTaskHolder@714 {
+    <name not found> = ArrayList@715[1] { ResolutionCandidate@716 }
 }
 
-ResolutionTaskHolder@719 {
-    <name not found> = ArrayList@720[1] { ResolutionCandidate@721 }
-    <name not found> = ArrayList@722[1] { ResolutionCandidate@721 }
+ResolutionTaskHolder@717 {
+    <name not found> = ArrayList@718[1] { ResolutionCandidate@719 }
+}
+
+ResolutionTaskHolder@720 {
+    <name not found> = ArrayList@721[1] { ResolutionCandidate@722 }
 }
 
 ResolutionTaskHolder@723 {
     <name not found> = ArrayList@724[1] { ResolutionCandidate@725 }
-    <name not found> = ArrayList@726[1] { ResolutionCandidate@725 }
 }
 
-ResolutionTaskHolder@727 {
-    <name not found> = ArrayList@728[1] { ResolutionCandidate@729 }
-    <name not found> = ArrayList@730[1] { ResolutionCandidate@729 }
+ResolutionTaskHolder@726 {
+    <name not found> = ArrayList@727[1] { ResolutionCandidate@728 }
 }
 
-ResolutionTaskHolder@731 {
-    <name not found> = ArrayList@732[1] { ResolutionCandidate@733 }
-    <name not found> = ArrayList@734[1] { ResolutionCandidate@733 }
+ResolutionTaskHolder@729 {
+    <name not found> = ArrayList@730[1] { ResolutionCandidate@731 }
+}
+
+ResolutionTaskHolder@732 {
+    <name not found> = ArrayList@733[1] { ResolutionCandidate@734 }
 }
 
 ResolutionTaskHolder@735 {
     <name not found> = ArrayList@736[1] { ResolutionCandidate@737 }
-    <name not found> = ArrayList@738[1] { ResolutionCandidate@737 }
 }
 
-ResolutionTaskHolder@739 {
-    <name not found> = ArrayList@740[1] { ResolutionCandidate@741 }
-    <name not found> = ArrayList@742[1] { ResolutionCandidate@741 }
+ResolutionTaskHolder@738 {
+    <name not found> = ArrayList@739[1] { ResolutionCandidate@740 }
 }
 
-ResolutionTaskHolder@743 {
-    <name not found> = ArrayList@744[1] { ResolutionCandidate@745 }
-    <name not found> = ArrayList@746[1] { ResolutionCandidate@745 }
+ResolutionTaskHolder@741 {
+    <name not found> = ArrayList@742[1] { ResolutionCandidate@743 }
+}
+
+ResolutionTaskHolder@744 {
+    <name not found> = ArrayList@745[1] { ResolutionCandidate@746 }
 }
 
 ResolutionTaskHolder@747 {
     <name not found> = ArrayList@748[1] { ResolutionCandidate@749 }
-    <name not found> = ArrayList@750[1] { ResolutionCandidate@749 }
 }
 
-ResolutionTaskHolder@751 {
-    <name not found> = ArrayList@752[1] { ResolutionCandidate@753 }
-    <name not found> = ArrayList@754[1] { ResolutionCandidate@753 }
+ResolutionTaskHolder@750 {
+    <name not found> = ArrayList@751[1] { ResolutionCandidate@752 }
 }
 
-ResolutionTaskHolder@755 {
-    <name not found> = ArrayList@756[1] { ResolutionCandidate@757 }
-    <name not found> = ArrayList@758[1] { ResolutionCandidate@757 }
+ResolutionTaskHolder@753 {
+    <name not found> = ArrayList@754[1] { ResolutionCandidate@755 }
+}
+
+ResolutionTaskHolder@756 {
+    <name not found> = ArrayList@757[1] { ResolutionCandidate@758 }
 }
 
 ResolutionTaskHolder@759 {
     <name not found> = ArrayList@760[1] { ResolutionCandidate@761 }
-    <name not found> = ArrayList@762[1] { ResolutionCandidate@761 }
 }
 
-ResolutionTaskHolder@763 {
-    <name not found> = ArrayList@764[1] { ResolutionCandidate@765 }
-    <name not found> = ArrayList@766[1] { ResolutionCandidate@765 }
+ResolutionTaskHolder@762 {
+    <name not found> = ArrayList@763[1] { ResolutionCandidate@764 }
 }
 
-ResolutionTaskHolder@767 {
-    <name not found> = ArrayList@768[1] { ResolutionCandidate@769 }
-    <name not found> = ArrayList@770[1] { ResolutionCandidate@769 }
+ResolutionTaskHolder@765 {
+    <name not found> = ArrayList@766[1] { ResolutionCandidate@767 }
+}
+
+ResolutionTaskHolder@768 {
+    <name not found> = ArrayList@769[1] { ResolutionCandidate@770 }
 }
 
 ResolutionTaskHolder@771 {
     <name not found> = ArrayList@772[1] { ResolutionCandidate@773 }
-    <name not found> = ArrayList@774[1] { ResolutionCandidate@773 }
 }
 
-ResolutionTaskHolder@775 {
-    <name not found> = ArrayList@776[1] { ResolutionCandidate@777 }
-    <name not found> = ArrayList@778[1] { ResolutionCandidate@777 }
+ResolutionTaskHolder@774 {
+    <name not found> = ArrayList@775[1] { ResolutionCandidate@776 }
 }
 
-ResolutionTaskHolder@779 {
-    <name not found> = ArrayList@780[1] { ResolutionCandidate@781 }
-    <name not found> = ArrayList@782[1] { ResolutionCandidate@781 }
+ResolutionTaskHolder@777 {
+    <name not found> = ArrayList@778[1] { ResolutionCandidate@779 }
+}
+
+ResolutionTaskHolder@780 {
+    <name not found> = ArrayList@781[1] { ResolutionCandidate@782 }
 }
 
 ResolutionTaskHolder@783 {
     <name not found> = ArrayList@784[1] { ResolutionCandidate@785 }
-    <name not found> = ArrayList@786[1] { ResolutionCandidate@785 }
 }
 
-ResolutionTaskHolder@787 {
-    <name not found> = ArrayList@788[1] { ResolutionCandidate@789 }
-    <name not found> = ArrayList@790[1] { ResolutionCandidate@789 }
+ResolutionTaskHolder@786 {
+    <name not found> = ArrayList@787[1] { ResolutionCandidate@788 }
 }
 
-ResolutionTaskHolder@791 {
-    <name not found> = ArrayList@792[1] { ResolutionCandidate@793 }
-    <name not found> = ArrayList@794[1] { ResolutionCandidate@793 }
+ResolutionTaskHolder@789 {
+    <name not found> = ArrayList@790[1] { ResolutionCandidate@791 }
+}
+
+ResolutionTaskHolder@792 {
+    <name not found> = ArrayList@793[1] { ResolutionCandidate@794 }
 }
 
 ResolutionTaskHolder@795 {
     <name not found> = ArrayList@796[1] { ResolutionCandidate@797 }
-    <name not found> = ArrayList@798[1] { ResolutionCandidate@797 }
 }
 
-ResolutionTaskHolder@799 {
-    <name not found> = ArrayList@800[1] { ResolutionCandidate@801 }
-    <name not found> = ArrayList@802[1] { ResolutionCandidate@801 }
+ResolutionTaskHolder@798 {
+    <name not found> = ArrayList@799[1] { ResolutionCandidate@800 }
 }
 
-ResolutionTaskHolder@803 {
-    <name not found> = ArrayList@804[1] { ResolutionCandidate@805 }
-    <name not found> = ArrayList@806[1] { ResolutionCandidate@805 }
+ResolutionTaskHolder@801 {
+    <name not found> = ArrayList@802[1] { ResolutionCandidate@803 }
+}
+
+ResolutionTaskHolder@804 {
+    <name not found> = ArrayList@805[1] { ResolutionCandidate@806 }
 }
 
 ResolutionTaskHolder@807 {
     <name not found> = ArrayList@808[1] { ResolutionCandidate@809 }
-    <name not found> = ArrayList@810[1] { ResolutionCandidate@809 }
 }
 
-ResolutionTaskHolder@811 {
-    <name not found> = ArrayList@812[1] { ResolutionCandidate@813 }
-    <name not found> = ArrayList@814[1] { ResolutionCandidate@813 }
+ResolutionTaskHolder@810 {
+    <name not found> = ArrayList@811[1] { ResolutionCandidate@812 }
 }
 
-ResolutionTaskHolder@815 {
-    <name not found> = ArrayList@816[1] { ResolutionCandidate@817 }
-    <name not found> = ArrayList@818[1] { ResolutionCandidate@817 }
+ResolutionTaskHolder@813 {
+    <name not found> = ArrayList@814[1] { ResolutionCandidate@815 }
+}
+
+ResolutionTaskHolder@816 {
+    <name not found> = ArrayList@817[1] { ResolutionCandidate@818 }
 }
 
 ResolutionTaskHolder@819 {
     <name not found> = ArrayList@820[1] { ResolutionCandidate@821 }
-    <name not found> = ArrayList@822[1] { ResolutionCandidate@821 }
 }
 
-ResolutionTaskHolder@823 {
-    <name not found> = ArrayList@824[1] { ResolutionCandidate@825 }
-    <name not found> = ArrayList@826[1] { ResolutionCandidate@825 }
+ResolutionTaskHolder@822 {
+    <name not found> = ArrayList@823[1] { ResolutionCandidate@824 }
 }
 
-ResolutionTaskHolder@827 {
-    <name not found> = ArrayList@828[1] { ResolutionCandidate@829 }
-    <name not found> = ArrayList@830[1] { ResolutionCandidate@829 }
+ResolutionTaskHolder@825 {
+    <name not found> = ArrayList@826[1] { ResolutionCandidate@827 }
+}
+
+ResolutionTaskHolder@828 {
+    <name not found> = ArrayList@829[1] { ResolutionCandidate@830 }
 }
 
 ResolutionTaskHolder@831 {
     <name not found> = ArrayList@832[1] { ResolutionCandidate@833 }
-    <name not found> = ArrayList@834[1] { ResolutionCandidate@833 }
 }
 
-ResolutionTaskHolder@835 {
-    <name not found> = ArrayList@836[1] { ResolutionCandidate@837 }
-    <name not found> = ArrayList@838[1] { ResolutionCandidate@837 }
+ResolutionTaskHolder@834 {
+    <name not found> = ArrayList@835[1] { ResolutionCandidate@836 }
 }
 
-ResolutionTaskHolder@839 {
-    <name not found> = ArrayList@840[1] { ResolutionCandidate@841 }
-    <name not found> = ArrayList@842[1] { ResolutionCandidate@841 }
+ResolutionTaskHolder@837 {
+    <name not found> = ArrayList@838[1] { ResolutionCandidate@839 }
+}
+
+ResolutionTaskHolder@840 {
+    <name not found> = ArrayList@841[1] { ResolutionCandidate@842 }
 }
 
 ResolutionTaskHolder@843 {
     <name not found> = ArrayList@844[1] { ResolutionCandidate@845 }
-    <name not found> = ArrayList@846[1] { ResolutionCandidate@845 }
 }
 
-ResolutionTaskHolder@847 {
-    <name not found> = ArrayList@848[1] { ResolutionCandidate@849 }
-    <name not found> = ArrayList@850[1] { ResolutionCandidate@849 }
+ResolutionTaskHolder@846 {
+    <name not found> = ArrayList@847[1] { ResolutionCandidate@848 }
 }
 
-ResolutionTaskHolder@851 {
-    <name not found> = ArrayList@852[1] { ResolutionCandidate@853 }
-    <name not found> = ArrayList@854[1] { ResolutionCandidate@853 }
+ResolutionTaskHolder@849 {
+    <name not found> = ArrayList@850[1] { ResolutionCandidate@851 }
+}
+
+ResolutionTaskHolder@852 {
+    <name not found> = ArrayList@853[1] { ResolutionCandidate@854 }
 }
 
 ResolutionTaskHolder@855 {
     <name not found> = ArrayList@856[1] { ResolutionCandidate@857 }
-    <name not found> = ArrayList@858[1] { ResolutionCandidate@857 }
 }
 
-ResolutionTaskHolder@859 {
-    <name not found> = ArrayList@860[1] { ResolutionCandidate@861 }
-    <name not found> = ArrayList@862[1] { ResolutionCandidate@861 }
+ResolutionTaskHolder@858 {
+    <name not found> = ArrayList@859[1] { ResolutionCandidate@860 }
 }
 
-ResolutionTaskHolder@863 {
-    <name not found> = ArrayList@864[1] { ResolutionCandidate@865 }
-    <name not found> = ArrayList@866[1] { ResolutionCandidate@865 }
+ResolutionTaskHolder@861 {
+    <name not found> = ArrayList@862[1] { ResolutionCandidate@863 }
+}
+
+ResolutionTaskHolder@864 {
+    <name not found> = ArrayList@865[1] { ResolutionCandidate@866 }
 }
 
 ResolutionTaskHolder@867 {
     <name not found> = ArrayList@868[1] { ResolutionCandidate@869 }
-    <name not found> = ArrayList@870[1] { ResolutionCandidate@869 }
 }
 
-ResolutionTaskHolder@871 {
-    <name not found> = ArrayList@872[1] { ResolutionCandidate@873 }
-    <name not found> = ArrayList@874[1] { ResolutionCandidate@873 }
+ResolutionTaskHolder@870 {
+    <name not found> = ArrayList@871[1] { ResolutionCandidate@872 }
 }
 
-ResolutionTaskHolder@875 {
-    <name not found> = ArrayList@876[1] { ResolutionCandidate@877 }
-    <name not found> = ArrayList@878[1] { ResolutionCandidate@877 }
+ResolutionTaskHolder@873 {
+    <name not found> = ArrayList@874[1] { ResolutionCandidate@875 }
+}
+
+ResolutionTaskHolder@876 {
+    <name not found> = ArrayList@877[1] { ResolutionCandidate@878 }
 }
 
 ResolutionTaskHolder@879 {
     <name not found> = ArrayList@880[1] { ResolutionCandidate@881 }
-    <name not found> = ArrayList@882[1] { ResolutionCandidate@881 }
 }
 
-ResolutionTaskHolder@883 {
-    <name not found> = ArrayList@884[1] { ResolutionCandidate@885 }
-    <name not found> = ArrayList@886[1] { ResolutionCandidate@885 }
+ResolutionTaskHolder@882 {
+    <name not found> = ArrayList@883[1] { ResolutionCandidate@884 }
 }
 
-ResolutionTaskHolder@887 {
-    <name not found> = ArrayList@888[1] { ResolutionCandidate@889 }
-    <name not found> = ArrayList@890[1] { ResolutionCandidate@889 }
+ResolutionTaskHolder@885 {
+    <name not found> = ArrayList@886[1] { ResolutionCandidate@887 }
+}
+
+ResolutionTaskHolder@888 {
+    <name not found> = ArrayList@889[1] { ResolutionCandidate@890 }
 }
 
 ResolutionTaskHolder@891 {
     <name not found> = ArrayList@892[1] { ResolutionCandidate@893 }
-    <name not found> = ArrayList@894[1] { ResolutionCandidate@893 }
 }
 
-ResolutionTaskHolder@895 {
-    <name not found> = ArrayList@896[1] { ResolutionCandidate@897 }
-    <name not found> = ArrayList@898[1] { ResolutionCandidate@897 }
+ResolutionTaskHolder@894 {
+    <name not found> = ArrayList@895[1] { ResolutionCandidate@896 }
 }
 
-ResolutionTaskHolder@899 {
-    <name not found> = ArrayList@900[1] { ResolutionCandidate@901 }
-    <name not found> = ArrayList@902[1] { ResolutionCandidate@901 }
+ResolutionTaskHolder@897 {
+    <name not found> = ArrayList@898[1] { ResolutionCandidate@899 }
+}
+
+ResolutionTaskHolder@900 {
+    <name not found> = ArrayList@901[1] { ResolutionCandidate@902 }
 }
 
 ResolutionTaskHolder@903 {
     <name not found> = ArrayList@904[1] { ResolutionCandidate@905 }
-    <name not found> = ArrayList@906[1] { ResolutionCandidate@905 }
 }
 
-ResolutionTaskHolder@907 {
-    <name not found> = ArrayList@908[1] { ResolutionCandidate@909 }
-    <name not found> = ArrayList@910[1] { ResolutionCandidate@909 }
+ResolutionTaskHolder@906 {
+    <name not found> = ArrayList@907[1] { ResolutionCandidate@908 }
 }
 
-ResolutionTaskHolder@911 {
-    <name not found> = ArrayList@912[1] { ResolutionCandidate@913 }
-    <name not found> = ArrayList@914[1] { ResolutionCandidate@913 }
+ResolutionTaskHolder@909 {
+    <name not found> = ArrayList@910[1] { ResolutionCandidate@911 }
+}
+
+ResolutionTaskHolder@912 {
+    <name not found> = ArrayList@913[1] { ResolutionCandidate@914 }
 }
 
 ResolutionTaskHolder@915 {
     <name not found> = ArrayList@916[1] { ResolutionCandidate@917 }
-    <name not found> = ArrayList@918[1] { ResolutionCandidate@917 }
 }
 
-ResolutionTaskHolder@919 {
-    <name not found> = ArrayList@920[1] { ResolutionCandidate@921 }
-    <name not found> = ArrayList@922[1] { ResolutionCandidate@921 }
+ResolutionTaskHolder@918 {
+    <name not found> = ArrayList@919[1] { ResolutionCandidate@920 }
 }
 
-ResolutionTaskHolder@923 {
-    <name not found> = ArrayList@924[1] { ResolutionCandidate@925 }
-    <name not found> = ArrayList@926[1] { ResolutionCandidate@925 }
+ResolutionTaskHolder@921 {
+    <name not found> = ArrayList@922[1] { ResolutionCandidate@923 }
+}
+
+ResolutionTaskHolder@924 {
+    <name not found> = ArrayList@925[1] { ResolutionCandidate@926 }
 }
 
 ResolutionTaskHolder@927 {
     <name not found> = ArrayList@928[1] { ResolutionCandidate@929 }
-    <name not found> = ArrayList@930[1] { ResolutionCandidate@929 }
 }
 
-ResolutionTaskHolder@931 {
-    <name not found> = ArrayList@932[1] { ResolutionCandidate@933 }
-    <name not found> = ArrayList@934[1] { ResolutionCandidate@933 }
+ResolutionTaskHolder@930 {
+    <name not found> = ArrayList@931[1] { ResolutionCandidate@932 }
 }
 
-ResolutionTaskHolder@935 {
-    <name not found> = ArrayList@936[1] { ResolutionCandidate@937 }
-    <name not found> = ArrayList@938[1] { ResolutionCandidate@937 }
+ResolutionTaskHolder@933 {
+    <name not found> = ArrayList@934[1] { ResolutionCandidate@935 }
+}
+
+ResolutionTaskHolder@936 {
+    <name not found> = ArrayList@937[1] { ResolutionCandidate@938 }
 }
 
 ResolutionTaskHolder@939 {
     <name not found> = ArrayList@940[1] { ResolutionCandidate@941 }
-    <name not found> = ArrayList@942[1] { ResolutionCandidate@941 }
 }
 
-ResolutionTaskHolder@943 {
-    <name not found> = ArrayList@944[1] { ResolutionCandidate@945 }
-    <name not found> = ArrayList@946[1] { ResolutionCandidate@945 }
+ResolutionTaskHolder@942 {
+    <name not found> = ArrayList@943[1] { ResolutionCandidate@944 }
 }
 
-ResolutionTaskHolder@947 {
-    <name not found> = ArrayList@948[1] { ResolutionCandidate@949 }
-    <name not found> = ArrayList@950[1] { ResolutionCandidate@949 }
+ResolutionTaskHolder@945 {
+    <name not found> = ArrayList@946[1] { ResolutionCandidate@947 }
+}
+
+ResolutionTaskHolder@948 {
+    <name not found> = ArrayList@949[1] { ResolutionCandidate@950 }
 }
 
 ResolutionTaskHolder@951 {
     <name not found> = ArrayList@952[1] { ResolutionCandidate@953 }
-    <name not found> = ArrayList@954[1] { ResolutionCandidate@953 }
 }
 
-ResolutionTaskHolder@955 {
-    <name not found> = ArrayList@956[1] { ResolutionCandidate@957 }
-    <name not found> = ArrayList@958[1] { ResolutionCandidate@957 }
+ResolutionTaskHolder@954 {
+    <name not found> = ArrayList@955[1] { ResolutionCandidate@956 }
 }
 
-ResolutionTaskHolder@959 {
-    <name not found> = ArrayList@960[1] { ResolutionCandidate@961 }
-    <name not found> = ArrayList@962[1] { ResolutionCandidate@961 }
+ResolutionTaskHolder@957 {
+    <name not found> = ArrayList@958[1] { ResolutionCandidate@959 }
+}
+
+ResolutionTaskHolder@960 {
+    <name not found> = ArrayList@961[1] { ResolutionCandidate@962 }
 }
 
 ResolutionTaskHolder@963 {
     <name not found> = ArrayList@964[1] { ResolutionCandidate@965 }
-    <name not found> = ArrayList@966[1] { ResolutionCandidate@965 }
 }
 
-ResolutionTaskHolder@967 {
-    <name not found> = ArrayList@968[1] { ResolutionCandidate@969 }
-    <name not found> = ArrayList@970[1] { ResolutionCandidate@969 }
+ResolutionTaskHolder@966 {
+    <name not found> = ArrayList@967[1] { ResolutionCandidate@968 }
 }
 
-ResolutionTaskHolder@971 {
-    <name not found> = ArrayList@972[1] { ResolutionCandidate@973 }
-    <name not found> = ArrayList@974[1] { ResolutionCandidate@973 }
+ResolutionTaskHolder@969 {
+    <name not found> = ArrayList@970[1] { ResolutionCandidate@971 }
+}
+
+ResolutionTaskHolder@972 {
+    <name not found> = ArrayList@973[1] { ResolutionCandidate@974 }
 }
 
 ResolutionTaskHolder@975 {
     <name not found> = ArrayList@976[1] { ResolutionCandidate@977 }
-    <name not found> = ArrayList@978[1] { ResolutionCandidate@977 }
 }
 
-ResolutionTaskHolder@979 {
-    <name not found> = ArrayList@980[1] { ResolutionCandidate@981 }
-    <name not found> = ArrayList@982[1] { ResolutionCandidate@981 }
+ResolutionTaskHolder@978 {
+    <name not found> = ArrayList@979[1] { ResolutionCandidate@980 }
 }
 
-ResolutionTaskHolder@983 {
-    <name not found> = ArrayList@984[1] { ResolutionCandidate@985 }
-    <name not found> = ArrayList@986[1] { ResolutionCandidate@985 }
+ResolutionTaskHolder@981 {
+    <name not found> = ArrayList@982[1] { ResolutionCandidate@983 }
+}
+
+ResolutionTaskHolder@984 {
+    <name not found> = ArrayList@985[1] { ResolutionCandidate@986 }
 }
 
 ResolutionTaskHolder@987 {
     <name not found> = ArrayList@988[1] { ResolutionCandidate@989 }
-    <name not found> = ArrayList@990[1] { ResolutionCandidate@989 }
 }
 
-ResolutionTaskHolder@991 {
-    <name not found> = ArrayList@992[1] { ResolutionCandidate@993 }
-    <name not found> = ArrayList@994[1] { ResolutionCandidate@993 }
+ResolutionTaskHolder@990 {
+    <name not found> = ArrayList@991[1] { ResolutionCandidate@992 }
 }
 
-ResolutionTaskHolder@995 {
-    <name not found> = ArrayList@996[1] { ResolutionCandidate@997 }
-    <name not found> = ArrayList@998[1] { ResolutionCandidate@997 }
+ResolutionTaskHolder@993 {
+    <name not found> = ArrayList@994[1] { ResolutionCandidate@995 }
+}
+
+ResolutionTaskHolder@996 {
+    <name not found> = ArrayList@997[1] { ResolutionCandidate@998 }
 }
 
 ResolutionTaskHolder@999 {
     <name not found> = ArrayList@1000[1] { ResolutionCandidate@1001 }
-    <name not found> = ArrayList@1002[1] { ResolutionCandidate@1001 }
 }
 
-ResolutionTaskHolder@1003 {
-    <name not found> = ArrayList@1004[1] { ResolutionCandidate@1005 }
-    <name not found> = ArrayList@1006[1] { ResolutionCandidate@1005 }
+ResolutionTaskHolder@1002 {
+    <name not found> = ArrayList@1003[1] { ResolutionCandidate@1004 }
 }
 
-ResolutionTaskHolder@1007 {
-    <name not found> = ArrayList@1008[1] { ResolutionCandidate@1009 }
-    <name not found> = ArrayList@1010[1] { ResolutionCandidate@1009 }
+ResolutionTaskHolder@1005 {
+    <name not found> = ArrayList@1006[1] { ResolutionCandidate@1007 }
+}
+
+ResolutionTaskHolder@1008 {
+    <name not found> = ArrayList@1009[1] { ResolutionCandidate@1010 }
 }
 
 ResolutionTaskHolder@1011 {
     <name not found> = ArrayList@1012[1] { ResolutionCandidate@1013 }
-    <name not found> = ArrayList@1014[1] { ResolutionCandidate@1013 }
 }
 
-ResolutionTaskHolder@1015 {
-    <name not found> = ArrayList@1016[1] { ResolutionCandidate@1017 }
-    <name not found> = ArrayList@1018[1] { ResolutionCandidate@1017 }
+ResolutionTaskHolder@1014 {
+    <name not found> = ArrayList@1015[1] { ResolutionCandidate@1016 }
 }
 
-ResolutionTaskHolder@1019 {
-    <name not found> = ArrayList@1020[1] { ResolutionCandidate@1021 }
-    <name not found> = ArrayList@1022[1] { ResolutionCandidate@1021 }
+ResolutionTaskHolder@1017 {
+    <name not found> = ArrayList@1018[1] { ResolutionCandidate@1019 }
+}
+
+ResolutionTaskHolder@1020 {
+    <name not found> = ArrayList@1021[1] { ResolutionCandidate@1022 }
 }
 
 ResolutionTaskHolder@1023 {
     <name not found> = ArrayList@1024[1] { ResolutionCandidate@1025 }
-    <name not found> = ArrayList@1026[1] { ResolutionCandidate@1025 }
 }
 
-ResolutionTaskHolder@1027 {
-    <name not found> = ArrayList@1028[1] { ResolutionCandidate@1029 }
-    <name not found> = ArrayList@1030[1] { ResolutionCandidate@1029 }
+ResolutionTaskHolder@1026 {
+    <name not found> = ArrayList@1027[1] { ResolutionCandidate@1028 }
 }
 
-ResolutionTaskHolder@1031 {
-    <name not found> = ArrayList@1032[1] { ResolutionCandidate@1033 }
-    <name not found> = ArrayList@1034[1] { ResolutionCandidate@1033 }
+ResolutionTaskHolder@1029 {
+    <name not found> = ArrayList@1030[1] { ResolutionCandidate@1031 }
+}
+
+ResolutionTaskHolder@1032 {
+    <name not found> = ArrayList@1033[1] { ResolutionCandidate@1034 }
 }
 
 ResolutionTaskHolder@1035 {
     <name not found> = ArrayList@1036[1] { ResolutionCandidate@1037 }
-    <name not found> = ArrayList@1038[1] { ResolutionCandidate@1037 }
 }
 
-ResolutionTaskHolder@1039 {
-    <name not found> = ArrayList@1040[1] { ResolutionCandidate@1041 }
-    <name not found> = ArrayList@1042[1] { ResolutionCandidate@1041 }
+ResolutionTaskHolder@1038 {
+    <name not found> = ArrayList@1039[1] { ResolutionCandidate@1040 }
 }
 
-ResolutionTaskHolder@1043 {
-    <name not found> = ArrayList@1044[1] { ResolutionCandidate@1045 }
-    <name not found> = ArrayList@1046[1] { ResolutionCandidate@1045 }
+ResolutionTaskHolder@1041 {
+    <name not found> = ArrayList@1042[1] { ResolutionCandidate@1043 }
+}
+
+ResolutionTaskHolder@1044 {
+    <name not found> = ArrayList@1045[1] { ResolutionCandidate@1046 }
 }
 
 ResolutionTaskHolder@1047 {
     <name not found> = ArrayList@1048[1] { ResolutionCandidate@1049 }
-    <name not found> = ArrayList@1050[1] { ResolutionCandidate@1049 }
 }
 
-ResolutionTaskHolder@1051 {
-    <name not found> = ArrayList@1052[1] { ResolutionCandidate@1053 }
-    <name not found> = ArrayList@1054[1] { ResolutionCandidate@1053 }
+ResolutionTaskHolder@1050 {
+    <name not found> = ArrayList@1051[1] { ResolutionCandidate@1052 }
 }
 
-ResolutionTaskHolder@1055 {
-    <name not found> = ArrayList@1056[1] { ResolutionCandidate@1057 }
-    <name not found> = ArrayList@1058[1] { ResolutionCandidate@1057 }
+ResolutionTaskHolder@1053 {
+    <name not found> = ArrayList@1054[1] { ResolutionCandidate@1055 }
+}
+
+ResolutionTaskHolder@1056 {
+    <name not found> = ArrayList@1057[1] { ResolutionCandidate@1058 }
 }
 
 ResolutionTaskHolder@1059 {
     <name not found> = ArrayList@1060[1] { ResolutionCandidate@1061 }
-    <name not found> = ArrayList@1062[1] { ResolutionCandidate@1061 }
 }
 
-ResolutionTaskHolder@1063 {
-    <name not found> = ArrayList@1064[1] { ResolutionCandidate@1065 }
-    <name not found> = ArrayList@1066[1] { ResolutionCandidate@1065 }
+ResolutionTaskHolder@1062 {
+    <name not found> = ArrayList@1063[1] { ResolutionCandidate@1064 }
 }
 
-ResolutionTaskHolder@1067 {
-    <name not found> = ArrayList@1068[1] { ResolutionCandidate@1069 }
-    <name not found> = ArrayList@1070[1] { ResolutionCandidate@1069 }
+ResolutionTaskHolder@1065 {
+    <name not found> = ArrayList@1066[1] { ResolutionCandidate@1067 }
+}
+
+ResolutionTaskHolder@1068 {
+    <name not found> = ArrayList@1069[1] { ResolutionCandidate@1070 }
 }
 
 ResolutionTaskHolder@1071 {
     <name not found> = ArrayList@1072[1] { ResolutionCandidate@1073 }
-    <name not found> = ArrayList@1074[1] { ResolutionCandidate@1073 }
 }
 
-ResolutionTaskHolder@1075 {
-    <name not found> = ArrayList@1076[1] { ResolutionCandidate@1077 }
-    <name not found> = ArrayList@1078[1] { ResolutionCandidate@1077 }
+ResolutionTaskHolder@1074 {
+    <name not found> = ArrayList@1075[1] { ResolutionCandidate@1076 }
 }
 
-ResolutionTaskHolder@1079 {
-    <name not found> = ArrayList@1080[1] { ResolutionCandidate@1081 }
-    <name not found> = ArrayList@1082[1] { ResolutionCandidate@1081 }
+ResolutionTaskHolder@1077 {
+    <name not found> = ArrayList@1078[1] { ResolutionCandidate@1079 }
+}
+
+ResolutionTaskHolder@1080 {
+    <name not found> = ArrayList@1081[1] { ResolutionCandidate@1082 }
 }
 
 ResolutionTaskHolder@1083 {
     <name not found> = ArrayList@1084[1] { ResolutionCandidate@1085 }
-    <name not found> = ArrayList@1086[1] { ResolutionCandidate@1085 }
 }
 
-ResolutionTaskHolder@1087 {
-    <name not found> = ArrayList@1088[1] { ResolutionCandidate@1089 }
-    <name not found> = ArrayList@1090[1] { ResolutionCandidate@1089 }
+ResolutionTaskHolder@1086 {
+    <name not found> = ArrayList@1087[1] { ResolutionCandidate@1088 }
 }
 
-ResolutionTaskHolder@1091 {
-    <name not found> = ArrayList@1092[1] { ResolutionCandidate@1093 }
-    <name not found> = ArrayList@1094[1] { ResolutionCandidate@1093 }
+ResolutionTaskHolder@1089 {
+    <name not found> = ArrayList@1090[1] { ResolutionCandidate@1091 }
+}
+
+ResolutionTaskHolder@1092 {
+    <name not found> = ArrayList@1093[1] { ResolutionCandidate@1094 }
 }
 
 ResolutionTaskHolder@1095 {
     <name not found> = ArrayList@1096[1] { ResolutionCandidate@1097 }
-    <name not found> = ArrayList@1098[1] { ResolutionCandidate@1097 }
 }
 
-ResolutionTaskHolder@1099 {
-    <name not found> = ArrayList@1100[1] { ResolutionCandidate@1101 }
-    <name not found> = ArrayList@1102[1] { ResolutionCandidate@1101 }
+ResolutionTaskHolder@1098 {
+    <name not found> = ArrayList@1099[1] { ResolutionCandidate@1100 }
 }
 
-ResolutionTaskHolder@1103 {
-    <name not found> = ArrayList@1104[1] { ResolutionCandidate@1105 }
-    <name not found> = ArrayList@1106[1] { ResolutionCandidate@1105 }
+ResolutionTaskHolder@1101 {
+    <name not found> = ArrayList@1102[1] { ResolutionCandidate@1103 }
+}
+
+ResolutionTaskHolder@1104 {
+    <name not found> = ArrayList@1105[1] { ResolutionCandidate@1106 }
 }
 
 ResolutionTaskHolder@1107 {
     <name not found> = ArrayList@1108[1] { ResolutionCandidate@1109 }
-    <name not found> = ArrayList@1110[1] { ResolutionCandidate@1109 }
 }
 
-ResolutionTaskHolder@1111 {
-    <name not found> = ArrayList@1112[1] { ResolutionCandidate@1113 }
-    <name not found> = ArrayList@1114[1] { ResolutionCandidate@1113 }
+ResolutionTaskHolder@1110 {
+    <name not found> = ArrayList@1111[1] { ResolutionCandidate@1112 }
 }
 
-ResolutionTaskHolder@1115 {
-    <name not found> = ArrayList@1116[1] { ResolutionCandidate@1117 }
-    <name not found> = ArrayList@1118[1] { ResolutionCandidate@1117 }
+ResolutionTaskHolder@1113 {
+    <name not found> = ArrayList@1114[1] { ResolutionCandidate@1115 }
+}
+
+ResolutionTaskHolder@1116 {
+    <name not found> = ArrayList@1117[1] { ResolutionCandidate@1118 }
 }
 
 ResolutionTaskHolder@1119 {
     <name not found> = ArrayList@1120[1] { ResolutionCandidate@1121 }
-    <name not found> = ArrayList@1122[1] { ResolutionCandidate@1121 }
 }
 
-ResolutionTaskHolder@1123 {
-    <name not found> = ArrayList@1124[1] { ResolutionCandidate@1125 }
-    <name not found> = ArrayList@1126[1] { ResolutionCandidate@1125 }
+ResolutionTaskHolder@1122 {
+    <name not found> = ArrayList@1123[1] { ResolutionCandidate@1124 }
 }
 
-ResolutionTaskHolder@1127 {
-    <name not found> = ArrayList@1128[1] { ResolutionCandidate@1129 }
-    <name not found> = ArrayList@1130[1] { ResolutionCandidate@1129 }
+ResolutionTaskHolder@1125 {
+    <name not found> = ArrayList@1126[1] { ResolutionCandidate@1127 }
+}
+
+ResolutionTaskHolder@1128 {
+    <name not found> = ArrayList@1129[1] { ResolutionCandidate@1130 }
 }
 
 ResolutionTaskHolder@1131 {
     <name not found> = ArrayList@1132[1] { ResolutionCandidate@1133 }
-    <name not found> = ArrayList@1134[1] { ResolutionCandidate@1133 }
 }
 
-ResolutionTaskHolder@1135 {
-    <name not found> = ArrayList@1136[1] { ResolutionCandidate@1137 }
-    <name not found> = ArrayList@1138[1] { ResolutionCandidate@1137 }
+ResolutionTaskHolder@1134 {
+    <name not found> = ArrayList@1135[1] { ResolutionCandidate@1136 }
 }
 
-ResolutionTaskHolder@1139 {
-    <name not found> = ArrayList@1140[1] { ResolutionCandidate@1141 }
-    <name not found> = ArrayList@1142[1] { ResolutionCandidate@1141 }
+ResolutionTaskHolder@1137 {
+    <name not found> = ArrayList@1138[1] { ResolutionCandidate@1139 }
+}
+
+ResolutionTaskHolder@1140 {
+    <name not found> = ArrayList@1141[1] { ResolutionCandidate@1142 }
 }
 
 ResolutionTaskHolder@1143 {
     <name not found> = ArrayList@1144[1] { ResolutionCandidate@1145 }
-    <name not found> = ArrayList@1146[1] { ResolutionCandidate@1145 }
 }
 
-ResolutionTaskHolder@1147 {
-    <name not found> = ArrayList@1148[1] { ResolutionCandidate@1149 }
-    <name not found> = ArrayList@1150[1] { ResolutionCandidate@1149 }
+ResolutionTaskHolder@1146 {
+    <name not found> = ArrayList@1147[1] { ResolutionCandidate@1148 }
 }
 
-ResolutionTaskHolder@1151 {
-    <name not found> = ArrayList@1152[1] { ResolutionCandidate@1153 }
-    <name not found> = ArrayList@1154[1] { ResolutionCandidate@1153 }
+ResolutionTaskHolder@1149 {
+    <name not found> = ArrayList@1150[1] { ResolutionCandidate@1151 }
+}
+
+ResolutionTaskHolder@1152 {
+    <name not found> = ArrayList@1153[1] { ResolutionCandidate@1154 }
 }
 
 ResolutionTaskHolder@1155 {
     <name not found> = ArrayList@1156[1] { ResolutionCandidate@1157 }
-    <name not found> = ArrayList@1158[1] { ResolutionCandidate@1157 }
 }
 
-ResolutionTaskHolder@1159 {
-    <name not found> = ArrayList@1160[1] { ResolutionCandidate@1161 }
-    <name not found> = ArrayList@1162[1] { ResolutionCandidate@1161 }
+ResolutionTaskHolder@1158 {
+    <name not found> = ArrayList@1159[1] { ResolutionCandidate@1160 }
 }
 
-ResolutionTaskHolder@1163 {
-    <name not found> = ArrayList@1164[1] { ResolutionCandidate@1165 }
-    <name not found> = ArrayList@1166[1] { ResolutionCandidate@1165 }
+ResolutionTaskHolder@1161 {
+    <name not found> = ArrayList@1162[1] { ResolutionCandidate@1163 }
+}
+
+ResolutionTaskHolder@1164 {
+    <name not found> = ArrayList@1165[1] { ResolutionCandidate@1166 }
 }
 
 ResolutionTaskHolder@1167 {
     <name not found> = ArrayList@1168[1] { ResolutionCandidate@1169 }
-    <name not found> = ArrayList@1170[1] { ResolutionCandidate@1169 }
 }
 
-ResolutionTaskHolder@1171 {
-    <name not found> = ArrayList@1172[1] { ResolutionCandidate@1173 }
-    <name not found> = ArrayList@1174[1] { ResolutionCandidate@1173 }
+ResolutionTaskHolder@1170 {
+    <name not found> = ArrayList@1171[1] { ResolutionCandidate@1172 }
 }
 
-ResolutionTaskHolder@1175 {
-    <name not found> = ArrayList@1176[1] { ResolutionCandidate@1177 }
-    <name not found> = ArrayList@1178[1] { ResolutionCandidate@1177 }
+ResolutionTaskHolder@1173 {
+    <name not found> = ArrayList@1174[1] { ResolutionCandidate@1175 }
+}
+
+ResolutionTaskHolder@1176 {
+    <name not found> = ArrayList@1177[1] { ResolutionCandidate@1178 }
 }
 
 ResolutionTaskHolder@1179 {
     <name not found> = ArrayList@1180[1] { ResolutionCandidate@1181 }
-    <name not found> = ArrayList@1182[1] { ResolutionCandidate@1181 }
 }
 
-ResolutionTaskHolder@1183 {
-    <name not found> = ArrayList@1184[1] { ResolutionCandidate@1185 }
-    <name not found> = ArrayList@1186[1] { ResolutionCandidate@1185 }
+ResolutionTaskHolder@1182 {
+    <name not found> = ArrayList@1183[1] { ResolutionCandidate@1184 }
 }
 
-ResolutionTaskHolder@1187 {
-    <name not found> = ArrayList@1188[1] { ResolutionCandidate@1189 }
-    <name not found> = ArrayList@1190[1] { ResolutionCandidate@1189 }
+ResolutionTaskHolder@1185 {
+    <name not found> = ArrayList@1186[1] { ResolutionCandidate@1187 }
+}
+
+ResolutionTaskHolder@1188 {
+    <name not found> = ArrayList@1189[1] { ResolutionCandidate@1190 }
 }
 
 ResolutionTaskHolder@1191 {
     <name not found> = ArrayList@1192[1] { ResolutionCandidate@1193 }
-    <name not found> = ArrayList@1194[1] { ResolutionCandidate@1193 }
 }
 
-ResolutionTaskHolder@1195 {
-    <name not found> = ArrayList@1196[1] { ResolutionCandidate@1197 }
-    <name not found> = ArrayList@1198[1] { ResolutionCandidate@1197 }
+ResolutionTaskHolder@1194 {
+    <name not found> = ArrayList@1195[1] { ResolutionCandidate@1196 }
 }
 
-ResolutionTaskHolder@1199 {
-    <name not found> = ArrayList@1200[1] { ResolutionCandidate@1201 }
-    <name not found> = ArrayList@1202[1] { ResolutionCandidate@1201 }
+ResolutionTaskHolder@1197 {
+    <name not found> = ArrayList@1198[1] { ResolutionCandidate@1199 }
+}
+
+ResolutionTaskHolder@1200 {
+    <name not found> = ArrayList@1201[1] { ResolutionCandidate@1202 }
 }
 
 ResolutionTaskHolder@1203 {
     <name not found> = ArrayList@1204[1] { ResolutionCandidate@1205 }
-    <name not found> = ArrayList@1206[1] { ResolutionCandidate@1205 }
 }
 
-ResolutionTaskHolder@1207 {
-    <name not found> = ArrayList@1208[1] { ResolutionCandidate@1209 }
-    <name not found> = ArrayList@1210[1] { ResolutionCandidate@1209 }
+ResolutionTaskHolder@1206 {
+    <name not found> = ArrayList@1207[1] { ResolutionCandidate@1208 }
 }
 
-ResolutionTaskHolder@1211 {
-    <name not found> = ArrayList@1212[1] { ResolutionCandidate@1213 }
-    <name not found> = ArrayList@1214[1] { ResolutionCandidate@1213 }
+ResolutionTaskHolder@1209 {
+    <name not found> = ArrayList@1210[1] { ResolutionCandidate@1211 }
+}
+
+ResolutionTaskHolder@1212 {
+    <name not found> = ArrayList@1213[1] { ResolutionCandidate@1214 }
 }
 
 ResolutionTaskHolder@1215 {
     <name not found> = ArrayList@1216[1] { ResolutionCandidate@1217 }
-    <name not found> = ArrayList@1218[1] { ResolutionCandidate@1217 }
 }
 
-ResolutionTaskHolder@1219 {
-    <name not found> = ArrayList@1220[1] { ResolutionCandidate@1221 }
-    <name not found> = ArrayList@1222[1] { ResolutionCandidate@1221 }
+ResolutionTaskHolder@1218 {
+    <name not found> = ArrayList@1219[1] { ResolutionCandidate@1220 }
 }
 
-ResolutionTaskHolder@1223 {
-    <name not found> = ArrayList@1224[1] { ResolutionCandidate@1225 }
-    <name not found> = ArrayList@1226[1] { ResolutionCandidate@1225 }
+ResolutionTaskHolder@1221 {
+    <name not found> = ArrayList@1222[1] { ResolutionCandidate@1223 }
+}
+
+ResolutionTaskHolder@1224 {
+    <name not found> = ArrayList@1225[1] { ResolutionCandidate@1226 }
 }
 
 ResolutionTaskHolder@1227 {
     <name not found> = ArrayList@1228[1] { ResolutionCandidate@1229 }
-    <name not found> = ArrayList@1230[1] { ResolutionCandidate@1229 }
 }
 
-ResolutionTaskHolder@1231 {
-    <name not found> = ArrayList@1232[1] { ResolutionCandidate@1233 }
-    <name not found> = ArrayList@1234[1] { ResolutionCandidate@1233 }
+ResolutionTaskHolder@1230 {
+    <name not found> = ArrayList@1231[1] { ResolutionCandidate@1232 }
 }
 
-ResolutionTaskHolder@1235 {
-    <name not found> = ArrayList@1236[1] { ResolutionCandidate@1237 }
-    <name not found> = ArrayList@1238[1] { ResolutionCandidate@1237 }
+ResolutionTaskHolder@1233 {
+    <name not found> = ArrayList@1234[1] { ResolutionCandidate@1235 }
+}
+
+ResolutionTaskHolder@1236 {
+    <name not found> = ArrayList@1237[1] { ResolutionCandidate@1238 }
 }
 
 ResolutionTaskHolder@1239 {
     <name not found> = ArrayList@1240[1] { ResolutionCandidate@1241 }
-    <name not found> = ArrayList@1242[1] { ResolutionCandidate@1241 }
 }
 
-ResolutionTaskHolder@1243 {
-    <name not found> = ArrayList@1244[1] { ResolutionCandidate@1245 }
-    <name not found> = ArrayList@1246[1] { ResolutionCandidate@1245 }
+ResolutionTaskHolder@1242 {
+    <name not found> = ArrayList@1243[1] { ResolutionCandidate@1244 }
 }
 
-ResolutionTaskHolder@1247 {
-    <name not found> = ArrayList@1248[1] { ResolutionCandidate@1249 }
-    <name not found> = ArrayList@1250[1] { ResolutionCandidate@1249 }
+ResolutionTaskHolder@1245 {
+    <name not found> = ArrayList@1246[1] { ResolutionCandidate@1247 }
+}
+
+ResolutionTaskHolder@1248 {
+    <name not found> = ArrayList@1249[1] { ResolutionCandidate@1250 }
 }
 
 ResolutionTaskHolder@1251 {
     <name not found> = ArrayList@1252[1] { ResolutionCandidate@1253 }
-    <name not found> = ArrayList@1254[1] { ResolutionCandidate@1253 }
 }
 
-ResolutionTaskHolder@1255 {
-    <name not found> = ArrayList@1256[1] { ResolutionCandidate@1257 }
-    <name not found> = ArrayList@1258[1] { ResolutionCandidate@1257 }
+ResolutionTaskHolder@1254 {
+    <name not found> = ArrayList@1255[1] { ResolutionCandidate@1256 }
 }
 
-ResolutionTaskHolder@1259 {
-    <name not found> = ArrayList@1260[1] { ResolutionCandidate@1261 }
-    <name not found> = ArrayList@1262[1] { ResolutionCandidate@1261 }
+ResolutionTaskHolder@1257 {
+    <name not found> = ArrayList@1258[1] { ResolutionCandidate@1259 }
+}
+
+ResolutionTaskHolder@1260 {
+    <name not found> = ArrayList@1261[1] { ResolutionCandidate@1262 }
 }
 
 ResolutionTaskHolder@1263 {
     <name not found> = ArrayList@1264[1] { ResolutionCandidate@1265 }
-    <name not found> = ArrayList@1266[1] { ResolutionCandidate@1265 }
 }
 
-ResolutionTaskHolder@1267 {
-    <name not found> = ArrayList@1268[1] { ResolutionCandidate@1269 }
-    <name not found> = ArrayList@1270[1] { ResolutionCandidate@1269 }
+ResolutionTaskHolder@1266 {
+    <name not found> = ArrayList@1267[1] { ResolutionCandidate@1268 }
 }
 
-ResolutionTaskHolder@1271 {
-    <name not found> = ArrayList@1272[1] { ResolutionCandidate@1273 }
-    <name not found> = ArrayList@1274[1] { ResolutionCandidate@1273 }
+ResolutionTaskHolder@1269 {
+    <name not found> = ArrayList@1270[1] { ResolutionCandidate@1271 }
+}
+
+ResolutionTaskHolder@1272 {
+    <name not found> = ArrayList@1273[1] { ResolutionCandidate@1274 }
 }
 
 ResolutionTaskHolder@1275 {
     <name not found> = ArrayList@1276[1] { ResolutionCandidate@1277 }
-    <name not found> = ArrayList@1278[1] { ResolutionCandidate@1277 }
 }
 
-ResolutionTaskHolder@1279 {
-    <name not found> = ArrayList@1280[1] { ResolutionCandidate@1281 }
-    <name not found> = ArrayList@1282[1] { ResolutionCandidate@1281 }
+ResolutionTaskHolder@1278 {
+    <name not found> = ArrayList@1279[20] { ResolutionCandidate@1280, ResolutionCandidate@1281, ResolutionCandidate@1282, ... }
 }
 
 ResolutionTaskHolder@1283 {
-    <name not found> = ArrayList@1284[1] { ResolutionCandidate@1285 }
-    <name not found> = ArrayList@1286[1] { ResolutionCandidate@1285 }
+    <name not found> = ArrayList@1284[20] { ResolutionCandidate@1285, ResolutionCandidate@1286, ResolutionCandidate@1287, ... }
 }
 
-ResolutionTaskHolder@1287 {
-    <name not found> = ArrayList@1288[1] { ResolutionCandidate@1289 }
-    <name not found> = ArrayList@1290[1] { ResolutionCandidate@1289 }
+ResolutionTaskHolder@1288 {
+    <name not found> = ArrayList@1289[20] { ResolutionCandidate@1290, ResolutionCandidate@1291, ResolutionCandidate@1292, ... }
 }
 
-ResolutionTaskHolder@1291 {
-    <name not found> = ArrayList@1292[1] { ResolutionCandidate@1293 }
-    <name not found> = ArrayList@1294[1] { ResolutionCandidate@1293 }
+ResolutionTaskHolder@1293 {
+    <name not found> = ArrayList@1294[20] { ResolutionCandidate@1295, ResolutionCandidate@1296, ResolutionCandidate@1297, ... }
 }
 
-ResolutionTaskHolder@1295 {
-    <name not found> = ArrayList@1296[1] { ResolutionCandidate@1297 }
-    <name not found> = ArrayList@1298[1] { ResolutionCandidate@1297 }
-}
-
-ResolutionTaskHolder@1299 {
-    <name not found> = ArrayList@1300[1] { ResolutionCandidate@1301 }
-    <name not found> = ArrayList@1302[1] { ResolutionCandidate@1301 }
+ResolutionTaskHolder@1298 {
+    <name not found> = ArrayList@1299[20] { ResolutionCandidate@1300, ResolutionCandidate@1301, ResolutionCandidate@1302, ... }
 }
 
 ResolutionTaskHolder@1303 {
-    <name not found> = ArrayList@1304[1] { ResolutionCandidate@1305 }
-    <name not found> = ArrayList@1306[1] { ResolutionCandidate@1305 }
+    <name not found> = ArrayList@1304[20] { ResolutionCandidate@1305, ResolutionCandidate@1306, ResolutionCandidate@1307, ... }
 }
 
-ResolutionTaskHolder@1307 {
-    <name not found> = ArrayList@1308[1] { ResolutionCandidate@1309 }
-    <name not found> = ArrayList@1310[1] { ResolutionCandidate@1309 }
+ResolutionTaskHolder@1308 {
+    <name not found> = ArrayList@1309[20] { ResolutionCandidate@1310, ResolutionCandidate@1311, ResolutionCandidate@1312, ... }
 }
 
-ResolutionTaskHolder@1311 {
-    <name not found> = ArrayList@1312[1] { ResolutionCandidate@1313 }
-    <name not found> = ArrayList@1314[1] { ResolutionCandidate@1313 }
+ResolutionTaskHolder@1313 {
+    <name not found> = ArrayList@1314[20] { ResolutionCandidate@1315, ResolutionCandidate@1316, ResolutionCandidate@1317, ... }
 }
 
-ResolutionTaskHolder@1315 {
-    <name not found> = ArrayList@1316[1] { ResolutionCandidate@1317 }
-    <name not found> = ArrayList@1318[1] { ResolutionCandidate@1317 }
-}
-
-ResolutionTaskHolder@1319 {
-    <name not found> = ArrayList@1320[1] { ResolutionCandidate@1321 }
-    <name not found> = ArrayList@1322[1] { ResolutionCandidate@1321 }
+ResolutionTaskHolder@1318 {
+    <name not found> = ArrayList@1319[20] { ResolutionCandidate@1320, ResolutionCandidate@1321, ResolutionCandidate@1322, ... }
 }
 
 ResolutionTaskHolder@1323 {
-    <name not found> = ArrayList@1324[1] { ResolutionCandidate@1325 }
-    <name not found> = ArrayList@1326[1] { ResolutionCandidate@1325 }
+    <name not found> = ArrayList@1324[20] { ResolutionCandidate@1325, ResolutionCandidate@1326, ResolutionCandidate@1327, ... }
 }
 
-ResolutionTaskHolder@1327 {
-    <name not found> = ArrayList@1328[1] { ResolutionCandidate@1329 }
-    <name not found> = ArrayList@1330[1] { ResolutionCandidate@1329 }
+ResolutionTaskHolder@1328 {
+    <name not found> = ArrayList@1329[20] { ResolutionCandidate@1330, ResolutionCandidate@1331, ResolutionCandidate@1332, ... }
 }
 
-ResolutionTaskHolder@1331 {
-    <name not found> = ArrayList@1332[1] { ResolutionCandidate@1333 }
-    <name not found> = ArrayList@1334[1] { ResolutionCandidate@1333 }
+ResolutionTaskHolder@1333 {
+    <name not found> = ArrayList@1334[20] { ResolutionCandidate@1335, ResolutionCandidate@1336, ResolutionCandidate@1337, ... }
 }
 
-ResolutionTaskHolder@1335 {
-    <name not found> = ArrayList@1336[1] { ResolutionCandidate@1337 }
-    <name not found> = ArrayList@1338[1] { ResolutionCandidate@1337 }
-}
-
-ResolutionTaskHolder@1339 {
-    <name not found> = ArrayList@1340[1] { ResolutionCandidate@1341 }
-    <name not found> = ArrayList@1342[1] { ResolutionCandidate@1341 }
+ResolutionTaskHolder@1338 {
+    <name not found> = ArrayList@1339[20] { ResolutionCandidate@1340, ResolutionCandidate@1341, ResolutionCandidate@1342, ... }
 }
 
 ResolutionTaskHolder@1343 {
-    <name not found> = ArrayList@1344[1] { ResolutionCandidate@1345 }
-    <name not found> = ArrayList@1346[1] { ResolutionCandidate@1345 }
+    <name not found> = ArrayList@1344[20] { ResolutionCandidate@1345, ResolutionCandidate@1346, ResolutionCandidate@1347, ... }
 }
 
-ResolutionTaskHolder@1347 {
-    <name not found> = ArrayList@1348[1] { ResolutionCandidate@1349 }
-    <name not found> = ArrayList@1350[1] { ResolutionCandidate@1349 }
+ResolutionTaskHolder@1348 {
+    <name not found> = ArrayList@1349[20] { ResolutionCandidate@1350, ResolutionCandidate@1351, ResolutionCandidate@1352, ... }
 }
 
-ResolutionTaskHolder@1351 {
-    <name not found> = ArrayList@1352[1] { ResolutionCandidate@1353 }
-    <name not found> = ArrayList@1354[1] { ResolutionCandidate@1353 }
+ResolutionTaskHolder@1353 {
+    <name not found> = ArrayList@1354[20] { ResolutionCandidate@1355, ResolutionCandidate@1356, ResolutionCandidate@1357, ... }
 }
 
-ResolutionTaskHolder@1355 {
-    <name not found> = ArrayList@1356[1] { ResolutionCandidate@1357 }
-    <name not found> = ArrayList@1358[1] { ResolutionCandidate@1357 }
-}
-
-ResolutionTaskHolder@1359 {
-    <name not found> = ArrayList@1360[1] { ResolutionCandidate@1361 }
-    <name not found> = ArrayList@1362[1] { ResolutionCandidate@1361 }
+ResolutionTaskHolder@1358 {
+    <name not found> = ArrayList@1359[20] { ResolutionCandidate@1360, ResolutionCandidate@1361, ResolutionCandidate@1362, ... }
 }
 
 ResolutionTaskHolder@1363 {
-    <name not found> = ArrayList@1364[1] { ResolutionCandidate@1365 }
-    <name not found> = ArrayList@1366[1] { ResolutionCandidate@1365 }
+    <name not found> = ArrayList@1364[20] { ResolutionCandidate@1365, ResolutionCandidate@1366, ResolutionCandidate@1367, ... }
 }
 
-ResolutionTaskHolder@1367 {
-    <name not found> = ArrayList@1368[1] { ResolutionCandidate@1369 }
-    <name not found> = ArrayList@1370[1] { ResolutionCandidate@1369 }
+ResolutionTaskHolder@1368 {
+    <name not found> = ArrayList@1369[20] { ResolutionCandidate@1370, ResolutionCandidate@1371, ResolutionCandidate@1372, ... }
 }
 
-ResolutionTaskHolder@1371 {
-    <name not found> = ArrayList@1372[1] { ResolutionCandidate@1373 }
-    <name not found> = ArrayList@1374[1] { ResolutionCandidate@1373 }
+ResolutionTaskHolder@1373 {
+    <name not found> = ArrayList@1374[20] { ResolutionCandidate@1375, ResolutionCandidate@1376, ResolutionCandidate@1377, ... }
 }
 
-ResolutionTaskHolder@1375 {
-    <name not found> = ArrayList@1376[1] { ResolutionCandidate@1377 }
-    <name not found> = ArrayList@1378[1] { ResolutionCandidate@1377 }
-}
-
-ResolutionTaskHolder@1379 {
-    <name not found> = ArrayList@1380[1] { ResolutionCandidate@1381 }
-    <name not found> = ArrayList@1382[1] { ResolutionCandidate@1381 }
+ResolutionTaskHolder@1378 {
+    <name not found> = ArrayList@1379[20] { ResolutionCandidate@1380, ResolutionCandidate@1381, ResolutionCandidate@1382, ... }
 }
 
 ResolutionTaskHolder@1383 {
-    <name not found> = ArrayList@1384[1] { ResolutionCandidate@1385 }
-    <name not found> = ArrayList@1386[1] { ResolutionCandidate@1385 }
+    <name not found> = ArrayList@1384[20] { ResolutionCandidate@1385, ResolutionCandidate@1386, ResolutionCandidate@1387, ... }
 }
 
-ResolutionTaskHolder@1387 {
-    <name not found> = ArrayList@1388[1] { ResolutionCandidate@1389 }
-    <name not found> = ArrayList@1390[1] { ResolutionCandidate@1389 }
+ResolutionTaskHolder@1388 {
+    <name not found> = ArrayList@1389[20] { ResolutionCandidate@1390, ResolutionCandidate@1391, ResolutionCandidate@1392, ... }
 }
 
-ResolutionTaskHolder@1391 {
-    <name not found> = ArrayList@1392[1] { ResolutionCandidate@1393 }
-    <name not found> = ArrayList@1394[1] { ResolutionCandidate@1393 }
+ResolutionTaskHolder@1393 {
+    <name not found> = ArrayList@1394[20] { ResolutionCandidate@1395, ResolutionCandidate@1396, ResolutionCandidate@1397, ... }
 }
 
-ResolutionTaskHolder@1395 {
-    <name not found> = ArrayList@1396[1] { ResolutionCandidate@1397 }
-    <name not found> = ArrayList@1398[1] { ResolutionCandidate@1397 }
-}
-
-ResolutionTaskHolder@1399 {
-    <name not found> = ArrayList@1400[1] { ResolutionCandidate@1401 }
-    <name not found> = ArrayList@1402[1] { ResolutionCandidate@1401 }
+ResolutionTaskHolder@1398 {
+    <name not found> = ArrayList@1399[20] { ResolutionCandidate@1400, ResolutionCandidate@1401, ResolutionCandidate@1402, ... }
 }
 
 ResolutionTaskHolder@1403 {
-    <name not found> = ArrayList@1404[1] { ResolutionCandidate@1405 }
-    <name not found> = ArrayList@1406[1] { ResolutionCandidate@1405 }
+    <name not found> = ArrayList@1404[2] { ResolutionCandidate@1405, ResolutionCandidate@1406 }
 }
 
 ResolutionTaskHolder@1407 {
-    <name not found> = ArrayList@1408[1] { ResolutionCandidate@1409 }
-    <name not found> = ArrayList@1410[1] { ResolutionCandidate@1409 }
+    <name not found> = ArrayList@1408[2] { ResolutionCandidate@1409, ResolutionCandidate@1410 }
 }
 
 ResolutionTaskHolder@1411 {
-    <name not found> = ArrayList@1412[1] { ResolutionCandidate@1413 }
-    <name not found> = ArrayList@1414[1] { ResolutionCandidate@1413 }
+    <name not found> = ArrayList@1412[2] { ResolutionCandidate@1413, ResolutionCandidate@1414 }
 }
 
 ResolutionTaskHolder@1415 {
-    <name not found> = ArrayList@1416[1] { ResolutionCandidate@1417 }
-    <name not found> = ArrayList@1418[1] { ResolutionCandidate@1417 }
+    <name not found> = ArrayList@1416[2] { ResolutionCandidate@1417, ResolutionCandidate@1418 }
 }
 
 ResolutionTaskHolder@1419 {
-    <name not found> = ArrayList@1420[1] { ResolutionCandidate@1421 }
-    <name not found> = ArrayList@1422[1] { ResolutionCandidate@1421 }
+    <name not found> = ArrayList@1420[2] { ResolutionCandidate@1421, ResolutionCandidate@1422 }
 }
 
 ResolutionTaskHolder@1423 {
-    <name not found> = ArrayList@1424[1] { ResolutionCandidate@1425 }
-    <name not found> = ArrayList@1426[1] { ResolutionCandidate@1425 }
+    <name not found> = ArrayList@1424[2] { ResolutionCandidate@1425, ResolutionCandidate@1426 }
 }
 
 ResolutionTaskHolder@1427 {
-    <name not found> = ArrayList@1428[1] { ResolutionCandidate@1429 }
-    <name not found> = ArrayList@1430[1] { ResolutionCandidate@1429 }
+    <name not found> = ArrayList@1428[2] { ResolutionCandidate@1429, ResolutionCandidate@1430 }
 }
 
 ResolutionTaskHolder@1431 {
-    <name not found> = ArrayList@1432[1] { ResolutionCandidate@1433 }
-    <name not found> = ArrayList@1434[1] { ResolutionCandidate@1433 }
+    <name not found> = ArrayList@1432[2] { ResolutionCandidate@1433, ResolutionCandidate@1434 }
 }
 
 ResolutionTaskHolder@1435 {
-    <name not found> = ArrayList@1436[1] { ResolutionCandidate@1437 }
-    <name not found> = ArrayList@1438[1] { ResolutionCandidate@1437 }
+    <name not found> = ArrayList@1436[2] { ResolutionCandidate@1437, ResolutionCandidate@1438 }
 }
 
 ResolutionTaskHolder@1439 {
-    <name not found> = ArrayList@1440[1] { ResolutionCandidate@1441 }
-    <name not found> = ArrayList@1442[1] { ResolutionCandidate@1441 }
+    <name not found> = ArrayList@1440[2] { ResolutionCandidate@1441, ResolutionCandidate@1442 }
 }
 
 ResolutionTaskHolder@1443 {
-    <name not found> = ArrayList@1444[1] { ResolutionCandidate@1445 }
-    <name not found> = ArrayList@1446[1] { ResolutionCandidate@1445 }
+    <name not found> = ArrayList@1444[2] { ResolutionCandidate@1445, ResolutionCandidate@1446 }
 }
 
 ResolutionTaskHolder@1447 {
-    <name not found> = ArrayList@1448[1] { ResolutionCandidate@1449 }
-    <name not found> = ArrayList@1450[1] { ResolutionCandidate@1449 }
+    <name not found> = ArrayList@1448[2] { ResolutionCandidate@1449, ResolutionCandidate@1450 }
 }
 
 ResolutionTaskHolder@1451 {
-    <name not found> = ArrayList@1452[1] { ResolutionCandidate@1453 }
-    <name not found> = ArrayList@1454[1] { ResolutionCandidate@1453 }
+    <name not found> = ArrayList@1452[2] { ResolutionCandidate@1453, ResolutionCandidate@1454 }
 }
 
 ResolutionTaskHolder@1455 {
-    <name not found> = ArrayList@1456[1] { ResolutionCandidate@1457 }
-    <name not found> = ArrayList@1458[1] { ResolutionCandidate@1457 }
+    <name not found> = ArrayList@1456[2] { ResolutionCandidate@1457, ResolutionCandidate@1458 }
 }
 
 ResolutionTaskHolder@1459 {
-    <name not found> = ArrayList@1460[1] { ResolutionCandidate@1461 }
-    <name not found> = ArrayList@1462[1] { ResolutionCandidate@1461 }
+    <name not found> = ArrayList@1460[2] { ResolutionCandidate@1461, ResolutionCandidate@1462 }
 }
 
 ResolutionTaskHolder@1463 {
-    <name not found> = ArrayList@1464[1] { ResolutionCandidate@1465 }
-    <name not found> = ArrayList@1466[1] { ResolutionCandidate@1465 }
+    <name not found> = ArrayList@1464[2] { ResolutionCandidate@1465, ResolutionCandidate@1466 }
 }
 
 ResolutionTaskHolder@1467 {
-    <name not found> = ArrayList@1468[1] { ResolutionCandidate@1469 }
-    <name not found> = ArrayList@1470[1] { ResolutionCandidate@1469 }
+    <name not found> = ArrayList@1468[2] { ResolutionCandidate@1469, ResolutionCandidate@1470 }
 }
 
 ResolutionTaskHolder@1471 {
-    <name not found> = ArrayList@1472[1] { ResolutionCandidate@1473 }
-    <name not found> = ArrayList@1474[1] { ResolutionCandidate@1473 }
+    <name not found> = ArrayList@1472[3] { ResolutionCandidate@1473, ResolutionCandidate@1474, ResolutionCandidate@1475 }
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@1475 {
-    <name not found> = ArrayList@1476[1] { ResolutionCandidate@1477 }
-    <name not found> = ArrayList@1478[1] { ResolutionCandidate@1477 }
+ResolutionTaskHolder@1476 {
+    <name not found> = ArrayList@1477[3] { ResolutionCandidate@1478, ResolutionCandidate@1479, ResolutionCandidate@1480 }
 }
 
-ResolutionTaskHolder@1479 {
-    <name not found> = ArrayList@1480[1] { ResolutionCandidate@1481 }
-    <name not found> = ArrayList@1482[1] { ResolutionCandidate@1481 }
+ResolutionTaskHolder@1481 {
+    <name not found> = ArrayList@1482[3] { ResolutionCandidate@1483, ResolutionCandidate@1484, ResolutionCandidate@1485 }
 }
 
-ResolutionTaskHolder@1483 {
-    <name not found> = ArrayList@1484[1] { ResolutionCandidate@1485 }
-    <name not found> = ArrayList@1486[1] { ResolutionCandidate@1485 }
-}
-
-ResolutionTaskHolder@1487 {
-    <name not found> = ArrayList@1488[1] { ResolutionCandidate@1489 }
-    <name not found> = ArrayList@1490[1] { ResolutionCandidate@1489 }
+ResolutionTaskHolder@1486 {
+    <name not found> = ArrayList@1487[3] { ResolutionCandidate@1488, ResolutionCandidate@1489, ResolutionCandidate@1490 }
 }
 
 ResolutionTaskHolder@1491 {
-    <name not found> = ArrayList@1492[1] { ResolutionCandidate@1493 }
-    <name not found> = ArrayList@1494[1] { ResolutionCandidate@1493 }
+    <name not found> = ArrayList@1492[3] { ResolutionCandidate@1493, ResolutionCandidate@1494, ResolutionCandidate@1495 }
 }
 
-ResolutionTaskHolder@1495 {
-    <name not found> = ArrayList@1496[1] { ResolutionCandidate@1497 }
-    <name not found> = ArrayList@1498[1] { ResolutionCandidate@1497 }
+ResolutionTaskHolder@1496 {
+    <name not found> = ArrayList@1497[6] { ResolutionCandidate@1498, ResolutionCandidate@1499, ResolutionCandidate@1500, ... }
 }
 
-ResolutionTaskHolder@1499 {
-    <name not found> = ArrayList@1500[1] { ResolutionCandidate@1501 }
-    <name not found> = ArrayList@1502[1] { ResolutionCandidate@1501 }
+ResolutionTaskHolder@1501 {
+    <name not found> = ArrayList@1502[6] { ResolutionCandidate@1503, ResolutionCandidate@1504, ResolutionCandidate@1505, ... }
 }
 
-ResolutionTaskHolder@1503 {
-    <name not found> = ArrayList@1504[1] { ResolutionCandidate@1505 }
-    <name not found> = ArrayList@1506[1] { ResolutionCandidate@1505 }
-}
-
-ResolutionTaskHolder@1507 {
-    <name not found> = ArrayList@1508[1] { ResolutionCandidate@1509 }
-    <name not found> = ArrayList@1510[1] { ResolutionCandidate@1509 }
+ResolutionTaskHolder@1506 {
+    <name not found> = ArrayList@1507[6] { ResolutionCandidate@1508, ResolutionCandidate@1509, ResolutionCandidate@1510, ... }
 }
 
 ResolutionTaskHolder@1511 {
-    <name not found> = ArrayList@1512[1] { ResolutionCandidate@1513 }
-    <name not found> = ArrayList@1514[1] { ResolutionCandidate@1513 }
+    <name not found> = ArrayList@1512[6] { ResolutionCandidate@1513, ResolutionCandidate@1514, ResolutionCandidate@1515, ... }
 }
 
-ResolutionTaskHolder@1515 {
-    <name not found> = ArrayList@1516[1] { ResolutionCandidate@1517 }
-    <name not found> = ArrayList@1518[1] { ResolutionCandidate@1517 }
+ResolutionTaskHolder@1516 {
+    <name not found> = ArrayList@1517[6] { ResolutionCandidate@1518, ResolutionCandidate@1519, ResolutionCandidate@1520, ... }
 }
 
-ResolutionTaskHolder@1519 {
-    <name not found> = ArrayList@1520[1] { ResolutionCandidate@1521 }
-    <name not found> = ArrayList@1522[1] { ResolutionCandidate@1521 }
+ResolutionTaskHolder@1521 {
+    <name not found> = ArrayList@1522[6] { ResolutionCandidate@1523, ResolutionCandidate@1524, ResolutionCandidate@1525, ... }
 }
 
-ResolutionTaskHolder@1523 {
-    <name not found> = ArrayList@1524[1] { ResolutionCandidate@1525 }
-    <name not found> = ArrayList@1526[1] { ResolutionCandidate@1525 }
-}
-
-ResolutionTaskHolder@1527 {
-    <name not found> = ArrayList@1528[1] { ResolutionCandidate@1529 }
-    <name not found> = ArrayList@1530[1] { ResolutionCandidate@1529 }
+ResolutionTaskHolder@1526 {
+    <name not found> = ArrayList@1527[7] { ResolutionCandidate@1528, ResolutionCandidate@1529, ResolutionCandidate@1530, ... }
 }
 
 ResolutionTaskHolder@1531 {
-    <name not found> = ArrayList@1532[1] { ResolutionCandidate@1533 }
-    <name not found> = ArrayList@1534[1] { ResolutionCandidate@1533 }
+    <name not found> = ArrayList@1532[7] { ResolutionCandidate@1533, ResolutionCandidate@1534, ResolutionCandidate@1535, ... }
 }
 
-ResolutionTaskHolder@1535 {
-    <name not found> = ArrayList@1536[1] { ResolutionCandidate@1537 }
-    <name not found> = ArrayList@1538[1] { ResolutionCandidate@1537 }
+ResolutionTaskHolder@1536 {
+    <name not found> = ArrayList@1537[7] { ResolutionCandidate@1538, ResolutionCandidate@1539, ResolutionCandidate@1540, ... }
 }
 
-ResolutionTaskHolder@1539 {
-    <name not found> = ArrayList@1540[1] { ResolutionCandidate@1541 }
-    <name not found> = ArrayList@1542[1] { ResolutionCandidate@1541 }
+ResolutionTaskHolder@1541 {
+    <name not found> = ArrayList@1542[7] { ResolutionCandidate@1543, ResolutionCandidate@1544, ResolutionCandidate@1545, ... }
 }
 
-ResolutionTaskHolder@1543 {
-    <name not found> = ArrayList@1544[1] { ResolutionCandidate@1545 }
-    <name not found> = ArrayList@1546[1] { ResolutionCandidate@1545 }
-}
-
-ResolutionTaskHolder@1547 {
-    <name not found> = ArrayList@1548[1] { ResolutionCandidate@1549 }
-    <name not found> = ArrayList@1550[1] { ResolutionCandidate@1549 }
+ResolutionTaskHolder@1546 {
+    <name not found> = ArrayList@1547[7] { ResolutionCandidate@1548, ResolutionCandidate@1549, ResolutionCandidate@1550, ... }
 }
 
 ResolutionTaskHolder@1551 {
-    <name not found> = ArrayList@1552[1] { ResolutionCandidate@1553 }
-    <name not found> = ArrayList@1554[1] { ResolutionCandidate@1553 }
+    <name not found> = ArrayList@1552[7] { ResolutionCandidate@1553, ResolutionCandidate@1554, ResolutionCandidate@1555, ... }
 }
 
-ResolutionTaskHolder@1555 {
-    <name not found> = ArrayList@1556[1] { ResolutionCandidate@1557 }
-    <name not found> = ArrayList@1558[1] { ResolutionCandidate@1557 }
+ResolutionTaskHolder@1556 {
+    <name not found> = ArrayList@1557[7] { ResolutionCandidate@1558, ResolutionCandidate@1559, ResolutionCandidate@1560, ... }
 }
 
-ResolutionTaskHolder@1559 {
-    <name not found> = ArrayList@1560[1] { ResolutionCandidate@1561 }
-    <name not found> = ArrayList@1562[1] { ResolutionCandidate@1561 }
+ResolutionTaskHolder@1561 {
+    <name not found> = ArrayList@1562[8] { ResolutionCandidate@1563, ResolutionCandidate@1564, ResolutionCandidate@1565, ... }
 }
 
-ResolutionTaskHolder@1563 {
-    <name not found> = ArrayList@1564[1] { ResolutionCandidate@1565 }
-    <name not found> = ArrayList@1566[1] { ResolutionCandidate@1565 }
-}
-
-ResolutionTaskHolder@1567 {
-    <name not found> = ArrayList@1568[1] { ResolutionCandidate@1569 }
-    <name not found> = ArrayList@1570[1] { ResolutionCandidate@1569 }
+ResolutionTaskHolder@1566 {
+    <name not found> = ArrayList@1567[8] { ResolutionCandidate@1568, ResolutionCandidate@1569, ResolutionCandidate@1570, ... }
 }
 
 ResolutionTaskHolder@1571 {
-    <name not found> = ArrayList@1572[1] { ResolutionCandidate@1573 }
-    <name not found> = ArrayList@1574[1] { ResolutionCandidate@1573 }
+    <name not found> = ArrayList@1572[8] { ResolutionCandidate@1573, ResolutionCandidate@1574, ResolutionCandidate@1575, ... }
 }
 
-ResolutionTaskHolder@1575 {
-    <name not found> = ArrayList@1576[1] { ResolutionCandidate@1577 }
-    <name not found> = ArrayList@1578[1] { ResolutionCandidate@1577 }
+ResolutionTaskHolder@1576 {
+    <name not found> = ArrayList@1577[8] { ResolutionCandidate@1578, ResolutionCandidate@1579, ResolutionCandidate@1580, ... }
 }
 
-ResolutionTaskHolder@1579 {
-    <name not found> = ArrayList@1580[1] { ResolutionCandidate@1581 }
-    <name not found> = ArrayList@1582[1] { ResolutionCandidate@1581 }
+ResolutionTaskHolder@1581 {
+    <name not found> = ArrayList@1582[8] { ResolutionCandidate@1583, ResolutionCandidate@1584, ResolutionCandidate@1585, ... }
 }
 
-ResolutionTaskHolder@1583 {
-    <name not found> = ArrayList@1584[1] { ResolutionCandidate@1585 }
-    <name not found> = ArrayList@1586[1] { ResolutionCandidate@1585 }
-}
-
-ResolutionTaskHolder@1587 {
-    <name not found> = ArrayList@1588[1] { ResolutionCandidate@1589 }
-    <name not found> = ArrayList@1590[1] { ResolutionCandidate@1589 }
-}
-
-ResolutionTaskHolder@1591 {
-    <name not found> = ArrayList@1592[1] { ResolutionCandidate@1593 }
-    <name not found> = ArrayList@1594[1] { ResolutionCandidate@1593 }
-}
-
-ResolutionTaskHolder@1595 {
-    <name not found> = ArrayList@1596[1] { ResolutionCandidate@1597 }
-    <name not found> = ArrayList@1598[1] { ResolutionCandidate@1597 }
-}
-
-ResolutionTaskHolder@1599 {
-    <name not found> = ArrayList@1600[1] { ResolutionCandidate@1601 }
-    <name not found> = ArrayList@1602[1] { ResolutionCandidate@1601 }
-}
-
-ResolutionTaskHolder@1603 {
-    <name not found> = ArrayList@1604[1] { ResolutionCandidate@1605 }
-    <name not found> = ArrayList@1606[1] { ResolutionCandidate@1605 }
-}
-
-ResolutionTaskHolder@1607 {
-    <name not found> = ArrayList@1608[1] { ResolutionCandidate@1609 }
-    <name not found> = ArrayList@1610[1] { ResolutionCandidate@1609 }
-}
-
-ResolutionTaskHolder@1611 {
-    <name not found> = ArrayList@1612[1] { ResolutionCandidate@1613 }
-    <name not found> = ArrayList@1614[1] { ResolutionCandidate@1613 }
-}
-
-ResolutionTaskHolder@1615 {
-    <name not found> = ArrayList@1616[1] { ResolutionCandidate@1617 }
-    <name not found> = ArrayList@1618[1] { ResolutionCandidate@1617 }
-}
-
-ResolutionTaskHolder@1619 {
-    <name not found> = ArrayList@1620[1] { ResolutionCandidate@1621 }
-    <name not found> = ArrayList@1622[1] { ResolutionCandidate@1621 }
-}
-
-ResolutionTaskHolder@1623 {
-    <name not found> = ArrayList@1624[1] { ResolutionCandidate@1625 }
-    <name not found> = ArrayList@1626[1] { ResolutionCandidate@1625 }
-}
-
-ResolutionTaskHolder@1627 {
-    <name not found> = ArrayList@1628[1] { ResolutionCandidate@1629 }
-    <name not found> = ArrayList@1630[1] { ResolutionCandidate@1629 }
-}
-
-ResolutionTaskHolder@1631 {
-    <name not found> = ArrayList@1632[1] { ResolutionCandidate@1633 }
-    <name not found> = ArrayList@1634[1] { ResolutionCandidate@1633 }
-}
-
-ResolutionTaskHolder@1635 {
-    <name not found> = ArrayList@1636[1] { ResolutionCandidate@1637 }
-    <name not found> = ArrayList@1638[1] { ResolutionCandidate@1637 }
-}
-
-ResolutionTaskHolder@1639 {
-    <name not found> = ArrayList@1640[1] { ResolutionCandidate@1641 }
-    <name not found> = ArrayList@1642[1] { ResolutionCandidate@1641 }
-}
-
-ResolutionTaskHolder@1643 {
-    <name not found> = ArrayList@1644[20] { ResolutionCandidate@1645, ResolutionCandidate@1646, ResolutionCandidate@1647, ... }
-    <name not found> = ArrayList@1648[20] { ResolutionCandidate@1645, ResolutionCandidate@1646, ResolutionCandidate@1647, ... }
-}
-
-ResolutionTaskHolder@1649 {
-    <name not found> = ArrayList@1650[20] { ResolutionCandidate@1651, ResolutionCandidate@1652, ResolutionCandidate@1653, ... }
-    <name not found> = ArrayList@1654[20] { ResolutionCandidate@1651, ResolutionCandidate@1652, ResolutionCandidate@1653, ... }
-}
-
-ResolutionTaskHolder@1655 {
-    <name not found> = ArrayList@1656[20] { ResolutionCandidate@1657, ResolutionCandidate@1658, ResolutionCandidate@1659, ... }
-    <name not found> = ArrayList@1660[20] { ResolutionCandidate@1657, ResolutionCandidate@1658, ResolutionCandidate@1659, ... }
-}
-
-ResolutionTaskHolder@1661 {
-    <name not found> = ArrayList@1662[20] { ResolutionCandidate@1663, ResolutionCandidate@1664, ResolutionCandidate@1665, ... }
-    <name not found> = ArrayList@1666[20] { ResolutionCandidate@1663, ResolutionCandidate@1664, ResolutionCandidate@1665, ... }
-}
-
-ResolutionTaskHolder@1667 {
-    <name not found> = ArrayList@1668[20] { ResolutionCandidate@1669, ResolutionCandidate@1670, ResolutionCandidate@1671, ... }
-    <name not found> = ArrayList@1672[20] { ResolutionCandidate@1669, ResolutionCandidate@1670, ResolutionCandidate@1671, ... }
-}
-
-ResolutionTaskHolder@1673 {
-    <name not found> = ArrayList@1674[20] { ResolutionCandidate@1675, ResolutionCandidate@1676, ResolutionCandidate@1677, ... }
-    <name not found> = ArrayList@1678[20] { ResolutionCandidate@1675, ResolutionCandidate@1676, ResolutionCandidate@1677, ... }
-}
-
-ResolutionTaskHolder@1679 {
-    <name not found> = ArrayList@1680[20] { ResolutionCandidate@1681, ResolutionCandidate@1682, ResolutionCandidate@1683, ... }
-    <name not found> = ArrayList@1684[20] { ResolutionCandidate@1681, ResolutionCandidate@1682, ResolutionCandidate@1683, ... }
-}
-
-ResolutionTaskHolder@1685 {
-    <name not found> = ArrayList@1686[20] { ResolutionCandidate@1687, ResolutionCandidate@1688, ResolutionCandidate@1689, ... }
-    <name not found> = ArrayList@1690[20] { ResolutionCandidate@1687, ResolutionCandidate@1688, ResolutionCandidate@1689, ... }
-}
-
-ResolutionTaskHolder@1691 {
-    <name not found> = ArrayList@1692[20] { ResolutionCandidate@1693, ResolutionCandidate@1694, ResolutionCandidate@1695, ... }
-    <name not found> = ArrayList@1696[20] { ResolutionCandidate@1693, ResolutionCandidate@1694, ResolutionCandidate@1695, ... }
-}
-
-ResolutionTaskHolder@1697 {
-    <name not found> = ArrayList@1698[20] { ResolutionCandidate@1699, ResolutionCandidate@1700, ResolutionCandidate@1701, ... }
-    <name not found> = ArrayList@1702[20] { ResolutionCandidate@1699, ResolutionCandidate@1700, ResolutionCandidate@1701, ... }
-}
-
-ResolutionTaskHolder@1703 {
-    <name not found> = ArrayList@1704[20] { ResolutionCandidate@1705, ResolutionCandidate@1706, ResolutionCandidate@1707, ... }
-    <name not found> = ArrayList@1708[20] { ResolutionCandidate@1705, ResolutionCandidate@1706, ResolutionCandidate@1707, ... }
-}
-
-ResolutionTaskHolder@1709 {
-    <name not found> = ArrayList@1710[20] { ResolutionCandidate@1711, ResolutionCandidate@1712, ResolutionCandidate@1713, ... }
-    <name not found> = ArrayList@1714[20] { ResolutionCandidate@1711, ResolutionCandidate@1712, ResolutionCandidate@1713, ... }
-}
-
-ResolutionTaskHolder@1715 {
-    <name not found> = ArrayList@1716[20] { ResolutionCandidate@1717, ResolutionCandidate@1718, ResolutionCandidate@1719, ... }
-    <name not found> = ArrayList@1720[20] { ResolutionCandidate@1717, ResolutionCandidate@1718, ResolutionCandidate@1719, ... }
-}
-
-ResolutionTaskHolder@1721 {
-    <name not found> = ArrayList@1722[20] { ResolutionCandidate@1723, ResolutionCandidate@1724, ResolutionCandidate@1725, ... }
-    <name not found> = ArrayList@1726[20] { ResolutionCandidate@1723, ResolutionCandidate@1724, ResolutionCandidate@1725, ... }
-}
-
-ResolutionTaskHolder@1727 {
-    <name not found> = ArrayList@1728[20] { ResolutionCandidate@1729, ResolutionCandidate@1730, ResolutionCandidate@1731, ... }
-    <name not found> = ArrayList@1732[20] { ResolutionCandidate@1729, ResolutionCandidate@1730, ResolutionCandidate@1731, ... }
-}
-
-ResolutionTaskHolder@1733 {
-    <name not found> = ArrayList@1734[20] { ResolutionCandidate@1735, ResolutionCandidate@1736, ResolutionCandidate@1737, ... }
-    <name not found> = ArrayList@1738[20] { ResolutionCandidate@1735, ResolutionCandidate@1736, ResolutionCandidate@1737, ... }
-}
-
-ResolutionTaskHolder@1739 {
-    <name not found> = ArrayList@1740[20] { ResolutionCandidate@1741, ResolutionCandidate@1742, ResolutionCandidate@1743, ... }
-    <name not found> = ArrayList@1744[20] { ResolutionCandidate@1741, ResolutionCandidate@1742, ResolutionCandidate@1743, ... }
-}
-
-ResolutionTaskHolder@1745 {
-    <name not found> = ArrayList@1746[20] { ResolutionCandidate@1747, ResolutionCandidate@1748, ResolutionCandidate@1749, ... }
-    <name not found> = ArrayList@1750[20] { ResolutionCandidate@1747, ResolutionCandidate@1748, ResolutionCandidate@1749, ... }
-}
-
-ResolutionTaskHolder@1751 {
-    <name not found> = ArrayList@1752[20] { ResolutionCandidate@1753, ResolutionCandidate@1754, ResolutionCandidate@1755, ... }
-    <name not found> = ArrayList@1756[20] { ResolutionCandidate@1753, ResolutionCandidate@1754, ResolutionCandidate@1755, ... }
-}
-
-ResolutionTaskHolder@1757 {
-    <name not found> = ArrayList@1758[20] { ResolutionCandidate@1759, ResolutionCandidate@1760, ResolutionCandidate@1761, ... }
-    <name not found> = ArrayList@1762[20] { ResolutionCandidate@1759, ResolutionCandidate@1760, ResolutionCandidate@1761, ... }
-}
-
-ResolutionTaskHolder@1763 {
-    <name not found> = ArrayList@1764[20] { ResolutionCandidate@1765, ResolutionCandidate@1766, ResolutionCandidate@1767, ... }
-    <name not found> = ArrayList@1768[20] { ResolutionCandidate@1765, ResolutionCandidate@1766, ResolutionCandidate@1767, ... }
-}
-
-ResolutionTaskHolder@1769 {
-    <name not found> = ArrayList@1770[20] { ResolutionCandidate@1771, ResolutionCandidate@1772, ResolutionCandidate@1773, ... }
-    <name not found> = ArrayList@1774[20] { ResolutionCandidate@1771, ResolutionCandidate@1772, ResolutionCandidate@1773, ... }
-}
-
-ResolutionTaskHolder@1775 {
-    <name not found> = ArrayList@1776[20] { ResolutionCandidate@1777, ResolutionCandidate@1778, ResolutionCandidate@1779, ... }
-    <name not found> = ArrayList@1780[20] { ResolutionCandidate@1777, ResolutionCandidate@1778, ResolutionCandidate@1779, ... }
-}
-
-ResolutionTaskHolder@1781 {
-    <name not found> = ArrayList@1782[20] { ResolutionCandidate@1783, ResolutionCandidate@1784, ResolutionCandidate@1785, ... }
-    <name not found> = ArrayList@1786[20] { ResolutionCandidate@1783, ResolutionCandidate@1784, ResolutionCandidate@1785, ... }
-}
-
-ResolutionTaskHolder@1787 {
-    <name not found> = ArrayList@1788[20] { ResolutionCandidate@1789, ResolutionCandidate@1790, ResolutionCandidate@1791, ... }
-    <name not found> = ArrayList@1792[20] { ResolutionCandidate@1789, ResolutionCandidate@1790, ResolutionCandidate@1791, ... }
-}
-
-ResolutionTaskHolder@1793 {
-    <name not found> = ArrayList@1794[2] { ResolutionCandidate@1795, ResolutionCandidate@1796 }
-    <name not found> = ArrayList@1797[2] { ResolutionCandidate@1795, ResolutionCandidate@1796 }
-}
-
-ResolutionTaskHolder@1798 {
-    <name not found> = ArrayList@1799[2] { ResolutionCandidate@1800, ResolutionCandidate@1801 }
-    <name not found> = ArrayList@1802[2] { ResolutionCandidate@1800, ResolutionCandidate@1801 }
-}
-
-ResolutionTaskHolder@1803 {
-    <name not found> = ArrayList@1804[2] { ResolutionCandidate@1805, ResolutionCandidate@1806 }
-    <name not found> = ArrayList@1807[2] { ResolutionCandidate@1805, ResolutionCandidate@1806 }
-}
-
-ResolutionTaskHolder@1808 {
-    <name not found> = ArrayList@1809[2] { ResolutionCandidate@1810, ResolutionCandidate@1811 }
-    <name not found> = ArrayList@1812[2] { ResolutionCandidate@1810, ResolutionCandidate@1811 }
-}
-
-ResolutionTaskHolder@1813 {
-    <name not found> = ArrayList@1814[2] { ResolutionCandidate@1815, ResolutionCandidate@1816 }
-    <name not found> = ArrayList@1817[2] { ResolutionCandidate@1815, ResolutionCandidate@1816 }
-}
-
-ResolutionTaskHolder@1818 {
-    <name not found> = ArrayList@1819[2] { ResolutionCandidate@1820, ResolutionCandidate@1821 }
-    <name not found> = ArrayList@1822[2] { ResolutionCandidate@1820, ResolutionCandidate@1821 }
-}
-
-ResolutionTaskHolder@1823 {
-    <name not found> = ArrayList@1824[2] { ResolutionCandidate@1825, ResolutionCandidate@1826 }
-    <name not found> = ArrayList@1827[2] { ResolutionCandidate@1825, ResolutionCandidate@1826 }
-}
-
-ResolutionTaskHolder@1828 {
-    <name not found> = ArrayList@1829[2] { ResolutionCandidate@1830, ResolutionCandidate@1831 }
-    <name not found> = ArrayList@1832[2] { ResolutionCandidate@1830, ResolutionCandidate@1831 }
-}
-
-ResolutionTaskHolder@1833 {
-    <name not found> = ArrayList@1834[2] { ResolutionCandidate@1835, ResolutionCandidate@1836 }
-    <name not found> = ArrayList@1837[2] { ResolutionCandidate@1835, ResolutionCandidate@1836 }
-}
-
-ResolutionTaskHolder@1838 {
-    <name not found> = ArrayList@1839[2] { ResolutionCandidate@1840, ResolutionCandidate@1841 }
-    <name not found> = ArrayList@1842[2] { ResolutionCandidate@1840, ResolutionCandidate@1841 }
-}
-
-ResolutionTaskHolder@1843 {
-    <name not found> = ArrayList@1844[2] { ResolutionCandidate@1845, ResolutionCandidate@1846 }
-    <name not found> = ArrayList@1847[2] { ResolutionCandidate@1845, ResolutionCandidate@1846 }
-}
-
-ResolutionTaskHolder@1848 {
-    <name not found> = ArrayList@1849[2] { ResolutionCandidate@1850, ResolutionCandidate@1851 }
-    <name not found> = ArrayList@1852[2] { ResolutionCandidate@1850, ResolutionCandidate@1851 }
-}
-
-ResolutionTaskHolder@1853 {
-    <name not found> = ArrayList@1854[2] { ResolutionCandidate@1855, ResolutionCandidate@1856 }
-    <name not found> = ArrayList@1857[2] { ResolutionCandidate@1855, ResolutionCandidate@1856 }
-}
-
-ResolutionTaskHolder@1858 {
-    <name not found> = ArrayList@1859[2] { ResolutionCandidate@1860, ResolutionCandidate@1861 }
-    <name not found> = ArrayList@1862[2] { ResolutionCandidate@1860, ResolutionCandidate@1861 }
-}
-
-ResolutionTaskHolder@1863 {
-    <name not found> = ArrayList@1864[2] { ResolutionCandidate@1865, ResolutionCandidate@1866 }
-    <name not found> = ArrayList@1867[2] { ResolutionCandidate@1865, ResolutionCandidate@1866 }
-}
-
-ResolutionTaskHolder@1868 {
-    <name not found> = ArrayList@1869[2] { ResolutionCandidate@1870, ResolutionCandidate@1871 }
-    <name not found> = ArrayList@1872[2] { ResolutionCandidate@1870, ResolutionCandidate@1871 }
-}
-
-ResolutionTaskHolder@1873 {
-    <name not found> = ArrayList@1874[2] { ResolutionCandidate@1875, ResolutionCandidate@1876 }
-    <name not found> = ArrayList@1877[2] { ResolutionCandidate@1875, ResolutionCandidate@1876 }
-}
-
-ResolutionTaskHolder@1878 {
-    <name not found> = ArrayList@1879[3] { ResolutionCandidate@1880, ResolutionCandidate@1881, ResolutionCandidate@1882 }
-    <name not found> = ArrayList@1883[3] { ResolutionCandidate@1880, ResolutionCandidate@1881, ResolutionCandidate@1882 }
+null {
+    <name not found> = ArrayList@1586[10] { ResolutionCandidate@233, ResolutionCandidate@234, ResolutionCandidate@235, ... }
+    <name not found> = ArrayList@1587[10] { ResolutionCandidate@308, ResolutionCandidate@309, ResolutionCandidate@310, ... }
+    <name not found> = ArrayList@1588[10] { ResolutionCandidate@288, ResolutionCandidate@289, ResolutionCandidate@290, ... }
+    <name not found> = ArrayList@1589[10] { ResolutionCandidate@268, ResolutionCandidate@269, ResolutionCandidate@270, ... }
+    <name not found> = ArrayList@1590[10] { ResolutionCandidate@173, ResolutionCandidate@174, ResolutionCandidate@175, ... }
+    <name not found> = ArrayList@1591[10] { ResolutionCandidate@298, ResolutionCandidate@299, ResolutionCandidate@300, ... }
+    <name not found> = ArrayList@1592[10] { ResolutionCandidate@273, ResolutionCandidate@274, ResolutionCandidate@275, ... }
+    <name not found> = ArrayList@1593[10] { ResolutionCandidate@263, ResolutionCandidate@264, ResolutionCandidate@265, ... }
+    <name not found> = ArrayList@1594[10] { ResolutionCandidate@183, ResolutionCandidate@184, ResolutionCandidate@185, ... }
+    <name not found> = ArrayList@1595[10] { ResolutionCandidate@293, ResolutionCandidate@294, ResolutionCandidate@295, ... }
+    <name not found> = ArrayList@1596[10] { ResolutionCandidate@193, ResolutionCandidate@194, ResolutionCandidate@195, ... }
+    <name not found> = ArrayList@1597[10] { ResolutionCandidate@258, ResolutionCandidate@259, ResolutionCandidate@260, ... }
+    <name not found> = ArrayList@1598[10] { ResolutionCandidate@218, ResolutionCandidate@219, ResolutionCandidate@220, ... }
+    <name not found> = ArrayList@1599[10] { ResolutionCandidate@243, ResolutionCandidate@244, ResolutionCandidate@245, ... }
+    <name not found> = ArrayList@1600[10] { ResolutionCandidate@238, ResolutionCandidate@239, ResolutionCandidate@240, ... }
+    <name not found> = ArrayList@1601[10] { ResolutionCandidate@213, ResolutionCandidate@214, ResolutionCandidate@215, ... }
+    <name not found> = ArrayList@1602[10] { ResolutionCandidate@283, ResolutionCandidate@284, ResolutionCandidate@285, ... }
+    <name not found> = ArrayList@1603[10] { ResolutionCandidate@178, ResolutionCandidate@179, ResolutionCandidate@180, ... }
+    <name not found> = ArrayList@1604[10] { ResolutionCandidate@278, ResolutionCandidate@279, ResolutionCandidate@280, ... }
+    <name not found> = ArrayList@1605[10] { ResolutionCandidate@203, ResolutionCandidate@204, ResolutionCandidate@205, ... }
+    <name not found> = ArrayList@1606[10] { ResolutionCandidate@248, ResolutionCandidate@249, ResolutionCandidate@250, ... }
+    <name not found> = ArrayList@1607[10] { ResolutionCandidate@188, ResolutionCandidate@189, ResolutionCandidate@190, ... }
+    <name not found> = ArrayList@1608[10] { ResolutionCandidate@303, ResolutionCandidate@304, ResolutionCandidate@305, ... }
+    <name not found> = ArrayList@1609[10] { ResolutionCandidate@198, ResolutionCandidate@199, ResolutionCandidate@200, ... }
+    <name not found> = ArrayList@1610[10] { ResolutionCandidate@253, ResolutionCandidate@254, ResolutionCandidate@255, ... }
+    <name not found> = ArrayList@1611[10] { ResolutionCandidate@228, ResolutionCandidate@229, ResolutionCandidate@230, ... }
+    <name not found> = ArrayList@1612[10] { ResolutionCandidate@223, ResolutionCandidate@224, ResolutionCandidate@225, ... }
+    <name not found> = ArrayList@1613[10] { ResolutionCandidate@208, ResolutionCandidate@209, ResolutionCandidate@210, ... }
+    <name not found> = ArrayList@1614[16] { ResolutionCandidate@313, ResolutionCandidate@314, ResolutionCandidate@315, ... }
+    <name not found> = ArrayList@1615[1] { ResolutionCandidate@1166 }
+    <name not found> = ArrayList@1616[1] { ResolutionCandidate@518 }
+    <name not found> = ArrayList@1617[1] { ResolutionCandidate@520 }
+    <name not found> = ArrayList@1618[1] { ResolutionCandidate@956 }
+    <name not found> = ArrayList@1619[1] { ResolutionCandidate@689 }
+    <name not found> = ArrayList@1620[1] { ResolutionCandidate@1172 }
+    <name not found> = ArrayList@1621[1] { ResolutionCandidate@698 }
+    <name not found> = ArrayList@1622[1] { ResolutionCandidate@896 }
+    <name not found> = ArrayList@1623[1] { ResolutionCandidate@575 }
+    <name not found> = ArrayList@1624[1] { ResolutionCandidate@408 }
+    <name not found> = ArrayList@1625[1] { ResolutionCandidate@410 }
+    <name not found> = ArrayList@1626[1] { ResolutionCandidate@1193 }
+    <name not found> = ArrayList@1627[1] { ResolutionCandidate@950 }
+    <name not found> = ArrayList@1628[1] { ResolutionCandidate@584 }
+    <name not found> = ArrayList@1629[1] { ResolutionCandidate@413 }
+    <name not found> = ArrayList@1630[1] { ResolutionCandidate@415 }
+    <name not found> = ArrayList@1631[1] { ResolutionCandidate@821 }
+    <name not found> = ArrayList@1632[1] { ResolutionCandidate@1013 }
+    <name not found> = ArrayList@1633[1] { ResolutionCandidate@1244 }
+    <name not found> = ArrayList@1634[1] { ResolutionCandidate@328 }
+    <name not found> = ArrayList@1635[1] { ResolutionCandidate@330 }
+    <name not found> = ArrayList@1636[1] { ResolutionCandidate@836 }
+    <name not found> = ArrayList@1637[1] { ResolutionCandidate@423 }
+    <name not found> = ArrayList@1638[1] { ResolutionCandidate@425 }
+    <name not found> = ArrayList@1639[1] { ResolutionCandidate@1046 }
+    <name not found> = ArrayList@1640[1] { ResolutionCandidate@1118 }
+    <name not found> = ArrayList@1641[1] { ResolutionCandidate@632 }
+    <name not found> = ArrayList@1642[1] { ResolutionCandidate@458 }
+    <name not found> = ArrayList@1643[1] { ResolutionCandidate@460 }
+    <name not found> = ArrayList@1644[1] { ResolutionCandidate@1136 }
+    <name not found> = ArrayList@1645[1] { ResolutionCandidate@932 }
+    <name not found> = ArrayList@1646[1] { ResolutionCandidate@665 }
+    <name not found> = ArrayList@1647[1] { ResolutionCandidate@848 }
+    <name not found> = ArrayList@1648[1] { ResolutionCandidate@478 }
+    <name not found> = ArrayList@1649[1] { ResolutionCandidate@480 }
+    <name not found> = ArrayList@1650[1] { ResolutionCandidate@1247 }
+    <name not found> = ArrayList@1651[1] { ResolutionCandidate@353 }
+    <name not found> = ArrayList@1652[1] { ResolutionCandidate@355 }
+    <name not found> = ArrayList@1653[1] { ResolutionCandidate@1223 }
+    <name not found> = ArrayList@1654[1] { ResolutionCandidate@513 }
+    <name not found> = ArrayList@1655[1] { ResolutionCandidate@515 }
+    <name not found> = ArrayList@1656[1] { ResolutionCandidate@779 }
+    <name not found> = ArrayList@1657[1] { ResolutionCandidate@590 }
+    <name not found> = ArrayList@1658[1] { ResolutionCandidate@872 }
+    <name not found> = ArrayList@1659[1] { ResolutionCandidate@968 }
+    <name not found> = ArrayList@1660[1] { ResolutionCandidate@508 }
+    <name not found> = ArrayList@1661[1] { ResolutionCandidate@510 }
+    <name not found> = ArrayList@1662[1] { ResolutionCandidate@614 }
+    <name not found> = ArrayList@1663[1] { ResolutionCandidate@554 }
+    <name not found> = ArrayList@1664[1] { ResolutionCandidate@980 }
+    <name not found> = ArrayList@1665[1] { ResolutionCandidate@851 }
+    <name not found> = ArrayList@1666[1] { ResolutionCandidate@992 }
+    <name not found> = ArrayList@1667[1] { ResolutionCandidate@1007 }
+    <name not found> = ArrayList@1668[1] { ResolutionCandidate@1154 }
+    <name not found> = ArrayList@1669[1] { ResolutionCandidate@602 }
+    <name not found> = ArrayList@1670[1] { ResolutionCandidate@528 }
+    <name not found> = ArrayList@1671[1] { ResolutionCandidate@530 }
+    <name not found> = ArrayList@1672[1] { ResolutionCandidate@1265 }
+    <name not found> = ArrayList@1673[1] { ResolutionCandidate@572 }
+    <name not found> = ArrayList@1674[1] { ResolutionCandidate@986 }
+    <name not found> = ArrayList@1675[1] { ResolutionCandidate@935 }
+    <name not found> = ArrayList@1676[1] { ResolutionCandidate@824 }
+    <name not found> = ArrayList@1677[1] { ResolutionCandidate@1079 }
+    <name not found> = ArrayList@1678[1] { ResolutionCandidate@1103 }
+    <name not found> = ArrayList@1679[1] { ResolutionCandidate@523 }
+    <name not found> = ArrayList@1680[1] { ResolutionCandidate@525 }
+    <name not found> = ArrayList@1681[1] { ResolutionCandidate@893 }
+    <name not found> = ArrayList@1682[1] { ResolutionCandidate@560 }
+    <name not found> = ArrayList@1683[1] { ResolutionCandidate@914 }
+    <name not found> = ArrayList@1684[1] { ResolutionCandidate@1175 }
+    <name not found> = ArrayList@1685[1] { ResolutionCandidate@629 }
+    <name not found> = ArrayList@1686[1] { ResolutionCandidate@902 }
+    <name not found> = ArrayList@1687[1] { ResolutionCandidate@605 }
+    <name not found> = ArrayList@1688[1] { ResolutionCandidate@1127 }
+    <name not found> = ArrayList@1689[1] { ResolutionCandidate@378 }
+    <name not found> = ArrayList@1690[1] { ResolutionCandidate@380 }
+    <name not found> = ArrayList@1691[1] { ResolutionCandidate@905 }
+    <name not found> = ArrayList@1692[1] { ResolutionCandidate@563 }
+    <name not found> = ArrayList@1693[1] { ResolutionCandidate@833 }
+    <name not found> = ArrayList@1694[1] { ResolutionCandidate@662 }
+    <name not found> = ArrayList@1695[1] { ResolutionCandidate@1256 }
+    <name not found> = ArrayList@1696[1] { ResolutionCandidate@1181 }
+    <name not found> = ArrayList@1697[1] { ResolutionCandidate@887 }
+    <name not found> = ArrayList@1698[1] { ResolutionCandidate@635 }
+    <name not found> = ArrayList@1699[1] { ResolutionCandidate@1025 }
+    <name not found> = ArrayList@1700[1] { ResolutionCandidate@1133 }
+    <name not found> = ArrayList@1701[1] { ResolutionCandidate@752 }
+    <name not found> = ArrayList@1702[1] { ResolutionCandidate@428 }
+    <name not found> = ArrayList@1703[1] { ResolutionCandidate@430 }
+    <name not found> = ArrayList@1704[1] { ResolutionCandidate@764 }
+    <name not found> = ArrayList@1705[1] { ResolutionCandidate@998 }
+    <name not found> = ArrayList@1706[1] { ResolutionCandidate@743 }
+    <name not found> = ArrayList@1707[1] { ResolutionCandidate@318 }
+    <name not found> = ArrayList@1708[1] { ResolutionCandidate@320 }
+    <name not found> = ArrayList@1709[1] { ResolutionCandidate@626 }
+    <name not found> = ArrayList@1710[1] { ResolutionCandidate@1268 }
+    <name not found> = ArrayList@1711[1] { ResolutionCandidate@1091 }
+    <name not found> = ArrayList@1712[1] { ResolutionCandidate@333 }
+    <name not found> = ArrayList@1713[1] { ResolutionCandidate@335 }
+    <name not found> = ArrayList@1714[1] { ResolutionCandidate@854 }
+    <name not found> = ArrayList@1715[1] { ResolutionCandidate@418 }
+    <name not found> = ArrayList@1716[1] { ResolutionCandidate@420 }
+    <name not found> = ArrayList@1717[1] { ResolutionCandidate@1259 }
+    <name not found> = ArrayList@1718[1] { ResolutionCandidate@959 }
+    <name not found> = ArrayList@1719[1] { ResolutionCandidate@1226 }
+    <name not found> = ArrayList@1720[1] { ResolutionCandidate@363 }
+    <name not found> = ArrayList@1721[1] { ResolutionCandidate@365 }
+    <name not found> = ArrayList@1722[1] { ResolutionCandidate@656 }
+    <name not found> = ArrayList@1723[1] { ResolutionCandidate@704 }
+    <name not found> = ArrayList@1724[1] { ResolutionCandidate@1151 }
+    <name not found> = ArrayList@1725[1] { ResolutionCandidate@755 }
+    <name not found> = ArrayList@1726[1] { ResolutionCandidate@533 }
+    <name not found> = ArrayList@1727[1] { ResolutionCandidate@535 }
+    <name not found> = ArrayList@1728[1] { ResolutionCandidate@866 }
+    <name not found> = ArrayList@1729[1] { ResolutionCandidate@483 }
+    <name not found> = ArrayList@1730[1] { ResolutionCandidate@485 }
+    <name not found> = ArrayList@1731[1] { ResolutionCandidate@695 }
+    <name not found> = ArrayList@1732[1] { ResolutionCandidate@383 }
+    <name not found> = ArrayList@1733[1] { ResolutionCandidate@385 }
+    <name not found> = ArrayList@1734[1] { ResolutionCandidate@965 }
+    <name not found> = ArrayList@1735[1] { ResolutionCandidate@1076 }
+    <name not found> = ArrayList@1736[1] { ResolutionCandidate@734 }
+    <name not found> = ArrayList@1737[1] { ResolutionCandidate@473 }
+    <name not found> = ArrayList@1738[1] { ResolutionCandidate@475 }
+    <name not found> = ArrayList@1739[1] { ResolutionCandidate@827 }
+    <name not found> = ArrayList@1740[1] { ResolutionCandidate@557 }
+    <name not found> = ArrayList@1741[1] { ResolutionCandidate@791 }
+    <name not found> = ArrayList@1742[1] { ResolutionCandidate@680 }
+    <name not found> = ArrayList@1743[1] { ResolutionCandidate@647 }
+    <name not found> = ArrayList@1744[1] { ResolutionCandidate@692 }
+    <name not found> = ArrayList@1745[1] { ResolutionCandidate@1196 }
+    <name not found> = ArrayList@1746[1] { ResolutionCandidate@794 }
+    <name not found> = ArrayList@1747[1] { ResolutionCandidate@468 }
+    <name not found> = ArrayList@1748[1] { ResolutionCandidate@470 }
+    <name not found> = ArrayList@1749[1] { ResolutionCandidate@1199 }
+    <name not found> = ArrayList@1750[1] { ResolutionCandidate@551 }
+    <name not found> = ArrayList@1751[1] { ResolutionCandidate@776 }
+    <name not found> = ArrayList@1752[1] { ResolutionCandidate@644 }
+    <name not found> = ArrayList@1753[1] { ResolutionCandidate@920 }
+    <name not found> = ArrayList@1754[1] { ResolutionCandidate@875 }
+    <name not found> = ArrayList@1755[1] { ResolutionCandidate@710 }
+    <name not found> = ArrayList@1756[1] { ResolutionCandidate@1250 }
+    <name not found> = ArrayList@1757[1] { ResolutionCandidate@453 }
+    <name not found> = ArrayList@1758[1] { ResolutionCandidate@455 }
+    <name not found> = ArrayList@1759[1] { ResolutionCandidate@962 }
+    <name not found> = ArrayList@1760[1] { ResolutionCandidate@566 }
+    <name not found> = ArrayList@1761[1] { ResolutionCandidate@911 }
+    <name not found> = ArrayList@1762[1] { ResolutionCandidate@1277 }
+    <name not found> = ArrayList@1763[1] { ResolutionCandidate@926 }
+    <name not found> = ArrayList@1764[1] { ResolutionCandidate@650 }
+    <name not found> = ArrayList@1765[1] { ResolutionCandidate@623 }
+    <name not found> = ArrayList@1766[1] { ResolutionCandidate@863 }
+    <name not found> = ArrayList@1767[1] { ResolutionCandidate@746 }
+    <name not found> = ArrayList@1768[1] { ResolutionCandidate@403 }
+    <name not found> = ArrayList@1769[1] { ResolutionCandidate@405 }
+    <name not found> = ArrayList@1770[1] { ResolutionCandidate@938 }
+    <name not found> = ArrayList@1771[1] { ResolutionCandidate@569 }
+    <name not found> = ArrayList@1772[1] { ResolutionCandidate@899 }
+    <name not found> = ArrayList@1773[1] { ResolutionCandidate@830 }
+    <name not found> = ArrayList@1774[1] { ResolutionCandidate@1055 }
+    <name not found> = ArrayList@1775[1] { ResolutionCandidate@881 }
+    <name not found> = ArrayList@1776[1] { ResolutionCandidate@1094 }
+    <name not found> = ArrayList@1777[1] { ResolutionCandidate@641 }
+    <name not found> = ArrayList@1778[1] { ResolutionCandidate@1088 }
+    <name not found> = ArrayList@1779[1] { ResolutionCandidate@443 }
+    <name not found> = ArrayList@1780[1] { ResolutionCandidate@445 }
+    <name not found> = ArrayList@1781[1] { ResolutionCandidate@1235 }
+    <name not found> = ArrayList@1782[1] { ResolutionCandidate@653 }
+    <name not found> = ArrayList@1783[1] { ResolutionCandidate@1028 }
+    <name not found> = ArrayList@1784[1] { ResolutionCandidate@358 }
+    <name not found> = ArrayList@1785[1] { ResolutionCandidate@360 }
+    <name not found> = ArrayList@1786[1] { ResolutionCandidate@1073 }
+    <name not found> = ArrayList@1787[1] { ResolutionCandidate@908 }
+    <name not found> = ArrayList@1788[1] { ResolutionCandidate@713 }
+    <name not found> = ArrayList@1789[1] { ResolutionCandidate@323 }
+    <name not found> = ArrayList@1790[1] { ResolutionCandidate@325 }
+    <name not found> = ArrayList@1791[1] { ResolutionCandidate@587 }
+    <name not found> = ArrayList@1792[1] { ResolutionCandidate@1031 }
+    <name not found> = ArrayList@1793[1] { ResolutionCandidate@617 }
+    <name not found> = ArrayList@1794[1] { ResolutionCandidate@890 }
+    <name not found> = ArrayList@1795[1] { ResolutionCandidate@839 }
+    <name not found> = ArrayList@1796[1] { ResolutionCandidate@785 }
+    <name not found> = ArrayList@1797[1] { ResolutionCandidate@548 }
+    <name not found> = ArrayList@1798[1] { ResolutionCandidate@686 }
+    <name not found> = ArrayList@1799[1] { ResolutionCandidate@393 }
+    <name not found> = ArrayList@1800[1] { ResolutionCandidate@395 }
+    <name not found> = ArrayList@1801[1] { ResolutionCandidate@977 }
+    <name not found> = ArrayList@1802[1] { ResolutionCandidate@941 }
+    <name not found> = ArrayList@1803[1] { ResolutionCandidate@749 }
+    <name not found> = ArrayList@1804[1] { ResolutionCandidate@1124 }
+    <name not found> = ArrayList@1805[1] { ResolutionCandidate@488 }
+    <name not found> = ArrayList@1806[1] { ResolutionCandidate@490 }
+    <name not found> = ArrayList@1807[1] { ResolutionCandidate@1163 }
+    <name not found> = ArrayList@1808[1] { ResolutionCandidate@797 }
+    <name not found> = ArrayList@1809[1] { ResolutionCandidate@683 }
+    <name not found> = ArrayList@1810[1] { ResolutionCandidate@581 }
+    <name not found> = ArrayList@1811[1] { ResolutionCandidate@438 }
+    <name not found> = ArrayList@1812[1] { ResolutionCandidate@440 }
+    <name not found> = ArrayList@1813[1] { ResolutionCandidate@593 }
+    <name not found> = ArrayList@1814[1] { ResolutionCandidate@1139 }
+    <name not found> = ArrayList@1815[1] { ResolutionCandidate@668 }
+    <name not found> = ArrayList@1816[1] { ResolutionCandidate@1202 }
+    <name not found> = ArrayList@1817[1] { ResolutionCandidate@448 }
+    <name not found> = ArrayList@1818[1] { ResolutionCandidate@450 }
+    <name not found> = ArrayList@1819[1] { ResolutionCandidate@806 }
+    <name not found> = ArrayList@1820[1] { ResolutionCandidate@812 }
+    <name not found> = ArrayList@1821[1] { ResolutionCandidate@701 }
+    <name not found> = ArrayList@1822[1] { ResolutionCandidate@674 }
+    <name not found> = ArrayList@1823[1] { ResolutionCandidate@1049 }
+    <name not found> = ArrayList@1824[1] { ResolutionCandidate@463 }
+    <name not found> = ArrayList@1825[1] { ResolutionCandidate@465 }
+    <name not found> = ArrayList@1826[1] { ResolutionCandidate@1019 }
+    <name not found> = ArrayList@1827[1] { ResolutionCandidate@770 }
+    <name not found> = ArrayList@1828[1] { ResolutionCandidate@974 }
+    <name not found> = ArrayList@1829[1] { ResolutionCandidate@971 }
+    <name not found> = ArrayList@1830[1] { ResolutionCandidate@388 }
+    <name not found> = ArrayList@1831[1] { ResolutionCandidate@390 }
+    <name not found> = ArrayList@1832[1] { ResolutionCandidate@1205 }
+    <name not found> = ArrayList@1833[1] { ResolutionCandidate@1184 }
+    <name not found> = ArrayList@1834[1] { ResolutionCandidate@608 }
+    <name not found> = ArrayList@1835[1] { ResolutionCandidate@707 }
+    <name not found> = ArrayList@1836[1] { ResolutionCandidate@842 }
+    <name not found> = ArrayList@1837[1] { ResolutionCandidate@1010 }
+    <name not found> = ArrayList@1838[1] { ResolutionCandidate@538 }
+    <name not found> = ArrayList@1839[1] { ResolutionCandidate@540 }
+    <name not found> = ArrayList@1840[1] { ResolutionCandidate@782 }
+    <name not found> = ArrayList@1841[1] { ResolutionCandidate@1106 }
+    <name not found> = ArrayList@1842[1] { ResolutionCandidate@1022 }
+    <name not found> = ArrayList@1843[1] { ResolutionCandidate@809 }
+    <name not found> = ArrayList@1844[1] { ResolutionCandidate@348 }
+    <name not found> = ArrayList@1845[1] { ResolutionCandidate@350 }
+    <name not found> = ArrayList@1846[1] { ResolutionCandidate@1208 }
+    <name not found> = ArrayList@1847[1] { ResolutionCandidate@596 }
+    <name not found> = ArrayList@1848[1] { ResolutionCandidate@983 }
+    <name not found> = ArrayList@1849[1] { ResolutionCandidate@1190 }
+    <name not found> = ArrayList@1850[1] { ResolutionCandidate@878 }
+    <name not found> = ArrayList@1851[1] { ResolutionCandidate@1157 }
+    <name not found> = ArrayList@1852[1] { ResolutionCandidate@1160 }
+    <name not found> = ArrayList@1853[1] { ResolutionCandidate@869 }
+    <name not found> = ArrayList@1854[1] { ResolutionCandidate@1187 }
+    <name not found> = ArrayList@1855[1] { ResolutionCandidate@498 }
+    <name not found> = ArrayList@1856[1] { ResolutionCandidate@500 }
+    <name not found> = ArrayList@1857[1] { ResolutionCandidate@1097 }
+    <name not found> = ArrayList@1858[1] { ResolutionCandidate@1001 }
+    <name not found> = ArrayList@1859[1] { ResolutionCandidate@611 }
+    <name not found> = ArrayList@1860[1] { ResolutionCandidate@1109 }
+    <name not found> = ArrayList@1861[1] { ResolutionCandidate@731 }
+    <name not found> = ArrayList@1862[1] { ResolutionCandidate@433 }
+    <name not found> = ArrayList@1863[1] { ResolutionCandidate@435 }
+    <name not found> = ArrayList@1864[1] { ResolutionCandidate@1211 }
+    <name not found> = ArrayList@1865[1] { ResolutionCandidate@1220 }
+    <name not found> = ArrayList@1866[1] { ResolutionCandidate@884 }
+    <name not found> = ArrayList@1867[1] { ResolutionCandidate@728 }
+    <name not found> = ArrayList@1868[1] { ResolutionCandidate@493 }
+    <name not found> = ArrayList@1869[1] { ResolutionCandidate@495 }
+    <name not found> = ArrayList@1870[1] { ResolutionCandidate@740 }
+    <name not found> = ArrayList@1871[1] { ResolutionCandidate@578 }
+    <name not found> = ArrayList@1872[1] { ResolutionCandidate@1100 }
+    <name not found> = ArrayList@1873[1] { ResolutionCandidate@716 }
+    <name not found> = ArrayList@1874[1] { ResolutionCandidate@1229 }
+    <name not found> = ArrayList@1875[1] { ResolutionCandidate@343 }
+    <name not found> = ArrayList@1876[1] { ResolutionCandidate@345 }
+    <name not found> = ArrayList@1877[1] { ResolutionCandidate@767 }
+    <name not found> = ArrayList@1878[1] { ResolutionCandidate@818 }
+    <name not found> = ArrayList@1879[1] { ResolutionCandidate@638 }
+    <name not found> = ArrayList@1880[1] { ResolutionCandidate@995 }
+    <name not found> = ArrayList@1881[1] { ResolutionCandidate@1262 }
+    <name not found> = ArrayList@1882[1] { ResolutionCandidate@671 }
+    <name not found> = ArrayList@1883[1] { ResolutionCandidate@1034 }
+    <name not found> = ArrayList@1884[1] { ResolutionCandidate@1085 }
+    <name not found> = ArrayList@1885[1] { ResolutionCandidate@368 }
+    <name not found> = ArrayList@1886[1] { ResolutionCandidate@370 }
+    <name not found> = ArrayList@1887[1] { ResolutionCandidate@659 }
+    <name not found> = ArrayList@1888[1] { ResolutionCandidate@923 }
+    <name not found> = ArrayList@1889[1] { ResolutionCandidate@1142 }
+    <name not found> = ArrayList@1890[1] { ResolutionCandidate@1145 }
+    <name not found> = ArrayList@1891[1] { ResolutionCandidate@758 }
+    <name not found> = ArrayList@1892[1] { ResolutionCandidate@845 }
+    <name not found> = ArrayList@1893[1] { ResolutionCandidate@737 }
+    <name not found> = ArrayList@1894[1] { ResolutionCandidate@929 }
+    <name not found> = ArrayList@1895[1] { ResolutionCandidate@1082 }
+    <name not found> = ArrayList@1896[1] { ResolutionCandidate@815 }
+    <name not found> = ArrayList@1897[1] { ResolutionCandidate@1232 }
+    <name not found> = ArrayList@1898[1] { ResolutionCandidate@338 }
+    <name not found> = ArrayList@1899[1] { ResolutionCandidate@340 }
+    <name not found> = ArrayList@1900[1] { ResolutionCandidate@725 }
+    <name not found> = ArrayList@1901[1] { ResolutionCandidate@373 }
+    <name not found> = ArrayList@1902[1] { ResolutionCandidate@375 }
+    <name not found> = ArrayList@1903[1] { ResolutionCandidate@953 }
+    <name not found> = ArrayList@1904[1] { ResolutionCandidate@599 }
+    <name not found> = ArrayList@1905[1] { ResolutionCandidate@1040 }
+    <name not found> = ArrayList@1906[1] { ResolutionCandidate@1178 }
+    <name not found> = ArrayList@1907[1] { ResolutionCandidate@788 }
+    <name not found> = ArrayList@1908[1] { ResolutionCandidate@1148 }
+    <name not found> = ArrayList@1909[1] { ResolutionCandidate@944 }
+    <name not found> = ArrayList@1910[1] { ResolutionCandidate@1112 }
+    <name not found> = ArrayList@1911[1] { ResolutionCandidate@803 }
+    <name not found> = ArrayList@1912[1] { ResolutionCandidate@620 }
+    <name not found> = ArrayList@1913[1] { ResolutionCandidate@1037 }
+    <name not found> = ArrayList@1914[1] { ResolutionCandidate@989 }
+    <name not found> = ArrayList@1915[1] { ResolutionCandidate@1238 }
+    <name not found> = ArrayList@1916[1] { ResolutionCandidate@503 }
+    <name not found> = ArrayList@1917[1] { ResolutionCandidate@505 }
+    <name not found> = ArrayList@1918[1] { ResolutionCandidate@947 }
+    <name not found> = ArrayList@1919[1] { ResolutionCandidate@860 }
+    <name not found> = ArrayList@1920[1] { ResolutionCandidate@761 }
+    <name not found> = ArrayList@1921[1] { ResolutionCandidate@1004 }
+    <name not found> = ArrayList@1922[1] { ResolutionCandidate@1274 }
+    <name not found> = ArrayList@1923[1] { ResolutionCandidate@1016 }
+    <name not found> = ArrayList@1924[1] { ResolutionCandidate@677 }
+    <name not found> = ArrayList@1925[1] { ResolutionCandidate@1064 }
+    <name not found> = ArrayList@1926[1] { ResolutionCandidate@1214 }
+    <name not found> = ArrayList@1927[1] { ResolutionCandidate@1241 }
+    <name not found> = ArrayList@1928[1] { ResolutionCandidate@857 }
+    <name not found> = ArrayList@1929[1] { ResolutionCandidate@1058 }
+    <name not found> = ArrayList@1930[1] { ResolutionCandidate@719 }
+    <name not found> = ArrayList@1931[1] { ResolutionCandidate@398 }
+    <name not found> = ArrayList@1932[1] { ResolutionCandidate@400 }
+    <name not found> = ArrayList@1933[1] { ResolutionCandidate@1070 }
+    <name not found> = ArrayList@1934[1] { ResolutionCandidate@773 }
+    <name not found> = ArrayList@1935[1] { ResolutionCandidate@1052 }
+    <name not found> = ArrayList@1936[1] { ResolutionCandidate@1253 }
+    <name not found> = ArrayList@1937[1] { ResolutionCandidate@1130 }
+    <name not found> = ArrayList@1938[1] { ResolutionCandidate@1115 }
+    <name not found> = ArrayList@1939[1] { ResolutionCandidate@1061 }
+    <name not found> = ArrayList@1940[1] { ResolutionCandidate@1121 }
+    <name not found> = ArrayList@1941[1] { ResolutionCandidate@1043 }
+    <name not found> = ArrayList@1942[1] { ResolutionCandidate@1169 }
+    <name not found> = ArrayList@1943[1] { ResolutionCandidate@800 }
+    <name not found> = ArrayList@1944[1] { ResolutionCandidate@722 }
+    <name not found> = ArrayList@1945[1] { ResolutionCandidate@1067 }
+    <name not found> = ArrayList@1946[1] { ResolutionCandidate@917 }
+    <name not found> = ArrayList@1947[1] { ResolutionCandidate@1217 }
+    <name not found> = ArrayList@1948[1] { ResolutionCandidate@543 }
+    <name not found> = ArrayList@1949[1] { ResolutionCandidate@545 }
+    <name not found> = ArrayList@1950[1] { ResolutionCandidate@1271 }
+    <name not found> = ArrayList@1951[20] { ResolutionCandidate@1365, ResolutionCandidate@1366, ResolutionCandidate@1367, ... }
+    <name not found> = ArrayList@1952[20] { ResolutionCandidate@1395, ResolutionCandidate@1396, ResolutionCandidate@1397, ... }
+    <name not found> = ArrayList@1953[20] { ResolutionCandidate@1340, ResolutionCandidate@1341, ResolutionCandidate@1342, ... }
+    <name not found> = ArrayList@1954[20] { ResolutionCandidate@1320, ResolutionCandidate@1321, ResolutionCandidate@1322, ... }
+    <name not found> = ArrayList@1955[20] { ResolutionCandidate@1360, ResolutionCandidate@1361, ResolutionCandidate@1362, ... }
+    <name not found> = ArrayList@1956[20] { ResolutionCandidate@1370, ResolutionCandidate@1371, ResolutionCandidate@1372, ... }
+    <name not found> = ArrayList@1957[20] { ResolutionCandidate@1325, ResolutionCandidate@1326, ResolutionCandidate@1327, ... }
+    <name not found> = ArrayList@1958[20] { ResolutionCandidate@1390, ResolutionCandidate@1391, ResolutionCandidate@1392, ... }
+    <name not found> = ArrayList@1959[20] { ResolutionCandidate@1295, ResolutionCandidate@1296, ResolutionCandidate@1297, ... }
+    <name not found> = ArrayList@1960[20] { ResolutionCandidate@1290, ResolutionCandidate@1291, ResolutionCandidate@1292, ... }
+    <name not found> = ArrayList@1961[20] { ResolutionCandidate@1375, ResolutionCandidate@1376, ResolutionCandidate@1377, ... }
+    <name not found> = ArrayList@1962[20] { ResolutionCandidate@1305, ResolutionCandidate@1306, ResolutionCandidate@1307, ... }
+    <name not found> = ArrayList@1963[20] { ResolutionCandidate@1400, ResolutionCandidate@1401, ResolutionCandidate@1402, ... }
+    <name not found> = ArrayList@1964[20] { ResolutionCandidate@1310, ResolutionCandidate@1311, ResolutionCandidate@1312, ... }
+    <name not found> = ArrayList@1965[20] { ResolutionCandidate@1385, ResolutionCandidate@1386, ResolutionCandidate@1387, ... }
+    <name not found> = ArrayList@1966[20] { ResolutionCandidate@1335, ResolutionCandidate@1336, ResolutionCandidate@1337, ... }
+    <name not found> = ArrayList@1967[20] { ResolutionCandidate@1330, ResolutionCandidate@1331, ResolutionCandidate@1332, ... }
+    <name not found> = ArrayList@1968[20] { ResolutionCandidate@1350, ResolutionCandidate@1351, ResolutionCandidate@1352, ... }
+    <name not found> = ArrayList@1969[20] { ResolutionCandidate@1300, ResolutionCandidate@1301, ResolutionCandidate@1302, ... }
+    <name not found> = ArrayList@1970[20] { ResolutionCandidate@1285, ResolutionCandidate@1286, ResolutionCandidate@1287, ... }
+    <name not found> = ArrayList@1971[20] { ResolutionCandidate@1315, ResolutionCandidate@1316, ResolutionCandidate@1317, ... }
+    <name not found> = ArrayList@1972[20] { ResolutionCandidate@1355, ResolutionCandidate@1356, ResolutionCandidate@1357, ... }
+    <name not found> = ArrayList@1973[20] { ResolutionCandidate@1380, ResolutionCandidate@1381, ResolutionCandidate@1382, ... }
+    <name not found> = ArrayList@1974[20] { ResolutionCandidate@1345, ResolutionCandidate@1346, ResolutionCandidate@1347, ... }
+    <name not found> = ArrayList@1975[20] { ResolutionCandidate@1280, ResolutionCandidate@1281, ResolutionCandidate@1282, ... }
+    <name not found> = ArrayList@1976[2] { ResolutionCandidate@1441, ResolutionCandidate@1442 }
+    <name not found> = ArrayList@1977[2] { ResolutionCandidate@1413, ResolutionCandidate@1414 }
+    <name not found> = ArrayList@1978[2] { ResolutionCandidate@1421, ResolutionCandidate@1422 }
+    <name not found> = ArrayList@1979[2] { ResolutionCandidate@1405, ResolutionCandidate@1406 }
+    <name not found> = ArrayList@1980[2] { ResolutionCandidate@1433, ResolutionCandidate@1434 }
+    <name not found> = ArrayList@1981[2] { ResolutionCandidate@1449, ResolutionCandidate@1450 }
+    <name not found> = ArrayList@1982[2] { ResolutionCandidate@1429, ResolutionCandidate@1430 }
+    <name not found> = ArrayList@1983[2] { ResolutionCandidate@1453, ResolutionCandidate@1454 }
+    <name not found> = ArrayList@1984[2] { ResolutionCandidate@1425, ResolutionCandidate@1426 }
+    <name not found> = ArrayList@1985[2] { ResolutionCandidate@1417, ResolutionCandidate@1418 }
+    <name not found> = ArrayList@1986[2] { ResolutionCandidate@1461, ResolutionCandidate@1462 }
+    <name not found> = ArrayList@1987[2] { ResolutionCandidate@1469, ResolutionCandidate@1470 }
+    <name not found> = ArrayList@1988[2] { ResolutionCandidate@1437, ResolutionCandidate@1438 }
+    <name not found> = ArrayList@1989[2] { ResolutionCandidate@1445, ResolutionCandidate@1446 }
+    <name not found> = ArrayList@1990[2] { ResolutionCandidate@1465, ResolutionCandidate@1466 }
+    <name not found> = ArrayList@1991[2] { ResolutionCandidate@1457, ResolutionCandidate@1458 }
+    <name not found> = ArrayList@1992[2] { ResolutionCandidate@1409, ResolutionCandidate@1410 }
+    <name not found> = ArrayList@1993[3] { ResolutionCandidate@1493, ResolutionCandidate@1494, ResolutionCandidate@1495 }
+    <name not found> = ArrayList@1994[3] { ResolutionCandidate@1488, ResolutionCandidate@1489, ResolutionCandidate@1490 }
+    <name not found> = ArrayList@1995[3] { ResolutionCandidate@1473, ResolutionCandidate@1474, ResolutionCandidate@1475 }
+    <name not found> = ArrayList@1996[3] { ResolutionCandidate@1478, ResolutionCandidate@1479, ResolutionCandidate@1480 }
+    <name not found> = ArrayList@1997[3] { ResolutionCandidate@1483, ResolutionCandidate@1484, ResolutionCandidate@1485 }
+    <name not found> = ArrayList@1998[6] { ResolutionCandidate@1508, ResolutionCandidate@1509, ResolutionCandidate@1510, ... }
+    <name not found> = ArrayList@1999[6] { ResolutionCandidate@1503, ResolutionCandidate@1504, ResolutionCandidate@1505, ... }
+    <name not found> = ArrayList@2000[6] { ResolutionCandidate@1518, ResolutionCandidate@1519, ResolutionCandidate@1520, ... }
+    <name not found> = ArrayList@2001[6] { ResolutionCandidate@1513, ResolutionCandidate@1514, ResolutionCandidate@1515, ... }
+    <name not found> = ArrayList@2002[6] { ResolutionCandidate@1523, ResolutionCandidate@1524, ResolutionCandidate@1525, ... }
+    <name not found> = ArrayList@2003[6] { ResolutionCandidate@1498, ResolutionCandidate@1499, ResolutionCandidate@1500, ... }
+    <name not found> = ArrayList@2004[7] { ResolutionCandidate@1533, ResolutionCandidate@1534, ResolutionCandidate@1535, ... }
+    <name not found> = ArrayList@2005[7] { ResolutionCandidate@1528, ResolutionCandidate@1529, ResolutionCandidate@1530, ... }
+    <name not found> = ArrayList@2006[7] { ResolutionCandidate@1553, ResolutionCandidate@1554, ResolutionCandidate@1555, ... }
+    <name not found> = ArrayList@2007[7] { ResolutionCandidate@1548, ResolutionCandidate@1549, ResolutionCandidate@1550, ... }
+    <name not found> = ArrayList@2008[7] { ResolutionCandidate@1558, ResolutionCandidate@1559, ResolutionCandidate@1560, ... }
+    <name not found> = ArrayList@2009[7] { ResolutionCandidate@1538, ResolutionCandidate@1539, ResolutionCandidate@1540, ... }
+    <name not found> = ArrayList@2010[7] { ResolutionCandidate@1543, ResolutionCandidate@1544, ResolutionCandidate@1545, ... }
+    <name not found> = ArrayList@2011[8] { ResolutionCandidate@1583, ResolutionCandidate@1584, ResolutionCandidate@1585, ... }
+    <name not found> = ArrayList@2012[8] { ResolutionCandidate@1568, ResolutionCandidate@1569, ResolutionCandidate@1570, ... }
+    <name not found> = ArrayList@2013[8] { ResolutionCandidate@1578, ResolutionCandidate@1579, ResolutionCandidate@1580, ... }
+    <name not found> = ArrayList@2014[8] { ResolutionCandidate@1573, ResolutionCandidate@1574, ResolutionCandidate@1575, ... }
+    <name not found> = ArrayList@2015[8] { ResolutionCandidate@1563, ResolutionCandidate@1564, ResolutionCandidate@1565, ... }
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
@@ -2609,114 +2722,4 @@ ResolutionTaskHolder@1878 {
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@1884 {
-    <name not found> = ArrayList@1885[3] { ResolutionCandidate@1886, ResolutionCandidate@1887, ResolutionCandidate@1888 }
-    <name not found> = ArrayList@1889[3] { ResolutionCandidate@1886, ResolutionCandidate@1887, ResolutionCandidate@1888 }
-}
-
-ResolutionTaskHolder@1890 {
-    <name not found> = ArrayList@1891[3] { ResolutionCandidate@1892, ResolutionCandidate@1893, ResolutionCandidate@1894 }
-    <name not found> = ArrayList@1895[3] { ResolutionCandidate@1892, ResolutionCandidate@1893, ResolutionCandidate@1894 }
-}
-
-ResolutionTaskHolder@1896 {
-    <name not found> = ArrayList@1897[3] { ResolutionCandidate@1898, ResolutionCandidate@1899, ResolutionCandidate@1900 }
-    <name not found> = ArrayList@1901[3] { ResolutionCandidate@1898, ResolutionCandidate@1899, ResolutionCandidate@1900 }
-}
-
-ResolutionTaskHolder@1902 {
-    <name not found> = ArrayList@1903[3] { ResolutionCandidate@1904, ResolutionCandidate@1905, ResolutionCandidate@1906 }
-    <name not found> = ArrayList@1907[3] { ResolutionCandidate@1904, ResolutionCandidate@1905, ResolutionCandidate@1906 }
-}
-
-ResolutionTaskHolder@1908 {
-    <name not found> = ArrayList@1909[6] { ResolutionCandidate@1910, ResolutionCandidate@1911, ResolutionCandidate@1912, ... }
-    <name not found> = ArrayList@1913[6] { ResolutionCandidate@1910, ResolutionCandidate@1911, ResolutionCandidate@1912, ... }
-}
-
-ResolutionTaskHolder@1914 {
-    <name not found> = ArrayList@1915[6] { ResolutionCandidate@1916, ResolutionCandidate@1917, ResolutionCandidate@1918, ... }
-    <name not found> = ArrayList@1919[6] { ResolutionCandidate@1916, ResolutionCandidate@1917, ResolutionCandidate@1918, ... }
-}
-
-ResolutionTaskHolder@1920 {
-    <name not found> = ArrayList@1921[6] { ResolutionCandidate@1922, ResolutionCandidate@1923, ResolutionCandidate@1924, ... }
-    <name not found> = ArrayList@1925[6] { ResolutionCandidate@1922, ResolutionCandidate@1923, ResolutionCandidate@1924, ... }
-}
-
-ResolutionTaskHolder@1926 {
-    <name not found> = ArrayList@1927[6] { ResolutionCandidate@1928, ResolutionCandidate@1929, ResolutionCandidate@1930, ... }
-    <name not found> = ArrayList@1931[6] { ResolutionCandidate@1928, ResolutionCandidate@1929, ResolutionCandidate@1930, ... }
-}
-
-ResolutionTaskHolder@1932 {
-    <name not found> = ArrayList@1933[6] { ResolutionCandidate@1934, ResolutionCandidate@1935, ResolutionCandidate@1936, ... }
-    <name not found> = ArrayList@1937[6] { ResolutionCandidate@1934, ResolutionCandidate@1935, ResolutionCandidate@1936, ... }
-}
-
-ResolutionTaskHolder@1938 {
-    <name not found> = ArrayList@1939[6] { ResolutionCandidate@1940, ResolutionCandidate@1941, ResolutionCandidate@1942, ... }
-    <name not found> = ArrayList@1943[6] { ResolutionCandidate@1940, ResolutionCandidate@1941, ResolutionCandidate@1942, ... }
-}
-
-ResolutionTaskHolder@1944 {
-    <name not found> = ArrayList@1945[7] { ResolutionCandidate@1946, ResolutionCandidate@1947, ResolutionCandidate@1948, ... }
-    <name not found> = ArrayList@1949[7] { ResolutionCandidate@1946, ResolutionCandidate@1947, ResolutionCandidate@1948, ... }
-}
-
-ResolutionTaskHolder@1950 {
-    <name not found> = ArrayList@1951[7] { ResolutionCandidate@1952, ResolutionCandidate@1953, ResolutionCandidate@1954, ... }
-    <name not found> = ArrayList@1955[7] { ResolutionCandidate@1952, ResolutionCandidate@1953, ResolutionCandidate@1954, ... }
-}
-
-ResolutionTaskHolder@1956 {
-    <name not found> = ArrayList@1957[7] { ResolutionCandidate@1958, ResolutionCandidate@1959, ResolutionCandidate@1960, ... }
-    <name not found> = ArrayList@1961[7] { ResolutionCandidate@1958, ResolutionCandidate@1959, ResolutionCandidate@1960, ... }
-}
-
-ResolutionTaskHolder@1962 {
-    <name not found> = ArrayList@1963[7] { ResolutionCandidate@1964, ResolutionCandidate@1965, ResolutionCandidate@1966, ... }
-    <name not found> = ArrayList@1967[7] { ResolutionCandidate@1964, ResolutionCandidate@1965, ResolutionCandidate@1966, ... }
-}
-
-ResolutionTaskHolder@1968 {
-    <name not found> = ArrayList@1969[7] { ResolutionCandidate@1970, ResolutionCandidate@1971, ResolutionCandidate@1972, ... }
-    <name not found> = ArrayList@1973[7] { ResolutionCandidate@1970, ResolutionCandidate@1971, ResolutionCandidate@1972, ... }
-}
-
-ResolutionTaskHolder@1974 {
-    <name not found> = ArrayList@1975[7] { ResolutionCandidate@1976, ResolutionCandidate@1977, ResolutionCandidate@1978, ... }
-    <name not found> = ArrayList@1979[7] { ResolutionCandidate@1976, ResolutionCandidate@1977, ResolutionCandidate@1978, ... }
-}
-
-ResolutionTaskHolder@1980 {
-    <name not found> = ArrayList@1981[7] { ResolutionCandidate@1982, ResolutionCandidate@1983, ResolutionCandidate@1984, ... }
-    <name not found> = ArrayList@1985[7] { ResolutionCandidate@1982, ResolutionCandidate@1983, ResolutionCandidate@1984, ... }
-}
-
-ResolutionTaskHolder@1986 {
-    <name not found> = ArrayList@1987[8] { ResolutionCandidate@1988, ResolutionCandidate@1989, ResolutionCandidate@1990, ... }
-    <name not found> = ArrayList@1991[8] { ResolutionCandidate@1988, ResolutionCandidate@1989, ResolutionCandidate@1990, ... }
-}
-
-ResolutionTaskHolder@1992 {
-    <name not found> = ArrayList@1993[8] { ResolutionCandidate@1994, ResolutionCandidate@1995, ResolutionCandidate@1996, ... }
-    <name not found> = ArrayList@1997[8] { ResolutionCandidate@1994, ResolutionCandidate@1995, ResolutionCandidate@1996, ... }
-}
-
-ResolutionTaskHolder@1998 {
-    <name not found> = ArrayList@1999[8] { ResolutionCandidate@2000, ResolutionCandidate@2001, ResolutionCandidate@2002, ... }
-    <name not found> = ArrayList@2003[8] { ResolutionCandidate@2000, ResolutionCandidate@2001, ResolutionCandidate@2002, ... }
-}
-
-ResolutionTaskHolder@2004 {
-    <name not found> = ArrayList@2005[8] { ResolutionCandidate@2006, ResolutionCandidate@2007, ResolutionCandidate@2008, ... }
-    <name not found> = ArrayList@2009[8] { ResolutionCandidate@2006, ResolutionCandidate@2007, ResolutionCandidate@2008, ... }
-}
-
-ResolutionTaskHolder@2010 {
-    <name not found> = ArrayList@2011[8] { ResolutionCandidate@2012, ResolutionCandidate@2013, ResolutionCandidate@2014, ... }
-    <name not found> = ArrayList@2015[8] { ResolutionCandidate@2012, ResolutionCandidate@2013, ResolutionCandidate@2014, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/OverrideFunctionWithParamDefaultValue.lazy.log b/compiler/testData/diagnostics/tests/OverrideFunctionWithParamDefaultValue.lazy.log
index a0de1a0c2a3..c882889d69f 100644
--- a/compiler/testData/diagnostics/tests/OverrideFunctionWithParamDefaultValue.lazy.log
+++ b/compiler/testData/diagnostics/tests/OverrideFunctionWithParamDefaultValue.lazy.log
@@ -38,24 +38,27 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@29 {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
+}
+
+null {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@40 }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/OverridenFunctionAndSpecifiedTypeParameter.lazy.log b/compiler/testData/diagnostics/tests/OverridenFunctionAndSpecifiedTypeParameter.lazy.log
index 38412ff5c13..bfae5101ac5 100644
--- a/compiler/testData/diagnostics/tests/OverridenFunctionAndSpecifiedTypeParameter.lazy.log
+++ b/compiler/testData/diagnostics/tests/OverridenFunctionAndSpecifiedTypeParameter.lazy.log
@@ -45,19 +45,22 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@36 {
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
+}
+
+null {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@44 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/OverridingVarByVal.lazy.log b/compiler/testData/diagnostics/tests/OverridingVarByVal.lazy.log
index cec1d7f71c8..28606cb3e68 100644
--- a/compiler/testData/diagnostics/tests/OverridingVarByVal.lazy.log
+++ b/compiler/testData/diagnostics/tests/OverridingVarByVal.lazy.log
@@ -35,10 +35,13 @@ LazyJavaPackageFragment@11['java'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
+}
+
+null {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@33 }
 }
diff --git a/compiler/testData/diagnostics/tests/PackageAsExpression.lazy.log b/compiler/testData/diagnostics/tests/PackageAsExpression.lazy.log
index 6934818855f..3bd852c01de 100644
--- a/compiler/testData/diagnostics/tests/PackageAsExpression.lazy.log
+++ b/compiler/testData/diagnostics/tests/PackageAsExpression.lazy.log
@@ -37,6 +37,9 @@ ResolutionTaskHolder@25 {
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
+}
+
+null {
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/PackageInExpressionPosition.lazy.log b/compiler/testData/diagnostics/tests/PackageInExpressionPosition.lazy.log
index b123fbdc08b..18aa7532012 100644
--- a/compiler/testData/diagnostics/tests/PackageInExpressionPosition.lazy.log
+++ b/compiler/testData/diagnostics/tests/PackageInExpressionPosition.lazy.log
@@ -82,10 +82,6 @@ LazyJavaPackageFragment@45['lang'] {
 
 ResolutionTaskHolder@72 {
     <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
@@ -103,19 +99,60 @@ ResolutionTaskHolder@72 {
     <name not found> = EmptyList@64[empty]
 }
 
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
+}
+
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
 }
 
 ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+}
+
+ResolutionTaskHolder@85 {
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+}
+
+ResolutionTaskHolder@86 {
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+}
+
+ResolutionTaskHolder@87 {
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
 }
 
 ResolutionTaskHolder@88 {
@@ -127,8 +164,6 @@ ResolutionTaskHolder@88 {
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
 }
 
 ResolutionTaskHolder@89 {
@@ -140,8 +175,6 @@ ResolutionTaskHolder@89 {
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
 }
 
 ResolutionTaskHolder@90 {
@@ -153,8 +186,6 @@ ResolutionTaskHolder@90 {
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
 }
 
 ResolutionTaskHolder@91 {
@@ -166,8 +197,6 @@ ResolutionTaskHolder@91 {
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
 }
 
 ResolutionTaskHolder@92 {
@@ -179,8 +208,6 @@ ResolutionTaskHolder@92 {
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
 }
 
 ResolutionTaskHolder@93 {
@@ -192,8 +219,6 @@ ResolutionTaskHolder@93 {
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
 }
 
 ResolutionTaskHolder@94 {
@@ -205,8 +230,6 @@ ResolutionTaskHolder@94 {
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
 }
 
 ResolutionTaskHolder@95 {
@@ -218,8 +241,6 @@ ResolutionTaskHolder@95 {
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
 }
 
 ResolutionTaskHolder@96 {
@@ -231,8 +252,6 @@ ResolutionTaskHolder@96 {
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
 }
 
 ResolutionTaskHolder@97 {
@@ -244,8 +263,6 @@ ResolutionTaskHolder@97 {
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
 }
 
 ResolutionTaskHolder@98 {
@@ -257,8 +274,6 @@ ResolutionTaskHolder@98 {
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
 }
 
 ResolutionTaskHolder@99 {
@@ -270,8 +285,6 @@ ResolutionTaskHolder@99 {
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
 }
 
 ResolutionTaskHolder@100 {
@@ -283,8 +296,6 @@ ResolutionTaskHolder@100 {
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
 }
 
 ResolutionTaskHolder@101 {
@@ -296,8 +307,6 @@ ResolutionTaskHolder@101 {
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
 }
 
 ResolutionTaskHolder@102 {
@@ -309,8 +318,6 @@ ResolutionTaskHolder@102 {
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
 }
 
 ResolutionTaskHolder@103 {
@@ -322,8 +329,6 @@ ResolutionTaskHolder@103 {
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
 }
 
 ResolutionTaskHolder@104 {
@@ -335,8 +340,6 @@ ResolutionTaskHolder@104 {
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
 }
 
 ResolutionTaskHolder@105 {
@@ -348,8 +351,6 @@ ResolutionTaskHolder@105 {
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
 }
 
 ResolutionTaskHolder@106 {
@@ -361,8 +362,6 @@ ResolutionTaskHolder@106 {
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
 }
 
 ResolutionTaskHolder@107 {
@@ -374,8 +373,6 @@ ResolutionTaskHolder@107 {
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
 }
 
 ResolutionTaskHolder@108 {
@@ -387,8 +384,6 @@ ResolutionTaskHolder@108 {
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
 }
 
 ResolutionTaskHolder@109 {
@@ -400,50 +395,58 @@ ResolutionTaskHolder@109 {
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
 }
 
-ResolutionTaskHolder@110 {
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-}
-
-ResolutionTaskHolder@113 {
+null {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@80 }
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
diff --git a/compiler/testData/diagnostics/tests/PackageQualified.lazy.log b/compiler/testData/diagnostics/tests/PackageQualified.lazy.log
index c1c5497730c..a327dbd9341 100644
--- a/compiler/testData/diagnostics/tests/PackageQualified.lazy.log
+++ b/compiler/testData/diagnostics/tests/PackageQualified.lazy.log
@@ -129,31 +129,22 @@ LazyJavaPackageFragment@60['lang'] {
 LazyJavaPackageFragment@74['util'] {
     classes('Int': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@113
     classes('List': Name@114) = LazyJavaClassDescriptor@7['List'] // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('a': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('util': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@113
+    classes('a': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@113
+    classes('util': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@113
     deserializedPackageScope = Empty@100 // through LazyPackageFragmentScopeForJavaPackage@113
 }
 
 LazyJavaTypeParameterDescriptor@10['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@115
-    upperBounds = LinkedHashSet@116[1] { NullableType@117 }
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@117
+    upperBounds = LinkedHashSet@118[1] { NullableType@119 }
 }
 
-LazyJavaTypeParameterResolver@118 {
-    resolve(JavaTypeParameterImpl@119['E']) = LazyJavaTypeParameterDescriptor@10['E']
+LazyJavaTypeParameterResolver@120 {
+    resolve(JavaTypeParameterImpl@121['E']) = LazyJavaTypeParameterDescriptor@10['E']
 }
 
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
+ResolutionTaskHolder@122 {
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
     <name not found> = EmptyList@102[empty]
     <name not found> = EmptyList@102[empty]
     <name not found> = EmptyList@102[empty]
@@ -164,175 +155,130 @@ ResolutionTaskHolder@120 {
     <name not found> = EmptyList@102[empty]
 }
 
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@126 }
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
+ResolutionTaskHolder@125 {
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
     <name not found> = EmptyList@102[empty]
     <name not found> = EmptyList@102[empty]
 }
 
 ResolutionTaskHolder@128 {
     <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
     <name not found> = EmptyList@102[empty]
     <name not found> = EmptyList@102[empty]
 }
 
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
-    <name not found> = EmptyList@102[empty]
+ResolutionTaskHolder@131 {
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
     <name not found> = EmptyList@102[empty]
 }
 
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
+ResolutionTaskHolder@134 {
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
     <name not found> = EmptyList@102[empty]
+}
+
+ResolutionTaskHolder@137 {
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
     <name not found> = EmptyList@102[empty]
 }
 
 ResolutionTaskHolder@140 {
     <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
-    <name not found> = EmptyList@102[empty]
     <name not found> = EmptyList@102[empty]
 }
 
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
-    <name not found> = EmptyList@102[empty]
+ResolutionTaskHolder@143 {
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
     <name not found> = EmptyList@102[empty]
 }
 
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
+ResolutionTaskHolder@146 {
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
     <name not found> = EmptyList@102[empty]
+}
+
+ResolutionTaskHolder@149 {
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
     <name not found> = EmptyList@102[empty]
 }
 
 ResolutionTaskHolder@152 {
     <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
 }
 
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
+ResolutionTaskHolder@155 {
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
 }
 
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@162 }
+ResolutionTaskHolder@158 {
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
+}
+
+ResolutionTaskHolder@161 {
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
 }
 
 ResolutionTaskHolder@164 {
     <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@166 }
 }
 
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@170 }
+ResolutionTaskHolder@167 {
+    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
 }
 
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@174 }
+ResolutionTaskHolder@170 {
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
+}
+
+ResolutionTaskHolder@173 {
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
 }
 
 ResolutionTaskHolder@176 {
     <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@178 }
 }
 
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@182 }
+ResolutionTaskHolder@179 {
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
 }
 
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@186 }
+ResolutionTaskHolder@182 {
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
+}
+
+ResolutionTaskHolder@185 {
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
 }
 
 ResolutionTaskHolder@188 {
     <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@190 }
 }
 
-ResolutionTaskHolder@192 {
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@194 }
+ResolutionTaskHolder@191 {
+    <name not found> = ArrayList@192[1] { ResolutionCandidate@193 }
 }
 
-ResolutionTaskHolder@196 {
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@198 }
+ResolutionTaskHolder@194 {
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@196 }
+}
+
+ResolutionTaskHolder@197 {
+    <name not found> = ArrayList@198[1] { ResolutionCandidate@199 }
 }
 
 ResolutionTaskHolder@200 {
     <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@202 }
 }
 
-ResolutionTaskHolder@204 {
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@206 }
+ResolutionTaskHolder@203 {
+    <name not found> = ArrayList@204[1] { ResolutionCandidate@205 }
 }
 
-ResolutionTaskHolder@208 {
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@210 }
+ResolutionTaskHolder@206 {
+    <name not found> = ArrayList@207[1] { ResolutionCandidate@208 }
 }
 
-ResolutionTaskHolder@212 {
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@214 }
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@214 }
-}
-
-ResolutionTaskHolder@216 {
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@218 }
-}
-
-ResolutionTaskHolder@220 {
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@222 }
-}
-
-ResolutionTaskHolder@224 {
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@226 }
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@226 }
-}
-
-ResolutionTaskHolder@228 {
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@230 }
-}
-
-ResolutionTaskHolder@232 {
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@234 }
-}
-
-ResolutionTaskHolder@236 {
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
+ResolutionTaskHolder@209 {
     <name not found> = EmptyList@102[empty]
     <name not found> = EmptyList@102[empty]
     <name not found> = EmptyList@102[empty]
@@ -359,9 +305,7 @@ ResolutionTaskHolder@236 {
     <name not found> = EmptyList@102[empty]
 }
 
-ResolutionTaskHolder@237 {
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
+ResolutionTaskHolder@210 {
     <name not found> = EmptyList@102[empty]
     <name not found> = EmptyList@102[empty]
     <name not found> = EmptyList@102[empty]
@@ -372,7 +316,66 @@ ResolutionTaskHolder@237 {
     <name not found> = EmptyList@102[empty]
 }
 
-ResolutionTaskHolder@238 {
+ResolutionTaskHolder@211 {
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+}
+
+null {
+    <name not found> = ArrayList@212[1] { ResolutionCandidate@148 }
+    <name not found> = ArrayList@213[1] { ResolutionCandidate@142 }
+    <name not found> = ArrayList@214[1] { ResolutionCandidate@172 }
+    <name not found> = ArrayList@215[1] { ResolutionCandidate@202 }
+    <name not found> = ArrayList@216[1] { ResolutionCandidate@139 }
+    <name not found> = ArrayList@217[1] { ResolutionCandidate@151 }
+    <name not found> = ArrayList@218[1] { ResolutionCandidate@133 }
+    <name not found> = ArrayList@219[1] { ResolutionCandidate@136 }
+    <name not found> = ArrayList@220[1] { ResolutionCandidate@193 }
+    <name not found> = ArrayList@221[1] { ResolutionCandidate@127 }
+    <name not found> = ArrayList@222[1] { ResolutionCandidate@145 }
+    <name not found> = ArrayList@223[1] { ResolutionCandidate@124 }
+    <name not found> = ArrayList@224[1] { ResolutionCandidate@169 }
+    <name not found> = ArrayList@225[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@226[1] { ResolutionCandidate@166 }
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@154 }
+    <name not found> = ArrayList@228[1] { ResolutionCandidate@184 }
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@196 }
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@181 }
+    <name not found> = ArrayList@231[1] { ResolutionCandidate@178 }
+    <name not found> = ArrayList@232[1] { ResolutionCandidate@199 }
+    <name not found> = ArrayList@233[1] { ResolutionCandidate@208 }
+    <name not found> = ArrayList@234[1] { ResolutionCandidate@205 }
+    <name not found> = ArrayList@235[1] { ResolutionCandidate@187 }
+    <name not found> = ArrayList@236[1] { ResolutionCandidate@163 }
+    <name not found> = ArrayList@237[1] { ResolutionCandidate@160 }
+    <name not found> = ArrayList@238[1] { ResolutionCandidate@175 }
+    <name not found> = ArrayList@239[1] { ResolutionCandidate@157 }
+    <name not found> = ArrayList@240[1] { ResolutionCandidate@190 }
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
     <name not found> = EmptyList@102[empty]
     <name not found> = EmptyList@102[empty]
     <name not found> = EmptyList@102[empty]
diff --git a/compiler/testData/diagnostics/tests/PrimaryConstructors.lazy.log b/compiler/testData/diagnostics/tests/PrimaryConstructors.lazy.log
index e9ef52f68d7..1f0f4dec9f6 100644
--- a/compiler/testData/diagnostics/tests/PrimaryConstructors.lazy.log
+++ b/compiler/testData/diagnostics/tests/PrimaryConstructors.lazy.log
@@ -60,14 +60,14 @@ LazyJavaClassifierType@32['String'] {
 
 LazyJavaClassifierType@35['String'] {
     arguments = ArrayList@36[empty]
-    classifier = JavaClassImpl@29['String']
+    classifier = JavaClassImpl@34['String']
     nullable = 'true': Boolean@37
     typeConstructor = DeserializedClassTypeConstructor@31
 }
 
 LazyJavaClassifierType@38['String'] {
     arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@34['String']
+    classifier = JavaClassImpl@29['String']
     nullable = 'true': Boolean@37
     typeConstructor = DeserializedClassTypeConstructor@31
 }
@@ -88,14 +88,14 @@ LazyJavaClassifierType@44['Throwable'] {
 
 LazyJavaClassifierType@47['Throwable'] {
     arguments = ArrayList@48[empty]
-    classifier = JavaClassImpl@42['Throwable']
+    classifier = JavaClassImpl@46['Throwable']
     nullable = 'true': Boolean@37
     typeConstructor = DeserializedClassTypeConstructor@43
 }
 
 LazyJavaClassifierType@49['Throwable'] {
     arguments = ArrayList@50[empty]
-    classifier = JavaClassImpl@46['Throwable']
+    classifier = JavaClassImpl@42['Throwable']
     nullable = 'true': Boolean@37
     typeConstructor = DeserializedClassTypeConstructor@43
 }
@@ -171,37 +171,40 @@ LazyJavaPackageFragment@69['lang'] {
 
 ResolutionTaskHolder@102 {
     <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+}
+
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
+}
+
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[4] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
 }
 
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[4] { ResolutionCandidate@112, ResolutionCandidate@113, ResolutionCandidate@114, ... }
-    <name not found> = ArrayList@115[4] { ResolutionCandidate@112, ResolutionCandidate@113, ResolutionCandidate@114, ... }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
+null {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@115[4] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
diff --git a/compiler/testData/diagnostics/tests/ProjectionOnFunctionArgumentErrror.lazy.log b/compiler/testData/diagnostics/tests/ProjectionOnFunctionArgumentErrror.lazy.log
index 3526a42c6ea..7b38654fc0f 100644
--- a/compiler/testData/diagnostics/tests/ProjectionOnFunctionArgumentErrror.lazy.log
+++ b/compiler/testData/diagnostics/tests/ProjectionOnFunctionArgumentErrror.lazy.log
@@ -34,5 +34,8 @@ LazyJavaPackageFragment@7['lang'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
+}
+
+null {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
 }
diff --git a/compiler/testData/diagnostics/tests/Properties.lazy.log b/compiler/testData/diagnostics/tests/Properties.lazy.log
index adb882bc746..f54669f124a 100644
--- a/compiler/testData/diagnostics/tests/Properties.lazy.log
+++ b/compiler/testData/diagnostics/tests/Properties.lazy.log
@@ -49,154 +49,157 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@37 {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@34[empty]
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@34[empty]
+}
+
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
     <name not found> = EmptyList@34[empty]
 }
 
 ResolutionTaskHolder@49 {
     <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@34[empty]
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@34[empty]
+}
+
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
     <name not found> = EmptyList@34[empty]
 }
 
 ResolutionTaskHolder@61 {
     <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@34[empty]
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
     <name not found> = EmptyList@34[empty]
+}
+
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
     <name not found> = EmptyList@34[empty]
 }
 
 ResolutionTaskHolder@73 {
     <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@34[empty]
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
     <name not found> = EmptyList@34[empty]
+}
+
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
     <name not found> = EmptyList@34[empty]
 }
 
 ResolutionTaskHolder@85 {
     <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
+}
+
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
 }
 
 ResolutionTaskHolder@97 {
     <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
+}
+
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
+}
+
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[8] { ResolutionCandidate@105, ResolutionCandidate@106, ResolutionCandidate@107, ... }
+}
+
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[8] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
+}
+
+null {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@135[8] { ResolutionCandidate@105, ResolutionCandidate@106, ResolutionCandidate@107, ... }
+    <name not found> = ArrayList@136[8] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[8] { ResolutionCandidate@127, ResolutionCandidate@128, ResolutionCandidate@129, ... }
-    <name not found> = ArrayList@130[8] { ResolutionCandidate@127, ResolutionCandidate@128, ResolutionCandidate@129, ... }
-}
-
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[8] { ResolutionCandidate@133, ResolutionCandidate@134, ResolutionCandidate@135, ... }
-    <name not found> = ArrayList@136[8] { ResolutionCandidate@133, ResolutionCandidate@134, ResolutionCandidate@135, ... }
-}
diff --git a/compiler/testData/diagnostics/tests/PropertyInitializers.lazy.log b/compiler/testData/diagnostics/tests/PropertyInitializers.lazy.log
index 16cf6b75439..fec69421a91 100644
--- a/compiler/testData/diagnostics/tests/PropertyInitializers.lazy.log
+++ b/compiler/testData/diagnostics/tests/PropertyInitializers.lazy.log
@@ -45,41 +45,23 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@33 {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[8] { ResolutionCandidate@47, ResolutionCandidate@48, ResolutionCandidate@49, ... }
-    <name not found> = ArrayList@50[8] { ResolutionCandidate@47, ResolutionCandidate@48, ResolutionCandidate@49, ... }
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[8] { ResolutionCandidate@44, ResolutionCandidate@45, ResolutionCandidate@46, ... }
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@47 {
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
@@ -130,13 +112,7 @@ ResolutionTaskHolder@51 {
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@48 {
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
@@ -162,3 +138,30 @@ ResolutionTaskHolder@52 {
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
+
+null {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@52[8] { ResolutionCandidate@44, ResolutionCandidate@45, ResolutionCandidate@46, ... }
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/QualifiedExpressions.lazy.log b/compiler/testData/diagnostics/tests/QualifiedExpressions.lazy.log
index b49c9e6b43b..f2807934cb8 100644
--- a/compiler/testData/diagnostics/tests/QualifiedExpressions.lazy.log
+++ b/compiler/testData/diagnostics/tests/QualifiedExpressions.lazy.log
@@ -40,109 +40,112 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@33 {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+}
+
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
 }
 
 ResolutionTaskHolder@45 {
     <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
+}
+
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
 }
 
 ResolutionTaskHolder@57 {
     <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
+}
+
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
 }
 
 ResolutionTaskHolder@69 {
     <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
+}
+
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
 }
 
 ResolutionTaskHolder@81 {
     <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
 }
 
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
+}
+
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
 }
 
 ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@94[8] { ResolutionCandidate@95, ResolutionCandidate@96, ResolutionCandidate@97, ... }
 }
 
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[8] { ResolutionCandidate@115, ResolutionCandidate@116, ResolutionCandidate@117, ... }
-    <name not found> = ArrayList@118[8] { ResolutionCandidate@115, ResolutionCandidate@116, ResolutionCandidate@117, ... }
+null {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@118[8] { ResolutionCandidate@95, ResolutionCandidate@96, ResolutionCandidate@97, ... }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/RecursiveTypeInference.lazy.log b/compiler/testData/diagnostics/tests/RecursiveTypeInference.lazy.log
index cb1c67829c8..190839068d5 100644
--- a/compiler/testData/diagnostics/tests/RecursiveTypeInference.lazy.log
+++ b/compiler/testData/diagnostics/tests/RecursiveTypeInference.lazy.log
@@ -8,7 +8,7 @@ DescriptorResolver@0 {
     <name not found> = ErrorTypeImpl@3
     <name not found> = JetTypeImpl@4['Int']
     <name not found> = JetTypeImpl@5['Int']
-    <name not found> = JetTypeImpl@5['Int']
+    <name not found> = JetTypeImpl@6['Int']
     <name not found> = JetTypeImpl@6['Int']
     <name not found> = null
 }
@@ -57,122 +57,125 @@ LazyJavaPackageFragment@18['lang'] {
 
 ResolutionTaskHolder@44 {
     <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
+}
+
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
 }
 
 ResolutionTaskHolder@56 {
     <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
+}
+
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
 }
 
 ResolutionTaskHolder@68 {
     <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
+}
+
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
 }
 
 ResolutionTaskHolder@80 {
     <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+null {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@85 }
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
 }
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/ReflectionTypesNotLoaded.lazy.log b/compiler/testData/diagnostics/tests/ReflectionTypesNotLoaded.lazy.log
index ac34575eae0..81ba1a8bb13 100644
--- a/compiler/testData/diagnostics/tests/ReflectionTypesNotLoaded.lazy.log
+++ b/compiler/testData/diagnostics/tests/ReflectionTypesNotLoaded.lazy.log
@@ -41,16 +41,50 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@30 {
     <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
+}
+
+ResolutionTaskHolder@36 {
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
+ResolutionTaskHolder@37 {
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@38 {
@@ -62,18 +96,6 @@ ResolutionTaskHolder@38 {
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@39 {
@@ -85,34 +107,15 @@ ResolutionTaskHolder@39 {
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@41 {
+null {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@35 }
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
diff --git a/compiler/testData/diagnostics/tests/ResolveOfJavaGenerics.lazy.log b/compiler/testData/diagnostics/tests/ResolveOfJavaGenerics.lazy.log
index 7907ddd7e08..ee1c9b23dcf 100644
--- a/compiler/testData/diagnostics/tests/ResolveOfJavaGenerics.lazy.log
+++ b/compiler/testData/diagnostics/tests/ResolveOfJavaGenerics.lazy.log
@@ -174,12 +174,12 @@ LazyJavaTypeParameterDescriptor@114['T'] {
     upperBoundsAsType = NullableType@116
 }
 
-LazyJavaTypeParameterDescriptor@23['T'] {
+LazyJavaTypeParameterDescriptor@27['T'] {
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@117
     upperBounds = LinkedHashSet@118[1] { NullableType@119 }
 }
 
-LazyJavaTypeParameterDescriptor@27['T'] {
+LazyJavaTypeParameterDescriptor@23['T'] {
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@120
     upperBounds = LinkedHashSet@121[1] { NullableType@122 }
 }
@@ -189,11 +189,11 @@ LazyJavaTypeParameterResolver@123 {
 }
 
 LazyJavaTypeParameterResolver@125 {
-    resolve(JavaTypeParameterImpl@126['T']) = LazyJavaTypeParameterDescriptor@23['T']
+    resolve(JavaTypeParameterImpl@126['T']) = LazyJavaTypeParameterDescriptor@27['T']
 }
 
 LazyJavaTypeParameterResolver@127 {
-    resolve(JavaTypeParameterImpl@128['T']) = LazyJavaTypeParameterDescriptor@27['T']
+    resolve(JavaTypeParameterImpl@128['T']) = LazyJavaTypeParameterDescriptor@23['T']
 }
 
 LazyJavaTypeParameterResolver@129 {
@@ -202,16 +202,32 @@ LazyJavaTypeParameterResolver@129 {
 
 ResolutionTaskHolder@131 {
     <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@133 }
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+}
+
+ResolutionTaskHolder@134 {
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+}
+
+ResolutionTaskHolder@137 {
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
 }
 
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@137 }
+ResolutionTaskHolder@138 {
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
@@ -227,8 +243,6 @@ ResolutionTaskHolder@139 {
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
 }
 
 ResolutionTaskHolder@140 {
@@ -240,8 +254,6 @@ ResolutionTaskHolder@140 {
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
 }
 
 ResolutionTaskHolder@141 {
@@ -253,8 +265,6 @@ ResolutionTaskHolder@141 {
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
 }
 
 ResolutionTaskHolder@142 {
@@ -266,24 +276,17 @@ ResolutionTaskHolder@142 {
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
 }
 
-ResolutionTaskHolder@143 {
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-}
-
-ResolutionTaskHolder@144 {
+null {
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@136 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@133 }
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
diff --git a/compiler/testData/diagnostics/tests/ResolveToJava.lazy.log b/compiler/testData/diagnostics/tests/ResolveToJava.lazy.log
index 7a1065561e0..23921798cd1 100644
--- a/compiler/testData/diagnostics/tests/ResolveToJava.lazy.log
+++ b/compiler/testData/diagnostics/tests/ResolveToJava.lazy.log
@@ -268,14 +268,14 @@ LazyJavaClassifierType@186['Charset'] {
 
 LazyJavaClassifierType@189['Charset'] {
     arguments = ArrayList@190[empty]
-    classifier = JavaClassImpl@184['Charset']
+    classifier = JavaClassImpl@188['Charset']
     nullable = 'true': Boolean@191
     typeConstructor = LazyJavaClassTypeConstructor@23['Charset']
 }
 
 LazyJavaClassifierType@192['Charset'] {
     arguments = ArrayList@193[empty]
-    classifier = JavaClassImpl@188['Charset']
+    classifier = JavaClassImpl@184['Charset']
     nullable = 'true': Boolean@191
     typeConstructor = LazyJavaClassTypeConstructor@23['Charset']
 }
@@ -285,14 +285,14 @@ LazyJavaClassifierType@194['Cloneable'] {
     typeConstructor = DeserializedClassTypeConstructor@196
 }
 
-LazyJavaClassifierType@172['Closeable'] {
+LazyJavaClassifierType@167['Closeable'] {
     arguments = ArrayList@197[empty]
     classifier = JavaClassImpl@198['Closeable']
     memberScope = LazyJavaClassMemberScope@26
     typeConstructor = LazyJavaClassTypeConstructor@28['Closeable']
 }
 
-LazyJavaClassifierType@167['Closeable'] {
+LazyJavaClassifierType@172['Closeable'] {
     arguments = ArrayList@199[empty]
     classifier = JavaClassImpl@200['Closeable']
     memberScope = LazyJavaClassMemberScope@26
@@ -331,14 +331,14 @@ LazyJavaClassifierType@217['E'] {
     arguments = ArrayList@218[empty]
     classifier = JavaTypeParameterImpl@219['E']
     nullable = 'false': Boolean@185
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@216
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@220
 }
 
-LazyJavaClassifierType@220['E'] {
-    arguments = ArrayList@221[empty]
-    classifier = JavaTypeParameterImpl@222['E']
+LazyJavaClassifierType@221['E'] {
+    arguments = ArrayList@222[empty]
+    classifier = JavaTypeParameterImpl@223['E']
     nullable = 'false': Boolean@185
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@223
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@216
 }
 
 LazyJavaClassifierType@224['E'] {
@@ -350,28 +350,28 @@ LazyJavaClassifierType@224['E'] {
 
 LazyJavaClassifierType@227['E'] {
     arguments = ArrayList@228[empty]
-    classifier = JavaTypeParameterImpl@222['E']
-    nullable = 'true': Boolean@191
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@223
-}
-
-LazyJavaClassifierType@229['E'] {
-    arguments = ArrayList@230[empty]
-    classifier = JavaTypeParameterImpl@226['E']
+    classifier = JavaTypeParameterImpl@215['E']
     nullable = 'true': Boolean@191
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@216
 }
 
+LazyJavaClassifierType@229['E'] {
+    arguments = ArrayList@230[empty]
+    classifier = JavaTypeParameterImpl@219['E']
+    nullable = 'true': Boolean@191
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@220
+}
+
 LazyJavaClassifierType@231['E'] {
     arguments = ArrayList@232[empty]
-    classifier = JavaTypeParameterImpl@219['E']
+    classifier = JavaTypeParameterImpl@226['E']
     nullable = 'true': Boolean@191
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@216
 }
 
 LazyJavaClassifierType@233['E'] {
     arguments = ArrayList@234[empty]
-    classifier = JavaTypeParameterImpl@215['E']
+    classifier = JavaTypeParameterImpl@223['E']
     nullable = 'true': Boolean@191
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@216
 }
@@ -545,21 +545,21 @@ LazyJavaClassifierType@302['OutputStream'] {
 
 LazyJavaClassifierType@305['OutputStream'] {
     arguments = ArrayList@306[empty]
-    classifier = JavaClassImpl@295['OutputStream']
+    classifier = JavaClassImpl@298['OutputStream']
     nullable = 'true': Boolean@191
     typeConstructor = LazyJavaClassTypeConstructor@95['OutputStream']
 }
 
 LazyJavaClassifierType@307['OutputStream'] {
     arguments = ArrayList@308[empty]
-    classifier = JavaClassImpl@304['OutputStream']
+    classifier = JavaClassImpl@292['OutputStream']
     nullable = 'true': Boolean@191
     typeConstructor = LazyJavaClassTypeConstructor@95['OutputStream']
 }
 
 LazyJavaClassifierType@309['OutputStream'] {
     arguments = ArrayList@310[empty]
-    classifier = JavaClassImpl@298['OutputStream']
+    classifier = JavaClassImpl@289['OutputStream']
     nullable = 'true': Boolean@191
     typeConstructor = LazyJavaClassTypeConstructor@95['OutputStream']
 }
@@ -573,14 +573,14 @@ LazyJavaClassifierType@311['OutputStream'] {
 
 LazyJavaClassifierType@313['OutputStream'] {
     arguments = ArrayList@314[empty]
-    classifier = JavaClassImpl@289['OutputStream']
+    classifier = JavaClassImpl@304['OutputStream']
     nullable = 'true': Boolean@191
     typeConstructor = LazyJavaClassTypeConstructor@95['OutputStream']
 }
 
 LazyJavaClassifierType@315['OutputStream'] {
     arguments = ArrayList@316[empty]
-    classifier = JavaClassImpl@292['OutputStream']
+    classifier = JavaClassImpl@295['OutputStream']
     nullable = 'true': Boolean@191
     typeConstructor = LazyJavaClassTypeConstructor@95['OutputStream']
 }
@@ -677,14 +677,14 @@ LazyJavaClassifierType@355['String'] {
 
 LazyJavaClassifierType@357['String'] {
     arguments = ArrayList@358[empty]
-    classifier = JavaClassImpl@342['String']
+    classifier = JavaClassImpl@338['String']
     nullable = 'true': Boolean@191
     typeConstructor = DeserializedClassTypeConstructor@339
 }
 
 LazyJavaClassifierType@359['String'] {
     arguments = ArrayList@360[empty]
-    classifier = JavaClassImpl@354['String']
+    classifier = JavaClassImpl@351['String']
     nullable = 'true': Boolean@191
     typeConstructor = DeserializedClassTypeConstructor@339
 }
@@ -698,14 +698,14 @@ LazyJavaClassifierType@361['String'] {
 
 LazyJavaClassifierType@363['String'] {
     arguments = ArrayList@364[empty]
-    classifier = JavaClassImpl@351['String']
+    classifier = JavaClassImpl@342['String']
     nullable = 'true': Boolean@191
     typeConstructor = DeserializedClassTypeConstructor@339
 }
 
 LazyJavaClassifierType@365['String'] {
     arguments = ArrayList@366[empty]
-    classifier = JavaClassImpl@338['String']
+    classifier = JavaClassImpl@354['String']
     nullable = 'true': Boolean@191
     typeConstructor = DeserializedClassTypeConstructor@339
 }
@@ -735,7 +735,7 @@ LazyJavaClassifierType@378['T'] {
     arguments = ArrayList@379[empty]
     classifier = JavaTypeParameterImpl@380['T']
     nullable = 'false': Boolean@185
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@370
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@374
 }
 
 LazyJavaClassifierType@381['T'] {
@@ -749,7 +749,7 @@ LazyJavaClassifierType@385['T'] {
     arguments = ArrayList@386[empty]
     classifier = JavaTypeParameterImpl@387['T']
     nullable = 'false': Boolean@185
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@374
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@370
 }
 
 LazyJavaClassifierType@388['T'] {
@@ -761,16 +761,16 @@ LazyJavaClassifierType@388['T'] {
 
 LazyJavaClassifierType@391['T'] {
     arguments = ArrayList@392[empty]
-    classifier = JavaTypeParameterImpl@390['T']
+    classifier = JavaTypeParameterImpl@373['T']
     nullable = 'true': Boolean@191
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@384
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@374
 }
 
 LazyJavaClassifierType@393['T'] {
     arguments = ArrayList@394[empty]
-    classifier = JavaTypeParameterImpl@373['T']
+    classifier = JavaTypeParameterImpl@390['T']
     nullable = 'true': Boolean@191
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@374
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@384
 }
 
 LazyJavaClassifierType@395['T'] {
@@ -782,21 +782,21 @@ LazyJavaClassifierType@395['T'] {
 
 LazyJavaClassifierType@397['T'] {
     arguments = ArrayList@398[empty]
-    classifier = JavaTypeParameterImpl@369['T']
+    classifier = JavaTypeParameterImpl@387['T']
     nullable = 'true': Boolean@191
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@370
 }
 
 LazyJavaClassifierType@399['T'] {
     arguments = ArrayList@400[empty]
-    classifier = JavaTypeParameterImpl@380['T']
+    classifier = JavaTypeParameterImpl@369['T']
     nullable = 'true': Boolean@191
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@370
 }
 
 LazyJavaClassifierType@401['T'] {
     arguments = ArrayList@402[empty]
-    classifier = JavaTypeParameterImpl@387['T']
+    classifier = JavaTypeParameterImpl@380['T']
     nullable = 'true': Boolean@191
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@374
 }
@@ -885,7 +885,7 @@ LazyJavaPackageFragmentProvider@409 {
     topLevelClasses(JavaClassImpl@181['AutoCloseable']) = LazyJavaClassDescriptor@18['AutoCloseable']
     topLevelClasses(JavaClassImpl@188['Charset']) = LazyJavaClassDescriptor@22['Charset']
     topLevelClasses(JavaClassImpl@479['Class']) = LazyJavaClassDescriptor@24['Class']
-    topLevelClasses(JavaClassImpl@198['Closeable']) = LazyJavaClassDescriptor@25['Closeable']
+    topLevelClasses(JavaClassImpl@200['Closeable']) = LazyJavaClassDescriptor@25['Closeable']
     topLevelClasses(JavaClassImpl@480['Collections']) = LazyJavaClassDescriptor@29['Collections']
     topLevelClasses(JavaClassImpl@481['Comparable']) = LazyJavaClassDescriptor@44['Comparable']
     topLevelClasses(JavaClassImpl@482['Exception']) = LazyJavaClassDescriptor@73['Exception']
@@ -1014,7 +1014,7 @@ LazyJavaTypeParameterDescriptor@162['E'] {
 }
 
 LazyJavaTypeParameterDescriptor@131['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@223
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@220
 }
 
 LazyJavaTypeParameterDescriptor@152['T'] {
@@ -1024,13 +1024,13 @@ LazyJavaTypeParameterDescriptor@152['T'] {
 }
 
 LazyJavaTypeParameterDescriptor@548['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@370
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@374
     upperBounds = LinkedHashSet@549[1] { NullableType@550 }
     upperBoundsAsType = NullableType@550
 }
 
 LazyJavaTypeParameterDescriptor@551['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@374
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@370
     upperBounds = LinkedHashSet@552[1] { NullableType@553 }
     upperBoundsAsType = NullableType@553
 }
@@ -1040,19 +1040,19 @@ LazyJavaTypeParameterResolver@554 {
 }
 
 LazyJavaTypeParameterResolver@556 {
-    resolve(JavaTypeParameterImpl@557['E']) = LazyJavaTypeParameterDescriptor@139['E']
+    resolve(JavaTypeParameterImpl@557['E']) = LazyJavaTypeParameterDescriptor@162['E']
 }
 
 LazyJavaTypeParameterResolver@558 {
-    resolve(JavaTypeParameterImpl@559['E']) = LazyJavaTypeParameterDescriptor@162['E']
+    resolve(JavaTypeParameterImpl@559['E']) = LazyJavaTypeParameterDescriptor@139['E']
 }
 
 LazyJavaTypeParameterResolver@560 {
-    resolve(JavaTypeParameterImpl@383['T']) = LazyJavaTypeParameterDescriptor@152['T']
+    resolve(JavaTypeParameterImpl@561['T']) = LazyJavaTypeParameterDescriptor@548['T']
 }
 
-LazyJavaTypeParameterResolver@561 {
-    resolve(JavaTypeParameterImpl@562['T']) = LazyJavaTypeParameterDescriptor@548['T']
+LazyJavaTypeParameterResolver@562 {
+    resolve(JavaTypeParameterImpl@390['T']) = LazyJavaTypeParameterDescriptor@152['T']
 }
 
 LazyJavaTypeParameterResolver@563 {
@@ -1069,24 +1069,10 @@ LazyJavaTypeParameterResolver@566 {
 
 ResolutionTaskHolder@567 {
     <name not found> = ArrayList@568[10] { ResolutionCandidate@569, ResolutionCandidate@570, ResolutionCandidate@571, ... }
-    <name not found> = ArrayList@572[10] { ResolutionCandidate@569, ResolutionCandidate@570, ResolutionCandidate@571, ... }
 }
 
-ResolutionTaskHolder@573 {
-    <name not found> = ArrayList@574[10] { ResolutionCandidate@575, ResolutionCandidate@576, ResolutionCandidate@577, ... }
-    <name not found> = ArrayList@578[7] { ResolutionCandidate@579, ResolutionCandidate@580, ResolutionCandidate@581, ... }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@582 {
-    <name not found> = ArrayList@583[1] { ResolutionCandidate@584 }
-    <name not found> = ArrayList@585[1] { ResolutionCandidate@584 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
+ResolutionTaskHolder@572 {
+    <name not found> = ArrayList@573[1] { ResolutionCandidate@574 }
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
@@ -1104,83 +1090,148 @@ ResolutionTaskHolder@582 {
     <name not found> = EmptyList@6[empty]
 }
 
-ResolutionTaskHolder@586 {
-    <name not found> = ArrayList@587[1] { ResolutionCandidate@588 }
-    <name not found> = ArrayList@589[1] { ResolutionCandidate@588 }
+ResolutionTaskHolder@575 {
+    <name not found> = ArrayList@576[1] { ResolutionCandidate@577 }
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
+}
+
+ResolutionTaskHolder@578 {
+    <name not found> = ArrayList@579[1] { ResolutionCandidate@580 }
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+}
+
+ResolutionTaskHolder@581 {
+    <name not found> = ArrayList@582[1] { ResolutionCandidate@583 }
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+}
+
+ResolutionTaskHolder@584 {
+    <name not found> = ArrayList@585[1] { ResolutionCandidate@586 }
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+}
+
+ResolutionTaskHolder@587 {
+    <name not found> = ArrayList@588[1] { ResolutionCandidate@589 }
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
 }
 
 ResolutionTaskHolder@590 {
     <name not found> = ArrayList@591[1] { ResolutionCandidate@592 }
-    <name not found> = ArrayList@593[1] { ResolutionCandidate@592 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
 }
 
-ResolutionTaskHolder@594 {
-    <name not found> = ArrayList@595[1] { ResolutionCandidate@596 }
-    <name not found> = ArrayList@597[1] { ResolutionCandidate@596 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
+ResolutionTaskHolder@593 {
+    <name not found> = ArrayList@594[1] { ResolutionCandidate@595 }
 }
 
-ResolutionTaskHolder@598 {
-    <name not found> = ArrayList@599[1] { ResolutionCandidate@600 }
-    <name not found> = ArrayList@601[1] { ResolutionCandidate@600 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
+ResolutionTaskHolder@596 {
+    <name not found> = ArrayList@597[1] { ResolutionCandidate@598 }
+}
+
+ResolutionTaskHolder@599 {
+    <name not found> = ArrayList@600[1] { ResolutionCandidate@601 }
 }
 
 ResolutionTaskHolder@602 {
-    <name not found> = ArrayList@603[1] { ResolutionCandidate@604 }
-    <name not found> = ArrayList@605[1] { ResolutionCandidate@604 }
+    <name not found> = ArrayList@603[3] { ResolutionCandidate@604, ResolutionCandidate@605, ResolutionCandidate@606 }
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+}
+
+ResolutionTaskHolder@607 {
+    <name not found> = ArrayList@608[7] { ResolutionCandidate@609, ResolutionCandidate@610, ResolutionCandidate@611, ... }
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+}
+
+ResolutionTaskHolder@612 {
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
 }
 
-ResolutionTaskHolder@606 {
-    <name not found> = ArrayList@607[1] { ResolutionCandidate@608 }
-    <name not found> = ArrayList@609[1] { ResolutionCandidate@608 }
+ResolutionTaskHolder@613 {
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@610 {
-    <name not found> = ArrayList@611[1] { ResolutionCandidate@612 }
-    <name not found> = ArrayList@613[1] { ResolutionCandidate@612 }
 }
 
 ResolutionTaskHolder@614 {
-    <name not found> = ArrayList@615[1] { ResolutionCandidate@616 }
-    <name not found> = ArrayList@617[1] { ResolutionCandidate@616 }
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
 }
 
-ResolutionTaskHolder@618 {
-    <name not found> = ArrayList@619[1] { ResolutionCandidate@620 }
-    <name not found> = ArrayList@621[1] { ResolutionCandidate@620 }
+ResolutionTaskHolder@615 {
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
 }
 
-ResolutionTaskHolder@622 {
-    <name not found> = ArrayList@623[3] { ResolutionCandidate@624, ResolutionCandidate@625, ResolutionCandidate@626 }
-    <name not found> = ArrayList@627[3] { ResolutionCandidate@624, ResolutionCandidate@625, ResolutionCandidate@626 }
+ResolutionTaskHolder@616 {
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+}
+
+ResolutionTaskHolder@617 {
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
 }
 
-ResolutionTaskHolder@628 {
+ResolutionTaskHolder@618 {
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
@@ -1189,6 +1240,9 @@ ResolutionTaskHolder@628 {
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
+}
+
+ResolutionTaskHolder@619 {
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
@@ -1197,25 +1251,31 @@ ResolutionTaskHolder@628 {
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
+}
+
+ResolutionTaskHolder@620 {
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+}
+
+ResolutionTaskHolder@621 {
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
 }
 
-ResolutionTaskHolder@629 {
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
+ResolutionTaskHolder@622 {
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
@@ -1226,9 +1286,7 @@ ResolutionTaskHolder@629 {
     <name not found> = EmptyList@6[empty]
 }
 
-ResolutionTaskHolder@630 {
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
+ResolutionTaskHolder@623 {
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
@@ -1239,111 +1297,56 @@ ResolutionTaskHolder@630 {
     <name not found> = EmptyList@6[empty]
 }
 
-ResolutionTaskHolder@631 {
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@632 {
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@633 {
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@634 {
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@635 {
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@636 {
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@637 {
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@638 {
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@639 {
+null {
+    <name not found> = ArrayList@624[10] { ResolutionCandidate@569, ResolutionCandidate@570, ResolutionCandidate@571, ... }
+    <name not found> = ArrayList@625[10] { ResolutionCandidate@626, ResolutionCandidate@627, ResolutionCandidate@628, ... }
+    <name not found> = ArrayList@629[1] { ResolutionCandidate@580 }
+    <name not found> = ArrayList@630[1] { ResolutionCandidate@577 }
+    <name not found> = ArrayList@631[1] { ResolutionCandidate@583 }
+    <name not found> = ArrayList@632[1] { ResolutionCandidate@586 }
+    <name not found> = ArrayList@633[1] { ResolutionCandidate@589 }
+    <name not found> = ArrayList@634[1] { ResolutionCandidate@574 }
+    <name not found> = ArrayList@635[1] { ResolutionCandidate@592 }
+    <name not found> = ArrayList@636[1] { ResolutionCandidate@595 }
+    <name not found> = ArrayList@637[1] { ResolutionCandidate@601 }
+    <name not found> = ArrayList@638[1] { ResolutionCandidate@598 }
+    <name not found> = ArrayList@639[3] { ResolutionCandidate@604, ResolutionCandidate@605, ResolutionCandidate@606 }
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
diff --git a/compiler/testData/diagnostics/tests/Return.lazy.log b/compiler/testData/diagnostics/tests/Return.lazy.log
index 36aa81a683c..49e294229c4 100644
--- a/compiler/testData/diagnostics/tests/Return.lazy.log
+++ b/compiler/testData/diagnostics/tests/Return.lazy.log
@@ -17,25 +17,28 @@ LazyJavaPackageFragment@5['java'] {
 
 ResolutionTaskHolder@17 {
     <name not found> = ArrayList@18[1] { ResolutionCandidate@19 }
-    <name not found> = ArrayList@20[1] { ResolutionCandidate@19 }
 }
 
-ResolutionTaskHolder@21 {
-    <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@23 }
+ResolutionTaskHolder@20 {
+    <name not found> = ArrayList@21[1] { ResolutionCandidate@22 }
 }
 
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[7] { ResolutionCandidate@27, ResolutionCandidate@28, ResolutionCandidate@29, ... }
-    <name not found> = ArrayList@30[7] { ResolutionCandidate@27, ResolutionCandidate@28, ResolutionCandidate@29, ... }
+ResolutionTaskHolder@23 {
+    <name not found> = ArrayList@24[7] { ResolutionCandidate@25, ResolutionCandidate@26, ResolutionCandidate@27, ... }
 }
 
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[7] { ResolutionCandidate@33, ResolutionCandidate@34, ResolutionCandidate@35, ... }
-    <name not found> = ArrayList@36[7] { ResolutionCandidate@33, ResolutionCandidate@34, ResolutionCandidate@35, ... }
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[7] { ResolutionCandidate@30, ResolutionCandidate@31, ResolutionCandidate@32, ... }
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[7] { ResolutionCandidate@39, ResolutionCandidate@40, ResolutionCandidate@41, ... }
-    <name not found> = ArrayList@42[7] { ResolutionCandidate@39, ResolutionCandidate@40, ResolutionCandidate@41, ... }
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[7] { ResolutionCandidate@35, ResolutionCandidate@36, ResolutionCandidate@37, ... }
+}
+
+null {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@22 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@19 }
+    <name not found> = ArrayList@40[7] { ResolutionCandidate@35, ResolutionCandidate@36, ResolutionCandidate@37, ... }
+    <name not found> = ArrayList@41[7] { ResolutionCandidate@30, ResolutionCandidate@31, ResolutionCandidate@32, ... }
+    <name not found> = ArrayList@42[7] { ResolutionCandidate@25, ResolutionCandidate@26, ResolutionCandidate@27, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/SafeCallNonNullReceiver.lazy.log b/compiler/testData/diagnostics/tests/SafeCallNonNullReceiver.lazy.log
index 76c66bf46d9..0077ecc2002 100644
--- a/compiler/testData/diagnostics/tests/SafeCallNonNullReceiver.lazy.log
+++ b/compiler/testData/diagnostics/tests/SafeCallNonNullReceiver.lazy.log
@@ -27,10 +27,13 @@ LazyJavaPackageFragment@7['java'] {
 
 ResolutionTaskHolder@23 {
     <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@25 }
 }
 
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[8] { ResolutionCandidate@29, ResolutionCandidate@30, ResolutionCandidate@31, ... }
-    <name not found> = ArrayList@32[8] { ResolutionCandidate@29, ResolutionCandidate@30, ResolutionCandidate@31, ... }
+ResolutionTaskHolder@26 {
+    <name not found> = ArrayList@27[8] { ResolutionCandidate@28, ResolutionCandidate@29, ResolutionCandidate@30, ... }
+}
+
+null {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@25 }
+    <name not found> = ArrayList@32[8] { ResolutionCandidate@28, ResolutionCandidate@29, ResolutionCandidate@30, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/SafeCallNonNullReceiverReturnNull.lazy.log b/compiler/testData/diagnostics/tests/SafeCallNonNullReceiverReturnNull.lazy.log
index 6d6f0441779..bfc1cb8daa7 100644
--- a/compiler/testData/diagnostics/tests/SafeCallNonNullReceiverReturnNull.lazy.log
+++ b/compiler/testData/diagnostics/tests/SafeCallNonNullReceiverReturnNull.lazy.log
@@ -39,14 +39,17 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+}
+
+null {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@30 }
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/SafeCallOnFakePackage.lazy.log b/compiler/testData/diagnostics/tests/SafeCallOnFakePackage.lazy.log
index 78a9212a408..85cdbf5c208 100644
--- a/compiler/testData/diagnostics/tests/SafeCallOnFakePackage.lazy.log
+++ b/compiler/testData/diagnostics/tests/SafeCallOnFakePackage.lazy.log
@@ -120,14 +120,14 @@ LazyJavaClassifierType@69['AutoCloseable'] {
     typeConstructor = LazyJavaClassTypeConstructor@13['AutoCloseable']
 }
 
-LazyJavaClassifierType@75['Closeable'] {
+LazyJavaClassifierType@80['Closeable'] {
     arguments = ArrayList@87[empty]
     classifier = JavaClassImpl@88['Closeable']
     memberScope = LazyJavaClassMemberScope@15
     typeConstructor = LazyJavaClassTypeConstructor@17['Closeable']
 }
 
-LazyJavaClassifierType@80['Closeable'] {
+LazyJavaClassifierType@75['Closeable'] {
     arguments = ArrayList@89[empty]
     classifier = JavaClassImpl@90['Closeable']
     memberScope = LazyJavaClassMemberScope@15
@@ -250,7 +250,7 @@ LazyJavaPackageFragmentProvider@130 {
     packageFragments('kotlin.jvm': FqName@153) = null
     topLevelClasses(JavaClassImpl@84['Appendable']) = LazyJavaClassDescriptor@4['Appendable']
     topLevelClasses(JavaClassImpl@86['AutoCloseable']) = LazyJavaClassDescriptor@10['AutoCloseable']
-    topLevelClasses(JavaClassImpl@90['Closeable']) = LazyJavaClassDescriptor@14['Closeable']
+    topLevelClasses(JavaClassImpl@88['Closeable']) = LazyJavaClassDescriptor@14['Closeable']
     topLevelClasses(JavaClassImpl@92['FilterOutputStream']) = LazyJavaClassDescriptor@18['FilterOutputStream']
     topLevelClasses(JavaClassImpl@114['OutputStream']) = LazyJavaClassDescriptor@22['OutputStream']
     topLevelClasses(JavaClassImpl@117['PrintStream']) = LazyJavaClassDescriptor@26['PrintStream']
@@ -284,48 +284,36 @@ LazyJavaTypeAttributes@166 {
 
 ResolutionTaskHolder@168 {
     <name not found> = ArrayList@169[10] { ResolutionCandidate@170, ResolutionCandidate@171, ResolutionCandidate@172, ... }
-    <name not found> = ArrayList@173[10] { ResolutionCandidate@170, ResolutionCandidate@171, ResolutionCandidate@172, ... }
 }
 
-ResolutionTaskHolder@174 {
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@176 }
-    <name not found> = EmptyList@6[empty]
+ResolutionTaskHolder@173 {
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
     <name not found> = EmptyList@6[empty]
 }
 
-ResolutionTaskHolder@178 {
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@180 }
+ResolutionTaskHolder@176 {
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
     <name not found> = EmptyList@6[empty]
+}
+
+ResolutionTaskHolder@179 {
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
     <name not found> = EmptyList@6[empty]
 }
 
 ResolutionTaskHolder@182 {
     <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@184 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
 }
 
-ResolutionTaskHolder@186 {
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@188 }
+ResolutionTaskHolder@185 {
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
 }
 
-ResolutionTaskHolder@190 {
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@192 }
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@192 }
+ResolutionTaskHolder@188 {
+    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
 }
 
-ResolutionTaskHolder@194 {
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@196 }
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@196 }
-}
-
-ResolutionTaskHolder@198 {
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
+ResolutionTaskHolder@191 {
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
@@ -336,9 +324,7 @@ ResolutionTaskHolder@198 {
     <name not found> = EmptyList@6[empty]
 }
 
-ResolutionTaskHolder@199 {
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
+ResolutionTaskHolder@192 {
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
@@ -349,7 +335,7 @@ ResolutionTaskHolder@199 {
     <name not found> = EmptyList@6[empty]
 }
 
-ResolutionTaskHolder@200 {
+ResolutionTaskHolder@193 {
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
@@ -358,6 +344,23 @@ ResolutionTaskHolder@200 {
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
+}
+
+null {
+    <name not found> = ArrayList@194[10] { ResolutionCandidate@170, ResolutionCandidate@171, ResolutionCandidate@172, ... }
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@178 }
+    <name not found> = ArrayList@196[1] { ResolutionCandidate@181 }
+    <name not found> = ArrayList@197[1] { ResolutionCandidate@175 }
+    <name not found> = ArrayList@198[1] { ResolutionCandidate@190 }
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@184 }
+    <name not found> = ArrayList@200[1] { ResolutionCandidate@187 }
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/StarsInFunctionCalls.lazy.log b/compiler/testData/diagnostics/tests/StarsInFunctionCalls.lazy.log
index 5ca092844ed..499bb076ebc 100644
--- a/compiler/testData/diagnostics/tests/StarsInFunctionCalls.lazy.log
+++ b/compiler/testData/diagnostics/tests/StarsInFunctionCalls.lazy.log
@@ -54,63 +54,66 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@33 {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
+}
+
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
 
 ResolutionTaskHolder@45 {
     <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+}
+
+ResolutionTaskHolder@51 {
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
+null {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@50 }
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
diff --git a/compiler/testData/diagnostics/tests/StringTemplates.lazy.log b/compiler/testData/diagnostics/tests/StringTemplates.lazy.log
index 1483e57a914..7d89f956600 100644
--- a/compiler/testData/diagnostics/tests/StringTemplates.lazy.log
+++ b/compiler/testData/diagnostics/tests/StringTemplates.lazy.log
@@ -57,104 +57,81 @@ LazyJavaPackageFragment@14['lang'] {
 
 ResolutionTaskHolder@41 {
     <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
+}
+
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
 }
 
 ResolutionTaskHolder@53 {
     <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
+}
+
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
 }
 
 ResolutionTaskHolder@65 {
     <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
+}
+
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
 }
 
 ResolutionTaskHolder@77 {
     <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
 }
 
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
 }
 
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[8] { ResolutionCandidate@85, ResolutionCandidate@86, ResolutionCandidate@87, ... }
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[8] { ResolutionCandidate@90, ResolutionCandidate@91, ResolutionCandidate@92, ... }
 }
 
 ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@94[8] { ResolutionCandidate@95, ResolutionCandidate@96, ResolutionCandidate@97, ... }
 }
 
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[8] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
-    <name not found> = ArrayList@102[8] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[8] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102, ... }
 }
 
 ResolutionTaskHolder@103 {
     <name not found> = ArrayList@104[8] { ResolutionCandidate@105, ResolutionCandidate@106, ResolutionCandidate@107, ... }
-    <name not found> = ArrayList@108[8] { ResolutionCandidate@105, ResolutionCandidate@106, ResolutionCandidate@107, ... }
 }
 
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[8] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113, ... }
-    <name not found> = ArrayList@114[8] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113, ... }
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[8] { ResolutionCandidate@117, ResolutionCandidate@118, ResolutionCandidate@119, ... }
-    <name not found> = ArrayList@120[8] { ResolutionCandidate@117, ResolutionCandidate@118, ResolutionCandidate@119, ... }
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[8] { ResolutionCandidate@123, ResolutionCandidate@124, ResolutionCandidate@125, ... }
-    <name not found> = ArrayList@126[8] { ResolutionCandidate@123, ResolutionCandidate@124, ResolutionCandidate@125, ... }
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@108 {
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -173,9 +150,7 @@ ResolutionTaskHolder@127 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@128 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@109 {
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -185,3 +160,31 @@ ResolutionTaskHolder@128 {
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
+
+null {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@124[8] { ResolutionCandidate@105, ResolutionCandidate@106, ResolutionCandidate@107, ... }
+    <name not found> = ArrayList@125[8] { ResolutionCandidate@95, ResolutionCandidate@96, ResolutionCandidate@97, ... }
+    <name not found> = ArrayList@126[8] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102, ... }
+    <name not found> = ArrayList@127[8] { ResolutionCandidate@90, ResolutionCandidate@91, ResolutionCandidate@92, ... }
+    <name not found> = ArrayList@128[8] { ResolutionCandidate@85, ResolutionCandidate@86, ResolutionCandidate@87, ... }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/SupertypeListChecks.lazy.log b/compiler/testData/diagnostics/tests/SupertypeListChecks.lazy.log
index 04962d92176..1c5adff084d 100644
--- a/compiler/testData/diagnostics/tests/SupertypeListChecks.lazy.log
+++ b/compiler/testData/diagnostics/tests/SupertypeListChecks.lazy.log
@@ -45,5 +45,8 @@ LazyJavaPackageFragment@23['java'] {
 
 ResolutionTaskHolder@45 {
     <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+}
+
+null {
     <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
 }
diff --git a/compiler/testData/diagnostics/tests/SyntaxErrorInTestHighlighting.lazy.log b/compiler/testData/diagnostics/tests/SyntaxErrorInTestHighlighting.lazy.log
index 2ecff42d658..af5bcfd8ae3 100644
--- a/compiler/testData/diagnostics/tests/SyntaxErrorInTestHighlighting.lazy.log
+++ b/compiler/testData/diagnostics/tests/SyntaxErrorInTestHighlighting.lazy.log
@@ -16,5 +16,8 @@ LazyJavaPackageFragment@4['java'] {
 
 ResolutionTaskHolder@16 {
     <name not found> = ArrayList@17[8] { ResolutionCandidate@18, ResolutionCandidate@19, ResolutionCandidate@20, ... }
+}
+
+null {
     <name not found> = ArrayList@21[8] { ResolutionCandidate@18, ResolutionCandidate@19, ResolutionCandidate@20, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/TraitOverrideObjectMethods.lazy.log b/compiler/testData/diagnostics/tests/TraitOverrideObjectMethods.lazy.log
index 8519e444668..0c22f6feb37 100644
--- a/compiler/testData/diagnostics/tests/TraitOverrideObjectMethods.lazy.log
+++ b/compiler/testData/diagnostics/tests/TraitOverrideObjectMethods.lazy.log
@@ -60,14 +60,14 @@ LazyJavaClassifierType@58['Object'] {
 
 LazyJavaClassifierType@61['Object'] {
     arguments = ArrayList@62[empty]
-    classifier = JavaClassImpl@56['Object']
+    classifier = JavaClassImpl@60['Object']
     nullable = 'true': Boolean@53
     typeConstructor = DeserializedClassTypeConstructor@57
 }
 
 LazyJavaClassifierType@63['Object'] {
     arguments = ArrayList@64[empty]
-    classifier = JavaClassImpl@60['Object']
+    classifier = JavaClassImpl@56['Object']
     nullable = 'true': Boolean@53
     typeConstructor = DeserializedClassTypeConstructor@57
 }
diff --git a/compiler/testData/diagnostics/tests/TypeInference.lazy.log b/compiler/testData/diagnostics/tests/TypeInference.lazy.log
index 6c930491895..0aa4a876339 100644
--- a/compiler/testData/diagnostics/tests/TypeInference.lazy.log
+++ b/compiler/testData/diagnostics/tests/TypeInference.lazy.log
@@ -52,70 +52,73 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
 ResolutionTaskHolder@52 {
     <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+null {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@51 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
diff --git a/compiler/testData/diagnostics/tests/TypeMismatchOnOverrideWithSyntaxErrors.lazy.log b/compiler/testData/diagnostics/tests/TypeMismatchOnOverrideWithSyntaxErrors.lazy.log
index 72e4bc64090..56ffa0a1c86 100644
--- a/compiler/testData/diagnostics/tests/TypeMismatchOnOverrideWithSyntaxErrors.lazy.log
+++ b/compiler/testData/diagnostics/tests/TypeMismatchOnOverrideWithSyntaxErrors.lazy.log
@@ -31,5 +31,8 @@ LazyJavaPackageFragment@8['java'] {
 
 ResolutionTaskHolder@29 {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
+}
+
+null {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
 }
diff --git a/compiler/testData/diagnostics/tests/UnitByDefaultForFunctionTypes.lazy.log b/compiler/testData/diagnostics/tests/UnitByDefaultForFunctionTypes.lazy.log
index 28e6fcd1a9d..286f38ddd93 100644
--- a/compiler/testData/diagnostics/tests/UnitByDefaultForFunctionTypes.lazy.log
+++ b/compiler/testData/diagnostics/tests/UnitByDefaultForFunctionTypes.lazy.log
@@ -34,12 +34,15 @@ LazyJavaPackageFragment@7['lang'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
-    <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
+}
+
+null {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@27 }
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@30 }
+    <name not found> = EmptyList@17[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/UnitValue.lazy.log b/compiler/testData/diagnostics/tests/UnitValue.lazy.log
index ec49615b9eb..042f13879e8 100644
--- a/compiler/testData/diagnostics/tests/UnitValue.lazy.log
+++ b/compiler/testData/diagnostics/tests/UnitValue.lazy.log
@@ -28,7 +28,10 @@ LazyJavaPackageFragment@7['lang'] {
 
 ResolutionTaskHolder@22 {
     <name not found> = ArrayList@23[1] { ResolutionCandidate@24 }
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@24 }
-    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+}
+
+null {
+    <name not found> = ArrayList@25[1] { ResolutionCandidate@24 }
     <name not found> = EmptyList@19[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/Unresolved.lazy.log b/compiler/testData/diagnostics/tests/Unresolved.lazy.log
index 9094b44684f..add6114e11d 100644
--- a/compiler/testData/diagnostics/tests/Unresolved.lazy.log
+++ b/compiler/testData/diagnostics/tests/Unresolved.lazy.log
@@ -72,68 +72,256 @@ LazyJavaPackageFragment@15['lang'] {
 
 ResolutionTaskHolder@65 {
     <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
+}
+
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
 }
 
 ResolutionTaskHolder@77 {
     <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
 }
 
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
 }
 
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
+}
+
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
 }
 
 ResolutionTaskHolder@89 {
     <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[8] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
 }
 
 ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+}
+
+ResolutionTaskHolder@98 {
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+}
+
+ResolutionTaskHolder@99 {
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+}
+
+ResolutionTaskHolder@100 {
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
 }
 
 ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[8] { ResolutionCandidate@103, ResolutionCandidate@104, ResolutionCandidate@105, ... }
-    <name not found> = ArrayList@106[8] { ResolutionCandidate@103, ResolutionCandidate@104, ResolutionCandidate@105, ... }
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+}
+
+ResolutionTaskHolder@102 {
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+}
+
+ResolutionTaskHolder@103 {
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+}
+
+ResolutionTaskHolder@104 {
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+}
+
+ResolutionTaskHolder@105 {
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+}
+
+ResolutionTaskHolder@106 {
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
 }
 
 ResolutionTaskHolder@107 {
@@ -153,20 +341,6 @@ ResolutionTaskHolder@107 {
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
 }
 
 ResolutionTaskHolder@108 {
@@ -186,20 +360,6 @@ ResolutionTaskHolder@108 {
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
 }
 
 ResolutionTaskHolder@109 {
@@ -215,14 +375,6 @@ ResolutionTaskHolder@109 {
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
 }
 
 ResolutionTaskHolder@110 {
@@ -234,18 +386,6 @@ ResolutionTaskHolder@110 {
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
 }
 
 ResolutionTaskHolder@111 {
@@ -257,18 +397,6 @@ ResolutionTaskHolder@111 {
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
 }
 
 ResolutionTaskHolder@112 {
@@ -280,18 +408,6 @@ ResolutionTaskHolder@112 {
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
 }
 
 ResolutionTaskHolder@113 {
@@ -303,18 +419,6 @@ ResolutionTaskHolder@113 {
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
 }
 
 ResolutionTaskHolder@114 {
@@ -326,18 +430,6 @@ ResolutionTaskHolder@114 {
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
 }
 
 ResolutionTaskHolder@115 {
@@ -349,18 +441,6 @@ ResolutionTaskHolder@115 {
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
 }
 
 ResolutionTaskHolder@116 {
@@ -372,18 +452,6 @@ ResolutionTaskHolder@116 {
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
 }
 
 ResolutionTaskHolder@117 {
@@ -395,18 +463,6 @@ ResolutionTaskHolder@117 {
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
 }
 
 ResolutionTaskHolder@118 {
@@ -418,18 +474,6 @@ ResolutionTaskHolder@118 {
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
 }
 
 ResolutionTaskHolder@119 {
@@ -441,133 +485,92 @@ ResolutionTaskHolder@119 {
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
 }
 
-ResolutionTaskHolder@120 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@123 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@129 {
+null {
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@129[8] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
diff --git a/compiler/testData/diagnostics/tests/UnusedVariables.lazy.log b/compiler/testData/diagnostics/tests/UnusedVariables.lazy.log
index 603d38bd662..5d2146749c2 100644
--- a/compiler/testData/diagnostics/tests/UnusedVariables.lazy.log
+++ b/compiler/testData/diagnostics/tests/UnusedVariables.lazy.log
@@ -63,26 +63,25 @@ LazyJavaPackageFragment@16['lang'] {
 
 ResolutionTaskHolder@53 {
     <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+}
+
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
     <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
@@ -95,412 +94,416 @@ ResolutionTaskHolder@60 {
 
 ResolutionTaskHolder@64 {
     <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
     <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@44[empty]
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
     <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
+}
+
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
     <name not found> = EmptyList@44[empty]
 }
 
 ResolutionTaskHolder@76 {
     <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
-    <name not found> = EmptyList@44[empty]
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
     <name not found> = EmptyList@44[empty]
 }
 
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
-    <name not found> = EmptyList@44[empty]
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
     <name not found> = EmptyList@44[empty]
 }
 
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
+}
+
 ResolutionTaskHolder@88 {
     <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
 }
 
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
+}
+
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
 }
 
 ResolutionTaskHolder@100 {
     <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
 }
 
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
+}
+
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
 }
 
 ResolutionTaskHolder@112 {
     <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
 }
 
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
+ResolutionTaskHolder@115 {
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
 }
 
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
+ResolutionTaskHolder@118 {
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
+}
+
+ResolutionTaskHolder@121 {
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
 }
 
 ResolutionTaskHolder@124 {
     <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@126 }
 }
 
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
+ResolutionTaskHolder@127 {
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
 }
 
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
+ResolutionTaskHolder@130 {
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
+}
+
+ResolutionTaskHolder@133 {
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
 }
 
 ResolutionTaskHolder@136 {
     <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
 }
 
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
+ResolutionTaskHolder@139 {
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
 }
 
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
+ResolutionTaskHolder@142 {
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
+}
+
+ResolutionTaskHolder@145 {
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
 }
 
 ResolutionTaskHolder@148 {
     <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
 }
 
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
+ResolutionTaskHolder@151 {
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
 }
 
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
+ResolutionTaskHolder@154 {
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
+}
+
+ResolutionTaskHolder@157 {
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
 }
 
 ResolutionTaskHolder@160 {
     <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@162 }
 }
 
-ResolutionTaskHolder@164 {
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@166 }
+ResolutionTaskHolder@163 {
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
 }
 
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@170 }
+ResolutionTaskHolder@166 {
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
+}
+
+ResolutionTaskHolder@169 {
+    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
 }
 
 ResolutionTaskHolder@172 {
     <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@174 }
 }
 
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@178 }
+ResolutionTaskHolder@175 {
+    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
 }
 
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@182 }
+ResolutionTaskHolder@178 {
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
+}
+
+ResolutionTaskHolder@181 {
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
 }
 
 ResolutionTaskHolder@184 {
     <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@186 }
 }
 
-ResolutionTaskHolder@188 {
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@190 }
+ResolutionTaskHolder@187 {
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
 }
 
-ResolutionTaskHolder@192 {
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@194 }
+ResolutionTaskHolder@190 {
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@192 }
+}
+
+ResolutionTaskHolder@193 {
+    <name not found> = ArrayList@194[1] { ResolutionCandidate@195 }
 }
 
 ResolutionTaskHolder@196 {
     <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@198 }
 }
 
-ResolutionTaskHolder@200 {
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@202 }
+ResolutionTaskHolder@199 {
+    <name not found> = ArrayList@200[1] { ResolutionCandidate@201 }
 }
 
-ResolutionTaskHolder@204 {
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@206 }
+ResolutionTaskHolder@202 {
+    <name not found> = ArrayList@203[1] { ResolutionCandidate@204 }
+}
+
+ResolutionTaskHolder@205 {
+    <name not found> = ArrayList@206[1] { ResolutionCandidate@207 }
 }
 
 ResolutionTaskHolder@208 {
     <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@210 }
 }
 
-ResolutionTaskHolder@212 {
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@214 }
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@214 }
+ResolutionTaskHolder@211 {
+    <name not found> = ArrayList@212[1] { ResolutionCandidate@213 }
 }
 
-ResolutionTaskHolder@216 {
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@218 }
+ResolutionTaskHolder@214 {
+    <name not found> = ArrayList@215[1] { ResolutionCandidate@216 }
+}
+
+ResolutionTaskHolder@217 {
+    <name not found> = ArrayList@218[1] { ResolutionCandidate@219 }
 }
 
 ResolutionTaskHolder@220 {
     <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@222 }
 }
 
-ResolutionTaskHolder@224 {
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@226 }
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@226 }
+ResolutionTaskHolder@223 {
+    <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
 }
 
-ResolutionTaskHolder@228 {
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@230 }
+ResolutionTaskHolder@226 {
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
+}
+
+ResolutionTaskHolder@229 {
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
 }
 
 ResolutionTaskHolder@232 {
     <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@234 }
 }
 
-ResolutionTaskHolder@236 {
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@238 }
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@238 }
+ResolutionTaskHolder@235 {
+    <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
 }
 
-ResolutionTaskHolder@240 {
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
-    <name not found> = ArrayList@243[1] { ResolutionCandidate@242 }
+ResolutionTaskHolder@238 {
+    <name not found> = ArrayList@239[1] { ResolutionCandidate@240 }
+}
+
+ResolutionTaskHolder@241 {
+    <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
 }
 
 ResolutionTaskHolder@244 {
     <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@246 }
 }
 
-ResolutionTaskHolder@248 {
-    <name not found> = ArrayList@249[1] { ResolutionCandidate@250 }
-    <name not found> = ArrayList@251[1] { ResolutionCandidate@250 }
+ResolutionTaskHolder@247 {
+    <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
 }
 
-ResolutionTaskHolder@252 {
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
-    <name not found> = ArrayList@255[1] { ResolutionCandidate@254 }
+ResolutionTaskHolder@250 {
+    <name not found> = ArrayList@251[1] { ResolutionCandidate@252 }
+}
+
+ResolutionTaskHolder@253 {
+    <name not found> = ArrayList@254[1] { ResolutionCandidate@255 }
 }
 
 ResolutionTaskHolder@256 {
-    <name not found> = ArrayList@257[1] { ResolutionCandidate@258 }
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@258 }
+    <name not found> = ArrayList@257[2] { ResolutionCandidate@258, ResolutionCandidate@259 }
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
 }
 
 ResolutionTaskHolder@260 {
-    <name not found> = ArrayList@261[1] { ResolutionCandidate@262 }
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@262 }
+    <name not found> = ArrayList@261[2] { ResolutionCandidate@262, ResolutionCandidate@263 }
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
 }
 
 ResolutionTaskHolder@264 {
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
-    <name not found> = ArrayList@267[1] { ResolutionCandidate@266 }
+    <name not found> = ArrayList@265[2] { ResolutionCandidate@266, ResolutionCandidate@267 }
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
 }
 
 ResolutionTaskHolder@268 {
-    <name not found> = ArrayList@269[1] { ResolutionCandidate@270 }
-    <name not found> = ArrayList@271[1] { ResolutionCandidate@270 }
+    <name not found> = ArrayList@269[2] { ResolutionCandidate@270, ResolutionCandidate@271 }
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
 }
 
 ResolutionTaskHolder@272 {
-    <name not found> = ArrayList@273[1] { ResolutionCandidate@274 }
-    <name not found> = ArrayList@275[1] { ResolutionCandidate@274 }
+    <name not found> = ArrayList@273[7] { ResolutionCandidate@274, ResolutionCandidate@275, ResolutionCandidate@276, ... }
 }
 
-ResolutionTaskHolder@276 {
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
-    <name not found> = ArrayList@279[1] { ResolutionCandidate@278 }
+ResolutionTaskHolder@277 {
+    <name not found> = ArrayList@278[7] { ResolutionCandidate@279, ResolutionCandidate@280, ResolutionCandidate@281, ... }
 }
 
-ResolutionTaskHolder@280 {
-    <name not found> = ArrayList@281[1] { ResolutionCandidate@282 }
-    <name not found> = ArrayList@283[1] { ResolutionCandidate@282 }
+ResolutionTaskHolder@282 {
+    <name not found> = ArrayList@283[7] { ResolutionCandidate@284, ResolutionCandidate@285, ResolutionCandidate@286, ... }
 }
 
-ResolutionTaskHolder@284 {
-    <name not found> = ArrayList@285[1] { ResolutionCandidate@286 }
-    <name not found> = ArrayList@287[1] { ResolutionCandidate@286 }
-}
-
-ResolutionTaskHolder@288 {
-    <name not found> = ArrayList@289[1] { ResolutionCandidate@290 }
-    <name not found> = ArrayList@291[1] { ResolutionCandidate@290 }
-}
-
-ResolutionTaskHolder@292 {
-    <name not found> = ArrayList@293[1] { ResolutionCandidate@294 }
-    <name not found> = ArrayList@295[1] { ResolutionCandidate@294 }
-}
-
-ResolutionTaskHolder@296 {
-    <name not found> = ArrayList@297[1] { ResolutionCandidate@298 }
-    <name not found> = ArrayList@299[1] { ResolutionCandidate@298 }
-}
-
-ResolutionTaskHolder@300 {
-    <name not found> = ArrayList@301[1] { ResolutionCandidate@302 }
-    <name not found> = ArrayList@303[1] { ResolutionCandidate@302 }
-}
-
-ResolutionTaskHolder@304 {
-    <name not found> = ArrayList@305[1] { ResolutionCandidate@306 }
-    <name not found> = ArrayList@307[1] { ResolutionCandidate@306 }
-}
-
-ResolutionTaskHolder@308 {
-    <name not found> = ArrayList@309[1] { ResolutionCandidate@310 }
-    <name not found> = ArrayList@311[1] { ResolutionCandidate@310 }
-}
-
-ResolutionTaskHolder@312 {
-    <name not found> = ArrayList@313[1] { ResolutionCandidate@314 }
-    <name not found> = ArrayList@315[1] { ResolutionCandidate@314 }
-}
-
-ResolutionTaskHolder@316 {
-    <name not found> = ArrayList@317[1] { ResolutionCandidate@318 }
-    <name not found> = ArrayList@319[1] { ResolutionCandidate@318 }
-}
-
-ResolutionTaskHolder@320 {
-    <name not found> = ArrayList@321[1] { ResolutionCandidate@322 }
-    <name not found> = ArrayList@323[1] { ResolutionCandidate@322 }
-}
-
-ResolutionTaskHolder@324 {
-    <name not found> = ArrayList@325[2] { ResolutionCandidate@326, ResolutionCandidate@327 }
-    <name not found> = ArrayList@328[2] { ResolutionCandidate@326, ResolutionCandidate@327 }
+null {
+    <name not found> = ArrayList@287[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@288[1] { ResolutionCandidate@225 }
+    <name not found> = ArrayList@289[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@290[1] { ResolutionCandidate@147 }
+    <name not found> = ArrayList@291[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@292[1] { ResolutionCandidate@252 }
+    <name not found> = ArrayList@293[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@294[1] { ResolutionCandidate@219 }
+    <name not found> = ArrayList@295[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@296[1] { ResolutionCandidate@246 }
+    <name not found> = ArrayList@297[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@298[1] { ResolutionCandidate@132 }
+    <name not found> = ArrayList@299[1] { ResolutionCandidate@249 }
+    <name not found> = ArrayList@300[1] { ResolutionCandidate@180 }
+    <name not found> = ArrayList@301[1] { ResolutionCandidate@228 }
+    <name not found> = ArrayList@302[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@303[1] { ResolutionCandidate@237 }
+    <name not found> = ArrayList@304[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@305[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@306[1] { ResolutionCandidate@234 }
+    <name not found> = ArrayList@307[1] { ResolutionCandidate@207 }
+    <name not found> = ArrayList@308[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@309[1] { ResolutionCandidate@189 }
+    <name not found> = ArrayList@310[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@311[1] { ResolutionCandidate@168 }
+    <name not found> = ArrayList@312[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@313[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@314[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@315[1] { ResolutionCandidate@177 }
+    <name not found> = ArrayList@316[1] { ResolutionCandidate@159 }
+    <name not found> = ArrayList@317[1] { ResolutionCandidate@162 }
+    <name not found> = ArrayList@318[1] { ResolutionCandidate@243 }
+    <name not found> = ArrayList@319[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@320[1] { ResolutionCandidate@165 }
+    <name not found> = ArrayList@321[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@322[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@323[1] { ResolutionCandidate@153 }
+    <name not found> = ArrayList@324[1] { ResolutionCandidate@255 }
+    <name not found> = ArrayList@325[1] { ResolutionCandidate@201 }
+    <name not found> = ArrayList@326[1] { ResolutionCandidate@195 }
+    <name not found> = ArrayList@327[1] { ResolutionCandidate@129 }
+    <name not found> = ArrayList@328[1] { ResolutionCandidate@171 }
+    <name not found> = ArrayList@329[1] { ResolutionCandidate@198 }
+    <name not found> = ArrayList@330[1] { ResolutionCandidate@231 }
+    <name not found> = ArrayList@331[1] { ResolutionCandidate@156 }
+    <name not found> = ArrayList@332[1] { ResolutionCandidate@135 }
+    <name not found> = ArrayList@333[1] { ResolutionCandidate@240 }
+    <name not found> = ArrayList@334[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@335[1] { ResolutionCandidate@174 }
+    <name not found> = ArrayList@336[1] { ResolutionCandidate@126 }
+    <name not found> = ArrayList@337[1] { ResolutionCandidate@210 }
+    <name not found> = ArrayList@338[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@339[1] { ResolutionCandidate@141 }
+    <name not found> = ArrayList@340[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@341[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@342[1] { ResolutionCandidate@213 }
+    <name not found> = ArrayList@343[1] { ResolutionCandidate@216 }
+    <name not found> = ArrayList@344[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@345[1] { ResolutionCandidate@183 }
+    <name not found> = ArrayList@346[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@347[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@348[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@349[1] { ResolutionCandidate@186 }
+    <name not found> = ArrayList@350[1] { ResolutionCandidate@222 }
+    <name not found> = ArrayList@351[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@352[1] { ResolutionCandidate@204 }
+    <name not found> = ArrayList@353[1] { ResolutionCandidate@192 }
+    <name not found> = ArrayList@354[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@355[2] { ResolutionCandidate@270, ResolutionCandidate@271 }
+    <name not found> = ArrayList@356[2] { ResolutionCandidate@266, ResolutionCandidate@267 }
+    <name not found> = ArrayList@357[2] { ResolutionCandidate@258, ResolutionCandidate@259 }
+    <name not found> = ArrayList@358[2] { ResolutionCandidate@262, ResolutionCandidate@263 }
+    <name not found> = ArrayList@359[7] { ResolutionCandidate@279, ResolutionCandidate@280, ResolutionCandidate@281, ... }
+    <name not found> = ArrayList@360[7] { ResolutionCandidate@274, ResolutionCandidate@275, ResolutionCandidate@276, ... }
+    <name not found> = ArrayList@361[7] { ResolutionCandidate@284, ResolutionCandidate@285, ResolutionCandidate@286, ... }
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
 }
-
-ResolutionTaskHolder@329 {
-    <name not found> = ArrayList@330[2] { ResolutionCandidate@331, ResolutionCandidate@332 }
-    <name not found> = ArrayList@333[2] { ResolutionCandidate@331, ResolutionCandidate@332 }
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-}
-
-ResolutionTaskHolder@334 {
-    <name not found> = ArrayList@335[2] { ResolutionCandidate@336, ResolutionCandidate@337 }
-    <name not found> = ArrayList@338[2] { ResolutionCandidate@336, ResolutionCandidate@337 }
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-}
-
-ResolutionTaskHolder@339 {
-    <name not found> = ArrayList@340[2] { ResolutionCandidate@341, ResolutionCandidate@342 }
-    <name not found> = ArrayList@343[2] { ResolutionCandidate@341, ResolutionCandidate@342 }
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-}
-
-ResolutionTaskHolder@344 {
-    <name not found> = ArrayList@345[7] { ResolutionCandidate@346, ResolutionCandidate@347, ResolutionCandidate@348, ... }
-    <name not found> = ArrayList@349[7] { ResolutionCandidate@346, ResolutionCandidate@347, ResolutionCandidate@348, ... }
-}
-
-ResolutionTaskHolder@350 {
-    <name not found> = ArrayList@351[7] { ResolutionCandidate@352, ResolutionCandidate@353, ResolutionCandidate@354, ... }
-    <name not found> = ArrayList@355[7] { ResolutionCandidate@352, ResolutionCandidate@353, ResolutionCandidate@354, ... }
-}
-
-ResolutionTaskHolder@356 {
-    <name not found> = ArrayList@357[7] { ResolutionCandidate@358, ResolutionCandidate@359, ResolutionCandidate@360, ... }
-    <name not found> = ArrayList@361[7] { ResolutionCandidate@358, ResolutionCandidate@359, ResolutionCandidate@360, ... }
-}
diff --git a/compiler/testData/diagnostics/tests/ValAndFunOverrideCompatibilityClash.lazy.log b/compiler/testData/diagnostics/tests/ValAndFunOverrideCompatibilityClash.lazy.log
index ce878f07266..cf901abfb14 100644
--- a/compiler/testData/diagnostics/tests/ValAndFunOverrideCompatibilityClash.lazy.log
+++ b/compiler/testData/diagnostics/tests/ValAndFunOverrideCompatibilityClash.lazy.log
@@ -389,7 +389,7 @@ LazyJavaClassifierType@379['Collection<? extends E>'] {
 
 LazyJavaClassifierType@385['Collection<? extends E>'] {
     arguments = ArrayList@386[1] { TypeProjectionImpl@387 }
-    classifier = JavaClassImpl@372['Collection']
+    classifier = JavaClassImpl@362['Collection']
     memberScope = SubstitutingScope@388
     nullable = 'true': Boolean@383
     typeConstructor = DeserializedClassTypeConstructor@384
@@ -397,7 +397,7 @@ LazyJavaClassifierType@385['Collection<? extends E>'] {
 
 LazyJavaClassifierType@389['Collection<? extends E>'] {
     arguments = ArrayList@390[1] { TypeProjectionImpl@391 }
-    classifier = JavaClassImpl@377['Collection']
+    classifier = JavaClassImpl@372['Collection']
     memberScope = SubstitutingScope@392
     nullable = 'true': Boolean@383
     typeConstructor = DeserializedClassTypeConstructor@384
@@ -405,7 +405,7 @@ LazyJavaClassifierType@389['Collection<? extends E>'] {
 
 LazyJavaClassifierType@393['Collection<? extends E>'] {
     arguments = ArrayList@394[1] { TypeProjectionImpl@395 }
-    classifier = JavaClassImpl@367['Collection']
+    classifier = JavaClassImpl@377['Collection']
     memberScope = SubstitutingScope@396
     nullable = 'true': Boolean@383
     typeConstructor = DeserializedClassTypeConstructor@384
@@ -413,7 +413,7 @@ LazyJavaClassifierType@393['Collection<? extends E>'] {
 
 LazyJavaClassifierType@397['Collection<? extends E>'] {
     arguments = ArrayList@398[1] { TypeProjectionImpl@399 }
-    classifier = JavaClassImpl@362['Collection']
+    classifier = JavaClassImpl@367['Collection']
     memberScope = SubstitutingScope@400
     nullable = 'true': Boolean@383
     typeConstructor = DeserializedClassTypeConstructor@384
@@ -469,7 +469,7 @@ LazyJavaClassifierType@426['Collection<?>'] {
 
 LazyJavaClassifierType@431['Collection<?>'] {
     arguments = ArrayList@432[1] { LazyStarProjection@433 }
-    classifier = JavaClassImpl@429['Collection']
+    classifier = JavaClassImpl@419['Collection']
     memberScope = SubstitutingScope@434
     nullable = 'true': Boolean@383
     typeConstructor = DeserializedClassTypeConstructor@384
@@ -485,7 +485,7 @@ LazyJavaClassifierType@435['Collection<?>'] {
 
 LazyJavaClassifierType@439['Collection<?>'] {
     arguments = ArrayList@440[1] { LazyStarProjection@441 }
-    classifier = JavaClassImpl@419['Collection']
+    classifier = JavaClassImpl@409['Collection']
     memberScope = SubstitutingScope@442
     nullable = 'true': Boolean@383
     typeConstructor = DeserializedClassTypeConstructor@384
@@ -501,7 +501,7 @@ LazyJavaClassifierType@443['Collection<?>'] {
 
 LazyJavaClassifierType@447['Collection<?>'] {
     arguments = ArrayList@448[1] { LazyStarProjection@449 }
-    classifier = JavaClassImpl@409['Collection']
+    classifier = JavaClassImpl@414['Collection']
     memberScope = SubstitutingScope@450
     nullable = 'true': Boolean@383
     typeConstructor = DeserializedClassTypeConstructor@384
@@ -509,7 +509,7 @@ LazyJavaClassifierType@447['Collection<?>'] {
 
 LazyJavaClassifierType@451['Collection<?>'] {
     arguments = ArrayList@452[1] { LazyStarProjection@453 }
-    classifier = JavaClassImpl@414['Collection']
+    classifier = JavaClassImpl@429['Collection']
     memberScope = SubstitutingScope@454
     nullable = 'true': Boolean@383
     typeConstructor = DeserializedClassTypeConstructor@384
@@ -556,14 +556,14 @@ LazyJavaClassifierType@475['E'] {
     arguments = ArrayList@476[empty]
     classifier = JavaTypeParameterImpl@477['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
 }
 
 LazyJavaClassifierType@478['E'] {
     arguments = ArrayList@479[empty]
     classifier = JavaTypeParameterImpl@480['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@481['E'] {
@@ -591,14 +591,14 @@ LazyJavaClassifierType@490['E'] {
     arguments = ArrayList@491[empty]
     classifier = JavaTypeParameterImpl@492['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@470
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@493['E'] {
     arguments = ArrayList@494[empty]
     classifier = JavaTypeParameterImpl@495['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@496['E'] {
@@ -612,7 +612,7 @@ LazyJavaClassifierType@499['E'] {
     arguments = ArrayList@500[empty]
     classifier = JavaTypeParameterImpl@501['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@470
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
 }
 
 LazyJavaClassifierType@502['E'] {
@@ -633,21 +633,21 @@ LazyJavaClassifierType@508['E'] {
     arguments = ArrayList@509[empty]
     classifier = JavaTypeParameterImpl@510['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
 }
 
 LazyJavaClassifierType@511['E'] {
     arguments = ArrayList@512[empty]
     classifier = JavaTypeParameterImpl@513['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@514['E'] {
     arguments = ArrayList@515[empty]
     classifier = JavaTypeParameterImpl@516['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@517['E'] {
@@ -661,21 +661,21 @@ LazyJavaClassifierType@520['E'] {
     arguments = ArrayList@521[empty]
     classifier = JavaTypeParameterImpl@522['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@470
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
 }
 
 LazyJavaClassifierType@523['E'] {
     arguments = ArrayList@524[empty]
     classifier = JavaTypeParameterImpl@525['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@470
 }
 
 LazyJavaClassifierType@526['E'] {
     arguments = ArrayList@527[empty]
     classifier = JavaTypeParameterImpl@528['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@470
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@529['E'] {
@@ -689,7 +689,7 @@ LazyJavaClassifierType@532['E'] {
     arguments = ArrayList@533[empty]
     classifier = JavaTypeParameterImpl@534['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@470
 }
 
 LazyJavaClassifierType@535['E'] {
@@ -724,7 +724,7 @@ LazyJavaClassifierType@547['E'] {
     arguments = ArrayList@548[empty]
     classifier = JavaTypeParameterImpl@549['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@470
 }
 
 LazyJavaClassifierType@550['E'] {
@@ -738,14 +738,14 @@ LazyJavaClassifierType@553['E'] {
     arguments = ArrayList@554[empty]
     classifier = JavaTypeParameterImpl@555['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
 }
 
 LazyJavaClassifierType@556['E'] {
     arguments = ArrayList@557[empty]
     classifier = JavaTypeParameterImpl@558['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@470
 }
 
 LazyJavaClassifierType@559['E'] {
@@ -766,7 +766,7 @@ LazyJavaClassifierType@565['E'] {
     arguments = ArrayList@566[empty]
     classifier = JavaTypeParameterImpl@567['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@470
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@568['E'] {
@@ -780,14 +780,14 @@ LazyJavaClassifierType@571['E'] {
     arguments = ArrayList@572[empty]
     classifier = JavaTypeParameterImpl@573['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
 }
 
 LazyJavaClassifierType@574['E'] {
     arguments = ArrayList@575[empty]
     classifier = JavaTypeParameterImpl@576['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
 }
 
 LazyJavaClassifierType@577['E'] {
@@ -808,7 +808,7 @@ LazyJavaClassifierType@583['E'] {
     arguments = ArrayList@584[empty]
     classifier = JavaTypeParameterImpl@585['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
 }
 
 LazyJavaClassifierType@586['E'] {
@@ -822,21 +822,21 @@ LazyJavaClassifierType@589['E'] {
     arguments = ArrayList@590[empty]
     classifier = JavaTypeParameterImpl@591['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
 }
 
 LazyJavaClassifierType@592['E'] {
     arguments = ArrayList@593[empty]
     classifier = JavaTypeParameterImpl@594['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@595['E'] {
     arguments = ArrayList@596[empty]
     classifier = JavaTypeParameterImpl@597['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@470
 }
 
 LazyJavaClassifierType@598['E'] {
@@ -850,334 +850,334 @@ LazyJavaClassifierType@601['E'] {
     arguments = ArrayList@602[empty]
     classifier = JavaTypeParameterImpl@603['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@604['E'] {
     arguments = ArrayList@605[empty]
-    classifier = JavaTypeParameterImpl@486['E']
+    classifier = JavaTypeParameterImpl@489['E']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
 }
 
 LazyJavaClassifierType@606['E'] {
     arguments = ArrayList@607[empty]
-    classifier = JavaTypeParameterImpl@501['E']
+    classifier = JavaTypeParameterImpl@525['E']
     nullable = 'true': Boolean@383
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@470
 }
 
 LazyJavaClassifierType@608['E'] {
     arguments = ArrayList@609[empty]
-    classifier = JavaTypeParameterImpl@576['E']
+    classifier = JavaTypeParameterImpl@594['E']
     nullable = 'true': Boolean@383
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@610['E'] {
     arguments = ArrayList@611[empty]
-    classifier = JavaTypeParameterImpl@570['E']
+    classifier = JavaTypeParameterImpl@507['E']
     nullable = 'true': Boolean@383
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@612['E'] {
     arguments = ArrayList@613[empty]
-    classifier = JavaTypeParameterImpl@558['E']
+    classifier = JavaTypeParameterImpl@546['E']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@614['E'] {
     arguments = ArrayList@615[empty]
-    classifier = JavaTypeParameterImpl@492['E']
+    classifier = JavaTypeParameterImpl@480['E']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@470
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@616['E'] {
     arguments = ArrayList@617[empty]
-    classifier = JavaTypeParameterImpl@594['E']
+    classifier = JavaTypeParameterImpl@549['E']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@470
 }
 
 LazyJavaClassifierType@618['E'] {
     arguments = ArrayList@619[empty]
-    classifier = JavaTypeParameterImpl@582['E']
+    classifier = JavaTypeParameterImpl@522['E']
     nullable = 'true': Boolean@383
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
 }
 
 LazyJavaClassifierType@620['E'] {
     arguments = ArrayList@621[empty]
-    classifier = JavaTypeParameterImpl@603['E']
+    classifier = JavaTypeParameterImpl@600['E']
     nullable = 'true': Boolean@383
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
 }
 
 LazyJavaClassifierType@622['E'] {
     arguments = ArrayList@623[empty]
-    classifier = JavaTypeParameterImpl@543['E']
+    classifier = JavaTypeParameterImpl@567['E']
     nullable = 'true': Boolean@383
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@624['E'] {
     arguments = ArrayList@625[empty]
-    classifier = JavaTypeParameterImpl@525['E']
+    classifier = JavaTypeParameterImpl@501['E']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
 }
 
 LazyJavaClassifierType@626['E'] {
     arguments = ArrayList@627[empty]
-    classifier = JavaTypeParameterImpl@573['E']
+    classifier = JavaTypeParameterImpl@555['E']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
 }
 
 LazyJavaClassifierType@628['E'] {
     arguments = ArrayList@629[empty]
-    classifier = JavaTypeParameterImpl@469['E']
+    classifier = JavaTypeParameterImpl@588['E']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@470
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@630['E'] {
     arguments = ArrayList@631[empty]
-    classifier = JavaTypeParameterImpl@461['E']
+    classifier = JavaTypeParameterImpl@585['E']
     nullable = 'true': Boolean@383
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
 }
 
 LazyJavaClassifierType@632['E'] {
     arguments = ArrayList@633[empty]
-    classifier = JavaTypeParameterImpl@504['E']
+    classifier = JavaTypeParameterImpl@483['E']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
 }
 
 LazyJavaClassifierType@634['E'] {
     arguments = ArrayList@635[empty]
-    classifier = JavaTypeParameterImpl@546['E']
+    classifier = JavaTypeParameterImpl@543['E']
     nullable = 'true': Boolean@383
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@636['E'] {
     arguments = ArrayList@637[empty]
-    classifier = JavaTypeParameterImpl@522['E']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@470
-}
-
-LazyJavaClassifierType@638['E'] {
-    arguments = ArrayList@639[empty]
-    classifier = JavaTypeParameterImpl@540['E']
+    classifier = JavaTypeParameterImpl@591['E']
     nullable = 'true': Boolean@383
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
 }
 
-LazyJavaClassifierType@640['E'] {
-    arguments = ArrayList@641[empty]
-    classifier = JavaTypeParameterImpl@473['E']
+LazyJavaClassifierType@638['E'] {
+    arguments = ArrayList@639[empty]
+    classifier = JavaTypeParameterImpl@486['E']
     nullable = 'true': Boolean@383
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
+LazyJavaClassifierType@640['E'] {
+    arguments = ArrayList@641[empty]
+    classifier = JavaTypeParameterImpl@469['E']
+    nullable = 'true': Boolean@383
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@470
+}
+
 LazyJavaClassifierType@642['E'] {
     arguments = ArrayList@643[empty]
-    classifier = JavaTypeParameterImpl@477['E']
+    classifier = JavaTypeParameterImpl@564['E']
     nullable = 'true': Boolean@383
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@644['E'] {
     arguments = ArrayList@645[empty]
-    classifier = JavaTypeParameterImpl@507['E']
+    classifier = JavaTypeParameterImpl@570['E']
     nullable = 'true': Boolean@383
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@646['E'] {
     arguments = ArrayList@647[empty]
-    classifier = JavaTypeParameterImpl@552['E']
+    classifier = JavaTypeParameterImpl@504['E']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@648['E'] {
     arguments = ArrayList@649[empty]
-    classifier = JavaTypeParameterImpl@466['E']
+    classifier = JavaTypeParameterImpl@534['E']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@470
 }
 
 LazyJavaClassifierType@650['E'] {
     arguments = ArrayList@651[empty]
-    classifier = JavaTypeParameterImpl@510['E']
+    classifier = JavaTypeParameterImpl@561['E']
     nullable = 'true': Boolean@383
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@652['E'] {
     arguments = ArrayList@653[empty]
-    classifier = JavaTypeParameterImpl@597['E']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
-}
-
-LazyJavaClassifierType@654['E'] {
-    arguments = ArrayList@655[empty]
-    classifier = JavaTypeParameterImpl@561['E']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
-}
-
-LazyJavaClassifierType@656['E'] {
-    arguments = ArrayList@657[empty]
-    classifier = JavaTypeParameterImpl@528['E']
+    classifier = JavaTypeParameterImpl@558['E']
     nullable = 'true': Boolean@383
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@470
 }
 
+LazyJavaClassifierType@654['E'] {
+    arguments = ArrayList@655[empty]
+    classifier = JavaTypeParameterImpl@582['E']
+    nullable = 'true': Boolean@383
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
+}
+
+LazyJavaClassifierType@656['E'] {
+    arguments = ArrayList@657[empty]
+    classifier = JavaTypeParameterImpl@576['E']
+    nullable = 'true': Boolean@383
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
+}
+
 LazyJavaClassifierType@658['E'] {
     arguments = ArrayList@659[empty]
-    classifier = JavaTypeParameterImpl@579['E']
+    classifier = JavaTypeParameterImpl@552['E']
     nullable = 'true': Boolean@383
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
 }
 
 LazyJavaClassifierType@660['E'] {
     arguments = ArrayList@661[empty]
-    classifier = JavaTypeParameterImpl@519['E']
+    classifier = JavaTypeParameterImpl@466['E']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
 }
 
 LazyJavaClassifierType@662['E'] {
     arguments = ArrayList@663[empty]
-    classifier = JavaTypeParameterImpl@495['E']
+    classifier = JavaTypeParameterImpl@597['E']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@470
 }
 
 LazyJavaClassifierType@664['E'] {
     arguments = ArrayList@665[empty]
-    classifier = JavaTypeParameterImpl@531['E']
+    classifier = JavaTypeParameterImpl@540['E']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
 }
 
 LazyJavaClassifierType@666['E'] {
     arguments = ArrayList@667[empty]
-    classifier = JavaTypeParameterImpl@600['E']
+    classifier = JavaTypeParameterImpl@513['E']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@668['E'] {
     arguments = ArrayList@669[empty]
-    classifier = JavaTypeParameterImpl@513['E']
+    classifier = JavaTypeParameterImpl@603['E']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@670['E'] {
     arguments = ArrayList@671[empty]
-    classifier = JavaTypeParameterImpl@537['E']
+    classifier = JavaTypeParameterImpl@473['E']
     nullable = 'true': Boolean@383
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@672['E'] {
     arguments = ArrayList@673[empty]
-    classifier = JavaTypeParameterImpl@489['E']
+    classifier = JavaTypeParameterImpl@579['E']
     nullable = 'true': Boolean@383
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
 }
 
 LazyJavaClassifierType@674['E'] {
     arguments = ArrayList@675[empty]
-    classifier = JavaTypeParameterImpl@555['E']
+    classifier = JavaTypeParameterImpl@461['E']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
 }
 
 LazyJavaClassifierType@676['E'] {
     arguments = ArrayList@677[empty]
-    classifier = JavaTypeParameterImpl@480['E']
+    classifier = JavaTypeParameterImpl@510['E']
     nullable = 'true': Boolean@383
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
 }
 
 LazyJavaClassifierType@678['E'] {
     arguments = ArrayList@679[empty]
-    classifier = JavaTypeParameterImpl@534['E']
+    classifier = JavaTypeParameterImpl@573['E']
     nullable = 'true': Boolean@383
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
 }
 
 LazyJavaClassifierType@680['E'] {
     arguments = ArrayList@681[empty]
-    classifier = JavaTypeParameterImpl@498['E']
+    classifier = JavaTypeParameterImpl@516['E']
     nullable = 'true': Boolean@383
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@682['E'] {
     arguments = ArrayList@683[empty]
-    classifier = JavaTypeParameterImpl@516['E']
+    classifier = JavaTypeParameterImpl@528['E']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@684['E'] {
     arguments = ArrayList@685[empty]
-    classifier = JavaTypeParameterImpl@585['E']
+    classifier = JavaTypeParameterImpl@537['E']
     nullable = 'true': Boolean@383
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@686['E'] {
     arguments = ArrayList@687[empty]
-    classifier = JavaTypeParameterImpl@591['E']
+    classifier = JavaTypeParameterImpl@495['E']
     nullable = 'true': Boolean@383
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@688['E'] {
     arguments = ArrayList@689[empty]
-    classifier = JavaTypeParameterImpl@567['E']
+    classifier = JavaTypeParameterImpl@531['E']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@470
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@690['E'] {
     arguments = ArrayList@691[empty]
-    classifier = JavaTypeParameterImpl@564['E']
+    classifier = JavaTypeParameterImpl@519['E']
     nullable = 'true': Boolean@383
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@692['E'] {
     arguments = ArrayList@693[empty]
-    classifier = JavaTypeParameterImpl@549['E']
+    classifier = JavaTypeParameterImpl@492['E']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@694['E'] {
     arguments = ArrayList@695[empty]
-    classifier = JavaTypeParameterImpl@483['E']
+    classifier = JavaTypeParameterImpl@477['E']
     nullable = 'true': Boolean@383
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
 }
 
 LazyJavaClassifierType@696['E'] {
     arguments = ArrayList@697[empty]
-    classifier = JavaTypeParameterImpl@588['E']
+    classifier = JavaTypeParameterImpl@498['E']
     nullable = 'true': Boolean@383
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
@@ -1208,7 +1208,7 @@ LazyJavaClassifierType@709['Iterator<E>'] {
 
 LazyJavaClassifierType@714['Iterator<E>'] {
     arguments = ArrayList@715[1] { TypeProjectionImpl@716 }
-    classifier = JavaClassImpl@701['Iterator']
+    classifier = JavaClassImpl@712['Iterator']
     memberScope = SubstitutingScope@717
     nullable = 'true': Boolean@383
     typeConstructor = DeserializedClassTypeConstructor@718
@@ -1216,7 +1216,7 @@ LazyJavaClassifierType@714['Iterator<E>'] {
 
 LazyJavaClassifierType@719['Iterator<E>'] {
     arguments = ArrayList@720[1] { TypeProjectionImpl@721 }
-    classifier = JavaClassImpl@707['Iterator']
+    classifier = JavaClassImpl@701['Iterator']
     memberScope = SubstitutingScope@722
     nullable = 'true': Boolean@383
     typeConstructor = DeserializedClassTypeConstructor@718
@@ -1224,7 +1224,7 @@ LazyJavaClassifierType@719['Iterator<E>'] {
 
 LazyJavaClassifierType@723['Iterator<E>'] {
     arguments = ArrayList@724[1] { TypeProjectionImpl@725 }
-    classifier = JavaClassImpl@712['Iterator']
+    classifier = JavaClassImpl@707['Iterator']
     memberScope = SubstitutingScope@726
     nullable = 'true': Boolean@383
     typeConstructor = DeserializedClassTypeConstructor@718
@@ -1238,15 +1238,15 @@ LazyJavaClassifierType@330['List<E>'] {
     typeConstructor = DeserializedClassTypeConstructor@731
 }
 
-LazyJavaClassifierType@732['List<E>'] {
-    arguments = ArrayList@733[1] { TypeProjectionImpl@734 }
-    classifier = JavaClassImpl@735['List']
-    memberScope = SubstitutingScope@736
+LazyJavaClassifierType@325['List<E>'] {
+    arguments = ArrayList@732[1] { TypeProjectionImpl@733 }
+    classifier = JavaClassImpl@734['List']
+    memberScope = SubstitutingScope@735
     nullable = 'false': Boolean@343
     typeConstructor = DeserializedClassTypeConstructor@731
 }
 
-LazyJavaClassifierType@325['List<E>'] {
+LazyJavaClassifierType@736['List<E>'] {
     arguments = ArrayList@737[1] { TypeProjectionImpl@738 }
     classifier = JavaClassImpl@739['List']
     memberScope = SubstitutingScope@740
@@ -1264,7 +1264,7 @@ LazyJavaClassifierType@741['List<E>'] {
 
 LazyJavaClassifierType@746['List<E>'] {
     arguments = ArrayList@747[1] { TypeProjectionImpl@748 }
-    classifier = JavaClassImpl@735['List']
+    classifier = JavaClassImpl@744['List']
     memberScope = SubstitutingScope@749
     nullable = 'true': Boolean@383
     typeConstructor = DeserializedClassTypeConstructor@750
@@ -1272,7 +1272,7 @@ LazyJavaClassifierType@746['List<E>'] {
 
 LazyJavaClassifierType@751['List<E>'] {
     arguments = ArrayList@752[1] { TypeProjectionImpl@753 }
-    classifier = JavaClassImpl@744['List']
+    classifier = JavaClassImpl@739['List']
     memberScope = SubstitutingScope@754
     nullable = 'true': Boolean@383
     typeConstructor = DeserializedClassTypeConstructor@750
@@ -1312,7 +1312,7 @@ LazyJavaClassifierType@771['ListIterator<E>'] {
 
 LazyJavaClassifierType@776['ListIterator<E>'] {
     arguments = ArrayList@777[1] { TypeProjectionImpl@778 }
-    classifier = JavaClassImpl@774['ListIterator']
+    classifier = JavaClassImpl@764['ListIterator']
     memberScope = SubstitutingScope@779
     nullable = 'true': Boolean@383
     typeConstructor = DeserializedClassTypeConstructor@780
@@ -1320,7 +1320,7 @@ LazyJavaClassifierType@776['ListIterator<E>'] {
 
 LazyJavaClassifierType@781['ListIterator<E>'] {
     arguments = ArrayList@782[1] { TypeProjectionImpl@783 }
-    classifier = JavaClassImpl@758['ListIterator']
+    classifier = JavaClassImpl@774['ListIterator']
     memberScope = SubstitutingScope@784
     nullable = 'true': Boolean@383
     typeConstructor = DeserializedClassTypeConstructor@780
@@ -1336,7 +1336,7 @@ LazyJavaClassifierType@785['ListIterator<E>'] {
 
 LazyJavaClassifierType@789['ListIterator<E>'] {
     arguments = ArrayList@790[1] { TypeProjectionImpl@791 }
-    classifier = JavaClassImpl@764['ListIterator']
+    classifier = JavaClassImpl@758['ListIterator']
     memberScope = SubstitutingScope@792
     nullable = 'true': Boolean@383
     typeConstructor = DeserializedClassTypeConstructor@780
@@ -1448,7 +1448,7 @@ LazyJavaClassifierType@831['Object'] {
 
 LazyJavaClassifierType@834['Object'] {
     arguments = ArrayList@835[empty]
-    classifier = JavaClassImpl@830['Object']
+    classifier = JavaClassImpl@809['Object']
     memberScope = DeserializedClassMemberScope@796
     nullable = 'true': Boolean@383
     typeConstructor = DeserializedClassTypeConstructor@797
@@ -1456,7 +1456,7 @@ LazyJavaClassifierType@834['Object'] {
 
 LazyJavaClassifierType@836['Object'] {
     arguments = ArrayList@837[empty]
-    classifier = JavaClassImpl@821['Object']
+    classifier = JavaClassImpl@830['Object']
     memberScope = DeserializedClassMemberScope@796
     nullable = 'true': Boolean@383
     typeConstructor = DeserializedClassTypeConstructor@797
@@ -1464,7 +1464,7 @@ LazyJavaClassifierType@836['Object'] {
 
 LazyJavaClassifierType@838['Object'] {
     arguments = ArrayList@839[empty]
-    classifier = JavaClassImpl@800['Object']
+    classifier = JavaClassImpl@821['Object']
     memberScope = DeserializedClassMemberScope@796
     nullable = 'true': Boolean@383
     typeConstructor = DeserializedClassTypeConstructor@797
@@ -1480,7 +1480,7 @@ LazyJavaClassifierType@840['Object'] {
 
 LazyJavaClassifierType@842['Object'] {
     arguments = ArrayList@843[empty]
-    classifier = JavaClassImpl@827['Object']
+    classifier = JavaClassImpl@800['Object']
     memberScope = DeserializedClassMemberScope@796
     nullable = 'true': Boolean@383
     typeConstructor = DeserializedClassTypeConstructor@797
@@ -1488,7 +1488,7 @@ LazyJavaClassifierType@842['Object'] {
 
 LazyJavaClassifierType@844['Object'] {
     arguments = ArrayList@845[empty]
-    classifier = JavaClassImpl@812['Object']
+    classifier = JavaClassImpl@795['Object']
     memberScope = DeserializedClassMemberScope@796
     nullable = 'true': Boolean@383
     typeConstructor = DeserializedClassTypeConstructor@797
@@ -1496,7 +1496,7 @@ LazyJavaClassifierType@844['Object'] {
 
 LazyJavaClassifierType@846['Object'] {
     arguments = ArrayList@847[empty]
-    classifier = JavaClassImpl@795['Object']
+    classifier = JavaClassImpl@827['Object']
     memberScope = DeserializedClassMemberScope@796
     nullable = 'true': Boolean@383
     typeConstructor = DeserializedClassTypeConstructor@797
@@ -1504,7 +1504,7 @@ LazyJavaClassifierType@846['Object'] {
 
 LazyJavaClassifierType@848['Object'] {
     arguments = ArrayList@849[empty]
-    classifier = JavaClassImpl@809['Object']
+    classifier = JavaClassImpl@824['Object']
     memberScope = DeserializedClassMemberScope@796
     nullable = 'true': Boolean@383
     typeConstructor = DeserializedClassTypeConstructor@797
@@ -1512,7 +1512,7 @@ LazyJavaClassifierType@848['Object'] {
 
 LazyJavaClassifierType@850['Object'] {
     arguments = ArrayList@851[empty]
-    classifier = JavaClassImpl@815['Object']
+    classifier = JavaClassImpl@812['Object']
     memberScope = DeserializedClassMemberScope@796
     nullable = 'true': Boolean@383
     typeConstructor = DeserializedClassTypeConstructor@797
@@ -1520,7 +1520,7 @@ LazyJavaClassifierType@850['Object'] {
 
 LazyJavaClassifierType@852['Object'] {
     arguments = ArrayList@853[empty]
-    classifier = JavaClassImpl@833['Object']
+    classifier = JavaClassImpl@803['Object']
     memberScope = DeserializedClassMemberScope@796
     nullable = 'true': Boolean@383
     typeConstructor = DeserializedClassTypeConstructor@797
@@ -1528,7 +1528,7 @@ LazyJavaClassifierType@852['Object'] {
 
 LazyJavaClassifierType@854['Object'] {
     arguments = ArrayList@855[empty]
-    classifier = JavaClassImpl@824['Object']
+    classifier = JavaClassImpl@815['Object']
     memberScope = DeserializedClassMemberScope@796
     nullable = 'true': Boolean@383
     typeConstructor = DeserializedClassTypeConstructor@797
@@ -1544,7 +1544,7 @@ LazyJavaClassifierType@856['Object'] {
 
 LazyJavaClassifierType@858['Object'] {
     arguments = ArrayList@859[empty]
-    classifier = JavaClassImpl@803['Object']
+    classifier = JavaClassImpl@833['Object']
     memberScope = DeserializedClassMemberScope@796
     nullable = 'true': Boolean@383
     typeConstructor = DeserializedClassTypeConstructor@797
@@ -1647,7 +1647,7 @@ LazyJavaClassifierType@894['String'] {
 
 LazyJavaClassifierType@896['String'] {
     arguments = ArrayList@897[empty]
-    classifier = JavaClassImpl@885['String']
+    classifier = JavaClassImpl@893['String']
     memberScope = DeserializedClassMemberScope@886
     nullable = 'true': Boolean@383
     typeConstructor = DeserializedClassTypeConstructor@887
@@ -1655,7 +1655,7 @@ LazyJavaClassifierType@896['String'] {
 
 LazyJavaClassifierType@898['String'] {
     arguments = ArrayList@899[empty]
-    classifier = JavaClassImpl@893['String']
+    classifier = JavaClassImpl@885['String']
     memberScope = DeserializedClassMemberScope@886
     nullable = 'true': Boolean@383
     typeConstructor = DeserializedClassTypeConstructor@887
@@ -1672,49 +1672,49 @@ LazyJavaClassifierType@904['T'] {
     arguments = ArrayList@905[empty]
     classifier = JavaTypeParameterImpl@906['T']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@903
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@907
 }
 
-LazyJavaClassifierType@907['T'] {
-    arguments = ArrayList@908[empty]
-    classifier = JavaTypeParameterImpl@909['T']
+LazyJavaClassifierType@908['T'] {
+    arguments = ArrayList@909[empty]
+    classifier = JavaTypeParameterImpl@910['T']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@910
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@903
 }
 
 LazyJavaClassifierType@911['T'] {
     arguments = ArrayList@912[empty]
     classifier = JavaTypeParameterImpl@913['T']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@910
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@907
 }
 
 LazyJavaClassifierType@914['T'] {
     arguments = ArrayList@915[empty]
-    classifier = JavaTypeParameterImpl@913['T']
+    classifier = JavaTypeParameterImpl@906['T']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@910
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@907
 }
 
 LazyJavaClassifierType@916['T'] {
     arguments = ArrayList@917[empty]
-    classifier = JavaTypeParameterImpl@909['T']
+    classifier = JavaTypeParameterImpl@910['T']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@910
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@903
 }
 
 LazyJavaClassifierType@918['T'] {
     arguments = ArrayList@919[empty]
-    classifier = JavaTypeParameterImpl@906['T']
+    classifier = JavaTypeParameterImpl@902['T']
     nullable = 'true': Boolean@383
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@903
 }
 
 LazyJavaClassifierType@920['T'] {
     arguments = ArrayList@921[empty]
-    classifier = JavaTypeParameterImpl@902['T']
+    classifier = JavaTypeParameterImpl@913['T']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@903
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@907
 }
 
 LazyJavaPackageFragmentProvider@922 {
@@ -1765,16 +1765,16 @@ LazyJavaPackageFragment@938['util'] {
     classes('ArrayList': Name@956) = LazyJavaClassDescriptor@163['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@957
 }
 
-LazyJavaTypeParameterDescriptor@322['E'] {
+LazyJavaTypeParameterDescriptor@327['E'] {
     defaultType = JetTypeImpl@958['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
     upperBounds = LinkedHashSet@959[1] { NullableType@960 }
     upperBoundsAsType = NullableType@960
 }
 
-LazyJavaTypeParameterDescriptor@327['E'] {
+LazyJavaTypeParameterDescriptor@322['E'] {
     defaultType = JetTypeImpl@961['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
     upperBounds = LinkedHashSet@962[1] { NullableType@963 }
     upperBoundsAsType = NullableType@963
 }
@@ -1788,127 +1788,127 @@ LazyJavaTypeParameterDescriptor@318['E'] {
 
 LazyJavaTypeParameterDescriptor@967['T'] {
     defaultType = JetTypeImpl@968['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@903
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@907
     upperBounds = LinkedHashSet@969[1] { NullableType@970 }
     upperBoundsAsType = NullableType@970
 }
 
 LazyJavaTypeParameterDescriptor@971['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@910
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@903
     upperBounds = LinkedHashSet@972[1] { NullableType@973 }
     upperBoundsAsType = NullableType@973
 }
 
 LazyJavaTypeParameterResolver@974 {
-    resolve(JavaTypeParameterImpl@975['E']) = LazyJavaTypeParameterDescriptor@322['E']
+    resolve(JavaTypeParameterImpl@975['E']) = LazyJavaTypeParameterDescriptor@318['E']
 }
 
 LazyJavaTypeParameterResolver@976 {
-    resolve(JavaTypeParameterImpl@977['E']) = LazyJavaTypeParameterDescriptor@318['E']
+    resolve(JavaTypeParameterImpl@977['E']) = LazyJavaTypeParameterDescriptor@327['E']
 }
 
 LazyJavaTypeParameterResolver@978 {
-    resolve(JavaTypeParameterImpl@979['E']) = LazyJavaTypeParameterDescriptor@327['E']
+    resolve(JavaTypeParameterImpl@979['E']) = LazyJavaTypeParameterDescriptor@322['E']
 }
 
 LazyJavaTypeParameterResolver@980 {
-    resolve(JavaTypeParameterImpl@531['E']) = null
+    resolve(JavaTypeParameterImpl@549['E']) = null
 }
 
 LazyJavaTypeParameterResolver@981 {
-    resolve(JavaTypeParameterImpl@537['E']) = null
-}
-
-LazyJavaTypeParameterResolver@982 {
-    resolve(JavaTypeParameterImpl@477['E']) = null
-}
-
-LazyJavaTypeParameterResolver@983 {
-    resolve(JavaTypeParameterImpl@552['E']) = null
-}
-
-LazyJavaTypeParameterResolver@984 {
-    resolve(JavaTypeParameterImpl@483['E']) = null
-}
-
-LazyJavaTypeParameterResolver@985 {
-    resolve(JavaTypeParameterImpl@579['E']) = null
-}
-
-LazyJavaTypeParameterResolver@986 {
-    resolve(JavaTypeParameterImpl@576['E']) = null
-}
-
-LazyJavaTypeParameterResolver@987 {
-    resolve(JavaTypeParameterImpl@567['E']) = null
-}
-
-LazyJavaTypeParameterResolver@988 {
-    resolve(JavaTypeParameterImpl@564['E']) = null
-}
-
-LazyJavaTypeParameterResolver@989 {
-    resolve(JavaTypeParameterImpl@492['E']) = null
-}
-
-LazyJavaTypeParameterResolver@990 {
-    resolve(JavaTypeParameterImpl@522['E']) = null
-}
-
-LazyJavaTypeParameterResolver@991 {
-    resolve(JavaTypeParameterImpl@466['E']) = null
-}
-
-LazyJavaTypeParameterResolver@992 {
-    resolve(JavaTypeParameterImpl@558['E']) = null
-}
-
-LazyJavaTypeParameterResolver@993 {
-    resolve(JavaTypeParameterImpl@561['E']) = null
-}
-
-LazyJavaTypeParameterResolver@994 {
-    resolve(JavaTypeParameterImpl@480['E']) = null
-}
-
-LazyJavaTypeParameterResolver@995 {
-    resolve(JavaTypeParameterImpl@513['E']) = null
-}
-
-LazyJavaTypeParameterResolver@996 {
-    resolve(JavaTypeParameterImpl@519['E']) = null
-}
-
-LazyJavaTypeParameterResolver@997 {
-    resolve(JavaTypeParameterImpl@546['E']) = null
-}
-
-LazyJavaTypeParameterResolver@998 {
     resolve(JavaTypeParameterImpl@555['E']) = null
 }
 
-LazyJavaTypeParameterResolver@999 {
+LazyJavaTypeParameterResolver@982 {
+    resolve(JavaTypeParameterImpl@567['E']) = null
+}
+
+LazyJavaTypeParameterResolver@983 {
+    resolve(JavaTypeParameterImpl@504['E']) = null
+}
+
+LazyJavaTypeParameterResolver@984 {
+    resolve(JavaTypeParameterImpl@480['E']) = null
+}
+
+LazyJavaTypeParameterResolver@985 {
+    resolve(JavaTypeParameterImpl@570['E']) = null
+}
+
+LazyJavaTypeParameterResolver@986 {
+    resolve(JavaTypeParameterImpl@516['E']) = null
+}
+
+LazyJavaTypeParameterResolver@987 {
+    resolve(JavaTypeParameterImpl@519['E']) = null
+}
+
+LazyJavaTypeParameterResolver@988 {
+    resolve(JavaTypeParameterImpl@582['E']) = null
+}
+
+LazyJavaTypeParameterResolver@989 {
+    resolve(JavaTypeParameterImpl@507['E']) = null
+}
+
+LazyJavaTypeParameterResolver@990 {
+    resolve(JavaTypeParameterImpl@513['E']) = null
+}
+
+LazyJavaTypeParameterResolver@991 {
+    resolve(JavaTypeParameterImpl@558['E']) = null
+}
+
+LazyJavaTypeParameterResolver@992 {
+    resolve(JavaTypeParameterImpl@585['E']) = null
+}
+
+LazyJavaTypeParameterResolver@993 {
+    resolve(JavaTypeParameterImpl@531['E']) = null
+}
+
+LazyJavaTypeParameterResolver@994 {
+    resolve(JavaTypeParameterImpl@552['E']) = null
+}
+
+LazyJavaTypeParameterResolver@995 {
+    resolve(JavaTypeParameterImpl@510['E']) = null
+}
+
+LazyJavaTypeParameterResolver@996 {
+    resolve(JavaTypeParameterImpl@486['E']) = null
+}
+
+LazyJavaTypeParameterResolver@997 {
     resolve(JavaTypeParameterImpl@591['E']) = null
 }
 
+LazyJavaTypeParameterResolver@998 {
+    resolve(JavaTypeParameterImpl@466['E']) = null
+}
+
+LazyJavaTypeParameterResolver@999 {
+    resolve(JavaTypeParameterImpl@469['E']) = null
+}
+
 LazyJavaTypeParameterResolver@1000 {
-    resolve(JavaTypeParameterImpl@594['E']) = null
+    resolve(JavaTypeParameterImpl@546['E']) = null
 }
 
 LazyJavaTypeParameterResolver@1001 {
-    resolve(JavaTypeParameterImpl@540['E']) = null
+    resolve(JavaTypeParameterImpl@501['E']) = null
 }
 
 LazyJavaTypeParameterResolver@1002 {
-    resolve(JavaTypeParameterImpl@603['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1003 {
     resolve(JavaTypeParameterImpl@573['E']) = null
 }
 
+LazyJavaTypeParameterResolver@1003 {
+    resolve(JavaTypeParameterImpl@522['E']) = null
+}
+
 LazyJavaTypeParameterResolver@1004 {
-    resolve(JavaTypeParameterImpl@588['E']) = null
+    resolve(JavaTypeParameterImpl@495['E']) = null
 }
 
 LazyJavaTypeParameterResolver@1005 {
@@ -1921,10 +1921,13 @@ LazyJavaTypeParameterResolver@1007 {
 
 ResolutionTaskHolder@1009 {
     <name not found> = ArrayList@1010[1] { ResolutionCandidate@1011 }
-    <name not found> = ArrayList@1012[1] { ResolutionCandidate@1011 }
 }
 
-ResolutionTaskHolder@1013 {
-    <name not found> = ArrayList@1014[3] { ResolutionCandidate@1015, ResolutionCandidate@1016, ResolutionCandidate@1017 }
-    <name not found> = ArrayList@1018[3] { ResolutionCandidate@1015, ResolutionCandidate@1016, ResolutionCandidate@1017 }
+ResolutionTaskHolder@1012 {
+    <name not found> = ArrayList@1013[3] { ResolutionCandidate@1014, ResolutionCandidate@1015, ResolutionCandidate@1016 }
+}
+
+null {
+    <name not found> = ArrayList@1017[1] { ResolutionCandidate@1011 }
+    <name not found> = ArrayList@1018[3] { ResolutionCandidate@1014, ResolutionCandidate@1015, ResolutionCandidate@1016 }
 }
diff --git a/compiler/testData/diagnostics/tests/VarargTypes.lazy.log b/compiler/testData/diagnostics/tests/VarargTypes.lazy.log
index 27d1e69489b..67188424ede 100644
--- a/compiler/testData/diagnostics/tests/VarargTypes.lazy.log
+++ b/compiler/testData/diagnostics/tests/VarargTypes.lazy.log
@@ -59,21 +59,21 @@ LazyJavaClassifierType@37['T'] {
 
 LazyJavaClassifierType@40['T'] {
     arguments = ArrayList@41[empty]
-    classifier = JavaTypeParameterImpl@36['T']
+    classifier = JavaTypeParameterImpl@32['T']
     nullable = 'true': Boolean@25
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@33
 }
 
 LazyJavaClassifierType@42['T'] {
     arguments = ArrayList@43[empty]
-    classifier = JavaTypeParameterImpl@32['T']
+    classifier = JavaTypeParameterImpl@39['T']
     nullable = 'true': Boolean@25
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@33
 }
 
 LazyJavaClassifierType@44['T'] {
     arguments = ArrayList@45[empty]
-    classifier = JavaTypeParameterImpl@39['T']
+    classifier = JavaTypeParameterImpl@36['T']
     nullable = 'true': Boolean@25
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@33
 }
@@ -283,148 +283,107 @@ LazyJavaTypeParameterResolver@179 {
 
 ResolutionTaskHolder@181 {
     <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@183 }
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
 }
 
-ResolutionTaskHolder@185 {
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@187 }
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
+ResolutionTaskHolder@184 {
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
 }
 
-ResolutionTaskHolder@189 {
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@191 }
+ResolutionTaskHolder@187 {
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
+}
+
+ResolutionTaskHolder@190 {
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@192 }
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
 }
 
 ResolutionTaskHolder@193 {
     <name not found> = ArrayList@194[1] { ResolutionCandidate@195 }
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@195 }
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
 }
 
-ResolutionTaskHolder@197 {
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@199 }
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@199 }
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
+ResolutionTaskHolder@196 {
+    <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
 }
 
-ResolutionTaskHolder@201 {
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@203 }
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
+ResolutionTaskHolder@199 {
+    <name not found> = ArrayList@200[1] { ResolutionCandidate@201 }
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
 }
 
+ResolutionTaskHolder@202 {
+    <name not found> = ArrayList@203[1] { ResolutionCandidate@204 }
+}
+
 ResolutionTaskHolder@205 {
     <name not found> = ArrayList@206[1] { ResolutionCandidate@207 }
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@207 }
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
 }
 
-ResolutionTaskHolder@209 {
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@211 }
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@211 }
+ResolutionTaskHolder@208 {
+    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
 }
 
-ResolutionTaskHolder@213 {
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@215 }
+ResolutionTaskHolder@211 {
+    <name not found> = ArrayList@212[1] { ResolutionCandidate@213 }
+}
+
+ResolutionTaskHolder@214 {
+    <name not found> = ArrayList@215[1] { ResolutionCandidate@216 }
 }
 
 ResolutionTaskHolder@217 {
     <name not found> = ArrayList@218[1] { ResolutionCandidate@219 }
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@219 }
 }
 
-ResolutionTaskHolder@221 {
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@223 }
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@223 }
+ResolutionTaskHolder@220 {
+    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
 }
 
-ResolutionTaskHolder@225 {
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@227 }
+ResolutionTaskHolder@223 {
+    <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
+}
+
+ResolutionTaskHolder@226 {
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
 }
 
 ResolutionTaskHolder@229 {
     <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@231 }
 }
 
-ResolutionTaskHolder@233 {
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@235 }
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@235 }
+ResolutionTaskHolder@232 {
+    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
 }
 
-ResolutionTaskHolder@237 {
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@239 }
+ResolutionTaskHolder@235 {
+    <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
 }
 
-ResolutionTaskHolder@241 {
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@243 }
-}
-
-ResolutionTaskHolder@245 {
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@247 }
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@247 }
-}
-
-ResolutionTaskHolder@249 {
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
-    <name not found> = ArrayList@252[1] { ResolutionCandidate@251 }
-}
-
-ResolutionTaskHolder@253 {
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@255 }
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@255 }
-}
-
-ResolutionTaskHolder@257 {
-    <name not found> = ArrayList@258[2] { ResolutionCandidate@259, ResolutionCandidate@260 }
-    <name not found> = ArrayList@261[2] { ResolutionCandidate@259, ResolutionCandidate@260 }
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
+ResolutionTaskHolder@238 {
+    <name not found> = ArrayList@239[2] { ResolutionCandidate@240, ResolutionCandidate@241 }
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
 }
 
-ResolutionTaskHolder@262 {
-    <name not found> = ArrayList@263[2] { ResolutionCandidate@264, ResolutionCandidate@265 }
-    <name not found> = ArrayList@266[2] { ResolutionCandidate@264, ResolutionCandidate@265 }
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
+ResolutionTaskHolder@242 {
+    <name not found> = ArrayList@243[2] { ResolutionCandidate@244, ResolutionCandidate@245 }
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
 }
 
-ResolutionTaskHolder@267 {
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
+ResolutionTaskHolder@246 {
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
@@ -435,7 +394,51 @@ ResolutionTaskHolder@267 {
     <name not found> = EmptyList@7[empty]
 }
 
-ResolutionTaskHolder@268 {
+ResolutionTaskHolder@247 {
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+}
+
+null {
+    <name not found> = ArrayList@248[1] { ResolutionCandidate@237 }
+    <name not found> = ArrayList@249[1] { ResolutionCandidate@222 }
+    <name not found> = ArrayList@250[1] { ResolutionCandidate@231 }
+    <name not found> = ArrayList@251[1] { ResolutionCandidate@225 }
+    <name not found> = ArrayList@252[1] { ResolutionCandidate@228 }
+    <name not found> = ArrayList@253[1] { ResolutionCandidate@204 }
+    <name not found> = ArrayList@254[1] { ResolutionCandidate@216 }
+    <name not found> = ArrayList@255[1] { ResolutionCandidate@234 }
+    <name not found> = ArrayList@256[1] { ResolutionCandidate@210 }
+    <name not found> = ArrayList@257[1] { ResolutionCandidate@201 }
+    <name not found> = ArrayList@258[1] { ResolutionCandidate@195 }
+    <name not found> = ArrayList@259[1] { ResolutionCandidate@189 }
+    <name not found> = ArrayList@260[1] { ResolutionCandidate@192 }
+    <name not found> = ArrayList@261[1] { ResolutionCandidate@198 }
+    <name not found> = ArrayList@262[1] { ResolutionCandidate@186 }
+    <name not found> = ArrayList@263[1] { ResolutionCandidate@213 }
+    <name not found> = ArrayList@264[1] { ResolutionCandidate@219 }
+    <name not found> = ArrayList@265[1] { ResolutionCandidate@207 }
+    <name not found> = ArrayList@266[1] { ResolutionCandidate@183 }
+    <name not found> = ArrayList@267[2] { ResolutionCandidate@244, ResolutionCandidate@245 }
+    <name not found> = ArrayList@268[2] { ResolutionCandidate@240, ResolutionCandidate@241 }
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
diff --git a/compiler/testData/diagnostics/tests/Varargs.lazy.log b/compiler/testData/diagnostics/tests/Varargs.lazy.log
index 10cfa726b69..e5a432168f2 100644
--- a/compiler/testData/diagnostics/tests/Varargs.lazy.log
+++ b/compiler/testData/diagnostics/tests/Varargs.lazy.log
@@ -50,10 +50,6 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@38 {
     <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -71,12 +67,8 @@ ResolutionTaskHolder@38 {
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -94,10 +86,8 @@ ResolutionTaskHolder@42 {
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -113,83 +103,96 @@ ResolutionTaskHolder@46 {
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
 ResolutionTaskHolder@50 {
     <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
 ResolutionTaskHolder@62 {
     <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
+null {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@40 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
-}
diff --git a/compiler/testData/diagnostics/tests/Variance.lazy.log b/compiler/testData/diagnostics/tests/Variance.lazy.log
index 54441963349..406e8a5b6d8 100644
--- a/compiler/testData/diagnostics/tests/Variance.lazy.log
+++ b/compiler/testData/diagnostics/tests/Variance.lazy.log
@@ -63,10 +63,6 @@ LazyJavaPackageFragment@14['lang'] {
 
 ResolutionTaskHolder@56 {
     <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
@@ -84,12 +80,8 @@ ResolutionTaskHolder@56 {
     <name not found> = EmptyList@47[empty]
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
     <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
@@ -107,116 +99,127 @@ ResolutionTaskHolder@60 {
     <name not found> = EmptyList@47[empty]
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
     <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
+}
+
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
     <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
 }
 
 ResolutionTaskHolder@68 {
     <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
     <name not found> = EmptyList@47[empty]
 }
 
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
+}
+
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
 }
 
 ResolutionTaskHolder@80 {
     <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
 }
 
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
 }
 
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
+}
+
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
 }
 
 ResolutionTaskHolder@92 {
     <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
 }
 
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
 }
 
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
+}
+
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
 }
 
 ResolutionTaskHolder@104 {
     <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
 }
 
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
 }
 
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
+}
+
+ResolutionTaskHolder@113 {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
 }
 
 ResolutionTaskHolder@116 {
     <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
 }
 
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
+ResolutionTaskHolder@119 {
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
 }
 
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@126 }
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
-}
-
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
-}
-
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
+null {
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@73 }
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/annotations/AmbigiousAnnotationConstructor.lazy.log b/compiler/testData/diagnostics/tests/annotations/AmbigiousAnnotationConstructor.lazy.log
index 4c670d12ac7..1bc3ae3f739 100644
--- a/compiler/testData/diagnostics/tests/annotations/AmbigiousAnnotationConstructor.lazy.log
+++ b/compiler/testData/diagnostics/tests/annotations/AmbigiousAnnotationConstructor.lazy.log
@@ -156,15 +156,51 @@ LazyJavaTypeParameterResolver@107 {
 
 ResolutionTaskHolder@109 {
     <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
     <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]
 }
 
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[3] { ResolutionCandidate@115, ResolutionCandidate@116, ResolutionCandidate@117 }
-    <name not found> = ArrayList@118[3] { ResolutionCandidate@115, ResolutionCandidate@116, ResolutionCandidate@117 }
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[3] { ResolutionCandidate@114, ResolutionCandidate@115, ResolutionCandidate@116 }
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+}
+
+ResolutionTaskHolder@117 {
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+}
+
+ResolutionTaskHolder@118 {
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]
@@ -179,18 +215,6 @@ ResolutionTaskHolder@119 {
     <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
 }
 
 ResolutionTaskHolder@120 {
@@ -202,34 +226,13 @@ ResolutionTaskHolder@120 {
     <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
 }
 
-ResolutionTaskHolder@121 {
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-}
-
-ResolutionTaskHolder@122 {
+null {
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@122[3] { ResolutionCandidate@114, ResolutionCandidate@115, ResolutionCandidate@116 }
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]
diff --git a/compiler/testData/diagnostics/tests/annotations/AnnotatedConstructorParams.lazy.log b/compiler/testData/diagnostics/tests/annotations/AnnotatedConstructorParams.lazy.log
index 20776d58c5c..8299439485e 100644
--- a/compiler/testData/diagnostics/tests/annotations/AnnotatedConstructorParams.lazy.log
+++ b/compiler/testData/diagnostics/tests/annotations/AnnotatedConstructorParams.lazy.log
@@ -326,49 +326,38 @@ LazyJavaPackageFragment@170['lang'] {
 
 ResolutionTaskHolder@204 {
     <name not found> = ArrayList@205[10] { ResolutionCandidate@206, ResolutionCandidate@207, ResolutionCandidate@208, ... }
-    <name not found> = ArrayList@209[10] { ResolutionCandidate@206, ResolutionCandidate@207, ResolutionCandidate@208, ... }
 }
 
-ResolutionTaskHolder@210 {
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@212 }
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@212 }
-    <name not found> = EmptyList@26[empty]
+ResolutionTaskHolder@209 {
+    <name not found> = ArrayList@210[1] { ResolutionCandidate@211 }
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@214 {
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@216 }
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@216 }
+ResolutionTaskHolder@212 {
+    <name not found> = ArrayList@213[1] { ResolutionCandidate@214 }
+}
+
+ResolutionTaskHolder@215 {
+    <name not found> = ArrayList@216[1] { ResolutionCandidate@217 }
 }
 
 ResolutionTaskHolder@218 {
     <name not found> = ArrayList@219[1] { ResolutionCandidate@220 }
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@220 }
 }
 
-ResolutionTaskHolder@222 {
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@224 }
+ResolutionTaskHolder@221 {
+    <name not found> = ArrayList@222[1] { ResolutionCandidate@223 }
 }
 
-ResolutionTaskHolder@226 {
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@228 }
+ResolutionTaskHolder@224 {
+    <name not found> = ArrayList@225[1] { ResolutionCandidate@226 }
+}
+
+ResolutionTaskHolder@227 {
+    <name not found> = ArrayList@228[1] { ResolutionCandidate@229 }
 }
 
 ResolutionTaskHolder@230 {
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@232 }
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@232 }
-}
-
-ResolutionTaskHolder@234 {
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@236 }
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@236 }
-}
-
-ResolutionTaskHolder@238 {
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
@@ -378,3 +367,17 @@ ResolutionTaskHolder@238 {
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
+
+null {
+    <name not found> = ArrayList@231[10] { ResolutionCandidate@206, ResolutionCandidate@207, ResolutionCandidate@208, ... }
+    <name not found> = ArrayList@232[1] { ResolutionCandidate@223 }
+    <name not found> = ArrayList@233[1] { ResolutionCandidate@214 }
+    <name not found> = ArrayList@234[1] { ResolutionCandidate@226 }
+    <name not found> = ArrayList@235[1] { ResolutionCandidate@229 }
+    <name not found> = ArrayList@236[1] { ResolutionCandidate@220 }
+    <name not found> = ArrayList@237[1] { ResolutionCandidate@217 }
+    <name not found> = ArrayList@238[1] { ResolutionCandidate@211 }
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/annotations/AnnotationsForClasses.lazy.log b/compiler/testData/diagnostics/tests/annotations/AnnotationsForClasses.lazy.log
index 0656b4967a4..425c0b5430c 100644
--- a/compiler/testData/diagnostics/tests/annotations/AnnotationsForClasses.lazy.log
+++ b/compiler/testData/diagnostics/tests/annotations/AnnotationsForClasses.lazy.log
@@ -52,10 +52,13 @@ LazyJavaPackageFragment@20['lang'] {
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+}
+
+null {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@42 }
 }
diff --git a/compiler/testData/diagnostics/tests/annotations/BasicAnnotations.lazy.log b/compiler/testData/diagnostics/tests/annotations/BasicAnnotations.lazy.log
index 0971a62741f..847ba23111f 100644
--- a/compiler/testData/diagnostics/tests/annotations/BasicAnnotations.lazy.log
+++ b/compiler/testData/diagnostics/tests/annotations/BasicAnnotations.lazy.log
@@ -66,33 +66,36 @@ LazyJavaPackageFragment@27['java'] {
 
 ResolutionTaskHolder@52 {
     <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
     <name not found> = EmptyList@50[empty]
     <name not found> = EmptyList@50[empty]
     <name not found> = EmptyList@50[empty]
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
+}
+
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
 }
 
 ResolutionTaskHolder@64 {
     <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+null {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@63 }
 }
diff --git a/compiler/testData/diagnostics/tests/annotations/ConstructorCall.lazy.log b/compiler/testData/diagnostics/tests/annotations/ConstructorCall.lazy.log
index 3ef6796f705..2f9574ffee1 100644
--- a/compiler/testData/diagnostics/tests/annotations/ConstructorCall.lazy.log
+++ b/compiler/testData/diagnostics/tests/annotations/ConstructorCall.lazy.log
@@ -116,14 +116,14 @@ LazyJavaClassifierType@77['A'] {
 
 LazyJavaClassifierType@80['A'] {
     arguments = ArrayList@81[empty]
-    classifier = JavaTypeParameterImpl@73['A']
+    classifier = JavaTypeParameterImpl@76['A']
     nullable = 'true': Boolean@79
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@70
 }
 
 LazyJavaClassifierType@82['A'] {
     arguments = ArrayList@83[empty]
-    classifier = JavaTypeParameterImpl@76['A']
+    classifier = JavaTypeParameterImpl@73['A']
     nullable = 'true': Boolean@79
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@70
 }
@@ -153,7 +153,7 @@ LazyJavaClassifierType@92['Annotation'] {
 
 LazyJavaClassifierType@95['Annotation'] {
     arguments = ArrayList@96[empty]
-    classifier = JavaClassImpl@89['Annotation']
+    classifier = JavaClassImpl@94['Annotation']
     memberScope = DeserializedClassMemberScope@90
     nullable = 'true': Boolean@79
     typeConstructor = DeserializedClassTypeConstructor@91
@@ -161,7 +161,7 @@ LazyJavaClassifierType@95['Annotation'] {
 
 LazyJavaClassifierType@97['Annotation'] {
     arguments = ArrayList@98[empty]
-    classifier = JavaClassImpl@94['Annotation']
+    classifier = JavaClassImpl@89['Annotation']
     memberScope = DeserializedClassMemberScope@90
     nullable = 'true': Boolean@79
     typeConstructor = DeserializedClassTypeConstructor@91
@@ -261,7 +261,7 @@ LazyJavaClassifierType@139['T'] {
 
 LazyJavaClassifierType@142['T'] {
     arguments = ArrayList@143[empty]
-    classifier = JavaTypeParameterImpl@138['T']
+    classifier = JavaTypeParameterImpl@141['T']
     nullable = 'true': Boolean@79
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@135
 }
@@ -275,7 +275,7 @@ LazyJavaClassifierType@144['T'] {
 
 LazyJavaClassifierType@146['T'] {
     arguments = ArrayList@147[empty]
-    classifier = JavaTypeParameterImpl@141['T']
+    classifier = JavaTypeParameterImpl@138['T']
     nullable = 'true': Boolean@79
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@135
 }
@@ -398,19 +398,15 @@ LazyJavaTypeParameterResolver@223 {
 }
 
 LazyJavaTypeParameterResolver@225 {
-    resolve(JavaTypeParameterImpl@226['T']) = LazyJavaTypeParameterDescriptor@220['T']
+    resolve(JavaTypeParameterImpl@226['T']) = LazyJavaTypeParameterDescriptor@55['T']
 }
 
 LazyJavaTypeParameterResolver@227 {
-    resolve(JavaTypeParameterImpl@228['T']) = LazyJavaTypeParameterDescriptor@55['T']
+    resolve(JavaTypeParameterImpl@228['T']) = LazyJavaTypeParameterDescriptor@220['T']
 }
 
 ResolutionTaskHolder@229 {
     <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@231 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
@@ -428,168 +424,175 @@ ResolutionTaskHolder@229 {
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@233 {
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@235 }
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@235 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@232 {
+    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@237 {
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@239 }
+ResolutionTaskHolder@235 {
+    <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
+}
+
+ResolutionTaskHolder@238 {
+    <name not found> = ArrayList@239[1] { ResolutionCandidate@240 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
 ResolutionTaskHolder@241 {
     <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@243 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@245 {
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@247 }
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@247 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@244 {
+    <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@249 {
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
-    <name not found> = ArrayList@252[1] { ResolutionCandidate@251 }
+ResolutionTaskHolder@247 {
+    <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
+}
+
+ResolutionTaskHolder@250 {
+    <name not found> = ArrayList@251[1] { ResolutionCandidate@252 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
 ResolutionTaskHolder@253 {
     <name not found> = ArrayList@254[1] { ResolutionCandidate@255 }
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@255 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@257 {
-    <name not found> = ArrayList@258[1] { ResolutionCandidate@259 }
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@259 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@256 {
+    <name not found> = ArrayList@257[1] { ResolutionCandidate@258 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@261 {
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@263 }
+ResolutionTaskHolder@259 {
+    <name not found> = ArrayList@260[1] { ResolutionCandidate@261 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
+}
+
+ResolutionTaskHolder@262 {
+    <name not found> = ArrayList@263[1] { ResolutionCandidate@264 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
 ResolutionTaskHolder@265 {
     <name not found> = ArrayList@266[1] { ResolutionCandidate@267 }
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@267 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@269 {
-    <name not found> = ArrayList@270[1] { ResolutionCandidate@271 }
-    <name not found> = ArrayList@272[1] { ResolutionCandidate@271 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@268 {
+    <name not found> = ArrayList@269[1] { ResolutionCandidate@270 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@273 {
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@275 }
-    <name not found> = ArrayList@276[1] { ResolutionCandidate@275 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@271 {
+    <name not found> = ArrayList@272[1] { ResolutionCandidate@273 }
     <name not found> = EmptyList@39[empty]
+}
+
+ResolutionTaskHolder@274 {
+    <name not found> = ArrayList@275[1] { ResolutionCandidate@276 }
     <name not found> = EmptyList@39[empty]
 }
 
 ResolutionTaskHolder@277 {
     <name not found> = ArrayList@278[1] { ResolutionCandidate@279 }
-    <name not found> = ArrayList@280[1] { ResolutionCandidate@279 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@281 {
-    <name not found> = ArrayList@282[1] { ResolutionCandidate@283 }
-    <name not found> = ArrayList@284[1] { ResolutionCandidate@283 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@280 {
+    <name not found> = ArrayList@281[1] { ResolutionCandidate@282 }
 }
 
-ResolutionTaskHolder@285 {
-    <name not found> = ArrayList@286[1] { ResolutionCandidate@287 }
-    <name not found> = ArrayList@288[1] { ResolutionCandidate@287 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@283 {
+    <name not found> = ArrayList@284[1] { ResolutionCandidate@285 }
+}
+
+ResolutionTaskHolder@286 {
+    <name not found> = ArrayList@287[1] { ResolutionCandidate@288 }
 }
 
 ResolutionTaskHolder@289 {
     <name not found> = ArrayList@290[1] { ResolutionCandidate@291 }
-    <name not found> = ArrayList@292[1] { ResolutionCandidate@291 }
+}
+
+ResolutionTaskHolder@292 {
+    <name not found> = ArrayList@293[1] { ResolutionCandidate@294 }
+}
+
+ResolutionTaskHolder@295 {
+    <name not found> = ArrayList@296[1] { ResolutionCandidate@297 }
+}
+
+null {
+    <name not found> = ArrayList@298[1] { ResolutionCandidate@240 }
+    <name not found> = ArrayList@299[1] { ResolutionCandidate@291 }
+    <name not found> = ArrayList@300[1] { ResolutionCandidate@243 }
+    <name not found> = ArrayList@301[1] { ResolutionCandidate@297 }
+    <name not found> = ArrayList@302[1] { ResolutionCandidate@285 }
+    <name not found> = ArrayList@303[1] { ResolutionCandidate@234 }
+    <name not found> = ArrayList@304[1] { ResolutionCandidate@258 }
+    <name not found> = ArrayList@305[1] { ResolutionCandidate@246 }
+    <name not found> = ArrayList@306[1] { ResolutionCandidate@231 }
+    <name not found> = ArrayList@307[1] { ResolutionCandidate@261 }
+    <name not found> = ArrayList@308[1] { ResolutionCandidate@264 }
+    <name not found> = ArrayList@309[1] { ResolutionCandidate@249 }
+    <name not found> = ArrayList@310[1] { ResolutionCandidate@252 }
+    <name not found> = ArrayList@311[1] { ResolutionCandidate@267 }
+    <name not found> = ArrayList@312[1] { ResolutionCandidate@237 }
+    <name not found> = ArrayList@313[1] { ResolutionCandidate@270 }
+    <name not found> = ArrayList@314[1] { ResolutionCandidate@288 }
+    <name not found> = ArrayList@315[1] { ResolutionCandidate@294 }
+    <name not found> = ArrayList@316[1] { ResolutionCandidate@282 }
+    <name not found> = ArrayList@317[1] { ResolutionCandidate@276 }
+    <name not found> = ArrayList@318[1] { ResolutionCandidate@273 }
+    <name not found> = ArrayList@319[1] { ResolutionCandidate@255 }
+    <name not found> = ArrayList@320[1] { ResolutionCandidate@279 }
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
-
-ResolutionTaskHolder@293 {
-    <name not found> = ArrayList@294[1] { ResolutionCandidate@295 }
-    <name not found> = ArrayList@296[1] { ResolutionCandidate@295 }
-}
-
-ResolutionTaskHolder@297 {
-    <name not found> = ArrayList@298[1] { ResolutionCandidate@299 }
-    <name not found> = ArrayList@300[1] { ResolutionCandidate@299 }
-}
-
-ResolutionTaskHolder@301 {
-    <name not found> = ArrayList@302[1] { ResolutionCandidate@303 }
-    <name not found> = ArrayList@304[1] { ResolutionCandidate@303 }
-}
-
-ResolutionTaskHolder@305 {
-    <name not found> = ArrayList@306[1] { ResolutionCandidate@307 }
-    <name not found> = ArrayList@308[1] { ResolutionCandidate@307 }
-}
-
-ResolutionTaskHolder@309 {
-    <name not found> = ArrayList@310[1] { ResolutionCandidate@311 }
-    <name not found> = ArrayList@312[1] { ResolutionCandidate@311 }
-}
-
-ResolutionTaskHolder@313 {
-    <name not found> = ArrayList@314[1] { ResolutionCandidate@315 }
-    <name not found> = ArrayList@316[1] { ResolutionCandidate@315 }
-}
-
-ResolutionTaskHolder@317 {
-    <name not found> = ArrayList@318[1] { ResolutionCandidate@319 }
-    <name not found> = ArrayList@320[1] { ResolutionCandidate@319 }
-}
diff --git a/compiler/testData/diagnostics/tests/annotations/Deprecated.lazy.log b/compiler/testData/diagnostics/tests/annotations/Deprecated.lazy.log
index 4fccfaea09d..eedc3c462eb 100644
--- a/compiler/testData/diagnostics/tests/annotations/Deprecated.lazy.log
+++ b/compiler/testData/diagnostics/tests/annotations/Deprecated.lazy.log
@@ -60,10 +60,13 @@ LazyJavaPackageFragment@21['lang'] {
 
 ResolutionTaskHolder@46 {
     <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
+}
+
+null {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@48 }
 }
diff --git a/compiler/testData/diagnostics/tests/annotations/JavaAnnotationConstructors.lazy.log b/compiler/testData/diagnostics/tests/annotations/JavaAnnotationConstructors.lazy.log
index 4c02497b104..0f8485dc1b5 100644
--- a/compiler/testData/diagnostics/tests/annotations/JavaAnnotationConstructors.lazy.log
+++ b/compiler/testData/diagnostics/tests/annotations/JavaAnnotationConstructors.lazy.log
@@ -231,48 +231,48 @@ LazyJavaPackageFragment@110['lang'] {
 
 ResolutionTaskHolder@154 {
     <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@156 }
-    <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
 }
 
-ResolutionTaskHolder@158 {
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@160 }
-    <name not found> = EmptyList@40[empty]
+ResolutionTaskHolder@157 {
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
     <name not found> = EmptyList@40[empty]
 }
 
-ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@164 }
+ResolutionTaskHolder@160 {
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
     <name not found> = EmptyList@40[empty]
+}
+
+ResolutionTaskHolder@163 {
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
     <name not found> = EmptyList@40[empty]
 }
 
 ResolutionTaskHolder@166 {
     <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@168 }
+}
+
+ResolutionTaskHolder@169 {
+    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
+}
+
+ResolutionTaskHolder@172 {
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
+}
+
+ResolutionTaskHolder@175 {
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
 }
 
-ResolutionTaskHolder@170 {
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@172 }
-}
-
-ResolutionTaskHolder@174 {
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@176 }
-}
-
-ResolutionTaskHolder@178 {
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@180 }
-}
-
-ResolutionTaskHolder@182 {
+ResolutionTaskHolder@176 {
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
@@ -281,13 +281,20 @@ ResolutionTaskHolder@182 {
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
+}
+
+ResolutionTaskHolder@177 {
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
 }
 
-ResolutionTaskHolder@183 {
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
+ResolutionTaskHolder@178 {
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
@@ -298,20 +305,16 @@ ResolutionTaskHolder@183 {
     <name not found> = EmptyList@40[empty]
 }
 
-ResolutionTaskHolder@184 {
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@185 {
+null {
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@165 }
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@171 }
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@159 }
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@168 }
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@156 }
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@162 }
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@174 }
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
diff --git a/compiler/testData/diagnostics/tests/annotations/NonAnnotationClass.lazy.log b/compiler/testData/diagnostics/tests/annotations/NonAnnotationClass.lazy.log
index 3c17152f3b2..b38d1f71469 100644
--- a/compiler/testData/diagnostics/tests/annotations/NonAnnotationClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/annotations/NonAnnotationClass.lazy.log
@@ -25,5 +25,8 @@ LazyJavaPackageFragment@9['java'] {
 
 ResolutionTaskHolder@23 {
     <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
+}
+
+null {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@25 }
 }
diff --git a/compiler/testData/diagnostics/tests/annotations/annotationInheritance.lazy.log b/compiler/testData/diagnostics/tests/annotations/annotationInheritance.lazy.log
index f490a3e29c9..9c260525fe9 100644
--- a/compiler/testData/diagnostics/tests/annotations/annotationInheritance.lazy.log
+++ b/compiler/testData/diagnostics/tests/annotations/annotationInheritance.lazy.log
@@ -46,17 +46,20 @@ LazyJavaPackageFragment@17['lang'] {
 
 ResolutionTaskHolder@34 {
     <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+}
+
+null {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@42 }
+    <name not found> = EmptyList@31[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/booleanLocalVal.lazy.log b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/booleanLocalVal.lazy.log
index bb1a6c8f2de..f7ddc59d029 100644
--- a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/booleanLocalVal.lazy.log
+++ b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/booleanLocalVal.lazy.log
@@ -36,15 +36,18 @@ LazyJavaPackageFragment@13['java'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
+}
+
+null {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@36 }
 }
diff --git a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/compareAndEquals.lazy.log b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/compareAndEquals.lazy.log
index c253281f501..24c3bc2d0c2 100644
--- a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/compareAndEquals.lazy.log
+++ b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/compareAndEquals.lazy.log
@@ -38,90 +38,93 @@ LazyJavaPackageFragment@15['java'] {
 
 ResolutionTaskHolder@33 {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+}
+
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
 }
 
 ResolutionTaskHolder@45 {
     <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
+}
+
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
 }
 
 ResolutionTaskHolder@57 {
     <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
+}
+
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
 }
 
 ResolutionTaskHolder@69 {
     <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
+}
+
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
 }
 
 ResolutionTaskHolder@81 {
     <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
 }
 
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[7] { ResolutionCandidate@86, ResolutionCandidate@87, ResolutionCandidate@88, ... }
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[7] { ResolutionCandidate@103, ResolutionCandidate@104, ResolutionCandidate@105, ... }
-    <name not found> = ArrayList@106[7] { ResolutionCandidate@103, ResolutionCandidate@104, ResolutionCandidate@105, ... }
+null {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@106[7] { ResolutionCandidate@86, ResolutionCandidate@87, ResolutionCandidate@88, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst.lazy.log b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst.lazy.log
index 8d42fba373f..1584729e058 100644
--- a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst.lazy.log
+++ b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst.lazy.log
@@ -53,45 +53,48 @@ LazyJavaPackageFragment@18['lang'] {
 
 ResolutionTaskHolder@38 {
     <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+    <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
+    <name not found> = EmptyList@30[empty]
+}
+
 ResolutionTaskHolder@50 {
     <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
+}
+
+ResolutionTaskHolder@53 {
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+null {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@40 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
diff --git a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/javaProperties.lazy.log b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/javaProperties.lazy.log
index e66a15a47c0..15e3f58b133 100644
--- a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/javaProperties.lazy.log
+++ b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/javaProperties.lazy.log
@@ -94,66 +94,60 @@ LazyJavaPackageFragment@58['lang'] {
 
 ResolutionTaskHolder@81 {
     <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
     <name not found> = EmptyList@27[empty]
+}
+
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
     <name not found> = EmptyList@27[empty]
 }
 
 ResolutionTaskHolder@93 {
     <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
     <name not found> = EmptyList@27[empty]
 }
 
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
+}
+
 ResolutionTaskHolder@105 {
     <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
+}
+
+ResolutionTaskHolder@108 {
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
 
 ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
-}
-
-ResolutionTaskHolder@117 {
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -162,13 +156,42 @@ ResolutionTaskHolder@117 {
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
+}
+
+ResolutionTaskHolder@110 {
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+}
+
+ResolutionTaskHolder@111 {
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+}
+
+ResolutionTaskHolder@112 {
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@118 {
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@113 {
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -179,46 +202,26 @@ ResolutionTaskHolder@118 {
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@119 {
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@122 {
+null {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@104 }
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
diff --git a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/kotlinProperties.lazy.log b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/kotlinProperties.lazy.log
index 0fc2f9ad30e..3608640f21f 100644
--- a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/kotlinProperties.lazy.log
+++ b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/kotlinProperties.lazy.log
@@ -68,75 +68,78 @@ LazyJavaPackageFragment@24['lang'] {
 
 ResolutionTaskHolder@47 {
     <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@44[empty]
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
     <name not found> = EmptyList@44[empty]
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
     <name not found> = EmptyList@44[empty]
+}
+
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
     <name not found> = EmptyList@44[empty]
 }
 
 ResolutionTaskHolder@59 {
     <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@44[empty]
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
     <name not found> = EmptyList@44[empty]
 }
 
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
     <name not found> = EmptyList@44[empty]
+}
+
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
     <name not found> = EmptyList@44[empty]
 }
 
 ResolutionTaskHolder@71 {
     <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
-    <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
 }
 
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@44[empty]
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
     <name not found> = EmptyList@44[empty]
 }
 
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
 }
 
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
+null {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@79 }
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
 }
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
-}
diff --git a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/strings.lazy.log b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/strings.lazy.log
index f4cb3cab32b..7769da432dd 100644
--- a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/strings.lazy.log
+++ b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/strings.lazy.log
@@ -50,116 +50,119 @@ LazyJavaPackageFragment@21['lang'] {
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
     <name not found> = EmptyList@37[empty]
 }
 
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
+}
+
 ResolutionTaskHolder@52 {
     <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
+}
+
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
 }
 
 ResolutionTaskHolder@64 {
     <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
+}
+
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
 }
 
 ResolutionTaskHolder@76 {
     <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
 }
 
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
+}
+
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
 }
 
 ResolutionTaskHolder@88 {
     <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
 }
 
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
+}
+
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
 }
 
 ResolutionTaskHolder@100 {
     <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
 }
 
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@126 }
+null {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@60 }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/annotations/kt1860-negative.lazy.log b/compiler/testData/diagnostics/tests/annotations/kt1860-negative.lazy.log
index de8c15d0ee1..ec0c8f10d8d 100644
--- a/compiler/testData/diagnostics/tests/annotations/kt1860-negative.lazy.log
+++ b/compiler/testData/diagnostics/tests/annotations/kt1860-negative.lazy.log
@@ -58,5 +58,8 @@ LazyJavaPackageFragment@22['lang'] {
 
 ResolutionTaskHolder@45 {
     <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+}
+
+null {
     <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
 }
diff --git a/compiler/testData/diagnostics/tests/annotations/kt1860-positive.lazy.log b/compiler/testData/diagnostics/tests/annotations/kt1860-positive.lazy.log
index 901093c57c9..f16611280d1 100644
--- a/compiler/testData/diagnostics/tests/annotations/kt1860-positive.lazy.log
+++ b/compiler/testData/diagnostics/tests/annotations/kt1860-positive.lazy.log
@@ -53,25 +53,28 @@ LazyJavaPackageFragment@20['java'] {
 
 ResolutionTaskHolder@43 {
     <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
 }
 
 ResolutionTaskHolder@55 {
     <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+null {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@45 }
 }
diff --git a/compiler/testData/diagnostics/tests/annotations/onExpression.lazy.log b/compiler/testData/diagnostics/tests/annotations/onExpression.lazy.log
index 115aed63662..da728c058b6 100644
--- a/compiler/testData/diagnostics/tests/annotations/onExpression.lazy.log
+++ b/compiler/testData/diagnostics/tests/annotations/onExpression.lazy.log
@@ -28,5 +28,8 @@ LazyJavaPackageFragment@10['java'] {
 
 ResolutionTaskHolder@24 {
     <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
+}
+
+null {
     <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
 }
diff --git a/compiler/testData/diagnostics/tests/annotations/onInitializer.lazy.log b/compiler/testData/diagnostics/tests/annotations/onInitializer.lazy.log
index 4aa66cf2b0f..e013ebe9d27 100644
--- a/compiler/testData/diagnostics/tests/annotations/onInitializer.lazy.log
+++ b/compiler/testData/diagnostics/tests/annotations/onInitializer.lazy.log
@@ -72,20 +72,23 @@ LazyJavaPackageFragment@34['lang'] {
 
 ResolutionTaskHolder@51 {
     <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
+}
+
+null {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@56 }
 }
diff --git a/compiler/testData/diagnostics/tests/annotations/onLoops.lazy.log b/compiler/testData/diagnostics/tests/annotations/onLoops.lazy.log
index 7195a902d5c..4698d8a702c 100644
--- a/compiler/testData/diagnostics/tests/annotations/onLoops.lazy.log
+++ b/compiler/testData/diagnostics/tests/annotations/onLoops.lazy.log
@@ -34,45 +34,48 @@ LazyJavaPackageFragment@14['java'] {
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
 }
 
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
 }
 
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
+}
+
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
 }
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[7] { ResolutionCandidate@48, ResolutionCandidate@49, ResolutionCandidate@50, ... }
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[7] { ResolutionCandidate@54, ResolutionCandidate@55, ResolutionCandidate@56, ... }
-    <name not found> = ArrayList@57[7] { ResolutionCandidate@54, ResolutionCandidate@55, ResolutionCandidate@56, ... }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[7] { ResolutionCandidate@53, ResolutionCandidate@54, ResolutionCandidate@55, ... }
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[7] { ResolutionCandidate@60, ResolutionCandidate@61, ResolutionCandidate@62, ... }
-    <name not found> = ArrayList@63[7] { ResolutionCandidate@60, ResolutionCandidate@61, ResolutionCandidate@62, ... }
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[7] { ResolutionCandidate@58, ResolutionCandidate@59, ResolutionCandidate@60, ... }
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[7] { ResolutionCandidate@66, ResolutionCandidate@67, ResolutionCandidate@68, ... }
-    <name not found> = ArrayList@69[7] { ResolutionCandidate@66, ResolutionCandidate@67, ResolutionCandidate@68, ... }
+null {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@67[7] { ResolutionCandidate@48, ResolutionCandidate@49, ResolutionCandidate@50, ... }
+    <name not found> = ArrayList@68[7] { ResolutionCandidate@53, ResolutionCandidate@54, ResolutionCandidate@55, ... }
+    <name not found> = ArrayList@69[7] { ResolutionCandidate@58, ResolutionCandidate@59, ResolutionCandidate@60, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/annotations/onLoopsUnreachable.lazy.log b/compiler/testData/diagnostics/tests/annotations/onLoopsUnreachable.lazy.log
index 7195a902d5c..4872cdb2bb4 100644
--- a/compiler/testData/diagnostics/tests/annotations/onLoopsUnreachable.lazy.log
+++ b/compiler/testData/diagnostics/tests/annotations/onLoopsUnreachable.lazy.log
@@ -34,45 +34,48 @@ LazyJavaPackageFragment@14['java'] {
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
 }
 
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
 }
 
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
+}
+
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
 }
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[7] { ResolutionCandidate@48, ResolutionCandidate@49, ResolutionCandidate@50, ... }
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[7] { ResolutionCandidate@54, ResolutionCandidate@55, ResolutionCandidate@56, ... }
-    <name not found> = ArrayList@57[7] { ResolutionCandidate@54, ResolutionCandidate@55, ResolutionCandidate@56, ... }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[7] { ResolutionCandidate@53, ResolutionCandidate@54, ResolutionCandidate@55, ... }
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[7] { ResolutionCandidate@60, ResolutionCandidate@61, ResolutionCandidate@62, ... }
-    <name not found> = ArrayList@63[7] { ResolutionCandidate@60, ResolutionCandidate@61, ResolutionCandidate@62, ... }
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[7] { ResolutionCandidate@58, ResolutionCandidate@59, ResolutionCandidate@60, ... }
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[7] { ResolutionCandidate@66, ResolutionCandidate@67, ResolutionCandidate@68, ... }
-    <name not found> = ArrayList@69[7] { ResolutionCandidate@66, ResolutionCandidate@67, ResolutionCandidate@68, ... }
+null {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@67[7] { ResolutionCandidate@53, ResolutionCandidate@54, ResolutionCandidate@55, ... }
+    <name not found> = ArrayList@68[7] { ResolutionCandidate@48, ResolutionCandidate@49, ResolutionCandidate@50, ... }
+    <name not found> = ArrayList@69[7] { ResolutionCandidate@58, ResolutionCandidate@59, ResolutionCandidate@60, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/annotations/onMultiDeclaration.lazy.log b/compiler/testData/diagnostics/tests/annotations/onMultiDeclaration.lazy.log
index 951d5625545..b660d63478c 100644
--- a/compiler/testData/diagnostics/tests/annotations/onMultiDeclaration.lazy.log
+++ b/compiler/testData/diagnostics/tests/annotations/onMultiDeclaration.lazy.log
@@ -64,12 +64,6 @@ LazyJavaPackageFragment@17['lang'] {
 
 ResolutionTaskHolder@45 {
     <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
@@ -78,14 +72,8 @@ ResolutionTaskHolder@45 {
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
@@ -94,36 +82,51 @@ ResolutionTaskHolder@49 {
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+}
+
 ResolutionTaskHolder@57 {
     <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[8] { ResolutionCandidate@68, ResolutionCandidate@69, ResolutionCandidate@70, ... }
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[8] { ResolutionCandidate@75, ResolutionCandidate@76, ResolutionCandidate@77, ... }
-    <name not found> = ArrayList@78[8] { ResolutionCandidate@75, ResolutionCandidate@76, ResolutionCandidate@77, ... }
+null {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@78[8] { ResolutionCandidate@68, ResolutionCandidate@69, ResolutionCandidate@70, ... }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/backingField/CustomGetSet.lazy.log b/compiler/testData/diagnostics/tests/backingField/CustomGetSet.lazy.log
index e3b56993d6e..5cf154c38c6 100644
--- a/compiler/testData/diagnostics/tests/backingField/CustomGetSet.lazy.log
+++ b/compiler/testData/diagnostics/tests/backingField/CustomGetSet.lazy.log
@@ -31,29 +31,32 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@24 {
     <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
-    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@27 {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
 }
 
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[8] { ResolutionCandidate@38, ResolutionCandidate@39, ResolutionCandidate@40, ... }
-    <name not found> = ArrayList@41[8] { ResolutionCandidate@38, ResolutionCandidate@39, ResolutionCandidate@40, ... }
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[8] { ResolutionCandidate@35, ResolutionCandidate@36, ResolutionCandidate@37, ... }
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[8] { ResolutionCandidate@44, ResolutionCandidate@45, ResolutionCandidate@46, ... }
-    <name not found> = ArrayList@47[8] { ResolutionCandidate@44, ResolutionCandidate@45, ResolutionCandidate@46, ... }
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[8] { ResolutionCandidate@40, ResolutionCandidate@41, ResolutionCandidate@42, ... }
+}
+
+null {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@26 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@46[8] { ResolutionCandidate@40, ResolutionCandidate@41, ResolutionCandidate@42, ... }
+    <name not found> = ArrayList@47[8] { ResolutionCandidate@35, ResolutionCandidate@36, ResolutionCandidate@37, ... }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/backingField/CustomGetVal.lazy.log b/compiler/testData/diagnostics/tests/backingField/CustomGetVal.lazy.log
index 92e51617a9b..04c2f93d009 100644
--- a/compiler/testData/diagnostics/tests/backingField/CustomGetVal.lazy.log
+++ b/compiler/testData/diagnostics/tests/backingField/CustomGetVal.lazy.log
@@ -32,12 +32,15 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@23 {
     <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@25 }
-    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[7] { ResolutionCandidate@29, ResolutionCandidate@30, ResolutionCandidate@31, ... }
-    <name not found> = ArrayList@32[7] { ResolutionCandidate@29, ResolutionCandidate@30, ResolutionCandidate@31, ... }
+ResolutionTaskHolder@26 {
+    <name not found> = ArrayList@27[7] { ResolutionCandidate@28, ResolutionCandidate@29, ResolutionCandidate@30, ... }
+}
+
+null {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@25 }
+    <name not found> = ArrayList@32[7] { ResolutionCandidate@28, ResolutionCandidate@29, ResolutionCandidate@30, ... }
+    <name not found> = EmptyList@20[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/backingField/CustomGetValGlobal.lazy.log b/compiler/testData/diagnostics/tests/backingField/CustomGetValGlobal.lazy.log
index 0a1501922d0..9ce4da8f324 100644
--- a/compiler/testData/diagnostics/tests/backingField/CustomGetValGlobal.lazy.log
+++ b/compiler/testData/diagnostics/tests/backingField/CustomGetValGlobal.lazy.log
@@ -28,12 +28,15 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@23 {
     <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@25 }
-    <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
 }
 
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[7] { ResolutionCandidate@29, ResolutionCandidate@30, ResolutionCandidate@31, ... }
-    <name not found> = ArrayList@32[7] { ResolutionCandidate@29, ResolutionCandidate@30, ResolutionCandidate@31, ... }
+ResolutionTaskHolder@26 {
+    <name not found> = ArrayList@27[7] { ResolutionCandidate@28, ResolutionCandidate@29, ResolutionCandidate@30, ... }
+}
+
+null {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@25 }
+    <name not found> = ArrayList@32[7] { ResolutionCandidate@28, ResolutionCandidate@29, ResolutionCandidate@30, ... }
+    <name not found> = EmptyList@19[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/backingField/CustomGetVar.lazy.log b/compiler/testData/diagnostics/tests/backingField/CustomGetVar.lazy.log
index b09b759c4ae..08f09aa42f9 100644
--- a/compiler/testData/diagnostics/tests/backingField/CustomGetVar.lazy.log
+++ b/compiler/testData/diagnostics/tests/backingField/CustomGetVar.lazy.log
@@ -31,12 +31,15 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@22 {
     <name not found> = ArrayList@23[1] { ResolutionCandidate@24 }
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@24 }
-    <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
 }
 
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[7] { ResolutionCandidate@28, ResolutionCandidate@29, ResolutionCandidate@30, ... }
-    <name not found> = ArrayList@31[7] { ResolutionCandidate@28, ResolutionCandidate@29, ResolutionCandidate@30, ... }
+ResolutionTaskHolder@25 {
+    <name not found> = ArrayList@26[7] { ResolutionCandidate@27, ResolutionCandidate@28, ResolutionCandidate@29, ... }
+}
+
+null {
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@24 }
+    <name not found> = ArrayList@31[7] { ResolutionCandidate@27, ResolutionCandidate@28, ResolutionCandidate@29, ... }
+    <name not found> = EmptyList@19[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/backingField/CustomSet.lazy.log b/compiler/testData/diagnostics/tests/backingField/CustomSet.lazy.log
index 37d40544306..9f16f81e5b6 100644
--- a/compiler/testData/diagnostics/tests/backingField/CustomSet.lazy.log
+++ b/compiler/testData/diagnostics/tests/backingField/CustomSet.lazy.log
@@ -31,17 +31,20 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@22 {
     <name not found> = ArrayList@23[1] { ResolutionCandidate@24 }
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@24 }
-    <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
 }
 
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
+ResolutionTaskHolder@25 {
+    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
 }
 
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[7] { ResolutionCandidate@32, ResolutionCandidate@33, ResolutionCandidate@34, ... }
-    <name not found> = ArrayList@35[7] { ResolutionCandidate@32, ResolutionCandidate@33, ResolutionCandidate@34, ... }
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[7] { ResolutionCandidate@30, ResolutionCandidate@31, ResolutionCandidate@32, ... }
+}
+
+null {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@24 }
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@27 }
+    <name not found> = ArrayList@35[7] { ResolutionCandidate@30, ResolutionCandidate@31, ResolutionCandidate@32, ... }
+    <name not found> = EmptyList@19[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/backingField/CyclicReferenceInitializer.lazy.log b/compiler/testData/diagnostics/tests/backingField/CyclicReferenceInitializer.lazy.log
index 961509efbc4..7d889cff019 100644
--- a/compiler/testData/diagnostics/tests/backingField/CyclicReferenceInitializer.lazy.log
+++ b/compiler/testData/diagnostics/tests/backingField/CyclicReferenceInitializer.lazy.log
@@ -31,7 +31,10 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@22 {
     <name not found> = ArrayList@23[1] { ResolutionCandidate@24 }
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@24 }
-    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+}
+
+null {
+    <name not found> = ArrayList@25[1] { ResolutionCandidate@24 }
     <name not found> = EmptyList@19[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/backingField/ReadForwardInAnonymous.lazy.log b/compiler/testData/diagnostics/tests/backingField/ReadForwardInAnonymous.lazy.log
index 900b0a8289f..cc53e728bd1 100644
--- a/compiler/testData/diagnostics/tests/backingField/ReadForwardInAnonymous.lazy.log
+++ b/compiler/testData/diagnostics/tests/backingField/ReadForwardInAnonymous.lazy.log
@@ -32,7 +32,10 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@23 {
     <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@25 }
-    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+}
+
+null {
+    <name not found> = ArrayList@26[1] { ResolutionCandidate@25 }
     <name not found> = EmptyList@20[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/backingField/ReadForwardInPropertyInitializer.lazy.log b/compiler/testData/diagnostics/tests/backingField/ReadForwardInPropertyInitializer.lazy.log
index f1baacb819c..ef6c3e57982 100644
--- a/compiler/testData/diagnostics/tests/backingField/ReadForwardInPropertyInitializer.lazy.log
+++ b/compiler/testData/diagnostics/tests/backingField/ReadForwardInPropertyInitializer.lazy.log
@@ -34,7 +34,10 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@24 {
     <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
-    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+}
+
+null {
+    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
     <name not found> = EmptyList@21[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/backingField/ReadInAnonymous.lazy.log b/compiler/testData/diagnostics/tests/backingField/ReadInAnonymous.lazy.log
index 31384f210d9..f08e06974ca 100644
--- a/compiler/testData/diagnostics/tests/backingField/ReadInAnonymous.lazy.log
+++ b/compiler/testData/diagnostics/tests/backingField/ReadInAnonymous.lazy.log
@@ -32,7 +32,10 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@23 {
     <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@25 }
-    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+}
+
+null {
+    <name not found> = ArrayList@26[1] { ResolutionCandidate@25 }
     <name not found> = EmptyList@20[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/backingField/ReadInAnotherPropertyIntializer.lazy.log b/compiler/testData/diagnostics/tests/backingField/ReadInAnotherPropertyIntializer.lazy.log
index dcce0eebe99..d4ba8c5590d 100644
--- a/compiler/testData/diagnostics/tests/backingField/ReadInAnotherPropertyIntializer.lazy.log
+++ b/compiler/testData/diagnostics/tests/backingField/ReadInAnotherPropertyIntializer.lazy.log
@@ -34,7 +34,10 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@24 {
     <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
-    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+}
+
+null {
+    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
     <name not found> = EmptyList@21[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/backingField/ReadInFunction.lazy.log b/compiler/testData/diagnostics/tests/backingField/ReadInFunction.lazy.log
index 1e7aab74041..6897bbbc526 100644
--- a/compiler/testData/diagnostics/tests/backingField/ReadInFunction.lazy.log
+++ b/compiler/testData/diagnostics/tests/backingField/ReadInFunction.lazy.log
@@ -33,7 +33,10 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@23 {
     <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@25 }
-    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+}
+
+null {
+    <name not found> = ArrayList@26[1] { ResolutionCandidate@25 }
     <name not found> = EmptyList@20[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/backingField/ReadNonexistentAbstractPropertyInAnonymous.lazy.log b/compiler/testData/diagnostics/tests/backingField/ReadNonexistentAbstractPropertyInAnonymous.lazy.log
index 2bb14583122..21dca2bfe52 100644
--- a/compiler/testData/diagnostics/tests/backingField/ReadNonexistentAbstractPropertyInAnonymous.lazy.log
+++ b/compiler/testData/diagnostics/tests/backingField/ReadNonexistentAbstractPropertyInAnonymous.lazy.log
@@ -31,7 +31,10 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@24 {
     <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
-    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+}
+
+null {
+    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
     <name not found> = EmptyList@21[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/backingField/ReadNonexistentAbstractPropertyInFunction.lazy.log b/compiler/testData/diagnostics/tests/backingField/ReadNonexistentAbstractPropertyInFunction.lazy.log
index b04a08c3a22..5a857224bfe 100644
--- a/compiler/testData/diagnostics/tests/backingField/ReadNonexistentAbstractPropertyInFunction.lazy.log
+++ b/compiler/testData/diagnostics/tests/backingField/ReadNonexistentAbstractPropertyInFunction.lazy.log
@@ -35,7 +35,10 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@26 {
     <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+}
+
+null {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
     <name not found> = EmptyList@23[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/backingField/ReadNonexistentCustomGetInAnonymous.lazy.log b/compiler/testData/diagnostics/tests/backingField/ReadNonexistentCustomGetInAnonymous.lazy.log
index 807373572e5..e9b5fbac586 100644
--- a/compiler/testData/diagnostics/tests/backingField/ReadNonexistentCustomGetInAnonymous.lazy.log
+++ b/compiler/testData/diagnostics/tests/backingField/ReadNonexistentCustomGetInAnonymous.lazy.log
@@ -31,7 +31,10 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@24 {
     <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
-    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+}
+
+null {
+    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
     <name not found> = EmptyList@21[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/backingField/ReadNonexistentCustomGetInAnotherInitializer.lazy.log b/compiler/testData/diagnostics/tests/backingField/ReadNonexistentCustomGetInAnotherInitializer.lazy.log
index 588c451afed..a8704afe9b4 100644
--- a/compiler/testData/diagnostics/tests/backingField/ReadNonexistentCustomGetInAnotherInitializer.lazy.log
+++ b/compiler/testData/diagnostics/tests/backingField/ReadNonexistentCustomGetInAnotherInitializer.lazy.log
@@ -36,7 +36,10 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@26 {
     <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+}
+
+null {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
     <name not found> = EmptyList@23[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/backingField/ReadNonexistentDeclaredInHigher.lazy.log b/compiler/testData/diagnostics/tests/backingField/ReadNonexistentDeclaredInHigher.lazy.log
index 588c451afed..a8704afe9b4 100644
--- a/compiler/testData/diagnostics/tests/backingField/ReadNonexistentDeclaredInHigher.lazy.log
+++ b/compiler/testData/diagnostics/tests/backingField/ReadNonexistentDeclaredInHigher.lazy.log
@@ -36,7 +36,10 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@26 {
     <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+}
+
+null {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
     <name not found> = EmptyList@23[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/backingField/ReadNonexistentPropertyInAnonymous.lazy.log b/compiler/testData/diagnostics/tests/backingField/ReadNonexistentPropertyInAnonymous.lazy.log
index 0a6702bb1c6..d2dead0a066 100644
--- a/compiler/testData/diagnostics/tests/backingField/ReadNonexistentPropertyInAnonymous.lazy.log
+++ b/compiler/testData/diagnostics/tests/backingField/ReadNonexistentPropertyInAnonymous.lazy.log
@@ -83,18 +83,6 @@ ResolutionTaskHolder@27 {
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
 }
 
 ResolutionTaskHolder@28 {
@@ -122,6 +110,21 @@ ResolutionTaskHolder@28 {
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
+}
+
+null {
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
diff --git a/compiler/testData/diagnostics/tests/backingField/WriteNonexistentDeclaredInHigher.lazy.log b/compiler/testData/diagnostics/tests/backingField/WriteNonexistentDeclaredInHigher.lazy.log
index ff05726a487..b16c70e805c 100644
--- a/compiler/testData/diagnostics/tests/backingField/WriteNonexistentDeclaredInHigher.lazy.log
+++ b/compiler/testData/diagnostics/tests/backingField/WriteNonexistentDeclaredInHigher.lazy.log
@@ -33,12 +33,15 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@24 {
     <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
+    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+}
+
+null {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@26 }
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@28 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
diff --git a/compiler/testData/diagnostics/tests/backingField/kt462BackingFieldsResolve.lazy.log b/compiler/testData/diagnostics/tests/backingField/kt462BackingFieldsResolve.lazy.log
index 0032e45e7c1..916df4517f5 100644
--- a/compiler/testData/diagnostics/tests/backingField/kt462BackingFieldsResolve.lazy.log
+++ b/compiler/testData/diagnostics/tests/backingField/kt462BackingFieldsResolve.lazy.log
@@ -88,355 +88,273 @@ LazyJavaPackageFragment@26['lang'] {
 
 ResolutionTaskHolder@67 {
     <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+}
+
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
     <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
 }
 
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
     <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
 }
 
-ResolutionTaskHolder@97 {
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
     <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
 }
 
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
+}
+
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
 }
 
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
+    <name not found> = EmptyList@48[empty]
+}
+
 ResolutionTaskHolder@117 {
     <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
+    <name not found> = EmptyList@48[empty]
+}
+
+ResolutionTaskHolder@120 {
     <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
+    <name not found> = EmptyList@48[empty]
+}
+
+ResolutionTaskHolder@123 {
     <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@125 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
 }
 
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@132 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
+ResolutionTaskHolder@126 {
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
     <name not found> = EmptyList@48[empty]
 }
 
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@136 }
+ResolutionTaskHolder@129 {
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
     <name not found> = EmptyList@48[empty]
+}
+
+ResolutionTaskHolder@132 {
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
+    <name not found> = EmptyList@48[empty]
+}
+
+ResolutionTaskHolder@135 {
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
     <name not found> = EmptyList@48[empty]
 }
 
 ResolutionTaskHolder@138 {
     <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@140 }
-    <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
 }
 
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@144 }
-    <name not found> = EmptyList@48[empty]
+ResolutionTaskHolder@141 {
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
     <name not found> = EmptyList@48[empty]
 }
 
-ResolutionTaskHolder@146 {
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@148 }
+ResolutionTaskHolder@144 {
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
     <name not found> = EmptyList@48[empty]
+}
+
+ResolutionTaskHolder@147 {
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
     <name not found> = EmptyList@48[empty]
 }
 
 ResolutionTaskHolder@150 {
     <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@152 }
-    <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
 }
 
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@156 }
-    <name not found> = EmptyList@48[empty]
+ResolutionTaskHolder@153 {
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
     <name not found> = EmptyList@48[empty]
 }
 
-ResolutionTaskHolder@158 {
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@160 }
+ResolutionTaskHolder@156 {
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
     <name not found> = EmptyList@48[empty]
+}
+
+ResolutionTaskHolder@159 {
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
     <name not found> = EmptyList@48[empty]
 }
 
 ResolutionTaskHolder@162 {
     <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@164 }
-    <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
 }
 
-ResolutionTaskHolder@166 {
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@168 }
-    <name not found> = EmptyList@48[empty]
+ResolutionTaskHolder@165 {
+    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
     <name not found> = EmptyList@48[empty]
 }
 
-ResolutionTaskHolder@170 {
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@172 }
+ResolutionTaskHolder@168 {
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
     <name not found> = EmptyList@48[empty]
+}
+
+ResolutionTaskHolder@171 {
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
     <name not found> = EmptyList@48[empty]
 }
 
 ResolutionTaskHolder@174 {
     <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@176 }
-    <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
 }
 
-ResolutionTaskHolder@178 {
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@180 }
-    <name not found> = EmptyList@48[empty]
+ResolutionTaskHolder@177 {
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
     <name not found> = EmptyList@48[empty]
 }
 
-ResolutionTaskHolder@182 {
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@184 }
-    <name not found> = EmptyList@48[empty]
+ResolutionTaskHolder@180 {
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
     <name not found> = EmptyList@48[empty]
 }
 
+ResolutionTaskHolder@183 {
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
+}
+
 ResolutionTaskHolder@186 {
     <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@188 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
 }
 
-ResolutionTaskHolder@190 {
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@192 }
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@192 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
+ResolutionTaskHolder@189 {
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
 }
 
-ResolutionTaskHolder@194 {
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@196 }
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@196 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
+ResolutionTaskHolder@192 {
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
+}
+
+ResolutionTaskHolder@195 {
+    <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
 }
 
 ResolutionTaskHolder@198 {
     <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@200 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
 }
 
-ResolutionTaskHolder@202 {
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@204 }
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@204 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
+ResolutionTaskHolder@201 {
+    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
 }
 
-ResolutionTaskHolder@206 {
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@208 }
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@208 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
+ResolutionTaskHolder@204 {
+    <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
+}
+
+ResolutionTaskHolder@207 {
+    <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
 }
 
 ResolutionTaskHolder@210 {
     <name not found> = ArrayList@211[1] { ResolutionCandidate@212 }
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@212 }
+}
+
+ResolutionTaskHolder@213 {
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
 }
 
 ResolutionTaskHolder@214 {
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@216 }
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@216 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@218 {
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@220 }
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@220 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@222 {
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@224 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@226 {
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@228 }
-}
-
-ResolutionTaskHolder@230 {
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@232 }
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@232 }
-}
-
-ResolutionTaskHolder@234 {
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@236 }
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@236 }
-}
-
-ResolutionTaskHolder@238 {
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@240 }
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@240 }
-}
-
-ResolutionTaskHolder@242 {
-    <name not found> = ArrayList@243[1] { ResolutionCandidate@244 }
-    <name not found> = ArrayList@245[1] { ResolutionCandidate@244 }
-}
-
-ResolutionTaskHolder@246 {
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@248 }
-    <name not found> = ArrayList@249[1] { ResolutionCandidate@248 }
-}
-
-ResolutionTaskHolder@250 {
-    <name not found> = ArrayList@251[1] { ResolutionCandidate@252 }
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@252 }
-}
-
-ResolutionTaskHolder@254 {
-    <name not found> = ArrayList@255[1] { ResolutionCandidate@256 }
-    <name not found> = ArrayList@257[1] { ResolutionCandidate@256 }
-}
-
-ResolutionTaskHolder@258 {
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@260 }
-    <name not found> = ArrayList@261[1] { ResolutionCandidate@260 }
-}
-
-ResolutionTaskHolder@262 {
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@264 }
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@264 }
-}
-
-ResolutionTaskHolder@266 {
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
@@ -463,7 +381,92 @@ ResolutionTaskHolder@266 {
     <name not found> = EmptyList@48[empty]
 }
 
-ResolutionTaskHolder@267 {
+null {
+    <name not found> = ArrayList@215[1] { ResolutionCandidate@140 }
+    <name not found> = ArrayList@216[1] { ResolutionCandidate@209 }
+    <name not found> = ArrayList@217[1] { ResolutionCandidate@164 }
+    <name not found> = ArrayList@218[1] { ResolutionCandidate@206 }
+    <name not found> = ArrayList@219[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@220[1] { ResolutionCandidate@113 }
+    <name not found> = ArrayList@221[1] { ResolutionCandidate@167 }
+    <name not found> = ArrayList@222[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@223[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@224[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@225[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@226[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@228[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@231[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@232[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@233[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@234[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@235[1] { ResolutionCandidate@155 }
+    <name not found> = ArrayList@236[1] { ResolutionCandidate@137 }
+    <name not found> = ArrayList@237[1] { ResolutionCandidate@212 }
+    <name not found> = ArrayList@238[1] { ResolutionCandidate@194 }
+    <name not found> = ArrayList@239[1] { ResolutionCandidate@152 }
+    <name not found> = ArrayList@240[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@241[1] { ResolutionCandidate@125 }
+    <name not found> = ArrayList@242[1] { ResolutionCandidate@170 }
+    <name not found> = ArrayList@243[1] { ResolutionCandidate@173 }
+    <name not found> = ArrayList@244[1] { ResolutionCandidate@161 }
+    <name not found> = ArrayList@245[1] { ResolutionCandidate@128 }
+    <name not found> = ArrayList@246[1] { ResolutionCandidate@122 }
+    <name not found> = ArrayList@247[1] { ResolutionCandidate@134 }
+    <name not found> = ArrayList@248[1] { ResolutionCandidate@176 }
+    <name not found> = ArrayList@249[1] { ResolutionCandidate@131 }
+    <name not found> = ArrayList@250[1] { ResolutionCandidate@143 }
+    <name not found> = ArrayList@251[1] { ResolutionCandidate@179 }
+    <name not found> = ArrayList@252[1] { ResolutionCandidate@146 }
+    <name not found> = ArrayList@253[1] { ResolutionCandidate@182 }
+    <name not found> = ArrayList@254[1] { ResolutionCandidate@200 }
+    <name not found> = ArrayList@255[1] { ResolutionCandidate@191 }
+    <name not found> = ArrayList@256[1] { ResolutionCandidate@149 }
+    <name not found> = ArrayList@257[1] { ResolutionCandidate@203 }
+    <name not found> = ArrayList@258[1] { ResolutionCandidate@188 }
+    <name not found> = ArrayList@259[1] { ResolutionCandidate@185 }
+    <name not found> = ArrayList@260[1] { ResolutionCandidate@197 }
+    <name not found> = ArrayList@261[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@262[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@263[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@264[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@265[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@266[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@267[1] { ResolutionCandidate@108 }
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
diff --git a/compiler/testData/diagnostics/tests/backingField/kt782packageLevel.lazy.log b/compiler/testData/diagnostics/tests/backingField/kt782packageLevel.lazy.log
index 12c3789f422..c477c82819a 100644
--- a/compiler/testData/diagnostics/tests/backingField/kt782packageLevel.lazy.log
+++ b/compiler/testData/diagnostics/tests/backingField/kt782packageLevel.lazy.log
@@ -36,28 +36,31 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@26[empty]
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@26[empty]
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+    <name not found> = EmptyList@26[empty]
+}
+
+null {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@39 }
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/backingField/qualifiedWithThis.lazy.log b/compiler/testData/diagnostics/tests/backingField/qualifiedWithThis.lazy.log
index 33f8310a45e..28e08563771 100644
--- a/compiler/testData/diagnostics/tests/backingField/qualifiedWithThis.lazy.log
+++ b/compiler/testData/diagnostics/tests/backingField/qualifiedWithThis.lazy.log
@@ -28,10 +28,13 @@ LazyJavaPackageFragment@8['java'] {
 
 ResolutionTaskHolder@24 {
     <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
 }
 
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
+ResolutionTaskHolder@27 {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
+}
+
+null {
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@26 }
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@29 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/AsErasedError.lazy.log b/compiler/testData/diagnostics/tests/cast/AsErasedError.lazy.log
index 3aa4b634f89..9c0b57941e7 100644
--- a/compiler/testData/diagnostics/tests/cast/AsErasedError.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/AsErasedError.lazy.log
@@ -39,5 +39,8 @@ LazyJavaPackageFragment@10['java'] {
 
 ResolutionTaskHolder@35 {
     <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+}
+
+null {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/AsErasedFine.lazy.log b/compiler/testData/diagnostics/tests/cast/AsErasedFine.lazy.log
index acde626d3f8..bde9cc5ab79 100644
--- a/compiler/testData/diagnostics/tests/cast/AsErasedFine.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/AsErasedFine.lazy.log
@@ -35,5 +35,8 @@ LazyJavaPackageFragment@9['java'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+}
+
+null {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/AsErasedStar.lazy.log b/compiler/testData/diagnostics/tests/cast/AsErasedStar.lazy.log
index c8d64a14f07..949f4685f47 100644
--- a/compiler/testData/diagnostics/tests/cast/AsErasedStar.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/AsErasedStar.lazy.log
@@ -31,5 +31,8 @@ LazyJavaPackageFragment@8['java'] {
 
 ResolutionTaskHolder@27 {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
+}
+
+null {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/AsErasedWarning.lazy.log b/compiler/testData/diagnostics/tests/cast/AsErasedWarning.lazy.log
index b50d7696167..edb88de5246 100644
--- a/compiler/testData/diagnostics/tests/cast/AsErasedWarning.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/AsErasedWarning.lazy.log
@@ -35,5 +35,8 @@ LazyJavaPackageFragment@9['java'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+}
+
+null {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/DowncastMap.lazy.log b/compiler/testData/diagnostics/tests/cast/DowncastMap.lazy.log
index 529a8f82666..34313f844ab 100644
--- a/compiler/testData/diagnostics/tests/cast/DowncastMap.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/DowncastMap.lazy.log
@@ -39,15 +39,18 @@ LazyJavaPackageFragment@10['java'] {
 
 ResolutionTaskHolder@37 {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+}
+
+null {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@39 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/IsArray.lazy.log b/compiler/testData/diagnostics/tests/cast/IsArray.lazy.log
index 29dbda63c42..2908adbd43b 100644
--- a/compiler/testData/diagnostics/tests/cast/IsArray.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsArray.lazy.log
@@ -35,5 +35,8 @@ LazyJavaPackageFragment@9['java'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+}
+
+null {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedAllowForDerivedWithOneSubstitutedAndOneSameGeneric.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedAllowForDerivedWithOneSubstitutedAndOneSameGeneric.lazy.log
index dcc585c1de4..3f6a601bd53 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedAllowForDerivedWithOneSubstitutedAndOneSameGeneric.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedAllowForDerivedWithOneSubstitutedAndOneSameGeneric.lazy.log
@@ -42,10 +42,13 @@ LazyJavaPackageFragment@12['java'] {
 
 ResolutionTaskHolder@38 {
     <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
+}
+
+null {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@40 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedAllowForExactSupertypeCheck.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedAllowForExactSupertypeCheck.lazy.log
index 4fb95f7d3dd..9883d47845c 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedAllowForExactSupertypeCheck.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedAllowForExactSupertypeCheck.lazy.log
@@ -33,10 +33,13 @@ LazyJavaPackageFragment@9['java'] {
 
 ResolutionTaskHolder@29 {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
+}
+
+null {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@34 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedAllowForOverridenVarianceWithProjection.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedAllowForOverridenVarianceWithProjection.lazy.log
index c8368fcaa34..4197d96800e 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedAllowForOverridenVarianceWithProjection.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedAllowForOverridenVarianceWithProjection.lazy.log
@@ -35,15 +35,18 @@ LazyJavaPackageFragment@11['java'] {
 
 ResolutionTaskHolder@33 {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+}
+
+null {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@35 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedAllowForSupertypeCheckWithContrvariance.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedAllowForSupertypeCheckWithContrvariance.lazy.log
index 7d6b9a1daec..13c8cabf0c7 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedAllowForSupertypeCheckWithContrvariance.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedAllowForSupertypeCheckWithContrvariance.lazy.log
@@ -32,15 +32,18 @@ LazyJavaPackageFragment@10['java'] {
 
 ResolutionTaskHolder@30 {
     <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
 }
 
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+}
+
+null {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@35 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedAllowForSupertypeCheckWithCovariance.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedAllowForSupertypeCheckWithCovariance.lazy.log
index 7d6b9a1daec..d234f4008c3 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedAllowForSupertypeCheckWithCovariance.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedAllowForSupertypeCheckWithCovariance.lazy.log
@@ -32,15 +32,18 @@ LazyJavaPackageFragment@10['java'] {
 
 ResolutionTaskHolder@30 {
     <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
 }
 
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+}
+
+null {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@32 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedAllowForTypeWithIrrelevantMixin.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedAllowForTypeWithIrrelevantMixin.lazy.log
index 506a40b959d..8b6b90f394b 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedAllowForTypeWithIrrelevantMixin.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedAllowForTypeWithIrrelevantMixin.lazy.log
@@ -41,5 +41,8 @@ LazyJavaPackageFragment@13['java'] {
 
 ResolutionTaskHolder@39 {
     <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+}
+
+null {
     <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedAllowForTypeWithTwoSameTypeSubstitutions.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedAllowForTypeWithTwoSameTypeSubstitutions.lazy.log
index a1f24b760e8..89973505b9d 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedAllowForTypeWithTwoSameTypeSubstitutions.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedAllowForTypeWithTwoSameTypeSubstitutions.lazy.log
@@ -40,10 +40,13 @@ LazyJavaPackageFragment@11['java'] {
 
 ResolutionTaskHolder@36 {
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+}
+
+null {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@41 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedAllowForTypeWithoutTypeArguments.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedAllowForTypeWithoutTypeArguments.lazy.log
index e3c70ac9247..e74b8d47f2b 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedAllowForTypeWithoutTypeArguments.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedAllowForTypeWithoutTypeArguments.lazy.log
@@ -36,10 +36,13 @@ LazyJavaPackageFragment@10['java'] {
 
 ResolutionTaskHolder@32 {
     <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
 }
 
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+}
+
+null {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@37 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedAllowFromOut.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedAllowFromOut.lazy.log
index 0270b7f544c..cae14bac454 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedAllowFromOut.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedAllowFromOut.lazy.log
@@ -35,5 +35,8 @@ LazyJavaPackageFragment@9['java'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+}
+
+null {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedAllowFromOut2.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedAllowFromOut2.lazy.log
index 8f277e94bc5..3eb6b4100ab 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedAllowFromOut2.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedAllowFromOut2.lazy.log
@@ -35,5 +35,8 @@ LazyJavaPackageFragment@9['java'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+}
+
+null {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedAllowFromOutAtClass.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedAllowFromOutAtClass.lazy.log
index 26b51be25c8..832b63297a8 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedAllowFromOutAtClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedAllowFromOutAtClass.lazy.log
@@ -35,5 +35,8 @@ LazyJavaPackageFragment@9['java'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+}
+
+null {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedAllowParameterSubtype.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedAllowParameterSubtype.lazy.log
index a8a65074bbb..6c0475593bb 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedAllowParameterSubtype.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedAllowParameterSubtype.lazy.log
@@ -37,10 +37,13 @@ LazyJavaPackageFragment@10['java'] {
 
 ResolutionTaskHolder@33 {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+}
+
+null {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@38 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedAllowSameClassParameter.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedAllowSameClassParameter.lazy.log
index d34bfddc134..4a3dbc464a4 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedAllowSameClassParameter.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedAllowSameClassParameter.lazy.log
@@ -35,5 +35,8 @@ LazyJavaPackageFragment@9['java'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+}
+
+null {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedAllowSameParameterParameter.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedAllowSameParameterParameter.lazy.log
index ddf8659627f..04075020329 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedAllowSameParameterParameter.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedAllowSameParameterParameter.lazy.log
@@ -34,5 +34,8 @@ LazyJavaPackageFragment@9['java'] {
 
 ResolutionTaskHolder@30 {
     <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
+}
+
+null {
     <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedDisallowDifferentArgInvariantPosition.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedDisallowDifferentArgInvariantPosition.lazy.log
index 8f277e94bc5..3eb6b4100ab 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedDisallowDifferentArgInvariantPosition.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedDisallowDifferentArgInvariantPosition.lazy.log
@@ -35,5 +35,8 @@ LazyJavaPackageFragment@9['java'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+}
+
+null {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedDisallowForOverridenVariance.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedDisallowForOverridenVariance.lazy.log
index c8368fcaa34..6e30a1bb9d8 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedDisallowForOverridenVariance.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedDisallowForOverridenVariance.lazy.log
@@ -35,15 +35,18 @@ LazyJavaPackageFragment@11['java'] {
 
 ResolutionTaskHolder@33 {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+}
+
+null {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@41 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedDisallowForTypeWithConstraints.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedDisallowForTypeWithConstraints.lazy.log
index d6738feb06b..36ce13671f4 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedDisallowForTypeWithConstraints.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedDisallowForTypeWithConstraints.lazy.log
@@ -32,5 +32,8 @@ LazyJavaPackageFragment@10['java'] {
 
 ResolutionTaskHolder@30 {
     <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
+}
+
+null {
     <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromAny.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromAny.lazy.log
index 22f57615ec8..d7a93601579 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromAny.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromAny.lazy.log
@@ -35,5 +35,8 @@ LazyJavaPackageFragment@9['java'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+}
+
+null {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromIn.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromIn.lazy.log
index 8f277e94bc5..3eb6b4100ab 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromIn.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromIn.lazy.log
@@ -35,5 +35,8 @@ LazyJavaPackageFragment@9['java'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+}
+
+null {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromOut.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromOut.lazy.log
index a1e8afc0406..3da706600c9 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromOut.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromOut.lazy.log
@@ -35,5 +35,8 @@ LazyJavaPackageFragment@9['java'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+}
+
+null {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromOutAtClass.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromOutAtClass.lazy.log
index 26b51be25c8..832b63297a8 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromOutAtClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromOutAtClass.lazy.log
@@ -35,5 +35,8 @@ LazyJavaPackageFragment@9['java'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+}
+
+null {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedDissallowForSubtypeMappedToTwoParamsWithFirstInvalid.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedDissallowForSubtypeMappedToTwoParamsWithFirstInvalid.lazy.log
index 98d550db723..33a67e0187d 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedDissallowForSubtypeMappedToTwoParamsWithFirstInvalid.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedDissallowForSubtypeMappedToTwoParamsWithFirstInvalid.lazy.log
@@ -38,15 +38,18 @@ LazyJavaPackageFragment@12['java'] {
 
 ResolutionTaskHolder@36 {
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
+}
+
+null {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@44 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedDissallowForSubtypeMappedToTwoParamsWithSecondInvalid.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedDissallowForSubtypeMappedToTwoParamsWithSecondInvalid.lazy.log
index 98d550db723..0293108bcea 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedDissallowForSubtypeMappedToTwoParamsWithSecondInvalid.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedDissallowForSubtypeMappedToTwoParamsWithSecondInvalid.lazy.log
@@ -38,15 +38,18 @@ LazyJavaPackageFragment@12['java'] {
 
 ResolutionTaskHolder@36 {
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
+}
+
+null {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@38 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedNonGeneric.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedNonGeneric.lazy.log
index 703c7122798..a7d4d6dd19e 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedNonGeneric.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedNonGeneric.lazy.log
@@ -26,5 +26,8 @@ LazyJavaPackageFragment@8['java'] {
 
 ResolutionTaskHolder@24 {
     <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
+}
+
+null {
     <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedNullableTasT.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedNullableTasT.lazy.log
index 168aaee06a6..eb5dc1207c3 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedNullableTasT.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedNullableTasT.lazy.log
@@ -30,5 +30,8 @@ LazyJavaPackageFragment@8['java'] {
 
 ResolutionTaskHolder@26 {
     <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
+}
+
+null {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedStar.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedStar.lazy.log
index 2a38c0e22e3..5eaf3e5ecfe 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedStar.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedStar.lazy.log
@@ -31,5 +31,8 @@ LazyJavaPackageFragment@8['java'] {
 
 ResolutionTaskHolder@27 {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
+}
+
+null {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedTasT.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedTasT.lazy.log
index 7c42103eb8b..ee107b9473c 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedTasT.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedTasT.lazy.log
@@ -23,5 +23,8 @@ LazyJavaPackageFragment@7['java'] {
 
 ResolutionTaskHolder@21 {
     <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
+}
+
+null {
     <name not found> = ArrayList@24[1] { ResolutionCandidate@23 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedToErrorType.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedToErrorType.lazy.log
index 8bad9f64594..681523f3ff0 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedToErrorType.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedToErrorType.lazy.log
@@ -39,5 +39,8 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@32 {
     <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
+}
+
+null {
     <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/IsRecursionSustainable.lazy.log b/compiler/testData/diagnostics/tests/cast/IsRecursionSustainable.lazy.log
index 978df9f5d6d..66d3a7ee1c2 100644
--- a/compiler/testData/diagnostics/tests/cast/IsRecursionSustainable.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsRecursionSustainable.lazy.log
@@ -40,25 +40,28 @@ LazyJavaPackageFragment@11['java'] {
 
 ResolutionTaskHolder@35 {
     <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
+}
+
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
 }
 
 ResolutionTaskHolder@47 {
     <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+null {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@37 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/IsReified.lazy.log b/compiler/testData/diagnostics/tests/cast/IsReified.lazy.log
index 818078ceada..ea0a5f9b685 100644
--- a/compiler/testData/diagnostics/tests/cast/IsReified.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsReified.lazy.log
@@ -35,5 +35,8 @@ LazyJavaPackageFragment@9['java'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+}
+
+null {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/IsTraits.lazy.log b/compiler/testData/diagnostics/tests/cast/IsTraits.lazy.log
index 251e5f59655..8e1f527490c 100644
--- a/compiler/testData/diagnostics/tests/cast/IsTraits.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsTraits.lazy.log
@@ -26,5 +26,8 @@ LazyJavaPackageFragment@8['java'] {
 
 ResolutionTaskHolder@24 {
     <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
+}
+
+null {
     <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/WhenErasedDisallowFromAny.lazy.log b/compiler/testData/diagnostics/tests/cast/WhenErasedDisallowFromAny.lazy.log
index 19d11e19f1e..f50412dfbd7 100644
--- a/compiler/testData/diagnostics/tests/cast/WhenErasedDisallowFromAny.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/WhenErasedDisallowFromAny.lazy.log
@@ -35,5 +35,8 @@ LazyJavaPackageFragment@9['java'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+}
+
+null {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/WhenWithExpression.lazy.log b/compiler/testData/diagnostics/tests/cast/WhenWithExpression.lazy.log
index ee993e4679c..e2a64cfca27 100644
--- a/compiler/testData/diagnostics/tests/cast/WhenWithExpression.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/WhenWithExpression.lazy.log
@@ -50,25 +50,6 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@39 {
     <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
@@ -89,22 +70,44 @@ ResolutionTaskHolder@39 {
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+}
+
+null {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@47 }
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
diff --git a/compiler/testData/diagnostics/tests/cast/bare/AsNestedBare.lazy.log b/compiler/testData/diagnostics/tests/cast/bare/AsNestedBare.lazy.log
index 1199a0b2486..2f19d50b457 100644
--- a/compiler/testData/diagnostics/tests/cast/bare/AsNestedBare.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/bare/AsNestedBare.lazy.log
@@ -29,10 +29,13 @@ LazyJavaPackageFragment@7['java'] {
 
 ResolutionTaskHolder@27 {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
 }
 
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
+}
+
+null {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@32 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/bare/AsNullable.lazy.log b/compiler/testData/diagnostics/tests/cast/bare/AsNullable.lazy.log
index 77cc7ae2604..c7c04f66bd8 100644
--- a/compiler/testData/diagnostics/tests/cast/bare/AsNullable.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/bare/AsNullable.lazy.log
@@ -32,15 +32,18 @@ LazyJavaPackageFragment@8['java'] {
 
 ResolutionTaskHolder@30 {
     <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
 }
 
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+}
+
+null {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@32 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/bare/AsNullableNotEnough.lazy.log b/compiler/testData/diagnostics/tests/cast/bare/AsNullableNotEnough.lazy.log
index ddc27a56f7f..23e1556a390 100644
--- a/compiler/testData/diagnostics/tests/cast/bare/AsNullableNotEnough.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/bare/AsNullableNotEnough.lazy.log
@@ -22,15 +22,18 @@ LazyJavaPackageFragment@6['java'] {
 
 ResolutionTaskHolder@22 {
     <name not found> = ArrayList@23[1] { ResolutionCandidate@24 }
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@24 }
 }
 
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
+ResolutionTaskHolder@25 {
+    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
 }
 
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
+}
+
+null {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@24 }
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@27 }
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@30 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/bare/EitherAs.lazy.log b/compiler/testData/diagnostics/tests/cast/bare/EitherAs.lazy.log
index a3d6406993b..656aa9ffe5c 100644
--- a/compiler/testData/diagnostics/tests/cast/bare/EitherAs.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/bare/EitherAs.lazy.log
@@ -52,20 +52,23 @@ LazyJavaPackageFragment@14['java'] {
 
 ResolutionTaskHolder@50 {
     <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
+}
+
+null {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@52 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/bare/EitherIs.lazy.log b/compiler/testData/diagnostics/tests/cast/bare/EitherIs.lazy.log
index fc8f9a3209e..324a35f52f4 100644
--- a/compiler/testData/diagnostics/tests/cast/bare/EitherIs.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/bare/EitherIs.lazy.log
@@ -52,50 +52,53 @@ LazyJavaPackageFragment@14['java'] {
 
 ResolutionTaskHolder@50 {
     <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+}
+
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
 }
 
 ResolutionTaskHolder@62 {
     <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
+}
+
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
 }
 
 ResolutionTaskHolder@74 {
     <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
 }
 
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+null {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@58 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/bare/EitherNotIs.lazy.log b/compiler/testData/diagnostics/tests/cast/bare/EitherNotIs.lazy.log
index fc8f9a3209e..6efdd26fd6c 100644
--- a/compiler/testData/diagnostics/tests/cast/bare/EitherNotIs.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/bare/EitherNotIs.lazy.log
@@ -52,50 +52,53 @@ LazyJavaPackageFragment@14['java'] {
 
 ResolutionTaskHolder@50 {
     <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+}
+
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
 }
 
 ResolutionTaskHolder@62 {
     <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
+}
+
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
 }
 
 ResolutionTaskHolder@74 {
     <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
 }
 
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+null {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@70 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/bare/EitherSafeAs.lazy.log b/compiler/testData/diagnostics/tests/cast/bare/EitherSafeAs.lazy.log
index a3d6406993b..93579520aac 100644
--- a/compiler/testData/diagnostics/tests/cast/bare/EitherSafeAs.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/bare/EitherSafeAs.lazy.log
@@ -52,20 +52,23 @@ LazyJavaPackageFragment@14['java'] {
 
 ResolutionTaskHolder@50 {
     <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
+}
+
+null {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@61 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/bare/EitherWhen.lazy.log b/compiler/testData/diagnostics/tests/cast/bare/EitherWhen.lazy.log
index 2a9250939c6..77999e2c7e4 100644
--- a/compiler/testData/diagnostics/tests/cast/bare/EitherWhen.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/bare/EitherWhen.lazy.log
@@ -52,40 +52,43 @@ LazyJavaPackageFragment@14['java'] {
 
 ResolutionTaskHolder@50 {
     <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+}
+
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
 }
 
 ResolutionTaskHolder@62 {
     <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
+null {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@67 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/bare/ErrorsInSubstitution.lazy.log b/compiler/testData/diagnostics/tests/cast/bare/ErrorsInSubstitution.lazy.log
index 9786ae66b3e..0a9835e8977 100644
--- a/compiler/testData/diagnostics/tests/cast/bare/ErrorsInSubstitution.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/bare/ErrorsInSubstitution.lazy.log
@@ -40,10 +40,13 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@35 {
     <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
+}
+
+null {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@40 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/bare/FromErrorType.lazy.log b/compiler/testData/diagnostics/tests/cast/bare/FromErrorType.lazy.log
index 854874d6fd5..0f3d89b1e0f 100644
--- a/compiler/testData/diagnostics/tests/cast/bare/FromErrorType.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/bare/FromErrorType.lazy.log
@@ -30,15 +30,18 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+}
+
+null {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@27 }
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@33 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/bare/NullableAs.lazy.log b/compiler/testData/diagnostics/tests/cast/bare/NullableAs.lazy.log
index da2170d38e0..ad1e95417f6 100644
--- a/compiler/testData/diagnostics/tests/cast/bare/NullableAs.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/bare/NullableAs.lazy.log
@@ -32,10 +32,13 @@ LazyJavaPackageFragment@8['java'] {
 
 ResolutionTaskHolder@30 {
     <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
 }
 
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
+}
+
+null {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@32 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/bare/NullableAsNotEnough.lazy.log b/compiler/testData/diagnostics/tests/cast/bare/NullableAsNotEnough.lazy.log
index 618e8404a78..3868f17cdb4 100644
--- a/compiler/testData/diagnostics/tests/cast/bare/NullableAsNotEnough.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/bare/NullableAsNotEnough.lazy.log
@@ -22,10 +22,13 @@ LazyJavaPackageFragment@6['java'] {
 
 ResolutionTaskHolder@22 {
     <name not found> = ArrayList@23[1] { ResolutionCandidate@24 }
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@24 }
 }
 
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
+ResolutionTaskHolder@25 {
+    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
+}
+
+null {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@24 }
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@27 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/bare/NullableAsNullable.lazy.log b/compiler/testData/diagnostics/tests/cast/bare/NullableAsNullable.lazy.log
index 77cc7ae2604..c9af5fd9cf1 100644
--- a/compiler/testData/diagnostics/tests/cast/bare/NullableAsNullable.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/bare/NullableAsNullable.lazy.log
@@ -32,15 +32,18 @@ LazyJavaPackageFragment@8['java'] {
 
 ResolutionTaskHolder@30 {
     <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
 }
 
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+}
+
+null {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@38 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/bare/NullableAsNullableNotEnough.lazy.log b/compiler/testData/diagnostics/tests/cast/bare/NullableAsNullableNotEnough.lazy.log
index ddc27a56f7f..29c3a56b87e 100644
--- a/compiler/testData/diagnostics/tests/cast/bare/NullableAsNullableNotEnough.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/bare/NullableAsNullableNotEnough.lazy.log
@@ -22,15 +22,18 @@ LazyJavaPackageFragment@6['java'] {
 
 ResolutionTaskHolder@22 {
     <name not found> = ArrayList@23[1] { ResolutionCandidate@24 }
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@24 }
 }
 
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
+ResolutionTaskHolder@25 {
+    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
 }
 
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
+}
+
+null {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@27 }
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@24 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/bare/RedundantNullable.lazy.log b/compiler/testData/diagnostics/tests/cast/bare/RedundantNullable.lazy.log
index e303f3ef532..80a9a1b28df 100644
--- a/compiler/testData/diagnostics/tests/cast/bare/RedundantNullable.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/bare/RedundantNullable.lazy.log
@@ -36,5 +36,8 @@ LazyJavaPackageFragment@10['java'] {
 
 ResolutionTaskHolder@32 {
     <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
+}
+
+null {
     <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/bare/ToErrorType.lazy.log b/compiler/testData/diagnostics/tests/cast/bare/ToErrorType.lazy.log
index e31e1d9a65e..8c3137cde75 100644
--- a/compiler/testData/diagnostics/tests/cast/bare/ToErrorType.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/bare/ToErrorType.lazy.log
@@ -34,10 +34,13 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@29 {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
+}
+
+null {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@31 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/bare/UnrelatedAs.lazy.log b/compiler/testData/diagnostics/tests/cast/bare/UnrelatedAs.lazy.log
index 618e8404a78..bcfc1a7e752 100644
--- a/compiler/testData/diagnostics/tests/cast/bare/UnrelatedAs.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/bare/UnrelatedAs.lazy.log
@@ -22,10 +22,13 @@ LazyJavaPackageFragment@6['java'] {
 
 ResolutionTaskHolder@22 {
     <name not found> = ArrayList@23[1] { ResolutionCandidate@24 }
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@24 }
 }
 
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
+ResolutionTaskHolder@25 {
+    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
+}
+
+null {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@24 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/bare/UnrelatedColon.lazy.log b/compiler/testData/diagnostics/tests/cast/bare/UnrelatedColon.lazy.log
index 5d47ed3fa25..c695fb02ec1 100644
--- a/compiler/testData/diagnostics/tests/cast/bare/UnrelatedColon.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/bare/UnrelatedColon.lazy.log
@@ -26,5 +26,8 @@ LazyJavaPackageFragment@8['java'] {
 
 ResolutionTaskHolder@24 {
     <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
+}
+
+null {
     <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/bare/UnrelatedIs.lazy.log b/compiler/testData/diagnostics/tests/cast/bare/UnrelatedIs.lazy.log
index 621f9b27898..ffc4ff3396a 100644
--- a/compiler/testData/diagnostics/tests/cast/bare/UnrelatedIs.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/bare/UnrelatedIs.lazy.log
@@ -26,5 +26,8 @@ LazyJavaPackageFragment@8['java'] {
 
 ResolutionTaskHolder@24 {
     <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
+}
+
+null {
     <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/isErasedAnyAndStarred.lazy.log b/compiler/testData/diagnostics/tests/cast/isErasedAnyAndStarred.lazy.log
index 644ed5b9b6b..b32953adcb6 100644
--- a/compiler/testData/diagnostics/tests/cast/isErasedAnyAndStarred.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/isErasedAnyAndStarred.lazy.log
@@ -30,5 +30,8 @@ LazyJavaPackageFragment@8['java'] {
 
 ResolutionTaskHolder@26 {
     <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
+}
+
+null {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/isErasedTAndStarred.lazy.log b/compiler/testData/diagnostics/tests/cast/isErasedTAndStarred.lazy.log
index 8b52a7ace0c..4a1fcce5546 100644
--- a/compiler/testData/diagnostics/tests/cast/isErasedTAndStarred.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/isErasedTAndStarred.lazy.log
@@ -26,5 +26,8 @@ LazyJavaPackageFragment@8['java'] {
 
 ResolutionTaskHolder@24 {
     <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
+}
+
+null {
     <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/isErasedUnrelatedAndStarred.lazy.log b/compiler/testData/diagnostics/tests/cast/isErasedUnrelatedAndStarred.lazy.log
index 621f9b27898..ffc4ff3396a 100644
--- a/compiler/testData/diagnostics/tests/cast/isErasedUnrelatedAndStarred.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/isErasedUnrelatedAndStarred.lazy.log
@@ -26,5 +26,8 @@ LazyJavaPackageFragment@8['java'] {
 
 ResolutionTaskHolder@24 {
     <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
+}
+
+null {
     <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/kt614.lazy.log b/compiler/testData/diagnostics/tests/cast/kt614.lazy.log
index 0cecdbfb395..4e1103f365a 100644
--- a/compiler/testData/diagnostics/tests/cast/kt614.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/kt614.lazy.log
@@ -31,5 +31,8 @@ LazyJavaPackageFragment@8['java'] {
 
 ResolutionTaskHolder@27 {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
+}
+
+null {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/neverSucceeds/CastToNotNullSuper.lazy.log b/compiler/testData/diagnostics/tests/cast/neverSucceeds/CastToNotNullSuper.lazy.log
index 22d91d75ad5..dae3e7a1dc4 100644
--- a/compiler/testData/diagnostics/tests/cast/neverSucceeds/CastToNotNullSuper.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/neverSucceeds/CastToNotNullSuper.lazy.log
@@ -22,15 +22,18 @@ LazyJavaPackageFragment@6['java'] {
 
 ResolutionTaskHolder@22 {
     <name not found> = ArrayList@23[1] { ResolutionCandidate@24 }
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@24 }
 }
 
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
+ResolutionTaskHolder@25 {
+    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
 }
 
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
+}
+
+null {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@27 }
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@24 }
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@30 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/neverSucceeds/MappedDirect.lazy.log b/compiler/testData/diagnostics/tests/cast/neverSucceeds/MappedDirect.lazy.log
index 6506bda0f3a..98f9484225d 100644
--- a/compiler/testData/diagnostics/tests/cast/neverSucceeds/MappedDirect.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/neverSucceeds/MappedDirect.lazy.log
@@ -138,90 +138,93 @@ LazyJavaPackageFragment@50['lang'] {
 
 ResolutionTaskHolder@91 {
     <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
 }
 
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
 }
 
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
+}
+
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
 }
 
 ResolutionTaskHolder@103 {
     <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
 }
 
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
 }
 
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@113 }
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
+}
+
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
 }
 
 ResolutionTaskHolder@115 {
     <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@117 }
 }
 
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@121 }
+ResolutionTaskHolder@118 {
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
 }
 
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@125 }
+ResolutionTaskHolder@121 {
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
+}
+
+ResolutionTaskHolder@124 {
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
 }
 
 ResolutionTaskHolder@127 {
     <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@129 }
 }
 
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@133 }
+ResolutionTaskHolder@130 {
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
 }
 
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@137 }
+ResolutionTaskHolder@133 {
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
+}
+
+ResolutionTaskHolder@136 {
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
 }
 
 ResolutionTaskHolder@139 {
     <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@141 }
 }
 
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@145 }
+ResolutionTaskHolder@142 {
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
 }
 
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@149 }
-}
-
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@153 }
-}
-
-ResolutionTaskHolder@155 {
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@157 }
-}
-
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@161 }
+null {
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@141 }
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@129 }
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@126 }
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@135 }
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@132 }
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@96 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/neverSucceeds/MappedSubtypes.lazy.log b/compiler/testData/diagnostics/tests/cast/neverSucceeds/MappedSubtypes.lazy.log
index 651ce85708d..e1d22d3f1aa 100644
--- a/compiler/testData/diagnostics/tests/cast/neverSucceeds/MappedSubtypes.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/neverSucceeds/MappedSubtypes.lazy.log
@@ -93,25 +93,28 @@ LazyJavaPackageFragment@59['lang'] {
 
 ResolutionTaskHolder@87 {
     <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
 }
 
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
 }
 
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
+}
+
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
 }
 
 ResolutionTaskHolder@99 {
     <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
 }
 
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
+null {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@101 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/neverSucceeds/NoGenericsRelated.lazy.log b/compiler/testData/diagnostics/tests/cast/neverSucceeds/NoGenericsRelated.lazy.log
index c4ce0d466ff..e50c3d5ebc0 100644
--- a/compiler/testData/diagnostics/tests/cast/neverSucceeds/NoGenericsRelated.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/neverSucceeds/NoGenericsRelated.lazy.log
@@ -49,125 +49,128 @@ LazyJavaPackageFragment@15['java'] {
 
 ResolutionTaskHolder@49 {
     <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
+}
+
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
 }
 
 ResolutionTaskHolder@61 {
     <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
+}
+
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
 }
 
 ResolutionTaskHolder@73 {
     <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
 }
 
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
+}
+
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
 }
 
 ResolutionTaskHolder@85 {
     <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
+}
+
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
 }
 
 ResolutionTaskHolder@97 {
     <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
 }
 
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
 }
 
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
+}
+
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
 }
 
 ResolutionTaskHolder@109 {
     <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
 }
 
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
 }
 
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
+ResolutionTaskHolder@115 {
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
+}
+
+ResolutionTaskHolder@118 {
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
 }
 
 ResolutionTaskHolder@121 {
     <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
 }
 
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@127 }
-}
-
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@131 }
-}
-
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@135 }
-}
-
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@139 }
-}
-
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@143 }
-}
-
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@147 }
+null {
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@66 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/neverSucceeds/NoGenericsUnrelated.lazy.log b/compiler/testData/diagnostics/tests/cast/neverSucceeds/NoGenericsUnrelated.lazy.log
index 048c7c27538..5ce0b64cd93 100644
--- a/compiler/testData/diagnostics/tests/cast/neverSucceeds/NoGenericsUnrelated.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/neverSucceeds/NoGenericsUnrelated.lazy.log
@@ -40,80 +40,83 @@ LazyJavaPackageFragment@12['java'] {
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
 }
 
 ResolutionTaskHolder@52 {
     <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
+}
+
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
 }
 
 ResolutionTaskHolder@64 {
     <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
+}
+
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
 }
 
 ResolutionTaskHolder@76 {
     <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
 }
 
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
 }
 
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
+null {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@84 }
 }
diff --git a/compiler/testData/diagnostics/tests/checkArguments/SpreadVarargs.lazy.log b/compiler/testData/diagnostics/tests/checkArguments/SpreadVarargs.lazy.log
index 58423c05c17..bb2d13e17a1 100644
--- a/compiler/testData/diagnostics/tests/checkArguments/SpreadVarargs.lazy.log
+++ b/compiler/testData/diagnostics/tests/checkArguments/SpreadVarargs.lazy.log
@@ -173,28 +173,28 @@ LazyJavaClassifierType@118['AbstractStringBuilder'] {
 
 LazyJavaClassifierType@121['AbstractStringBuilder'] {
     arguments = ArrayList@122[empty]
-    classifier = JavaClassImpl@120['AbstractStringBuilder']
+    classifier = JavaClassImpl@114['AbstractStringBuilder']
     nullable = 'true': Boolean@123
     typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@124['AbstractStringBuilder'] {
     arguments = ArrayList@125[empty]
-    classifier = JavaClassImpl@93['AbstractStringBuilder']
+    classifier = JavaClassImpl@111['AbstractStringBuilder']
     nullable = 'true': Boolean@123
     typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@126['AbstractStringBuilder'] {
     arguments = ArrayList@127[empty]
-    classifier = JavaClassImpl@83['AbstractStringBuilder']
+    classifier = JavaClassImpl@105['AbstractStringBuilder']
     nullable = 'true': Boolean@123
     typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@128['AbstractStringBuilder'] {
     arguments = ArrayList@129[empty]
-    classifier = JavaClassImpl@87['AbstractStringBuilder']
+    classifier = JavaClassImpl@90['AbstractStringBuilder']
     nullable = 'true': Boolean@123
     typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
 }
@@ -208,56 +208,56 @@ LazyJavaClassifierType@130['AbstractStringBuilder'] {
 
 LazyJavaClassifierType@132['AbstractStringBuilder'] {
     arguments = ArrayList@133[empty]
-    classifier = JavaClassImpl@111['AbstractStringBuilder']
+    classifier = JavaClassImpl@83['AbstractStringBuilder']
     nullable = 'true': Boolean@123
     typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@134['AbstractStringBuilder'] {
     arguments = ArrayList@135[empty]
-    classifier = JavaClassImpl@105['AbstractStringBuilder']
+    classifier = JavaClassImpl@96['AbstractStringBuilder']
     nullable = 'true': Boolean@123
     typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@136['AbstractStringBuilder'] {
     arguments = ArrayList@137[empty]
-    classifier = JavaClassImpl@99['AbstractStringBuilder']
+    classifier = JavaClassImpl@120['AbstractStringBuilder']
     nullable = 'true': Boolean@123
     typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@138['AbstractStringBuilder'] {
     arguments = ArrayList@139[empty]
-    classifier = JavaClassImpl@96['AbstractStringBuilder']
+    classifier = JavaClassImpl@87['AbstractStringBuilder']
     nullable = 'true': Boolean@123
     typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@140['AbstractStringBuilder'] {
     arguments = ArrayList@141[empty]
-    classifier = JavaClassImpl@117['AbstractStringBuilder']
+    classifier = JavaClassImpl@102['AbstractStringBuilder']
     nullable = 'true': Boolean@123
     typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@142['AbstractStringBuilder'] {
     arguments = ArrayList@143[empty]
-    classifier = JavaClassImpl@102['AbstractStringBuilder']
+    classifier = JavaClassImpl@99['AbstractStringBuilder']
     nullable = 'true': Boolean@123
     typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@144['AbstractStringBuilder'] {
     arguments = ArrayList@145[empty]
-    classifier = JavaClassImpl@114['AbstractStringBuilder']
+    classifier = JavaClassImpl@93['AbstractStringBuilder']
     nullable = 'true': Boolean@123
     typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@146['AbstractStringBuilder'] {
     arguments = ArrayList@147[empty]
-    classifier = JavaClassImpl@90['AbstractStringBuilder']
+    classifier = JavaClassImpl@117['AbstractStringBuilder']
     nullable = 'true': Boolean@123
     typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
 }
@@ -298,7 +298,7 @@ LazyJavaClassifierType@158['Appendable'] {
 
 LazyJavaClassifierType@161['Appendable'] {
     arguments = ArrayList@162[empty]
-    classifier = JavaClassImpl@160['Appendable']
+    classifier = JavaClassImpl@157['Appendable']
     nullable = 'true': Boolean@123
     typeConstructor = LazyJavaClassTypeConstructor@29['Appendable']
 }
@@ -312,7 +312,7 @@ LazyJavaClassifierType@163['Appendable'] {
 
 LazyJavaClassifierType@165['Appendable'] {
     arguments = ArrayList@166[empty]
-    classifier = JavaClassImpl@157['Appendable']
+    classifier = JavaClassImpl@160['Appendable']
     nullable = 'true': Boolean@123
     typeConstructor = LazyJavaClassTypeConstructor@29['Appendable']
 }
@@ -382,49 +382,49 @@ LazyJavaClassifierType@191['CharSequence'] {
 
 LazyJavaClassifierType@194['CharSequence'] {
     arguments = ArrayList@195[empty]
-    classifier = JavaClassImpl@190['CharSequence']
+    classifier = JavaClassImpl@181['CharSequence']
     nullable = 'true': Boolean@123
     typeConstructor = DeserializedClassTypeConstructor@170
 }
 
 LazyJavaClassifierType@196['CharSequence'] {
     arguments = ArrayList@197[empty]
-    classifier = JavaClassImpl@187['CharSequence']
+    classifier = JavaClassImpl@175['CharSequence']
     nullable = 'true': Boolean@123
     typeConstructor = DeserializedClassTypeConstructor@170
 }
 
 LazyJavaClassifierType@198['CharSequence'] {
     arguments = ArrayList@199[empty]
-    classifier = JavaClassImpl@184['CharSequence']
+    classifier = JavaClassImpl@193['CharSequence']
     nullable = 'true': Boolean@123
     typeConstructor = DeserializedClassTypeConstructor@170
 }
 
 LazyJavaClassifierType@200['CharSequence'] {
     arguments = ArrayList@201[empty]
-    classifier = JavaClassImpl@175['CharSequence']
+    classifier = JavaClassImpl@190['CharSequence']
     nullable = 'true': Boolean@123
     typeConstructor = DeserializedClassTypeConstructor@170
 }
 
 LazyJavaClassifierType@202['CharSequence'] {
     arguments = ArrayList@203[empty]
-    classifier = JavaClassImpl@181['CharSequence']
+    classifier = JavaClassImpl@187['CharSequence']
     nullable = 'true': Boolean@123
     typeConstructor = DeserializedClassTypeConstructor@170
 }
 
 LazyJavaClassifierType@204['CharSequence'] {
     arguments = ArrayList@205[empty]
-    classifier = JavaClassImpl@193['CharSequence']
+    classifier = JavaClassImpl@178['CharSequence']
     nullable = 'true': Boolean@123
     typeConstructor = DeserializedClassTypeConstructor@170
 }
 
 LazyJavaClassifierType@206['CharSequence'] {
     arguments = ArrayList@207[empty]
-    classifier = JavaClassImpl@178['CharSequence']
+    classifier = JavaClassImpl@184['CharSequence']
     nullable = 'true': Boolean@123
     typeConstructor = DeserializedClassTypeConstructor@170
 }
@@ -450,14 +450,14 @@ LazyJavaClassifierType@213['Object'] {
 
 LazyJavaClassifierType@216['Object'] {
     arguments = ArrayList@217[empty]
-    classifier = JavaClassImpl@211['Object']
+    classifier = JavaClassImpl@215['Object']
     nullable = 'true': Boolean@123
     typeConstructor = DeserializedClassTypeConstructor@212
 }
 
 LazyJavaClassifierType@218['Object'] {
     arguments = ArrayList@219[empty]
-    classifier = JavaClassImpl@215['Object']
+    classifier = JavaClassImpl@211['Object']
     nullable = 'true': Boolean@123
     typeConstructor = DeserializedClassTypeConstructor@212
 }
@@ -526,35 +526,35 @@ LazyJavaClassifierType@242['String'] {
 
 LazyJavaClassifierType@245['String'] {
     arguments = ArrayList@246[empty]
-    classifier = JavaClassImpl@244['String']
+    classifier = JavaClassImpl@241['String']
     nullable = 'true': Boolean@123
     typeConstructor = DeserializedClassTypeConstructor@232
 }
 
 LazyJavaClassifierType@247['String'] {
     arguments = ArrayList@248[empty]
-    classifier = JavaClassImpl@238['String']
+    classifier = JavaClassImpl@244['String']
     nullable = 'true': Boolean@123
     typeConstructor = DeserializedClassTypeConstructor@232
 }
 
 LazyJavaClassifierType@249['String'] {
     arguments = ArrayList@250[empty]
-    classifier = JavaClassImpl@241['String']
+    classifier = JavaClassImpl@231['String']
     nullable = 'true': Boolean@123
     typeConstructor = DeserializedClassTypeConstructor@232
 }
 
 LazyJavaClassifierType@251['String'] {
     arguments = ArrayList@252[empty]
-    classifier = JavaClassImpl@235['String']
+    classifier = JavaClassImpl@238['String']
     nullable = 'true': Boolean@123
     typeConstructor = DeserializedClassTypeConstructor@232
 }
 
 LazyJavaClassifierType@253['String'] {
     arguments = ArrayList@254[empty]
-    classifier = JavaClassImpl@231['String']
+    classifier = JavaClassImpl@235['String']
     nullable = 'true': Boolean@123
     typeConstructor = DeserializedClassTypeConstructor@232
 }
@@ -575,14 +575,14 @@ LazyJavaClassifierType@258['StringBuffer'] {
 
 LazyJavaClassifierType@261['StringBuffer'] {
     arguments = ArrayList@262[empty]
-    classifier = JavaClassImpl@257['StringBuffer']
+    classifier = JavaClassImpl@260['StringBuffer']
     nullable = 'true': Boolean@123
     typeConstructor = LazyJavaClassTypeConstructor@39['StringBuffer']
 }
 
 LazyJavaClassifierType@263['StringBuffer'] {
     arguments = ArrayList@264[empty]
-    classifier = JavaClassImpl@260['StringBuffer']
+    classifier = JavaClassImpl@257['StringBuffer']
     nullable = 'true': Boolean@123
     typeConstructor = LazyJavaClassTypeConstructor@39['StringBuffer']
 }
@@ -694,77 +694,77 @@ LazyJavaClassifierType@307['StringBuilder'] {
 
 LazyJavaClassifierType@310['StringBuilder'] {
     arguments = ArrayList@311[empty]
-    classifier = JavaClassImpl@303['StringBuilder']
+    classifier = JavaClassImpl@282['StringBuilder']
     nullable = 'true': Boolean@123
     typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
 }
 
 LazyJavaClassifierType@312['StringBuilder'] {
     arguments = ArrayList@313[empty]
-    classifier = JavaClassImpl@300['StringBuilder']
+    classifier = JavaClassImpl@309['StringBuilder']
     nullable = 'true': Boolean@123
     typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
 }
 
 LazyJavaClassifierType@314['StringBuilder'] {
     arguments = ArrayList@315[empty]
-    classifier = JavaClassImpl@306['StringBuilder']
+    classifier = JavaClassImpl@297['StringBuilder']
     nullable = 'true': Boolean@123
     typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
 }
 
 LazyJavaClassifierType@316['StringBuilder'] {
     arguments = ArrayList@317[empty]
-    classifier = JavaClassImpl@288['StringBuilder']
+    classifier = JavaClassImpl@303['StringBuilder']
     nullable = 'true': Boolean@123
     typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
 }
 
 LazyJavaClassifierType@318['StringBuilder'] {
     arguments = ArrayList@319[empty]
-    classifier = JavaClassImpl@282['StringBuilder']
+    classifier = JavaClassImpl@273['StringBuilder']
     nullable = 'true': Boolean@123
     typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
 }
 
 LazyJavaClassifierType@320['StringBuilder'] {
     arguments = ArrayList@321[empty]
-    classifier = JavaClassImpl@276['StringBuilder']
+    classifier = JavaClassImpl@288['StringBuilder']
     nullable = 'true': Boolean@123
     typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
 }
 
 LazyJavaClassifierType@322['StringBuilder'] {
     arguments = ArrayList@323[empty]
-    classifier = JavaClassImpl@285['StringBuilder']
+    classifier = JavaClassImpl@267['StringBuilder']
     nullable = 'true': Boolean@123
     typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
 }
 
 LazyJavaClassifierType@324['StringBuilder'] {
     arguments = ArrayList@325[empty]
-    classifier = JavaClassImpl@309['StringBuilder']
+    classifier = JavaClassImpl@276['StringBuilder']
     nullable = 'true': Boolean@123
     typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
 }
 
 LazyJavaClassifierType@326['StringBuilder'] {
     arguments = ArrayList@327[empty]
-    classifier = JavaClassImpl@267['StringBuilder']
+    classifier = JavaClassImpl@285['StringBuilder']
     nullable = 'true': Boolean@123
     typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
 }
 
 LazyJavaClassifierType@328['StringBuilder'] {
     arguments = ArrayList@329[empty]
-    classifier = JavaClassImpl@273['StringBuilder']
+    classifier = JavaClassImpl@270['StringBuilder']
     nullable = 'true': Boolean@123
     typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
 }
 
 LazyJavaClassifierType@330['StringBuilder'] {
     arguments = ArrayList@331[empty]
-    classifier = JavaClassImpl@279['StringBuilder']
+    classifier = JavaClassImpl@306['StringBuilder']
     nullable = 'true': Boolean@123
     typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
 }
@@ -778,14 +778,14 @@ LazyJavaClassifierType@332['StringBuilder'] {
 
 LazyJavaClassifierType@334['StringBuilder'] {
     arguments = ArrayList@335[empty]
-    classifier = JavaClassImpl@297['StringBuilder']
+    classifier = JavaClassImpl@279['StringBuilder']
     nullable = 'true': Boolean@123
     typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
 }
 
 LazyJavaClassifierType@336['StringBuilder'] {
     arguments = ArrayList@337[empty]
-    classifier = JavaClassImpl@270['StringBuilder']
+    classifier = JavaClassImpl@300['StringBuilder']
     nullable = 'true': Boolean@123
     typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
 }
@@ -823,7 +823,7 @@ LazyJavaPackageFragmentProvider@340 {
     topLevelClasses(JavaClassImpl@80['AbstractStringBuilder']) = LazyJavaClassDescriptor@2['AbstractStringBuilder']
     topLevelClasses(JavaClassImpl@151['Appendable']) = LazyJavaClassDescriptor@16['Appendable']
     topLevelClasses(JavaClassImpl@227['Serializable']) = LazyJavaClassDescriptor@30['Serializable']
-    topLevelClasses(JavaClassImpl@257['StringBuffer']) = LazyJavaClassDescriptor@38['StringBuffer']
+    topLevelClasses(JavaClassImpl@260['StringBuffer']) = LazyJavaClassDescriptor@38['StringBuffer']
     topLevelClasses(JavaClassImpl@367['StringBuilder']) = LazyJavaClassDescriptor@40['StringBuilder']
 }
 
@@ -870,20 +870,14 @@ LazyJavaPackageFragment@353['lang'] {
 
 ResolutionTaskHolder@386 {
     <name not found> = ArrayList@387[13] { ResolutionCandidate@388, ResolutionCandidate@389, ResolutionCandidate@390, ... }
-    <name not found> = ArrayList@391[14] { ResolutionCandidate@388, ResolutionCandidate@389, ResolutionCandidate@392, ... }
 }
 
-ResolutionTaskHolder@393 {
-    <name not found> = ArrayList@394[13] { ResolutionCandidate@395, ResolutionCandidate@396, ResolutionCandidate@397, ... }
-    <name not found> = ArrayList@398[14] { ResolutionCandidate@395, ResolutionCandidate@396, ResolutionCandidate@399, ... }
+ResolutionTaskHolder@391 {
+    <name not found> = ArrayList@392[13] { ResolutionCandidate@393, ResolutionCandidate@394, ResolutionCandidate@395, ... }
 }
 
-ResolutionTaskHolder@400 {
-    <name not found> = ArrayList@401[1] { ResolutionCandidate@402 }
-    <name not found> = ArrayList@403[1] { ResolutionCandidate@402 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@396 {
+    <name not found> = ArrayList@397[1] { ResolutionCandidate@398 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -901,9 +895,8 @@ ResolutionTaskHolder@400 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@404 {
-    <name not found> = ArrayList@405[1] { ResolutionCandidate@406 }
-    <name not found> = ArrayList@407[1] { ResolutionCandidate@406 }
+ResolutionTaskHolder@399 {
+    <name not found> = ArrayList@400[1] { ResolutionCandidate@401 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -919,6 +912,41 @@ ResolutionTaskHolder@404 {
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@402 {
+    <name not found> = ArrayList@403[1] { ResolutionCandidate@404 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@405 {
+    <name not found> = ArrayList@406[1] { ResolutionCandidate@407 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -926,10 +954,6 @@ ResolutionTaskHolder@404 {
 
 ResolutionTaskHolder@408 {
     <name not found> = ArrayList@409[1] { ResolutionCandidate@410 }
-    <name not found> = ArrayList@411[1] { ResolutionCandidate@410 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -947,12 +971,8 @@ ResolutionTaskHolder@408 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@412 {
-    <name not found> = ArrayList@413[1] { ResolutionCandidate@414 }
-    <name not found> = ArrayList@415[1] { ResolutionCandidate@414 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@411 {
+    <name not found> = ArrayList@412[1] { ResolutionCandidate@413 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -970,9 +990,8 @@ ResolutionTaskHolder@412 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@416 {
-    <name not found> = ArrayList@417[1] { ResolutionCandidate@418 }
-    <name not found> = ArrayList@419[1] { ResolutionCandidate@418 }
+ResolutionTaskHolder@414 {
+    <name not found> = ArrayList@415[1] { ResolutionCandidate@416 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -988,6 +1007,22 @@ ResolutionTaskHolder@416 {
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@417 {
+    <name not found> = ArrayList@418[1] { ResolutionCandidate@419 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -995,10 +1030,6 @@ ResolutionTaskHolder@416 {
 
 ResolutionTaskHolder@420 {
     <name not found> = ArrayList@421[1] { ResolutionCandidate@422 }
-    <name not found> = ArrayList@423[1] { ResolutionCandidate@422 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -1016,12 +1047,8 @@ ResolutionTaskHolder@420 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@424 {
-    <name not found> = ArrayList@425[1] { ResolutionCandidate@426 }
-    <name not found> = ArrayList@427[1] { ResolutionCandidate@426 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@423 {
+    <name not found> = ArrayList@424[1] { ResolutionCandidate@425 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -1039,9 +1066,8 @@ ResolutionTaskHolder@424 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@428 {
-    <name not found> = ArrayList@429[1] { ResolutionCandidate@430 }
-    <name not found> = ArrayList@431[1] { ResolutionCandidate@430 }
+ResolutionTaskHolder@426 {
+    <name not found> = ArrayList@427[1] { ResolutionCandidate@428 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -1057,6 +1083,22 @@ ResolutionTaskHolder@428 {
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@429 {
+    <name not found> = ArrayList@430[1] { ResolutionCandidate@431 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -1064,10 +1106,6 @@ ResolutionTaskHolder@428 {
 
 ResolutionTaskHolder@432 {
     <name not found> = ArrayList@433[1] { ResolutionCandidate@434 }
-    <name not found> = ArrayList@435[1] { ResolutionCandidate@434 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -1085,12 +1123,8 @@ ResolutionTaskHolder@432 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@436 {
-    <name not found> = ArrayList@437[1] { ResolutionCandidate@438 }
-    <name not found> = ArrayList@439[1] { ResolutionCandidate@438 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@435 {
+    <name not found> = ArrayList@436[1] { ResolutionCandidate@437 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -1108,9 +1142,8 @@ ResolutionTaskHolder@436 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@440 {
-    <name not found> = ArrayList@441[1] { ResolutionCandidate@442 }
-    <name not found> = ArrayList@443[1] { ResolutionCandidate@442 }
+ResolutionTaskHolder@438 {
+    <name not found> = ArrayList@439[1] { ResolutionCandidate@440 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -1126,6 +1159,22 @@ ResolutionTaskHolder@440 {
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@441 {
+    <name not found> = ArrayList@442[1] { ResolutionCandidate@443 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -1133,10 +1182,6 @@ ResolutionTaskHolder@440 {
 
 ResolutionTaskHolder@444 {
     <name not found> = ArrayList@445[1] { ResolutionCandidate@446 }
-    <name not found> = ArrayList@447[1] { ResolutionCandidate@446 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -1154,834 +1199,792 @@ ResolutionTaskHolder@444 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@448 {
-    <name not found> = ArrayList@449[1] { ResolutionCandidate@450 }
-    <name not found> = ArrayList@451[1] { ResolutionCandidate@450 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@447 {
+    <name not found> = ArrayList@448[1] { ResolutionCandidate@449 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@452 {
-    <name not found> = ArrayList@453[1] { ResolutionCandidate@454 }
-    <name not found> = ArrayList@455[1] { ResolutionCandidate@454 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@450 {
+    <name not found> = ArrayList@451[1] { ResolutionCandidate@452 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@453 {
+    <name not found> = ArrayList@454[1] { ResolutionCandidate@455 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
 ResolutionTaskHolder@456 {
     <name not found> = ArrayList@457[1] { ResolutionCandidate@458 }
-    <name not found> = ArrayList@459[1] { ResolutionCandidate@458 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@460 {
-    <name not found> = ArrayList@461[1] { ResolutionCandidate@462 }
-    <name not found> = ArrayList@463[1] { ResolutionCandidate@462 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@459 {
+    <name not found> = ArrayList@460[1] { ResolutionCandidate@461 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@464 {
-    <name not found> = ArrayList@465[1] { ResolutionCandidate@466 }
-    <name not found> = ArrayList@467[1] { ResolutionCandidate@466 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@462 {
+    <name not found> = ArrayList@463[1] { ResolutionCandidate@464 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@465 {
+    <name not found> = ArrayList@466[1] { ResolutionCandidate@467 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
 ResolutionTaskHolder@468 {
     <name not found> = ArrayList@469[1] { ResolutionCandidate@470 }
-    <name not found> = ArrayList@471[1] { ResolutionCandidate@470 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@472 {
-    <name not found> = ArrayList@473[1] { ResolutionCandidate@474 }
-    <name not found> = ArrayList@475[1] { ResolutionCandidate@474 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@471 {
+    <name not found> = ArrayList@472[1] { ResolutionCandidate@473 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@476 {
-    <name not found> = ArrayList@477[1] { ResolutionCandidate@478 }
-    <name not found> = ArrayList@479[1] { ResolutionCandidate@478 }
+ResolutionTaskHolder@474 {
+    <name not found> = ArrayList@475[1] { ResolutionCandidate@476 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@477 {
+    <name not found> = ArrayList@478[1] { ResolutionCandidate@479 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
 ResolutionTaskHolder@480 {
     <name not found> = ArrayList@481[1] { ResolutionCandidate@482 }
-    <name not found> = ArrayList@483[1] { ResolutionCandidate@482 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@484 {
-    <name not found> = ArrayList@485[1] { ResolutionCandidate@486 }
-    <name not found> = ArrayList@487[1] { ResolutionCandidate@486 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@483 {
+    <name not found> = ArrayList@484[1] { ResolutionCandidate@485 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@488 {
-    <name not found> = ArrayList@489[1] { ResolutionCandidate@490 }
-    <name not found> = ArrayList@491[1] { ResolutionCandidate@490 }
+ResolutionTaskHolder@486 {
+    <name not found> = ArrayList@487[1] { ResolutionCandidate@488 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@489 {
+    <name not found> = ArrayList@490[1] { ResolutionCandidate@491 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
 ResolutionTaskHolder@492 {
     <name not found> = ArrayList@493[1] { ResolutionCandidate@494 }
-    <name not found> = ArrayList@495[1] { ResolutionCandidate@494 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@496 {
-    <name not found> = ArrayList@497[1] { ResolutionCandidate@498 }
-    <name not found> = ArrayList@499[1] { ResolutionCandidate@498 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@495 {
+    <name not found> = ArrayList@496[1] { ResolutionCandidate@497 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@500 {
-    <name not found> = ArrayList@501[1] { ResolutionCandidate@502 }
-    <name not found> = ArrayList@503[1] { ResolutionCandidate@502 }
+ResolutionTaskHolder@498 {
+    <name not found> = ArrayList@499[1] { ResolutionCandidate@500 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@501 {
+    <name not found> = ArrayList@502[1] { ResolutionCandidate@503 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
 ResolutionTaskHolder@504 {
     <name not found> = ArrayList@505[1] { ResolutionCandidate@506 }
-    <name not found> = ArrayList@507[1] { ResolutionCandidate@506 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@508 {
-    <name not found> = ArrayList@509[1] { ResolutionCandidate@510 }
-    <name not found> = ArrayList@511[1] { ResolutionCandidate@510 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@507 {
+    <name not found> = ArrayList@508[1] { ResolutionCandidate@509 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@512 {
-    <name not found> = ArrayList@513[1] { ResolutionCandidate@514 }
-    <name not found> = ArrayList@515[1] { ResolutionCandidate@514 }
+ResolutionTaskHolder@510 {
+    <name not found> = ArrayList@511[1] { ResolutionCandidate@512 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@513 {
+    <name not found> = ArrayList@514[1] { ResolutionCandidate@515 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
 ResolutionTaskHolder@516 {
     <name not found> = ArrayList@517[1] { ResolutionCandidate@518 }
-    <name not found> = ArrayList@519[1] { ResolutionCandidate@518 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@520 {
-    <name not found> = ArrayList@521[1] { ResolutionCandidate@522 }
-    <name not found> = ArrayList@523[1] { ResolutionCandidate@522 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@519 {
+    <name not found> = ArrayList@520[1] { ResolutionCandidate@521 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@524 {
-    <name not found> = ArrayList@525[1] { ResolutionCandidate@526 }
-    <name not found> = ArrayList@527[1] { ResolutionCandidate@526 }
+ResolutionTaskHolder@522 {
+    <name not found> = ArrayList@523[1] { ResolutionCandidate@524 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@525 {
+    <name not found> = ArrayList@526[1] { ResolutionCandidate@527 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
 ResolutionTaskHolder@528 {
     <name not found> = ArrayList@529[1] { ResolutionCandidate@530 }
-    <name not found> = ArrayList@531[1] { ResolutionCandidate@530 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@532 {
-    <name not found> = ArrayList@533[1] { ResolutionCandidate@534 }
-    <name not found> = ArrayList@535[1] { ResolutionCandidate@534 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@531 {
+    <name not found> = ArrayList@532[1] { ResolutionCandidate@533 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@536 {
-    <name not found> = ArrayList@537[1] { ResolutionCandidate@538 }
-    <name not found> = ArrayList@539[1] { ResolutionCandidate@538 }
+ResolutionTaskHolder@534 {
+    <name not found> = ArrayList@535[1] { ResolutionCandidate@536 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@537 {
+    <name not found> = ArrayList@538[1] { ResolutionCandidate@539 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
 ResolutionTaskHolder@540 {
     <name not found> = ArrayList@541[1] { ResolutionCandidate@542 }
-    <name not found> = ArrayList@543[1] { ResolutionCandidate@542 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@544 {
-    <name not found> = ArrayList@545[1] { ResolutionCandidate@546 }
-    <name not found> = ArrayList@547[1] { ResolutionCandidate@546 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@543 {
+    <name not found> = ArrayList@544[1] { ResolutionCandidate@545 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@548 {
-    <name not found> = ArrayList@549[1] { ResolutionCandidate@550 }
-    <name not found> = ArrayList@551[1] { ResolutionCandidate@550 }
+ResolutionTaskHolder@546 {
+    <name not found> = ArrayList@547[1] { ResolutionCandidate@548 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@549 {
+    <name not found> = ArrayList@550[1] { ResolutionCandidate@551 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
 ResolutionTaskHolder@552 {
     <name not found> = ArrayList@553[1] { ResolutionCandidate@554 }
-    <name not found> = ArrayList@555[1] { ResolutionCandidate@554 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@556 {
-    <name not found> = ArrayList@557[1] { ResolutionCandidate@558 }
-    <name not found> = ArrayList@559[1] { ResolutionCandidate@558 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@555 {
+    <name not found> = ArrayList@556[1] { ResolutionCandidate@557 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@560 {
-    <name not found> = ArrayList@561[1] { ResolutionCandidate@562 }
-    <name not found> = ArrayList@563[1] { ResolutionCandidate@562 }
+ResolutionTaskHolder@558 {
+    <name not found> = ArrayList@559[1] { ResolutionCandidate@560 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@561 {
+    <name not found> = ArrayList@562[1] { ResolutionCandidate@563 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
 ResolutionTaskHolder@564 {
     <name not found> = ArrayList@565[1] { ResolutionCandidate@566 }
-    <name not found> = ArrayList@567[1] { ResolutionCandidate@566 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@568 {
-    <name not found> = ArrayList@569[1] { ResolutionCandidate@570 }
-    <name not found> = ArrayList@571[1] { ResolutionCandidate@570 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@567 {
+    <name not found> = ArrayList@568[1] { ResolutionCandidate@569 }
 }
 
-ResolutionTaskHolder@572 {
-    <name not found> = ArrayList@573[1] { ResolutionCandidate@574 }
-    <name not found> = ArrayList@575[1] { ResolutionCandidate@574 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@570 {
+    <name not found> = ArrayList@571[1] { ResolutionCandidate@572 }
+}
+
+ResolutionTaskHolder@573 {
+    <name not found> = ArrayList@574[1] { ResolutionCandidate@575 }
 }
 
 ResolutionTaskHolder@576 {
     <name not found> = ArrayList@577[1] { ResolutionCandidate@578 }
-    <name not found> = ArrayList@579[1] { ResolutionCandidate@578 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@580 {
-    <name not found> = ArrayList@581[1] { ResolutionCandidate@582 }
-    <name not found> = ArrayList@583[1] { ResolutionCandidate@582 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@579 {
+    <name not found> = ArrayList@580[1] { ResolutionCandidate@581 }
 }
 
-ResolutionTaskHolder@584 {
-    <name not found> = ArrayList@585[1] { ResolutionCandidate@586 }
-    <name not found> = ArrayList@587[1] { ResolutionCandidate@586 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@582 {
+    <name not found> = ArrayList@583[1] { ResolutionCandidate@584 }
+}
+
+ResolutionTaskHolder@585 {
+    <name not found> = ArrayList@586[1] { ResolutionCandidate@587 }
 }
 
 ResolutionTaskHolder@588 {
     <name not found> = ArrayList@589[1] { ResolutionCandidate@590 }
-    <name not found> = ArrayList@591[1] { ResolutionCandidate@590 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@592 {
-    <name not found> = ArrayList@593[1] { ResolutionCandidate@594 }
-    <name not found> = ArrayList@595[1] { ResolutionCandidate@594 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@591 {
+    <name not found> = ArrayList@592[1] { ResolutionCandidate@593 }
 }
 
-ResolutionTaskHolder@596 {
-    <name not found> = ArrayList@597[1] { ResolutionCandidate@598 }
-    <name not found> = ArrayList@599[1] { ResolutionCandidate@598 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@594 {
+    <name not found> = ArrayList@595[1] { ResolutionCandidate@596 }
+}
+
+ResolutionTaskHolder@597 {
+    <name not found> = ArrayList@598[1] { ResolutionCandidate@599 }
 }
 
 ResolutionTaskHolder@600 {
     <name not found> = ArrayList@601[1] { ResolutionCandidate@602 }
-    <name not found> = ArrayList@603[1] { ResolutionCandidate@602 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@604 {
-    <name not found> = ArrayList@605[1] { ResolutionCandidate@606 }
-    <name not found> = ArrayList@607[1] { ResolutionCandidate@606 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@603 {
+    <name not found> = ArrayList@604[1] { ResolutionCandidate@605 }
 }
 
-ResolutionTaskHolder@608 {
-    <name not found> = ArrayList@609[1] { ResolutionCandidate@610 }
-    <name not found> = ArrayList@611[1] { ResolutionCandidate@610 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@606 {
+    <name not found> = ArrayList@607[1] { ResolutionCandidate@608 }
+}
+
+ResolutionTaskHolder@609 {
+    <name not found> = ArrayList@610[1] { ResolutionCandidate@611 }
 }
 
 ResolutionTaskHolder@612 {
     <name not found> = ArrayList@613[1] { ResolutionCandidate@614 }
-    <name not found> = ArrayList@615[1] { ResolutionCandidate@614 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@616 {
-    <name not found> = ArrayList@617[1] { ResolutionCandidate@618 }
-    <name not found> = ArrayList@619[1] { ResolutionCandidate@618 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@615 {
+    <name not found> = ArrayList@616[1] { ResolutionCandidate@617 }
 }
 
-ResolutionTaskHolder@620 {
-    <name not found> = ArrayList@621[1] { ResolutionCandidate@622 }
-    <name not found> = ArrayList@623[1] { ResolutionCandidate@622 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@618 {
+    <name not found> = ArrayList@619[1] { ResolutionCandidate@620 }
+}
+
+ResolutionTaskHolder@621 {
+    <name not found> = ArrayList@622[1] { ResolutionCandidate@623 }
 }
 
 ResolutionTaskHolder@624 {
     <name not found> = ArrayList@625[1] { ResolutionCandidate@626 }
-    <name not found> = ArrayList@627[1] { ResolutionCandidate@626 }
 }
 
-ResolutionTaskHolder@628 {
-    <name not found> = ArrayList@629[1] { ResolutionCandidate@630 }
-    <name not found> = ArrayList@631[1] { ResolutionCandidate@630 }
+ResolutionTaskHolder@627 {
+    <name not found> = ArrayList@628[1] { ResolutionCandidate@629 }
 }
 
-ResolutionTaskHolder@632 {
-    <name not found> = ArrayList@633[1] { ResolutionCandidate@634 }
-    <name not found> = ArrayList@635[1] { ResolutionCandidate@634 }
+ResolutionTaskHolder@630 {
+    <name not found> = ArrayList@631[1] { ResolutionCandidate@632 }
+}
+
+ResolutionTaskHolder@633 {
+    <name not found> = ArrayList@634[1] { ResolutionCandidate@635 }
 }
 
 ResolutionTaskHolder@636 {
     <name not found> = ArrayList@637[1] { ResolutionCandidate@638 }
-    <name not found> = ArrayList@639[1] { ResolutionCandidate@638 }
 }
 
-ResolutionTaskHolder@640 {
-    <name not found> = ArrayList@641[1] { ResolutionCandidate@642 }
-    <name not found> = ArrayList@643[1] { ResolutionCandidate@642 }
+ResolutionTaskHolder@639 {
+    <name not found> = ArrayList@640[1] { ResolutionCandidate@641 }
 }
 
-ResolutionTaskHolder@644 {
-    <name not found> = ArrayList@645[1] { ResolutionCandidate@646 }
-    <name not found> = ArrayList@647[1] { ResolutionCandidate@646 }
+ResolutionTaskHolder@642 {
+    <name not found> = ArrayList@643[1] { ResolutionCandidate@644 }
+}
+
+ResolutionTaskHolder@645 {
+    <name not found> = ArrayList@646[1] { ResolutionCandidate@647 }
 }
 
 ResolutionTaskHolder@648 {
     <name not found> = ArrayList@649[1] { ResolutionCandidate@650 }
-    <name not found> = ArrayList@651[1] { ResolutionCandidate@650 }
 }
 
-ResolutionTaskHolder@652 {
-    <name not found> = ArrayList@653[1] { ResolutionCandidate@654 }
-    <name not found> = ArrayList@655[1] { ResolutionCandidate@654 }
+ResolutionTaskHolder@651 {
+    <name not found> = ArrayList@652[1] { ResolutionCandidate@653 }
 }
 
-ResolutionTaskHolder@656 {
-    <name not found> = ArrayList@657[1] { ResolutionCandidate@658 }
-    <name not found> = ArrayList@659[1] { ResolutionCandidate@658 }
+ResolutionTaskHolder@654 {
+    <name not found> = ArrayList@655[1] { ResolutionCandidate@656 }
+}
+
+ResolutionTaskHolder@657 {
+    <name not found> = ArrayList@658[1] { ResolutionCandidate@659 }
 }
 
 ResolutionTaskHolder@660 {
     <name not found> = ArrayList@661[1] { ResolutionCandidate@662 }
-    <name not found> = ArrayList@663[1] { ResolutionCandidate@662 }
 }
 
-ResolutionTaskHolder@664 {
-    <name not found> = ArrayList@665[1] { ResolutionCandidate@666 }
-    <name not found> = ArrayList@667[1] { ResolutionCandidate@666 }
+ResolutionTaskHolder@663 {
+    <name not found> = ArrayList@664[1] { ResolutionCandidate@665 }
 }
 
-ResolutionTaskHolder@668 {
-    <name not found> = ArrayList@669[1] { ResolutionCandidate@670 }
-    <name not found> = ArrayList@671[1] { ResolutionCandidate@670 }
+ResolutionTaskHolder@666 {
+    <name not found> = ArrayList@667[1] { ResolutionCandidate@668 }
+}
+
+ResolutionTaskHolder@669 {
+    <name not found> = ArrayList@670[1] { ResolutionCandidate@671 }
 }
 
 ResolutionTaskHolder@672 {
     <name not found> = ArrayList@673[1] { ResolutionCandidate@674 }
-    <name not found> = ArrayList@675[1] { ResolutionCandidate@674 }
 }
 
-ResolutionTaskHolder@676 {
-    <name not found> = ArrayList@677[1] { ResolutionCandidate@678 }
-    <name not found> = ArrayList@679[1] { ResolutionCandidate@678 }
+ResolutionTaskHolder@675 {
+    <name not found> = ArrayList@676[1] { ResolutionCandidate@677 }
 }
 
-ResolutionTaskHolder@680 {
-    <name not found> = ArrayList@681[1] { ResolutionCandidate@682 }
-    <name not found> = ArrayList@683[1] { ResolutionCandidate@682 }
+ResolutionTaskHolder@678 {
+    <name not found> = ArrayList@679[1] { ResolutionCandidate@680 }
+}
+
+ResolutionTaskHolder@681 {
+    <name not found> = ArrayList@682[1] { ResolutionCandidate@683 }
 }
 
 ResolutionTaskHolder@684 {
     <name not found> = ArrayList@685[1] { ResolutionCandidate@686 }
-    <name not found> = ArrayList@687[1] { ResolutionCandidate@686 }
 }
 
-ResolutionTaskHolder@688 {
-    <name not found> = ArrayList@689[1] { ResolutionCandidate@690 }
-    <name not found> = ArrayList@691[1] { ResolutionCandidate@690 }
+ResolutionTaskHolder@687 {
+    <name not found> = ArrayList@688[1] { ResolutionCandidate@689 }
 }
 
-ResolutionTaskHolder@692 {
-    <name not found> = ArrayList@693[1] { ResolutionCandidate@694 }
-    <name not found> = ArrayList@695[1] { ResolutionCandidate@694 }
+ResolutionTaskHolder@690 {
+    <name not found> = ArrayList@691[1] { ResolutionCandidate@692 }
+}
+
+ResolutionTaskHolder@693 {
+    <name not found> = ArrayList@694[1] { ResolutionCandidate@695 }
 }
 
 ResolutionTaskHolder@696 {
     <name not found> = ArrayList@697[1] { ResolutionCandidate@698 }
-    <name not found> = ArrayList@699[1] { ResolutionCandidate@698 }
 }
 
-ResolutionTaskHolder@700 {
-    <name not found> = ArrayList@701[1] { ResolutionCandidate@702 }
-    <name not found> = ArrayList@703[1] { ResolutionCandidate@702 }
+ResolutionTaskHolder@699 {
+    <name not found> = ArrayList@700[1] { ResolutionCandidate@701 }
 }
 
-ResolutionTaskHolder@704 {
-    <name not found> = ArrayList@705[1] { ResolutionCandidate@706 }
-    <name not found> = ArrayList@707[1] { ResolutionCandidate@706 }
+ResolutionTaskHolder@702 {
+    <name not found> = ArrayList@703[1] { ResolutionCandidate@704 }
+}
+
+ResolutionTaskHolder@705 {
+    <name not found> = ArrayList@706[1] { ResolutionCandidate@707 }
 }
 
 ResolutionTaskHolder@708 {
     <name not found> = ArrayList@709[1] { ResolutionCandidate@710 }
-    <name not found> = ArrayList@711[1] { ResolutionCandidate@710 }
 }
 
-ResolutionTaskHolder@712 {
-    <name not found> = ArrayList@713[1] { ResolutionCandidate@714 }
-    <name not found> = ArrayList@715[1] { ResolutionCandidate@714 }
+ResolutionTaskHolder@711 {
+    <name not found> = ArrayList@712[1] { ResolutionCandidate@713 }
 }
 
-ResolutionTaskHolder@716 {
-    <name not found> = ArrayList@717[1] { ResolutionCandidate@718 }
-    <name not found> = ArrayList@719[1] { ResolutionCandidate@718 }
+ResolutionTaskHolder@714 {
+    <name not found> = ArrayList@715[1] { ResolutionCandidate@716 }
+}
+
+ResolutionTaskHolder@717 {
+    <name not found> = ArrayList@718[1] { ResolutionCandidate@719 }
 }
 
 ResolutionTaskHolder@720 {
     <name not found> = ArrayList@721[1] { ResolutionCandidate@722 }
-    <name not found> = ArrayList@723[1] { ResolutionCandidate@722 }
 }
 
-ResolutionTaskHolder@724 {
-    <name not found> = ArrayList@725[1] { ResolutionCandidate@726 }
-    <name not found> = ArrayList@727[1] { ResolutionCandidate@726 }
+ResolutionTaskHolder@723 {
+    <name not found> = ArrayList@724[1] { ResolutionCandidate@725 }
 }
 
-ResolutionTaskHolder@728 {
-    <name not found> = ArrayList@729[1] { ResolutionCandidate@730 }
-    <name not found> = ArrayList@731[1] { ResolutionCandidate@730 }
+ResolutionTaskHolder@726 {
+    <name not found> = ArrayList@727[1] { ResolutionCandidate@728 }
+}
+
+ResolutionTaskHolder@729 {
+    <name not found> = ArrayList@730[1] { ResolutionCandidate@731 }
 }
 
 ResolutionTaskHolder@732 {
     <name not found> = ArrayList@733[1] { ResolutionCandidate@734 }
-    <name not found> = ArrayList@735[1] { ResolutionCandidate@734 }
 }
 
-ResolutionTaskHolder@736 {
-    <name not found> = ArrayList@737[1] { ResolutionCandidate@738 }
-    <name not found> = ArrayList@739[1] { ResolutionCandidate@738 }
+ResolutionTaskHolder@735 {
+    <name not found> = ArrayList@736[1] { ResolutionCandidate@737 }
 }
 
-ResolutionTaskHolder@740 {
-    <name not found> = ArrayList@741[1] { ResolutionCandidate@742 }
-    <name not found> = ArrayList@743[1] { ResolutionCandidate@742 }
+ResolutionTaskHolder@738 {
+    <name not found> = ArrayList@739[1] { ResolutionCandidate@740 }
+}
+
+ResolutionTaskHolder@741 {
+    <name not found> = ArrayList@742[1] { ResolutionCandidate@743 }
 }
 
 ResolutionTaskHolder@744 {
     <name not found> = ArrayList@745[1] { ResolutionCandidate@746 }
-    <name not found> = ArrayList@747[1] { ResolutionCandidate@746 }
 }
 
-ResolutionTaskHolder@748 {
-    <name not found> = ArrayList@749[1] { ResolutionCandidate@750 }
-    <name not found> = ArrayList@751[1] { ResolutionCandidate@750 }
+ResolutionTaskHolder@747 {
+    <name not found> = ArrayList@748[1] { ResolutionCandidate@749 }
 }
 
-ResolutionTaskHolder@752 {
-    <name not found> = ArrayList@753[1] { ResolutionCandidate@754 }
-    <name not found> = ArrayList@755[1] { ResolutionCandidate@754 }
+ResolutionTaskHolder@750 {
+    <name not found> = ArrayList@751[1] { ResolutionCandidate@752 }
+}
+
+ResolutionTaskHolder@753 {
+    <name not found> = ArrayList@754[1] { ResolutionCandidate@755 }
 }
 
 ResolutionTaskHolder@756 {
     <name not found> = ArrayList@757[1] { ResolutionCandidate@758 }
-    <name not found> = ArrayList@759[1] { ResolutionCandidate@758 }
 }
 
-ResolutionTaskHolder@760 {
-    <name not found> = ArrayList@761[1] { ResolutionCandidate@762 }
-    <name not found> = ArrayList@763[1] { ResolutionCandidate@762 }
+ResolutionTaskHolder@759 {
+    <name not found> = ArrayList@760[1] { ResolutionCandidate@761 }
 }
 
-ResolutionTaskHolder@764 {
-    <name not found> = ArrayList@765[1] { ResolutionCandidate@766 }
-    <name not found> = ArrayList@767[1] { ResolutionCandidate@766 }
+ResolutionTaskHolder@762 {
+    <name not found> = ArrayList@763[1] { ResolutionCandidate@764 }
+}
+
+ResolutionTaskHolder@765 {
+    <name not found> = ArrayList@766[1] { ResolutionCandidate@767 }
 }
 
 ResolutionTaskHolder@768 {
     <name not found> = ArrayList@769[1] { ResolutionCandidate@770 }
-    <name not found> = ArrayList@771[1] { ResolutionCandidate@770 }
 }
 
-ResolutionTaskHolder@772 {
-    <name not found> = ArrayList@773[1] { ResolutionCandidate@774 }
-    <name not found> = ArrayList@775[1] { ResolutionCandidate@774 }
+ResolutionTaskHolder@771 {
+    <name not found> = ArrayList@772[1] { ResolutionCandidate@773 }
 }
 
-ResolutionTaskHolder@776 {
-    <name not found> = ArrayList@777[1] { ResolutionCandidate@778 }
-    <name not found> = ArrayList@779[1] { ResolutionCandidate@778 }
+ResolutionTaskHolder@774 {
+    <name not found> = ArrayList@775[4] { ResolutionCandidate@776, ResolutionCandidate@777, ResolutionCandidate@778, ... }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@780 {
-    <name not found> = ArrayList@781[1] { ResolutionCandidate@782 }
-    <name not found> = ArrayList@783[1] { ResolutionCandidate@782 }
+ResolutionTaskHolder@779 {
+    <name not found> = ArrayList@780[4] { ResolutionCandidate@781, ResolutionCandidate@782, ResolutionCandidate@783, ... }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@784 {
-    <name not found> = ArrayList@785[1] { ResolutionCandidate@786 }
-    <name not found> = ArrayList@787[1] { ResolutionCandidate@786 }
-}
-
-ResolutionTaskHolder@788 {
-    <name not found> = ArrayList@789[1] { ResolutionCandidate@790 }
-    <name not found> = ArrayList@791[1] { ResolutionCandidate@790 }
-}
-
-ResolutionTaskHolder@792 {
-    <name not found> = ArrayList@793[1] { ResolutionCandidate@794 }
-    <name not found> = ArrayList@795[1] { ResolutionCandidate@794 }
-}
-
-ResolutionTaskHolder@796 {
-    <name not found> = ArrayList@797[1] { ResolutionCandidate@798 }
-    <name not found> = ArrayList@799[1] { ResolutionCandidate@798 }
-}
-
-ResolutionTaskHolder@800 {
-    <name not found> = ArrayList@801[1] { ResolutionCandidate@802 }
-    <name not found> = ArrayList@803[1] { ResolutionCandidate@802 }
-}
-
-ResolutionTaskHolder@804 {
-    <name not found> = ArrayList@805[1] { ResolutionCandidate@806 }
-    <name not found> = ArrayList@807[1] { ResolutionCandidate@806 }
-}
-
-ResolutionTaskHolder@808 {
-    <name not found> = ArrayList@809[1] { ResolutionCandidate@810 }
-    <name not found> = ArrayList@811[1] { ResolutionCandidate@810 }
-}
-
-ResolutionTaskHolder@812 {
-    <name not found> = ArrayList@813[1] { ResolutionCandidate@814 }
-    <name not found> = ArrayList@815[1] { ResolutionCandidate@814 }
-}
-
-ResolutionTaskHolder@816 {
-    <name not found> = ArrayList@817[1] { ResolutionCandidate@818 }
-    <name not found> = ArrayList@819[1] { ResolutionCandidate@818 }
-}
-
-ResolutionTaskHolder@820 {
-    <name not found> = ArrayList@821[1] { ResolutionCandidate@822 }
-    <name not found> = ArrayList@823[1] { ResolutionCandidate@822 }
-}
-
-ResolutionTaskHolder@824 {
-    <name not found> = ArrayList@825[1] { ResolutionCandidate@826 }
-    <name not found> = ArrayList@827[1] { ResolutionCandidate@826 }
-}
-
-ResolutionTaskHolder@828 {
-    <name not found> = ArrayList@829[1] { ResolutionCandidate@830 }
-    <name not found> = ArrayList@831[1] { ResolutionCandidate@830 }
-}
-
-ResolutionTaskHolder@832 {
-    <name not found> = ArrayList@833[1] { ResolutionCandidate@834 }
-    <name not found> = ArrayList@835[1] { ResolutionCandidate@834 }
-}
-
-ResolutionTaskHolder@836 {
-    <name not found> = ArrayList@837[1] { ResolutionCandidate@838 }
-    <name not found> = ArrayList@839[1] { ResolutionCandidate@838 }
-}
-
-ResolutionTaskHolder@840 {
-    <name not found> = ArrayList@841[1] { ResolutionCandidate@842 }
-    <name not found> = ArrayList@843[1] { ResolutionCandidate@842 }
-}
-
-ResolutionTaskHolder@844 {
-    <name not found> = ArrayList@845[1] { ResolutionCandidate@846 }
-    <name not found> = ArrayList@847[1] { ResolutionCandidate@846 }
-}
-
-ResolutionTaskHolder@848 {
-    <name not found> = ArrayList@849[1] { ResolutionCandidate@850 }
-    <name not found> = ArrayList@851[1] { ResolutionCandidate@850 }
-}
-
-ResolutionTaskHolder@852 {
-    <name not found> = ArrayList@853[1] { ResolutionCandidate@854 }
-    <name not found> = ArrayList@855[1] { ResolutionCandidate@854 }
-}
-
-ResolutionTaskHolder@856 {
-    <name not found> = ArrayList@857[1] { ResolutionCandidate@858 }
-    <name not found> = ArrayList@859[1] { ResolutionCandidate@858 }
-}
-
-ResolutionTaskHolder@860 {
-    <name not found> = ArrayList@861[1] { ResolutionCandidate@862 }
-    <name not found> = ArrayList@863[1] { ResolutionCandidate@862 }
-}
-
-ResolutionTaskHolder@864 {
-    <name not found> = ArrayList@865[1] { ResolutionCandidate@866 }
-    <name not found> = ArrayList@867[1] { ResolutionCandidate@866 }
-}
-
-ResolutionTaskHolder@868 {
-    <name not found> = ArrayList@869[1] { ResolutionCandidate@870 }
-    <name not found> = ArrayList@871[1] { ResolutionCandidate@870 }
-}
-
-ResolutionTaskHolder@872 {
-    <name not found> = ArrayList@873[1] { ResolutionCandidate@874 }
-    <name not found> = ArrayList@875[1] { ResolutionCandidate@874 }
-}
-
-ResolutionTaskHolder@876 {
-    <name not found> = ArrayList@877[1] { ResolutionCandidate@878 }
-    <name not found> = ArrayList@879[1] { ResolutionCandidate@878 }
-}
-
-ResolutionTaskHolder@880 {
-    <name not found> = ArrayList@881[1] { ResolutionCandidate@882 }
-    <name not found> = ArrayList@883[1] { ResolutionCandidate@882 }
-}
-
-ResolutionTaskHolder@884 {
-    <name not found> = ArrayList@885[1] { ResolutionCandidate@886 }
-    <name not found> = ArrayList@887[1] { ResolutionCandidate@886 }
-}
-
-ResolutionTaskHolder@888 {
-    <name not found> = ArrayList@889[1] { ResolutionCandidate@890 }
-    <name not found> = ArrayList@891[1] { ResolutionCandidate@890 }
-}
-
-ResolutionTaskHolder@892 {
-    <name not found> = ArrayList@893[1] { ResolutionCandidate@894 }
-    <name not found> = ArrayList@895[1] { ResolutionCandidate@894 }
-}
-
-ResolutionTaskHolder@896 {
-    <name not found> = ArrayList@897[1] { ResolutionCandidate@898 }
-    <name not found> = ArrayList@899[1] { ResolutionCandidate@898 }
-}
-
-ResolutionTaskHolder@900 {
-    <name not found> = ArrayList@901[1] { ResolutionCandidate@902 }
-    <name not found> = ArrayList@903[1] { ResolutionCandidate@902 }
-}
-
-ResolutionTaskHolder@904 {
-    <name not found> = ArrayList@905[4] { ResolutionCandidate@906, ResolutionCandidate@907, ResolutionCandidate@908, ... }
-    <name not found> = ArrayList@909[4] { ResolutionCandidate@906, ResolutionCandidate@907, ResolutionCandidate@908, ... }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@910 {
-    <name not found> = ArrayList@911[4] { ResolutionCandidate@912, ResolutionCandidate@913, ResolutionCandidate@914, ... }
-    <name not found> = ArrayList@915[4] { ResolutionCandidate@912, ResolutionCandidate@913, ResolutionCandidate@914, ... }
+null {
+    <name not found> = ArrayList@784[14] { ResolutionCandidate@393, ResolutionCandidate@394, ResolutionCandidate@785, ... }
+    <name not found> = ArrayList@786[14] { ResolutionCandidate@388, ResolutionCandidate@389, ResolutionCandidate@787, ... }
+    <name not found> = ArrayList@788[1] { ResolutionCandidate@755 }
+    <name not found> = ArrayList@789[1] { ResolutionCandidate@488 }
+    <name not found> = ArrayList@790[1] { ResolutionCandidate@476 }
+    <name not found> = ArrayList@791[1] { ResolutionCandidate@461 }
+    <name not found> = ArrayList@792[1] { ResolutionCandidate@491 }
+    <name not found> = ArrayList@793[1] { ResolutionCandidate@512 }
+    <name not found> = ArrayList@794[1] { ResolutionCandidate@413 }
+    <name not found> = ArrayList@795[1] { ResolutionCandidate@440 }
+    <name not found> = ArrayList@796[1] { ResolutionCandidate@545 }
+    <name not found> = ArrayList@797[1] { ResolutionCandidate@410 }
+    <name not found> = ArrayList@798[1] { ResolutionCandidate@566 }
+    <name not found> = ArrayList@799[1] { ResolutionCandidate@530 }
+    <name not found> = ArrayList@800[1] { ResolutionCandidate@695 }
+    <name not found> = ArrayList@801[1] { ResolutionCandidate@431 }
+    <name not found> = ArrayList@802[1] { ResolutionCandidate@665 }
+    <name not found> = ArrayList@803[1] { ResolutionCandidate@497 }
+    <name not found> = ArrayList@804[1] { ResolutionCandidate@644 }
+    <name not found> = ArrayList@805[1] { ResolutionCandidate@401 }
+    <name not found> = ArrayList@806[1] { ResolutionCandidate@731 }
+    <name not found> = ArrayList@807[1] { ResolutionCandidate@521 }
+    <name not found> = ArrayList@808[1] { ResolutionCandidate@668 }
+    <name not found> = ArrayList@809[1] { ResolutionCandidate@419 }
+    <name not found> = ArrayList@810[1] { ResolutionCandidate@641 }
+    <name not found> = ArrayList@811[1] { ResolutionCandidate@536 }
+    <name not found> = ArrayList@812[1] { ResolutionCandidate@716 }
+    <name not found> = ArrayList@813[1] { ResolutionCandidate@416 }
+    <name not found> = ArrayList@814[1] { ResolutionCandidate@725 }
+    <name not found> = ArrayList@815[1] { ResolutionCandidate@500 }
+    <name not found> = ArrayList@816[1] { ResolutionCandidate@680 }
+    <name not found> = ArrayList@817[1] { ResolutionCandidate@620 }
+    <name not found> = ArrayList@818[1] { ResolutionCandidate@551 }
+    <name not found> = ArrayList@819[1] { ResolutionCandidate@752 }
+    <name not found> = ArrayList@820[1] { ResolutionCandidate@572 }
+    <name not found> = ArrayList@821[1] { ResolutionCandidate@407 }
+    <name not found> = ArrayList@822[1] { ResolutionCandidate@602 }
+    <name not found> = ArrayList@823[1] { ResolutionCandidate@455 }
+    <name not found> = ArrayList@824[1] { ResolutionCandidate@569 }
+    <name not found> = ArrayList@825[1] { ResolutionCandidate@437 }
+    <name not found> = ArrayList@826[1] { ResolutionCandidate@635 }
+    <name not found> = ArrayList@827[1] { ResolutionCandidate@428 }
+    <name not found> = ArrayList@828[1] { ResolutionCandidate@518 }
+    <name not found> = ArrayList@829[1] { ResolutionCandidate@446 }
+    <name not found> = ArrayList@830[1] { ResolutionCandidate@404 }
+    <name not found> = ArrayList@831[1] { ResolutionCandidate@584 }
+    <name not found> = ArrayList@832[1] { ResolutionCandidate@473 }
+    <name not found> = ArrayList@833[1] { ResolutionCandidate@527 }
+    <name not found> = ArrayList@834[1] { ResolutionCandidate@398 }
+    <name not found> = ArrayList@835[1] { ResolutionCandidate@671 }
+    <name not found> = ArrayList@836[1] { ResolutionCandidate@467 }
+    <name not found> = ArrayList@837[1] { ResolutionCandidate@686 }
+    <name not found> = ArrayList@838[1] { ResolutionCandidate@554 }
+    <name not found> = ArrayList@839[1] { ResolutionCandidate@728 }
+    <name not found> = ArrayList@840[1] { ResolutionCandidate@509 }
+    <name not found> = ArrayList@841[1] { ResolutionCandidate@677 }
+    <name not found> = ArrayList@842[1] { ResolutionCandidate@479 }
+    <name not found> = ArrayList@843[1] { ResolutionCandidate@683 }
+    <name not found> = ArrayList@844[1] { ResolutionCandidate@707 }
+    <name not found> = ArrayList@845[1] { ResolutionCandidate@449 }
+    <name not found> = ArrayList@846[1] { ResolutionCandidate@626 }
+    <name not found> = ArrayList@847[1] { ResolutionCandidate@503 }
+    <name not found> = ArrayList@848[1] { ResolutionCandidate@539 }
+    <name not found> = ArrayList@849[1] { ResolutionCandidate@443 }
+    <name not found> = ArrayList@850[1] { ResolutionCandidate@425 }
+    <name not found> = ArrayList@851[1] { ResolutionCandidate@596 }
+    <name not found> = ArrayList@852[1] { ResolutionCandidate@563 }
+    <name not found> = ArrayList@853[1] { ResolutionCandidate@542 }
+    <name not found> = ArrayList@854[1] { ResolutionCandidate@422 }
+    <name not found> = ArrayList@855[1] { ResolutionCandidate@617 }
+    <name not found> = ArrayList@856[1] { ResolutionCandidate@458 }
+    <name not found> = ArrayList@857[1] { ResolutionCandidate@692 }
+    <name not found> = ArrayList@858[1] { ResolutionCandidate@557 }
+    <name not found> = ArrayList@859[1] { ResolutionCandidate@767 }
+    <name not found> = ArrayList@860[1] { ResolutionCandidate@515 }
+    <name not found> = ArrayList@861[1] { ResolutionCandidate@761 }
+    <name not found> = ArrayList@862[1] { ResolutionCandidate@482 }
+    <name not found> = ArrayList@863[1] { ResolutionCandidate@656 }
+    <name not found> = ArrayList@864[1] { ResolutionCandidate@743 }
+    <name not found> = ArrayList@865[1] { ResolutionCandidate@533 }
+    <name not found> = ArrayList@866[1] { ResolutionCandidate@698 }
+    <name not found> = ArrayList@867[1] { ResolutionCandidate@548 }
+    <name not found> = ArrayList@868[1] { ResolutionCandidate@470 }
+    <name not found> = ArrayList@869[1] { ResolutionCandidate@737 }
+    <name not found> = ArrayList@870[1] { ResolutionCandidate@434 }
+    <name not found> = ArrayList@871[1] { ResolutionCandidate@773 }
+    <name not found> = ArrayList@872[1] { ResolutionCandidate@659 }
+    <name not found> = ArrayList@873[1] { ResolutionCandidate@452 }
+    <name not found> = ArrayList@874[1] { ResolutionCandidate@614 }
+    <name not found> = ArrayList@875[1] { ResolutionCandidate@749 }
+    <name not found> = ArrayList@876[1] { ResolutionCandidate@464 }
+    <name not found> = ArrayList@877[1] { ResolutionCandidate@650 }
+    <name not found> = ArrayList@878[1] { ResolutionCandidate@581 }
+    <name not found> = ArrayList@879[1] { ResolutionCandidate@524 }
+    <name not found> = ArrayList@880[1] { ResolutionCandidate@701 }
+    <name not found> = ArrayList@881[1] { ResolutionCandidate@608 }
+    <name not found> = ArrayList@882[1] { ResolutionCandidate@506 }
+    <name not found> = ArrayList@883[1] { ResolutionCandidate@758 }
+    <name not found> = ArrayList@884[1] { ResolutionCandidate@623 }
+    <name not found> = ArrayList@885[1] { ResolutionCandidate@647 }
+    <name not found> = ArrayList@886[1] { ResolutionCandidate@485 }
+    <name not found> = ArrayList@887[1] { ResolutionCandidate@770 }
+    <name not found> = ArrayList@888[1] { ResolutionCandidate@719 }
+    <name not found> = ArrayList@889[1] { ResolutionCandidate@494 }
+    <name not found> = ArrayList@890[1] { ResolutionCandidate@629 }
+    <name not found> = ArrayList@891[1] { ResolutionCandidate@689 }
+    <name not found> = ArrayList@892[1] { ResolutionCandidate@560 }
+    <name not found> = ArrayList@893[1] { ResolutionCandidate@674 }
+    <name not found> = ArrayList@894[1] { ResolutionCandidate@605 }
+    <name not found> = ArrayList@895[1] { ResolutionCandidate@590 }
+    <name not found> = ArrayList@896[1] { ResolutionCandidate@575 }
+    <name not found> = ArrayList@897[1] { ResolutionCandidate@662 }
+    <name not found> = ArrayList@898[1] { ResolutionCandidate@587 }
+    <name not found> = ArrayList@899[1] { ResolutionCandidate@740 }
+    <name not found> = ArrayList@900[1] { ResolutionCandidate@764 }
+    <name not found> = ArrayList@901[1] { ResolutionCandidate@710 }
+    <name not found> = ArrayList@902[1] { ResolutionCandidate@632 }
+    <name not found> = ArrayList@903[1] { ResolutionCandidate@704 }
+    <name not found> = ArrayList@904[1] { ResolutionCandidate@734 }
+    <name not found> = ArrayList@905[1] { ResolutionCandidate@638 }
+    <name not found> = ArrayList@906[1] { ResolutionCandidate@713 }
+    <name not found> = ArrayList@907[1] { ResolutionCandidate@599 }
+    <name not found> = ArrayList@908[1] { ResolutionCandidate@653 }
+    <name not found> = ArrayList@909[1] { ResolutionCandidate@722 }
+    <name not found> = ArrayList@910[1] { ResolutionCandidate@593 }
+    <name not found> = ArrayList@911[1] { ResolutionCandidate@746 }
+    <name not found> = ArrayList@912[1] { ResolutionCandidate@578 }
+    <name not found> = ArrayList@913[1] { ResolutionCandidate@611 }
+    <name not found> = ArrayList@914[4] { ResolutionCandidate@776, ResolutionCandidate@777, ResolutionCandidate@778, ... }
+    <name not found> = ArrayList@915[4] { ResolutionCandidate@781, ResolutionCandidate@782, ResolutionCandidate@783, ... }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
diff --git a/compiler/testData/diagnostics/tests/checkArguments/booleanExpressions.lazy.log b/compiler/testData/diagnostics/tests/checkArguments/booleanExpressions.lazy.log
index 89291f80f27..a2d2be4459f 100644
--- a/compiler/testData/diagnostics/tests/checkArguments/booleanExpressions.lazy.log
+++ b/compiler/testData/diagnostics/tests/checkArguments/booleanExpressions.lazy.log
@@ -27,40 +27,43 @@ LazyJavaPackageFragment@6['java'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+}
+
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
 }
 
 ResolutionTaskHolder@37 {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+null {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@27 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@39 }
 }
diff --git a/compiler/testData/diagnostics/tests/checkArguments/kt1897_diagnostic_part.lazy.log b/compiler/testData/diagnostics/tests/checkArguments/kt1897_diagnostic_part.lazy.log
index e7e7b1ad8f1..4aeaf530644 100644
--- a/compiler/testData/diagnostics/tests/checkArguments/kt1897_diagnostic_part.lazy.log
+++ b/compiler/testData/diagnostics/tests/checkArguments/kt1897_diagnostic_part.lazy.log
@@ -40,10 +40,6 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@35 {
     <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -61,12 +57,8 @@ ResolutionTaskHolder@35 {
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -84,9 +76,8 @@ ResolutionTaskHolder@39 {
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -102,6 +93,22 @@ ResolutionTaskHolder@43 {
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
+}
+
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -109,10 +116,6 @@ ResolutionTaskHolder@43 {
 
 ResolutionTaskHolder@47 {
     <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -130,12 +133,8 @@ ResolutionTaskHolder@47 {
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -153,9 +152,8 @@ ResolutionTaskHolder@51 {
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -171,6 +169,22 @@ ResolutionTaskHolder@55 {
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
+}
+
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -178,7 +192,6 @@ ResolutionTaskHolder@55 {
 
 ResolutionTaskHolder@59 {
     <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -194,14 +207,28 @@ ResolutionTaskHolder@59 {
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
+}
+
+ResolutionTaskHolder@62 {
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
 
 ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -218,23 +245,50 @@ ResolutionTaskHolder@63 {
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
+}
+
+ResolutionTaskHolder@64 {
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+}
+
+ResolutionTaskHolder@65 {
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+}
+
+ResolutionTaskHolder@66 {
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
 
 ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -245,7 +299,41 @@ ResolutionTaskHolder@67 {
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@71 {
+null {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@46 }
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -267,88 +355,3 @@ ResolutionTaskHolder@71 {
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
-
-ResolutionTaskHolder@72 {
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/checkArguments/kt1940.lazy.log b/compiler/testData/diagnostics/tests/checkArguments/kt1940.lazy.log
index 6e2d35e4b1a..468eaf47f89 100644
--- a/compiler/testData/diagnostics/tests/checkArguments/kt1940.lazy.log
+++ b/compiler/testData/diagnostics/tests/checkArguments/kt1940.lazy.log
@@ -28,10 +28,6 @@ LazyJavaPackageFragment@7['lang'] {
 
 ResolutionTaskHolder@24 {
     <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
@@ -49,12 +45,8 @@ ResolutionTaskHolder@24 {
     <name not found> = EmptyList@19[empty]
 }
 
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
+ResolutionTaskHolder@27 {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
@@ -71,3 +63,14 @@ ResolutionTaskHolder@28 {
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
 }
+
+null {
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@26 }
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@29 }
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/checkType.lazy.log b/compiler/testData/diagnostics/tests/checkType.lazy.log
index 0d67640df14..962cf149ac1 100644
--- a/compiler/testData/diagnostics/tests/checkType.lazy.log
+++ b/compiler/testData/diagnostics/tests/checkType.lazy.log
@@ -63,62 +63,65 @@ LazyJavaPackageFragment@14['lang'] {
 
 ResolutionTaskHolder@52 {
     <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
 }
 
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
+}
+
 ResolutionTaskHolder@64 {
     <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
+}
+
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
 }
 
 ResolutionTaskHolder@76 {
     <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
 }
 
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+null {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@69 }
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/classObjects/ClassObjectCannotAccessClassFields.lazy.log b/compiler/testData/diagnostics/tests/classObjects/ClassObjectCannotAccessClassFields.lazy.log
index b2ab4888563..8ec0cf8fbe1 100644
--- a/compiler/testData/diagnostics/tests/classObjects/ClassObjectCannotAccessClassFields.lazy.log
+++ b/compiler/testData/diagnostics/tests/classObjects/ClassObjectCannotAccessClassFields.lazy.log
@@ -34,23 +34,11 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@24 {
     <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
     <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
@@ -94,3 +82,18 @@ ResolutionTaskHolder@24 {
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
+
+null {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@26 }
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@28 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@36 }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/classObjects/ClassObjectVisibility.lazy.log b/compiler/testData/diagnostics/tests/classObjects/ClassObjectVisibility.lazy.log
index 5fadb379693..0db5c8f4904 100644
--- a/compiler/testData/diagnostics/tests/classObjects/ClassObjectVisibility.lazy.log
+++ b/compiler/testData/diagnostics/tests/classObjects/ClassObjectVisibility.lazy.log
@@ -41,8 +41,6 @@ LazyJavaPackageFragment@17['lang'] {
 ResolutionTaskHolder@34 {
     <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@38 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
@@ -61,30 +59,33 @@ ResolutionTaskHolder@34 {
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
+}
+
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
@@ -96,8 +97,6 @@ ResolutionTaskHolder@41 {
 
 ResolutionTaskHolder@45 {
     <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
@@ -107,10 +106,8 @@ ResolutionTaskHolder@45 {
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@31[empty]
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
@@ -120,43 +117,49 @@ ResolutionTaskHolder@49 {
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
+}
+
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
     <name not found> = EmptyList@31[empty]
 }
 
 ResolutionTaskHolder@57 {
     <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+    <name not found> = EmptyList@31[empty]
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+null {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@41 }
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@69 {
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
diff --git a/compiler/testData/diagnostics/tests/classObjects/ClassObjects.lazy.log b/compiler/testData/diagnostics/tests/classObjects/ClassObjects.lazy.log
index 59e825f0d55..a9022b442f1 100644
--- a/compiler/testData/diagnostics/tests/classObjects/ClassObjects.lazy.log
+++ b/compiler/testData/diagnostics/tests/classObjects/ClassObjects.lazy.log
@@ -114,14 +114,14 @@ LazyJavaClassifierType@63['AutoCloseable'] {
     typeConstructor = LazyJavaClassTypeConstructor@19['AutoCloseable']
 }
 
-LazyJavaClassifierType@69['Closeable'] {
+LazyJavaClassifierType@74['Closeable'] {
     arguments = ArrayList@80[empty]
     classifier = JavaClassImpl@81['Closeable']
     memberScope = LazyJavaClassMemberScope@21
     typeConstructor = LazyJavaClassTypeConstructor@23['Closeable']
 }
 
-LazyJavaClassifierType@74['Closeable'] {
+LazyJavaClassifierType@69['Closeable'] {
     arguments = ArrayList@82[empty]
     classifier = JavaClassImpl@83['Closeable']
     memberScope = LazyJavaClassMemberScope@21
@@ -242,7 +242,7 @@ LazyJavaPackageFragmentProvider@117 {
     packageFragments('kotlin.jvm': FqName@150) = null
     topLevelClasses(JavaClassImpl@77['Appendable']) = LazyJavaClassDescriptor@10['Appendable']
     topLevelClasses(JavaClassImpl@79['AutoCloseable']) = LazyJavaClassDescriptor@16['AutoCloseable']
-    topLevelClasses(JavaClassImpl@83['Closeable']) = LazyJavaClassDescriptor@20['Closeable']
+    topLevelClasses(JavaClassImpl@81['Closeable']) = LazyJavaClassDescriptor@20['Closeable']
     topLevelClasses(JavaClassImpl@85['FilterOutputStream']) = LazyJavaClassDescriptor@24['FilterOutputStream']
     topLevelClasses(JavaClassImpl@105['OutputStream']) = LazyJavaClassDescriptor@28['OutputStream']
     topLevelClasses(JavaClassImpl@108['PrintStream']) = LazyJavaClassDescriptor@32['PrintStream']
@@ -267,47 +267,163 @@ LazyJavaPackageFragment@139['lang'] {
 
 ResolutionTaskHolder@162 {
     <name not found> = ArrayList@163[10] { ResolutionCandidate@164, ResolutionCandidate@165, ResolutionCandidate@166, ... }
-    <name not found> = ArrayList@167[10] { ResolutionCandidate@164, ResolutionCandidate@165, ResolutionCandidate@166, ... }
 }
 
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[10] { ResolutionCandidate@170, ResolutionCandidate@171, ResolutionCandidate@172, ... }
-    <name not found> = ArrayList@173[10] { ResolutionCandidate@170, ResolutionCandidate@171, ResolutionCandidate@172, ... }
+ResolutionTaskHolder@167 {
+    <name not found> = ArrayList@168[10] { ResolutionCandidate@169, ResolutionCandidate@170, ResolutionCandidate@171, ... }
 }
 
-ResolutionTaskHolder@174 {
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@176 }
-    <name not found> = EmptyList@12[empty]
+ResolutionTaskHolder@172 {
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
+}
+
+ResolutionTaskHolder@175 {
+    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
     <name not found> = EmptyList@12[empty]
 }
 
 ResolutionTaskHolder@178 {
     <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@180 }
+    <name not found> = EmptyList@12[empty]
+}
+
+ResolutionTaskHolder@181 {
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
+    <name not found> = EmptyList@12[empty]
+}
+
+ResolutionTaskHolder@184 {
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
+    <name not found> = EmptyList@12[empty]
+}
+
+ResolutionTaskHolder@187 {
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
 }
 
-ResolutionTaskHolder@182 {
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@184 }
+ResolutionTaskHolder@188 {
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
 }
 
-ResolutionTaskHolder@186 {
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@188 }
+ResolutionTaskHolder@189 {
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
 }
 
 ResolutionTaskHolder@190 {
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@192 }
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@192 }
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+}
+
+ResolutionTaskHolder@191 {
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+}
+
+ResolutionTaskHolder@192 {
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+}
+
+ResolutionTaskHolder@193 {
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
 }
@@ -321,48 +437,6 @@ ResolutionTaskHolder@194 {
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
 }
 
 ResolutionTaskHolder@195 {
@@ -374,23 +448,6 @@ ResolutionTaskHolder@195 {
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
 }
 
 ResolutionTaskHolder@196 {
@@ -402,99 +459,45 @@ ResolutionTaskHolder@196 {
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
 }
 
-ResolutionTaskHolder@197 {
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
-
-ResolutionTaskHolder@198 {
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
-
-ResolutionTaskHolder@199 {
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
-
-ResolutionTaskHolder@200 {
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
-
-ResolutionTaskHolder@201 {
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
-
-ResolutionTaskHolder@202 {
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
-
-ResolutionTaskHolder@203 {
+null {
+    <name not found> = ArrayList@197[10] { ResolutionCandidate@164, ResolutionCandidate@165, ResolutionCandidate@166, ... }
+    <name not found> = ArrayList@198[10] { ResolutionCandidate@169, ResolutionCandidate@170, ResolutionCandidate@171, ... }
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@183 }
+    <name not found> = ArrayList@200[1] { ResolutionCandidate@174 }
+    <name not found> = ArrayList@201[1] { ResolutionCandidate@180 }
+    <name not found> = ArrayList@202[1] { ResolutionCandidate@177 }
+    <name not found> = ArrayList@203[1] { ResolutionCandidate@186 }
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
diff --git a/compiler/testData/diagnostics/tests/classObjects/importClassInClassObject.lazy.log b/compiler/testData/diagnostics/tests/classObjects/importClassInClassObject.lazy.log
index 4851e11c78b..860dd506349 100644
--- a/compiler/testData/diagnostics/tests/classObjects/importClassInClassObject.lazy.log
+++ b/compiler/testData/diagnostics/tests/classObjects/importClassInClassObject.lazy.log
@@ -29,9 +29,12 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@23 {
     <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@25 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+}
+
+null {
+    <name not found> = ArrayList@26[1] { ResolutionCandidate@25 }
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/classObjects/invisibleClassObjects.lazy.log b/compiler/testData/diagnostics/tests/classObjects/invisibleClassObjects.lazy.log
index 09af2f73fd9..b4c4250637b 100644
--- a/compiler/testData/diagnostics/tests/classObjects/invisibleClassObjects.lazy.log
+++ b/compiler/testData/diagnostics/tests/classObjects/invisibleClassObjects.lazy.log
@@ -57,16 +57,6 @@ LazyJavaPackageFragment@23['lang'] {
 
 ResolutionTaskHolder@50 {
     <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
@@ -108,18 +98,8 @@ ResolutionTaskHolder@50 {
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
@@ -161,9 +141,8 @@ ResolutionTaskHolder@54 {
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
@@ -203,6 +182,40 @@ ResolutionTaskHolder@58 {
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
+}
+
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
@@ -216,48 +229,6 @@ ResolutionTaskHolder@58 {
 
 ResolutionTaskHolder@62 {
     <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
@@ -267,10 +238,8 @@ ResolutionTaskHolder@62 {
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@41[empty]
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
@@ -280,9 +249,8 @@ ResolutionTaskHolder@66 {
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
@@ -290,13 +258,21 @@ ResolutionTaskHolder@70 {
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
+}
+
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
 }
 
 ResolutionTaskHolder@74 {
     <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
@@ -306,10 +282,8 @@ ResolutionTaskHolder@74 {
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@41[empty]
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
@@ -319,9 +293,8 @@ ResolutionTaskHolder@78 {
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
@@ -329,121 +302,64 @@ ResolutionTaskHolder@82 {
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
+}
+
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
 }
 
 ResolutionTaskHolder@86 {
     <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
+}
+
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
 }
 
 ResolutionTaskHolder@98 {
     <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
     <name not found> = EmptyList@41[empty]
+}
+
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
     <name not found> = EmptyList@41[empty]
 }
 
 ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
@@ -454,7 +370,94 @@ ResolutionTaskHolder@130 {
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@131 {
+ResolutionTaskHolder@111 {
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+}
+
+null {
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@58 }
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
diff --git a/compiler/testData/diagnostics/tests/classObjects/kt3866.lazy.log b/compiler/testData/diagnostics/tests/classObjects/kt3866.lazy.log
index 007b4d03a9f..4871c0010dd 100644
--- a/compiler/testData/diagnostics/tests/classObjects/kt3866.lazy.log
+++ b/compiler/testData/diagnostics/tests/classObjects/kt3866.lazy.log
@@ -37,13 +37,6 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
@@ -52,105 +45,115 @@ ResolutionTaskHolder@28 {
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
     <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
     <name not found> = EmptyList@20[empty]
 }
 
 ResolutionTaskHolder@52 {
     <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
     <name not found> = EmptyList@20[empty]
 }
 
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
+}
+
 ResolutionTaskHolder@64 {
     <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+}
+
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
+}
+
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
+}
+
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[7] { ResolutionCandidate@75, ResolutionCandidate@76, ResolutionCandidate@77, ... }
+}
+
+null {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@93[7] { ResolutionCandidate@75, ResolutionCandidate@76, ResolutionCandidate@77, ... }
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[7] { ResolutionCandidate@90, ResolutionCandidate@91, ResolutionCandidate@92, ... }
-    <name not found> = ArrayList@93[7] { ResolutionCandidate@90, ResolutionCandidate@91, ResolutionCandidate@92, ... }
-}
diff --git a/compiler/testData/diagnostics/tests/classObjects/nestedClassInPrivateClassObject.lazy.log b/compiler/testData/diagnostics/tests/classObjects/nestedClassInPrivateClassObject.lazy.log
index 6eaa6facf38..6545460ef89 100644
--- a/compiler/testData/diagnostics/tests/classObjects/nestedClassInPrivateClassObject.lazy.log
+++ b/compiler/testData/diagnostics/tests/classObjects/nestedClassInPrivateClassObject.lazy.log
@@ -38,16 +38,6 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@27 {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
@@ -89,10 +79,8 @@ ResolutionTaskHolder@27 {
     <name not found> = EmptyList@19[empty]
 }
 
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@19[empty]
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
@@ -102,9 +90,8 @@ ResolutionTaskHolder@31 {
     <name not found> = EmptyList@19[empty]
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
@@ -112,13 +99,21 @@ ResolutionTaskHolder@35 {
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
+}
+
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
 }
 
 ResolutionTaskHolder@39 {
     <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
@@ -128,25 +123,7 @@ ResolutionTaskHolder@39 {
     <name not found> = EmptyList@19[empty]
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
+ResolutionTaskHolder@42 {
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
@@ -169,7 +146,7 @@ ResolutionTaskHolder@47 {
     <name not found> = EmptyList@19[empty]
 }
 
-ResolutionTaskHolder@48 {
+ResolutionTaskHolder@43 {
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
@@ -190,6 +167,32 @@ ResolutionTaskHolder@48 {
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
+}
+
+null {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@29 }
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.lazy.log
index ef6d5b42d19..4bf48527e01 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.lazy.log
@@ -131,804 +131,1130 @@ LazyJavaPackageFragment@34['lang'] {
 
 ResolutionTaskHolder@103 {
     <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+}
+
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
     <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@121 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@125 }
+ResolutionTaskHolder@124 {
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
     <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@131 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@133 {
+ResolutionTaskHolder@131 {
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
     <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@141 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@148 }
+ResolutionTaskHolder@136 {
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
+}
+
+ResolutionTaskHolder@141 {
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
+}
+
+ResolutionTaskHolder@144 {
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
+    <name not found> = EmptyList@77[empty]
+}
+
+ResolutionTaskHolder@147 {
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
     <name not found> = EmptyList@77[empty]
 }
 
 ResolutionTaskHolder@150 {
     <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@152 }
+    <name not found> = EmptyList@77[empty]
+}
+
+ResolutionTaskHolder@153 {
     <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@155 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@159 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
+ResolutionTaskHolder@156 {
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
     <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@161 {
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@163 }
+ResolutionTaskHolder@159 {
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
     <name not found> = EmptyList@77[empty]
+}
+
+ResolutionTaskHolder@162 {
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
     <name not found> = EmptyList@77[empty]
 }
 
 ResolutionTaskHolder@165 {
     <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@167 }
-    <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@169 {
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@171 }
-    <name not found> = EmptyList@77[empty]
+ResolutionTaskHolder@168 {
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
     <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@173 {
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@175 }
+ResolutionTaskHolder@171 {
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
     <name not found> = EmptyList@77[empty]
+}
+
+ResolutionTaskHolder@174 {
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
     <name not found> = EmptyList@77[empty]
 }
 
 ResolutionTaskHolder@177 {
     <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@179 }
-    <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@181 {
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@183 }
-    <name not found> = EmptyList@77[empty]
+ResolutionTaskHolder@180 {
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
     <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@185 {
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@187 }
+ResolutionTaskHolder@183 {
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
     <name not found> = EmptyList@77[empty]
+}
+
+ResolutionTaskHolder@186 {
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
     <name not found> = EmptyList@77[empty]
 }
 
 ResolutionTaskHolder@189 {
     <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@191 }
-    <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@193 {
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@195 }
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@195 }
-    <name not found> = EmptyList@77[empty]
+ResolutionTaskHolder@192 {
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
     <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@197 {
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@199 }
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@199 }
+ResolutionTaskHolder@195 {
+    <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
     <name not found> = EmptyList@77[empty]
+}
+
+ResolutionTaskHolder@198 {
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
     <name not found> = EmptyList@77[empty]
 }
 
 ResolutionTaskHolder@201 {
     <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@203 }
-    <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@205 {
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@207 }
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@207 }
-    <name not found> = EmptyList@77[empty]
+ResolutionTaskHolder@204 {
+    <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
     <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@209 {
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@211 }
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@211 }
+ResolutionTaskHolder@207 {
+    <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
     <name not found> = EmptyList@77[empty]
+}
+
+ResolutionTaskHolder@210 {
+    <name not found> = ArrayList@211[1] { ResolutionCandidate@212 }
     <name not found> = EmptyList@77[empty]
 }
 
 ResolutionTaskHolder@213 {
     <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@215 }
-    <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@217 {
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@219 }
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@219 }
-    <name not found> = EmptyList@77[empty]
+ResolutionTaskHolder@216 {
+    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
     <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@221 {
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@223 }
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@223 }
+ResolutionTaskHolder@219 {
+    <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
     <name not found> = EmptyList@77[empty]
+}
+
+ResolutionTaskHolder@222 {
+    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
     <name not found> = EmptyList@77[empty]
 }
 
 ResolutionTaskHolder@225 {
     <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@227 }
-    <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@229 {
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@231 }
-    <name not found> = EmptyList@77[empty]
+ResolutionTaskHolder@228 {
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
     <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@233 {
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@235 }
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@235 }
+ResolutionTaskHolder@231 {
+    <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
     <name not found> = EmptyList@77[empty]
+}
+
+ResolutionTaskHolder@234 {
+    <name not found> = ArrayList@235[1] { ResolutionCandidate@236 }
     <name not found> = EmptyList@77[empty]
 }
 
 ResolutionTaskHolder@237 {
     <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@239 }
-    <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@241 {
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@243 }
-    <name not found> = EmptyList@77[empty]
+ResolutionTaskHolder@240 {
+    <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
     <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@245 {
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@247 }
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@247 }
+ResolutionTaskHolder@243 {
+    <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
     <name not found> = EmptyList@77[empty]
+}
+
+ResolutionTaskHolder@246 {
+    <name not found> = ArrayList@247[1] { ResolutionCandidate@248 }
     <name not found> = EmptyList@77[empty]
 }
 
 ResolutionTaskHolder@249 {
     <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
-    <name not found> = ArrayList@252[1] { ResolutionCandidate@251 }
-    <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@253 {
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@255 }
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@255 }
-    <name not found> = EmptyList@77[empty]
+ResolutionTaskHolder@252 {
+    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
     <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@257 {
-    <name not found> = ArrayList@258[1] { ResolutionCandidate@259 }
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@259 }
+ResolutionTaskHolder@255 {
+    <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
     <name not found> = EmptyList@77[empty]
+}
+
+ResolutionTaskHolder@258 {
+    <name not found> = ArrayList@259[1] { ResolutionCandidate@260 }
     <name not found> = EmptyList@77[empty]
 }
 
 ResolutionTaskHolder@261 {
     <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@263 }
-    <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@265 {
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@267 }
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@267 }
-    <name not found> = EmptyList@77[empty]
+ResolutionTaskHolder@264 {
+    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
     <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@269 {
-    <name not found> = ArrayList@270[1] { ResolutionCandidate@271 }
-    <name not found> = ArrayList@272[1] { ResolutionCandidate@271 }
+ResolutionTaskHolder@267 {
+    <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
     <name not found> = EmptyList@77[empty]
+}
+
+ResolutionTaskHolder@270 {
+    <name not found> = ArrayList@271[1] { ResolutionCandidate@272 }
     <name not found> = EmptyList@77[empty]
 }
 
 ResolutionTaskHolder@273 {
     <name not found> = ArrayList@274[1] { ResolutionCandidate@275 }
-    <name not found> = ArrayList@276[1] { ResolutionCandidate@275 }
-    <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@277 {
-    <name not found> = ArrayList@278[1] { ResolutionCandidate@279 }
-    <name not found> = ArrayList@280[1] { ResolutionCandidate@279 }
-    <name not found> = EmptyList@77[empty]
+ResolutionTaskHolder@276 {
+    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
     <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@281 {
-    <name not found> = ArrayList@282[1] { ResolutionCandidate@283 }
-    <name not found> = ArrayList@284[1] { ResolutionCandidate@283 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
+ResolutionTaskHolder@279 {
+    <name not found> = ArrayList@280[1] { ResolutionCandidate@281 }
+}
+
+ResolutionTaskHolder@282 {
+    <name not found> = ArrayList@283[1] { ResolutionCandidate@284 }
 }
 
 ResolutionTaskHolder@285 {
     <name not found> = ArrayList@286[1] { ResolutionCandidate@287 }
-    <name not found> = ArrayList@288[1] { ResolutionCandidate@287 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@289 {
-    <name not found> = ArrayList@290[1] { ResolutionCandidate@291 }
-    <name not found> = ArrayList@292[1] { ResolutionCandidate@291 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
+ResolutionTaskHolder@288 {
+    <name not found> = ArrayList@289[1] { ResolutionCandidate@290 }
 }
 
-ResolutionTaskHolder@293 {
-    <name not found> = ArrayList@294[1] { ResolutionCandidate@295 }
-    <name not found> = ArrayList@296[1] { ResolutionCandidate@295 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
+ResolutionTaskHolder@291 {
+    <name not found> = ArrayList@292[1] { ResolutionCandidate@293 }
+}
+
+ResolutionTaskHolder@294 {
+    <name not found> = ArrayList@295[1] { ResolutionCandidate@296 }
 }
 
 ResolutionTaskHolder@297 {
     <name not found> = ArrayList@298[1] { ResolutionCandidate@299 }
-    <name not found> = ArrayList@300[1] { ResolutionCandidate@299 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@301 {
-    <name not found> = ArrayList@302[1] { ResolutionCandidate@303 }
-    <name not found> = ArrayList@304[1] { ResolutionCandidate@303 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
+ResolutionTaskHolder@300 {
+    <name not found> = ArrayList@301[1] { ResolutionCandidate@302 }
 }
 
-ResolutionTaskHolder@305 {
-    <name not found> = ArrayList@306[1] { ResolutionCandidate@307 }
-    <name not found> = ArrayList@308[1] { ResolutionCandidate@307 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
+ResolutionTaskHolder@303 {
+    <name not found> = ArrayList@304[1] { ResolutionCandidate@305 }
+}
+
+ResolutionTaskHolder@306 {
+    <name not found> = ArrayList@307[1] { ResolutionCandidate@308 }
 }
 
 ResolutionTaskHolder@309 {
     <name not found> = ArrayList@310[1] { ResolutionCandidate@311 }
-    <name not found> = ArrayList@312[1] { ResolutionCandidate@311 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@313 {
-    <name not found> = ArrayList@314[1] { ResolutionCandidate@315 }
-    <name not found> = ArrayList@316[1] { ResolutionCandidate@315 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
+ResolutionTaskHolder@312 {
+    <name not found> = ArrayList@313[1] { ResolutionCandidate@314 }
 }
 
-ResolutionTaskHolder@317 {
-    <name not found> = ArrayList@318[1] { ResolutionCandidate@319 }
-    <name not found> = ArrayList@320[1] { ResolutionCandidate@319 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
+ResolutionTaskHolder@315 {
+    <name not found> = ArrayList@316[1] { ResolutionCandidate@317 }
+}
+
+ResolutionTaskHolder@318 {
+    <name not found> = ArrayList@319[1] { ResolutionCandidate@320 }
 }
 
 ResolutionTaskHolder@321 {
     <name not found> = ArrayList@322[1] { ResolutionCandidate@323 }
-    <name not found> = ArrayList@324[1] { ResolutionCandidate@323 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@325 {
-    <name not found> = ArrayList@326[1] { ResolutionCandidate@327 }
-    <name not found> = ArrayList@328[1] { ResolutionCandidate@327 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
+ResolutionTaskHolder@324 {
+    <name not found> = ArrayList@325[1] { ResolutionCandidate@326 }
 }
 
-ResolutionTaskHolder@329 {
-    <name not found> = ArrayList@330[1] { ResolutionCandidate@331 }
-    <name not found> = ArrayList@332[1] { ResolutionCandidate@331 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
+ResolutionTaskHolder@327 {
+    <name not found> = ArrayList@328[1] { ResolutionCandidate@329 }
+}
+
+ResolutionTaskHolder@330 {
+    <name not found> = ArrayList@331[1] { ResolutionCandidate@332 }
 }
 
 ResolutionTaskHolder@333 {
     <name not found> = ArrayList@334[1] { ResolutionCandidate@335 }
-    <name not found> = ArrayList@336[1] { ResolutionCandidate@335 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@337 {
-    <name not found> = ArrayList@338[1] { ResolutionCandidate@339 }
-    <name not found> = ArrayList@340[1] { ResolutionCandidate@339 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
+ResolutionTaskHolder@336 {
+    <name not found> = ArrayList@337[1] { ResolutionCandidate@338 }
 }
 
-ResolutionTaskHolder@341 {
-    <name not found> = ArrayList@342[1] { ResolutionCandidate@343 }
-    <name not found> = ArrayList@344[1] { ResolutionCandidate@343 }
+ResolutionTaskHolder@339 {
+    <name not found> = ArrayList@340[1] { ResolutionCandidate@341 }
+}
+
+ResolutionTaskHolder@342 {
+    <name not found> = ArrayList@343[1] { ResolutionCandidate@344 }
 }
 
 ResolutionTaskHolder@345 {
     <name not found> = ArrayList@346[1] { ResolutionCandidate@347 }
-    <name not found> = ArrayList@348[1] { ResolutionCandidate@347 }
 }
 
-ResolutionTaskHolder@349 {
-    <name not found> = ArrayList@350[1] { ResolutionCandidate@351 }
-    <name not found> = ArrayList@352[1] { ResolutionCandidate@351 }
+ResolutionTaskHolder@348 {
+    <name not found> = ArrayList@349[1] { ResolutionCandidate@350 }
 }
 
-ResolutionTaskHolder@353 {
-    <name not found> = ArrayList@354[1] { ResolutionCandidate@355 }
-    <name not found> = ArrayList@356[1] { ResolutionCandidate@355 }
+ResolutionTaskHolder@351 {
+    <name not found> = ArrayList@352[1] { ResolutionCandidate@353 }
+}
+
+ResolutionTaskHolder@354 {
+    <name not found> = ArrayList@355[1] { ResolutionCandidate@356 }
 }
 
 ResolutionTaskHolder@357 {
     <name not found> = ArrayList@358[1] { ResolutionCandidate@359 }
-    <name not found> = ArrayList@360[1] { ResolutionCandidate@359 }
 }
 
-ResolutionTaskHolder@361 {
-    <name not found> = ArrayList@362[1] { ResolutionCandidate@363 }
-    <name not found> = ArrayList@364[1] { ResolutionCandidate@363 }
+ResolutionTaskHolder@360 {
+    <name not found> = ArrayList@361[1] { ResolutionCandidate@362 }
 }
 
-ResolutionTaskHolder@365 {
-    <name not found> = ArrayList@366[1] { ResolutionCandidate@367 }
-    <name not found> = ArrayList@368[1] { ResolutionCandidate@367 }
+ResolutionTaskHolder@363 {
+    <name not found> = ArrayList@364[1] { ResolutionCandidate@365 }
+}
+
+ResolutionTaskHolder@366 {
+    <name not found> = ArrayList@367[1] { ResolutionCandidate@368 }
 }
 
 ResolutionTaskHolder@369 {
     <name not found> = ArrayList@370[1] { ResolutionCandidate@371 }
-    <name not found> = ArrayList@372[1] { ResolutionCandidate@371 }
 }
 
-ResolutionTaskHolder@373 {
-    <name not found> = ArrayList@374[1] { ResolutionCandidate@375 }
-    <name not found> = ArrayList@376[1] { ResolutionCandidate@375 }
+ResolutionTaskHolder@372 {
+    <name not found> = ArrayList@373[1] { ResolutionCandidate@374 }
 }
 
-ResolutionTaskHolder@377 {
-    <name not found> = ArrayList@378[1] { ResolutionCandidate@379 }
-    <name not found> = ArrayList@380[1] { ResolutionCandidate@379 }
+ResolutionTaskHolder@375 {
+    <name not found> = ArrayList@376[1] { ResolutionCandidate@377 }
+}
+
+ResolutionTaskHolder@378 {
+    <name not found> = ArrayList@379[1] { ResolutionCandidate@380 }
 }
 
 ResolutionTaskHolder@381 {
     <name not found> = ArrayList@382[1] { ResolutionCandidate@383 }
-    <name not found> = ArrayList@384[1] { ResolutionCandidate@383 }
 }
 
-ResolutionTaskHolder@385 {
-    <name not found> = ArrayList@386[1] { ResolutionCandidate@387 }
-    <name not found> = ArrayList@388[1] { ResolutionCandidate@387 }
+ResolutionTaskHolder@384 {
+    <name not found> = ArrayList@385[1] { ResolutionCandidate@386 }
 }
 
-ResolutionTaskHolder@389 {
-    <name not found> = ArrayList@390[1] { ResolutionCandidate@391 }
-    <name not found> = ArrayList@392[1] { ResolutionCandidate@391 }
+ResolutionTaskHolder@387 {
+    <name not found> = ArrayList@388[1] { ResolutionCandidate@389 }
+}
+
+ResolutionTaskHolder@390 {
+    <name not found> = ArrayList@391[1] { ResolutionCandidate@392 }
 }
 
 ResolutionTaskHolder@393 {
     <name not found> = ArrayList@394[1] { ResolutionCandidate@395 }
-    <name not found> = ArrayList@396[1] { ResolutionCandidate@395 }
 }
 
-ResolutionTaskHolder@397 {
-    <name not found> = ArrayList@398[1] { ResolutionCandidate@399 }
-    <name not found> = ArrayList@400[1] { ResolutionCandidate@399 }
+ResolutionTaskHolder@396 {
+    <name not found> = ArrayList@397[1] { ResolutionCandidate@398 }
 }
 
-ResolutionTaskHolder@401 {
-    <name not found> = ArrayList@402[1] { ResolutionCandidate@403 }
-    <name not found> = ArrayList@404[1] { ResolutionCandidate@403 }
+ResolutionTaskHolder@399 {
+    <name not found> = ArrayList@400[1] { ResolutionCandidate@401 }
+}
+
+ResolutionTaskHolder@402 {
+    <name not found> = ArrayList@403[1] { ResolutionCandidate@404 }
 }
 
 ResolutionTaskHolder@405 {
     <name not found> = ArrayList@406[1] { ResolutionCandidate@407 }
-    <name not found> = ArrayList@408[1] { ResolutionCandidate@407 }
 }
 
-ResolutionTaskHolder@409 {
-    <name not found> = ArrayList@410[1] { ResolutionCandidate@411 }
-    <name not found> = ArrayList@412[1] { ResolutionCandidate@411 }
+ResolutionTaskHolder@408 {
+    <name not found> = ArrayList@409[1] { ResolutionCandidate@410 }
 }
 
-ResolutionTaskHolder@413 {
-    <name not found> = ArrayList@414[1] { ResolutionCandidate@415 }
-    <name not found> = ArrayList@416[1] { ResolutionCandidate@415 }
+ResolutionTaskHolder@411 {
+    <name not found> = ArrayList@412[1] { ResolutionCandidate@413 }
+}
+
+ResolutionTaskHolder@414 {
+    <name not found> = ArrayList@415[1] { ResolutionCandidate@416 }
 }
 
 ResolutionTaskHolder@417 {
     <name not found> = ArrayList@418[1] { ResolutionCandidate@419 }
-    <name not found> = ArrayList@420[1] { ResolutionCandidate@419 }
 }
 
-ResolutionTaskHolder@421 {
-    <name not found> = ArrayList@422[1] { ResolutionCandidate@423 }
-    <name not found> = ArrayList@424[1] { ResolutionCandidate@423 }
+ResolutionTaskHolder@420 {
+    <name not found> = ArrayList@421[1] { ResolutionCandidate@422 }
 }
 
-ResolutionTaskHolder@425 {
-    <name not found> = ArrayList@426[1] { ResolutionCandidate@427 }
-    <name not found> = ArrayList@428[1] { ResolutionCandidate@427 }
+ResolutionTaskHolder@423 {
+    <name not found> = ArrayList@424[1] { ResolutionCandidate@425 }
+}
+
+ResolutionTaskHolder@426 {
+    <name not found> = ArrayList@427[1] { ResolutionCandidate@428 }
 }
 
 ResolutionTaskHolder@429 {
     <name not found> = ArrayList@430[1] { ResolutionCandidate@431 }
-    <name not found> = ArrayList@432[1] { ResolutionCandidate@431 }
 }
 
-ResolutionTaskHolder@433 {
-    <name not found> = ArrayList@434[1] { ResolutionCandidate@435 }
-    <name not found> = ArrayList@436[1] { ResolutionCandidate@435 }
+ResolutionTaskHolder@432 {
+    <name not found> = ArrayList@433[1] { ResolutionCandidate@434 }
 }
 
-ResolutionTaskHolder@437 {
-    <name not found> = ArrayList@438[1] { ResolutionCandidate@439 }
-    <name not found> = ArrayList@440[1] { ResolutionCandidate@439 }
+ResolutionTaskHolder@435 {
+    <name not found> = ArrayList@436[1] { ResolutionCandidate@437 }
+}
+
+ResolutionTaskHolder@438 {
+    <name not found> = ArrayList@439[1] { ResolutionCandidate@440 }
 }
 
 ResolutionTaskHolder@441 {
     <name not found> = ArrayList@442[1] { ResolutionCandidate@443 }
-    <name not found> = ArrayList@444[1] { ResolutionCandidate@443 }
 }
 
-ResolutionTaskHolder@445 {
-    <name not found> = ArrayList@446[1] { ResolutionCandidate@447 }
-    <name not found> = ArrayList@448[1] { ResolutionCandidate@447 }
+ResolutionTaskHolder@444 {
+    <name not found> = ArrayList@445[1] { ResolutionCandidate@446 }
 }
 
-ResolutionTaskHolder@449 {
-    <name not found> = ArrayList@450[1] { ResolutionCandidate@451 }
-    <name not found> = ArrayList@452[1] { ResolutionCandidate@451 }
+ResolutionTaskHolder@447 {
+    <name not found> = ArrayList@448[1] { ResolutionCandidate@449 }
+}
+
+ResolutionTaskHolder@450 {
+    <name not found> = ArrayList@451[1] { ResolutionCandidate@452 }
 }
 
 ResolutionTaskHolder@453 {
     <name not found> = ArrayList@454[1] { ResolutionCandidate@455 }
-    <name not found> = ArrayList@456[1] { ResolutionCandidate@455 }
 }
 
-ResolutionTaskHolder@457 {
-    <name not found> = ArrayList@458[1] { ResolutionCandidate@459 }
-    <name not found> = ArrayList@460[1] { ResolutionCandidate@459 }
+ResolutionTaskHolder@456 {
+    <name not found> = ArrayList@457[1] { ResolutionCandidate@458 }
 }
 
-ResolutionTaskHolder@461 {
-    <name not found> = ArrayList@462[1] { ResolutionCandidate@463 }
-    <name not found> = ArrayList@464[1] { ResolutionCandidate@463 }
+ResolutionTaskHolder@459 {
+    <name not found> = ArrayList@460[1] { ResolutionCandidate@461 }
+}
+
+ResolutionTaskHolder@462 {
+    <name not found> = ArrayList@463[1] { ResolutionCandidate@464 }
 }
 
 ResolutionTaskHolder@465 {
     <name not found> = ArrayList@466[1] { ResolutionCandidate@467 }
-    <name not found> = ArrayList@468[1] { ResolutionCandidate@467 }
 }
 
-ResolutionTaskHolder@469 {
-    <name not found> = ArrayList@470[1] { ResolutionCandidate@471 }
-    <name not found> = ArrayList@472[1] { ResolutionCandidate@471 }
+ResolutionTaskHolder@468 {
+    <name not found> = ArrayList@469[1] { ResolutionCandidate@470 }
 }
 
-ResolutionTaskHolder@473 {
-    <name not found> = ArrayList@474[1] { ResolutionCandidate@475 }
-    <name not found> = ArrayList@476[1] { ResolutionCandidate@475 }
+ResolutionTaskHolder@471 {
+    <name not found> = ArrayList@472[1] { ResolutionCandidate@473 }
+}
+
+ResolutionTaskHolder@474 {
+    <name not found> = ArrayList@475[1] { ResolutionCandidate@476 }
 }
 
 ResolutionTaskHolder@477 {
     <name not found> = ArrayList@478[1] { ResolutionCandidate@479 }
-    <name not found> = ArrayList@480[1] { ResolutionCandidate@479 }
 }
 
-ResolutionTaskHolder@481 {
-    <name not found> = ArrayList@482[1] { ResolutionCandidate@483 }
-    <name not found> = ArrayList@484[1] { ResolutionCandidate@483 }
+ResolutionTaskHolder@480 {
+    <name not found> = ArrayList@481[1] { ResolutionCandidate@482 }
 }
 
-ResolutionTaskHolder@485 {
-    <name not found> = ArrayList@486[1] { ResolutionCandidate@487 }
-    <name not found> = ArrayList@488[1] { ResolutionCandidate@487 }
+ResolutionTaskHolder@483 {
+    <name not found> = ArrayList@484[1] { ResolutionCandidate@485 }
+}
+
+ResolutionTaskHolder@486 {
+    <name not found> = ArrayList@487[1] { ResolutionCandidate@488 }
 }
 
 ResolutionTaskHolder@489 {
     <name not found> = ArrayList@490[1] { ResolutionCandidate@491 }
-    <name not found> = ArrayList@492[1] { ResolutionCandidate@491 }
 }
 
-ResolutionTaskHolder@493 {
-    <name not found> = ArrayList@494[1] { ResolutionCandidate@495 }
-    <name not found> = ArrayList@496[1] { ResolutionCandidate@495 }
+ResolutionTaskHolder@492 {
+    <name not found> = ArrayList@493[1] { ResolutionCandidate@494 }
 }
 
-ResolutionTaskHolder@497 {
-    <name not found> = ArrayList@498[1] { ResolutionCandidate@499 }
-    <name not found> = ArrayList@500[1] { ResolutionCandidate@499 }
+ResolutionTaskHolder@495 {
+    <name not found> = ArrayList@496[1] { ResolutionCandidate@497 }
+}
+
+ResolutionTaskHolder@498 {
+    <name not found> = ArrayList@499[1] { ResolutionCandidate@500 }
 }
 
 ResolutionTaskHolder@501 {
     <name not found> = ArrayList@502[1] { ResolutionCandidate@503 }
-    <name not found> = ArrayList@504[1] { ResolutionCandidate@503 }
 }
 
-ResolutionTaskHolder@505 {
-    <name not found> = ArrayList@506[1] { ResolutionCandidate@507 }
-    <name not found> = ArrayList@508[1] { ResolutionCandidate@507 }
+ResolutionTaskHolder@504 {
+    <name not found> = ArrayList@505[2] { ResolutionCandidate@506, ResolutionCandidate@507 }
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@509 {
-    <name not found> = ArrayList@510[1] { ResolutionCandidate@511 }
-    <name not found> = ArrayList@512[1] { ResolutionCandidate@511 }
+ResolutionTaskHolder@508 {
+    <name not found> = ArrayList@509[2] { ResolutionCandidate@510, ResolutionCandidate@511 }
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@513 {
-    <name not found> = ArrayList@514[1] { ResolutionCandidate@515 }
-    <name not found> = ArrayList@516[1] { ResolutionCandidate@515 }
+ResolutionTaskHolder@512 {
+    <name not found> = ArrayList@513[2] { ResolutionCandidate@514, ResolutionCandidate@515 }
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@517 {
-    <name not found> = ArrayList@518[1] { ResolutionCandidate@519 }
-    <name not found> = ArrayList@520[1] { ResolutionCandidate@519 }
+ResolutionTaskHolder@516 {
+    <name not found> = ArrayList@517[2] { ResolutionCandidate@518, ResolutionCandidate@519 }
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@521 {
-    <name not found> = ArrayList@522[1] { ResolutionCandidate@523 }
-    <name not found> = ArrayList@524[1] { ResolutionCandidate@523 }
+ResolutionTaskHolder@520 {
+    <name not found> = ArrayList@521[2] { ResolutionCandidate@522, ResolutionCandidate@523 }
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@525 {
-    <name not found> = ArrayList@526[1] { ResolutionCandidate@527 }
-    <name not found> = ArrayList@528[1] { ResolutionCandidate@527 }
+ResolutionTaskHolder@524 {
+    <name not found> = ArrayList@525[2] { ResolutionCandidate@526, ResolutionCandidate@527 }
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@529 {
-    <name not found> = ArrayList@530[1] { ResolutionCandidate@531 }
-    <name not found> = ArrayList@532[1] { ResolutionCandidate@531 }
+ResolutionTaskHolder@528 {
+    <name not found> = ArrayList@529[2] { ResolutionCandidate@530, ResolutionCandidate@531 }
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@533 {
-    <name not found> = ArrayList@534[1] { ResolutionCandidate@535 }
-    <name not found> = ArrayList@536[1] { ResolutionCandidate@535 }
+ResolutionTaskHolder@532 {
+    <name not found> = ArrayList@533[2] { ResolutionCandidate@534, ResolutionCandidate@535 }
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@537 {
-    <name not found> = ArrayList@538[1] { ResolutionCandidate@539 }
-    <name not found> = ArrayList@540[1] { ResolutionCandidate@539 }
+ResolutionTaskHolder@536 {
+    <name not found> = ArrayList@537[2] { ResolutionCandidate@538, ResolutionCandidate@539 }
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@541 {
-    <name not found> = ArrayList@542[1] { ResolutionCandidate@543 }
-    <name not found> = ArrayList@544[1] { ResolutionCandidate@543 }
+ResolutionTaskHolder@540 {
+    <name not found> = ArrayList@541[2] { ResolutionCandidate@542, ResolutionCandidate@543 }
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@545 {
-    <name not found> = ArrayList@546[1] { ResolutionCandidate@547 }
-    <name not found> = ArrayList@548[1] { ResolutionCandidate@547 }
+ResolutionTaskHolder@544 {
+    <name not found> = ArrayList@545[2] { ResolutionCandidate@546, ResolutionCandidate@547 }
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@549 {
-    <name not found> = ArrayList@550[1] { ResolutionCandidate@551 }
-    <name not found> = ArrayList@552[1] { ResolutionCandidate@551 }
+ResolutionTaskHolder@548 {
+    <name not found> = ArrayList@549[2] { ResolutionCandidate@550, ResolutionCandidate@551 }
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@553 {
-    <name not found> = ArrayList@554[1] { ResolutionCandidate@555 }
-    <name not found> = ArrayList@556[1] { ResolutionCandidate@555 }
+ResolutionTaskHolder@552 {
+    <name not found> = ArrayList@553[2] { ResolutionCandidate@554, ResolutionCandidate@555 }
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@557 {
-    <name not found> = ArrayList@558[1] { ResolutionCandidate@559 }
-    <name not found> = ArrayList@560[1] { ResolutionCandidate@559 }
+ResolutionTaskHolder@556 {
+    <name not found> = ArrayList@557[7] { ResolutionCandidate@558, ResolutionCandidate@559, ResolutionCandidate@560, ... }
 }
 
 ResolutionTaskHolder@561 {
-    <name not found> = ArrayList@562[1] { ResolutionCandidate@563 }
-    <name not found> = ArrayList@564[1] { ResolutionCandidate@563 }
+    <name not found> = ArrayList@562[7] { ResolutionCandidate@563, ResolutionCandidate@564, ResolutionCandidate@565, ... }
 }
 
-ResolutionTaskHolder@565 {
-    <name not found> = ArrayList@566[1] { ResolutionCandidate@567 }
-    <name not found> = ArrayList@568[1] { ResolutionCandidate@567 }
+ResolutionTaskHolder@566 {
+    <name not found> = ArrayList@567[7] { ResolutionCandidate@568, ResolutionCandidate@569, ResolutionCandidate@570, ... }
 }
 
-ResolutionTaskHolder@569 {
-    <name not found> = ArrayList@570[1] { ResolutionCandidate@571 }
-    <name not found> = ArrayList@572[1] { ResolutionCandidate@571 }
+ResolutionTaskHolder@571 {
+    <name not found> = ArrayList@572[7] { ResolutionCandidate@573, ResolutionCandidate@574, ResolutionCandidate@575, ... }
 }
 
-ResolutionTaskHolder@573 {
-    <name not found> = ArrayList@574[1] { ResolutionCandidate@575 }
-    <name not found> = ArrayList@576[1] { ResolutionCandidate@575 }
-}
-
-ResolutionTaskHolder@577 {
-    <name not found> = ArrayList@578[1] { ResolutionCandidate@579 }
-    <name not found> = ArrayList@580[1] { ResolutionCandidate@579 }
+ResolutionTaskHolder@576 {
+    <name not found> = ArrayList@577[7] { ResolutionCandidate@578, ResolutionCandidate@579, ResolutionCandidate@580, ... }
 }
 
 ResolutionTaskHolder@581 {
-    <name not found> = ArrayList@582[1] { ResolutionCandidate@583 }
-    <name not found> = ArrayList@584[1] { ResolutionCandidate@583 }
+    <name not found> = ArrayList@582[7] { ResolutionCandidate@583, ResolutionCandidate@584, ResolutionCandidate@585, ... }
 }
 
-ResolutionTaskHolder@585 {
-    <name not found> = ArrayList@586[1] { ResolutionCandidate@587 }
-    <name not found> = ArrayList@588[1] { ResolutionCandidate@587 }
+ResolutionTaskHolder@586 {
+    <name not found> = ArrayList@587[7] { ResolutionCandidate@588, ResolutionCandidate@589, ResolutionCandidate@590, ... }
 }
 
-ResolutionTaskHolder@589 {
-    <name not found> = ArrayList@590[1] { ResolutionCandidate@591 }
-    <name not found> = ArrayList@592[1] { ResolutionCandidate@591 }
+ResolutionTaskHolder@591 {
+    <name not found> = ArrayList@592[8] { ResolutionCandidate@593, ResolutionCandidate@594, ResolutionCandidate@595, ... }
 }
 
-ResolutionTaskHolder@593 {
-    <name not found> = ArrayList@594[1] { ResolutionCandidate@595 }
-    <name not found> = ArrayList@596[1] { ResolutionCandidate@595 }
-}
-
-ResolutionTaskHolder@597 {
-    <name not found> = ArrayList@598[1] { ResolutionCandidate@599 }
-    <name not found> = ArrayList@600[1] { ResolutionCandidate@599 }
+ResolutionTaskHolder@596 {
+    <name not found> = ArrayList@597[8] { ResolutionCandidate@598, ResolutionCandidate@599, ResolutionCandidate@600, ... }
 }
 
 ResolutionTaskHolder@601 {
-    <name not found> = ArrayList@602[1] { ResolutionCandidate@603 }
-    <name not found> = ArrayList@604[1] { ResolutionCandidate@603 }
+    <name not found> = ArrayList@602[8] { ResolutionCandidate@603, ResolutionCandidate@604, ResolutionCandidate@605, ... }
 }
 
-ResolutionTaskHolder@605 {
-    <name not found> = ArrayList@606[1] { ResolutionCandidate@607 }
-    <name not found> = ArrayList@608[1] { ResolutionCandidate@607 }
+ResolutionTaskHolder@606 {
+    <name not found> = ArrayList@607[8] { ResolutionCandidate@608, ResolutionCandidate@609, ResolutionCandidate@610, ... }
 }
 
-ResolutionTaskHolder@609 {
-    <name not found> = ArrayList@610[1] { ResolutionCandidate@611 }
-    <name not found> = ArrayList@612[1] { ResolutionCandidate@611 }
+ResolutionTaskHolder@611 {
+    <name not found> = ArrayList@612[8] { ResolutionCandidate@613, ResolutionCandidate@614, ResolutionCandidate@615, ... }
 }
 
-ResolutionTaskHolder@613 {
-    <name not found> = ArrayList@614[1] { ResolutionCandidate@615 }
-    <name not found> = ArrayList@616[1] { ResolutionCandidate@615 }
+ResolutionTaskHolder@616 {
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
 }
 
 ResolutionTaskHolder@617 {
-    <name not found> = ArrayList@618[1] { ResolutionCandidate@619 }
-    <name not found> = ArrayList@620[1] { ResolutionCandidate@619 }
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+}
+
+ResolutionTaskHolder@618 {
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+}
+
+ResolutionTaskHolder@619 {
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+}
+
+ResolutionTaskHolder@620 {
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
 }
 
 ResolutionTaskHolder@621 {
-    <name not found> = ArrayList@622[1] { ResolutionCandidate@623 }
-    <name not found> = ArrayList@624[1] { ResolutionCandidate@623 }
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@625 {
-    <name not found> = ArrayList@626[1] { ResolutionCandidate@627 }
-    <name not found> = ArrayList@628[1] { ResolutionCandidate@627 }
+ResolutionTaskHolder@622 {
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@629 {
-    <name not found> = ArrayList@630[1] { ResolutionCandidate@631 }
-    <name not found> = ArrayList@632[1] { ResolutionCandidate@631 }
+ResolutionTaskHolder@623 {
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@633 {
-    <name not found> = ArrayList@634[1] { ResolutionCandidate@635 }
-    <name not found> = ArrayList@636[1] { ResolutionCandidate@635 }
-}
-
-ResolutionTaskHolder@637 {
-    <name not found> = ArrayList@638[1] { ResolutionCandidate@639 }
-    <name not found> = ArrayList@640[1] { ResolutionCandidate@639 }
-}
-
-ResolutionTaskHolder@641 {
-    <name not found> = ArrayList@642[2] { ResolutionCandidate@643, ResolutionCandidate@644 }
-    <name not found> = ArrayList@645[2] { ResolutionCandidate@643, ResolutionCandidate@644 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
+ResolutionTaskHolder@624 {
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
@@ -955,21 +1281,7 @@ ResolutionTaskHolder@641 {
     <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@646 {
-    <name not found> = ArrayList@647[2] { ResolutionCandidate@648, ResolutionCandidate@649 }
-    <name not found> = ArrayList@650[2] { ResolutionCandidate@648, ResolutionCandidate@649 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
+ResolutionTaskHolder@625 {
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
@@ -996,17 +1308,7 @@ ResolutionTaskHolder@646 {
     <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@651 {
-    <name not found> = ArrayList@652[2] { ResolutionCandidate@653, ResolutionCandidate@654 }
-    <name not found> = ArrayList@655[2] { ResolutionCandidate@653, ResolutionCandidate@654 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
+ResolutionTaskHolder@626 {
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
@@ -1017,9 +1319,238 @@ ResolutionTaskHolder@651 {
     <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@656 {
-    <name not found> = ArrayList@657[2] { ResolutionCandidate@658, ResolutionCandidate@659 }
-    <name not found> = ArrayList@660[2] { ResolutionCandidate@658, ResolutionCandidate@659 }
+null {
+    <name not found> = ArrayList@627[1] { ResolutionCandidate@167 }
+    <name not found> = ArrayList@628[1] { ResolutionCandidate@173 }
+    <name not found> = ArrayList@629[1] { ResolutionCandidate@449 }
+    <name not found> = ArrayList@630[1] { ResolutionCandidate@473 }
+    <name not found> = ArrayList@631[1] { ResolutionCandidate@431 }
+    <name not found> = ArrayList@632[1] { ResolutionCandidate@215 }
+    <name not found> = ArrayList@633[1] { ResolutionCandidate@383 }
+    <name not found> = ArrayList@634[1] { ResolutionCandidate@203 }
+    <name not found> = ArrayList@635[1] { ResolutionCandidate@233 }
+    <name not found> = ArrayList@636[1] { ResolutionCandidate@200 }
+    <name not found> = ArrayList@637[1] { ResolutionCandidate@278 }
+    <name not found> = ArrayList@638[1] { ResolutionCandidate@239 }
+    <name not found> = ArrayList@639[1] { ResolutionCandidate@242 }
+    <name not found> = ArrayList@640[1] { ResolutionCandidate@257 }
+    <name not found> = ArrayList@641[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@642[1] { ResolutionCandidate@140 }
+    <name not found> = ArrayList@643[1] { ResolutionCandidate@133 }
+    <name not found> = ArrayList@644[1] { ResolutionCandidate@135 }
+    <name not found> = ArrayList@645[1] { ResolutionCandidate@164 }
+    <name not found> = ArrayList@646[1] { ResolutionCandidate@266 }
+    <name not found> = ArrayList@647[1] { ResolutionCandidate@272 }
+    <name not found> = ArrayList@648[1] { ResolutionCandidate@194 }
+    <name not found> = ArrayList@649[1] { ResolutionCandidate@170 }
+    <name not found> = ArrayList@650[1] { ResolutionCandidate@308 }
+    <name not found> = ArrayList@651[1] { ResolutionCandidate@161 }
+    <name not found> = ArrayList@652[1] { ResolutionCandidate@221 }
+    <name not found> = ArrayList@653[1] { ResolutionCandidate@299 }
+    <name not found> = ArrayList@654[1] { ResolutionCandidate@206 }
+    <name not found> = ArrayList@655[1] { ResolutionCandidate@191 }
+    <name not found> = ArrayList@656[1] { ResolutionCandidate@212 }
+    <name not found> = ArrayList@657[1] { ResolutionCandidate@362 }
+    <name not found> = ArrayList@658[1] { ResolutionCandidate@149 }
+    <name not found> = ArrayList@659[1] { ResolutionCandidate@254 }
+    <name not found> = ArrayList@660[1] { ResolutionCandidate@332 }
+    <name not found> = ArrayList@661[1] { ResolutionCandidate@182 }
+    <name not found> = ArrayList@662[1] { ResolutionCandidate@353 }
+    <name not found> = ArrayList@663[1] { ResolutionCandidate@209 }
+    <name not found> = ArrayList@664[1] { ResolutionCandidate@227 }
+    <name not found> = ArrayList@665[1] { ResolutionCandidate@407 }
+    <name not found> = ArrayList@666[1] { ResolutionCandidate@275 }
+    <name not found> = ArrayList@667[1] { ResolutionCandidate@416 }
+    <name not found> = ArrayList@668[1] { ResolutionCandidate@197 }
+    <name not found> = ArrayList@669[1] { ResolutionCandidate@230 }
+    <name not found> = ArrayList@670[1] { ResolutionCandidate@185 }
+    <name not found> = ArrayList@671[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@672[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@673[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@674[1] { ResolutionCandidate@488 }
+    <name not found> = ArrayList@675[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@676[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@677[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@678[1] { ResolutionCandidate@287 }
+    <name not found> = ArrayList@679[1] { ResolutionCandidate@152 }
+    <name not found> = ArrayList@680[1] { ResolutionCandidate@464 }
+    <name not found> = ArrayList@681[1] { ResolutionCandidate@365 }
+    <name not found> = ArrayList@682[1] { ResolutionCandidate@455 }
+    <name not found> = ArrayList@683[1] { ResolutionCandidate@344 }
+    <name not found> = ArrayList@684[1] { ResolutionCandidate@359 }
+    <name not found> = ArrayList@685[1] { ResolutionCandidate@338 }
+    <name not found> = ArrayList@686[1] { ResolutionCandidate@341 }
+    <name not found> = ArrayList@687[1] { ResolutionCandidate@479 }
+    <name not found> = ArrayList@688[1] { ResolutionCandidate@491 }
+    <name not found> = ArrayList@689[1] { ResolutionCandidate@458 }
+    <name not found> = ArrayList@690[1] { ResolutionCandidate@386 }
+    <name not found> = ArrayList@691[1] { ResolutionCandidate@470 }
+    <name not found> = ArrayList@692[1] { ResolutionCandidate@485 }
+    <name not found> = ArrayList@693[1] { ResolutionCandidate@503 }
+    <name not found> = ArrayList@694[1] { ResolutionCandidate@461 }
+    <name not found> = ArrayList@695[1] { ResolutionCandidate@428 }
+    <name not found> = ArrayList@696[1] { ResolutionCandidate@482 }
+    <name not found> = ArrayList@697[1] { ResolutionCandidate@284 }
+    <name not found> = ArrayList@698[1] { ResolutionCandidate@440 }
+    <name not found> = ArrayList@699[1] { ResolutionCandidate@476 }
+    <name not found> = ArrayList@700[1] { ResolutionCandidate@377 }
+    <name not found> = ArrayList@701[1] { ResolutionCandidate@413 }
+    <name not found> = ArrayList@702[1] { ResolutionCandidate@419 }
+    <name not found> = ArrayList@703[1] { ResolutionCandidate@374 }
+    <name not found> = ArrayList@704[1] { ResolutionCandidate@143 }
+    <name not found> = ArrayList@705[1] { ResolutionCandidate@422 }
+    <name not found> = ArrayList@706[1] { ResolutionCandidate@296 }
+    <name not found> = ArrayList@707[1] { ResolutionCandidate@155 }
+    <name not found> = ArrayList@708[1] { ResolutionCandidate@314 }
+    <name not found> = ArrayList@709[1] { ResolutionCandidate@452 }
+    <name not found> = ArrayList@710[1] { ResolutionCandidate@443 }
+    <name not found> = ArrayList@711[1] { ResolutionCandidate@326 }
+    <name not found> = ArrayList@712[1] { ResolutionCandidate@335 }
+    <name not found> = ArrayList@713[1] { ResolutionCandidate@467 }
+    <name not found> = ArrayList@714[1] { ResolutionCandidate@320 }
+    <name not found> = ArrayList@715[1] { ResolutionCandidate@281 }
+    <name not found> = ArrayList@716[1] { ResolutionCandidate@329 }
+    <name not found> = ArrayList@717[1] { ResolutionCandidate@302 }
+    <name not found> = ArrayList@718[1] { ResolutionCandidate@395 }
+    <name not found> = ArrayList@719[1] { ResolutionCandidate@446 }
+    <name not found> = ArrayList@720[1] { ResolutionCandidate@305 }
+    <name not found> = ArrayList@721[1] { ResolutionCandidate@410 }
+    <name not found> = ArrayList@722[1] { ResolutionCandidate@371 }
+    <name not found> = ArrayList@723[1] { ResolutionCandidate@380 }
+    <name not found> = ArrayList@724[1] { ResolutionCandidate@404 }
+    <name not found> = ArrayList@725[1] { ResolutionCandidate@146 }
+    <name not found> = ArrayList@726[1] { ResolutionCandidate@251 }
+    <name not found> = ArrayList@727[1] { ResolutionCandidate@236 }
+    <name not found> = ArrayList@728[1] { ResolutionCandidate@248 }
+    <name not found> = ArrayList@729[1] { ResolutionCandidate@437 }
+    <name not found> = ArrayList@730[1] { ResolutionCandidate@317 }
+    <name not found> = ArrayList@731[1] { ResolutionCandidate@494 }
+    <name not found> = ArrayList@732[1] { ResolutionCandidate@356 }
+    <name not found> = ArrayList@733[1] { ResolutionCandidate@500 }
+    <name not found> = ArrayList@734[1] { ResolutionCandidate@368 }
+    <name not found> = ArrayList@735[1] { ResolutionCandidate@323 }
+    <name not found> = ArrayList@736[1] { ResolutionCandidate@347 }
+    <name not found> = ArrayList@737[1] { ResolutionCandidate@401 }
+    <name not found> = ArrayList@738[1] { ResolutionCandidate@293 }
+    <name not found> = ArrayList@739[1] { ResolutionCandidate@311 }
+    <name not found> = ArrayList@740[1] { ResolutionCandidate@425 }
+    <name not found> = ArrayList@741[1] { ResolutionCandidate@176 }
+    <name not found> = ArrayList@742[1] { ResolutionCandidate@269 }
+    <name not found> = ArrayList@743[1] { ResolutionCandidate@290 }
+    <name not found> = ArrayList@744[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@745[1] { ResolutionCandidate@224 }
+    <name not found> = ArrayList@746[1] { ResolutionCandidate@350 }
+    <name not found> = ArrayList@747[1] { ResolutionCandidate@260 }
+    <name not found> = ArrayList@748[1] { ResolutionCandidate@497 }
+    <name not found> = ArrayList@749[1] { ResolutionCandidate@245 }
+    <name not found> = ArrayList@750[1] { ResolutionCandidate@179 }
+    <name not found> = ArrayList@751[1] { ResolutionCandidate@398 }
+    <name not found> = ArrayList@752[1] { ResolutionCandidate@218 }
+    <name not found> = ArrayList@753[1] { ResolutionCandidate@126 }
+    <name not found> = ArrayList@754[1] { ResolutionCandidate@128 }
+    <name not found> = ArrayList@755[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@756[1] { ResolutionCandidate@188 }
+    <name not found> = ArrayList@757[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@758[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@759[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@760[1] { ResolutionCandidate@263 }
+    <name not found> = ArrayList@761[1] { ResolutionCandidate@434 }
+    <name not found> = ArrayList@762[1] { ResolutionCandidate@389 }
+    <name not found> = ArrayList@763[1] { ResolutionCandidate@392 }
+    <name not found> = ArrayList@764[2] { ResolutionCandidate@534, ResolutionCandidate@535 }
+    <name not found> = ArrayList@765[2] { ResolutionCandidate@550, ResolutionCandidate@551 }
+    <name not found> = ArrayList@766[2] { ResolutionCandidate@538, ResolutionCandidate@539 }
+    <name not found> = ArrayList@767[2] { ResolutionCandidate@542, ResolutionCandidate@543 }
+    <name not found> = ArrayList@768[2] { ResolutionCandidate@554, ResolutionCandidate@555 }
+    <name not found> = ArrayList@769[2] { ResolutionCandidate@546, ResolutionCandidate@547 }
+    <name not found> = ArrayList@770[2] { ResolutionCandidate@530, ResolutionCandidate@531 }
+    <name not found> = ArrayList@771[2] { ResolutionCandidate@514, ResolutionCandidate@515 }
+    <name not found> = ArrayList@772[2] { ResolutionCandidate@522, ResolutionCandidate@523 }
+    <name not found> = ArrayList@773[2] { ResolutionCandidate@526, ResolutionCandidate@527 }
+    <name not found> = ArrayList@774[2] { ResolutionCandidate@518, ResolutionCandidate@519 }
+    <name not found> = ArrayList@775[2] { ResolutionCandidate@510, ResolutionCandidate@511 }
+    <name not found> = ArrayList@776[2] { ResolutionCandidate@506, ResolutionCandidate@507 }
+    <name not found> = ArrayList@777[7] { ResolutionCandidate@563, ResolutionCandidate@564, ResolutionCandidate@565, ... }
+    <name not found> = ArrayList@778[7] { ResolutionCandidate@583, ResolutionCandidate@584, ResolutionCandidate@585, ... }
+    <name not found> = ArrayList@779[7] { ResolutionCandidate@578, ResolutionCandidate@579, ResolutionCandidate@580, ... }
+    <name not found> = ArrayList@780[7] { ResolutionCandidate@558, ResolutionCandidate@559, ResolutionCandidate@560, ... }
+    <name not found> = ArrayList@781[7] { ResolutionCandidate@588, ResolutionCandidate@589, ResolutionCandidate@590, ... }
+    <name not found> = ArrayList@782[7] { ResolutionCandidate@568, ResolutionCandidate@569, ResolutionCandidate@570, ... }
+    <name not found> = ArrayList@783[7] { ResolutionCandidate@573, ResolutionCandidate@574, ResolutionCandidate@575, ... }
+    <name not found> = ArrayList@784[8] { ResolutionCandidate@598, ResolutionCandidate@599, ResolutionCandidate@600, ... }
+    <name not found> = ArrayList@785[8] { ResolutionCandidate@593, ResolutionCandidate@594, ResolutionCandidate@595, ... }
+    <name not found> = ArrayList@786[8] { ResolutionCandidate@613, ResolutionCandidate@614, ResolutionCandidate@615, ... }
+    <name not found> = ArrayList@787[8] { ResolutionCandidate@608, ResolutionCandidate@609, ResolutionCandidate@610, ... }
+    <name not found> = ArrayList@788[8] { ResolutionCandidate@603, ResolutionCandidate@604, ResolutionCandidate@605, ... }
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
@@ -1036,11 +1567,6 @@ ResolutionTaskHolder@656 {
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@661 {
-    <name not found> = ArrayList@662[2] { ResolutionCandidate@663, ResolutionCandidate@664 }
-    <name not found> = ArrayList@665[2] { ResolutionCandidate@663, ResolutionCandidate@664 }
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
@@ -1057,11 +1583,6 @@ ResolutionTaskHolder@661 {
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@666 {
-    <name not found> = ArrayList@667[2] { ResolutionCandidate@668, ResolutionCandidate@669 }
-    <name not found> = ArrayList@670[2] { ResolutionCandidate@668, ResolutionCandidate@669 }
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
@@ -1078,132 +1599,34 @@ ResolutionTaskHolder@666 {
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@671 {
-    <name not found> = ArrayList@672[2] { ResolutionCandidate@673, ResolutionCandidate@674 }
-    <name not found> = ArrayList@675[2] { ResolutionCandidate@673, ResolutionCandidate@674 }
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@676 {
-    <name not found> = ArrayList@677[2] { ResolutionCandidate@678, ResolutionCandidate@679 }
-    <name not found> = ArrayList@680[2] { ResolutionCandidate@678, ResolutionCandidate@679 }
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@681 {
-    <name not found> = ArrayList@682[2] { ResolutionCandidate@683, ResolutionCandidate@684 }
-    <name not found> = ArrayList@685[2] { ResolutionCandidate@683, ResolutionCandidate@684 }
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@686 {
-    <name not found> = ArrayList@687[2] { ResolutionCandidate@688, ResolutionCandidate@689 }
-    <name not found> = ArrayList@690[2] { ResolutionCandidate@688, ResolutionCandidate@689 }
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@691 {
-    <name not found> = ArrayList@692[2] { ResolutionCandidate@693, ResolutionCandidate@694 }
-    <name not found> = ArrayList@695[2] { ResolutionCandidate@693, ResolutionCandidate@694 }
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@696 {
-    <name not found> = ArrayList@697[2] { ResolutionCandidate@698, ResolutionCandidate@699 }
-    <name not found> = ArrayList@700[2] { ResolutionCandidate@698, ResolutionCandidate@699 }
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@701 {
-    <name not found> = ArrayList@702[2] { ResolutionCandidate@703, ResolutionCandidate@704 }
-    <name not found> = ArrayList@705[2] { ResolutionCandidate@703, ResolutionCandidate@704 }
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@706 {
-    <name not found> = ArrayList@707[7] { ResolutionCandidate@708, ResolutionCandidate@709, ResolutionCandidate@710, ... }
-    <name not found> = ArrayList@711[7] { ResolutionCandidate@708, ResolutionCandidate@709, ResolutionCandidate@710, ... }
-}
-
-ResolutionTaskHolder@712 {
-    <name not found> = ArrayList@713[7] { ResolutionCandidate@714, ResolutionCandidate@715, ResolutionCandidate@716, ... }
-    <name not found> = ArrayList@717[7] { ResolutionCandidate@714, ResolutionCandidate@715, ResolutionCandidate@716, ... }
-}
-
-ResolutionTaskHolder@718 {
-    <name not found> = ArrayList@719[7] { ResolutionCandidate@720, ResolutionCandidate@721, ResolutionCandidate@722, ... }
-    <name not found> = ArrayList@723[7] { ResolutionCandidate@720, ResolutionCandidate@721, ResolutionCandidate@722, ... }
-}
-
-ResolutionTaskHolder@724 {
-    <name not found> = ArrayList@725[7] { ResolutionCandidate@726, ResolutionCandidate@727, ResolutionCandidate@728, ... }
-    <name not found> = ArrayList@729[7] { ResolutionCandidate@726, ResolutionCandidate@727, ResolutionCandidate@728, ... }
-}
-
-ResolutionTaskHolder@730 {
-    <name not found> = ArrayList@731[7] { ResolutionCandidate@732, ResolutionCandidate@733, ResolutionCandidate@734, ... }
-    <name not found> = ArrayList@735[7] { ResolutionCandidate@732, ResolutionCandidate@733, ResolutionCandidate@734, ... }
-}
-
-ResolutionTaskHolder@736 {
-    <name not found> = ArrayList@737[7] { ResolutionCandidate@738, ResolutionCandidate@739, ResolutionCandidate@740, ... }
-    <name not found> = ArrayList@741[7] { ResolutionCandidate@738, ResolutionCandidate@739, ResolutionCandidate@740, ... }
-}
-
-ResolutionTaskHolder@742 {
-    <name not found> = ArrayList@743[7] { ResolutionCandidate@744, ResolutionCandidate@745, ResolutionCandidate@746, ... }
-    <name not found> = ArrayList@747[7] { ResolutionCandidate@744, ResolutionCandidate@745, ResolutionCandidate@746, ... }
-}
-
-ResolutionTaskHolder@748 {
-    <name not found> = ArrayList@749[8] { ResolutionCandidate@750, ResolutionCandidate@751, ResolutionCandidate@752, ... }
-    <name not found> = ArrayList@753[8] { ResolutionCandidate@750, ResolutionCandidate@751, ResolutionCandidate@752, ... }
-}
-
-ResolutionTaskHolder@754 {
-    <name not found> = ArrayList@755[8] { ResolutionCandidate@756, ResolutionCandidate@757, ResolutionCandidate@758, ... }
-    <name not found> = ArrayList@759[8] { ResolutionCandidate@756, ResolutionCandidate@757, ResolutionCandidate@758, ... }
-}
-
-ResolutionTaskHolder@760 {
-    <name not found> = ArrayList@761[8] { ResolutionCandidate@762, ResolutionCandidate@763, ResolutionCandidate@764, ... }
-    <name not found> = ArrayList@765[8] { ResolutionCandidate@762, ResolutionCandidate@763, ResolutionCandidate@764, ... }
-}
-
-ResolutionTaskHolder@766 {
-    <name not found> = ArrayList@767[8] { ResolutionCandidate@768, ResolutionCandidate@769, ResolutionCandidate@770, ... }
-    <name not found> = ArrayList@771[8] { ResolutionCandidate@768, ResolutionCandidate@769, ResolutionCandidate@770, ... }
-}
-
-ResolutionTaskHolder@772 {
-    <name not found> = ArrayList@773[8] { ResolutionCandidate@774, ResolutionCandidate@775, ResolutionCandidate@776, ... }
-    <name not found> = ArrayList@777[8] { ResolutionCandidate@774, ResolutionCandidate@775, ResolutionCandidate@776, ... }
-}
-
-ResolutionTaskHolder@778 {
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
@@ -1305,423 +1728,3 @@ ResolutionTaskHolder@778 {
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
 }
-
-ResolutionTaskHolder@779 {
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@780 {
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@781 {
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@782 {
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@783 {
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@784 {
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@785 {
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@786 {
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@787 {
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@788 {
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/backingFieldInsideGetter.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/backingFieldInsideGetter.lazy.log
index 193a9124a53..a3cb1fb8bad 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/backingFieldInsideGetter.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/backingFieldInsideGetter.lazy.log
@@ -88,14 +88,14 @@ LazyJavaClassifierType@55['E'] {
     arguments = ArrayList@56[empty]
     classifier = JavaTypeParameterImpl@57['E']
     nullable = 'false': Boolean@42
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@54
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@58
 }
 
-LazyJavaClassifierType@58['E'] {
-    arguments = ArrayList@59[empty]
-    classifier = JavaTypeParameterImpl@60['E']
+LazyJavaClassifierType@59['E'] {
+    arguments = ArrayList@60[empty]
+    classifier = JavaTypeParameterImpl@61['E']
     nullable = 'false': Boolean@42
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@61
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@54
 }
 
 LazyJavaClassifierType@62['E'] {
@@ -107,30 +107,30 @@ LazyJavaClassifierType@62['E'] {
 
 LazyJavaClassifierType@65['E'] {
     arguments = ArrayList@66[empty]
-    classifier = JavaTypeParameterImpl@57['E']
+    classifier = JavaTypeParameterImpl@61['E']
     nullable = 'true': Boolean@48
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@54
 }
 
 LazyJavaClassifierType@67['E'] {
     arguments = ArrayList@68[empty]
-    classifier = JavaTypeParameterImpl@53['E']
+    classifier = JavaTypeParameterImpl@57['E']
     nullable = 'true': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@54
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@58
 }
 
 LazyJavaClassifierType@69['E'] {
     arguments = ArrayList@70[empty]
-    classifier = JavaTypeParameterImpl@64['E']
+    classifier = JavaTypeParameterImpl@53['E']
     nullable = 'true': Boolean@48
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@54
 }
 
 LazyJavaClassifierType@71['E'] {
     arguments = ArrayList@72[empty]
-    classifier = JavaTypeParameterImpl@60['E']
+    classifier = JavaTypeParameterImpl@64['E']
     nullable = 'true': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@61
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@54
 }
 
 LazyJavaClassifierType@73['Object'] {
@@ -222,82 +222,85 @@ LazyJavaTypeParameterDescriptor@24['E'] {
 }
 
 LazyJavaTypeParameterDescriptor@19['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@61
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@58
 }
 
 LazyJavaTypeParameterResolver@134 {
-    resolve(JavaTypeParameterImpl@135['E']) = LazyJavaTypeParameterDescriptor@19['E']
+    resolve(JavaTypeParameterImpl@135['E']) = LazyJavaTypeParameterDescriptor@24['E']
 }
 
 LazyJavaTypeParameterResolver@136 {
-    resolve(JavaTypeParameterImpl@137['E']) = LazyJavaTypeParameterDescriptor@24['E']
+    resolve(JavaTypeParameterImpl@137['E']) = LazyJavaTypeParameterDescriptor@19['E']
 }
 
 ResolutionTaskHolder@138 {
     <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@143 }
-    <name not found> = EmptyList@118[empty]
-    <name not found> = EmptyList@118[empty]
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
     <name not found> = EmptyList@118[empty]
     <name not found> = EmptyList@118[empty]
 }
 
-ResolutionTaskHolder@145 {
+ResolutionTaskHolder@143 {
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
     <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@147 }
+    <name not found> = EmptyList@118[empty]
+}
+
+ResolutionTaskHolder@148 {
     <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
-    <name not found> = EmptyList@118[empty]
     <name not found> = EmptyList@118[empty]
 }
 
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
-    <name not found> = EmptyList@118[empty]
+ResolutionTaskHolder@151 {
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
     <name not found> = EmptyList@118[empty]
 }
 
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
+ResolutionTaskHolder@154 {
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
     <name not found> = EmptyList@118[empty]
+}
+
+ResolutionTaskHolder@157 {
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
     <name not found> = EmptyList@118[empty]
 }
 
 ResolutionTaskHolder@160 {
     <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@162 }
+    <name not found> = EmptyList@118[empty]
+}
+
+ResolutionTaskHolder@163 {
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
+    <name not found> = EmptyList@118[empty]
+}
+
+ResolutionTaskHolder@166 {
+    <name not found> = ArrayList@167[4] { ResolutionCandidate@168, ResolutionCandidate@169, ResolutionCandidate@170, ... }
     <name not found> = EmptyList@118[empty]
     <name not found> = EmptyList@118[empty]
 }
 
-ResolutionTaskHolder@164 {
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@166 }
+null {
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@159 }
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@140 }
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@142 }
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@165 }
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@176[1] { ResolutionCandidate@156 }
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@145 }
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@147 }
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@153 }
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@162 }
+    <name not found> = ArrayList@181[5] { ResolutionCandidate@168, ResolutionCandidate@169, ResolutionCandidate@170, ... }
+    <name not found> = EmptyList@118[empty]
     <name not found> = EmptyList@118[empty]
     <name not found> = EmptyList@118[empty]
-}
-
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@170 }
     <name not found> = EmptyList@118[empty]
     <name not found> = EmptyList@118[empty]
-}
-
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@174 }
     <name not found> = EmptyList@118[empty]
     <name not found> = EmptyList@118[empty]
-}
-
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[4] { ResolutionCandidate@178, ResolutionCandidate@179, ResolutionCandidate@180, ... }
-    <name not found> = ArrayList@181[5] { ResolutionCandidate@178, ResolutionCandidate@179, ResolutionCandidate@180, ... }
     <name not found> = EmptyList@118[empty]
     <name not found> = EmptyList@118[empty]
     <name not found> = EmptyList@118[empty]
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/breakOrContinueInLoopCondition.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/breakOrContinueInLoopCondition.lazy.log
index 890495a607e..efba41e5518 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/breakOrContinueInLoopCondition.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/breakOrContinueInLoopCondition.lazy.log
@@ -23,130 +23,133 @@ LazyJavaPackageFragment@5['java'] {
 
 ResolutionTaskHolder@21 {
     <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@23 }
 }
 
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
+ResolutionTaskHolder@24 {
+    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+ResolutionTaskHolder@27 {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
+}
+
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
 }
 
 ResolutionTaskHolder@33 {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+}
+
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
 }
 
 ResolutionTaskHolder@45 {
     <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
+}
+
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
 }
 
 ResolutionTaskHolder@57 {
     <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
+}
+
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
 }
 
 ResolutionTaskHolder@69 {
     <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
+}
+
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
 }
 
 ResolutionTaskHolder@81 {
     <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
 }
 
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[7] { ResolutionCandidate@89, ResolutionCandidate@90, ResolutionCandidate@91, ... }
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[7] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
 }
 
 ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@98[7] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
 }
 
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[7] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
 }
 
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[7] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113, ... }
-    <name not found> = ArrayList@114[7] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113, ... }
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[7] { ResolutionCandidate@117, ResolutionCandidate@118, ResolutionCandidate@119, ... }
-    <name not found> = ArrayList@120[7] { ResolutionCandidate@117, ResolutionCandidate@118, ResolutionCandidate@119, ... }
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[7] { ResolutionCandidate@123, ResolutionCandidate@124, ResolutionCandidate@125, ... }
-    <name not found> = ArrayList@126[7] { ResolutionCandidate@123, ResolutionCandidate@124, ResolutionCandidate@125, ... }
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[7] { ResolutionCandidate@129, ResolutionCandidate@130, ResolutionCandidate@131, ... }
-    <name not found> = ArrayList@132[7] { ResolutionCandidate@129, ResolutionCandidate@130, ResolutionCandidate@131, ... }
+null {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@23 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@26 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@129[7] { ResolutionCandidate@89, ResolutionCandidate@90, ResolutionCandidate@91, ... }
+    <name not found> = ArrayList@130[7] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
+    <name not found> = ArrayList@131[7] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
+    <name not found> = ArrayList@132[7] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/checkInnerLocalDeclarations.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/checkInnerLocalDeclarations.lazy.log
index f4fb9f8abb8..22d0f096b53 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/checkInnerLocalDeclarations.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/checkInnerLocalDeclarations.lazy.log
@@ -17,5 +17,8 @@ LazyJavaPackageFragment@5['java'] {
 
 ResolutionTaskHolder@17 {
     <name not found> = ArrayList@18[1] { ResolutionCandidate@19 }
+}
+
+null {
     <name not found> = ArrayList@20[1] { ResolutionCandidate@19 }
 }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/checkPropertyAccessor.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/checkPropertyAccessor.lazy.log
index 8e65e12aaeb..e8252a7c7a2 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/checkPropertyAccessor.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/checkPropertyAccessor.lazy.log
@@ -23,20 +23,23 @@ LazyJavaPackageFragment@9['java'] {
 
 ResolutionTaskHolder@23 {
     <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@25 }
 }
 
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
+ResolutionTaskHolder@26 {
+    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
 }
 
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
+ResolutionTaskHolder@29 {
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
+}
+
+null {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@25 }
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@28 }
 }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/commasAndWhitespaces.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/commasAndWhitespaces.lazy.log
index 6b72c907bf5..856d7b2dc2f 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/commasAndWhitespaces.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/commasAndWhitespaces.lazy.log
@@ -37,21 +37,21 @@ LazyJavaClassifierType@21['String'] {
 
 LazyJavaClassifierType@24['String'] {
     arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@15['String']
+    classifier = JavaClassImpl@20['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@23['String']
+    classifier = JavaClassImpl@15['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@29['String'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@20['String']
+    classifier = JavaClassImpl@23['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -79,14 +79,14 @@ LazyJavaClassifierType@38['Throwable'] {
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@40['Throwable']
+    classifier = JavaClassImpl@37['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@43['Throwable'] {
     arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@37['Throwable']
+    classifier = JavaClassImpl@40['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -157,21 +157,24 @@ LazyJavaPackageFragment@58['lang'] {
 
 ResolutionTaskHolder@85 {
     <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[4] { ResolutionCandidate@95, ResolutionCandidate@96, ResolutionCandidate@97, ... }
-    <name not found> = ArrayList@98[5] { ResolutionCandidate@95, ResolutionCandidate@96, ResolutionCandidate@97, ... }
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[4] { ResolutionCandidate@93, ResolutionCandidate@94, ResolutionCandidate@95, ... }
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+}
+
+null {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@98[5] { ResolutionCandidate@93, ResolutionCandidate@94, ResolutionCandidate@95, ... }
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/commentsInDeadCode.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/commentsInDeadCode.lazy.log
index 7f34721a25d..4481bb608e1 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/commentsInDeadCode.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/commentsInDeadCode.lazy.log
@@ -79,21 +79,21 @@ LazyJavaClassifierType@38['Throwable'] {
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@40['Throwable']
+    classifier = JavaClassImpl@33['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@43['Throwable'] {
     arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@33['Throwable']
+    classifier = JavaClassImpl@37['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@45['Throwable'] {
     arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@37['Throwable']
+    classifier = JavaClassImpl@40['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -147,61 +147,64 @@ LazyJavaPackageFragment@62['lang'] {
 
 ResolutionTaskHolder@84 {
     <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
+}
+
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
 }
 
 ResolutionTaskHolder@96 {
     <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[4] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[4] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
-    <name not found> = ArrayList@113[5] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
+null {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@113[5] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCallInInvokeCall.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCallInInvokeCall.lazy.log
index 2577934a2cc..5fe40755e76 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCallInInvokeCall.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCallInInvokeCall.lazy.log
@@ -39,21 +39,21 @@ LazyJavaClassifierType@23['String'] {
 
 LazyJavaClassifierType@26['String'] {
     arguments = ArrayList@27[empty]
-    classifier = JavaClassImpl@25['String']
+    classifier = JavaClassImpl@22['String']
     nullable = 'true': Boolean@28
     typeConstructor = DeserializedClassTypeConstructor@19
 }
 
 LazyJavaClassifierType@29['String'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@17['String']
+    classifier = JavaClassImpl@25['String']
     nullable = 'true': Boolean@28
     typeConstructor = DeserializedClassTypeConstructor@19
 }
 
 LazyJavaClassifierType@31['String'] {
     arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@22['String']
+    classifier = JavaClassImpl@17['String']
     nullable = 'true': Boolean@28
     typeConstructor = DeserializedClassTypeConstructor@19
 }
@@ -81,21 +81,21 @@ LazyJavaClassifierType@40['Throwable'] {
 
 LazyJavaClassifierType@43['Throwable'] {
     arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@39['Throwable']
+    classifier = JavaClassImpl@35['Throwable']
     nullable = 'true': Boolean@28
     typeConstructor = DeserializedClassTypeConstructor@36
 }
 
 LazyJavaClassifierType@45['Throwable'] {
     arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@35['Throwable']
+    classifier = JavaClassImpl@42['Throwable']
     nullable = 'true': Boolean@28
     typeConstructor = DeserializedClassTypeConstructor@36
 }
 
 LazyJavaClassifierType@47['Throwable'] {
     arguments = ArrayList@48[empty]
-    classifier = JavaClassImpl@42['Throwable']
+    classifier = JavaClassImpl@39['Throwable']
     nullable = 'true': Boolean@28
     typeConstructor = DeserializedClassTypeConstructor@36
 }
@@ -155,44 +155,47 @@ LazyJavaPackageFragment@59['lang'] {
 
 ResolutionTaskHolder@83 {
     <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
 }
 
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
 }
 
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
     <name not found> = EmptyList@75[empty]
+}
+
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
     <name not found> = EmptyList@75[empty]
 }
 
 ResolutionTaskHolder@95 {
     <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
+}
+
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[4] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102, ... }
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
 }
 
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[4] { ResolutionCandidate@105, ResolutionCandidate@106, ResolutionCandidate@107, ... }
-    <name not found> = ArrayList@108[5] { ResolutionCandidate@105, ResolutionCandidate@106, ResolutionCandidate@107, ... }
+null {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@108[5] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102, ... }
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCallInReceiver.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCallInReceiver.lazy.log
index fac81e682cc..8a9092a7670 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCallInReceiver.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCallInReceiver.lazy.log
@@ -79,7 +79,7 @@ LazyJavaClassifierType@38['Throwable'] {
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@37['Throwable']
+    classifier = JavaClassImpl@33['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -93,7 +93,7 @@ LazyJavaClassifierType@43['Throwable'] {
 
 LazyJavaClassifierType@45['Throwable'] {
     arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@33['Throwable']
+    classifier = JavaClassImpl@37['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -153,43 +153,46 @@ LazyJavaPackageFragment@57['lang'] {
 
 ResolutionTaskHolder@81 {
     <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
 }
 
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
     <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
     <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
+}
+
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
     <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
 }
 
 ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
+    <name not found> = ArrayList@94[4] { ResolutionCandidate@95, ResolutionCandidate@96, ResolutionCandidate@97, ... }
     <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
 }
 
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[4] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
-    <name not found> = ArrayList@102[5] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
+null {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@102[5] { ResolutionCandidate@95, ResolutionCandidate@96, ResolutionCandidate@97, ... }
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeDifferentExamples.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeDifferentExamples.lazy.log
index 174bb4451f7..e03e667f78e 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeDifferentExamples.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeDifferentExamples.lazy.log
@@ -52,21 +52,21 @@ LazyJavaClassifierType@28['String'] {
 
 LazyJavaClassifierType@31['String'] {
     arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@27['String']
+    classifier = JavaClassImpl@30['String']
     nullable = 'true': Boolean@33
     typeConstructor = DeserializedClassTypeConstructor@24
 }
 
 LazyJavaClassifierType@34['String'] {
     arguments = ArrayList@35[empty]
-    classifier = JavaClassImpl@22['String']
+    classifier = JavaClassImpl@27['String']
     nullable = 'true': Boolean@33
     typeConstructor = DeserializedClassTypeConstructor@24
 }
 
 LazyJavaClassifierType@36['String'] {
     arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@30['String']
+    classifier = JavaClassImpl@22['String']
     nullable = 'true': Boolean@33
     typeConstructor = DeserializedClassTypeConstructor@24
 }
@@ -94,21 +94,21 @@ LazyJavaClassifierType@45['Throwable'] {
 
 LazyJavaClassifierType@48['Throwable'] {
     arguments = ArrayList@49[empty]
-    classifier = JavaClassImpl@44['Throwable']
+    classifier = JavaClassImpl@47['Throwable']
     nullable = 'true': Boolean@33
     typeConstructor = DeserializedClassTypeConstructor@41
 }
 
 LazyJavaClassifierType@50['Throwable'] {
     arguments = ArrayList@51[empty]
-    classifier = JavaClassImpl@47['Throwable']
+    classifier = JavaClassImpl@40['Throwable']
     nullable = 'true': Boolean@33
     typeConstructor = DeserializedClassTypeConstructor@41
 }
 
 LazyJavaClassifierType@52['Throwable'] {
     arguments = ArrayList@53[empty]
-    classifier = JavaClassImpl@40['Throwable']
+    classifier = JavaClassImpl@44['Throwable']
     nullable = 'true': Boolean@33
     typeConstructor = DeserializedClassTypeConstructor@41
 }
@@ -181,168 +181,129 @@ LazyJavaPackageFragment@67['lang'] {
 
 ResolutionTaskHolder@101 {
     <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
+    <name not found> = EmptyList@92[empty]
+}
+
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
     <name not found> = EmptyList@92[empty]
     <name not found> = EmptyList@92[empty]
 }
 
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
     <name not found> = EmptyList@92[empty]
     <name not found> = EmptyList@92[empty]
 }
 
 ResolutionTaskHolder@112 {
     <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
 }
 
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
+ResolutionTaskHolder@115 {
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
 }
 
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
+ResolutionTaskHolder@118 {
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
+}
+
+ResolutionTaskHolder@121 {
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
 }
 
 ResolutionTaskHolder@124 {
     <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@126 }
 }
 
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
+ResolutionTaskHolder@127 {
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
 }
 
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
+ResolutionTaskHolder@130 {
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
+}
+
+ResolutionTaskHolder@133 {
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
 }
 
 ResolutionTaskHolder@136 {
     <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
 }
 
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
+ResolutionTaskHolder@139 {
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
 }
 
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
+ResolutionTaskHolder@142 {
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
+}
+
+ResolutionTaskHolder@145 {
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
 }
 
 ResolutionTaskHolder@148 {
     <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
 }
 
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
+ResolutionTaskHolder@151 {
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
 }
 
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
+ResolutionTaskHolder@154 {
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
+}
+
+ResolutionTaskHolder@157 {
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
 }
 
 ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@162 }
+    <name not found> = ArrayList@161[4] { ResolutionCandidate@162, ResolutionCandidate@163, ResolutionCandidate@164, ... }
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
 }
 
-ResolutionTaskHolder@164 {
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@166 }
+ResolutionTaskHolder@165 {
+    <name not found> = ArrayList@166[7] { ResolutionCandidate@167, ResolutionCandidate@168, ResolutionCandidate@169, ... }
 }
 
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@170 }
+ResolutionTaskHolder@170 {
+    <name not found> = ArrayList@171[7] { ResolutionCandidate@172, ResolutionCandidate@173, ResolutionCandidate@174, ... }
 }
 
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@174 }
-}
-
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@178 }
+ResolutionTaskHolder@175 {
+    <name not found> = ArrayList@176[7] { ResolutionCandidate@177, ResolutionCandidate@178, ResolutionCandidate@179, ... }
 }
 
 ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[4] { ResolutionCandidate@182, ResolutionCandidate@183, ResolutionCandidate@184, ... }
-    <name not found> = ArrayList@185[5] { ResolutionCandidate@182, ResolutionCandidate@183, ResolutionCandidate@184, ... }
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
+    <name not found> = ArrayList@181[7] { ResolutionCandidate@182, ResolutionCandidate@183, ResolutionCandidate@184, ... }
 }
 
-ResolutionTaskHolder@186 {
-    <name not found> = ArrayList@187[7] { ResolutionCandidate@188, ResolutionCandidate@189, ResolutionCandidate@190, ... }
-    <name not found> = ArrayList@191[7] { ResolutionCandidate@188, ResolutionCandidate@189, ResolutionCandidate@190, ... }
+ResolutionTaskHolder@185 {
+    <name not found> = ArrayList@186[7] { ResolutionCandidate@187, ResolutionCandidate@188, ResolutionCandidate@189, ... }
 }
 
-ResolutionTaskHolder@192 {
-    <name not found> = ArrayList@193[7] { ResolutionCandidate@194, ResolutionCandidate@195, ResolutionCandidate@196, ... }
-    <name not found> = ArrayList@197[7] { ResolutionCandidate@194, ResolutionCandidate@195, ResolutionCandidate@196, ... }
+ResolutionTaskHolder@190 {
+    <name not found> = ArrayList@191[7] { ResolutionCandidate@192, ResolutionCandidate@193, ResolutionCandidate@194, ... }
 }
 
-ResolutionTaskHolder@198 {
-    <name not found> = ArrayList@199[7] { ResolutionCandidate@200, ResolutionCandidate@201, ResolutionCandidate@202, ... }
-    <name not found> = ArrayList@203[7] { ResolutionCandidate@200, ResolutionCandidate@201, ResolutionCandidate@202, ... }
+ResolutionTaskHolder@195 {
+    <name not found> = ArrayList@196[7] { ResolutionCandidate@197, ResolutionCandidate@198, ResolutionCandidate@199, ... }
 }
 
-ResolutionTaskHolder@204 {
-    <name not found> = ArrayList@205[7] { ResolutionCandidate@206, ResolutionCandidate@207, ResolutionCandidate@208, ... }
-    <name not found> = ArrayList@209[7] { ResolutionCandidate@206, ResolutionCandidate@207, ResolutionCandidate@208, ... }
+ResolutionTaskHolder@200 {
+    <name not found> = ArrayList@201[7] { ResolutionCandidate@202, ResolutionCandidate@203, ResolutionCandidate@204, ... }
+}
+
+ResolutionTaskHolder@205 {
+    <name not found> = ArrayList@206[7] { ResolutionCandidate@207, ResolutionCandidate@208, ResolutionCandidate@209, ... }
 }
 
 ResolutionTaskHolder@210 {
-    <name not found> = ArrayList@211[7] { ResolutionCandidate@212, ResolutionCandidate@213, ResolutionCandidate@214, ... }
-    <name not found> = ArrayList@215[7] { ResolutionCandidate@212, ResolutionCandidate@213, ResolutionCandidate@214, ... }
-}
-
-ResolutionTaskHolder@216 {
-    <name not found> = ArrayList@217[7] { ResolutionCandidate@218, ResolutionCandidate@219, ResolutionCandidate@220, ... }
-    <name not found> = ArrayList@221[7] { ResolutionCandidate@218, ResolutionCandidate@219, ResolutionCandidate@220, ... }
-}
-
-ResolutionTaskHolder@222 {
-    <name not found> = ArrayList@223[7] { ResolutionCandidate@224, ResolutionCandidate@225, ResolutionCandidate@226, ... }
-    <name not found> = ArrayList@227[7] { ResolutionCandidate@224, ResolutionCandidate@225, ResolutionCandidate@226, ... }
-}
-
-ResolutionTaskHolder@228 {
-    <name not found> = ArrayList@229[7] { ResolutionCandidate@230, ResolutionCandidate@231, ResolutionCandidate@232, ... }
-    <name not found> = ArrayList@233[7] { ResolutionCandidate@230, ResolutionCandidate@231, ResolutionCandidate@232, ... }
-}
-
-ResolutionTaskHolder@234 {
-    <name not found> = ArrayList@235[7] { ResolutionCandidate@236, ResolutionCandidate@237, ResolutionCandidate@238, ... }
-    <name not found> = ArrayList@239[7] { ResolutionCandidate@236, ResolutionCandidate@237, ResolutionCandidate@238, ... }
-}
-
-ResolutionTaskHolder@240 {
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
     <name not found> = EmptyList@92[empty]
     <name not found> = EmptyList@92[empty]
     <name not found> = EmptyList@92[empty]
@@ -353,7 +314,49 @@ ResolutionTaskHolder@240 {
     <name not found> = EmptyList@92[empty]
 }
 
-ResolutionTaskHolder@241 {
+ResolutionTaskHolder@211 {
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+}
+
+null {
+    <name not found> = ArrayList@212[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@213[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@214[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@215[1] { ResolutionCandidate@129 }
+    <name not found> = ArrayList@216[1] { ResolutionCandidate@141 }
+    <name not found> = ArrayList@217[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@218[1] { ResolutionCandidate@132 }
+    <name not found> = ArrayList@219[1] { ResolutionCandidate@156 }
+    <name not found> = ArrayList@220[1] { ResolutionCandidate@135 }
+    <name not found> = ArrayList@221[1] { ResolutionCandidate@126 }
+    <name not found> = ArrayList@222[1] { ResolutionCandidate@159 }
+    <name not found> = ArrayList@223[1] { ResolutionCandidate@153 }
+    <name not found> = ArrayList@224[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@225[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@226[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@228[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@231[1] { ResolutionCandidate@147 }
+    <name not found> = ArrayList@232[5] { ResolutionCandidate@162, ResolutionCandidate@163, ResolutionCandidate@164, ... }
+    <name not found> = ArrayList@233[7] { ResolutionCandidate@177, ResolutionCandidate@178, ResolutionCandidate@179, ... }
+    <name not found> = ArrayList@234[7] { ResolutionCandidate@182, ResolutionCandidate@183, ResolutionCandidate@184, ... }
+    <name not found> = ArrayList@235[7] { ResolutionCandidate@187, ResolutionCandidate@188, ResolutionCandidate@189, ... }
+    <name not found> = ArrayList@236[7] { ResolutionCandidate@207, ResolutionCandidate@208, ResolutionCandidate@209, ... }
+    <name not found> = ArrayList@237[7] { ResolutionCandidate@167, ResolutionCandidate@168, ResolutionCandidate@169, ... }
+    <name not found> = ArrayList@238[7] { ResolutionCandidate@197, ResolutionCandidate@198, ResolutionCandidate@199, ... }
+    <name not found> = ArrayList@239[7] { ResolutionCandidate@202, ResolutionCandidate@203, ResolutionCandidate@204, ... }
+    <name not found> = ArrayList@240[7] { ResolutionCandidate@172, ResolutionCandidate@173, ResolutionCandidate@174, ... }
+    <name not found> = ArrayList@241[7] { ResolutionCandidate@192, ResolutionCandidate@193, ResolutionCandidate@194, ... }
+    <name not found> = EmptyList@92[empty]
     <name not found> = EmptyList@92[empty]
     <name not found> = EmptyList@92[empty]
     <name not found> = EmptyList@92[empty]
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeFromDifferentSources.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeFromDifferentSources.lazy.log
index 99148f43037..0dfa926c15a 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeFromDifferentSources.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeFromDifferentSources.lazy.log
@@ -79,7 +79,7 @@ LazyJavaClassifierType@38['Throwable'] {
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@37['Throwable']
+    classifier = JavaClassImpl@33['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -93,7 +93,7 @@ LazyJavaClassifierType@43['Throwable'] {
 
 LazyJavaClassifierType@45['Throwable'] {
     arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@33['Throwable']
+    classifier = JavaClassImpl@37['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -141,59 +141,62 @@ LazyJavaPackageFragment@60['lang'] {
 
 ResolutionTaskHolder@79 {
     <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
 }
 
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
     <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
 }
 
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
+}
+
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
 }
 
 ResolutionTaskHolder@91 {
     <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
 }
 
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
 }
 
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
+}
+
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
 }
 
 ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@104[4] { ResolutionCandidate@105, ResolutionCandidate@106, ResolutionCandidate@107, ... }
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
 }
 
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[4] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
-    <name not found> = ArrayList@116[5] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
+null {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@116[5] { ResolutionCandidate@105, ResolutionCandidate@106, ResolutionCandidate@107, ... }
     <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInArrayAccess.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInArrayAccess.lazy.log
index a14666ed4a4..b3c2d2da062 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInArrayAccess.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInArrayAccess.lazy.log
@@ -37,21 +37,21 @@ LazyJavaClassifierType@21['String'] {
 
 LazyJavaClassifierType@24['String'] {
     arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@23['String']
+    classifier = JavaClassImpl@15['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@20['String']
+    classifier = JavaClassImpl@23['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@29['String'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@15['String']
+    classifier = JavaClassImpl@20['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -79,7 +79,7 @@ LazyJavaClassifierType@38['Throwable'] {
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@33['Throwable']
+    classifier = JavaClassImpl@37['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -93,7 +93,7 @@ LazyJavaClassifierType@43['Throwable'] {
 
 LazyJavaClassifierType@45['Throwable'] {
     arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@37['Throwable']
+    classifier = JavaClassImpl@33['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -177,12 +177,6 @@ LazyJavaPackageFragment@60['lang'] {
 
 ResolutionTaskHolder@96 {
     <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
     <name not found> = EmptyList@88[empty]
     <name not found> = EmptyList@88[empty]
     <name not found> = EmptyList@88[empty]
@@ -208,185 +202,194 @@ ResolutionTaskHolder@96 {
     <name not found> = EmptyList@88[empty]
 }
 
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
     <name not found> = EmptyList@88[empty]
     <name not found> = EmptyList@88[empty]
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
     <name not found> = EmptyList@88[empty]
     <name not found> = EmptyList@88[empty]
+}
+
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
     <name not found> = EmptyList@88[empty]
     <name not found> = EmptyList@88[empty]
 }
 
 ResolutionTaskHolder@108 {
     <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
     <name not found> = EmptyList@88[empty]
     <name not found> = EmptyList@88[empty]
 }
 
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
+ResolutionTaskHolder@111 {
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
     <name not found> = EmptyList@88[empty]
     <name not found> = EmptyList@88[empty]
 }
 
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
     <name not found> = EmptyList@88[empty]
     <name not found> = EmptyList@88[empty]
+}
+
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
     <name not found> = EmptyList@88[empty]
     <name not found> = EmptyList@88[empty]
 }
 
 ResolutionTaskHolder@120 {
     <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
     <name not found> = EmptyList@88[empty]
     <name not found> = EmptyList@88[empty]
 }
 
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@126 }
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
+ResolutionTaskHolder@123 {
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
     <name not found> = EmptyList@88[empty]
     <name not found> = EmptyList@88[empty]
 }
 
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
+ResolutionTaskHolder@126 {
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
     <name not found> = EmptyList@88[empty]
     <name not found> = EmptyList@88[empty]
+}
+
+ResolutionTaskHolder@129 {
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
     <name not found> = EmptyList@88[empty]
     <name not found> = EmptyList@88[empty]
 }
 
 ResolutionTaskHolder@132 {
     <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
     <name not found> = EmptyList@88[empty]
     <name not found> = EmptyList@88[empty]
 }
 
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
+ResolutionTaskHolder@135 {
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
     <name not found> = EmptyList@88[empty]
     <name not found> = EmptyList@88[empty]
 }
 
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
+ResolutionTaskHolder@138 {
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
     <name not found> = EmptyList@88[empty]
     <name not found> = EmptyList@88[empty]
 }
 
+ResolutionTaskHolder@141 {
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
+}
+
 ResolutionTaskHolder@144 {
     <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
 }
 
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
+ResolutionTaskHolder@147 {
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
 }
 
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
+ResolutionTaskHolder@150 {
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
+}
+
+ResolutionTaskHolder@153 {
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
 }
 
 ResolutionTaskHolder@156 {
     <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
 }
 
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@162 }
+ResolutionTaskHolder@159 {
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
 }
 
-ResolutionTaskHolder@164 {
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@166 }
+ResolutionTaskHolder@162 {
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
+}
+
+ResolutionTaskHolder@165 {
+    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
 }
 
 ResolutionTaskHolder@168 {
     <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@170 }
 }
 
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@174 }
+ResolutionTaskHolder@171 {
+    <name not found> = ArrayList@172[4] { ResolutionCandidate@173, ResolutionCandidate@174, ResolutionCandidate@175, ... }
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
 }
 
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@178 }
-}
-
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@182 }
-}
-
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@186 }
-}
-
-ResolutionTaskHolder@188 {
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@190 }
-}
-
-ResolutionTaskHolder@192 {
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@194 }
-}
-
-ResolutionTaskHolder@196 {
-    <name not found> = ArrayList@197[4] { ResolutionCandidate@198, ResolutionCandidate@199, ResolutionCandidate@200, ... }
-    <name not found> = ArrayList@201[5] { ResolutionCandidate@198, ResolutionCandidate@199, ResolutionCandidate@200, ... }
+null {
+    <name not found> = ArrayList@176[1] { ResolutionCandidate@161 }
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@167 }
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@134 }
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@137 }
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@125 }
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@143 }
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@152 }
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@122 }
+    <name not found> = ArrayList@189[1] { ResolutionCandidate@149 }
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@170 }
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@128 }
+    <name not found> = ArrayList@192[1] { ResolutionCandidate@155 }
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@194[1] { ResolutionCandidate@140 }
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@164 }
+    <name not found> = ArrayList@196[1] { ResolutionCandidate@146 }
+    <name not found> = ArrayList@197[1] { ResolutionCandidate@131 }
+    <name not found> = ArrayList@198[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@113 }
+    <name not found> = ArrayList@200[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@201[5] { ResolutionCandidate@173, ResolutionCandidate@174, ResolutionCandidate@175, ... }
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
     <name not found> = EmptyList@88[empty]
     <name not found> = EmptyList@88[empty]
     <name not found> = EmptyList@88[empty]
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInAssignment.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInAssignment.lazy.log
index 5f0f5002a8d..76bf72b8560 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInAssignment.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInAssignment.lazy.log
@@ -37,21 +37,21 @@ LazyJavaClassifierType@21['String'] {
 
 LazyJavaClassifierType@24['String'] {
     arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@20['String']
+    classifier = JavaClassImpl@15['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@15['String']
+    classifier = JavaClassImpl@23['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@29['String'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@23['String']
+    classifier = JavaClassImpl@20['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -149,69 +149,72 @@ LazyJavaPackageFragment@56['lang'] {
 
 ResolutionTaskHolder@77 {
     <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]
 }
 
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
     <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]
 }
 
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
     <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]
+}
+
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
     <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]
 }
 
 ResolutionTaskHolder@89 {
     <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
+}
+
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
+}
+
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[4] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102, ... }
     <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]
 }
 
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[8] { ResolutionCandidate@105, ResolutionCandidate@106, ResolutionCandidate@107, ... }
 }
 
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[4] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
-    <name not found> = ArrayList@110[5] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
+null {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@115[5] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102, ... }
+    <name not found> = ArrayList@116[8] { ResolutionCandidate@105, ResolutionCandidate@106, ResolutionCandidate@107, ... }
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]
 }
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[8] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
-    <name not found> = ArrayList@116[8] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInBinaryExpressions.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInBinaryExpressions.lazy.log
index 6b9f80337fd..f609c194ca6 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInBinaryExpressions.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInBinaryExpressions.lazy.log
@@ -37,14 +37,14 @@ LazyJavaClassifierType@21['String'] {
 
 LazyJavaClassifierType@24['String'] {
     arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@15['String']
+    classifier = JavaClassImpl@23['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@23['String']
+    classifier = JavaClassImpl@15['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -161,118 +161,121 @@ LazyJavaPackageFragment@58['lang'] {
 
 ResolutionTaskHolder@86 {
     <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
     <name not found> = EmptyList@78[empty]
     <name not found> = EmptyList@78[empty]
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
     <name not found> = EmptyList@78[empty]
     <name not found> = EmptyList@78[empty]
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
     <name not found> = EmptyList@78[empty]
     <name not found> = EmptyList@78[empty]
+}
+
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
     <name not found> = EmptyList@78[empty]
     <name not found> = EmptyList@78[empty]
 }
 
 ResolutionTaskHolder@98 {
     <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
     <name not found> = EmptyList@78[empty]
     <name not found> = EmptyList@78[empty]
 }
 
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
     <name not found> = EmptyList@78[empty]
     <name not found> = EmptyList@78[empty]
 }
 
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
     <name not found> = EmptyList@78[empty]
     <name not found> = EmptyList@78[empty]
+}
+
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
     <name not found> = EmptyList@78[empty]
     <name not found> = EmptyList@78[empty]
 }
 
 ResolutionTaskHolder@110 {
     <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
     <name not found> = EmptyList@78[empty]
     <name not found> = EmptyList@78[empty]
 }
 
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
+ResolutionTaskHolder@113 {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
 }
 
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
+}
+
+ResolutionTaskHolder@119 {
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
 }
 
 ResolutionTaskHolder@122 {
     <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
 }
 
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
+ResolutionTaskHolder@125 {
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
 }
 
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@132 }
+ResolutionTaskHolder@128 {
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
 }
 
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@136 }
+ResolutionTaskHolder@131 {
+    <name not found> = ArrayList@132[4] { ResolutionCandidate@133, ResolutionCandidate@134, ResolutionCandidate@135, ... }
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
 }
 
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@140 }
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@144 }
-}
-
-ResolutionTaskHolder@146 {
-    <name not found> = ArrayList@147[4] { ResolutionCandidate@148, ResolutionCandidate@149, ResolutionCandidate@150, ... }
-    <name not found> = ArrayList@151[5] { ResolutionCandidate@148, ResolutionCandidate@149, ResolutionCandidate@150, ... }
+null {
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@124 }
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@127 }
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@151[5] { ResolutionCandidate@133, ResolutionCandidate@134, ResolutionCandidate@135, ... }
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
     <name not found> = EmptyList@78[empty]
     <name not found> = EmptyList@78[empty]
     <name not found> = EmptyList@78[empty]
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInCalls.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInCalls.lazy.log
index b12cad2a64d..d28ac6e57c6 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInCalls.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInCalls.lazy.log
@@ -37,21 +37,21 @@ LazyJavaClassifierType@21['String'] {
 
 LazyJavaClassifierType@24['String'] {
     arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@20['String']
+    classifier = JavaClassImpl@15['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@23['String']
+    classifier = JavaClassImpl@20['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@29['String'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@15['String']
+    classifier = JavaClassImpl@23['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -86,14 +86,14 @@ LazyJavaClassifierType@41['Throwable'] {
 
 LazyJavaClassifierType@43['Throwable'] {
     arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@33['Throwable']
+    classifier = JavaClassImpl@40['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@45['Throwable'] {
     arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@40['Throwable']
+    classifier = JavaClassImpl@33['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -165,42 +165,45 @@ LazyJavaPackageFragment@59['lang'] {
 
 ResolutionTaskHolder@90 {
     <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
 }
 
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
-    <name not found> = EmptyList@82[empty]
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
     <name not found> = EmptyList@82[empty]
 }
 
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
+}
+
 ResolutionTaskHolder@102 {
     <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
 }
 
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[4] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
 }
 
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[4] { ResolutionCandidate@112, ResolutionCandidate@113, ResolutionCandidate@114, ... }
-    <name not found> = ArrayList@115[5] { ResolutionCandidate@112, ResolutionCandidate@113, ResolutionCandidate@114, ... }
+null {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@115[5] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInDeadCode.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInDeadCode.lazy.log
index 547abb9cf0c..472a4f7983c 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInDeadCode.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInDeadCode.lazy.log
@@ -37,21 +37,21 @@ LazyJavaClassifierType@21['String'] {
 
 LazyJavaClassifierType@24['String'] {
     arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@15['String']
+    classifier = JavaClassImpl@20['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@20['String']
+    classifier = JavaClassImpl@23['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@29['String'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@23['String']
+    classifier = JavaClassImpl@15['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -79,14 +79,14 @@ LazyJavaClassifierType@38['Throwable'] {
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@33['Throwable']
+    classifier = JavaClassImpl@37['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@43['Throwable'] {
     arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@37['Throwable']
+    classifier = JavaClassImpl@33['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -153,62 +153,65 @@ LazyJavaPackageFragment@57['lang'] {
 
 ResolutionTaskHolder@81 {
     <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
 }
 
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
     <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
     <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
+}
+
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
     <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
 }
 
 ResolutionTaskHolder@93 {
     <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
 }
 
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
+}
+
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
+}
+
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[4] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
     <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
 }
 
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[4] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113, ... }
-    <name not found> = ArrayList@114[5] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113, ... }
+null {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@114[5] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInIf.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInIf.lazy.log
index f8dfe531985..53280e3313d 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInIf.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInIf.lazy.log
@@ -37,7 +37,7 @@ LazyJavaClassifierType@21['String'] {
 
 LazyJavaClassifierType@24['String'] {
     arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@15['String']
+    classifier = JavaClassImpl@20['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -51,7 +51,7 @@ LazyJavaClassifierType@27['String'] {
 
 LazyJavaClassifierType@29['String'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@20['String']
+    classifier = JavaClassImpl@15['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -79,7 +79,7 @@ LazyJavaClassifierType@38['Throwable'] {
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@37['Throwable']
+    classifier = JavaClassImpl@33['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -93,7 +93,7 @@ LazyJavaClassifierType@43['Throwable'] {
 
 LazyJavaClassifierType@45['Throwable'] {
     arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@33['Throwable']
+    classifier = JavaClassImpl@37['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -149,49 +149,52 @@ LazyJavaPackageFragment@56['lang'] {
 
 ResolutionTaskHolder@77 {
     <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]
 }
 
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
     <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]
 }
 
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
     <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]
 }
 
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
+}
+
 ResolutionTaskHolder@89 {
     <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
 }
 
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[4] { ResolutionCandidate@97, ResolutionCandidate@98, ResolutionCandidate@99, ... }
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
 }
 
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[4] { ResolutionCandidate@103, ResolutionCandidate@104, ResolutionCandidate@105, ... }
-    <name not found> = ArrayList@106[5] { ResolutionCandidate@103, ResolutionCandidate@104, ResolutionCandidate@105, ... }
+null {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@106[5] { ResolutionCandidate@97, ResolutionCandidate@98, ResolutionCandidate@99, ... }
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInInnerExpressions.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInInnerExpressions.lazy.log
index db097a0afbc..d8baa42d40d 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInInnerExpressions.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInInnerExpressions.lazy.log
@@ -44,14 +44,14 @@ LazyJavaClassifierType@24['String'] {
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@23['String']
+    classifier = JavaClassImpl@15['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@29['String'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@15['String']
+    classifier = JavaClassImpl@23['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -79,21 +79,21 @@ LazyJavaClassifierType@38['Throwable'] {
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@40['Throwable']
+    classifier = JavaClassImpl@33['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@43['Throwable'] {
     arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@33['Throwable']
+    classifier = JavaClassImpl@37['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@45['Throwable'] {
     arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@37['Throwable']
+    classifier = JavaClassImpl@40['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -165,61 +165,38 @@ LazyJavaPackageFragment@59['lang'] {
 
 ResolutionTaskHolder@90 {
     <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
 }
 
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
+}
+
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
 }
 
 ResolutionTaskHolder@102 {
     <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
 }
 
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
 }
 
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[4] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
-    <name not found> = ArrayList@119[5] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[4] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
@@ -230,9 +207,35 @@ ResolutionTaskHolder@114 {
     <name not found> = EmptyList@82[empty]
 }
 
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[4] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
-    <name not found> = ArrayList@125[5] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
+ResolutionTaskHolder@113 {
+    <name not found> = ArrayList@114[4] { ResolutionCandidate@115, ResolutionCandidate@116, ResolutionCandidate@117, ... }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+}
+
+null {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@124[5] { ResolutionCandidate@115, ResolutionCandidate@116, ResolutionCandidate@117, ... }
+    <name not found> = ArrayList@125[5] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInLocalDeclarations.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInLocalDeclarations.lazy.log
index 95f67b9a600..1e797db3f74 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInLocalDeclarations.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInLocalDeclarations.lazy.log
@@ -61,21 +61,21 @@ LazyJavaClassifierType@31['String'] {
 
 LazyJavaClassifierType@34['String'] {
     arguments = ArrayList@35[empty]
-    classifier = JavaClassImpl@25['String']
+    classifier = JavaClassImpl@30['String']
     nullable = 'true': Boolean@36
     typeConstructor = DeserializedClassTypeConstructor@27
 }
 
 LazyJavaClassifierType@37['String'] {
     arguments = ArrayList@38[empty]
-    classifier = JavaClassImpl@30['String']
+    classifier = JavaClassImpl@33['String']
     nullable = 'true': Boolean@36
     typeConstructor = DeserializedClassTypeConstructor@27
 }
 
 LazyJavaClassifierType@39['String'] {
     arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@33['String']
+    classifier = JavaClassImpl@25['String']
     nullable = 'true': Boolean@36
     typeConstructor = DeserializedClassTypeConstructor@27
 }
@@ -103,21 +103,21 @@ LazyJavaClassifierType@48['Throwable'] {
 
 LazyJavaClassifierType@51['Throwable'] {
     arguments = ArrayList@52[empty]
-    classifier = JavaClassImpl@50['Throwable']
+    classifier = JavaClassImpl@43['Throwable']
     nullable = 'true': Boolean@36
     typeConstructor = DeserializedClassTypeConstructor@44
 }
 
 LazyJavaClassifierType@53['Throwable'] {
     arguments = ArrayList@54[empty]
-    classifier = JavaClassImpl@43['Throwable']
+    classifier = JavaClassImpl@47['Throwable']
     nullable = 'true': Boolean@36
     typeConstructor = DeserializedClassTypeConstructor@44
 }
 
 LazyJavaClassifierType@55['Throwable'] {
     arguments = ArrayList@56[empty]
-    classifier = JavaClassImpl@47['Throwable']
+    classifier = JavaClassImpl@50['Throwable']
     nullable = 'true': Boolean@36
     typeConstructor = DeserializedClassTypeConstructor@44
 }
@@ -180,95 +180,98 @@ LazyJavaPackageFragment@68['lang'] {
 
 ResolutionTaskHolder@94 {
     <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
     <name not found> = EmptyList@86[empty]
     <name not found> = EmptyList@86[empty]
 }
 
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
     <name not found> = EmptyList@86[empty]
     <name not found> = EmptyList@86[empty]
 }
 
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
     <name not found> = EmptyList@86[empty]
     <name not found> = EmptyList@86[empty]
+}
+
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
     <name not found> = EmptyList@86[empty]
     <name not found> = EmptyList@86[empty]
 }
 
 ResolutionTaskHolder@106 {
     <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
     <name not found> = EmptyList@86[empty]
     <name not found> = EmptyList@86[empty]
 }
 
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
     <name not found> = EmptyList@86[empty]
     <name not found> = EmptyList@86[empty]
 }
 
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
     <name not found> = EmptyList@86[empty]
     <name not found> = EmptyList@86[empty]
 }
 
+ResolutionTaskHolder@115 {
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
+}
+
 ResolutionTaskHolder@118 {
     <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
 }
 
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
+ResolutionTaskHolder@121 {
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
 }
 
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
+ResolutionTaskHolder@124 {
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
+}
+
+ResolutionTaskHolder@127 {
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
 }
 
 ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@132 }
+    <name not found> = ArrayList@131[4] { ResolutionCandidate@132, ResolutionCandidate@133, ResolutionCandidate@134, ... }
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
 }
 
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@136 }
-}
-
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@140 }
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[4] { ResolutionCandidate@144, ResolutionCandidate@145, ResolutionCandidate@146, ... }
-    <name not found> = ArrayList@147[5] { ResolutionCandidate@144, ResolutionCandidate@145, ResolutionCandidate@146, ... }
+null {
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@126 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@129 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@147[5] { ResolutionCandidate@132, ResolutionCandidate@133, ResolutionCandidate@134, ... }
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
     <name not found> = EmptyList@86[empty]
     <name not found> = EmptyList@86[empty]
     <name not found> = EmptyList@86[empty]
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInLoops.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInLoops.lazy.log
index 49f6cca8328..fa8e93eec90 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInLoops.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInLoops.lazy.log
@@ -45,14 +45,14 @@ LazyJavaClassifierType@25['String'] {
 
 LazyJavaClassifierType@28['String'] {
     arguments = ArrayList@29[empty]
-    classifier = JavaClassImpl@24['String']
+    classifier = JavaClassImpl@21['String']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@18
 }
 
 LazyJavaClassifierType@30['String'] {
     arguments = ArrayList@31[empty]
-    classifier = JavaClassImpl@21['String']
+    classifier = JavaClassImpl@24['String']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@18
 }
@@ -80,21 +80,21 @@ LazyJavaClassifierType@39['Throwable'] {
 
 LazyJavaClassifierType@42['Throwable'] {
     arguments = ArrayList@43[empty]
-    classifier = JavaClassImpl@41['Throwable']
+    classifier = JavaClassImpl@38['Throwable']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@35
 }
 
 LazyJavaClassifierType@44['Throwable'] {
     arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@38['Throwable']
+    classifier = JavaClassImpl@34['Throwable']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@35
 }
 
 LazyJavaClassifierType@46['Throwable'] {
     arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@34['Throwable']
+    classifier = JavaClassImpl@41['Throwable']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@35
 }
@@ -154,74 +154,77 @@ LazyJavaPackageFragment@57['lang'] {
 
 ResolutionTaskHolder@79 {
     <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
+}
+
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
 }
 
 ResolutionTaskHolder@91 {
     <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
 }
 
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
+}
+
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
 }
 
 ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[4] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
-    <name not found> = ArrayList@116[5] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
+    <name not found> = ArrayList@104[4] { ResolutionCandidate@105, ResolutionCandidate@106, ResolutionCandidate@107, ... }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[7] { ResolutionCandidate@119, ResolutionCandidate@120, ResolutionCandidate@121, ... }
-    <name not found> = ArrayList@122[7] { ResolutionCandidate@119, ResolutionCandidate@120, ResolutionCandidate@121, ... }
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[7] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
+}
+
+null {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@121[5] { ResolutionCandidate@105, ResolutionCandidate@106, ResolutionCandidate@107, ... }
+    <name not found> = ArrayList@122[7] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInReturn.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInReturn.lazy.log
index f67832ebf63..98184857aad 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInReturn.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInReturn.lazy.log
@@ -37,21 +37,21 @@ LazyJavaClassifierType@21['String'] {
 
 LazyJavaClassifierType@24['String'] {
     arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@15['String']
+    classifier = JavaClassImpl@20['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@20['String']
+    classifier = JavaClassImpl@23['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@29['String'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@23['String']
+    classifier = JavaClassImpl@15['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -79,7 +79,7 @@ LazyJavaClassifierType@38['Throwable'] {
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@33['Throwable']
+    classifier = JavaClassImpl@37['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -93,7 +93,7 @@ LazyJavaClassifierType@43['Throwable'] {
 
 LazyJavaClassifierType@45['Throwable'] {
     arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@37['Throwable']
+    classifier = JavaClassImpl@33['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -141,16 +141,19 @@ LazyJavaPackageFragment@55['lang'] {
 
 ResolutionTaskHolder@72 {
     <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
 }
 
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[4] { ResolutionCandidate@78, ResolutionCandidate@79, ResolutionCandidate@80, ... }
-    <name not found> = ArrayList@81[5] { ResolutionCandidate@78, ResolutionCandidate@79, ResolutionCandidate@80, ... }
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[4] { ResolutionCandidate@77, ResolutionCandidate@78, ResolutionCandidate@79, ... }
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+}
+
+null {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@81[5] { ResolutionCandidate@77, ResolutionCandidate@78, ResolutionCandidate@79, ... }
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInUnaryExpr.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInUnaryExpr.lazy.log
index d731832a7d2..d96dce3dd16 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInUnaryExpr.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInUnaryExpr.lazy.log
@@ -37,7 +37,7 @@ LazyJavaClassifierType@21['String'] {
 
 LazyJavaClassifierType@24['String'] {
     arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@23['String']
+    classifier = JavaClassImpl@20['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -51,7 +51,7 @@ LazyJavaClassifierType@27['String'] {
 
 LazyJavaClassifierType@29['String'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@20['String']
+    classifier = JavaClassImpl@23['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -79,21 +79,21 @@ LazyJavaClassifierType@38['Throwable'] {
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@37['Throwable']
+    classifier = JavaClassImpl@40['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@43['Throwable'] {
     arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@40['Throwable']
+    classifier = JavaClassImpl@33['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@45['Throwable'] {
     arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@33['Throwable']
+    classifier = JavaClassImpl@37['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -157,53 +157,56 @@ LazyJavaPackageFragment@57['lang'] {
 
 ResolutionTaskHolder@82 {
     <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
     <name not found> = EmptyList@74[empty]
     <name not found> = EmptyList@74[empty]
 }
 
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
     <name not found> = EmptyList@74[empty]
     <name not found> = EmptyList@74[empty]
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
     <name not found> = EmptyList@74[empty]
     <name not found> = EmptyList@74[empty]
+}
+
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
     <name not found> = EmptyList@74[empty]
     <name not found> = EmptyList@74[empty]
 }
 
 ResolutionTaskHolder@94 {
     <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
+}
+
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
+}
+
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[4] { ResolutionCandidate@102, ResolutionCandidate@103, ResolutionCandidate@104, ... }
     <name not found> = EmptyList@74[empty]
     <name not found> = EmptyList@74[empty]
 }
 
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[4] { ResolutionCandidate@108, ResolutionCandidate@109, ResolutionCandidate@110, ... }
-    <name not found> = ArrayList@111[5] { ResolutionCandidate@108, ResolutionCandidate@109, ResolutionCandidate@110, ... }
+null {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@111[5] { ResolutionCandidate@102, ResolutionCandidate@103, ResolutionCandidate@104, ... }
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
     <name not found> = EmptyList@74[empty]
     <name not found> = EmptyList@74[empty]
     <name not found> = EmptyList@74[empty]
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInWhileFromBreak.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInWhileFromBreak.lazy.log
index 2eab36a3e85..4ef382a6507 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInWhileFromBreak.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInWhileFromBreak.lazy.log
@@ -46,87 +46,90 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@34 {
     <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+}
+
 ResolutionTaskHolder@46 {
     <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
 }
 
 ResolutionTaskHolder@58 {
     <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[7] { ResolutionCandidate@69, ResolutionCandidate@70, ResolutionCandidate@71, ... }
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[7] { ResolutionCandidate@74, ResolutionCandidate@75, ResolutionCandidate@76, ... }
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[7] { ResolutionCandidate@80, ResolutionCandidate@81, ResolutionCandidate@82, ... }
-    <name not found> = ArrayList@83[7] { ResolutionCandidate@80, ResolutionCandidate@81, ResolutionCandidate@82, ... }
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[7] { ResolutionCandidate@79, ResolutionCandidate@80, ResolutionCandidate@81, ... }
 }
 
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[7] { ResolutionCandidate@86, ResolutionCandidate@87, ResolutionCandidate@88, ... }
-    <name not found> = ArrayList@89[7] { ResolutionCandidate@86, ResolutionCandidate@87, ResolutionCandidate@88, ... }
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[7] { ResolutionCandidate@84, ResolutionCandidate@85, ResolutionCandidate@86, ... }
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[7] { ResolutionCandidate@92, ResolutionCandidate@93, ResolutionCandidate@94, ... }
-    <name not found> = ArrayList@95[7] { ResolutionCandidate@92, ResolutionCandidate@93, ResolutionCandidate@94, ... }
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[7] { ResolutionCandidate@98, ResolutionCandidate@99, ResolutionCandidate@100, ... }
-    <name not found> = ArrayList@101[7] { ResolutionCandidate@98, ResolutionCandidate@99, ResolutionCandidate@100, ... }
+null {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@98[7] { ResolutionCandidate@79, ResolutionCandidate@80, ResolutionCandidate@81, ... }
+    <name not found> = ArrayList@99[7] { ResolutionCandidate@84, ResolutionCandidate@85, ResolutionCandidate@86, ... }
+    <name not found> = ArrayList@100[7] { ResolutionCandidate@69, ResolutionCandidate@70, ResolutionCandidate@71, ... }
+    <name not found> = ArrayList@101[7] { ResolutionCandidate@74, ResolutionCandidate@75, ResolutionCandidate@76, ... }
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/expressionInUnitLiteral.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/expressionInUnitLiteral.lazy.log
index 3170d355f46..e23f7d33861 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/expressionInUnitLiteral.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/expressionInUnitLiteral.lazy.log
@@ -49,21 +49,24 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@37 {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+}
+
+null {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@45 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt2585_1.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt2585_1.lazy.log
index d7ac67f6d5f..9ddc6643886 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt2585_1.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt2585_1.lazy.log
@@ -55,14 +55,14 @@ LazyJavaClassifierType@29['String'] {
 
 LazyJavaClassifierType@32['String'] {
     arguments = ArrayList@33[empty]
-    classifier = JavaClassImpl@28['String']
+    classifier = JavaClassImpl@20['String']
     nullable = 'true': Boolean@31
     typeConstructor = DeserializedClassTypeConstructor@22
 }
 
 LazyJavaClassifierType@34['String'] {
     arguments = ArrayList@35[empty]
-    classifier = JavaClassImpl@20['String']
+    classifier = JavaClassImpl@28['String']
     nullable = 'true': Boolean@31
     typeConstructor = DeserializedClassTypeConstructor@22
 }
@@ -90,7 +90,7 @@ LazyJavaClassifierType@43['Throwable'] {
 
 LazyJavaClassifierType@46['Throwable'] {
     arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@38['Throwable']
+    classifier = JavaClassImpl@42['Throwable']
     nullable = 'true': Boolean@31
     typeConstructor = DeserializedClassTypeConstructor@39
 }
@@ -104,7 +104,7 @@ LazyJavaClassifierType@48['Throwable'] {
 
 LazyJavaClassifierType@50['Throwable'] {
     arguments = ArrayList@51[empty]
-    classifier = JavaClassImpl@42['Throwable']
+    classifier = JavaClassImpl@38['Throwable']
     nullable = 'true': Boolean@31
     typeConstructor = DeserializedClassTypeConstructor@39
 }
@@ -158,14 +158,17 @@ LazyJavaPackageFragment@62['lang'] {
 
 ResolutionTaskHolder@85 {
     <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[4] { ResolutionCandidate@91, ResolutionCandidate@92, ResolutionCandidate@93, ... }
-    <name not found> = ArrayList@94[5] { ResolutionCandidate@91, ResolutionCandidate@92, ResolutionCandidate@93, ... }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[4] { ResolutionCandidate@90, ResolutionCandidate@91, ResolutionCandidate@92, ... }
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+}
+
+null {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@94[5] { ResolutionCandidate@90, ResolutionCandidate@91, ResolutionCandidate@92, ... }
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt2585_2.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt2585_2.lazy.log
index d6a68f8de76..c759f6a1832 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt2585_2.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt2585_2.lazy.log
@@ -52,14 +52,14 @@ LazyJavaClassifierType@28['String'] {
 
 LazyJavaClassifierType@31['String'] {
     arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@27['String']
+    classifier = JavaClassImpl@30['String']
     nullable = 'true': Boolean@33
     typeConstructor = DeserializedClassTypeConstructor@24
 }
 
 LazyJavaClassifierType@34['String'] {
     arguments = ArrayList@35[empty]
-    classifier = JavaClassImpl@30['String']
+    classifier = JavaClassImpl@27['String']
     nullable = 'true': Boolean@33
     typeConstructor = DeserializedClassTypeConstructor@24
 }
@@ -162,25 +162,28 @@ LazyJavaPackageFragment@63['lang'] {
 
 ResolutionTaskHolder@84 {
     <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
-    <name not found> = EmptyList@76[empty]
-    <name not found> = EmptyList@76[empty]
     <name not found> = EmptyList@76[empty]
     <name not found> = EmptyList@76[empty]
 }
 
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[4] { ResolutionCandidate@90, ResolutionCandidate@91, ResolutionCandidate@92, ... }
-    <name not found> = ArrayList@93[5] { ResolutionCandidate@90, ResolutionCandidate@91, ResolutionCandidate@92, ... }
-    <name not found> = EmptyList@76[empty]
-    <name not found> = EmptyList@76[empty]
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[4] { ResolutionCandidate@89, ResolutionCandidate@90, ResolutionCandidate@91, ... }
     <name not found> = EmptyList@76[empty]
     <name not found> = EmptyList@76[empty]
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[4] { ResolutionCandidate@96, ResolutionCandidate@97, ResolutionCandidate@98, ... }
-    <name not found> = ArrayList@99[5] { ResolutionCandidate@96, ResolutionCandidate@97, ResolutionCandidate@98, ... }
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[4] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
+    <name not found> = EmptyList@76[empty]
+    <name not found> = EmptyList@76[empty]
+}
+
+null {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@98[5] { ResolutionCandidate@89, ResolutionCandidate@90, ResolutionCandidate@91, ... }
+    <name not found> = ArrayList@99[5] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
+    <name not found> = EmptyList@76[empty]
+    <name not found> = EmptyList@76[empty]
     <name not found> = EmptyList@76[empty]
     <name not found> = EmptyList@76[empty]
     <name not found> = EmptyList@76[empty]
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt2585_3.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt2585_3.lazy.log
index 9572bb9d2f4..67612418fd8 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt2585_3.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt2585_3.lazy.log
@@ -73,14 +73,14 @@ LazyJavaClassifierType@41['String'] {
 
 LazyJavaClassifierType@44['String'] {
     arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@40['String']
+    classifier = JavaClassImpl@43['String']
     nullable = 'true': Boolean@46
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@47['String'] {
     arguments = ArrayList@48[empty]
-    classifier = JavaClassImpl@43['String']
+    classifier = JavaClassImpl@32['String']
     nullable = 'true': Boolean@46
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -94,7 +94,7 @@ LazyJavaClassifierType@49['String'] {
 
 LazyJavaClassifierType@51['String'] {
     arguments = ArrayList@52[empty]
-    classifier = JavaClassImpl@32['String']
+    classifier = JavaClassImpl@40['String']
     nullable = 'true': Boolean@46
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -122,21 +122,21 @@ LazyJavaClassifierType@60['Throwable'] {
 
 LazyJavaClassifierType@63['Throwable'] {
     arguments = ArrayList@64[empty]
-    classifier = JavaClassImpl@62['Throwable']
+    classifier = JavaClassImpl@55['Throwable']
     nullable = 'true': Boolean@46
     typeConstructor = DeserializedClassTypeConstructor@56
 }
 
 LazyJavaClassifierType@65['Throwable'] {
     arguments = ArrayList@66[empty]
-    classifier = JavaClassImpl@55['Throwable']
+    classifier = JavaClassImpl@59['Throwable']
     nullable = 'true': Boolean@46
     typeConstructor = DeserializedClassTypeConstructor@56
 }
 
 LazyJavaClassifierType@67['Throwable'] {
     arguments = ArrayList@68[empty]
-    classifier = JavaClassImpl@59['Throwable']
+    classifier = JavaClassImpl@62['Throwable']
     nullable = 'true': Boolean@46
     typeConstructor = DeserializedClassTypeConstructor@56
 }
@@ -190,16 +190,19 @@ LazyJavaPackageFragment@78['lang'] {
 
 ResolutionTaskHolder@98 {
     <name not found> = ArrayList@99[2] { ResolutionCandidate@100, ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[2] { ResolutionCandidate@100, ResolutionCandidate@101 }
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
 }
 
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[4] { ResolutionCandidate@105, ResolutionCandidate@106, ResolutionCandidate@107, ... }
-    <name not found> = ArrayList@108[5] { ResolutionCandidate@105, ResolutionCandidate@106, ResolutionCandidate@107, ... }
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[4] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+}
+
+null {
+    <name not found> = ArrayList@107[2] { ResolutionCandidate@100, ResolutionCandidate@101 }
+    <name not found> = ArrayList@108[5] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
     <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt3162tryAsInitializer.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt3162tryAsInitializer.lazy.log
index 70f0d709188..9e15a5996c4 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt3162tryAsInitializer.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt3162tryAsInitializer.lazy.log
@@ -47,10 +47,13 @@ LazyJavaPackageFragment@16['lang'] {
 
 ResolutionTaskHolder@35 {
     <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
+}
+
+null {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@37 }
 }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt5200DeadCodeInLambdas.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt5200DeadCodeInLambdas.lazy.log
index 6ffae8fb1a8..561af58d126 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt5200DeadCodeInLambdas.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt5200DeadCodeInLambdas.lazy.log
@@ -125,57 +125,60 @@ LazyJavaPackageFragment@50['lang'] {
 
 ResolutionTaskHolder@77 {
     <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]
 }
 
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
     <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]
 }
 
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@69[empty]
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
     <name not found> = EmptyList@69[empty]
 }
 
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
+}
+
 ResolutionTaskHolder@89 {
     <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
 }
 
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
+}
+
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
 }
 
 ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@102[2] { ResolutionCandidate@103, ResolutionCandidate@104 }
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
 }
 
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[2] { ResolutionCandidate@111, ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[2] { ResolutionCandidate@111, ResolutionCandidate@112 }
+null {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@113[2] { ResolutionCandidate@103, ResolutionCandidate@104 }
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/kt3444_ReturnFromLocalFunctions.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/kt3444_ReturnFromLocalFunctions.lazy.log
index 1eb97165866..84c5a7866cf 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/kt3444_ReturnFromLocalFunctions.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/kt3444_ReturnFromLocalFunctions.lazy.log
@@ -38,14 +38,17 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@33 {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+}
+
+null {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@35 }
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/kt4034.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/kt4034.lazy.log
index 53bbe1bd165..9f4dc674798 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/kt4034.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/kt4034.lazy.log
@@ -25,5 +25,8 @@ LazyJavaPackageFragment@7['java'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
+}
+
+null {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
 }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturnInWhen.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturnInWhen.lazy.log
index f24dd2009a0..1d507982aa2 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturnInWhen.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturnInWhen.lazy.log
@@ -31,20 +31,23 @@ LazyJavaPackageFragment@7['java'] {
 
 ResolutionTaskHolder@29 {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
+}
+
+null {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@34 }
 }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1001.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1001.lazy.log
index 51991a5343a..4d9d46401c3 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1001.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1001.lazy.log
@@ -53,49 +53,52 @@ LazyJavaPackageFragment@17['lang'] {
 
 ResolutionTaskHolder@42 {
     <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+}
+
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
 }
 
 ResolutionTaskHolder@54 {
     <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
+}
+
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
 }
 
 ResolutionTaskHolder@66 {
     <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
+null {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@44 }
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1027.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1027.lazy.log
index ecba73c1c7d..0c69c57dae2 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1027.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1027.lazy.log
@@ -34,77 +34,53 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@29 {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
+}
+
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
 }
 
 ResolutionTaskHolder@41 {
     <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
+}
+
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
 }
 
 ResolutionTaskHolder@53 {
     <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[8] { ResolutionCandidate@58, ResolutionCandidate@59, ResolutionCandidate@60, ... }
 }
 
 ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[8] { ResolutionCandidate@67, ResolutionCandidate@68, ResolutionCandidate@69, ... }
-    <name not found> = ArrayList@70[8] { ResolutionCandidate@67, ResolutionCandidate@68, ResolutionCandidate@69, ... }
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
@@ -130,3 +106,30 @@ ResolutionTaskHolder@71 {
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
 }
+
+null {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@71[8] { ResolutionCandidate@58, ResolutionCandidate@59, ResolutionCandidate@60, ... }
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1066.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1066.lazy.log
index a661fe0962e..cda14d3e1c5 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1066.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1066.lazy.log
@@ -42,130 +42,99 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@35 {
     <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
+}
+
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
 }
 
 ResolutionTaskHolder@47 {
     <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
+}
+
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
 }
 
 ResolutionTaskHolder@59 {
     <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
 }
 
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
+}
+
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
 }
 
 ResolutionTaskHolder@71 {
     <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
 }
 
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
 }
 
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
+}
+
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
 }
 
 ResolutionTaskHolder@83 {
     <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
 }
 
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
 }
 
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
 }
 
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[7] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
 }
 
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[7] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
 }
 
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[8] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
 }
 
 ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@108[8] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111, ... }
 }
 
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[7] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
-    <name not found> = ArrayList@116[7] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[7] { ResolutionCandidate@119, ResolutionCandidate@120, ResolutionCandidate@121, ... }
-    <name not found> = ArrayList@122[7] { ResolutionCandidate@119, ResolutionCandidate@120, ResolutionCandidate@121, ... }
-}
-
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[8] { ResolutionCandidate@125, ResolutionCandidate@126, ResolutionCandidate@127, ... }
-    <name not found> = ArrayList@128[8] { ResolutionCandidate@125, ResolutionCandidate@126, ResolutionCandidate@127, ... }
-}
-
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[8] { ResolutionCandidate@131, ResolutionCandidate@132, ResolutionCandidate@133, ... }
-    <name not found> = ArrayList@134[8] { ResolutionCandidate@131, ResolutionCandidate@132, ResolutionCandidate@133, ... }
-}
-
-ResolutionTaskHolder@135 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@112 {
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -191,3 +160,37 @@ ResolutionTaskHolder@135 {
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
+
+null {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@132[7] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
+    <name not found> = ArrayList@133[7] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
+    <name not found> = ArrayList@134[8] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
+    <name not found> = ArrayList@135[8] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111, ... }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1156.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1156.lazy.log
index f5ca464ab6c..f75c219d7c8 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1156.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1156.lazy.log
@@ -119,14 +119,14 @@ LazyJavaClassifierType@63['AutoCloseable'] {
     typeConstructor = LazyJavaClassTypeConstructor@9['AutoCloseable']
 }
 
-LazyJavaClassifierType@77['Closeable'] {
+LazyJavaClassifierType@72['Closeable'] {
     arguments = ArrayList@86[empty]
     classifier = JavaClassImpl@87['Closeable']
     memberScope = LazyJavaClassMemberScope@11
     typeConstructor = LazyJavaClassTypeConstructor@13['Closeable']
 }
 
-LazyJavaClassifierType@72['Closeable'] {
+LazyJavaClassifierType@77['Closeable'] {
     arguments = ArrayList@88[empty]
     classifier = JavaClassImpl@89['Closeable']
     memberScope = LazyJavaClassMemberScope@11
@@ -237,28 +237,28 @@ LazyJavaClassifierType@129['String'] {
 
 LazyJavaClassifierType@132['String'] {
     arguments = ArrayList@133[empty]
-    classifier = JavaClassImpl@125['String']
+    classifier = JavaClassImpl@121['String']
     nullable = 'true': Boolean@103
     typeConstructor = DeserializedClassTypeConstructor@122
 }
 
 LazyJavaClassifierType@134['String'] {
     arguments = ArrayList@135[empty]
-    classifier = JavaClassImpl@128['String']
+    classifier = JavaClassImpl@131['String']
     nullable = 'true': Boolean@103
     typeConstructor = DeserializedClassTypeConstructor@122
 }
 
 LazyJavaClassifierType@136['String'] {
     arguments = ArrayList@137[empty]
-    classifier = JavaClassImpl@131['String']
+    classifier = JavaClassImpl@125['String']
     nullable = 'true': Boolean@103
     typeConstructor = DeserializedClassTypeConstructor@122
 }
 
 LazyJavaClassifierType@138['String'] {
     arguments = ArrayList@139[empty]
-    classifier = JavaClassImpl@121['String']
+    classifier = JavaClassImpl@128['String']
     nullable = 'true': Boolean@103
     typeConstructor = DeserializedClassTypeConstructor@122
 }
@@ -286,7 +286,7 @@ LazyJavaClassifierType@147['Throwable'] {
 
 LazyJavaClassifierType@150['Throwable'] {
     arguments = ArrayList@151[empty]
-    classifier = JavaClassImpl@142['Throwable']
+    classifier = JavaClassImpl@149['Throwable']
     nullable = 'true': Boolean@103
     typeConstructor = DeserializedClassTypeConstructor@143
 }
@@ -300,7 +300,7 @@ LazyJavaClassifierType@152['Throwable'] {
 
 LazyJavaClassifierType@154['Throwable'] {
     arguments = ArrayList@155[empty]
-    classifier = JavaClassImpl@149['Throwable']
+    classifier = JavaClassImpl@142['Throwable']
     nullable = 'true': Boolean@103
     typeConstructor = DeserializedClassTypeConstructor@143
 }
@@ -327,7 +327,7 @@ LazyJavaPackageFragmentProvider@158 {
     packageFragments('kotlin.jvm': FqName@175) = null
     topLevelClasses(JavaClassImpl@83['Appendable']) = LazyJavaClassDescriptor@0['Appendable']
     topLevelClasses(JavaClassImpl@85['AutoCloseable']) = LazyJavaClassDescriptor@6['AutoCloseable']
-    topLevelClasses(JavaClassImpl@87['Closeable']) = LazyJavaClassDescriptor@10['Closeable']
+    topLevelClasses(JavaClassImpl@89['Closeable']) = LazyJavaClassDescriptor@10['Closeable']
     topLevelClasses(JavaClassImpl@91['Exception']) = LazyJavaClassDescriptor@14['Exception']
     topLevelClasses(JavaClassImpl@93['FilterOutputStream']) = LazyJavaClassDescriptor@16['FilterOutputStream']
     topLevelClasses(JavaClassImpl@113['OutputStream']) = LazyJavaClassDescriptor@20['OutputStream']
@@ -362,46 +362,49 @@ LazyJavaPackageFragment@168['lang'] {
 
 ResolutionTaskHolder@190 {
     <name not found> = ArrayList@191[10] { ResolutionCandidate@192, ResolutionCandidate@193, ResolutionCandidate@194, ... }
-    <name not found> = ArrayList@195[10] { ResolutionCandidate@192, ResolutionCandidate@193, ResolutionCandidate@194, ... }
 }
 
-ResolutionTaskHolder@196 {
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@198 }
-    <name not found> = EmptyList@2[empty]
+ResolutionTaskHolder@195 {
+    <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
     <name not found> = EmptyList@2[empty]
 }
 
-ResolutionTaskHolder@200 {
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@202 }
+ResolutionTaskHolder@198 {
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
+}
+
+ResolutionTaskHolder@201 {
+    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
 }
 
 ResolutionTaskHolder@204 {
     <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@206 }
 }
 
-ResolutionTaskHolder@208 {
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@210 }
+ResolutionTaskHolder@207 {
+    <name not found> = ArrayList@208[4] { ResolutionCandidate@209, ResolutionCandidate@210, ResolutionCandidate@211, ... }
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
 }
 
 ResolutionTaskHolder@212 {
-    <name not found> = ArrayList@213[4] { ResolutionCandidate@214, ResolutionCandidate@215, ResolutionCandidate@216, ... }
-    <name not found> = ArrayList@217[5] { ResolutionCandidate@214, ResolutionCandidate@215, ResolutionCandidate@216, ... }
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
 }
 
-ResolutionTaskHolder@218 {
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
+null {
+    <name not found> = ArrayList@213[10] { ResolutionCandidate@192, ResolutionCandidate@193, ResolutionCandidate@194, ... }
+    <name not found> = ArrayList@214[1] { ResolutionCandidate@200 }
+    <name not found> = ArrayList@215[1] { ResolutionCandidate@203 }
+    <name not found> = ArrayList@216[1] { ResolutionCandidate@197 }
+    <name not found> = ArrayList@217[1] { ResolutionCandidate@206 }
+    <name not found> = ArrayList@218[5] { ResolutionCandidate@209, ResolutionCandidate@210, ResolutionCandidate@211, ... }
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.lazy.log
index f27c698d9e6..585f397098b 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.lazy.log
@@ -41,131 +41,142 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@33 {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
     <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
     <name not found> = EmptyList@30[empty]
 }
 
 ResolutionTaskHolder@45 {
     <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
     <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
     <name not found> = EmptyList@30[empty]
 }
 
 ResolutionTaskHolder@57 {
     <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
     <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
     <name not found> = EmptyList@30[empty]
 }
 
 ResolutionTaskHolder@69 {
     <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
+}
+
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
 }
 
 ResolutionTaskHolder@81 {
     <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
+}
+
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
 }
 
 ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@94 {
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@95 {
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@96 {
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
 }
 
 ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
-}
-
-ResolutionTaskHolder@113 {
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -174,13 +185,42 @@ ResolutionTaskHolder@113 {
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@98 {
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@99 {
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@100 {
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@114 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@101 {
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -191,9 +231,7 @@ ResolutionTaskHolder@114 {
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@115 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@102 {
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -204,9 +242,7 @@ ResolutionTaskHolder@115 {
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@116 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@103 {
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -217,9 +253,7 @@ ResolutionTaskHolder@116 {
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@117 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@104 {
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -230,85 +264,54 @@ ResolutionTaskHolder@117 {
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@118 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@123 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@124 {
+null {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@50 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1189.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1189.lazy.log
index 2152695263a..382ddb72fea 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1189.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1189.lazy.log
@@ -115,14 +115,14 @@ LazyJavaClassTypeConstructor@85['WriteLock'] {
     supertypes = ArrayList@102[2] { LazyJavaClassifierType@103['Lock'], LazyJavaClassifierType@104['Serializable'] }
 }
 
-LazyJavaClassifierType@91['Lock'] {
+LazyJavaClassifierType@103['Lock'] {
     arguments = ArrayList@105[empty]
     classifier = JavaClassImpl@106['Lock']
     memberScope = LazyJavaClassMemberScope@10
     typeConstructor = LazyJavaClassTypeConstructor@16['Lock']
 }
 
-LazyJavaClassifierType@103['Lock'] {
+LazyJavaClassifierType@91['Lock'] {
     arguments = ArrayList@107[empty]
     classifier = JavaClassImpl@108['Lock']
     memberScope = LazyJavaClassMemberScope@10
@@ -323,198 +323,201 @@ LazyJavaPackageFragment@168['util'] {
 
 ResolutionTaskHolder@207 {
     <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@209 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@211 {
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@213 }
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@213 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
+ResolutionTaskHolder@210 {
+    <name not found> = ArrayList@211[1] { ResolutionCandidate@212 }
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@215 {
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@217 }
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@217 }
+ResolutionTaskHolder@213 {
+    <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
+}
+
+ResolutionTaskHolder@216 {
+    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
 
 ResolutionTaskHolder@219 {
     <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@221 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@223 {
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@225 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
+ResolutionTaskHolder@222 {
+    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
 }
 
-ResolutionTaskHolder@227 {
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@229 }
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@229 }
+ResolutionTaskHolder@225 {
+    <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
+}
+
+ResolutionTaskHolder@228 {
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
 }
 
 ResolutionTaskHolder@231 {
     <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@233 }
 }
 
-ResolutionTaskHolder@235 {
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@237 }
+ResolutionTaskHolder@234 {
+    <name not found> = ArrayList@235[1] { ResolutionCandidate@236 }
 }
 
-ResolutionTaskHolder@239 {
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@241 }
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@241 }
+ResolutionTaskHolder@237 {
+    <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
+}
+
+ResolutionTaskHolder@240 {
+    <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
 }
 
 ResolutionTaskHolder@243 {
     <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@245 }
 }
 
-ResolutionTaskHolder@247 {
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@249 }
+ResolutionTaskHolder@246 {
+    <name not found> = ArrayList@247[1] { ResolutionCandidate@248 }
 }
 
-ResolutionTaskHolder@251 {
-    <name not found> = ArrayList@252[1] { ResolutionCandidate@253 }
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@253 }
+ResolutionTaskHolder@249 {
+    <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
+}
+
+ResolutionTaskHolder@252 {
+    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
 }
 
 ResolutionTaskHolder@255 {
     <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
-    <name not found> = ArrayList@258[1] { ResolutionCandidate@257 }
 }
 
-ResolutionTaskHolder@259 {
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@261 }
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@261 }
+ResolutionTaskHolder@258 {
+    <name not found> = ArrayList@259[1] { ResolutionCandidate@260 }
 }
 
-ResolutionTaskHolder@263 {
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@265 }
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@265 }
+ResolutionTaskHolder@261 {
+    <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
+}
+
+ResolutionTaskHolder@264 {
+    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
 }
 
 ResolutionTaskHolder@267 {
     <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
-    <name not found> = ArrayList@270[1] { ResolutionCandidate@269 }
 }
 
-ResolutionTaskHolder@271 {
-    <name not found> = ArrayList@272[1] { ResolutionCandidate@273 }
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@273 }
+ResolutionTaskHolder@270 {
+    <name not found> = ArrayList@271[1] { ResolutionCandidate@272 }
 }
 
-ResolutionTaskHolder@275 {
-    <name not found> = ArrayList@276[1] { ResolutionCandidate@277 }
-    <name not found> = ArrayList@278[1] { ResolutionCandidate@277 }
+ResolutionTaskHolder@273 {
+    <name not found> = ArrayList@274[1] { ResolutionCandidate@275 }
+}
+
+ResolutionTaskHolder@276 {
+    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
 }
 
 ResolutionTaskHolder@279 {
     <name not found> = ArrayList@280[1] { ResolutionCandidate@281 }
-    <name not found> = ArrayList@282[1] { ResolutionCandidate@281 }
 }
 
-ResolutionTaskHolder@283 {
-    <name not found> = ArrayList@284[1] { ResolutionCandidate@285 }
-    <name not found> = ArrayList@286[1] { ResolutionCandidate@285 }
+ResolutionTaskHolder@282 {
+    <name not found> = ArrayList@283[1] { ResolutionCandidate@284 }
 }
 
-ResolutionTaskHolder@287 {
-    <name not found> = ArrayList@288[1] { ResolutionCandidate@289 }
-    <name not found> = ArrayList@290[1] { ResolutionCandidate@289 }
+ResolutionTaskHolder@285 {
+    <name not found> = ArrayList@286[1] { ResolutionCandidate@287 }
+}
+
+ResolutionTaskHolder@288 {
+    <name not found> = ArrayList@289[1] { ResolutionCandidate@290 }
 }
 
 ResolutionTaskHolder@291 {
     <name not found> = ArrayList@292[1] { ResolutionCandidate@293 }
-    <name not found> = ArrayList@294[1] { ResolutionCandidate@293 }
 }
 
-ResolutionTaskHolder@295 {
-    <name not found> = ArrayList@296[1] { ResolutionCandidate@297 }
-    <name not found> = ArrayList@298[1] { ResolutionCandidate@297 }
+ResolutionTaskHolder@294 {
+    <name not found> = ArrayList@295[1] { ResolutionCandidate@296 }
 }
 
-ResolutionTaskHolder@299 {
-    <name not found> = ArrayList@300[1] { ResolutionCandidate@301 }
-    <name not found> = ArrayList@302[1] { ResolutionCandidate@301 }
+ResolutionTaskHolder@297 {
+    <name not found> = ArrayList@298[1] { ResolutionCandidate@299 }
 }
 
-ResolutionTaskHolder@303 {
-    <name not found> = ArrayList@304[1] { ResolutionCandidate@305 }
-    <name not found> = ArrayList@306[1] { ResolutionCandidate@305 }
+ResolutionTaskHolder@300 {
+    <name not found> = ArrayList@301[7] { ResolutionCandidate@302, ResolutionCandidate@303, ResolutionCandidate@304, ... }
 }
 
-ResolutionTaskHolder@307 {
-    <name not found> = ArrayList@308[1] { ResolutionCandidate@309 }
-    <name not found> = ArrayList@310[1] { ResolutionCandidate@309 }
+ResolutionTaskHolder@305 {
+    <name not found> = ArrayList@306[7] { ResolutionCandidate@307, ResolutionCandidate@308, ResolutionCandidate@309, ... }
 }
 
-ResolutionTaskHolder@311 {
-    <name not found> = ArrayList@312[1] { ResolutionCandidate@313 }
-    <name not found> = ArrayList@314[1] { ResolutionCandidate@313 }
+ResolutionTaskHolder@310 {
+    <name not found> = ArrayList@311[7] { ResolutionCandidate@312, ResolutionCandidate@313, ResolutionCandidate@314, ... }
 }
 
 ResolutionTaskHolder@315 {
-    <name not found> = ArrayList@316[1] { ResolutionCandidate@317 }
-    <name not found> = ArrayList@318[1] { ResolutionCandidate@317 }
+    <name not found> = ArrayList@316[7] { ResolutionCandidate@317, ResolutionCandidate@318, ResolutionCandidate@319, ... }
 }
 
-ResolutionTaskHolder@319 {
-    <name not found> = ArrayList@320[1] { ResolutionCandidate@321 }
-    <name not found> = ArrayList@322[1] { ResolutionCandidate@321 }
+ResolutionTaskHolder@320 {
+    <name not found> = ArrayList@321[7] { ResolutionCandidate@322, ResolutionCandidate@323, ResolutionCandidate@324, ... }
 }
 
-ResolutionTaskHolder@323 {
-    <name not found> = ArrayList@324[1] { ResolutionCandidate@325 }
-    <name not found> = ArrayList@326[1] { ResolutionCandidate@325 }
-}
-
-ResolutionTaskHolder@327 {
-    <name not found> = ArrayList@328[1] { ResolutionCandidate@329 }
-    <name not found> = ArrayList@330[1] { ResolutionCandidate@329 }
-}
-
-ResolutionTaskHolder@331 {
-    <name not found> = ArrayList@332[7] { ResolutionCandidate@333, ResolutionCandidate@334, ResolutionCandidate@335, ... }
-    <name not found> = ArrayList@336[7] { ResolutionCandidate@333, ResolutionCandidate@334, ResolutionCandidate@335, ... }
-}
-
-ResolutionTaskHolder@337 {
-    <name not found> = ArrayList@338[7] { ResolutionCandidate@339, ResolutionCandidate@340, ResolutionCandidate@341, ... }
-    <name not found> = ArrayList@342[7] { ResolutionCandidate@339, ResolutionCandidate@340, ResolutionCandidate@341, ... }
-}
-
-ResolutionTaskHolder@343 {
-    <name not found> = ArrayList@344[7] { ResolutionCandidate@345, ResolutionCandidate@346, ResolutionCandidate@347, ... }
-    <name not found> = ArrayList@348[7] { ResolutionCandidate@345, ResolutionCandidate@346, ResolutionCandidate@347, ... }
-}
-
-ResolutionTaskHolder@349 {
-    <name not found> = ArrayList@350[7] { ResolutionCandidate@351, ResolutionCandidate@352, ResolutionCandidate@353, ... }
-    <name not found> = ArrayList@354[7] { ResolutionCandidate@351, ResolutionCandidate@352, ResolutionCandidate@353, ... }
-}
-
-ResolutionTaskHolder@355 {
-    <name not found> = ArrayList@356[7] { ResolutionCandidate@357, ResolutionCandidate@358, ResolutionCandidate@359, ... }
-    <name not found> = ArrayList@360[7] { ResolutionCandidate@357, ResolutionCandidate@358, ResolutionCandidate@359, ... }
+null {
+    <name not found> = ArrayList@325[1] { ResolutionCandidate@263 }
+    <name not found> = ArrayList@326[1] { ResolutionCandidate@209 }
+    <name not found> = ArrayList@327[1] { ResolutionCandidate@218 }
+    <name not found> = ArrayList@328[1] { ResolutionCandidate@236 }
+    <name not found> = ArrayList@329[1] { ResolutionCandidate@269 }
+    <name not found> = ArrayList@330[1] { ResolutionCandidate@272 }
+    <name not found> = ArrayList@331[1] { ResolutionCandidate@212 }
+    <name not found> = ArrayList@332[1] { ResolutionCandidate@230 }
+    <name not found> = ArrayList@333[1] { ResolutionCandidate@254 }
+    <name not found> = ArrayList@334[1] { ResolutionCandidate@293 }
+    <name not found> = ArrayList@335[1] { ResolutionCandidate@251 }
+    <name not found> = ArrayList@336[1] { ResolutionCandidate@281 }
+    <name not found> = ArrayList@337[1] { ResolutionCandidate@227 }
+    <name not found> = ArrayList@338[1] { ResolutionCandidate@275 }
+    <name not found> = ArrayList@339[1] { ResolutionCandidate@215 }
+    <name not found> = ArrayList@340[1] { ResolutionCandidate@233 }
+    <name not found> = ArrayList@341[1] { ResolutionCandidate@290 }
+    <name not found> = ArrayList@342[1] { ResolutionCandidate@278 }
+    <name not found> = ArrayList@343[1] { ResolutionCandidate@284 }
+    <name not found> = ArrayList@344[1] { ResolutionCandidate@299 }
+    <name not found> = ArrayList@345[1] { ResolutionCandidate@296 }
+    <name not found> = ArrayList@346[1] { ResolutionCandidate@257 }
+    <name not found> = ArrayList@347[1] { ResolutionCandidate@248 }
+    <name not found> = ArrayList@348[1] { ResolutionCandidate@239 }
+    <name not found> = ArrayList@349[1] { ResolutionCandidate@287 }
+    <name not found> = ArrayList@350[1] { ResolutionCandidate@224 }
+    <name not found> = ArrayList@351[1] { ResolutionCandidate@221 }
+    <name not found> = ArrayList@352[1] { ResolutionCandidate@242 }
+    <name not found> = ArrayList@353[1] { ResolutionCandidate@245 }
+    <name not found> = ArrayList@354[1] { ResolutionCandidate@260 }
+    <name not found> = ArrayList@355[1] { ResolutionCandidate@266 }
+    <name not found> = ArrayList@356[7] { ResolutionCandidate@317, ResolutionCandidate@318, ResolutionCandidate@319, ... }
+    <name not found> = ArrayList@357[7] { ResolutionCandidate@312, ResolutionCandidate@313, ResolutionCandidate@314, ... }
+    <name not found> = ArrayList@358[7] { ResolutionCandidate@302, ResolutionCandidate@303, ResolutionCandidate@304, ... }
+    <name not found> = ArrayList@359[7] { ResolutionCandidate@322, ResolutionCandidate@323, ResolutionCandidate@324, ... }
+    <name not found> = ArrayList@360[7] { ResolutionCandidate@307, ResolutionCandidate@308, ResolutionCandidate@309, ... }
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1191.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1191.lazy.log
index 76f7ba8331b..14875c4496d 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1191.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1191.lazy.log
@@ -41,20 +41,23 @@ LazyJavaPackageFragment@13['java'] {
 
 ResolutionTaskHolder@35 {
     <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[8] { ResolutionCandidate@49, ResolutionCandidate@50, ResolutionCandidate@51, ... }
-    <name not found> = ArrayList@52[8] { ResolutionCandidate@49, ResolutionCandidate@50, ResolutionCandidate@51, ... }
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[8] { ResolutionCandidate@46, ResolutionCandidate@47, ResolutionCandidate@48, ... }
+}
+
+null {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@52[8] { ResolutionCandidate@46, ResolutionCandidate@47, ResolutionCandidate@48, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1219.1301.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1219.1301.lazy.log
index 033d0d2e389..f3707adc42e 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1219.1301.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1219.1301.lazy.log
@@ -98,14 +98,14 @@ LazyJavaClassifierType@53['AutoCloseable'] {
     typeConstructor = LazyJavaClassTypeConstructor@9['AutoCloseable']
 }
 
-LazyJavaClassifierType@64['Closeable'] {
+LazyJavaClassifierType@59['Closeable'] {
     arguments = ArrayList@70[empty]
     classifier = JavaClassImpl@71['Closeable']
     memberScope = LazyJavaClassMemberScope@11
     typeConstructor = LazyJavaClassTypeConstructor@13['Closeable']
 }
 
-LazyJavaClassifierType@59['Closeable'] {
+LazyJavaClassifierType@64['Closeable'] {
     arguments = ArrayList@72[empty]
     classifier = JavaClassImpl@73['Closeable']
     memberScope = LazyJavaClassMemberScope@11
@@ -225,7 +225,7 @@ LazyJavaPackageFragmentProvider@107 {
     packageFragments('kt1219.Unit': FqName@139) = null
     topLevelClasses(JavaClassImpl@67['Appendable']) = LazyJavaClassDescriptor@0['Appendable']
     topLevelClasses(JavaClassImpl@69['AutoCloseable']) = LazyJavaClassDescriptor@6['AutoCloseable']
-    topLevelClasses(JavaClassImpl@71['Closeable']) = LazyJavaClassDescriptor@10['Closeable']
+    topLevelClasses(JavaClassImpl@73['Closeable']) = LazyJavaClassDescriptor@10['Closeable']
     topLevelClasses(JavaClassImpl@75['FilterOutputStream']) = LazyJavaClassDescriptor@14['FilterOutputStream']
     topLevelClasses(JavaClassImpl@95['OutputStream']) = LazyJavaClassDescriptor@18['OutputStream']
     topLevelClasses(JavaClassImpl@98['PrintStream']) = LazyJavaClassDescriptor@22['PrintStream']
@@ -255,114 +255,117 @@ LazyJavaPackageFragment@120['lang'] {
 
 ResolutionTaskHolder@153 {
     <name not found> = ArrayList@154[10] { ResolutionCandidate@155, ResolutionCandidate@156, ResolutionCandidate@157, ... }
-    <name not found> = ArrayList@158[10] { ResolutionCandidate@155, ResolutionCandidate@156, ResolutionCandidate@157, ... }
 }
 
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@161 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
+ResolutionTaskHolder@158 {
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
 }
 
-ResolutionTaskHolder@163 {
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@165 }
+ResolutionTaskHolder@161 {
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
     <name not found> = EmptyList@2[empty]
+}
+
+ResolutionTaskHolder@164 {
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
     <name not found> = EmptyList@2[empty]
 }
 
 ResolutionTaskHolder@167 {
     <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@169 }
-    <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
 }
 
-ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@173 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
+ResolutionTaskHolder@170 {
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
 }
 
-ResolutionTaskHolder@175 {
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@177 }
+ResolutionTaskHolder@173 {
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
+}
+
+ResolutionTaskHolder@176 {
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
 }
 
 ResolutionTaskHolder@179 {
     <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@181 }
 }
 
-ResolutionTaskHolder@183 {
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@185 }
+ResolutionTaskHolder@182 {
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
 }
 
-ResolutionTaskHolder@187 {
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@189 }
+ResolutionTaskHolder@185 {
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
+}
+
+ResolutionTaskHolder@188 {
+    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
 }
 
 ResolutionTaskHolder@191 {
     <name not found> = ArrayList@192[1] { ResolutionCandidate@193 }
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@193 }
 }
 
-ResolutionTaskHolder@195 {
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@197 }
+ResolutionTaskHolder@194 {
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@196 }
 }
 
-ResolutionTaskHolder@199 {
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@201 }
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@201 }
+ResolutionTaskHolder@197 {
+    <name not found> = ArrayList@198[1] { ResolutionCandidate@199 }
+}
+
+ResolutionTaskHolder@200 {
+    <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
 }
 
 ResolutionTaskHolder@203 {
     <name not found> = ArrayList@204[1] { ResolutionCandidate@205 }
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@205 }
 }
 
-ResolutionTaskHolder@207 {
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@209 }
+ResolutionTaskHolder@206 {
+    <name not found> = ArrayList@207[1] { ResolutionCandidate@208 }
 }
 
-ResolutionTaskHolder@211 {
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@213 }
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@213 }
+ResolutionTaskHolder@209 {
+    <name not found> = ArrayList@210[1] { ResolutionCandidate@211 }
 }
 
-ResolutionTaskHolder@215 {
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@217 }
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@217 }
-}
-
-ResolutionTaskHolder@219 {
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@221 }
-}
-
-ResolutionTaskHolder@223 {
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@225 }
-}
-
-ResolutionTaskHolder@227 {
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@229 }
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@229 }
-}
-
-ResolutionTaskHolder@231 {
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
+ResolutionTaskHolder@212 {
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+}
+
+null {
+    <name not found> = ArrayList@213[10] { ResolutionCandidate@155, ResolutionCandidate@156, ResolutionCandidate@157, ... }
+    <name not found> = ArrayList@214[1] { ResolutionCandidate@196 }
+    <name not found> = ArrayList@215[1] { ResolutionCandidate@160 }
+    <name not found> = ArrayList@216[1] { ResolutionCandidate@184 }
+    <name not found> = ArrayList@217[1] { ResolutionCandidate@172 }
+    <name not found> = ArrayList@218[1] { ResolutionCandidate@190 }
+    <name not found> = ArrayList@219[1] { ResolutionCandidate@166 }
+    <name not found> = ArrayList@220[1] { ResolutionCandidate@181 }
+    <name not found> = ArrayList@221[1] { ResolutionCandidate@187 }
+    <name not found> = ArrayList@222[1] { ResolutionCandidate@205 }
+    <name not found> = ArrayList@223[1] { ResolutionCandidate@208 }
+    <name not found> = ArrayList@224[1] { ResolutionCandidate@169 }
+    <name not found> = ArrayList@225[1] { ResolutionCandidate@211 }
+    <name not found> = ArrayList@226[1] { ResolutionCandidate@202 }
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@199 }
+    <name not found> = ArrayList@228[1] { ResolutionCandidate@178 }
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@193 }
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@163 }
+    <name not found> = ArrayList@231[1] { ResolutionCandidate@175 }
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1571.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1571.lazy.log
index 58ec23bf6e5..034d76cb473 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1571.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1571.lazy.log
@@ -55,147 +55,103 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@44 {
     <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@51 {
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
     <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+}
+
+ResolutionTaskHolder@54 {
     <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
     <name not found> = EmptyList@33[empty]
+}
+
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
     <name not found> = EmptyList@33[empty]
 }
 
 ResolutionTaskHolder@66 {
     <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
     <name not found> = EmptyList@33[empty]
+}
+
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
     <name not found> = EmptyList@33[empty]
 }
 
 ResolutionTaskHolder@78 {
     <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
 }
 
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
+}
+
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
 }
 
 ResolutionTaskHolder@90 {
     <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
 }
 
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
+}
+
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
 }
 
 ResolutionTaskHolder@102 {
     <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
 }
 
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
 }
 
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@108 {
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
@@ -222,7 +178,7 @@ ResolutionTaskHolder@130 {
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@131 {
+ResolutionTaskHolder@109 {
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
@@ -247,6 +203,53 @@ ResolutionTaskHolder@131 {
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
+}
+
+null {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@98 }
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1977.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1977.lazy.log
index 8a325d456fa..ac3480c8df5 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1977.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1977.lazy.log
@@ -113,14 +113,14 @@ LazyJavaClassifierType@63['String'] {
 
 LazyJavaClassifierType@66['String'] {
     arguments = ArrayList@67[empty]
-    classifier = JavaClassImpl@65['String']
+    classifier = JavaClassImpl@61['String']
     nullable = 'true': Boolean@52
     typeConstructor = DeserializedClassTypeConstructor@62
 }
 
 LazyJavaClassifierType@68['String'] {
     arguments = ArrayList@69[empty]
-    classifier = JavaClassImpl@61['String']
+    classifier = JavaClassImpl@65['String']
     nullable = 'true': Boolean@52
     typeConstructor = DeserializedClassTypeConstructor@62
 }
@@ -185,63 +185,45 @@ LazyJavaPackageFragment@84['lang'] {
 
 ResolutionTaskHolder@117 {
     <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
 }
 
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
+ResolutionTaskHolder@120 {
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
 }
 
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@127 }
+ResolutionTaskHolder@123 {
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
+}
+
+ResolutionTaskHolder@126 {
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
 }
 
 ResolutionTaskHolder@129 {
     <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@131 }
 }
 
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@135 }
-}
-
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[2] { ResolutionCandidate@139, ResolutionCandidate@140 }
-    <name not found> = ArrayList@141[2] { ResolutionCandidate@139, ResolutionCandidate@140 }
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
+ResolutionTaskHolder@132 {
+    <name not found> = ArrayList@133[2] { ResolutionCandidate@134, ResolutionCandidate@135 }
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
 }
 
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[2] { ResolutionCandidate@144, ResolutionCandidate@145 }
-    <name not found> = ArrayList@146[2] { ResolutionCandidate@144, ResolutionCandidate@145 }
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
+ResolutionTaskHolder@136 {
+    <name not found> = ArrayList@137[2] { ResolutionCandidate@138, ResolutionCandidate@139 }
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
 }
 
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[2] { ResolutionCandidate@149, ResolutionCandidate@150 }
-    <name not found> = ArrayList@151[2] { ResolutionCandidate@149, ResolutionCandidate@150 }
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
+ResolutionTaskHolder@140 {
+    <name not found> = ArrayList@141[2] { ResolutionCandidate@142, ResolutionCandidate@143 }
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
 }
 
-ResolutionTaskHolder@152 {
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
+ResolutionTaskHolder@144 {
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
@@ -252,9 +234,7 @@ ResolutionTaskHolder@152 {
     <name not found> = EmptyList@12[empty]
 }
 
-ResolutionTaskHolder@153 {
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
+ResolutionTaskHolder@145 {
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
@@ -265,7 +245,30 @@ ResolutionTaskHolder@153 {
     <name not found> = EmptyList@12[empty]
 }
 
-ResolutionTaskHolder@154 {
+ResolutionTaskHolder@146 {
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+}
+
+null {
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@125 }
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@131 }
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@128 }
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@122 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@152[2] { ResolutionCandidate@138, ResolutionCandidate@139 }
+    <name not found> = ArrayList@153[2] { ResolutionCandidate@134, ResolutionCandidate@135 }
+    <name not found> = ArrayList@154[2] { ResolutionCandidate@142, ResolutionCandidate@143 }
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2166_kt2103.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2166_kt2103.lazy.log
index 3684f2167dc..70db267e3f2 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2166_kt2103.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2166_kt2103.lazy.log
@@ -32,9 +32,12 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+}
+
+null {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2226.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2226.lazy.log
index 1563213ea2b..c78df8407c8 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2226.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2226.lazy.log
@@ -37,15 +37,18 @@ LazyJavaPackageFragment@15['java'] {
 
 ResolutionTaskHolder@33 {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+}
+
+null {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@41 }
 }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2330.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2330.lazy.log
index 7ac60e99450..abcddd0f03a 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2330.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2330.lazy.log
@@ -47,15 +47,6 @@ LazyJavaPackageFragment@16['lang'] {
 
 ResolutionTaskHolder@38 {
     <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -66,17 +57,8 @@ ResolutionTaskHolder@38 {
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -87,113 +69,78 @@ ResolutionTaskHolder@42 {
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
     <name not found> = EmptyList@29[empty]
 }
 
 ResolutionTaskHolder@50 {
     <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
     <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
     <name not found> = EmptyList@29[empty]
 }
 
 ResolutionTaskHolder@62 {
     <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
+}
+
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
 }
 
 ResolutionTaskHolder@74 {
     <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
 }
 
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
+}
+
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
 }
 
 ResolutionTaskHolder@86 {
     <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@92 {
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -244,7 +191,63 @@ ResolutionTaskHolder@110 {
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@111 {
+ResolutionTaskHolder@93 {
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+}
+
+null {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@70 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2369.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2369.lazy.log
index bd7de900eab..e00f80e3fcc 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2369.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2369.lazy.log
@@ -86,14 +86,14 @@ LazyJavaClassifierType@41['Throwable'] {
 
 LazyJavaClassifierType@43['Throwable'] {
     arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@40['Throwable']
+    classifier = JavaClassImpl@37['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@45['Throwable'] {
     arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@37['Throwable']
+    classifier = JavaClassImpl@40['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -157,33 +157,36 @@ LazyJavaPackageFragment@59['lang'] {
 
 ResolutionTaskHolder@88 {
     <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
     <name not found> = EmptyList@80[empty]
     <name not found> = EmptyList@80[empty]
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
 }
 
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
 }
 
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[4] { ResolutionCandidate@102, ResolutionCandidate@103, ResolutionCandidate@104, ... }
-    <name not found> = ArrayList@105[5] { ResolutionCandidate@102, ResolutionCandidate@103, ResolutionCandidate@104, ... }
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[4] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
     <name not found> = EmptyList@80[empty]
     <name not found> = EmptyList@80[empty]
 }
 
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[8] { ResolutionCandidate@108, ResolutionCandidate@109, ResolutionCandidate@110, ... }
-    <name not found> = ArrayList@111[8] { ResolutionCandidate@108, ResolutionCandidate@109, ResolutionCandidate@110, ... }
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[8] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
+}
+
+null {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@110[5] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
+    <name not found> = ArrayList@111[8] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2845.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2845.lazy.log
index de8a5c43363..b57900a5c51 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2845.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2845.lazy.log
@@ -91,47 +91,47 @@ LazyJavaClassifierType@57['E'] {
     arguments = ArrayList@58[empty]
     classifier = JavaTypeParameterImpl@59['E']
     nullable = 'false': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@60
 }
 
-LazyJavaClassifierType@60['E'] {
-    arguments = ArrayList@61[empty]
-    classifier = JavaTypeParameterImpl@62['E']
+LazyJavaClassifierType@61['E'] {
+    arguments = ArrayList@62[empty]
+    classifier = JavaTypeParameterImpl@63['E']
     nullable = 'false': Boolean@44
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
 }
 
-LazyJavaClassifierType@63['E'] {
-    arguments = ArrayList@64[empty]
-    classifier = JavaTypeParameterImpl@65['E']
+LazyJavaClassifierType@64['E'] {
+    arguments = ArrayList@65[empty]
+    classifier = JavaTypeParameterImpl@66['E']
     nullable = 'false': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
 }
 
 LazyJavaClassifierType@67['E'] {
     arguments = ArrayList@68[empty]
-    classifier = JavaTypeParameterImpl@59['E']
+    classifier = JavaTypeParameterImpl@66['E']
     nullable = 'true': Boolean@50
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
 }
 
 LazyJavaClassifierType@69['E'] {
     arguments = ArrayList@70[empty]
-    classifier = JavaTypeParameterImpl@65['E']
-    nullable = 'true': Boolean@50
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
-}
-
-LazyJavaClassifierType@71['E'] {
-    arguments = ArrayList@72[empty]
     classifier = JavaTypeParameterImpl@55['E']
     nullable = 'true': Boolean@50
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
 }
 
+LazyJavaClassifierType@71['E'] {
+    arguments = ArrayList@72[empty]
+    classifier = JavaTypeParameterImpl@59['E']
+    nullable = 'true': Boolean@50
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@60
+}
+
 LazyJavaClassifierType@73['E'] {
     arguments = ArrayList@74[empty]
-    classifier = JavaTypeParameterImpl@62['E']
+    classifier = JavaTypeParameterImpl@63['E']
     nullable = 'true': Boolean@50
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
 }
@@ -232,7 +232,7 @@ LazyJavaTypeParameterDescriptor@24['E'] {
 }
 
 LazyJavaTypeParameterDescriptor@19['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@60
 }
 
 LazyJavaTypeParameterResolver@135 {
@@ -245,37 +245,40 @@ LazyJavaTypeParameterResolver@137 {
 
 ResolutionTaskHolder@139 {
     <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@144 }
-    <name not found> = EmptyList@121[empty]
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
     <name not found> = EmptyList@121[empty]
 }
 
-ResolutionTaskHolder@146 {
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@148 }
+ResolutionTaskHolder@144 {
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
+}
+
+ResolutionTaskHolder@147 {
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
 }
 
 ResolutionTaskHolder@150 {
     <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@152 }
 }
 
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@156 }
+ResolutionTaskHolder@153 {
+    <name not found> = ArrayList@154[2] { ResolutionCandidate@155, ResolutionCandidate@156 }
 }
 
-ResolutionTaskHolder@158 {
-    <name not found> = ArrayList@159[2] { ResolutionCandidate@160, ResolutionCandidate@161 }
-    <name not found> = ArrayList@162[2] { ResolutionCandidate@160, ResolutionCandidate@161 }
+ResolutionTaskHolder@157 {
+    <name not found> = ArrayList@158[3] { ResolutionCandidate@159, ResolutionCandidate@160, ResolutionCandidate@161 }
+    <name not found> = EmptyList@121[empty]
+    <name not found> = EmptyList@121[empty]
 }
 
-ResolutionTaskHolder@163 {
-    <name not found> = ArrayList@164[3] { ResolutionCandidate@165, ResolutionCandidate@166, ResolutionCandidate@167 }
-    <name not found> = ArrayList@168[3] { ResolutionCandidate@165, ResolutionCandidate@166, ResolutionCandidate@167 }
-    <name not found> = EmptyList@121[empty]
+null {
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@146 }
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@141 }
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@143 }
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@152 }
+    <name not found> = ArrayList@166[1] { ResolutionCandidate@149 }
+    <name not found> = ArrayList@167[2] { ResolutionCandidate@155, ResolutionCandidate@156 }
+    <name not found> = ArrayList@168[3] { ResolutionCandidate@159, ResolutionCandidate@160, ResolutionCandidate@161 }
     <name not found> = EmptyList@121[empty]
     <name not found> = EmptyList@121[empty]
     <name not found> = EmptyList@121[empty]
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2960.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2960.lazy.log
index 67e8a6e2512..b8e45ba1958 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2960.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2960.lazy.log
@@ -52,9 +52,16 @@ LazyJavaPackageFragment@24['lang'] {
 
 ResolutionTaskHolder@42 {
     <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+}
+
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
@@ -63,17 +70,8 @@ ResolutionTaskHolder@42 {
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
@@ -86,83 +84,88 @@ ResolutionTaskHolder@49 {
 
 ResolutionTaskHolder@53 {
     <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
     <name not found> = EmptyList@34[empty]
+}
+
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
     <name not found> = EmptyList@34[empty]
 }
 
 ResolutionTaskHolder@65 {
     <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
+}
+
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
 }
 
 ResolutionTaskHolder@77 {
     <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
 }
 
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
 }
 
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
+null {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@55 }
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2972.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2972.lazy.log
index a19308f5c27..7af40352ec3 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2972.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2972.lazy.log
@@ -148,47 +148,50 @@ LazyJavaPackageFragment@83['lang'] {
 
 ResolutionTaskHolder@122 {
     <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
-    <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
 }
 
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
+ResolutionTaskHolder@125 {
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
 }
 
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@132 }
+ResolutionTaskHolder@128 {
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
+}
+
+ResolutionTaskHolder@131 {
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
 }
 
 ResolutionTaskHolder@134 {
     <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@136 }
 }
 
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@140 }
+ResolutionTaskHolder@137 {
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
 }
 
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@144 }
+ResolutionTaskHolder@140 {
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
+}
+
+ResolutionTaskHolder@143 {
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
 }
 
 ResolutionTaskHolder@146 {
     <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@148 }
 }
 
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@152 }
-}
-
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@156 }
+null {
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@127 }
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@145 }
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@148 }
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@133 }
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@139 }
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@142 }
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@124 }
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@136 }
+    <name not found> = EmptyList@7[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt3501.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt3501.lazy.log
index 7af3ed0f364..5b32e551049 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt3501.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt3501.lazy.log
@@ -23,5 +23,8 @@ LazyJavaPackageFragment@5['java'] {
 
 ResolutionTaskHolder@21 {
     <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
+}
+
+null {
     <name not found> = ArrayList@24[1] { ResolutionCandidate@23 }
 }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt510.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt510.lazy.log
index f01a8f28ada..8ced7a82672 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt510.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt510.lazy.log
@@ -28,12 +28,15 @@ LazyJavaPackageFragment@7['lang'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
-    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
+}
+
+null {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@27 }
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@30 }
+    <name not found> = EmptyList@21[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt607.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt607.lazy.log
index cc52428990d..d095769880c 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt607.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt607.lazy.log
@@ -29,20 +29,23 @@ LazyJavaPackageFragment@8['java'] {
 
 ResolutionTaskHolder@27 {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
 }
 
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+}
+
+null {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@32 }
 }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt609.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt609.lazy.log
index f022e164b69..ce215938771 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt609.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt609.lazy.log
@@ -31,15 +31,18 @@ LazyJavaPackageFragment@7['java'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
+}
+
+null {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@36 }
 }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt610.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt610.lazy.log
index d8235179b1f..8d1c5209f22 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt610.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt610.lazy.log
@@ -17,5 +17,8 @@ LazyJavaPackageFragment@4['java'] {
 
 ResolutionTaskHolder@17 {
     <name not found> = ArrayList@18[1] { ResolutionCandidate@19 }
+}
+
+null {
     <name not found> = ArrayList@20[1] { ResolutionCandidate@19 }
 }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt776.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt776.lazy.log
index 6e1d870341b..aa44677ce81 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt776.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt776.lazy.log
@@ -28,54 +28,57 @@ LazyJavaPackageFragment@7['lang'] {
 
 ResolutionTaskHolder@24 {
     <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
 }
 
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
+ResolutionTaskHolder@27 {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
 }
 
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
+}
+
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
 }
 
 ResolutionTaskHolder@36 {
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
+}
+
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
 }
 
 ResolutionTaskHolder@48 {
     <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[7] { ResolutionCandidate@53, ResolutionCandidate@54, ResolutionCandidate@55, ... }
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[7] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64, ... }
-    <name not found> = ArrayList@65[7] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64, ... }
+null {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@26 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@65[7] { ResolutionCandidate@53, ResolutionCandidate@54, ResolutionCandidate@55, ... }
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt897.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt897.lazy.log
index 26f4fe28fd5..77ab04b444c 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt897.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt897.lazy.log
@@ -33,21 +33,24 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
+    <name not found> = EmptyList@22[empty]
+}
+
+null {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@36 }
+    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/propertiesOrderInPackage.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/propertiesOrderInPackage.lazy.log
index 1eef4d4e57a..5266282446f 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/propertiesOrderInPackage.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/propertiesOrderInPackage.lazy.log
@@ -34,14 +34,17 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@27 {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
+    <name not found> = EmptyList@22[empty]
+}
+
+null {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@29 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/referenceToPropertyInitializer.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/referenceToPropertyInitializer.lazy.log
index 8bfd82f8da3..ea34cd055d9 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/referenceToPropertyInitializer.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/referenceToPropertyInitializer.lazy.log
@@ -60,148 +60,151 @@ LazyJavaPackageFragment@16['lang'] {
 
 ResolutionTaskHolder@46 {
     <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
     <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
     <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
+    <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
+    <name not found> = EmptyList@37[empty]
+}
+
 ResolutionTaskHolder@86 {
     <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
+}
+
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
 }
 
 ResolutionTaskHolder@98 {
     <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
+}
+
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
+}
+
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
+}
+
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[8] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111, ... }
+}
+
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[8] { ResolutionCandidate@114, ResolutionCandidate@115, ResolutionCandidate@116, ... }
+}
+
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[8] { ResolutionCandidate@119, ResolutionCandidate@120, ResolutionCandidate@121, ... }
+}
+
+null {
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@145[8] { ResolutionCandidate@114, ResolutionCandidate@115, ResolutionCandidate@116, ... }
+    <name not found> = ArrayList@146[8] { ResolutionCandidate@119, ResolutionCandidate@120, ResolutionCandidate@121, ... }
+    <name not found> = ArrayList@147[8] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111, ... }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[8] { ResolutionCandidate@132, ResolutionCandidate@133, ResolutionCandidate@134, ... }
-    <name not found> = ArrayList@135[8] { ResolutionCandidate@132, ResolutionCandidate@133, ResolutionCandidate@134, ... }
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[8] { ResolutionCandidate@138, ResolutionCandidate@139, ResolutionCandidate@140, ... }
-    <name not found> = ArrayList@141[8] { ResolutionCandidate@138, ResolutionCandidate@139, ResolutionCandidate@140, ... }
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[8] { ResolutionCandidate@144, ResolutionCandidate@145, ResolutionCandidate@146, ... }
-    <name not found> = ArrayList@147[8] { ResolutionCandidate@144, ResolutionCandidate@145, ResolutionCandidate@146, ... }
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/repeatUnitializedErrorOnlyForLocalVars.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/repeatUnitializedErrorOnlyForLocalVars.lazy.log
index c0fafcd451c..4529ad6b9e8 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/repeatUnitializedErrorOnlyForLocalVars.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/repeatUnitializedErrorOnlyForLocalVars.lazy.log
@@ -37,72 +37,75 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@23[empty]
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
     <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
     <name not found> = EmptyList@23[empty]
+}
+
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
     <name not found> = EmptyList@23[empty]
 }
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@23[empty]
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
 }
 
 ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@53[8] { ResolutionCandidate@54, ResolutionCandidate@55, ResolutionCandidate@56, ... }
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[8] { ResolutionCandidate@59, ResolutionCandidate@60, ResolutionCandidate@61, ... }
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[8] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64, ... }
-    <name not found> = ArrayList@65[8] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64, ... }
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[8] { ResolutionCandidate@64, ResolutionCandidate@65, ResolutionCandidate@66, ... }
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[8] { ResolutionCandidate@68, ResolutionCandidate@69, ResolutionCandidate@70, ... }
-    <name not found> = ArrayList@71[8] { ResolutionCandidate@68, ResolutionCandidate@69, ResolutionCandidate@70, ... }
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[8] { ResolutionCandidate@69, ResolutionCandidate@70, ResolutionCandidate@71, ... }
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[8] { ResolutionCandidate@74, ResolutionCandidate@75, ResolutionCandidate@76, ... }
-    <name not found> = ArrayList@77[8] { ResolutionCandidate@74, ResolutionCandidate@75, ResolutionCandidate@76, ... }
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[8] { ResolutionCandidate@80, ResolutionCandidate@81, ResolutionCandidate@82, ... }
-    <name not found> = ArrayList@83[8] { ResolutionCandidate@80, ResolutionCandidate@81, ResolutionCandidate@82, ... }
+null {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@80[8] { ResolutionCandidate@69, ResolutionCandidate@70, ResolutionCandidate@71, ... }
+    <name not found> = ArrayList@81[8] { ResolutionCandidate@64, ResolutionCandidate@65, ResolutionCandidate@66, ... }
+    <name not found> = ArrayList@82[8] { ResolutionCandidate@59, ResolutionCandidate@60, ResolutionCandidate@61, ... }
+    <name not found> = ArrayList@83[8] { ResolutionCandidate@54, ResolutionCandidate@55, ResolutionCandidate@56, ... }
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/scopeOfAnonymousInitializer.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/scopeOfAnonymousInitializer.lazy.log
index b90f1bc30ae..cfaf6f4770c 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/scopeOfAnonymousInitializer.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/scopeOfAnonymousInitializer.lazy.log
@@ -31,7 +31,10 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@24 {
     <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
-    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+}
+
+null {
+    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
     <name not found> = EmptyList@21[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/uninitializedInLocalDeclarations.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/uninitializedInLocalDeclarations.lazy.log
index ffd4bf49f50..15854501b94 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/uninitializedInLocalDeclarations.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/uninitializedInLocalDeclarations.lazy.log
@@ -67,103 +67,106 @@ LazyJavaPackageFragment@20['lang'] {
 
 ResolutionTaskHolder@48 {
     <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
+}
+
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
 }
 
 ResolutionTaskHolder@60 {
     <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
 }
 
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
+}
+
 ResolutionTaskHolder@72 {
     <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
 }
 
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
+}
+
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
 }
 
 ResolutionTaskHolder@84 {
     <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
 }
 
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
 }
 
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
+null {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@65 }
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/unmappedArgs.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/unmappedArgs.lazy.log
index a3636c91486..7125a7e4b5e 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/unmappedArgs.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/unmappedArgs.lazy.log
@@ -38,10 +38,6 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@27 {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
@@ -59,22 +55,29 @@ ResolutionTaskHolder@27 {
     <name not found> = EmptyList@19[empty]
 }
 
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
+}
+
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
 }
 
 ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@40[8] { ResolutionCandidate@41, ResolutionCandidate@42, ResolutionCandidate@43, ... }
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[8] { ResolutionCandidate@45, ResolutionCandidate@46, ResolutionCandidate@47, ... }
-    <name not found> = ArrayList@48[8] { ResolutionCandidate@45, ResolutionCandidate@46, ResolutionCandidate@47, ... }
+null {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@48[8] { ResolutionCandidate@41, ResolutionCandidate@42, ResolutionCandidate@43, ... }
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/varInitializationInIfInCycle.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/varInitializationInIfInCycle.lazy.log
index cf70d78f415..870cb46ad76 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/varInitializationInIfInCycle.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/varInitializationInIfInCycle.lazy.log
@@ -50,59 +50,62 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@39 {
     <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
 }
 
 ResolutionTaskHolder@51 {
     <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
 }
 
 ResolutionTaskHolder@63 {
     <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
 }
 
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
 }
 
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[7] { ResolutionCandidate@71, ResolutionCandidate@72, ResolutionCandidate@73, ... }
 }
 
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[7] { ResolutionCandidate@81, ResolutionCandidate@82, ResolutionCandidate@83, ... }
-    <name not found> = ArrayList@84[7] { ResolutionCandidate@81, ResolutionCandidate@82, ResolutionCandidate@83, ... }
+null {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@84[7] { ResolutionCandidate@71, ResolutionCandidate@72, ResolutionCandidate@73, ... }
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/controlStructures/ForWithoutBraces.lazy.log b/compiler/testData/diagnostics/tests/controlStructures/ForWithoutBraces.lazy.log
index 832bd5f48f8..4208d10186d 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/ForWithoutBraces.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlStructures/ForWithoutBraces.lazy.log
@@ -30,51 +30,37 @@ LazyJavaPackageFragment@6['lang'] {
 
 ResolutionTaskHolder@21 {
     <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@23 }
 }
 
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
+ResolutionTaskHolder@24 {
+    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+ResolutionTaskHolder@27 {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
+}
+
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
 }
 
 ResolutionTaskHolder@33 {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[7] { ResolutionCandidate@41, ResolutionCandidate@42, ResolutionCandidate@43, ... }
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[7] { ResolutionCandidate@47, ResolutionCandidate@48, ResolutionCandidate@49, ... }
-    <name not found> = ArrayList@50[7] { ResolutionCandidate@47, ResolutionCandidate@48, ResolutionCandidate@49, ... }
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[8] { ResolutionCandidate@46, ResolutionCandidate@47, ResolutionCandidate@48, ... }
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[8] { ResolutionCandidate@53, ResolutionCandidate@54, ResolutionCandidate@55, ... }
-    <name not found> = ArrayList@56[8] { ResolutionCandidate@53, ResolutionCandidate@54, ResolutionCandidate@55, ... }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
+ResolutionTaskHolder@49 {
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
@@ -100,3 +86,20 @@ ResolutionTaskHolder@57 {
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
 }
+
+null {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@26 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@23 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@56[7] { ResolutionCandidate@41, ResolutionCandidate@42, ResolutionCandidate@43, ... }
+    <name not found> = ArrayList@57[8] { ResolutionCandidate@46, ResolutionCandidate@47, ResolutionCandidate@48, ... }
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/controlStructures/ForbidStatementAsDirectFunctionBody.lazy.log b/compiler/testData/diagnostics/tests/controlStructures/ForbidStatementAsDirectFunctionBody.lazy.log
index 140c463f05a..d2bcd1f3da3 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/ForbidStatementAsDirectFunctionBody.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlStructures/ForbidStatementAsDirectFunctionBody.lazy.log
@@ -44,43 +44,46 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@30 {
     <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@36 {
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+null {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@32 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
diff --git a/compiler/testData/diagnostics/tests/controlStructures/emptyIf.lazy.log b/compiler/testData/diagnostics/tests/controlStructures/emptyIf.lazy.log
index b155b13fef5..ef78b0c6436 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/emptyIf.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlStructures/emptyIf.lazy.log
@@ -38,52 +38,55 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@27 {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
 }
 
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
 }
 
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+}
+
 ResolutionTaskHolder@39 {
     <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+null {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@29 }
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/controlStructures/forLoopWithNullableRange.lazy.log b/compiler/testData/diagnostics/tests/controlStructures/forLoopWithNullableRange.lazy.log
index c02f50010a8..1c5b95ac1cb 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/forLoopWithNullableRange.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlStructures/forLoopWithNullableRange.lazy.log
@@ -49,36 +49,39 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@32 {
     <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
+    <name not found> = EmptyList@24[empty]
+}
+
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -91,51 +94,51 @@ ResolutionTaskHolder@39 {
 
 ResolutionTaskHolder@43 {
     <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
 }
 
 ResolutionTaskHolder@55 {
     <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[2] { ResolutionCandidate@60, ResolutionCandidate@61 }
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[2] { ResolutionCandidate@69, ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[2] { ResolutionCandidate@69, ResolutionCandidate@70 }
+null {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@71[2] { ResolutionCandidate@60, ResolutionCandidate@61 }
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/controlStructures/forWithNullableIterator.lazy.log b/compiler/testData/diagnostics/tests/controlStructures/forWithNullableIterator.lazy.log
index 2e857b350fa..40a0fcd19ec 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/forWithNullableIterator.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlStructures/forWithNullableIterator.lazy.log
@@ -47,12 +47,6 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@30 {
     <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
@@ -78,14 +72,8 @@ ResolutionTaskHolder@30 {
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
@@ -111,16 +99,31 @@ ResolutionTaskHolder@34 {
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+}
+
+null {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@32 }
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/controlStructures/jumpAcrossFunctionBoundary.lazy.log b/compiler/testData/diagnostics/tests/controlStructures/jumpAcrossFunctionBoundary.lazy.log
index 17149d8243e..52fcd356150 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/jumpAcrossFunctionBoundary.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlStructures/jumpAcrossFunctionBoundary.lazy.log
@@ -42,21 +42,24 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
+}
+
+null {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@30 }
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/controlStructures/kt1075.lazy.log b/compiler/testData/diagnostics/tests/controlStructures/kt1075.lazy.log
index d6122eb7df6..1ff4e8ccceb 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/kt1075.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlStructures/kt1075.lazy.log
@@ -28,12 +28,6 @@ LazyJavaPackageFragment@7['lang'] {
 
 ResolutionTaskHolder@24 {
     <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
@@ -59,14 +53,8 @@ ResolutionTaskHolder@24 {
     <name not found> = EmptyList@19[empty]
 }
 
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
+ResolutionTaskHolder@27 {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
@@ -92,22 +80,37 @@ ResolutionTaskHolder@28 {
     <name not found> = EmptyList@19[empty]
 }
 
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
+}
+
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
 }
 
 ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@37[7] { ResolutionCandidate@38, ResolutionCandidate@39, ResolutionCandidate@40, ... }
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[7] { ResolutionCandidate@42, ResolutionCandidate@43, ResolutionCandidate@44, ... }
-    <name not found> = ArrayList@45[7] { ResolutionCandidate@42, ResolutionCandidate@43, ResolutionCandidate@44, ... }
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[7] { ResolutionCandidate@43, ResolutionCandidate@44, ResolutionCandidate@45, ... }
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[7] { ResolutionCandidate@48, ResolutionCandidate@49, ResolutionCandidate@50, ... }
-    <name not found> = ArrayList@51[7] { ResolutionCandidate@48, ResolutionCandidate@49, ResolutionCandidate@50, ... }
+null {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@26 }
+    <name not found> = ArrayList@50[7] { ResolutionCandidate@43, ResolutionCandidate@44, ResolutionCandidate@45, ... }
+    <name not found> = ArrayList@51[7] { ResolutionCandidate@38, ResolutionCandidate@39, ResolutionCandidate@40, ... }
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/controlStructures/kt4310.lazy.log b/compiler/testData/diagnostics/tests/controlStructures/kt4310.lazy.log
index 1fc47a44e26..3a5e7e238d5 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/kt4310.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlStructures/kt4310.lazy.log
@@ -25,15 +25,18 @@ LazyJavaPackageFragment@9['java'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+}
+
+null {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@27 }
 }
diff --git a/compiler/testData/diagnostics/tests/controlStructures/kt657.lazy.log b/compiler/testData/diagnostics/tests/controlStructures/kt657.lazy.log
index c500279442e..5145f5abdeb 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/kt657.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlStructures/kt657.lazy.log
@@ -47,32 +47,35 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@38 {
     <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[7] { ResolutionCandidate@52, ResolutionCandidate@53, ResolutionCandidate@54, ... }
-    <name not found> = ArrayList@55[7] { ResolutionCandidate@52, ResolutionCandidate@53, ResolutionCandidate@54, ... }
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[7] { ResolutionCandidate@49, ResolutionCandidate@50, ResolutionCandidate@51, ... }
+}
+
+null {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@55[7] { ResolutionCandidate@49, ResolutionCandidate@50, ResolutionCandidate@51, ... }
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/controlStructures/kt770.kt351.kt735_StatementType.lazy.log b/compiler/testData/diagnostics/tests/controlStructures/kt770.kt351.kt735_StatementType.lazy.log
index c7f7872b638..80f6a535354 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/kt770.kt351.kt735_StatementType.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlStructures/kt770.kt351.kt735_StatementType.lazy.log
@@ -266,15 +266,10 @@ LazyJavaPackageFragment@124['lang'] {
 
 ResolutionTaskHolder@164 {
     <name not found> = ArrayList@165[10] { ResolutionCandidate@166, ResolutionCandidate@167, ResolutionCandidate@168, ... }
-    <name not found> = ArrayList@169[10] { ResolutionCandidate@166, ResolutionCandidate@167, ResolutionCandidate@168, ... }
 }
 
-ResolutionTaskHolder@170 {
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@172 }
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
+ResolutionTaskHolder@169 {
+    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
@@ -292,212 +287,166 @@ ResolutionTaskHolder@170 {
     <name not found> = EmptyList@4[empty]
 }
 
-ResolutionTaskHolder@174 {
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@176 }
-    <name not found> = EmptyList@4[empty]
+ResolutionTaskHolder@172 {
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
+}
+
+ResolutionTaskHolder@175 {
+    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
     <name not found> = EmptyList@4[empty]
 }
 
 ResolutionTaskHolder@178 {
     <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@180 }
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
 }
 
-ResolutionTaskHolder@182 {
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@184 }
+ResolutionTaskHolder@181 {
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
 }
 
-ResolutionTaskHolder@186 {
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@188 }
+ResolutionTaskHolder@184 {
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
+}
+
+ResolutionTaskHolder@187 {
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
 }
 
 ResolutionTaskHolder@190 {
     <name not found> = ArrayList@191[1] { ResolutionCandidate@192 }
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@192 }
 }
 
-ResolutionTaskHolder@194 {
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@196 }
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@196 }
+ResolutionTaskHolder@193 {
+    <name not found> = ArrayList@194[1] { ResolutionCandidate@195 }
 }
 
-ResolutionTaskHolder@198 {
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@200 }
+ResolutionTaskHolder@196 {
+    <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
+}
+
+ResolutionTaskHolder@199 {
+    <name not found> = ArrayList@200[1] { ResolutionCandidate@201 }
 }
 
 ResolutionTaskHolder@202 {
     <name not found> = ArrayList@203[1] { ResolutionCandidate@204 }
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@204 }
 }
 
-ResolutionTaskHolder@206 {
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@208 }
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@208 }
+ResolutionTaskHolder@205 {
+    <name not found> = ArrayList@206[1] { ResolutionCandidate@207 }
 }
 
-ResolutionTaskHolder@210 {
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@212 }
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@212 }
+ResolutionTaskHolder@208 {
+    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
+}
+
+ResolutionTaskHolder@211 {
+    <name not found> = ArrayList@212[1] { ResolutionCandidate@213 }
 }
 
 ResolutionTaskHolder@214 {
     <name not found> = ArrayList@215[1] { ResolutionCandidate@216 }
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@216 }
 }
 
-ResolutionTaskHolder@218 {
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@220 }
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@220 }
+ResolutionTaskHolder@217 {
+    <name not found> = ArrayList@218[1] { ResolutionCandidate@219 }
 }
 
-ResolutionTaskHolder@222 {
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@224 }
+ResolutionTaskHolder@220 {
+    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
+}
+
+ResolutionTaskHolder@223 {
+    <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
 }
 
 ResolutionTaskHolder@226 {
     <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@228 }
 }
 
-ResolutionTaskHolder@230 {
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@232 }
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@232 }
+ResolutionTaskHolder@229 {
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
 }
 
-ResolutionTaskHolder@234 {
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@236 }
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@236 }
+ResolutionTaskHolder@232 {
+    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
+}
+
+ResolutionTaskHolder@235 {
+    <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
 }
 
 ResolutionTaskHolder@238 {
     <name not found> = ArrayList@239[1] { ResolutionCandidate@240 }
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@240 }
 }
 
-ResolutionTaskHolder@242 {
-    <name not found> = ArrayList@243[1] { ResolutionCandidate@244 }
-    <name not found> = ArrayList@245[1] { ResolutionCandidate@244 }
+ResolutionTaskHolder@241 {
+    <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
 }
 
-ResolutionTaskHolder@246 {
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@248 }
-    <name not found> = ArrayList@249[1] { ResolutionCandidate@248 }
+ResolutionTaskHolder@244 {
+    <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
+}
+
+ResolutionTaskHolder@247 {
+    <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
 }
 
 ResolutionTaskHolder@250 {
     <name not found> = ArrayList@251[1] { ResolutionCandidate@252 }
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@252 }
 }
 
-ResolutionTaskHolder@254 {
-    <name not found> = ArrayList@255[1] { ResolutionCandidate@256 }
-    <name not found> = ArrayList@257[1] { ResolutionCandidate@256 }
+ResolutionTaskHolder@253 {
+    <name not found> = ArrayList@254[1] { ResolutionCandidate@255 }
 }
 
-ResolutionTaskHolder@258 {
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@260 }
-    <name not found> = ArrayList@261[1] { ResolutionCandidate@260 }
+ResolutionTaskHolder@256 {
+    <name not found> = ArrayList@257[1] { ResolutionCandidate@258 }
+}
+
+ResolutionTaskHolder@259 {
+    <name not found> = ArrayList@260[1] { ResolutionCandidate@261 }
 }
 
 ResolutionTaskHolder@262 {
     <name not found> = ArrayList@263[1] { ResolutionCandidate@264 }
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@264 }
 }
 
-ResolutionTaskHolder@266 {
-    <name not found> = ArrayList@267[1] { ResolutionCandidate@268 }
-    <name not found> = ArrayList@269[1] { ResolutionCandidate@268 }
+ResolutionTaskHolder@265 {
+    <name not found> = ArrayList@266[1] { ResolutionCandidate@267 }
 }
 
-ResolutionTaskHolder@270 {
-    <name not found> = ArrayList@271[1] { ResolutionCandidate@272 }
-    <name not found> = ArrayList@273[1] { ResolutionCandidate@272 }
+ResolutionTaskHolder@268 {
+    <name not found> = ArrayList@269[1] { ResolutionCandidate@270 }
+}
+
+ResolutionTaskHolder@271 {
+    <name not found> = ArrayList@272[1] { ResolutionCandidate@273 }
 }
 
 ResolutionTaskHolder@274 {
     <name not found> = ArrayList@275[1] { ResolutionCandidate@276 }
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@276 }
 }
 
-ResolutionTaskHolder@278 {
-    <name not found> = ArrayList@279[1] { ResolutionCandidate@280 }
-    <name not found> = ArrayList@281[1] { ResolutionCandidate@280 }
+ResolutionTaskHolder@277 {
+    <name not found> = ArrayList@278[1] { ResolutionCandidate@279 }
 }
 
-ResolutionTaskHolder@282 {
-    <name not found> = ArrayList@283[1] { ResolutionCandidate@284 }
-    <name not found> = ArrayList@285[1] { ResolutionCandidate@284 }
+ResolutionTaskHolder@280 {
+    <name not found> = ArrayList@281[1] { ResolutionCandidate@282 }
 }
 
-ResolutionTaskHolder@286 {
-    <name not found> = ArrayList@287[1] { ResolutionCandidate@288 }
-    <name not found> = ArrayList@289[1] { ResolutionCandidate@288 }
+ResolutionTaskHolder@283 {
+    <name not found> = ArrayList@284[7] { ResolutionCandidate@285, ResolutionCandidate@286, ResolutionCandidate@287, ... }
 }
 
-ResolutionTaskHolder@290 {
-    <name not found> = ArrayList@291[1] { ResolutionCandidate@292 }
-    <name not found> = ArrayList@293[1] { ResolutionCandidate@292 }
+ResolutionTaskHolder@288 {
+    <name not found> = ArrayList@289[8] { ResolutionCandidate@290, ResolutionCandidate@291, ResolutionCandidate@292, ... }
 }
 
-ResolutionTaskHolder@294 {
-    <name not found> = ArrayList@295[1] { ResolutionCandidate@296 }
-    <name not found> = ArrayList@297[1] { ResolutionCandidate@296 }
-}
-
-ResolutionTaskHolder@298 {
-    <name not found> = ArrayList@299[1] { ResolutionCandidate@300 }
-    <name not found> = ArrayList@301[1] { ResolutionCandidate@300 }
-}
-
-ResolutionTaskHolder@302 {
-    <name not found> = ArrayList@303[1] { ResolutionCandidate@304 }
-    <name not found> = ArrayList@305[1] { ResolutionCandidate@304 }
-}
-
-ResolutionTaskHolder@306 {
-    <name not found> = ArrayList@307[1] { ResolutionCandidate@308 }
-    <name not found> = ArrayList@309[1] { ResolutionCandidate@308 }
-}
-
-ResolutionTaskHolder@310 {
-    <name not found> = ArrayList@311[1] { ResolutionCandidate@312 }
-    <name not found> = ArrayList@313[1] { ResolutionCandidate@312 }
-}
-
-ResolutionTaskHolder@314 {
-    <name not found> = ArrayList@315[1] { ResolutionCandidate@316 }
-    <name not found> = ArrayList@317[1] { ResolutionCandidate@316 }
-}
-
-ResolutionTaskHolder@318 {
-    <name not found> = ArrayList@319[1] { ResolutionCandidate@320 }
-    <name not found> = ArrayList@321[1] { ResolutionCandidate@320 }
-}
-
-ResolutionTaskHolder@322 {
-    <name not found> = ArrayList@323[7] { ResolutionCandidate@324, ResolutionCandidate@325, ResolutionCandidate@326, ... }
-    <name not found> = ArrayList@327[7] { ResolutionCandidate@324, ResolutionCandidate@325, ResolutionCandidate@326, ... }
-}
-
-ResolutionTaskHolder@328 {
-    <name not found> = ArrayList@329[8] { ResolutionCandidate@330, ResolutionCandidate@331, ResolutionCandidate@332, ... }
-    <name not found> = ArrayList@333[8] { ResolutionCandidate@330, ResolutionCandidate@331, ResolutionCandidate@332, ... }
-}
-
-ResolutionTaskHolder@334 {
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
+ResolutionTaskHolder@293 {
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
@@ -516,9 +465,7 @@ ResolutionTaskHolder@334 {
     <name not found> = EmptyList@4[empty]
 }
 
-ResolutionTaskHolder@335 {
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
+ResolutionTaskHolder@294 {
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
@@ -529,7 +476,63 @@ ResolutionTaskHolder@335 {
     <name not found> = EmptyList@4[empty]
 }
 
-ResolutionTaskHolder@336 {
+ResolutionTaskHolder@295 {
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+}
+
+null {
+    <name not found> = ArrayList@296[10] { ResolutionCandidate@166, ResolutionCandidate@167, ResolutionCandidate@168, ... }
+    <name not found> = ArrayList@297[1] { ResolutionCandidate@270 }
+    <name not found> = ArrayList@298[1] { ResolutionCandidate@237 }
+    <name not found> = ArrayList@299[1] { ResolutionCandidate@213 }
+    <name not found> = ArrayList@300[1] { ResolutionCandidate@246 }
+    <name not found> = ArrayList@301[1] { ResolutionCandidate@177 }
+    <name not found> = ArrayList@302[1] { ResolutionCandidate@183 }
+    <name not found> = ArrayList@303[1] { ResolutionCandidate@192 }
+    <name not found> = ArrayList@304[1] { ResolutionCandidate@219 }
+    <name not found> = ArrayList@305[1] { ResolutionCandidate@273 }
+    <name not found> = ArrayList@306[1] { ResolutionCandidate@279 }
+    <name not found> = ArrayList@307[1] { ResolutionCandidate@267 }
+    <name not found> = ArrayList@308[1] { ResolutionCandidate@261 }
+    <name not found> = ArrayList@309[1] { ResolutionCandidate@180 }
+    <name not found> = ArrayList@310[1] { ResolutionCandidate@189 }
+    <name not found> = ArrayList@311[1] { ResolutionCandidate@222 }
+    <name not found> = ArrayList@312[1] { ResolutionCandidate@249 }
+    <name not found> = ArrayList@313[1] { ResolutionCandidate@204 }
+    <name not found> = ArrayList@314[1] { ResolutionCandidate@255 }
+    <name not found> = ArrayList@315[1] { ResolutionCandidate@174 }
+    <name not found> = ArrayList@316[1] { ResolutionCandidate@243 }
+    <name not found> = ArrayList@317[1] { ResolutionCandidate@282 }
+    <name not found> = ArrayList@318[1] { ResolutionCandidate@186 }
+    <name not found> = ArrayList@319[1] { ResolutionCandidate@258 }
+    <name not found> = ArrayList@320[1] { ResolutionCandidate@195 }
+    <name not found> = ArrayList@321[1] { ResolutionCandidate@216 }
+    <name not found> = ArrayList@322[1] { ResolutionCandidate@207 }
+    <name not found> = ArrayList@323[1] { ResolutionCandidate@276 }
+    <name not found> = ArrayList@324[1] { ResolutionCandidate@228 }
+    <name not found> = ArrayList@325[1] { ResolutionCandidate@234 }
+    <name not found> = ArrayList@326[1] { ResolutionCandidate@252 }
+    <name not found> = ArrayList@327[1] { ResolutionCandidate@240 }
+    <name not found> = ArrayList@328[1] { ResolutionCandidate@198 }
+    <name not found> = ArrayList@329[1] { ResolutionCandidate@171 }
+    <name not found> = ArrayList@330[1] { ResolutionCandidate@225 }
+    <name not found> = ArrayList@331[1] { ResolutionCandidate@210 }
+    <name not found> = ArrayList@332[1] { ResolutionCandidate@201 }
+    <name not found> = ArrayList@333[1] { ResolutionCandidate@264 }
+    <name not found> = ArrayList@334[1] { ResolutionCandidate@231 }
+    <name not found> = ArrayList@335[7] { ResolutionCandidate@285, ResolutionCandidate@286, ResolutionCandidate@287, ... }
+    <name not found> = ArrayList@336[8] { ResolutionCandidate@290, ResolutionCandidate@291, ResolutionCandidate@292, ... }
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
diff --git a/compiler/testData/diagnostics/tests/controlStructures/kt786.lazy.log b/compiler/testData/diagnostics/tests/controlStructures/kt786.lazy.log
index b590e477818..6e077f12926 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/kt786.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlStructures/kt786.lazy.log
@@ -28,44 +28,47 @@ LazyJavaPackageFragment@7['lang'] {
 
 ResolutionTaskHolder@24 {
     <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
 }
 
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
+ResolutionTaskHolder@27 {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
 }
 
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
+}
+
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
 }
 
 ResolutionTaskHolder@36 {
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[8] { ResolutionCandidate@47, ResolutionCandidate@48, ResolutionCandidate@49, ... }
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[8] { ResolutionCandidate@54, ResolutionCandidate@55, ResolutionCandidate@56, ... }
-    <name not found> = ArrayList@57[8] { ResolutionCandidate@54, ResolutionCandidate@55, ResolutionCandidate@56, ... }
+null {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@26 }
+    <name not found> = ArrayList@57[8] { ResolutionCandidate@47, ResolutionCandidate@48, ResolutionCandidate@49, ... }
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/controlStructures/kt799.lazy.log b/compiler/testData/diagnostics/tests/controlStructures/kt799.lazy.log
index fff68ece530..3bf4bb08276 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/kt799.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlStructures/kt799.lazy.log
@@ -40,10 +40,6 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@34 {
     <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -61,50 +57,57 @@ ResolutionTaskHolder@34 {
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+}
+
 ResolutionTaskHolder@46 {
     <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
 }
 
 ResolutionTaskHolder@58 {
     <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
+}
+
+null {
     <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@54 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/controlStructures/tryReturnType.lazy.log b/compiler/testData/diagnostics/tests/controlStructures/tryReturnType.lazy.log
index d9fa905c2a4..c476f6d5ba5 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/tryReturnType.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlStructures/tryReturnType.lazy.log
@@ -49,16 +49,19 @@ LazyJavaPackageFragment@19['lang'] {
 
 ResolutionTaskHolder@38 {
     <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+}
+
+null {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@40 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
diff --git a/compiler/testData/diagnostics/tests/controlStructures/valVarLoopParameter.lazy.log b/compiler/testData/diagnostics/tests/controlStructures/valVarLoopParameter.lazy.log
index e4db6966a56..f1a17bf6934 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/valVarLoopParameter.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlStructures/valVarLoopParameter.lazy.log
@@ -16,40 +16,43 @@ LazyJavaPackageFragment@4['java'] {
 
 ResolutionTaskHolder@16 {
     <name not found> = ArrayList@17[1] { ResolutionCandidate@18 }
-    <name not found> = ArrayList@19[1] { ResolutionCandidate@18 }
 }
 
-ResolutionTaskHolder@20 {
-    <name not found> = ArrayList@21[1] { ResolutionCandidate@22 }
-    <name not found> = ArrayList@23[1] { ResolutionCandidate@22 }
+ResolutionTaskHolder@19 {
+    <name not found> = ArrayList@20[1] { ResolutionCandidate@21 }
 }
 
-ResolutionTaskHolder@24 {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
+ResolutionTaskHolder@22 {
+    <name not found> = ArrayList@23[1] { ResolutionCandidate@24 }
+}
+
+ResolutionTaskHolder@25 {
+    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
 }
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
 }
 
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
 }
 
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[7] { ResolutionCandidate@36, ResolutionCandidate@37, ResolutionCandidate@38, ... }
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[7] { ResolutionCandidate@42, ResolutionCandidate@43, ResolutionCandidate@44, ... }
-    <name not found> = ArrayList@45[7] { ResolutionCandidate@42, ResolutionCandidate@43, ResolutionCandidate@44, ... }
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[7] { ResolutionCandidate@41, ResolutionCandidate@42, ResolutionCandidate@43, ... }
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[7] { ResolutionCandidate@48, ResolutionCandidate@49, ResolutionCandidate@50, ... }
-    <name not found> = ArrayList@51[7] { ResolutionCandidate@48, ResolutionCandidate@49, ResolutionCandidate@50, ... }
+null {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@18 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@27 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@21 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@24 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@50[7] { ResolutionCandidate@36, ResolutionCandidate@37, ResolutionCandidate@38, ... }
+    <name not found> = ArrayList@51[7] { ResolutionCandidate@41, ResolutionCandidate@42, ResolutionCandidate@43, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/controlStructures/when.kt234.kt973.lazy.log b/compiler/testData/diagnostics/tests/controlStructures/when.kt234.kt973.lazy.log
index dce35ccde03..bc8e509e2d7 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/when.kt234.kt973.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlStructures/when.kt234.kt973.lazy.log
@@ -47,53 +47,56 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@39 {
     <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
 }
 
 ResolutionTaskHolder@51 {
     <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
 }
 
 ResolutionTaskHolder@63 {
     <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
+}
+
+null {
     <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@59 }
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/cyclicHierarchy/classIndirectlyInheritsNested.lazy.log b/compiler/testData/diagnostics/tests/cyclicHierarchy/classIndirectlyInheritsNested.lazy.log
index 310fb6b6017..c25346211da 100644
--- a/compiler/testData/diagnostics/tests/cyclicHierarchy/classIndirectlyInheritsNested.lazy.log
+++ b/compiler/testData/diagnostics/tests/cyclicHierarchy/classIndirectlyInheritsNested.lazy.log
@@ -22,10 +22,13 @@ LazyJavaPackageFragment@6['java'] {
 
 ResolutionTaskHolder@22 {
     <name not found> = ArrayList@23[1] { ResolutionCandidate@24 }
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@24 }
 }
 
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
+ResolutionTaskHolder@25 {
+    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
+}
+
+null {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@24 }
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@27 }
 }
diff --git a/compiler/testData/diagnostics/tests/cyclicHierarchy/classInheritsNested.lazy.log b/compiler/testData/diagnostics/tests/cyclicHierarchy/classInheritsNested.lazy.log
index cade85036a0..bdfc7869db2 100644
--- a/compiler/testData/diagnostics/tests/cyclicHierarchy/classInheritsNested.lazy.log
+++ b/compiler/testData/diagnostics/tests/cyclicHierarchy/classInheritsNested.lazy.log
@@ -19,5 +19,8 @@ LazyJavaPackageFragment@5['java'] {
 
 ResolutionTaskHolder@19 {
     <name not found> = ArrayList@20[1] { ResolutionCandidate@21 }
+}
+
+null {
     <name not found> = ArrayList@22[1] { ResolutionCandidate@21 }
 }
diff --git a/compiler/testData/diagnostics/tests/cyclicHierarchy/cyclicHierarchy.lazy.log b/compiler/testData/diagnostics/tests/cyclicHierarchy/cyclicHierarchy.lazy.log
index 7fd0010ba83..6aa589e69d2 100644
--- a/compiler/testData/diagnostics/tests/cyclicHierarchy/cyclicHierarchy.lazy.log
+++ b/compiler/testData/diagnostics/tests/cyclicHierarchy/cyclicHierarchy.lazy.log
@@ -89,68 +89,272 @@ LazyJavaPackageFragment@24['lang'] {
 
 ResolutionTaskHolder@63 {
     <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
     <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
     <name not found> = EmptyList@55[empty]
 }
 
 ResolutionTaskHolder@75 {
     <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
     <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
     <name not found> = EmptyList@55[empty]
 }
 
 ResolutionTaskHolder@87 {
     <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
+}
+
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
+}
+
+ResolutionTaskHolder@93 {
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
+ResolutionTaskHolder@94 {
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
 
 ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@96 {
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@97 {
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@98 {
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
 }
 
 ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@100 {
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@101 {
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@102 {
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
 }
 
 ResolutionTaskHolder@103 {
@@ -166,24 +370,6 @@ ResolutionTaskHolder@103 {
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
 }
 
 ResolutionTaskHolder@104 {
@@ -199,27 +385,51 @@ ResolutionTaskHolder@104 {
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@105 {
+null {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@77 }
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
@@ -251,210 +461,3 @@ ResolutionTaskHolder@105 {
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
-
-ResolutionTaskHolder@106 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/cyclicHierarchy/kotlinJavaCycle.lazy.log b/compiler/testData/diagnostics/tests/cyclicHierarchy/kotlinJavaCycle.lazy.log
index f2ea21e3794..915650e95bd 100644
--- a/compiler/testData/diagnostics/tests/cyclicHierarchy/kotlinJavaCycle.lazy.log
+++ b/compiler/testData/diagnostics/tests/cyclicHierarchy/kotlinJavaCycle.lazy.log
@@ -41,5 +41,8 @@ LazyJavaPackageFragment@17['java'] {
 
 ResolutionTaskHolder@34 {
     <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
+}
+
+null {
     <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
 }
diff --git a/compiler/testData/diagnostics/tests/cyclicHierarchy/kotlinJavaKotlinCycle.lazy.log b/compiler/testData/diagnostics/tests/cyclicHierarchy/kotlinJavaKotlinCycle.lazy.log
index 7a3f2306c61..df800e166d7 100644
--- a/compiler/testData/diagnostics/tests/cyclicHierarchy/kotlinJavaKotlinCycle.lazy.log
+++ b/compiler/testData/diagnostics/tests/cyclicHierarchy/kotlinJavaKotlinCycle.lazy.log
@@ -44,10 +44,13 @@ LazyJavaPackageFragment@18['java'] {
 
 ResolutionTaskHolder@37 {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+}
+
+null {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@39 }
 }
diff --git a/compiler/testData/diagnostics/tests/cyclicHierarchy/kt303.lazy.log b/compiler/testData/diagnostics/tests/cyclicHierarchy/kt303.lazy.log
index 02cd30cc0c5..db376f0441a 100644
--- a/compiler/testData/diagnostics/tests/cyclicHierarchy/kt303.lazy.log
+++ b/compiler/testData/diagnostics/tests/cyclicHierarchy/kt303.lazy.log
@@ -46,19 +46,22 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@34 {
     <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+}
+
+null {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@36 }
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/cyclicHierarchy/twoClassesWithNestedCycle.lazy.log b/compiler/testData/diagnostics/tests/cyclicHierarchy/twoClassesWithNestedCycle.lazy.log
index 02b00d2a564..62d313630b0 100644
--- a/compiler/testData/diagnostics/tests/cyclicHierarchy/twoClassesWithNestedCycle.lazy.log
+++ b/compiler/testData/diagnostics/tests/cyclicHierarchy/twoClassesWithNestedCycle.lazy.log
@@ -22,10 +22,13 @@ LazyJavaPackageFragment@6['java'] {
 
 ResolutionTaskHolder@22 {
     <name not found> = ArrayList@23[1] { ResolutionCandidate@24 }
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@24 }
 }
 
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
+ResolutionTaskHolder@25 {
+    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
+}
+
+null {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@24 }
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@27 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataClasses/bothParamsAreNotProperties.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/bothParamsAreNotProperties.lazy.log
index f98633ae129..cc7946a067e 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/bothParamsAreNotProperties.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataClasses/bothParamsAreNotProperties.lazy.log
@@ -54,17 +54,83 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@50 {
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@51 {
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
 }
 
 ResolutionTaskHolder@52 {
@@ -80,39 +146,12 @@ ResolutionTaskHolder@52 {
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+null {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@48 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -132,39 +171,3 @@ ResolutionTaskHolder@53 {
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
-
-ResolutionTaskHolder@54 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataClasses/componentFunctionInSubClass.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/componentFunctionInSubClass.lazy.log
index ff71b077c14..35acb033d16 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/componentFunctionInSubClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataClasses/componentFunctionInSubClass.lazy.log
@@ -55,12 +55,6 @@ LazyJavaPackageFragment@14['lang'] {
 
 ResolutionTaskHolder@41 {
     <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
@@ -86,36 +80,45 @@ ResolutionTaskHolder@41 {
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
+}
+
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
 }
 
 ResolutionTaskHolder@53 {
     <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+null {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@43 }
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/dataClasses/componentFunctionVisibility.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/componentFunctionVisibility.lazy.log
index d509840bf71..6956e73a4c8 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/componentFunctionVisibility.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataClasses/componentFunctionVisibility.lazy.log
@@ -63,14 +63,6 @@ LazyJavaPackageFragment@15['lang'] {
 
 ResolutionTaskHolder@46 {
     <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
@@ -104,14 +96,8 @@ ResolutionTaskHolder@46 {
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
@@ -137,9 +123,8 @@ ResolutionTaskHolder@50 {
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
@@ -163,6 +148,13 @@ ResolutionTaskHolder@54 {
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
@@ -172,14 +164,6 @@ ResolutionTaskHolder@54 {
 
 ResolutionTaskHolder@58 {
     <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
@@ -190,18 +174,8 @@ ResolutionTaskHolder@58 {
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
@@ -210,43 +184,72 @@ ResolutionTaskHolder@62 {
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
+}
+
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
 }
 
 ResolutionTaskHolder@70 {
     <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
 }
 
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+null {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@60 }
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/dataClasses/componentFunctionsAreFinal.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/componentFunctionsAreFinal.lazy.log
index c37236afa8e..7965008d462 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/componentFunctionsAreFinal.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataClasses/componentFunctionsAreFinal.lazy.log
@@ -42,30 +42,33 @@ LazyJavaPackageFragment@12['java'] {
 
 ResolutionTaskHolder@38 {
     <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+}
+
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
 }
 
 ResolutionTaskHolder@50 {
     <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
+null {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@40 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataClasses/componentNamedComponent1.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/componentNamedComponent1.lazy.log
index d3aafcb46bd..3a6f1d32c53 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/componentNamedComponent1.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataClasses/componentNamedComponent1.lazy.log
@@ -51,12 +51,6 @@ LazyJavaPackageFragment@12['lang'] {
 ResolutionTaskHolder@36 {
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
     <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
@@ -64,29 +58,23 @@ ResolutionTaskHolder@36 {
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
+}
+
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
 }
 
 ResolutionTaskHolder@47 {
     <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
+ResolutionTaskHolder@53 {
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
@@ -96,3 +84,18 @@ ResolutionTaskHolder@59 {
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
+
+null {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@43 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/dataClasses/conflictingCopyOverloads.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/conflictingCopyOverloads.lazy.log
index c6f19017c79..4e12f60ef44 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/conflictingCopyOverloads.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataClasses/conflictingCopyOverloads.lazy.log
@@ -53,15 +53,6 @@ LazyJavaPackageFragment@16['lang'] {
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -72,22 +63,34 @@ ResolutionTaskHolder@40 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
 }
 
 ResolutionTaskHolder@52 {
     <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+null {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@42 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/dataClasses/conflictingOverloads.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/conflictingOverloads.lazy.log
index 4781cd3a8c6..624cb4b5f1f 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/conflictingOverloads.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataClasses/conflictingOverloads.lazy.log
@@ -42,5 +42,8 @@ LazyJavaPackageFragment@13['java'] {
 
 ResolutionTaskHolder@35 {
     <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+}
+
+null {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataClasses/dataClassOverrideConflict.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/dataClassOverrideConflict.lazy.log
index 8efd88fb743..3bd4e1b9121 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/dataClassOverrideConflict.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataClasses/dataClassOverrideConflict.lazy.log
@@ -45,15 +45,18 @@ LazyJavaPackageFragment@15['java'] {
 
 ResolutionTaskHolder@39 {
     <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+}
+
+null {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@41 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataClasses/emptyConstructor.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/emptyConstructor.lazy.log
index bd9ab4a4379..41767b841dd 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/emptyConstructor.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataClasses/emptyConstructor.lazy.log
@@ -46,17 +46,83 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@32 {
     <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
 }
 
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
+}
+
+ResolutionTaskHolder@41 {
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+}
+
+ResolutionTaskHolder@42 {
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+}
+
+ResolutionTaskHolder@43 {
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
 }
 
 ResolutionTaskHolder@44 {
@@ -72,39 +138,12 @@ ResolutionTaskHolder@44 {
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
+null {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@37 }
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -124,39 +163,3 @@ ResolutionTaskHolder@45 {
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
 }
-
-ResolutionTaskHolder@46 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataClasses/firstParamIsVal.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/firstParamIsVal.lazy.log
index 52ec6327e01..bec0cc93ffe 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/firstParamIsVal.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataClasses/firstParamIsVal.lazy.log
@@ -54,12 +54,6 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -68,28 +62,19 @@ ResolutionTaskHolder@40 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
 }
 
 ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -116,7 +101,7 @@ ResolutionTaskHolder@56 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@57 {
+ResolutionTaskHolder@53 {
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -129,6 +114,24 @@ ResolutionTaskHolder@57 {
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
+}
+
+null {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@51 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
diff --git a/compiler/testData/diagnostics/tests/dataClasses/firstParamIsVar.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/firstParamIsVar.lazy.log
index 52ec6327e01..0eedcbc7413 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/firstParamIsVar.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataClasses/firstParamIsVar.lazy.log
@@ -54,12 +54,6 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -68,28 +62,19 @@ ResolutionTaskHolder@40 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
 }
 
 ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -116,7 +101,7 @@ ResolutionTaskHolder@56 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@57 {
+ResolutionTaskHolder@53 {
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -129,6 +114,24 @@ ResolutionTaskHolder@57 {
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
+}
+
+null {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@45 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
diff --git a/compiler/testData/diagnostics/tests/dataClasses/implementTraitWhichHasComponent1.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/implementTraitWhichHasComponent1.lazy.log
index 60cd959f8ba..113c54f8fa4 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/implementTraitWhichHasComponent1.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataClasses/implementTraitWhichHasComponent1.lazy.log
@@ -36,5 +36,8 @@ LazyJavaPackageFragment@11['java'] {
 
 ResolutionTaskHolder@32 {
     <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
+}
+
+null {
     <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataClasses/implementTraitWhichHasFinalComponent1.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/implementTraitWhichHasFinalComponent1.lazy.log
index 60cd959f8ba..113c54f8fa4 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/implementTraitWhichHasFinalComponent1.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataClasses/implementTraitWhichHasFinalComponent1.lazy.log
@@ -36,5 +36,8 @@ LazyJavaPackageFragment@11['java'] {
 
 ResolutionTaskHolder@32 {
     <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
+}
+
+null {
     <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataClasses/multiDeclaration.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/multiDeclaration.lazy.log
index 8e3638e6ff5..dc9e9b66a1d 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/multiDeclaration.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataClasses/multiDeclaration.lazy.log
@@ -54,12 +54,6 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -68,14 +62,8 @@ ResolutionTaskHolder@40 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -84,22 +72,37 @@ ResolutionTaskHolder@44 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
 }
 
 ResolutionTaskHolder@52 {
     <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+null {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@57 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/dataClasses/multiDeclarationFor.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/multiDeclarationFor.lazy.log
index db572b86718..13fccc3ea4d 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/multiDeclarationFor.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataClasses/multiDeclarationFor.lazy.log
@@ -58,12 +58,6 @@ LazyJavaPackageFragment@14['lang'] {
 
 ResolutionTaskHolder@44 {
     <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
@@ -72,14 +66,8 @@ ResolutionTaskHolder@44 {
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
@@ -88,37 +76,52 @@ ResolutionTaskHolder@48 {
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
+}
+
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
 }
 
 ResolutionTaskHolder@56 {
     <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
+}
+
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
 }
 
 ResolutionTaskHolder@68 {
     <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+null {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@70 }
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/dataClasses/noConstructor.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/noConstructor.lazy.log
index bd9ab4a4379..41767b841dd 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/noConstructor.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataClasses/noConstructor.lazy.log
@@ -46,17 +46,83 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@32 {
     <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
 }
 
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
+}
+
+ResolutionTaskHolder@41 {
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+}
+
+ResolutionTaskHolder@42 {
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+}
+
+ResolutionTaskHolder@43 {
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
 }
 
 ResolutionTaskHolder@44 {
@@ -72,39 +138,12 @@ ResolutionTaskHolder@44 {
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
+null {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@37 }
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -124,39 +163,3 @@ ResolutionTaskHolder@45 {
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
 }
-
-ResolutionTaskHolder@46 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataClasses/notADataClass.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/notADataClass.lazy.log
index 230ae2d26ff..a0633ec5068 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/notADataClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataClasses/notADataClass.lazy.log
@@ -45,12 +45,64 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@33 {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+}
+
+ResolutionTaskHolder@39 {
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
 }
 
 ResolutionTaskHolder@41 {
@@ -66,24 +118,6 @@ ResolutionTaskHolder@41 {
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
 }
 
 ResolutionTaskHolder@42 {
@@ -99,45 +133,14 @@ ResolutionTaskHolder@42 {
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@44 {
+null {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@38 }
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
diff --git a/compiler/testData/diagnostics/tests/dataClasses/oneValParam.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/oneValParam.lazy.log
index 0b06bd8fa35..c1d4d4ebad0 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/oneValParam.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataClasses/oneValParam.lazy.log
@@ -50,12 +50,6 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@36 {
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
@@ -64,28 +58,19 @@ ResolutionTaskHolder@36 {
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
+}
+
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
 }
 
 ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
@@ -112,7 +97,7 @@ ResolutionTaskHolder@52 {
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@53 {
+ResolutionTaskHolder@49 {
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
@@ -125,6 +110,24 @@ ResolutionTaskHolder@53 {
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
+}
+
+null {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@41 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
diff --git a/compiler/testData/diagnostics/tests/dataClasses/overrideInvisibleMember.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/overrideInvisibleMember.lazy.log
index 4c712e190af..3058d62b23f 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/overrideInvisibleMember.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataClasses/overrideInvisibleMember.lazy.log
@@ -41,15 +41,18 @@ LazyJavaPackageFragment@14['java'] {
 
 ResolutionTaskHolder@35 {
     <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
+}
+
+null {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@37 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataClasses/paramNameSameToField.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/paramNameSameToField.lazy.log
index 1cc6f9d44fd..3231f444761 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/paramNameSameToField.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataClasses/paramNameSameToField.lazy.log
@@ -69,12 +69,6 @@ LazyJavaPackageFragment@17['lang'] {
 
 ResolutionTaskHolder@48 {
     <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
@@ -83,37 +77,58 @@ ResolutionTaskHolder@48 {
     <name not found> = EmptyList@40[empty]
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+}
+
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
 }
 
 ResolutionTaskHolder@60 {
     <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+ResolutionTaskHolder@69 {
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
 }
 
-ResolutionTaskHolder@76 {
+ResolutionTaskHolder@70 {
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
@@ -138,6 +153,15 @@ ResolutionTaskHolder@76 {
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
+}
+
+ResolutionTaskHolder@71 {
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
@@ -146,25 +170,7 @@ ResolutionTaskHolder@76 {
     <name not found> = EmptyList@40[empty]
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
+ResolutionTaskHolder@72 {
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
@@ -179,25 +185,22 @@ ResolutionTaskHolder@77 {
     <name not found> = EmptyList@40[empty]
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@79 {
+null {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@53 }
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
diff --git a/compiler/testData/diagnostics/tests/dataClasses/secondParamIsVal.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/secondParamIsVal.lazy.log
index 52ec6327e01..bec0cc93ffe 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/secondParamIsVal.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataClasses/secondParamIsVal.lazy.log
@@ -54,12 +54,6 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -68,28 +62,19 @@ ResolutionTaskHolder@40 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
 }
 
 ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -116,7 +101,7 @@ ResolutionTaskHolder@56 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@57 {
+ResolutionTaskHolder@53 {
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -129,6 +114,24 @@ ResolutionTaskHolder@57 {
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
+}
+
+null {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@51 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
diff --git a/compiler/testData/diagnostics/tests/dataClasses/secondParamIsVar.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/secondParamIsVar.lazy.log
index 52ec6327e01..dbca714059c 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/secondParamIsVar.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataClasses/secondParamIsVar.lazy.log
@@ -54,12 +54,6 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -68,28 +62,19 @@ ResolutionTaskHolder@40 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
 }
 
 ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -116,7 +101,7 @@ ResolutionTaskHolder@56 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@57 {
+ResolutionTaskHolder@53 {
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -129,6 +114,24 @@ ResolutionTaskHolder@57 {
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
+}
+
+null {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@48 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
diff --git a/compiler/testData/diagnostics/tests/dataClasses/twoValParams.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/twoValParams.lazy.log
index b196a47b0c6..185d75b2632 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/twoValParams.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataClasses/twoValParams.lazy.log
@@ -54,12 +54,6 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -68,14 +62,8 @@ ResolutionTaskHolder@40 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -84,17 +72,32 @@ ResolutionTaskHolder@44 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
 }
 
 ResolutionTaskHolder@52 {
     <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+null {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@45 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/dataClasses/twoVarParams.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/twoVarParams.lazy.log
index b196a47b0c6..80e9e0465ac 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/twoVarParams.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataClasses/twoVarParams.lazy.log
@@ -54,12 +54,6 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -68,14 +62,8 @@ ResolutionTaskHolder@40 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -84,17 +72,32 @@ ResolutionTaskHolder@44 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
 }
 
 ResolutionTaskHolder@52 {
     <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+null {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@42 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlow/CalleeExpression.lazy.log b/compiler/testData/diagnostics/tests/dataFlow/CalleeExpression.lazy.log
index 0d037a9ce27..74a9ee3cb77 100644
--- a/compiler/testData/diagnostics/tests/dataFlow/CalleeExpression.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlow/CalleeExpression.lazy.log
@@ -30,20 +30,23 @@ LazyJavaPackageFragment@7['java'] {
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
 }
 
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
 }
 
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
+}
+
+null {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@39 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlow/EmptyIf.lazy.log b/compiler/testData/diagnostics/tests/dataFlow/EmptyIf.lazy.log
index a118e6bfac0..9de9f966998 100644
--- a/compiler/testData/diagnostics/tests/dataFlow/EmptyIf.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlow/EmptyIf.lazy.log
@@ -37,117 +37,120 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
 }
 
 ResolutionTaskHolder@43 {
     <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
 }
 
 ResolutionTaskHolder@55 {
     <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
+}
+
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
 }
 
 ResolutionTaskHolder@67 {
     <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
 }
 
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
 }
 
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
+}
+
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
 }
 
 ResolutionTaskHolder@79 {
     <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
 }
 
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
 }
 
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
+}
+
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
 }
 
 ResolutionTaskHolder@91 {
     <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
 }
 
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
 }
 
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[2] { ResolutionCandidate@99, ResolutionCandidate@100 }
 }
 
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@113 }
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@117 }
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[2] { ResolutionCandidate@121, ResolutionCandidate@122 }
-    <name not found> = ArrayList@123[2] { ResolutionCandidate@121, ResolutionCandidate@122 }
+null {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@123[2] { ResolutionCandidate@99, ResolutionCandidate@100 }
+    <name not found> = EmptyList@28[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlow/IsExpression.lazy.log b/compiler/testData/diagnostics/tests/dataFlow/IsExpression.lazy.log
index b58bbb51e85..e1e8cf80dab 100644
--- a/compiler/testData/diagnostics/tests/dataFlow/IsExpression.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlow/IsExpression.lazy.log
@@ -46,13 +46,7 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@34 {
     <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@38[8] { ResolutionCandidate@39, ResolutionCandidate@40, ResolutionCandidate@41, ... }
-    <name not found> = ArrayList@42[8] { ResolutionCandidate@39, ResolutionCandidate@40, ResolutionCandidate@41, ... }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
+    <name not found> = ArrayList@37[8] { ResolutionCandidate@38, ResolutionCandidate@39, ResolutionCandidate@40, ... }
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
@@ -77,12 +71,8 @@ ResolutionTaskHolder@34 {
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
@@ -100,17 +90,30 @@ ResolutionTaskHolder@43 {
     <name not found> = EmptyList@26[empty]
 }
 
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+}
+
 ResolutionTaskHolder@47 {
     <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+null {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@58[8] { ResolutionCandidate@38, ResolutionCandidate@39, ResolutionCandidate@40, ... }
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlow/WhenSubject.lazy.log b/compiler/testData/diagnostics/tests/dataFlow/WhenSubject.lazy.log
index 4ab7c355982..36098d79439 100644
--- a/compiler/testData/diagnostics/tests/dataFlow/WhenSubject.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlow/WhenSubject.lazy.log
@@ -29,15 +29,18 @@ LazyJavaPackageFragment@7['java'] {
 
 ResolutionTaskHolder@27 {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
 }
 
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
+}
+
+null {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@35 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassBase.lazy.log b/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassBase.lazy.log
index ad703085332..ad5b4e0607a 100644
--- a/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassBase.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassBase.lazy.log
@@ -45,34 +45,37 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@36 {
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@28[empty]
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
+}
+
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
 }
 
 ResolutionTaskHolder@47 {
     <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+null {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@43 }
+    <name not found> = EmptyList@28[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassDefaultParameters.lazy.log b/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassDefaultParameters.lazy.log
index e1493b9590a..003931b6818 100644
--- a/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassDefaultParameters.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassDefaultParameters.lazy.log
@@ -27,20 +27,23 @@ LazyJavaPackageFragment@6['java'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
+}
+
+null {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@27 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassDelegatedProperties.lazy.log b/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassDelegatedProperties.lazy.log
index a2372695090..9de3981d766 100644
--- a/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassDelegatedProperties.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassDelegatedProperties.lazy.log
@@ -57,15 +57,6 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -76,17 +67,8 @@ ResolutionTaskHolder@40 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -97,9 +79,8 @@ ResolutionTaskHolder@44 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -108,6 +89,10 @@ ResolutionTaskHolder@48 {
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -120,15 +105,6 @@ ResolutionTaskHolder@48 {
 
 ResolutionTaskHolder@52 {
     <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -139,17 +115,8 @@ ResolutionTaskHolder@52 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -160,66 +127,31 @@ ResolutionTaskHolder@56 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
+}
+
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
 }
 
 ResolutionTaskHolder@64 {
     <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
+}
+
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
 }
 
 ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -254,7 +186,78 @@ ResolutionTaskHolder@88 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@89 {
+ResolutionTaskHolder@77 {
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+}
+
+null {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@54 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
diff --git a/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassDelegation.lazy.log b/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassDelegation.lazy.log
index 9c861abf5d9..2eff08812a1 100644
--- a/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassDelegation.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassDelegation.lazy.log
@@ -26,10 +26,13 @@ LazyJavaPackageFragment@6['java'] {
 
 ResolutionTaskHolder@24 {
     <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
 }
 
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
+ResolutionTaskHolder@27 {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
+}
+
+null {
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@26 }
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@29 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassFunctions.lazy.log b/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassFunctions.lazy.log
index 08401d4dd26..20322e9d284 100644
--- a/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassFunctions.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassFunctions.lazy.log
@@ -34,35 +34,38 @@ LazyJavaPackageFragment@9['java'] {
 
 ResolutionTaskHolder@30 {
     <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
 }
 
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+}
+
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
 }
 
 ResolutionTaskHolder@42 {
     <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+null {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@41 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassInMemberOfLocalClass.lazy.log b/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassInMemberOfLocalClass.lazy.log
index cdae901e195..08e7a9f7573 100644
--- a/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassInMemberOfLocalClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassInMemberOfLocalClass.lazy.log
@@ -27,30 +27,33 @@ LazyJavaPackageFragment@6['java'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+}
+
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
 }
 
 ResolutionTaskHolder@37 {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+null {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@27 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassInitializer.lazy.log b/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassInitializer.lazy.log
index 412cce53b2b..cb51d7821a2 100644
--- a/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassInitializer.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassInitializer.lazy.log
@@ -29,25 +29,28 @@ LazyJavaPackageFragment@7['java'] {
 
 ResolutionTaskHolder@27 {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
 }
 
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
+}
+
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
 }
 
 ResolutionTaskHolder@39 {
     <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+null {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@32 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassProperty.lazy.log b/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassProperty.lazy.log
index 85a8d2e6496..5909d251005 100644
--- a/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassProperty.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassProperty.lazy.log
@@ -37,30 +37,33 @@ LazyJavaPackageFragment@9['java'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
 }
 
 ResolutionTaskHolder@43 {
     <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+null {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@33 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlow/local/LocalObject.lazy.log b/compiler/testData/diagnostics/tests/dataFlow/local/LocalObject.lazy.log
index e956cf6b015..44687f6fe2b 100644
--- a/compiler/testData/diagnostics/tests/dataFlow/local/LocalObject.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlow/local/LocalObject.lazy.log
@@ -38,25 +38,28 @@ LazyJavaPackageFragment@11['java'] {
 
 ResolutionTaskHolder@32 {
     <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
 }
 
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
+}
+
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
 }
 
 ResolutionTaskHolder@44 {
     <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+null {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@46 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlow/local/LocalObjectDelegation.lazy.log b/compiler/testData/diagnostics/tests/dataFlow/local/LocalObjectDelegation.lazy.log
index 809e37f46c0..78d14a210f4 100644
--- a/compiler/testData/diagnostics/tests/dataFlow/local/LocalObjectDelegation.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlow/local/LocalObjectDelegation.lazy.log
@@ -48,29 +48,32 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@35 {
     <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@27[empty]
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+}
+
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
 }
 
 ResolutionTaskHolder@46 {
     <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+null {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@51 }
+    <name not found> = EmptyList@27[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlow/local/NestedLocalClass.lazy.log b/compiler/testData/diagnostics/tests/dataFlow/local/NestedLocalClass.lazy.log
index 04be9f584c0..b67c287e1f7 100644
--- a/compiler/testData/diagnostics/tests/dataFlow/local/NestedLocalClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlow/local/NestedLocalClass.lazy.log
@@ -27,15 +27,18 @@ LazyJavaPackageFragment@6['java'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+}
+
+null {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@27 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlow/local/kt2835.lazy.log b/compiler/testData/diagnostics/tests/dataFlow/local/kt2835.lazy.log
index 846cbc2802b..ec51742fa23 100644
--- a/compiler/testData/diagnostics/tests/dataFlow/local/kt2835.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlow/local/kt2835.lazy.log
@@ -41,24 +41,27 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@30 {
     <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@22[empty]
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+}
+
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
 }
 
 ResolutionTaskHolder@41 {
     <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+null {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@37 }
+    <name not found> = EmptyList@22[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AndOr.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AndOr.lazy.log
index e9ce3701850..7bf387652af 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AndOr.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AndOr.lazy.log
@@ -42,28 +42,18 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@20[empty]
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@35 {
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
     <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+    <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@38 {
     <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
@@ -81,9 +71,8 @@ ResolutionTaskHolder@42 {
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
@@ -99,6 +88,41 @@ ResolutionTaskHolder@46 {
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
@@ -106,227 +130,206 @@ ResolutionTaskHolder@46 {
 
 ResolutionTaskHolder@50 {
     <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
 ResolutionTaskHolder@62 {
     <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
 ResolutionTaskHolder@74 {
     <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
 }
 
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
+}
+
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
 }
 
 ResolutionTaskHolder@86 {
     <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
+}
+
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
 }
 
 ResolutionTaskHolder@98 {
     <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
 }
 
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
 }
 
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
+}
+
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
 }
 
 ResolutionTaskHolder@110 {
     <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
 }
 
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
+ResolutionTaskHolder@113 {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
 }
 
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
+}
+
+ResolutionTaskHolder@119 {
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
 }
 
 ResolutionTaskHolder@122 {
     <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
 }
 
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
+ResolutionTaskHolder@125 {
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
 }
 
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@132 }
+ResolutionTaskHolder@128 {
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
 }
 
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@136 }
+ResolutionTaskHolder@131 {
+    <name not found> = ArrayList@132[7] { ResolutionCandidate@133, ResolutionCandidate@134, ResolutionCandidate@135, ... }
 }
 
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@140 }
+ResolutionTaskHolder@136 {
+    <name not found> = ArrayList@137[8] { ResolutionCandidate@138, ResolutionCandidate@139, ResolutionCandidate@140, ... }
 }
 
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@144 }
-}
-
-ResolutionTaskHolder@146 {
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@148 }
-}
-
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@152 }
-}
-
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@156 }
-}
-
-ResolutionTaskHolder@158 {
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@160 }
-}
-
-ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@164 }
-}
-
-ResolutionTaskHolder@166 {
-    <name not found> = ArrayList@167[7] { ResolutionCandidate@168, ResolutionCandidate@169, ResolutionCandidate@170, ... }
-    <name not found> = ArrayList@171[7] { ResolutionCandidate@168, ResolutionCandidate@169, ResolutionCandidate@170, ... }
-}
-
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[8] { ResolutionCandidate@174, ResolutionCandidate@175, ResolutionCandidate@176, ... }
-    <name not found> = ArrayList@177[8] { ResolutionCandidate@174, ResolutionCandidate@175, ResolutionCandidate@176, ... }
+null {
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@166[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@168[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@170[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@124 }
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@127 }
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@176[7] { ResolutionCandidate@133, ResolutionCandidate@134, ResolutionCandidate@135, ... }
+    <name not found> = ArrayList@177[8] { ResolutionCandidate@138, ResolutionCandidate@139, ResolutionCandidate@140, ... }
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayAccess.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayAccess.lazy.log
index 32b605e3d29..11686daf27f 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayAccess.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayAccess.lazy.log
@@ -50,39 +50,78 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@30 {
     <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@22[empty]
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@37 {
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+    <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
+    <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@51 {
     <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
@@ -108,213 +147,177 @@ ResolutionTaskHolder@51 {
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@63 {
     <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
+}
+
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
 }
 
 ResolutionTaskHolder@75 {
     <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
 }
 
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
+}
+
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
 }
 
 ResolutionTaskHolder@87 {
     <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
 }
 
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
 }
 
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
+}
+
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
 }
 
 ResolutionTaskHolder@99 {
     <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
 }
 
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
 }
 
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
+}
+
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
 }
 
 ResolutionTaskHolder@111 {
     <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@113 }
 }
 
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@117 }
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
 }
 
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@121 }
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
+}
+
+ResolutionTaskHolder@120 {
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
 }
 
 ResolutionTaskHolder@123 {
     <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@125 }
 }
 
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@129 }
+ResolutionTaskHolder@126 {
+    <name not found> = ArrayList@127[8] { ResolutionCandidate@128, ResolutionCandidate@129, ResolutionCandidate@130, ... }
 }
 
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@133 }
-}
-
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@137 }
-}
-
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@141 }
-}
-
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@145 }
-}
-
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@149 }
-}
-
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@153 }
-}
-
-ResolutionTaskHolder@155 {
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@157 }
-}
-
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[8] { ResolutionCandidate@161, ResolutionCandidate@162, ResolutionCandidate@163, ... }
-    <name not found> = ArrayList@164[8] { ResolutionCandidate@161, ResolutionCandidate@162, ResolutionCandidate@163, ... }
+null {
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@125 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@122 }
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@113 }
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@164[8] { ResolutionCandidate@128, ResolutionCandidate@129, ResolutionCandidate@130, ... }
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayExpression.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayExpression.lazy.log
index 247d62d8df9..7d249bbe164 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayExpression.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayExpression.lazy.log
@@ -31,20 +31,23 @@ LazyJavaPackageFragment@7['java'] {
 
 ResolutionTaskHolder@29 {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
+}
+
+null {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@34 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayGetSetConvention.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayGetSetConvention.lazy.log
index 376a4b9d2b3..5bb4bc79403 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayGetSetConvention.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayGetSetConvention.lazy.log
@@ -26,150 +26,153 @@ LazyJavaPackageFragment@6['java'] {
 
 ResolutionTaskHolder@24 {
     <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
 }
 
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
+ResolutionTaskHolder@27 {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
 }
 
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
+}
+
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
 }
 
 ResolutionTaskHolder@36 {
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
+}
+
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
 }
 
 ResolutionTaskHolder@48 {
     <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+}
+
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
 }
 
 ResolutionTaskHolder@60 {
     <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
+}
+
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
 }
 
 ResolutionTaskHolder@72 {
     <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
 }
 
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
+}
+
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
 }
 
 ResolutionTaskHolder@84 {
     <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
 }
 
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
+}
+
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
 }
 
 ResolutionTaskHolder@96 {
     <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
 }
 
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
+}
+
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
 }
 
 ResolutionTaskHolder@108 {
     <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
 }
 
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
+ResolutionTaskHolder@111 {
+    <name not found> = ArrayList@112[8] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
 }
 
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@126 }
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
-}
-
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
-}
-
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[8] { ResolutionCandidate@142, ResolutionCandidate@143, ResolutionCandidate@144, ... }
-    <name not found> = ArrayList@145[8] { ResolutionCandidate@142, ResolutionCandidate@143, ResolutionCandidate@144, ... }
+null {
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@26 }
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@145[8] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayIndices.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayIndices.lazy.log
index 37674366dc8..ec2dd5682f0 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayIndices.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayIndices.lazy.log
@@ -27,80 +27,83 @@ LazyJavaPackageFragment@6['java'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+}
+
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
 }
 
 ResolutionTaskHolder@37 {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+}
+
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
 }
 
 ResolutionTaskHolder@49 {
     <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
+}
+
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
 }
 
 ResolutionTaskHolder@61 {
     <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
+null {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@27 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@54 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Assignment.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Assignment.lazy.log
index 42491972419..689c548f36d 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Assignment.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Assignment.lazy.log
@@ -40,64 +40,67 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@29 {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+}
+
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
 }
 
 ResolutionTaskHolder@41 {
     <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
+}
+
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
 }
 
 ResolutionTaskHolder@53 {
     <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+null {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@40 }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AssignmentInInitializer.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AssignmentInInitializer.lazy.log
index a94b8777b97..358553e289b 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AssignmentInInitializer.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AssignmentInInitializer.lazy.log
@@ -40,64 +40,67 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@29 {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+}
+
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
 }
 
 ResolutionTaskHolder@41 {
     <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
+}
+
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
 }
 
 ResolutionTaskHolder@53 {
     <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+null {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@40 }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AssignmentOperation.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AssignmentOperation.lazy.log
index 3111fa6819b..1163fe26054 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AssignmentOperation.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AssignmentOperation.lazy.log
@@ -49,94 +49,119 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@38 {
     <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+}
+
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
 }
 
 ResolutionTaskHolder@50 {
     <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+}
+
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
 }
 
 ResolutionTaskHolder@62 {
     <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
+}
+
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
 }
 
 ResolutionTaskHolder@74 {
     <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[8] { ResolutionCandidate@79, ResolutionCandidate@80, ResolutionCandidate@81, ... }
 }
 
 ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@83[8] { ResolutionCandidate@84, ResolutionCandidate@85, ResolutionCandidate@86, ... }
 }
 
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+ResolutionTaskHolder@87 {
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[8] { ResolutionCandidate@92, ResolutionCandidate@93, ResolutionCandidate@94, ... }
-    <name not found> = ArrayList@95[8] { ResolutionCandidate@92, ResolutionCandidate@93, ResolutionCandidate@94, ... }
+ResolutionTaskHolder@88 {
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[8] { ResolutionCandidate@98, ResolutionCandidate@99, ResolutionCandidate@100, ... }
-    <name not found> = ArrayList@101[8] { ResolutionCandidate@98, ResolutionCandidate@99, ResolutionCandidate@100, ... }
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@89 {
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -155,29 +180,7 @@ ResolutionTaskHolder@102 {
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@103 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@90 {
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -188,9 +191,22 @@ ResolutionTaskHolder@103 {
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+null {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@104[8] { ResolutionCandidate@84, ResolutionCandidate@85, ResolutionCandidate@86, ... }
+    <name not found> = ArrayList@105[8] { ResolutionCandidate@79, ResolutionCandidate@80, ResolutionCandidate@81, ... }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -210,16 +226,3 @@ ResolutionTaskHolder@104 {
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
-
-ResolutionTaskHolder@105 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AssignmentToArrayElement.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AssignmentToArrayElement.lazy.log
index 3458463afdb..549707d83d2 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AssignmentToArrayElement.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AssignmentToArrayElement.lazy.log
@@ -27,55 +27,58 @@ LazyJavaPackageFragment@6['java'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+}
+
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
 }
 
 ResolutionTaskHolder@37 {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+}
+
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
 }
 
 ResolutionTaskHolder@49 {
     <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+null {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@27 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@45 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpression.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpression.lazy.log
index 288a62e01be..a9ad9948fe2 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpression.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpression.lazy.log
@@ -42,168 +42,171 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[14] { ResolutionCandidate@30, ResolutionCandidate@31, ResolutionCandidate@32, ... }
-    <name not found> = ArrayList@33[14] { ResolutionCandidate@30, ResolutionCandidate@31, ResolutionCandidate@32, ... }
 }
 
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[14] { ResolutionCandidate@36, ResolutionCandidate@37, ResolutionCandidate@38, ... }
-    <name not found> = ArrayList@39[14] { ResolutionCandidate@36, ResolutionCandidate@37, ResolutionCandidate@38, ... }
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[14] { ResolutionCandidate@35, ResolutionCandidate@36, ResolutionCandidate@37, ... }
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[16] { ResolutionCandidate@42, ResolutionCandidate@43, ResolutionCandidate@44, ... }
-    <name not found> = ArrayList@45[16] { ResolutionCandidate@42, ResolutionCandidate@43, ResolutionCandidate@44, ... }
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[16] { ResolutionCandidate@40, ResolutionCandidate@41, ResolutionCandidate@42, ... }
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[16] { ResolutionCandidate@48, ResolutionCandidate@49, ResolutionCandidate@50, ... }
-    <name not found> = ArrayList@51[16] { ResolutionCandidate@48, ResolutionCandidate@49, ResolutionCandidate@50, ... }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[16] { ResolutionCandidate@45, ResolutionCandidate@46, ResolutionCandidate@47, ... }
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
+    <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
     <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
+    <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
 ResolutionTaskHolder@66 {
     <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@69 {
     <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
+}
+
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
 }
 
 ResolutionTaskHolder@81 {
     <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
+}
+
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
 }
 
 ResolutionTaskHolder@93 {
     <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
 }
 
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
 }
 
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
+}
+
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
 }
 
 ResolutionTaskHolder@105 {
     <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
 }
 
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
 }
 
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
+ResolutionTaskHolder@111 {
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
 }
 
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[8] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
 }
 
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
+ResolutionTaskHolder@119 {
+    <name not found> = ArrayList@120[8] { ResolutionCandidate@121, ResolutionCandidate@122, ResolutionCandidate@123, ... }
 }
 
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@127 }
-}
-
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@131 }
-}
-
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@135 }
-}
-
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@139 }
-}
-
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[8] { ResolutionCandidate@143, ResolutionCandidate@144, ResolutionCandidate@145, ... }
-    <name not found> = ArrayList@146[8] { ResolutionCandidate@143, ResolutionCandidate@144, ResolutionCandidate@145, ... }
-}
-
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[8] { ResolutionCandidate@149, ResolutionCandidate@150, ResolutionCandidate@151, ... }
-    <name not found> = ArrayList@152[8] { ResolutionCandidate@149, ResolutionCandidate@150, ResolutionCandidate@151, ... }
+null {
+    <name not found> = ArrayList@124[14] { ResolutionCandidate@30, ResolutionCandidate@31, ResolutionCandidate@32, ... }
+    <name not found> = ArrayList@125[14] { ResolutionCandidate@35, ResolutionCandidate@36, ResolutionCandidate@37, ... }
+    <name not found> = ArrayList@126[16] { ResolutionCandidate@45, ResolutionCandidate@46, ResolutionCandidate@47, ... }
+    <name not found> = ArrayList@127[16] { ResolutionCandidate@40, ResolutionCandidate@41, ResolutionCandidate@42, ... }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@113 }
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@151[8] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
+    <name not found> = ArrayList@152[8] { ResolutionCandidate@121, ResolutionCandidate@122, ResolutionCandidate@123, ... }
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionBooleanOperations.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionBooleanOperations.lazy.log
index 879134c0797..276e1cdf6ca 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionBooleanOperations.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionBooleanOperations.lazy.log
@@ -31,100 +31,103 @@ LazyJavaPackageFragment@7['java'] {
 
 ResolutionTaskHolder@29 {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+}
+
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
 }
 
 ResolutionTaskHolder@41 {
     <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
+}
+
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
 }
 
 ResolutionTaskHolder@53 {
     <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
+}
+
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
 }
 
 ResolutionTaskHolder@65 {
     <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
+}
+
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
 }
 
 ResolutionTaskHolder@77 {
     <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
 }
 
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
 }
 
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
+null {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@88 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionCompareToConvention.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionCompareToConvention.lazy.log
index a80ef345df3..62c32afe062 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionCompareToConvention.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionCompareToConvention.lazy.log
@@ -44,73 +44,76 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@33 {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+}
+
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
 }
 
 ResolutionTaskHolder@45 {
     <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
+}
+
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
 }
 
 ResolutionTaskHolder@57 {
     <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
+}
+
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
 }
 
 ResolutionTaskHolder@69 {
     <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
+null {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@71 }
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionContainsConvention.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionContainsConvention.lazy.log
index f274c36693a..4d7267fa743 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionContainsConvention.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionContainsConvention.lazy.log
@@ -31,25 +31,28 @@ LazyJavaPackageFragment@7['java'] {
 
 ResolutionTaskHolder@29 {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+}
+
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
 }
 
 ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@42[7] { ResolutionCandidate@43, ResolutionCandidate@44, ResolutionCandidate@45, ... }
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[7] { ResolutionCandidate@47, ResolutionCandidate@48, ResolutionCandidate@49, ... }
-    <name not found> = ArrayList@50[7] { ResolutionCandidate@47, ResolutionCandidate@48, ResolutionCandidate@49, ... }
+null {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@50[7] { ResolutionCandidate@43, ResolutionCandidate@44, ResolutionCandidate@45, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionElvis.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionElvis.lazy.log
index f4e7d443f0c..e41b74c688f 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionElvis.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionElvis.lazy.log
@@ -42,74 +42,77 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@33 {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+}
+
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
 }
 
 ResolutionTaskHolder@45 {
     <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
+}
+
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
 }
 
 ResolutionTaskHolder@57 {
     <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
+}
+
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
 }
 
 ResolutionTaskHolder@69 {
     <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
+null {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@74 }
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionEqualsConvention.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionEqualsConvention.lazy.log
index ea0513f7929..b09b960ff20 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionEqualsConvention.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionEqualsConvention.lazy.log
@@ -29,50 +29,53 @@ LazyJavaPackageFragment@7['java'] {
 
 ResolutionTaskHolder@27 {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
 }
 
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
+}
+
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
 }
 
 ResolutionTaskHolder@39 {
     <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
 }
 
 ResolutionTaskHolder@51 {
     <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
+null {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@41 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionIdentifier.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionIdentifier.lazy.log
index 38b5d13ea1e..379ae72b16e 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionIdentifier.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionIdentifier.lazy.log
@@ -27,45 +27,48 @@ LazyJavaPackageFragment@6['java'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+}
+
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
 }
 
 ResolutionTaskHolder@37 {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[7] { ResolutionCandidate@48, ResolutionCandidate@49, ResolutionCandidate@50, ... }
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[7] { ResolutionCandidate@55, ResolutionCandidate@56, ResolutionCandidate@57, ... }
-    <name not found> = ArrayList@58[7] { ResolutionCandidate@55, ResolutionCandidate@56, ResolutionCandidate@57, ... }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[7] { ResolutionCandidate@53, ResolutionCandidate@54, ResolutionCandidate@55, ... }
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[7] { ResolutionCandidate@61, ResolutionCandidate@62, ResolutionCandidate@63, ... }
-    <name not found> = ArrayList@64[7] { ResolutionCandidate@61, ResolutionCandidate@62, ResolutionCandidate@63, ... }
+null {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@27 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@63[7] { ResolutionCandidate@48, ResolutionCandidate@49, ResolutionCandidate@50, ... }
+    <name not found> = ArrayList@64[7] { ResolutionCandidate@53, ResolutionCandidate@54, ResolutionCandidate@55, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionPlusConvention.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionPlusConvention.lazy.log
index 4dc7a674519..655c724568b 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionPlusConvention.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionPlusConvention.lazy.log
@@ -40,76 +40,79 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@29 {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+}
+
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
 }
 
 ResolutionTaskHolder@41 {
     <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
+}
+
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
 }
 
 ResolutionTaskHolder@53 {
     <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
+}
+
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
 }
 
 ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@66[2] { ResolutionCandidate@67, ResolutionCandidate@68 }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
 }
 
 ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[2] { ResolutionCandidate@79, ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[2] { ResolutionCandidate@79, ResolutionCandidate@80 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
+    <name not found> = ArrayList@70[2] { ResolutionCandidate@71, ResolutionCandidate@72 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[2] { ResolutionCandidate@84, ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[2] { ResolutionCandidate@84, ResolutionCandidate@85 }
+null {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@85[2] { ResolutionCandidate@67, ResolutionCandidate@68 }
+    <name not found> = ArrayList@86[2] { ResolutionCandidate@71, ResolutionCandidate@72 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Condition.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Condition.lazy.log
index e20d833c138..264959f3351 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Condition.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Condition.lazy.log
@@ -27,35 +27,38 @@ LazyJavaPackageFragment@6['java'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+}
+
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
 }
 
 ResolutionTaskHolder@37 {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+null {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@27 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@39 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ContinueOuterLoop.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ContinueOuterLoop.lazy.log
index 0479b0c5431..532b0795fb1 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ContinueOuterLoop.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ContinueOuterLoop.lazy.log
@@ -34,175 +34,178 @@ LazyJavaPackageFragment@7['lang'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@17[empty]
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
     <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@32 {
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
     <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
+    <name not found> = EmptyList@17[empty]
+}
+
+ResolutionTaskHolder@35 {
     <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@17[empty]
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
     <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@17[empty]
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
     <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
     <name not found> = EmptyList@17[empty]
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
     <name not found> = EmptyList@17[empty]
 }
 
 ResolutionTaskHolder@60 {
     <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@17[empty]
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
     <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@67 {
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
     <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@17[empty]
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
     <name not found> = EmptyList@17[empty]
 }
 
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
+}
+
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
+}
+
 ResolutionTaskHolder@81 {
     <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
+}
+
+ResolutionTaskHolder@84 {
     <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
 }
 
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
+}
+
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
+}
+
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
 }
 
 ResolutionTaskHolder@99 {
     <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
 }
 
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
 }
 
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
+}
+
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
 }
 
 ResolutionTaskHolder@111 {
     <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@113 }
 }
 
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@117 }
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
 }
 
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@121 }
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
+}
+
+ResolutionTaskHolder@120 {
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
 }
 
 ResolutionTaskHolder@123 {
     <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@125 }
 }
 
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@129 }
-}
-
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@133 }
-}
-
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@137 }
-}
-
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@141 }
-}
-
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@145 }
-}
-
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@149 }
-}
-
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@153 }
-}
-
-ResolutionTaskHolder@155 {
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@157 }
-}
-
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@161 }
+null {
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@113 }
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@27 }
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@122 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@125 }
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@107 }
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DeepIf.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DeepIf.lazy.log
index c2cbe733d91..75e85d16579 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DeepIf.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DeepIf.lazy.log
@@ -43,421 +43,424 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@29 {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@21[empty]
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@36 {
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+    <name not found> = EmptyList@21[empty]
+}
+
+ResolutionTaskHolder@39 {
     <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@21[empty]
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
     <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+    <name not found> = EmptyList@21[empty]
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
+}
+
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
 ResolutionTaskHolder@61 {
     <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
+}
+
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
 ResolutionTaskHolder@73 {
     <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
+}
+
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
 ResolutionTaskHolder@85 {
     <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
+}
+
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
 ResolutionTaskHolder@97 {
     <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
+}
+
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
 }
 
 ResolutionTaskHolder@109 {
     <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
 }
 
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@115 {
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
+}
+
+ResolutionTaskHolder@118 {
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
 }
 
 ResolutionTaskHolder@121 {
     <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@127 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@124 {
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
 }
 
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@131 }
+ResolutionTaskHolder@127 {
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
+}
+
+ResolutionTaskHolder@130 {
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
 }
 
 ResolutionTaskHolder@133 {
     <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@135 }
 }
 
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@139 }
+ResolutionTaskHolder@136 {
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
 }
 
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@143 }
+ResolutionTaskHolder@139 {
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
+}
+
+ResolutionTaskHolder@142 {
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
 }
 
 ResolutionTaskHolder@145 {
     <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@147 }
 }
 
-ResolutionTaskHolder@149 {
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@151 }
+ResolutionTaskHolder@148 {
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
 }
 
-ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@155 }
+ResolutionTaskHolder@151 {
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
+}
+
+ResolutionTaskHolder@154 {
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
 }
 
 ResolutionTaskHolder@157 {
     <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@159 }
 }
 
-ResolutionTaskHolder@161 {
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@163 }
+ResolutionTaskHolder@160 {
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
 }
 
-ResolutionTaskHolder@165 {
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@167 }
+ResolutionTaskHolder@163 {
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
+}
+
+ResolutionTaskHolder@166 {
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
 }
 
 ResolutionTaskHolder@169 {
     <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@171 }
 }
 
-ResolutionTaskHolder@173 {
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@175 }
+ResolutionTaskHolder@172 {
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
 }
 
-ResolutionTaskHolder@177 {
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@179 }
+ResolutionTaskHolder@175 {
+    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
+}
+
+ResolutionTaskHolder@178 {
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
 }
 
 ResolutionTaskHolder@181 {
     <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@183 }
 }
 
-ResolutionTaskHolder@185 {
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@187 }
+ResolutionTaskHolder@184 {
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
 }
 
-ResolutionTaskHolder@189 {
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@191 }
+ResolutionTaskHolder@187 {
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
+}
+
+ResolutionTaskHolder@190 {
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@192 }
 }
 
 ResolutionTaskHolder@193 {
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@195 }
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@195 }
+    <name not found> = ArrayList@194[2] { ResolutionCandidate@195, ResolutionCandidate@196 }
 }
 
 ResolutionTaskHolder@197 {
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@199 }
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@199 }
+    <name not found> = ArrayList@198[2] { ResolutionCandidate@199, ResolutionCandidate@200 }
 }
 
 ResolutionTaskHolder@201 {
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@203 }
+    <name not found> = ArrayList@202[2] { ResolutionCandidate@203, ResolutionCandidate@204 }
 }
 
 ResolutionTaskHolder@205 {
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@207 }
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@207 }
+    <name not found> = ArrayList@206[2] { ResolutionCandidate@207, ResolutionCandidate@208 }
 }
 
 ResolutionTaskHolder@209 {
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@211 }
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@211 }
+    <name not found> = ArrayList@210[2] { ResolutionCandidate@211, ResolutionCandidate@212 }
 }
 
 ResolutionTaskHolder@213 {
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@215 }
+    <name not found> = ArrayList@214[7] { ResolutionCandidate@215, ResolutionCandidate@216, ResolutionCandidate@217, ... }
 }
 
-ResolutionTaskHolder@217 {
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@219 }
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@219 }
+ResolutionTaskHolder@218 {
+    <name not found> = ArrayList@219[7] { ResolutionCandidate@220, ResolutionCandidate@221, ResolutionCandidate@222, ... }
 }
 
-ResolutionTaskHolder@221 {
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@223 }
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@223 }
+ResolutionTaskHolder@223 {
+    <name not found> = ArrayList@224[8] { ResolutionCandidate@225, ResolutionCandidate@226, ResolutionCandidate@227, ... }
 }
 
-ResolutionTaskHolder@225 {
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@227 }
+ResolutionTaskHolder@228 {
+    <name not found> = ArrayList@229[8] { ResolutionCandidate@230, ResolutionCandidate@231, ResolutionCandidate@232, ... }
 }
 
-ResolutionTaskHolder@229 {
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@231 }
-}
-
-ResolutionTaskHolder@233 {
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@235 }
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@235 }
-}
-
-ResolutionTaskHolder@237 {
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@239 }
-}
-
-ResolutionTaskHolder@241 {
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@243 }
-}
-
-ResolutionTaskHolder@245 {
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@247 }
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@247 }
-}
-
-ResolutionTaskHolder@249 {
-    <name not found> = ArrayList@250[2] { ResolutionCandidate@251, ResolutionCandidate@252 }
-    <name not found> = ArrayList@253[2] { ResolutionCandidate@251, ResolutionCandidate@252 }
-}
-
-ResolutionTaskHolder@254 {
-    <name not found> = ArrayList@255[2] { ResolutionCandidate@256, ResolutionCandidate@257 }
-    <name not found> = ArrayList@258[2] { ResolutionCandidate@256, ResolutionCandidate@257 }
-}
-
-ResolutionTaskHolder@259 {
-    <name not found> = ArrayList@260[2] { ResolutionCandidate@261, ResolutionCandidate@262 }
-    <name not found> = ArrayList@263[2] { ResolutionCandidate@261, ResolutionCandidate@262 }
-}
-
-ResolutionTaskHolder@264 {
-    <name not found> = ArrayList@265[2] { ResolutionCandidate@266, ResolutionCandidate@267 }
-    <name not found> = ArrayList@268[2] { ResolutionCandidate@266, ResolutionCandidate@267 }
-}
-
-ResolutionTaskHolder@269 {
-    <name not found> = ArrayList@270[2] { ResolutionCandidate@271, ResolutionCandidate@272 }
-    <name not found> = ArrayList@273[2] { ResolutionCandidate@271, ResolutionCandidate@272 }
-}
-
-ResolutionTaskHolder@274 {
-    <name not found> = ArrayList@275[7] { ResolutionCandidate@276, ResolutionCandidate@277, ResolutionCandidate@278, ... }
-    <name not found> = ArrayList@279[7] { ResolutionCandidate@276, ResolutionCandidate@277, ResolutionCandidate@278, ... }
-}
-
-ResolutionTaskHolder@280 {
-    <name not found> = ArrayList@281[7] { ResolutionCandidate@282, ResolutionCandidate@283, ResolutionCandidate@284, ... }
-    <name not found> = ArrayList@285[7] { ResolutionCandidate@282, ResolutionCandidate@283, ResolutionCandidate@284, ... }
-}
-
-ResolutionTaskHolder@286 {
-    <name not found> = ArrayList@287[8] { ResolutionCandidate@288, ResolutionCandidate@289, ResolutionCandidate@290, ... }
-    <name not found> = ArrayList@291[8] { ResolutionCandidate@288, ResolutionCandidate@289, ResolutionCandidate@290, ... }
-}
-
-ResolutionTaskHolder@292 {
-    <name not found> = ArrayList@293[8] { ResolutionCandidate@294, ResolutionCandidate@295, ResolutionCandidate@296, ... }
-    <name not found> = ArrayList@297[8] { ResolutionCandidate@294, ResolutionCandidate@295, ResolutionCandidate@296, ... }
+null {
+    <name not found> = ArrayList@233[1] { ResolutionCandidate@174 }
+    <name not found> = ArrayList@234[1] { ResolutionCandidate@177 }
+    <name not found> = ArrayList@235[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@236[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@237[1] { ResolutionCandidate@189 }
+    <name not found> = ArrayList@238[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@239[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@240[1] { ResolutionCandidate@168 }
+    <name not found> = ArrayList@241[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@242[1] { ResolutionCandidate@126 }
+    <name not found> = ArrayList@243[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@244[1] { ResolutionCandidate@132 }
+    <name not found> = ArrayList@245[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@246[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@247[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@248[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@249[1] { ResolutionCandidate@141 }
+    <name not found> = ArrayList@250[1] { ResolutionCandidate@183 }
+    <name not found> = ArrayList@251[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@252[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@253[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@254[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@255[1] { ResolutionCandidate@159 }
+    <name not found> = ArrayList@256[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@257[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@258[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@259[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@260[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@261[1] { ResolutionCandidate@180 }
+    <name not found> = ArrayList@262[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@263[1] { ResolutionCandidate@186 }
+    <name not found> = ArrayList@264[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@265[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@266[1] { ResolutionCandidate@156 }
+    <name not found> = ArrayList@267[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@268[1] { ResolutionCandidate@162 }
+    <name not found> = ArrayList@269[1] { ResolutionCandidate@147 }
+    <name not found> = ArrayList@270[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@271[1] { ResolutionCandidate@135 }
+    <name not found> = ArrayList@272[1] { ResolutionCandidate@153 }
+    <name not found> = ArrayList@273[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@274[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@275[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@276[1] { ResolutionCandidate@192 }
+    <name not found> = ArrayList@277[1] { ResolutionCandidate@165 }
+    <name not found> = ArrayList@278[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@279[1] { ResolutionCandidate@171 }
+    <name not found> = ArrayList@280[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@281[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@282[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@283[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@284[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@285[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@286[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@287[1] { ResolutionCandidate@129 }
+    <name not found> = ArrayList@288[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@289[2] { ResolutionCandidate@199, ResolutionCandidate@200 }
+    <name not found> = ArrayList@290[2] { ResolutionCandidate@207, ResolutionCandidate@208 }
+    <name not found> = ArrayList@291[2] { ResolutionCandidate@211, ResolutionCandidate@212 }
+    <name not found> = ArrayList@292[2] { ResolutionCandidate@195, ResolutionCandidate@196 }
+    <name not found> = ArrayList@293[2] { ResolutionCandidate@203, ResolutionCandidate@204 }
+    <name not found> = ArrayList@294[7] { ResolutionCandidate@215, ResolutionCandidate@216, ResolutionCandidate@217, ... }
+    <name not found> = ArrayList@295[7] { ResolutionCandidate@220, ResolutionCandidate@221, ResolutionCandidate@222, ... }
+    <name not found> = ArrayList@296[8] { ResolutionCandidate@230, ResolutionCandidate@231, ResolutionCandidate@232, ... }
+    <name not found> = ArrayList@297[8] { ResolutionCandidate@225, ResolutionCandidate@226, ResolutionCandidate@227, ... }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DoWhile.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DoWhile.lazy.log
index 6c49f28effe..ee7d8e6c263 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DoWhile.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DoWhile.lazy.log
@@ -43,28 +43,18 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@20[empty]
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@35 {
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
     <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+    <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@38 {
     <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
@@ -82,9 +72,8 @@ ResolutionTaskHolder@42 {
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
@@ -100,79 +89,93 @@ ResolutionTaskHolder@46 {
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
 }
 
 ResolutionTaskHolder@50 {
     <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+}
+
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
 }
 
 ResolutionTaskHolder@62 {
     <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[8] { ResolutionCandidate@73, ResolutionCandidate@74, ResolutionCandidate@75, ... }
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[8] { ResolutionCandidate@88, ResolutionCandidate@89, ResolutionCandidate@90, ... }
-    <name not found> = ArrayList@91[8] { ResolutionCandidate@88, ResolutionCandidate@89, ResolutionCandidate@90, ... }
+null {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@91[8] { ResolutionCandidate@73, ResolutionCandidate@74, ResolutionCandidate@75, ... }
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DoWhileCondition.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DoWhileCondition.lazy.log
index 9c97a9149ce..5e1f7c768d7 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DoWhileCondition.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DoWhileCondition.lazy.log
@@ -23,100 +23,103 @@ LazyJavaPackageFragment@5['java'] {
 
 ResolutionTaskHolder@21 {
     <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@23 }
 }
 
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
+ResolutionTaskHolder@24 {
+    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+ResolutionTaskHolder@27 {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
+}
+
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
 }
 
 ResolutionTaskHolder@33 {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+}
+
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
 }
 
 ResolutionTaskHolder@45 {
     <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
+}
+
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
 }
 
 ResolutionTaskHolder@57 {
     <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
+}
+
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
 }
 
 ResolutionTaskHolder@69 {
     <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
 }
 
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[7] { ResolutionCandidate@80, ResolutionCandidate@81, ResolutionCandidate@82, ... }
 }
 
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[7] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
-    <name not found> = ArrayList@102[7] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
+null {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@26 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@23 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@102[7] { ResolutionCandidate@80, ResolutionCandidate@81, ResolutionCandidate@82, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Elvis.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Elvis.lazy.log
index 31d8892417c..c1b6864cb22 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Elvis.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Elvis.lazy.log
@@ -42,95 +42,98 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
+    <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
 ResolutionTaskHolder@39 {
     <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
 }
 
 ResolutionTaskHolder@51 {
     <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
 }
 
 ResolutionTaskHolder@63 {
     <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
 }
 
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[8] { ResolutionCandidate@68, ResolutionCandidate@69, ResolutionCandidate@70, ... }
 }
 
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[8] { ResolutionCandidate@81, ResolutionCandidate@82, ResolutionCandidate@83, ... }
-    <name not found> = ArrayList@84[8] { ResolutionCandidate@81, ResolutionCandidate@82, ResolutionCandidate@83, ... }
+null {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@84[8] { ResolutionCandidate@68, ResolutionCandidate@69, ResolutionCandidate@70, ... }
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ExclExcl.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ExclExcl.lazy.log
index c5cc0420256..00a0247b7cd 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ExclExcl.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ExclExcl.lazy.log
@@ -42,284 +42,287 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@20[empty]
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@35 {
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
     <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+    <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@38 {
     <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@20[empty]
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+    <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
+    <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
+    <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
 ResolutionTaskHolder@70 {
     <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
 ResolutionTaskHolder@82 {
     <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
+}
+
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
 }
 
 ResolutionTaskHolder@94 {
     <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
 }
 
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
+}
+
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
 }
 
 ResolutionTaskHolder@106 {
     <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
 }
 
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
 }
 
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
+}
+
+ResolutionTaskHolder@115 {
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
 }
 
 ResolutionTaskHolder@118 {
     <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
 }
 
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
+ResolutionTaskHolder@121 {
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
 }
 
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
+ResolutionTaskHolder@124 {
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
+}
+
+ResolutionTaskHolder@127 {
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
 }
 
 ResolutionTaskHolder@130 {
     <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@132 }
 }
 
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@136 }
+ResolutionTaskHolder@133 {
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
 }
 
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@140 }
+ResolutionTaskHolder@136 {
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
+}
+
+ResolutionTaskHolder@139 {
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
 }
 
 ResolutionTaskHolder@142 {
     <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@144 }
 }
 
-ResolutionTaskHolder@146 {
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@148 }
+ResolutionTaskHolder@145 {
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
 }
 
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@152 }
+ResolutionTaskHolder@148 {
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
+}
+
+ResolutionTaskHolder@151 {
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
 }
 
 ResolutionTaskHolder@154 {
     <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@156 }
 }
 
-ResolutionTaskHolder@158 {
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@160 }
+ResolutionTaskHolder@157 {
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
 }
 
-ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@164 }
+ResolutionTaskHolder@160 {
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
 }
 
-ResolutionTaskHolder@166 {
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@168 }
+ResolutionTaskHolder@163 {
+    <name not found> = ArrayList@164[8] { ResolutionCandidate@165, ResolutionCandidate@166, ResolutionCandidate@167, ... }
 }
 
-ResolutionTaskHolder@170 {
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@172 }
-}
-
-ResolutionTaskHolder@174 {
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@176 }
-}
-
-ResolutionTaskHolder@178 {
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@180 }
-}
-
-ResolutionTaskHolder@182 {
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@184 }
-}
-
-ResolutionTaskHolder@186 {
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@188 }
-}
-
-ResolutionTaskHolder@190 {
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@192 }
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@192 }
-}
-
-ResolutionTaskHolder@194 {
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@196 }
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@196 }
-}
-
-ResolutionTaskHolder@198 {
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@200 }
-}
-
-ResolutionTaskHolder@202 {
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@204 }
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@204 }
-}
-
-ResolutionTaskHolder@206 {
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@208 }
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@208 }
-}
-
-ResolutionTaskHolder@210 {
-    <name not found> = ArrayList@211[8] { ResolutionCandidate@212, ResolutionCandidate@213, ResolutionCandidate@214, ... }
-    <name not found> = ArrayList@215[8] { ResolutionCandidate@212, ResolutionCandidate@213, ResolutionCandidate@214, ... }
+null {
+    <name not found> = ArrayList@168[1] { ResolutionCandidate@135 }
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@170[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@176[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@141 }
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@162 }
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@189[1] { ResolutionCandidate@156 }
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@192[1] { ResolutionCandidate@126 }
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@194[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@196[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@197[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@198[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@200[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@201[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@202[1] { ResolutionCandidate@153 }
+    <name not found> = ArrayList@203[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@204[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@205[1] { ResolutionCandidate@132 }
+    <name not found> = ArrayList@206[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@207[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@208[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@209[1] { ResolutionCandidate@159 }
+    <name not found> = ArrayList@210[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@211[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@212[1] { ResolutionCandidate@147 }
+    <name not found> = ArrayList@213[1] { ResolutionCandidate@129 }
+    <name not found> = ArrayList@214[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@215[8] { ResolutionCandidate@165, ResolutionCandidate@166, ResolutionCandidate@167, ... }
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/For.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/For.lazy.log
index 4e42be4a12c..b1ad05bf986 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/For.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/For.lazy.log
@@ -46,28 +46,18 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@29 {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@21[empty]
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@36 {
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+    <name not found> = EmptyList@21[empty]
+}
+
+ResolutionTaskHolder@39 {
     <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
@@ -85,9 +75,8 @@ ResolutionTaskHolder@43 {
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
@@ -103,172 +92,186 @@ ResolutionTaskHolder@47 {
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
+}
+
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
 ResolutionTaskHolder@51 {
     <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
+}
+
 ResolutionTaskHolder@63 {
     <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
 }
 
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
+}
+
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
 }
 
 ResolutionTaskHolder@75 {
     <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
 }
 
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
 }
 
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
+}
+
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
 }
 
 ResolutionTaskHolder@87 {
     <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
 }
 
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
 }
 
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
+}
+
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
 }
 
 ResolutionTaskHolder@99 {
     <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
 }
 
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
 }
 
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
+}
+
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
 }
 
 ResolutionTaskHolder@111 {
     <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@113 }
 }
 
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@117 }
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
 }
 
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@121 }
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
+}
+
+ResolutionTaskHolder@120 {
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
 }
 
 ResolutionTaskHolder@123 {
     <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@125 }
 }
 
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@129 }
+ResolutionTaskHolder@126 {
+    <name not found> = ArrayList@127[2] { ResolutionCandidate@128, ResolutionCandidate@129 }
 }
 
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@133 }
+ResolutionTaskHolder@130 {
+    <name not found> = ArrayList@131[8] { ResolutionCandidate@132, ResolutionCandidate@133, ResolutionCandidate@134, ... }
 }
 
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@137 }
-}
-
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@141 }
-}
-
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@145 }
-}
-
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@149 }
-}
-
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@153 }
-}
-
-ResolutionTaskHolder@155 {
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@157 }
-}
-
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[2] { ResolutionCandidate@161, ResolutionCandidate@162 }
-    <name not found> = ArrayList@163[2] { ResolutionCandidate@161, ResolutionCandidate@162 }
-}
-
-ResolutionTaskHolder@164 {
-    <name not found> = ArrayList@165[8] { ResolutionCandidate@166, ResolutionCandidate@167, ResolutionCandidate@168, ... }
-    <name not found> = ArrayList@169[8] { ResolutionCandidate@166, ResolutionCandidate@167, ResolutionCandidate@168, ... }
+null {
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@113 }
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@125 }
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@122 }
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@166[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@168[2] { ResolutionCandidate@128, ResolutionCandidate@129 }
+    <name not found> = ArrayList@169[8] { ResolutionCandidate@132, ResolutionCandidate@133, ResolutionCandidate@134, ... }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ForLoopRange.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ForLoopRange.lazy.log
index ba2e5a1333d..d984922ad60 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ForLoopRange.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ForLoopRange.lazy.log
@@ -27,35 +27,38 @@ LazyJavaPackageFragment@6['java'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+}
+
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
 }
 
 ResolutionTaskHolder@37 {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+null {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@27 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@39 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/FunctionLiteral.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/FunctionLiteral.lazy.log
index cf55fe52ac3..6396f66ab1e 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/FunctionLiteral.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/FunctionLiteral.lazy.log
@@ -50,28 +50,18 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@30 {
     <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@22[empty]
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@37 {
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+    <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
@@ -89,70 +79,83 @@ ResolutionTaskHolder@44 {
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
+}
+
 ResolutionTaskHolder@52 {
     <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
+}
+
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
 }
 
 ResolutionTaskHolder@64 {
     <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
+}
+
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
 }
 
 ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@77[8] { ResolutionCandidate@78, ResolutionCandidate@79, ResolutionCandidate@80, ... }
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[8] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
-    <name not found> = ArrayList@97[8] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
+null {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@97[8] { ResolutionCandidate@78, ResolutionCandidate@79, ResolutionCandidate@80, ... }
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IfStatement.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IfStatement.lazy.log
index 3a1a2e5ce94..3051a7c763e 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IfStatement.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IfStatement.lazy.log
@@ -27,110 +27,113 @@ LazyJavaPackageFragment@6['java'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+}
+
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
 }
 
 ResolutionTaskHolder@37 {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+}
+
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
 }
 
 ResolutionTaskHolder@49 {
     <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
+}
+
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
 }
 
 ResolutionTaskHolder@61 {
     <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
+}
+
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
 }
 
 ResolutionTaskHolder@73 {
     <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
 }
 
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
+}
+
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
 }
 
 ResolutionTaskHolder@85 {
     <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
+null {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@27 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@48 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IfThenElse.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IfThenElse.lazy.log
index b6c906834c4..0adcc882607 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IfThenElse.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IfThenElse.lazy.log
@@ -43,37 +43,62 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@20[empty]
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@35 {
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
     <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+    <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@38 {
     <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+    <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
 ResolutionTaskHolder@49 {
     <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
@@ -91,240 +116,218 @@ ResolutionTaskHolder@49 {
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
 ResolutionTaskHolder@61 {
     <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
 ResolutionTaskHolder@73 {
     <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
 }
 
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
+}
+
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
 }
 
 ResolutionTaskHolder@85 {
     <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
+}
+
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
 }
 
 ResolutionTaskHolder@97 {
     <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
 }
 
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
 }
 
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
+}
+
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
 }
 
 ResolutionTaskHolder@109 {
     <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
 }
 
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
 }
 
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
+ResolutionTaskHolder@115 {
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
+}
+
+ResolutionTaskHolder@118 {
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
 }
 
 ResolutionTaskHolder@121 {
     <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
 }
 
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@127 }
+ResolutionTaskHolder@124 {
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
 }
 
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@131 }
+ResolutionTaskHolder@127 {
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
+}
+
+ResolutionTaskHolder@130 {
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
 }
 
 ResolutionTaskHolder@133 {
     <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@135 }
 }
 
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@139 }
+ResolutionTaskHolder@136 {
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
 }
 
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@143 }
+ResolutionTaskHolder@139 {
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
 }
 
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@147 }
+ResolutionTaskHolder@142 {
+    <name not found> = ArrayList@143[2] { ResolutionCandidate@144, ResolutionCandidate@145 }
 }
 
-ResolutionTaskHolder@149 {
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@151 }
+ResolutionTaskHolder@146 {
+    <name not found> = ArrayList@147[8] { ResolutionCandidate@148, ResolutionCandidate@149, ResolutionCandidate@150, ... }
 }
 
-ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@155 }
-}
-
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@159 }
-}
-
-ResolutionTaskHolder@161 {
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@163 }
-}
-
-ResolutionTaskHolder@165 {
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@167 }
-}
-
-ResolutionTaskHolder@169 {
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@171 }
-}
-
-ResolutionTaskHolder@173 {
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@175 }
-}
-
-ResolutionTaskHolder@177 {
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@179 }
-}
-
-ResolutionTaskHolder@181 {
-    <name not found> = ArrayList@182[2] { ResolutionCandidate@183, ResolutionCandidate@184 }
-    <name not found> = ArrayList@185[2] { ResolutionCandidate@183, ResolutionCandidate@184 }
-}
-
-ResolutionTaskHolder@186 {
-    <name not found> = ArrayList@187[8] { ResolutionCandidate@188, ResolutionCandidate@189, ResolutionCandidate@190, ... }
-    <name not found> = ArrayList@191[8] { ResolutionCandidate@188, ResolutionCandidate@189, ResolutionCandidate@190, ... }
+null {
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@141 }
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@129 }
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@126 }
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@166[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@168[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@170[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@132 }
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@176[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@135 }
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@189[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@190[2] { ResolutionCandidate@144, ResolutionCandidate@145 }
+    <name not found> = ArrayList@191[8] { ResolutionCandidate@148, ResolutionCandidate@149, ResolutionCandidate@150, ... }
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IfThenElseBothInvalid.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IfThenElseBothInvalid.lazy.log
index aaa0afa7a4b..90917c110c8 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IfThenElseBothInvalid.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IfThenElseBothInvalid.lazy.log
@@ -42,28 +42,18 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@20[empty]
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@35 {
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
     <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+    <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@38 {
     <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
@@ -81,66 +71,79 @@ ResolutionTaskHolder@42 {
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+}
+
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
+}
+
 ResolutionTaskHolder@50 {
     <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+}
+
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
 }
 
 ResolutionTaskHolder@62 {
     <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[2] { ResolutionCandidate@67, ResolutionCandidate@68 }
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[8] { ResolutionCandidate@71, ResolutionCandidate@72, ResolutionCandidate@73, ... }
 }
 
 ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@75[8] { ResolutionCandidate@76, ResolutionCandidate@77, ResolutionCandidate@78, ... }
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[2] { ResolutionCandidate@80, ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[2] { ResolutionCandidate@80, ResolutionCandidate@81 }
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[8] { ResolutionCandidate@81, ResolutionCandidate@82, ResolutionCandidate@83, ... }
 }
 
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[8] { ResolutionCandidate@85, ResolutionCandidate@86, ResolutionCandidate@87, ... }
-    <name not found> = ArrayList@88[8] { ResolutionCandidate@85, ResolutionCandidate@86, ResolutionCandidate@87, ... }
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[8] { ResolutionCandidate@91, ResolutionCandidate@92, ResolutionCandidate@93, ... }
-    <name not found> = ArrayList@94[8] { ResolutionCandidate@91, ResolutionCandidate@92, ResolutionCandidate@93, ... }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[8] { ResolutionCandidate@97, ResolutionCandidate@98, ResolutionCandidate@99, ... }
-    <name not found> = ArrayList@100[8] { ResolutionCandidate@97, ResolutionCandidate@98, ResolutionCandidate@99, ... }
+null {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@97[2] { ResolutionCandidate@67, ResolutionCandidate@68 }
+    <name not found> = ArrayList@98[8] { ResolutionCandidate@71, ResolutionCandidate@72, ResolutionCandidate@73, ... }
+    <name not found> = ArrayList@99[8] { ResolutionCandidate@76, ResolutionCandidate@77, ResolutionCandidate@78, ... }
+    <name not found> = ArrayList@100[8] { ResolutionCandidate@81, ResolutionCandidate@82, ResolutionCandidate@83, ... }
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IsExpression.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IsExpression.lazy.log
index 0a52b9e2da8..93123a48267 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IsExpression.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IsExpression.lazy.log
@@ -27,15 +27,18 @@ LazyJavaPackageFragment@6['java'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+}
+
+null {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@27 }
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@30 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ManyIfs.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ManyIfs.lazy.log
index 76b7b9f5529..42578e78e4b 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ManyIfs.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ManyIfs.lazy.log
@@ -31,1045 +31,1048 @@ LazyJavaPackageFragment@7['java'] {
 
 ResolutionTaskHolder@29 {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+}
+
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
 }
 
 ResolutionTaskHolder@41 {
     <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
+}
+
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
 }
 
 ResolutionTaskHolder@53 {
     <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
+}
+
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
 }
 
 ResolutionTaskHolder@65 {
     <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
+}
+
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
 }
 
 ResolutionTaskHolder@77 {
     <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
 }
 
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
 }
 
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
+}
+
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
 }
 
 ResolutionTaskHolder@89 {
     <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
 }
 
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
+}
+
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
 }
 
 ResolutionTaskHolder@101 {
     <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
 }
 
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
 }
 
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
+}
+
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
 }
 
 ResolutionTaskHolder@113 {
     <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
 }
 
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
 }
 
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
+ResolutionTaskHolder@119 {
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
+}
+
+ResolutionTaskHolder@122 {
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
 }
 
 ResolutionTaskHolder@125 {
     <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@127 }
 }
 
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@131 }
+ResolutionTaskHolder@128 {
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
 }
 
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@135 }
+ResolutionTaskHolder@131 {
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
+}
+
+ResolutionTaskHolder@134 {
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
 }
 
 ResolutionTaskHolder@137 {
     <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@139 }
 }
 
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@143 }
+ResolutionTaskHolder@140 {
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
 }
 
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@147 }
+ResolutionTaskHolder@143 {
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
+}
+
+ResolutionTaskHolder@146 {
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
 }
 
 ResolutionTaskHolder@149 {
     <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@151 }
 }
 
-ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@155 }
+ResolutionTaskHolder@152 {
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
 }
 
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@159 }
+ResolutionTaskHolder@155 {
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
+}
+
+ResolutionTaskHolder@158 {
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
 }
 
 ResolutionTaskHolder@161 {
     <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@163 }
 }
 
-ResolutionTaskHolder@165 {
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@167 }
+ResolutionTaskHolder@164 {
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
 }
 
-ResolutionTaskHolder@169 {
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@171 }
+ResolutionTaskHolder@167 {
+    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
+}
+
+ResolutionTaskHolder@170 {
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
 }
 
 ResolutionTaskHolder@173 {
     <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@175 }
 }
 
-ResolutionTaskHolder@177 {
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@179 }
+ResolutionTaskHolder@176 {
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
 }
 
-ResolutionTaskHolder@181 {
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@183 }
+ResolutionTaskHolder@179 {
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
+}
+
+ResolutionTaskHolder@182 {
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
 }
 
 ResolutionTaskHolder@185 {
     <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@187 }
 }
 
-ResolutionTaskHolder@189 {
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@191 }
+ResolutionTaskHolder@188 {
+    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
 }
 
-ResolutionTaskHolder@193 {
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@195 }
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@195 }
+ResolutionTaskHolder@191 {
+    <name not found> = ArrayList@192[1] { ResolutionCandidate@193 }
+}
+
+ResolutionTaskHolder@194 {
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@196 }
 }
 
 ResolutionTaskHolder@197 {
     <name not found> = ArrayList@198[1] { ResolutionCandidate@199 }
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@199 }
 }
 
-ResolutionTaskHolder@201 {
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@203 }
+ResolutionTaskHolder@200 {
+    <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
 }
 
-ResolutionTaskHolder@205 {
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@207 }
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@207 }
+ResolutionTaskHolder@203 {
+    <name not found> = ArrayList@204[1] { ResolutionCandidate@205 }
+}
+
+ResolutionTaskHolder@206 {
+    <name not found> = ArrayList@207[1] { ResolutionCandidate@208 }
 }
 
 ResolutionTaskHolder@209 {
     <name not found> = ArrayList@210[1] { ResolutionCandidate@211 }
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@211 }
 }
 
-ResolutionTaskHolder@213 {
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@215 }
+ResolutionTaskHolder@212 {
+    <name not found> = ArrayList@213[1] { ResolutionCandidate@214 }
 }
 
-ResolutionTaskHolder@217 {
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@219 }
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@219 }
+ResolutionTaskHolder@215 {
+    <name not found> = ArrayList@216[1] { ResolutionCandidate@217 }
+}
+
+ResolutionTaskHolder@218 {
+    <name not found> = ArrayList@219[1] { ResolutionCandidate@220 }
 }
 
 ResolutionTaskHolder@221 {
     <name not found> = ArrayList@222[1] { ResolutionCandidate@223 }
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@223 }
 }
 
-ResolutionTaskHolder@225 {
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@227 }
+ResolutionTaskHolder@224 {
+    <name not found> = ArrayList@225[1] { ResolutionCandidate@226 }
 }
 
-ResolutionTaskHolder@229 {
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@231 }
+ResolutionTaskHolder@227 {
+    <name not found> = ArrayList@228[1] { ResolutionCandidate@229 }
+}
+
+ResolutionTaskHolder@230 {
+    <name not found> = ArrayList@231[1] { ResolutionCandidate@232 }
 }
 
 ResolutionTaskHolder@233 {
     <name not found> = ArrayList@234[1] { ResolutionCandidate@235 }
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@235 }
 }
 
-ResolutionTaskHolder@237 {
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@239 }
+ResolutionTaskHolder@236 {
+    <name not found> = ArrayList@237[1] { ResolutionCandidate@238 }
 }
 
-ResolutionTaskHolder@241 {
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@243 }
+ResolutionTaskHolder@239 {
+    <name not found> = ArrayList@240[1] { ResolutionCandidate@241 }
+}
+
+ResolutionTaskHolder@242 {
+    <name not found> = ArrayList@243[1] { ResolutionCandidate@244 }
 }
 
 ResolutionTaskHolder@245 {
     <name not found> = ArrayList@246[1] { ResolutionCandidate@247 }
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@247 }
 }
 
-ResolutionTaskHolder@249 {
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
-    <name not found> = ArrayList@252[1] { ResolutionCandidate@251 }
+ResolutionTaskHolder@248 {
+    <name not found> = ArrayList@249[1] { ResolutionCandidate@250 }
 }
 
-ResolutionTaskHolder@253 {
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@255 }
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@255 }
+ResolutionTaskHolder@251 {
+    <name not found> = ArrayList@252[1] { ResolutionCandidate@253 }
+}
+
+ResolutionTaskHolder@254 {
+    <name not found> = ArrayList@255[1] { ResolutionCandidate@256 }
 }
 
 ResolutionTaskHolder@257 {
     <name not found> = ArrayList@258[1] { ResolutionCandidate@259 }
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@259 }
 }
 
-ResolutionTaskHolder@261 {
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@263 }
+ResolutionTaskHolder@260 {
+    <name not found> = ArrayList@261[1] { ResolutionCandidate@262 }
 }
 
-ResolutionTaskHolder@265 {
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@267 }
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@267 }
+ResolutionTaskHolder@263 {
+    <name not found> = ArrayList@264[1] { ResolutionCandidate@265 }
+}
+
+ResolutionTaskHolder@266 {
+    <name not found> = ArrayList@267[1] { ResolutionCandidate@268 }
 }
 
 ResolutionTaskHolder@269 {
     <name not found> = ArrayList@270[1] { ResolutionCandidate@271 }
-    <name not found> = ArrayList@272[1] { ResolutionCandidate@271 }
 }
 
-ResolutionTaskHolder@273 {
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@275 }
-    <name not found> = ArrayList@276[1] { ResolutionCandidate@275 }
+ResolutionTaskHolder@272 {
+    <name not found> = ArrayList@273[1] { ResolutionCandidate@274 }
 }
 
-ResolutionTaskHolder@277 {
-    <name not found> = ArrayList@278[1] { ResolutionCandidate@279 }
-    <name not found> = ArrayList@280[1] { ResolutionCandidate@279 }
+ResolutionTaskHolder@275 {
+    <name not found> = ArrayList@276[1] { ResolutionCandidate@277 }
+}
+
+ResolutionTaskHolder@278 {
+    <name not found> = ArrayList@279[1] { ResolutionCandidate@280 }
 }
 
 ResolutionTaskHolder@281 {
     <name not found> = ArrayList@282[1] { ResolutionCandidate@283 }
-    <name not found> = ArrayList@284[1] { ResolutionCandidate@283 }
 }
 
-ResolutionTaskHolder@285 {
-    <name not found> = ArrayList@286[1] { ResolutionCandidate@287 }
-    <name not found> = ArrayList@288[1] { ResolutionCandidate@287 }
+ResolutionTaskHolder@284 {
+    <name not found> = ArrayList@285[1] { ResolutionCandidate@286 }
 }
 
-ResolutionTaskHolder@289 {
-    <name not found> = ArrayList@290[1] { ResolutionCandidate@291 }
-    <name not found> = ArrayList@292[1] { ResolutionCandidate@291 }
+ResolutionTaskHolder@287 {
+    <name not found> = ArrayList@288[1] { ResolutionCandidate@289 }
+}
+
+ResolutionTaskHolder@290 {
+    <name not found> = ArrayList@291[1] { ResolutionCandidate@292 }
 }
 
 ResolutionTaskHolder@293 {
     <name not found> = ArrayList@294[1] { ResolutionCandidate@295 }
-    <name not found> = ArrayList@296[1] { ResolutionCandidate@295 }
 }
 
-ResolutionTaskHolder@297 {
-    <name not found> = ArrayList@298[1] { ResolutionCandidate@299 }
-    <name not found> = ArrayList@300[1] { ResolutionCandidate@299 }
+ResolutionTaskHolder@296 {
+    <name not found> = ArrayList@297[1] { ResolutionCandidate@298 }
 }
 
-ResolutionTaskHolder@301 {
-    <name not found> = ArrayList@302[1] { ResolutionCandidate@303 }
-    <name not found> = ArrayList@304[1] { ResolutionCandidate@303 }
+ResolutionTaskHolder@299 {
+    <name not found> = ArrayList@300[1] { ResolutionCandidate@301 }
+}
+
+ResolutionTaskHolder@302 {
+    <name not found> = ArrayList@303[1] { ResolutionCandidate@304 }
 }
 
 ResolutionTaskHolder@305 {
     <name not found> = ArrayList@306[1] { ResolutionCandidate@307 }
-    <name not found> = ArrayList@308[1] { ResolutionCandidate@307 }
 }
 
-ResolutionTaskHolder@309 {
-    <name not found> = ArrayList@310[1] { ResolutionCandidate@311 }
-    <name not found> = ArrayList@312[1] { ResolutionCandidate@311 }
+ResolutionTaskHolder@308 {
+    <name not found> = ArrayList@309[1] { ResolutionCandidate@310 }
 }
 
-ResolutionTaskHolder@313 {
-    <name not found> = ArrayList@314[1] { ResolutionCandidate@315 }
-    <name not found> = ArrayList@316[1] { ResolutionCandidate@315 }
+ResolutionTaskHolder@311 {
+    <name not found> = ArrayList@312[1] { ResolutionCandidate@313 }
+}
+
+ResolutionTaskHolder@314 {
+    <name not found> = ArrayList@315[1] { ResolutionCandidate@316 }
 }
 
 ResolutionTaskHolder@317 {
     <name not found> = ArrayList@318[1] { ResolutionCandidate@319 }
-    <name not found> = ArrayList@320[1] { ResolutionCandidate@319 }
 }
 
-ResolutionTaskHolder@321 {
-    <name not found> = ArrayList@322[1] { ResolutionCandidate@323 }
-    <name not found> = ArrayList@324[1] { ResolutionCandidate@323 }
+ResolutionTaskHolder@320 {
+    <name not found> = ArrayList@321[1] { ResolutionCandidate@322 }
 }
 
-ResolutionTaskHolder@325 {
-    <name not found> = ArrayList@326[1] { ResolutionCandidate@327 }
-    <name not found> = ArrayList@328[1] { ResolutionCandidate@327 }
+ResolutionTaskHolder@323 {
+    <name not found> = ArrayList@324[1] { ResolutionCandidate@325 }
+}
+
+ResolutionTaskHolder@326 {
+    <name not found> = ArrayList@327[1] { ResolutionCandidate@328 }
 }
 
 ResolutionTaskHolder@329 {
     <name not found> = ArrayList@330[1] { ResolutionCandidate@331 }
-    <name not found> = ArrayList@332[1] { ResolutionCandidate@331 }
 }
 
-ResolutionTaskHolder@333 {
-    <name not found> = ArrayList@334[1] { ResolutionCandidate@335 }
-    <name not found> = ArrayList@336[1] { ResolutionCandidate@335 }
+ResolutionTaskHolder@332 {
+    <name not found> = ArrayList@333[1] { ResolutionCandidate@334 }
 }
 
-ResolutionTaskHolder@337 {
-    <name not found> = ArrayList@338[1] { ResolutionCandidate@339 }
-    <name not found> = ArrayList@340[1] { ResolutionCandidate@339 }
+ResolutionTaskHolder@335 {
+    <name not found> = ArrayList@336[1] { ResolutionCandidate@337 }
+}
+
+ResolutionTaskHolder@338 {
+    <name not found> = ArrayList@339[1] { ResolutionCandidate@340 }
 }
 
 ResolutionTaskHolder@341 {
     <name not found> = ArrayList@342[1] { ResolutionCandidate@343 }
-    <name not found> = ArrayList@344[1] { ResolutionCandidate@343 }
 }
 
-ResolutionTaskHolder@345 {
-    <name not found> = ArrayList@346[1] { ResolutionCandidate@347 }
-    <name not found> = ArrayList@348[1] { ResolutionCandidate@347 }
+ResolutionTaskHolder@344 {
+    <name not found> = ArrayList@345[1] { ResolutionCandidate@346 }
 }
 
-ResolutionTaskHolder@349 {
-    <name not found> = ArrayList@350[1] { ResolutionCandidate@351 }
-    <name not found> = ArrayList@352[1] { ResolutionCandidate@351 }
+ResolutionTaskHolder@347 {
+    <name not found> = ArrayList@348[1] { ResolutionCandidate@349 }
+}
+
+ResolutionTaskHolder@350 {
+    <name not found> = ArrayList@351[1] { ResolutionCandidate@352 }
 }
 
 ResolutionTaskHolder@353 {
     <name not found> = ArrayList@354[1] { ResolutionCandidate@355 }
-    <name not found> = ArrayList@356[1] { ResolutionCandidate@355 }
 }
 
-ResolutionTaskHolder@357 {
-    <name not found> = ArrayList@358[1] { ResolutionCandidate@359 }
-    <name not found> = ArrayList@360[1] { ResolutionCandidate@359 }
+ResolutionTaskHolder@356 {
+    <name not found> = ArrayList@357[1] { ResolutionCandidate@358 }
 }
 
-ResolutionTaskHolder@361 {
-    <name not found> = ArrayList@362[1] { ResolutionCandidate@363 }
-    <name not found> = ArrayList@364[1] { ResolutionCandidate@363 }
+ResolutionTaskHolder@359 {
+    <name not found> = ArrayList@360[1] { ResolutionCandidate@361 }
+}
+
+ResolutionTaskHolder@362 {
+    <name not found> = ArrayList@363[1] { ResolutionCandidate@364 }
 }
 
 ResolutionTaskHolder@365 {
     <name not found> = ArrayList@366[1] { ResolutionCandidate@367 }
-    <name not found> = ArrayList@368[1] { ResolutionCandidate@367 }
 }
 
-ResolutionTaskHolder@369 {
-    <name not found> = ArrayList@370[1] { ResolutionCandidate@371 }
-    <name not found> = ArrayList@372[1] { ResolutionCandidate@371 }
+ResolutionTaskHolder@368 {
+    <name not found> = ArrayList@369[1] { ResolutionCandidate@370 }
 }
 
-ResolutionTaskHolder@373 {
-    <name not found> = ArrayList@374[1] { ResolutionCandidate@375 }
-    <name not found> = ArrayList@376[1] { ResolutionCandidate@375 }
+ResolutionTaskHolder@371 {
+    <name not found> = ArrayList@372[1] { ResolutionCandidate@373 }
+}
+
+ResolutionTaskHolder@374 {
+    <name not found> = ArrayList@375[1] { ResolutionCandidate@376 }
 }
 
 ResolutionTaskHolder@377 {
     <name not found> = ArrayList@378[1] { ResolutionCandidate@379 }
-    <name not found> = ArrayList@380[1] { ResolutionCandidate@379 }
 }
 
-ResolutionTaskHolder@381 {
-    <name not found> = ArrayList@382[1] { ResolutionCandidate@383 }
-    <name not found> = ArrayList@384[1] { ResolutionCandidate@383 }
+ResolutionTaskHolder@380 {
+    <name not found> = ArrayList@381[1] { ResolutionCandidate@382 }
 }
 
-ResolutionTaskHolder@385 {
-    <name not found> = ArrayList@386[1] { ResolutionCandidate@387 }
-    <name not found> = ArrayList@388[1] { ResolutionCandidate@387 }
+ResolutionTaskHolder@383 {
+    <name not found> = ArrayList@384[1] { ResolutionCandidate@385 }
+}
+
+ResolutionTaskHolder@386 {
+    <name not found> = ArrayList@387[1] { ResolutionCandidate@388 }
 }
 
 ResolutionTaskHolder@389 {
     <name not found> = ArrayList@390[1] { ResolutionCandidate@391 }
-    <name not found> = ArrayList@392[1] { ResolutionCandidate@391 }
 }
 
-ResolutionTaskHolder@393 {
-    <name not found> = ArrayList@394[1] { ResolutionCandidate@395 }
-    <name not found> = ArrayList@396[1] { ResolutionCandidate@395 }
+ResolutionTaskHolder@392 {
+    <name not found> = ArrayList@393[1] { ResolutionCandidate@394 }
 }
 
-ResolutionTaskHolder@397 {
-    <name not found> = ArrayList@398[1] { ResolutionCandidate@399 }
-    <name not found> = ArrayList@400[1] { ResolutionCandidate@399 }
+ResolutionTaskHolder@395 {
+    <name not found> = ArrayList@396[1] { ResolutionCandidate@397 }
+}
+
+ResolutionTaskHolder@398 {
+    <name not found> = ArrayList@399[1] { ResolutionCandidate@400 }
 }
 
 ResolutionTaskHolder@401 {
     <name not found> = ArrayList@402[1] { ResolutionCandidate@403 }
-    <name not found> = ArrayList@404[1] { ResolutionCandidate@403 }
 }
 
-ResolutionTaskHolder@405 {
-    <name not found> = ArrayList@406[1] { ResolutionCandidate@407 }
-    <name not found> = ArrayList@408[1] { ResolutionCandidate@407 }
+ResolutionTaskHolder@404 {
+    <name not found> = ArrayList@405[1] { ResolutionCandidate@406 }
 }
 
-ResolutionTaskHolder@409 {
-    <name not found> = ArrayList@410[1] { ResolutionCandidate@411 }
-    <name not found> = ArrayList@412[1] { ResolutionCandidate@411 }
+ResolutionTaskHolder@407 {
+    <name not found> = ArrayList@408[1] { ResolutionCandidate@409 }
+}
+
+ResolutionTaskHolder@410 {
+    <name not found> = ArrayList@411[1] { ResolutionCandidate@412 }
 }
 
 ResolutionTaskHolder@413 {
     <name not found> = ArrayList@414[1] { ResolutionCandidate@415 }
-    <name not found> = ArrayList@416[1] { ResolutionCandidate@415 }
 }
 
-ResolutionTaskHolder@417 {
-    <name not found> = ArrayList@418[1] { ResolutionCandidate@419 }
-    <name not found> = ArrayList@420[1] { ResolutionCandidate@419 }
+ResolutionTaskHolder@416 {
+    <name not found> = ArrayList@417[1] { ResolutionCandidate@418 }
 }
 
-ResolutionTaskHolder@421 {
-    <name not found> = ArrayList@422[1] { ResolutionCandidate@423 }
-    <name not found> = ArrayList@424[1] { ResolutionCandidate@423 }
+ResolutionTaskHolder@419 {
+    <name not found> = ArrayList@420[1] { ResolutionCandidate@421 }
+}
+
+ResolutionTaskHolder@422 {
+    <name not found> = ArrayList@423[1] { ResolutionCandidate@424 }
 }
 
 ResolutionTaskHolder@425 {
     <name not found> = ArrayList@426[1] { ResolutionCandidate@427 }
-    <name not found> = ArrayList@428[1] { ResolutionCandidate@427 }
 }
 
-ResolutionTaskHolder@429 {
-    <name not found> = ArrayList@430[1] { ResolutionCandidate@431 }
-    <name not found> = ArrayList@432[1] { ResolutionCandidate@431 }
+ResolutionTaskHolder@428 {
+    <name not found> = ArrayList@429[1] { ResolutionCandidate@430 }
 }
 
-ResolutionTaskHolder@433 {
-    <name not found> = ArrayList@434[1] { ResolutionCandidate@435 }
-    <name not found> = ArrayList@436[1] { ResolutionCandidate@435 }
+ResolutionTaskHolder@431 {
+    <name not found> = ArrayList@432[1] { ResolutionCandidate@433 }
+}
+
+ResolutionTaskHolder@434 {
+    <name not found> = ArrayList@435[1] { ResolutionCandidate@436 }
 }
 
 ResolutionTaskHolder@437 {
     <name not found> = ArrayList@438[1] { ResolutionCandidate@439 }
-    <name not found> = ArrayList@440[1] { ResolutionCandidate@439 }
 }
 
-ResolutionTaskHolder@441 {
-    <name not found> = ArrayList@442[1] { ResolutionCandidate@443 }
-    <name not found> = ArrayList@444[1] { ResolutionCandidate@443 }
+ResolutionTaskHolder@440 {
+    <name not found> = ArrayList@441[1] { ResolutionCandidate@442 }
 }
 
-ResolutionTaskHolder@445 {
-    <name not found> = ArrayList@446[1] { ResolutionCandidate@447 }
-    <name not found> = ArrayList@448[1] { ResolutionCandidate@447 }
+ResolutionTaskHolder@443 {
+    <name not found> = ArrayList@444[1] { ResolutionCandidate@445 }
+}
+
+ResolutionTaskHolder@446 {
+    <name not found> = ArrayList@447[1] { ResolutionCandidate@448 }
 }
 
 ResolutionTaskHolder@449 {
     <name not found> = ArrayList@450[1] { ResolutionCandidate@451 }
-    <name not found> = ArrayList@452[1] { ResolutionCandidate@451 }
 }
 
-ResolutionTaskHolder@453 {
-    <name not found> = ArrayList@454[1] { ResolutionCandidate@455 }
-    <name not found> = ArrayList@456[1] { ResolutionCandidate@455 }
+ResolutionTaskHolder@452 {
+    <name not found> = ArrayList@453[1] { ResolutionCandidate@454 }
 }
 
-ResolutionTaskHolder@457 {
-    <name not found> = ArrayList@458[1] { ResolutionCandidate@459 }
-    <name not found> = ArrayList@460[1] { ResolutionCandidate@459 }
+ResolutionTaskHolder@455 {
+    <name not found> = ArrayList@456[1] { ResolutionCandidate@457 }
+}
+
+ResolutionTaskHolder@458 {
+    <name not found> = ArrayList@459[1] { ResolutionCandidate@460 }
 }
 
 ResolutionTaskHolder@461 {
     <name not found> = ArrayList@462[1] { ResolutionCandidate@463 }
-    <name not found> = ArrayList@464[1] { ResolutionCandidate@463 }
 }
 
-ResolutionTaskHolder@465 {
-    <name not found> = ArrayList@466[1] { ResolutionCandidate@467 }
-    <name not found> = ArrayList@468[1] { ResolutionCandidate@467 }
+ResolutionTaskHolder@464 {
+    <name not found> = ArrayList@465[1] { ResolutionCandidate@466 }
 }
 
-ResolutionTaskHolder@469 {
-    <name not found> = ArrayList@470[1] { ResolutionCandidate@471 }
-    <name not found> = ArrayList@472[1] { ResolutionCandidate@471 }
+ResolutionTaskHolder@467 {
+    <name not found> = ArrayList@468[1] { ResolutionCandidate@469 }
+}
+
+ResolutionTaskHolder@470 {
+    <name not found> = ArrayList@471[1] { ResolutionCandidate@472 }
 }
 
 ResolutionTaskHolder@473 {
     <name not found> = ArrayList@474[1] { ResolutionCandidate@475 }
-    <name not found> = ArrayList@476[1] { ResolutionCandidate@475 }
 }
 
-ResolutionTaskHolder@477 {
-    <name not found> = ArrayList@478[1] { ResolutionCandidate@479 }
-    <name not found> = ArrayList@480[1] { ResolutionCandidate@479 }
+ResolutionTaskHolder@476 {
+    <name not found> = ArrayList@477[1] { ResolutionCandidate@478 }
 }
 
-ResolutionTaskHolder@481 {
-    <name not found> = ArrayList@482[1] { ResolutionCandidate@483 }
-    <name not found> = ArrayList@484[1] { ResolutionCandidate@483 }
+ResolutionTaskHolder@479 {
+    <name not found> = ArrayList@480[1] { ResolutionCandidate@481 }
+}
+
+ResolutionTaskHolder@482 {
+    <name not found> = ArrayList@483[1] { ResolutionCandidate@484 }
 }
 
 ResolutionTaskHolder@485 {
     <name not found> = ArrayList@486[1] { ResolutionCandidate@487 }
-    <name not found> = ArrayList@488[1] { ResolutionCandidate@487 }
 }
 
-ResolutionTaskHolder@489 {
-    <name not found> = ArrayList@490[1] { ResolutionCandidate@491 }
-    <name not found> = ArrayList@492[1] { ResolutionCandidate@491 }
+ResolutionTaskHolder@488 {
+    <name not found> = ArrayList@489[1] { ResolutionCandidate@490 }
 }
 
-ResolutionTaskHolder@493 {
-    <name not found> = ArrayList@494[1] { ResolutionCandidate@495 }
-    <name not found> = ArrayList@496[1] { ResolutionCandidate@495 }
+ResolutionTaskHolder@491 {
+    <name not found> = ArrayList@492[1] { ResolutionCandidate@493 }
+}
+
+ResolutionTaskHolder@494 {
+    <name not found> = ArrayList@495[1] { ResolutionCandidate@496 }
 }
 
 ResolutionTaskHolder@497 {
     <name not found> = ArrayList@498[1] { ResolutionCandidate@499 }
-    <name not found> = ArrayList@500[1] { ResolutionCandidate@499 }
 }
 
-ResolutionTaskHolder@501 {
-    <name not found> = ArrayList@502[1] { ResolutionCandidate@503 }
-    <name not found> = ArrayList@504[1] { ResolutionCandidate@503 }
+ResolutionTaskHolder@500 {
+    <name not found> = ArrayList@501[1] { ResolutionCandidate@502 }
 }
 
-ResolutionTaskHolder@505 {
-    <name not found> = ArrayList@506[1] { ResolutionCandidate@507 }
-    <name not found> = ArrayList@508[1] { ResolutionCandidate@507 }
+ResolutionTaskHolder@503 {
+    <name not found> = ArrayList@504[1] { ResolutionCandidate@505 }
+}
+
+ResolutionTaskHolder@506 {
+    <name not found> = ArrayList@507[1] { ResolutionCandidate@508 }
 }
 
 ResolutionTaskHolder@509 {
     <name not found> = ArrayList@510[1] { ResolutionCandidate@511 }
-    <name not found> = ArrayList@512[1] { ResolutionCandidate@511 }
 }
 
-ResolutionTaskHolder@513 {
-    <name not found> = ArrayList@514[1] { ResolutionCandidate@515 }
-    <name not found> = ArrayList@516[1] { ResolutionCandidate@515 }
+ResolutionTaskHolder@512 {
+    <name not found> = ArrayList@513[1] { ResolutionCandidate@514 }
 }
 
-ResolutionTaskHolder@517 {
-    <name not found> = ArrayList@518[1] { ResolutionCandidate@519 }
-    <name not found> = ArrayList@520[1] { ResolutionCandidate@519 }
+ResolutionTaskHolder@515 {
+    <name not found> = ArrayList@516[1] { ResolutionCandidate@517 }
+}
+
+ResolutionTaskHolder@518 {
+    <name not found> = ArrayList@519[1] { ResolutionCandidate@520 }
 }
 
 ResolutionTaskHolder@521 {
     <name not found> = ArrayList@522[1] { ResolutionCandidate@523 }
-    <name not found> = ArrayList@524[1] { ResolutionCandidate@523 }
 }
 
-ResolutionTaskHolder@525 {
-    <name not found> = ArrayList@526[1] { ResolutionCandidate@527 }
-    <name not found> = ArrayList@528[1] { ResolutionCandidate@527 }
+ResolutionTaskHolder@524 {
+    <name not found> = ArrayList@525[1] { ResolutionCandidate@526 }
 }
 
-ResolutionTaskHolder@529 {
-    <name not found> = ArrayList@530[1] { ResolutionCandidate@531 }
-    <name not found> = ArrayList@532[1] { ResolutionCandidate@531 }
+ResolutionTaskHolder@527 {
+    <name not found> = ArrayList@528[1] { ResolutionCandidate@529 }
+}
+
+ResolutionTaskHolder@530 {
+    <name not found> = ArrayList@531[1] { ResolutionCandidate@532 }
 }
 
 ResolutionTaskHolder@533 {
     <name not found> = ArrayList@534[1] { ResolutionCandidate@535 }
-    <name not found> = ArrayList@536[1] { ResolutionCandidate@535 }
 }
 
-ResolutionTaskHolder@537 {
-    <name not found> = ArrayList@538[1] { ResolutionCandidate@539 }
-    <name not found> = ArrayList@540[1] { ResolutionCandidate@539 }
+ResolutionTaskHolder@536 {
+    <name not found> = ArrayList@537[1] { ResolutionCandidate@538 }
 }
 
-ResolutionTaskHolder@541 {
-    <name not found> = ArrayList@542[1] { ResolutionCandidate@543 }
-    <name not found> = ArrayList@544[1] { ResolutionCandidate@543 }
+ResolutionTaskHolder@539 {
+    <name not found> = ArrayList@540[1] { ResolutionCandidate@541 }
+}
+
+ResolutionTaskHolder@542 {
+    <name not found> = ArrayList@543[1] { ResolutionCandidate@544 }
 }
 
 ResolutionTaskHolder@545 {
     <name not found> = ArrayList@546[1] { ResolutionCandidate@547 }
-    <name not found> = ArrayList@548[1] { ResolutionCandidate@547 }
 }
 
-ResolutionTaskHolder@549 {
-    <name not found> = ArrayList@550[1] { ResolutionCandidate@551 }
-    <name not found> = ArrayList@552[1] { ResolutionCandidate@551 }
+ResolutionTaskHolder@548 {
+    <name not found> = ArrayList@549[1] { ResolutionCandidate@550 }
 }
 
-ResolutionTaskHolder@553 {
-    <name not found> = ArrayList@554[1] { ResolutionCandidate@555 }
-    <name not found> = ArrayList@556[1] { ResolutionCandidate@555 }
+ResolutionTaskHolder@551 {
+    <name not found> = ArrayList@552[1] { ResolutionCandidate@553 }
+}
+
+ResolutionTaskHolder@554 {
+    <name not found> = ArrayList@555[1] { ResolutionCandidate@556 }
 }
 
 ResolutionTaskHolder@557 {
     <name not found> = ArrayList@558[1] { ResolutionCandidate@559 }
-    <name not found> = ArrayList@560[1] { ResolutionCandidate@559 }
 }
 
-ResolutionTaskHolder@561 {
-    <name not found> = ArrayList@562[1] { ResolutionCandidate@563 }
-    <name not found> = ArrayList@564[1] { ResolutionCandidate@563 }
+ResolutionTaskHolder@560 {
+    <name not found> = ArrayList@561[1] { ResolutionCandidate@562 }
 }
 
-ResolutionTaskHolder@565 {
-    <name not found> = ArrayList@566[1] { ResolutionCandidate@567 }
-    <name not found> = ArrayList@568[1] { ResolutionCandidate@567 }
+ResolutionTaskHolder@563 {
+    <name not found> = ArrayList@564[1] { ResolutionCandidate@565 }
+}
+
+ResolutionTaskHolder@566 {
+    <name not found> = ArrayList@567[1] { ResolutionCandidate@568 }
 }
 
 ResolutionTaskHolder@569 {
     <name not found> = ArrayList@570[1] { ResolutionCandidate@571 }
-    <name not found> = ArrayList@572[1] { ResolutionCandidate@571 }
 }
 
-ResolutionTaskHolder@573 {
-    <name not found> = ArrayList@574[1] { ResolutionCandidate@575 }
-    <name not found> = ArrayList@576[1] { ResolutionCandidate@575 }
+ResolutionTaskHolder@572 {
+    <name not found> = ArrayList@573[1] { ResolutionCandidate@574 }
 }
 
-ResolutionTaskHolder@577 {
-    <name not found> = ArrayList@578[1] { ResolutionCandidate@579 }
-    <name not found> = ArrayList@580[1] { ResolutionCandidate@579 }
+ResolutionTaskHolder@575 {
+    <name not found> = ArrayList@576[1] { ResolutionCandidate@577 }
+}
+
+ResolutionTaskHolder@578 {
+    <name not found> = ArrayList@579[1] { ResolutionCandidate@580 }
 }
 
 ResolutionTaskHolder@581 {
     <name not found> = ArrayList@582[1] { ResolutionCandidate@583 }
-    <name not found> = ArrayList@584[1] { ResolutionCandidate@583 }
 }
 
-ResolutionTaskHolder@585 {
-    <name not found> = ArrayList@586[1] { ResolutionCandidate@587 }
-    <name not found> = ArrayList@588[1] { ResolutionCandidate@587 }
+ResolutionTaskHolder@584 {
+    <name not found> = ArrayList@585[1] { ResolutionCandidate@586 }
 }
 
-ResolutionTaskHolder@589 {
-    <name not found> = ArrayList@590[1] { ResolutionCandidate@591 }
-    <name not found> = ArrayList@592[1] { ResolutionCandidate@591 }
+ResolutionTaskHolder@587 {
+    <name not found> = ArrayList@588[1] { ResolutionCandidate@589 }
+}
+
+ResolutionTaskHolder@590 {
+    <name not found> = ArrayList@591[1] { ResolutionCandidate@592 }
 }
 
 ResolutionTaskHolder@593 {
     <name not found> = ArrayList@594[1] { ResolutionCandidate@595 }
-    <name not found> = ArrayList@596[1] { ResolutionCandidate@595 }
 }
 
-ResolutionTaskHolder@597 {
-    <name not found> = ArrayList@598[1] { ResolutionCandidate@599 }
-    <name not found> = ArrayList@600[1] { ResolutionCandidate@599 }
+ResolutionTaskHolder@596 {
+    <name not found> = ArrayList@597[1] { ResolutionCandidate@598 }
 }
 
-ResolutionTaskHolder@601 {
-    <name not found> = ArrayList@602[1] { ResolutionCandidate@603 }
-    <name not found> = ArrayList@604[1] { ResolutionCandidate@603 }
+ResolutionTaskHolder@599 {
+    <name not found> = ArrayList@600[1] { ResolutionCandidate@601 }
+}
+
+ResolutionTaskHolder@602 {
+    <name not found> = ArrayList@603[1] { ResolutionCandidate@604 }
 }
 
 ResolutionTaskHolder@605 {
     <name not found> = ArrayList@606[1] { ResolutionCandidate@607 }
-    <name not found> = ArrayList@608[1] { ResolutionCandidate@607 }
 }
 
-ResolutionTaskHolder@609 {
-    <name not found> = ArrayList@610[1] { ResolutionCandidate@611 }
-    <name not found> = ArrayList@612[1] { ResolutionCandidate@611 }
+ResolutionTaskHolder@608 {
+    <name not found> = ArrayList@609[1] { ResolutionCandidate@610 }
 }
 
-ResolutionTaskHolder@613 {
-    <name not found> = ArrayList@614[1] { ResolutionCandidate@615 }
-    <name not found> = ArrayList@616[1] { ResolutionCandidate@615 }
+ResolutionTaskHolder@611 {
+    <name not found> = ArrayList@612[1] { ResolutionCandidate@613 }
+}
+
+ResolutionTaskHolder@614 {
+    <name not found> = ArrayList@615[1] { ResolutionCandidate@616 }
 }
 
 ResolutionTaskHolder@617 {
     <name not found> = ArrayList@618[1] { ResolutionCandidate@619 }
-    <name not found> = ArrayList@620[1] { ResolutionCandidate@619 }
 }
 
-ResolutionTaskHolder@621 {
-    <name not found> = ArrayList@622[1] { ResolutionCandidate@623 }
-    <name not found> = ArrayList@624[1] { ResolutionCandidate@623 }
+ResolutionTaskHolder@620 {
+    <name not found> = ArrayList@621[1] { ResolutionCandidate@622 }
 }
 
-ResolutionTaskHolder@625 {
-    <name not found> = ArrayList@626[1] { ResolutionCandidate@627 }
-    <name not found> = ArrayList@628[1] { ResolutionCandidate@627 }
+ResolutionTaskHolder@623 {
+    <name not found> = ArrayList@624[1] { ResolutionCandidate@625 }
+}
+
+ResolutionTaskHolder@626 {
+    <name not found> = ArrayList@627[1] { ResolutionCandidate@628 }
 }
 
 ResolutionTaskHolder@629 {
     <name not found> = ArrayList@630[1] { ResolutionCandidate@631 }
-    <name not found> = ArrayList@632[1] { ResolutionCandidate@631 }
 }
 
-ResolutionTaskHolder@633 {
-    <name not found> = ArrayList@634[1] { ResolutionCandidate@635 }
-    <name not found> = ArrayList@636[1] { ResolutionCandidate@635 }
+ResolutionTaskHolder@632 {
+    <name not found> = ArrayList@633[1] { ResolutionCandidate@634 }
 }
 
-ResolutionTaskHolder@637 {
-    <name not found> = ArrayList@638[1] { ResolutionCandidate@639 }
-    <name not found> = ArrayList@640[1] { ResolutionCandidate@639 }
+ResolutionTaskHolder@635 {
+    <name not found> = ArrayList@636[1] { ResolutionCandidate@637 }
+}
+
+ResolutionTaskHolder@638 {
+    <name not found> = ArrayList@639[1] { ResolutionCandidate@640 }
 }
 
 ResolutionTaskHolder@641 {
     <name not found> = ArrayList@642[1] { ResolutionCandidate@643 }
-    <name not found> = ArrayList@644[1] { ResolutionCandidate@643 }
 }
 
-ResolutionTaskHolder@645 {
-    <name not found> = ArrayList@646[1] { ResolutionCandidate@647 }
-    <name not found> = ArrayList@648[1] { ResolutionCandidate@647 }
+ResolutionTaskHolder@644 {
+    <name not found> = ArrayList@645[1] { ResolutionCandidate@646 }
 }
 
-ResolutionTaskHolder@649 {
-    <name not found> = ArrayList@650[1] { ResolutionCandidate@651 }
-    <name not found> = ArrayList@652[1] { ResolutionCandidate@651 }
+ResolutionTaskHolder@647 {
+    <name not found> = ArrayList@648[1] { ResolutionCandidate@649 }
+}
+
+ResolutionTaskHolder@650 {
+    <name not found> = ArrayList@651[1] { ResolutionCandidate@652 }
 }
 
 ResolutionTaskHolder@653 {
     <name not found> = ArrayList@654[1] { ResolutionCandidate@655 }
-    <name not found> = ArrayList@656[1] { ResolutionCandidate@655 }
 }
 
-ResolutionTaskHolder@657 {
-    <name not found> = ArrayList@658[1] { ResolutionCandidate@659 }
-    <name not found> = ArrayList@660[1] { ResolutionCandidate@659 }
-}
-
-ResolutionTaskHolder@661 {
-    <name not found> = ArrayList@662[1] { ResolutionCandidate@663 }
-    <name not found> = ArrayList@664[1] { ResolutionCandidate@663 }
-}
-
-ResolutionTaskHolder@665 {
-    <name not found> = ArrayList@666[1] { ResolutionCandidate@667 }
-    <name not found> = ArrayList@668[1] { ResolutionCandidate@667 }
-}
-
-ResolutionTaskHolder@669 {
-    <name not found> = ArrayList@670[1] { ResolutionCandidate@671 }
-    <name not found> = ArrayList@672[1] { ResolutionCandidate@671 }
-}
-
-ResolutionTaskHolder@673 {
-    <name not found> = ArrayList@674[1] { ResolutionCandidate@675 }
-    <name not found> = ArrayList@676[1] { ResolutionCandidate@675 }
-}
-
-ResolutionTaskHolder@677 {
-    <name not found> = ArrayList@678[1] { ResolutionCandidate@679 }
-    <name not found> = ArrayList@680[1] { ResolutionCandidate@679 }
-}
-
-ResolutionTaskHolder@681 {
-    <name not found> = ArrayList@682[1] { ResolutionCandidate@683 }
-    <name not found> = ArrayList@684[1] { ResolutionCandidate@683 }
-}
-
-ResolutionTaskHolder@685 {
-    <name not found> = ArrayList@686[1] { ResolutionCandidate@687 }
-    <name not found> = ArrayList@688[1] { ResolutionCandidate@687 }
-}
-
-ResolutionTaskHolder@689 {
-    <name not found> = ArrayList@690[1] { ResolutionCandidate@691 }
-    <name not found> = ArrayList@692[1] { ResolutionCandidate@691 }
-}
-
-ResolutionTaskHolder@693 {
-    <name not found> = ArrayList@694[1] { ResolutionCandidate@695 }
-    <name not found> = ArrayList@696[1] { ResolutionCandidate@695 }
-}
-
-ResolutionTaskHolder@697 {
-    <name not found> = ArrayList@698[1] { ResolutionCandidate@699 }
-    <name not found> = ArrayList@700[1] { ResolutionCandidate@699 }
-}
-
-ResolutionTaskHolder@701 {
-    <name not found> = ArrayList@702[1] { ResolutionCandidate@703 }
-    <name not found> = ArrayList@704[1] { ResolutionCandidate@703 }
-}
-
-ResolutionTaskHolder@705 {
-    <name not found> = ArrayList@706[1] { ResolutionCandidate@707 }
-    <name not found> = ArrayList@708[1] { ResolutionCandidate@707 }
-}
-
-ResolutionTaskHolder@709 {
-    <name not found> = ArrayList@710[1] { ResolutionCandidate@711 }
-    <name not found> = ArrayList@712[1] { ResolutionCandidate@711 }
-}
-
-ResolutionTaskHolder@713 {
-    <name not found> = ArrayList@714[1] { ResolutionCandidate@715 }
-    <name not found> = ArrayList@716[1] { ResolutionCandidate@715 }
-}
-
-ResolutionTaskHolder@717 {
-    <name not found> = ArrayList@718[1] { ResolutionCandidate@719 }
-    <name not found> = ArrayList@720[1] { ResolutionCandidate@719 }
-}
-
-ResolutionTaskHolder@721 {
-    <name not found> = ArrayList@722[1] { ResolutionCandidate@723 }
-    <name not found> = ArrayList@724[1] { ResolutionCandidate@723 }
-}
-
-ResolutionTaskHolder@725 {
-    <name not found> = ArrayList@726[1] { ResolutionCandidate@727 }
-    <name not found> = ArrayList@728[1] { ResolutionCandidate@727 }
-}
-
-ResolutionTaskHolder@729 {
-    <name not found> = ArrayList@730[1] { ResolutionCandidate@731 }
-    <name not found> = ArrayList@732[1] { ResolutionCandidate@731 }
-}
-
-ResolutionTaskHolder@733 {
-    <name not found> = ArrayList@734[1] { ResolutionCandidate@735 }
-    <name not found> = ArrayList@736[1] { ResolutionCandidate@735 }
-}
-
-ResolutionTaskHolder@737 {
-    <name not found> = ArrayList@738[1] { ResolutionCandidate@739 }
-    <name not found> = ArrayList@740[1] { ResolutionCandidate@739 }
-}
-
-ResolutionTaskHolder@741 {
-    <name not found> = ArrayList@742[1] { ResolutionCandidate@743 }
-    <name not found> = ArrayList@744[1] { ResolutionCandidate@743 }
-}
-
-ResolutionTaskHolder@745 {
-    <name not found> = ArrayList@746[1] { ResolutionCandidate@747 }
-    <name not found> = ArrayList@748[1] { ResolutionCandidate@747 }
-}
-
-ResolutionTaskHolder@749 {
-    <name not found> = ArrayList@750[1] { ResolutionCandidate@751 }
-    <name not found> = ArrayList@752[1] { ResolutionCandidate@751 }
-}
-
-ResolutionTaskHolder@753 {
-    <name not found> = ArrayList@754[1] { ResolutionCandidate@755 }
-    <name not found> = ArrayList@756[1] { ResolutionCandidate@755 }
-}
-
-ResolutionTaskHolder@757 {
-    <name not found> = ArrayList@758[1] { ResolutionCandidate@759 }
-    <name not found> = ArrayList@760[1] { ResolutionCandidate@759 }
-}
-
-ResolutionTaskHolder@761 {
-    <name not found> = ArrayList@762[1] { ResolutionCandidate@763 }
-    <name not found> = ArrayList@764[1] { ResolutionCandidate@763 }
-}
-
-ResolutionTaskHolder@765 {
-    <name not found> = ArrayList@766[1] { ResolutionCandidate@767 }
-    <name not found> = ArrayList@768[1] { ResolutionCandidate@767 }
-}
-
-ResolutionTaskHolder@769 {
-    <name not found> = ArrayList@770[1] { ResolutionCandidate@771 }
-    <name not found> = ArrayList@772[1] { ResolutionCandidate@771 }
-}
-
-ResolutionTaskHolder@773 {
-    <name not found> = ArrayList@774[1] { ResolutionCandidate@775 }
-    <name not found> = ArrayList@776[1] { ResolutionCandidate@775 }
-}
-
-ResolutionTaskHolder@777 {
-    <name not found> = ArrayList@778[1] { ResolutionCandidate@779 }
-    <name not found> = ArrayList@780[1] { ResolutionCandidate@779 }
-}
-
-ResolutionTaskHolder@781 {
-    <name not found> = ArrayList@782[1] { ResolutionCandidate@783 }
-    <name not found> = ArrayList@784[1] { ResolutionCandidate@783 }
-}
-
-ResolutionTaskHolder@785 {
-    <name not found> = ArrayList@786[1] { ResolutionCandidate@787 }
-    <name not found> = ArrayList@788[1] { ResolutionCandidate@787 }
-}
-
-ResolutionTaskHolder@789 {
-    <name not found> = ArrayList@790[1] { ResolutionCandidate@791 }
-    <name not found> = ArrayList@792[1] { ResolutionCandidate@791 }
-}
-
-ResolutionTaskHolder@793 {
-    <name not found> = ArrayList@794[1] { ResolutionCandidate@795 }
-    <name not found> = ArrayList@796[1] { ResolutionCandidate@795 }
-}
-
-ResolutionTaskHolder@797 {
-    <name not found> = ArrayList@798[1] { ResolutionCandidate@799 }
-    <name not found> = ArrayList@800[1] { ResolutionCandidate@799 }
-}
-
-ResolutionTaskHolder@801 {
-    <name not found> = ArrayList@802[1] { ResolutionCandidate@803 }
-    <name not found> = ArrayList@804[1] { ResolutionCandidate@803 }
-}
-
-ResolutionTaskHolder@805 {
-    <name not found> = ArrayList@806[1] { ResolutionCandidate@807 }
-    <name not found> = ArrayList@808[1] { ResolutionCandidate@807 }
-}
-
-ResolutionTaskHolder@809 {
-    <name not found> = ArrayList@810[1] { ResolutionCandidate@811 }
-    <name not found> = ArrayList@812[1] { ResolutionCandidate@811 }
-}
-
-ResolutionTaskHolder@813 {
-    <name not found> = ArrayList@814[1] { ResolutionCandidate@815 }
-    <name not found> = ArrayList@816[1] { ResolutionCandidate@815 }
-}
-
-ResolutionTaskHolder@817 {
-    <name not found> = ArrayList@818[1] { ResolutionCandidate@819 }
-    <name not found> = ArrayList@820[1] { ResolutionCandidate@819 }
-}
-
-ResolutionTaskHolder@821 {
-    <name not found> = ArrayList@822[1] { ResolutionCandidate@823 }
-    <name not found> = ArrayList@824[1] { ResolutionCandidate@823 }
-}
-
-ResolutionTaskHolder@825 {
-    <name not found> = ArrayList@826[1] { ResolutionCandidate@827 }
-    <name not found> = ArrayList@828[1] { ResolutionCandidate@827 }
-}
-
-ResolutionTaskHolder@829 {
-    <name not found> = ArrayList@830[1] { ResolutionCandidate@831 }
-    <name not found> = ArrayList@832[1] { ResolutionCandidate@831 }
-}
-
-ResolutionTaskHolder@833 {
-    <name not found> = ArrayList@834[1] { ResolutionCandidate@835 }
-    <name not found> = ArrayList@836[1] { ResolutionCandidate@835 }
-}
-
-ResolutionTaskHolder@837 {
-    <name not found> = ArrayList@838[1] { ResolutionCandidate@839 }
-    <name not found> = ArrayList@840[1] { ResolutionCandidate@839 }
-}
-
-ResolutionTaskHolder@841 {
-    <name not found> = ArrayList@842[1] { ResolutionCandidate@843 }
-    <name not found> = ArrayList@844[1] { ResolutionCandidate@843 }
-}
-
-ResolutionTaskHolder@845 {
-    <name not found> = ArrayList@846[1] { ResolutionCandidate@847 }
-    <name not found> = ArrayList@848[1] { ResolutionCandidate@847 }
-}
-
-ResolutionTaskHolder@849 {
-    <name not found> = ArrayList@850[1] { ResolutionCandidate@851 }
-    <name not found> = ArrayList@852[1] { ResolutionCandidate@851 }
-}
-
-ResolutionTaskHolder@853 {
-    <name not found> = ArrayList@854[1] { ResolutionCandidate@855 }
-    <name not found> = ArrayList@856[1] { ResolutionCandidate@855 }
-}
-
-ResolutionTaskHolder@857 {
-    <name not found> = ArrayList@858[1] { ResolutionCandidate@859 }
-    <name not found> = ArrayList@860[1] { ResolutionCandidate@859 }
-}
-
-ResolutionTaskHolder@861 {
-    <name not found> = ArrayList@862[1] { ResolutionCandidate@863 }
-    <name not found> = ArrayList@864[1] { ResolutionCandidate@863 }
+null {
+    <name not found> = ArrayList@656[1] { ResolutionCandidate@427 }
+    <name not found> = ArrayList@657[1] { ResolutionCandidate@367 }
+    <name not found> = ArrayList@658[1] { ResolutionCandidate@604 }
+    <name not found> = ArrayList@659[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@660[1] { ResolutionCandidate@406 }
+    <name not found> = ArrayList@661[1] { ResolutionCandidate@607 }
+    <name not found> = ArrayList@662[1] { ResolutionCandidate@598 }
+    <name not found> = ArrayList@663[1] { ResolutionCandidate@493 }
+    <name not found> = ArrayList@664[1] { ResolutionCandidate@325 }
+    <name not found> = ArrayList@665[1] { ResolutionCandidate@364 }
+    <name not found> = ArrayList@666[1] { ResolutionCandidate@169 }
+    <name not found> = ArrayList@667[1] { ResolutionCandidate@175 }
+    <name not found> = ArrayList@668[1] { ResolutionCandidate@286 }
+    <name not found> = ArrayList@669[1] { ResolutionCandidate@178 }
+    <name not found> = ArrayList@670[1] { ResolutionCandidate@592 }
+    <name not found> = ArrayList@671[1] { ResolutionCandidate@517 }
+    <name not found> = ArrayList@672[1] { ResolutionCandidate@154 }
+    <name not found> = ArrayList@673[1] { ResolutionCandidate@223 }
+    <name not found> = ArrayList@674[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@675[1] { ResolutionCandidate@307 }
+    <name not found> = ArrayList@676[1] { ResolutionCandidate@649 }
+    <name not found> = ArrayList@677[1] { ResolutionCandidate@280 }
+    <name not found> = ArrayList@678[1] { ResolutionCandidate@187 }
+    <name not found> = ArrayList@679[1] { ResolutionCandidate@337 }
+    <name not found> = ArrayList@680[1] { ResolutionCandidate@388 }
+    <name not found> = ArrayList@681[1] { ResolutionCandidate@184 }
+    <name not found> = ArrayList@682[1] { ResolutionCandidate@160 }
+    <name not found> = ArrayList@683[1] { ResolutionCandidate@127 }
+    <name not found> = ArrayList@684[1] { ResolutionCandidate@556 }
+    <name not found> = ArrayList@685[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@686[1] { ResolutionCandidate@625 }
+    <name not found> = ArrayList@687[1] { ResolutionCandidate@523 }
+    <name not found> = ArrayList@688[1] { ResolutionCandidate@196 }
+    <name not found> = ArrayList@689[1] { ResolutionCandidate@577 }
+    <name not found> = ArrayList@690[1] { ResolutionCandidate@382 }
+    <name not found> = ArrayList@691[1] { ResolutionCandidate@472 }
+    <name not found> = ArrayList@692[1] { ResolutionCandidate@319 }
+    <name not found> = ArrayList@693[1] { ResolutionCandidate@163 }
+    <name not found> = ArrayList@694[1] { ResolutionCandidate@349 }
+    <name not found> = ArrayList@695[1] { ResolutionCandidate@430 }
+    <name not found> = ArrayList@696[1] { ResolutionCandidate@358 }
+    <name not found> = ArrayList@697[1] { ResolutionCandidate@202 }
+    <name not found> = ArrayList@698[1] { ResolutionCandidate@313 }
+    <name not found> = ArrayList@699[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@700[1] { ResolutionCandidate@511 }
+    <name not found> = ArrayList@701[1] { ResolutionCandidate@391 }
+    <name not found> = ArrayList@702[1] { ResolutionCandidate@418 }
+    <name not found> = ArrayList@703[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@704[1] { ResolutionCandidate@436 }
+    <name not found> = ArrayList@705[1] { ResolutionCandidate@340 }
+    <name not found> = ArrayList@706[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@707[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@708[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@709[1] { ResolutionCandidate@256 }
+    <name not found> = ArrayList@710[1] { ResolutionCandidate@394 }
+    <name not found> = ArrayList@711[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@712[1] { ResolutionCandidate@460 }
+    <name not found> = ArrayList@713[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@714[1] { ResolutionCandidate@274 }
+    <name not found> = ArrayList@715[1] { ResolutionCandidate@445 }
+    <name not found> = ArrayList@716[1] { ResolutionCandidate@328 }
+    <name not found> = ArrayList@717[1] { ResolutionCandidate@448 }
+    <name not found> = ArrayList@718[1] { ResolutionCandidate@148 }
+    <name not found> = ArrayList@719[1] { ResolutionCandidate@514 }
+    <name not found> = ArrayList@720[1] { ResolutionCandidate@298 }
+    <name not found> = ArrayList@721[1] { ResolutionCandidate@172 }
+    <name not found> = ArrayList@722[1] { ResolutionCandidate@211 }
+    <name not found> = ArrayList@723[1] { ResolutionCandidate@646 }
+    <name not found> = ArrayList@724[1] { ResolutionCandidate@400 }
+    <name not found> = ArrayList@725[1] { ResolutionCandidate@199 }
+    <name not found> = ArrayList@726[1] { ResolutionCandidate@616 }
+    <name not found> = ArrayList@727[1] { ResolutionCandidate@181 }
+    <name not found> = ArrayList@728[1] { ResolutionCandidate@505 }
+    <name not found> = ArrayList@729[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@730[1] { ResolutionCandidate@217 }
+    <name not found> = ArrayList@731[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@732[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@733[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@734[1] { ResolutionCandidate@421 }
+    <name not found> = ArrayList@735[1] { ResolutionCandidate@262 }
+    <name not found> = ArrayList@736[1] { ResolutionCandidate@565 }
+    <name not found> = ArrayList@737[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@738[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@739[1] { ResolutionCandidate@253 }
+    <name not found> = ArrayList@740[1] { ResolutionCandidate@139 }
+    <name not found> = ArrayList@741[1] { ResolutionCandidate@568 }
+    <name not found> = ArrayList@742[1] { ResolutionCandidate@190 }
+    <name not found> = ArrayList@743[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@744[1] { ResolutionCandidate@283 }
+    <name not found> = ArrayList@745[1] { ResolutionCandidate@526 }
+    <name not found> = ArrayList@746[1] { ResolutionCandidate@454 }
+    <name not found> = ArrayList@747[1] { ResolutionCandidate@361 }
+    <name not found> = ArrayList@748[1] { ResolutionCandidate@193 }
+    <name not found> = ArrayList@749[1] { ResolutionCandidate@277 }
+    <name not found> = ArrayList@750[1] { ResolutionCandidate@232 }
+    <name not found> = ArrayList@751[1] { ResolutionCandidate@310 }
+    <name not found> = ArrayList@752[1] { ResolutionCandidate@265 }
+    <name not found> = ArrayList@753[1] { ResolutionCandidate@580 }
+    <name not found> = ArrayList@754[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@755[1] { ResolutionCandidate@403 }
+    <name not found> = ArrayList@756[1] { ResolutionCandidate@637 }
+    <name not found> = ArrayList@757[1] { ResolutionCandidate@370 }
+    <name not found> = ArrayList@758[1] { ResolutionCandidate@640 }
+    <name not found> = ArrayList@759[1] { ResolutionCandidate@352 }
+    <name not found> = ArrayList@760[1] { ResolutionCandidate@226 }
+    <name not found> = ArrayList@761[1] { ResolutionCandidate@268 }
+    <name not found> = ArrayList@762[1] { ResolutionCandidate@610 }
+    <name not found> = ArrayList@763[1] { ResolutionCandidate@484 }
+    <name not found> = ArrayList@764[1] { ResolutionCandidate@238 }
+    <name not found> = ArrayList@765[1] { ResolutionCandidate@655 }
+    <name not found> = ArrayList@766[1] { ResolutionCandidate@466 }
+    <name not found> = ArrayList@767[1] { ResolutionCandidate@241 }
+    <name not found> = ArrayList@768[1] { ResolutionCandidate@271 }
+    <name not found> = ArrayList@769[1] { ResolutionCandidate@331 }
+    <name not found> = ArrayList@770[1] { ResolutionCandidate@205 }
+    <name not found> = ArrayList@771[1] { ResolutionCandidate@535 }
+    <name not found> = ArrayList@772[1] { ResolutionCandidate@409 }
+    <name not found> = ArrayList@773[1] { ResolutionCandidate@538 }
+    <name not found> = ArrayList@774[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@775[1] { ResolutionCandidate@643 }
+    <name not found> = ArrayList@776[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@777[1] { ResolutionCandidate@412 }
+    <name not found> = ArrayList@778[1] { ResolutionCandidate@481 }
+    <name not found> = ArrayList@779[1] { ResolutionCandidate@496 }
+    <name not found> = ArrayList@780[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@781[1] { ResolutionCandidate@316 }
+    <name not found> = ArrayList@782[1] { ResolutionCandidate@571 }
+    <name not found> = ArrayList@783[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@784[1] { ResolutionCandidate@508 }
+    <name not found> = ArrayList@785[1] { ResolutionCandidate@541 }
+    <name not found> = ArrayList@786[1] { ResolutionCandidate@373 }
+    <name not found> = ArrayList@787[1] { ResolutionCandidate@628 }
+    <name not found> = ArrayList@788[1] { ResolutionCandidate@289 }
+    <name not found> = ArrayList@789[1] { ResolutionCandidate@250 }
+    <name not found> = ArrayList@790[1] { ResolutionCandidate@136 }
+    <name not found> = ArrayList@791[1] { ResolutionCandidate@574 }
+    <name not found> = ArrayList@792[1] { ResolutionCandidate@166 }
+    <name not found> = ArrayList@793[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@794[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@795[1] { ResolutionCandidate@529 }
+    <name not found> = ArrayList@796[1] { ResolutionCandidate@451 }
+    <name not found> = ArrayList@797[1] { ResolutionCandidate@376 }
+    <name not found> = ArrayList@798[1] { ResolutionCandidate@439 }
+    <name not found> = ArrayList@799[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@800[1] { ResolutionCandidate@502 }
+    <name not found> = ArrayList@801[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@802[1] { ResolutionCandidate@142 }
+    <name not found> = ArrayList@803[1] { ResolutionCandidate@553 }
+    <name not found> = ArrayList@804[1] { ResolutionCandidate@433 }
+    <name not found> = ArrayList@805[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@806[1] { ResolutionCandidate@490 }
+    <name not found> = ArrayList@807[1] { ResolutionCandidate@244 }
+    <name not found> = ArrayList@808[1] { ResolutionCandidate@478 }
+    <name not found> = ArrayList@809[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@810[1] { ResolutionCandidate@544 }
+    <name not found> = ArrayList@811[1] { ResolutionCandidate@457 }
+    <name not found> = ArrayList@812[1] { ResolutionCandidate@220 }
+    <name not found> = ArrayList@813[1] { ResolutionCandidate@322 }
+    <name not found> = ArrayList@814[1] { ResolutionCandidate@151 }
+    <name not found> = ArrayList@815[1] { ResolutionCandidate@547 }
+    <name not found> = ArrayList@816[1] { ResolutionCandidate@442 }
+    <name not found> = ArrayList@817[1] { ResolutionCandidate@355 }
+    <name not found> = ArrayList@818[1] { ResolutionCandidate@634 }
+    <name not found> = ArrayList@819[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@820[1] { ResolutionCandidate@379 }
+    <name not found> = ArrayList@821[1] { ResolutionCandidate@343 }
+    <name not found> = ArrayList@822[1] { ResolutionCandidate@145 }
+    <name not found> = ArrayList@823[1] { ResolutionCandidate@292 }
+    <name not found> = ArrayList@824[1] { ResolutionCandidate@652 }
+    <name not found> = ArrayList@825[1] { ResolutionCandidate@208 }
+    <name not found> = ArrayList@826[1] { ResolutionCandidate@424 }
+    <name not found> = ArrayList@827[1] { ResolutionCandidate@589 }
+    <name not found> = ArrayList@828[1] { ResolutionCandidate@601 }
+    <name not found> = ArrayList@829[1] { ResolutionCandidate@559 }
+    <name not found> = ArrayList@830[1] { ResolutionCandidate@619 }
+    <name not found> = ArrayList@831[1] { ResolutionCandidate@397 }
+    <name not found> = ArrayList@832[1] { ResolutionCandidate@463 }
+    <name not found> = ArrayList@833[1] { ResolutionCandidate@583 }
+    <name not found> = ArrayList@834[1] { ResolutionCandidate@586 }
+    <name not found> = ArrayList@835[1] { ResolutionCandidate@229 }
+    <name not found> = ArrayList@836[1] { ResolutionCandidate@499 }
+    <name not found> = ArrayList@837[1] { ResolutionCandidate@259 }
+    <name not found> = ArrayList@838[1] { ResolutionCandidate@532 }
+    <name not found> = ArrayList@839[1] { ResolutionCandidate@595 }
+    <name not found> = ArrayList@840[1] { ResolutionCandidate@385 }
+    <name not found> = ArrayList@841[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@842[1] { ResolutionCandidate@301 }
+    <name not found> = ArrayList@843[1] { ResolutionCandidate@304 }
+    <name not found> = ArrayList@844[1] { ResolutionCandidate@469 }
+    <name not found> = ArrayList@845[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@846[1] { ResolutionCandidate@475 }
+    <name not found> = ArrayList@847[1] { ResolutionCandidate@613 }
+    <name not found> = ArrayList@848[1] { ResolutionCandidate@487 }
+    <name not found> = ArrayList@849[1] { ResolutionCandidate@562 }
+    <name not found> = ArrayList@850[1] { ResolutionCandidate@133 }
+    <name not found> = ArrayList@851[1] { ResolutionCandidate@247 }
+    <name not found> = ArrayList@852[1] { ResolutionCandidate@295 }
+    <name not found> = ArrayList@853[1] { ResolutionCandidate@214 }
+    <name not found> = ArrayList@854[1] { ResolutionCandidate@415 }
+    <name not found> = ArrayList@855[1] { ResolutionCandidate@622 }
+    <name not found> = ArrayList@856[1] { ResolutionCandidate@157 }
+    <name not found> = ArrayList@857[1] { ResolutionCandidate@235 }
+    <name not found> = ArrayList@858[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@859[1] { ResolutionCandidate@631 }
+    <name not found> = ArrayList@860[1] { ResolutionCandidate@550 }
+    <name not found> = ArrayList@861[1] { ResolutionCandidate@520 }
+    <name not found> = ArrayList@862[1] { ResolutionCandidate@124 }
+    <name not found> = ArrayList@863[1] { ResolutionCandidate@346 }
+    <name not found> = ArrayList@864[1] { ResolutionCandidate@334 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/MultiDeclaration.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/MultiDeclaration.lazy.log
index df916f43456..636ae6f7164 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/MultiDeclaration.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/MultiDeclaration.lazy.log
@@ -46,24 +46,27 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@35 {
     <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+}
+
+null {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@40 }
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ObjectExpression.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ObjectExpression.lazy.log
index ddd92ce1b08..17ce57e4492 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ObjectExpression.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ObjectExpression.lazy.log
@@ -50,37 +50,20 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@32 {
     <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@39 {
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
     <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+}
+
+ResolutionTaskHolder@42 {
     <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -91,47 +74,67 @@ ResolutionTaskHolder@46 {
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+}
+
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
 }
 
 ResolutionTaskHolder@54 {
     <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
+}
+
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
 }
 
 ResolutionTaskHolder@66 {
     <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[8] { ResolutionCandidate@71, ResolutionCandidate@72, ResolutionCandidate@73, ... }
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[8] { ResolutionCandidate@84, ResolutionCandidate@85, ResolutionCandidate@86, ... }
-    <name not found> = ArrayList@87[8] { ResolutionCandidate@84, ResolutionCandidate@85, ResolutionCandidate@86, ... }
+null {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@87[8] { ResolutionCandidate@71, ResolutionCandidate@72, ResolutionCandidate@73, ... }
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/QualifiedExpression.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/QualifiedExpression.lazy.log
index 9b833a957ea..9b66bbf3f95 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/QualifiedExpression.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/QualifiedExpression.lazy.log
@@ -52,36 +52,39 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@32 {
     <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
+    <name not found> = EmptyList@24[empty]
+}
+
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -94,74 +97,74 @@ ResolutionTaskHolder@39 {
 
 ResolutionTaskHolder@43 {
     <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
 }
 
 ResolutionTaskHolder@55 {
     <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
+}
+
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
 }
 
 ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@68[8] { ResolutionCandidate@69, ResolutionCandidate@70, ResolutionCandidate@71, ... }
 }
 
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[8] { ResolutionCandidate@81, ResolutionCandidate@82, ResolutionCandidate@83, ... }
-    <name not found> = ArrayList@84[8] { ResolutionCandidate@81, ResolutionCandidate@82, ResolutionCandidate@83, ... }
+null {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@84[8] { ResolutionCandidate@69, ResolutionCandidate@70, ResolutionCandidate@71, ... }
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Return.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Return.lazy.log
index eb30ccaa46e..0e735000b3b 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Return.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Return.lazy.log
@@ -44,144 +44,147 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@20[empty]
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@35 {
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
     <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+    <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@38 {
     <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@20[empty]
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+    <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+}
+
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
 }
 
 ResolutionTaskHolder@60 {
     <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
+}
+
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
 }
 
 ResolutionTaskHolder@72 {
     <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
 }
 
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
+}
+
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
 }
 
 ResolutionTaskHolder@84 {
     <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
 }
 
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
+}
+
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
 }
 
 ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@97[2] { ResolutionCandidate@98, ResolutionCandidate@99 }
 }
 
 ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@101[8] { ResolutionCandidate@102, ResolutionCandidate@103, ResolutionCandidate@104, ... }
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[2] { ResolutionCandidate@122, ResolutionCandidate@123 }
-    <name not found> = ArrayList@124[2] { ResolutionCandidate@122, ResolutionCandidate@123 }
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[8] { ResolutionCandidate@127, ResolutionCandidate@128, ResolutionCandidate@129, ... }
-    <name not found> = ArrayList@130[8] { ResolutionCandidate@127, ResolutionCandidate@128, ResolutionCandidate@129, ... }
+null {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@129[2] { ResolutionCandidate@98, ResolutionCandidate@99 }
+    <name not found> = ArrayList@130[8] { ResolutionCandidate@102, ResolutionCandidate@103, ResolutionCandidate@104, ... }
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/StringTemplate.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/StringTemplate.lazy.log
index d56077df74e..17f9ba70cca 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/StringTemplate.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/StringTemplate.lazy.log
@@ -31,45 +31,48 @@ LazyJavaPackageFragment@7['java'] {
 
 ResolutionTaskHolder@29 {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+}
+
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
 }
 
 ResolutionTaskHolder@41 {
     <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
+}
+
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
 }
 
 ResolutionTaskHolder@53 {
     <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+null {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@55 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ThisSuper.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ThisSuper.lazy.log
index 2e5267758e0..3678682a875 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ThisSuper.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ThisSuper.lazy.log
@@ -51,36 +51,20 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@33 {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@40 {
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+}
+
+ResolutionTaskHolder@43 {
     <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
@@ -114,9 +98,8 @@ ResolutionTaskHolder@47 {
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
@@ -148,6 +131,10 @@ ResolutionTaskHolder@51 {
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
@@ -155,142 +142,158 @@ ResolutionTaskHolder@51 {
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
 }
 
 ResolutionTaskHolder@55 {
     <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
+}
+
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
 }
 
 ResolutionTaskHolder@67 {
     <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
 }
 
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
 }
 
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
+}
+
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
 }
 
 ResolutionTaskHolder@79 {
     <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
 }
 
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
 }
 
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
+}
+
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
 }
 
 ResolutionTaskHolder@91 {
     <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
 }
 
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
 }
 
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
+}
+
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
 }
 
 ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@104[8] { ResolutionCandidate@105, ResolutionCandidate@106, ResolutionCandidate@107, ... }
 }
 
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[8] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
 }
 
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@113 }
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@117 }
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@121 }
-}
-
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@125 }
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[8] { ResolutionCandidate@129, ResolutionCandidate@130, ResolutionCandidate@131, ... }
-    <name not found> = ArrayList@132[8] { ResolutionCandidate@129, ResolutionCandidate@130, ResolutionCandidate@131, ... }
-}
-
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[8] { ResolutionCandidate@135, ResolutionCandidate@136, ResolutionCandidate@137, ... }
-    <name not found> = ArrayList@138[8] { ResolutionCandidate@135, ResolutionCandidate@136, ResolutionCandidate@137, ... }
+null {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@137[8] { ResolutionCandidate@105, ResolutionCandidate@106, ResolutionCandidate@107, ... }
+    <name not found> = ArrayList@138[8] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Throw.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Throw.lazy.log
index 4e0255f60bf..fcc8f1b5051 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Throw.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Throw.lazy.log
@@ -94,21 +94,21 @@ LazyJavaClassifierType@45['Throwable'] {
 
 LazyJavaClassifierType@48['Throwable'] {
     arguments = ArrayList@49[empty]
-    classifier = JavaClassImpl@44['Throwable']
+    classifier = JavaClassImpl@40['Throwable']
     nullable = 'true': Boolean@33
     typeConstructor = DeserializedClassTypeConstructor@41
 }
 
 LazyJavaClassifierType@50['Throwable'] {
     arguments = ArrayList@51[empty]
-    classifier = JavaClassImpl@40['Throwable']
+    classifier = JavaClassImpl@47['Throwable']
     nullable = 'true': Boolean@33
     typeConstructor = DeserializedClassTypeConstructor@41
 }
 
 LazyJavaClassifierType@52['Throwable'] {
     arguments = ArrayList@53[empty]
-    classifier = JavaClassImpl@47['Throwable']
+    classifier = JavaClassImpl@44['Throwable']
     nullable = 'true': Boolean@33
     typeConstructor = DeserializedClassTypeConstructor@41
 }
@@ -168,87 +168,90 @@ LazyJavaPackageFragment@64['lang'] {
 
 ResolutionTaskHolder@88 {
     <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
+    <name not found> = EmptyList@80[empty]
+}
+
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
     <name not found> = EmptyList@80[empty]
     <name not found> = EmptyList@80[empty]
 }
 
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
     <name not found> = EmptyList@80[empty]
     <name not found> = EmptyList@80[empty]
 }
 
 ResolutionTaskHolder@99 {
     <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
     <name not found> = EmptyList@80[empty]
     <name not found> = EmptyList@80[empty]
 }
 
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
 }
 
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
+}
+
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
 }
 
 ResolutionTaskHolder@111 {
     <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@113 }
 }
 
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@117 }
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
 }
 
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@121 }
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
 }
 
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@125 }
+ResolutionTaskHolder@120 {
+    <name not found> = ArrayList@121[4] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
 }
 
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@129 }
-}
-
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[4] { ResolutionCandidate@133, ResolutionCandidate@134, ResolutionCandidate@135, ... }
-    <name not found> = ArrayList@136[5] { ResolutionCandidate@133, ResolutionCandidate@134, ResolutionCandidate@135, ... }
+null {
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@113 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@136[5] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
     <name not found> = EmptyList@80[empty]
     <name not found> = EmptyList@80[empty]
     <name not found> = EmptyList@80[empty]
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/TryCatch.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/TryCatch.lazy.log
index ce8634bc7ae..a7c3cf6942f 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/TryCatch.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/TryCatch.lazy.log
@@ -63,94 +63,97 @@ LazyJavaPackageFragment@18['lang'] {
 
 ResolutionTaskHolder@41 {
     <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+    <name not found> = EmptyList@33[empty]
+}
+
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
 ResolutionTaskHolder@52 {
     <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
+}
+
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
 }
 
 ResolutionTaskHolder@64 {
     <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
+}
+
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
 }
 
 ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@77[8] { ResolutionCandidate@78, ResolutionCandidate@79, ResolutionCandidate@80, ... }
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[8] { ResolutionCandidate@90, ResolutionCandidate@91, ResolutionCandidate@92, ... }
-    <name not found> = ArrayList@93[8] { ResolutionCandidate@90, ResolutionCandidate@91, ResolutionCandidate@92, ... }
+null {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@93[8] { ResolutionCandidate@78, ResolutionCandidate@79, ResolutionCandidate@80, ... }
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/TryFinally.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/TryFinally.lazy.log
index aa898385308..8ef1d8f1410 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/TryFinally.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/TryFinally.lazy.log
@@ -47,55 +47,58 @@ LazyJavaPackageFragment@16['lang'] {
 
 ResolutionTaskHolder@35 {
     <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
+}
+
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
 }
 
 ResolutionTaskHolder@47 {
     <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
+}
+
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
 }
 
 ResolutionTaskHolder@59 {
     <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
 }
 
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
 }
 
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
+null {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@46 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/UnaryExpression.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/UnaryExpression.lazy.log
index 1fca64871e8..7a690154735 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/UnaryExpression.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/UnaryExpression.lazy.log
@@ -59,168 +59,123 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@35 {
     <name not found> = ArrayList@36[16] { ResolutionCandidate@37, ResolutionCandidate@38, ResolutionCandidate@39, ... }
-    <name not found> = ArrayList@40[16] { ResolutionCandidate@37, ResolutionCandidate@38, ResolutionCandidate@39, ... }
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
+    <name not found> = EmptyList@27[empty]
+}
+
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
+    <name not found> = EmptyList@27[empty]
+}
+
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
 
 ResolutionTaskHolder@59 {
     <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
 
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
+}
+
 ResolutionTaskHolder@71 {
     <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
 }
 
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
+}
+
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
 }
 
 ResolutionTaskHolder@83 {
     <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
 }
 
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
 }
 
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
+}
+
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
 }
 
 ResolutionTaskHolder@95 {
     <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
 }
 
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[2] { ResolutionCandidate@100, ResolutionCandidate@101 }
 }
 
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@113 }
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@117 }
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[2] { ResolutionCandidate@121, ResolutionCandidate@122 }
-    <name not found> = ArrayList@123[2] { ResolutionCandidate@121, ResolutionCandidate@122 }
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[8] { ResolutionCandidate@126, ResolutionCandidate@127, ResolutionCandidate@128, ... }
-    <name not found> = ArrayList@129[8] { ResolutionCandidate@126, ResolutionCandidate@127, ResolutionCandidate@128, ... }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[8] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -246,14 +201,8 @@ ResolutionTaskHolder@124 {
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[8] { ResolutionCandidate@132, ResolutionCandidate@133, ResolutionCandidate@134, ... }
-    <name not found> = ArrayList@135[8] { ResolutionCandidate@132, ResolutionCandidate@133, ResolutionCandidate@134, ... }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[8] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111, ... }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -279,7 +228,61 @@ ResolutionTaskHolder@130 {
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[8] { ResolutionCandidate@138, ResolutionCandidate@139, ResolutionCandidate@140, ... }
-    <name not found> = ArrayList@141[8] { ResolutionCandidate@138, ResolutionCandidate@139, ResolutionCandidate@140, ... }
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[8] { ResolutionCandidate@114, ResolutionCandidate@115, ResolutionCandidate@116, ... }
+}
+
+null {
+    <name not found> = ArrayList@117[16] { ResolutionCandidate@37, ResolutionCandidate@38, ResolutionCandidate@39, ... }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@138[2] { ResolutionCandidate@100, ResolutionCandidate@101 }
+    <name not found> = ArrayList@139[8] { ResolutionCandidate@114, ResolutionCandidate@115, ResolutionCandidate@116, ... }
+    <name not found> = ArrayList@140[8] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
+    <name not found> = ArrayList@141[8] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111, ... }
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/When.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/When.lazy.log
index f60adcec344..d408ee1ba2c 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/When.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/When.lazy.log
@@ -42,86 +42,89 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@20[empty]
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@35 {
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
     <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+    <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@38 {
     <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+}
+
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
 }
 
 ResolutionTaskHolder@50 {
     <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+}
+
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
 }
 
 ResolutionTaskHolder@62 {
     <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[2] { ResolutionCandidate@70, ResolutionCandidate@71 }
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[8] { ResolutionCandidate@74, ResolutionCandidate@75, ResolutionCandidate@76, ... }
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[2] { ResolutionCandidate@84, ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[2] { ResolutionCandidate@84, ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[8] { ResolutionCandidate@89, ResolutionCandidate@90, ResolutionCandidate@91, ... }
-    <name not found> = ArrayList@92[8] { ResolutionCandidate@89, ResolutionCandidate@90, ResolutionCandidate@91, ... }
+null {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@91[2] { ResolutionCandidate@70, ResolutionCandidate@71 }
+    <name not found> = ArrayList@92[8] { ResolutionCandidate@74, ResolutionCandidate@75, ResolutionCandidate@76, ... }
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenEntryAs.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenEntryAs.lazy.log
index f444885bc2e..5de1589e33c 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenEntryAs.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenEntryAs.lazy.log
@@ -27,65 +27,68 @@ LazyJavaPackageFragment@6['java'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+}
+
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
 }
 
 ResolutionTaskHolder@37 {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+}
+
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
 }
 
 ResolutionTaskHolder@49 {
     <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
+}
+
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
 }
 
 ResolutionTaskHolder@61 {
     <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+null {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@27 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@39 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenEntryIs.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenEntryIs.lazy.log
index 466748d2062..7899943e823 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenEntryIs.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenEntryIs.lazy.log
@@ -27,50 +27,53 @@ LazyJavaPackageFragment@6['java'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+}
+
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
 }
 
 ResolutionTaskHolder@37 {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+}
+
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
 }
 
 ResolutionTaskHolder@49 {
     <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+null {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@27 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@51 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenIn.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenIn.lazy.log
index 3f198226429..856fc9976c9 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenIn.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenIn.lazy.log
@@ -27,50 +27,53 @@ LazyJavaPackageFragment@6['java'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+}
+
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
 }
 
 ResolutionTaskHolder@37 {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+}
+
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
 }
 
 ResolutionTaskHolder@49 {
     <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+null {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@27 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@48 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenSubject.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenSubject.lazy.log
index 0a52b9e2da8..be6d2b254fe 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenSubject.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenSubject.lazy.log
@@ -27,15 +27,18 @@ LazyJavaPackageFragment@6['java'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+}
+
+null {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@27 }
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@33 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/While.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/While.lazy.log
index 7f3d88ba5d5..20bf5aeb7ee 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/While.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/While.lazy.log
@@ -44,37 +44,62 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@20[empty]
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@35 {
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
     <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+    <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@38 {
     <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+    <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
 ResolutionTaskHolder@49 {
     <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
@@ -92,12 +117,8 @@ ResolutionTaskHolder@49 {
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
@@ -115,121 +136,103 @@ ResolutionTaskHolder@53 {
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
 ResolutionTaskHolder@61 {
     <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
+}
+
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
 }
 
 ResolutionTaskHolder@73 {
     <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
 }
 
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
+}
+
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
 }
 
 ResolutionTaskHolder@85 {
     <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[8] { ResolutionCandidate@93, ResolutionCandidate@94, ResolutionCandidate@95, ... }
 }
 
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[8] { ResolutionCandidate@115, ResolutionCandidate@116, ResolutionCandidate@117, ... }
-    <name not found> = ArrayList@118[8] { ResolutionCandidate@115, ResolutionCandidate@116, ResolutionCandidate@117, ... }
+null {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@118[8] { ResolutionCandidate@93, ResolutionCandidate@94, ResolutionCandidate@95, ... }
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhileCondition.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhileCondition.lazy.log
index 04fcb0f3aeb..1fb187c86ec 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhileCondition.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhileCondition.lazy.log
@@ -23,95 +23,98 @@ LazyJavaPackageFragment@5['java'] {
 
 ResolutionTaskHolder@21 {
     <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@23 }
 }
 
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
+ResolutionTaskHolder@24 {
+    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+ResolutionTaskHolder@27 {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
+}
+
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
 }
 
 ResolutionTaskHolder@33 {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+}
+
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
 }
 
 ResolutionTaskHolder@45 {
     <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
+}
+
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
 }
 
 ResolutionTaskHolder@57 {
     <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
+}
+
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
 }
 
 ResolutionTaskHolder@69 {
     <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
 }
 
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
+null {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@23 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@26 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@50 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/kt4332WhenBranches.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/kt4332WhenBranches.lazy.log
index c1c6bd88fe2..f67077431c8 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/kt4332WhenBranches.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/kt4332WhenBranches.lazy.log
@@ -38,58 +38,61 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@29 {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@21[empty]
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@36 {
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+    <name not found> = EmptyList@21[empty]
+}
+
+ResolutionTaskHolder@39 {
     <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
 }
 
 ResolutionTaskHolder@51 {
     <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[2] { ResolutionCandidate@59, ResolutionCandidate@60 }
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[2] { ResolutionCandidate@63, ResolutionCandidate@64 }
 }
 
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[2] { ResolutionCandidate@69, ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[2] { ResolutionCandidate@69, ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[2] { ResolutionCandidate@74, ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[2] { ResolutionCandidate@74, ResolutionCandidate@75 }
+null {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@75[2] { ResolutionCandidate@63, ResolutionCandidate@64 }
+    <name not found> = ArrayList@76[2] { ResolutionCandidate@59, ResolutionCandidate@60 }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/kt5155WhenBranches.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/kt5155WhenBranches.lazy.log
index cd09fb2dcaa..6dafb706fad 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/kt5155WhenBranches.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/kt5155WhenBranches.lazy.log
@@ -42,28 +42,31 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
+    <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
 }
 
 ResolutionTaskHolder@39 {
     <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+null {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@35 }
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/kt5182WhenBranches.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/kt5182WhenBranches.lazy.log
index 3c6767a9d0b..eb95b280242 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/kt5182WhenBranches.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/kt5182WhenBranches.lazy.log
@@ -27,30 +27,33 @@ LazyJavaPackageFragment@8['java'] {
 
 ResolutionTaskHolder@24 {
     <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
 }
 
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
+ResolutionTaskHolder@27 {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
 }
 
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
+}
+
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
 }
 
 ResolutionTaskHolder@36 {
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+null {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@26 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@29 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/smartcasts/SmartcastAmbiguitites.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/smartcasts/SmartcastAmbiguitites.lazy.log
index 997dac76c3f..1b6b9e3af6b 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/smartcasts/SmartcastAmbiguitites.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/smartcasts/SmartcastAmbiguitites.lazy.log
@@ -29,20 +29,23 @@ LazyJavaPackageFragment@7['java'] {
 
 ResolutionTaskHolder@27 {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
 }
 
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[2] { ResolutionCandidate@41, ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[2] { ResolutionCandidate@41, ResolutionCandidate@42 }
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[2] { ResolutionCandidate@38, ResolutionCandidate@39 }
+}
+
+null {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@43[2] { ResolutionCandidate@38, ResolutionCandidate@39 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/smartcasts/SmartcastsForStableIdentifiers.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/smartcasts/SmartcastsForStableIdentifiers.lazy.log
index 29b2e1ccaeb..f45b23a6fe4 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/smartcasts/SmartcastsForStableIdentifiers.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/smartcasts/SmartcastsForStableIdentifiers.lazy.log
@@ -57,37 +57,38 @@ LazyJavaPackageFragment@28['lang'] {
 
 ResolutionTaskHolder@52 {
     <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@59 {
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
     <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+}
+
+ResolutionTaskHolder@62 {
     <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
+}
+
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
+    <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
@@ -96,37 +97,30 @@ ResolutionTaskHolder@66 {
 
 ResolutionTaskHolder@73 {
     <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
+}
+
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
@@ -135,304 +129,551 @@ ResolutionTaskHolder@81 {
 
 ResolutionTaskHolder@85 {
     <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
+}
+
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
 }
 
 ResolutionTaskHolder@97 {
     <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
+}
+
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
 }
 
 ResolutionTaskHolder@109 {
     <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
     <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
+ResolutionTaskHolder@115 {
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
     <name not found> = EmptyList@46[empty]
+}
+
+ResolutionTaskHolder@118 {
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
     <name not found> = EmptyList@46[empty]
 }
 
 ResolutionTaskHolder@121 {
     <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@127 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
+ResolutionTaskHolder@124 {
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
     <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@131 }
+ResolutionTaskHolder@127 {
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
     <name not found> = EmptyList@46[empty]
+}
+
+ResolutionTaskHolder@130 {
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
     <name not found> = EmptyList@46[empty]
 }
 
 ResolutionTaskHolder@133 {
     <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@135 }
-    <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@139 }
-    <name not found> = EmptyList@46[empty]
+ResolutionTaskHolder@136 {
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
     <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@143 }
+ResolutionTaskHolder@139 {
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
     <name not found> = EmptyList@46[empty]
+}
+
+ResolutionTaskHolder@142 {
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
     <name not found> = EmptyList@46[empty]
 }
 
 ResolutionTaskHolder@145 {
     <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@147 }
-    <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@149 {
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@151 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
+ResolutionTaskHolder@148 {
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
 }
 
-ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@155 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
+ResolutionTaskHolder@151 {
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
+}
+
+ResolutionTaskHolder@154 {
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
 }
 
 ResolutionTaskHolder@157 {
     <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@159 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@161 {
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@163 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
+ResolutionTaskHolder@160 {
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
 }
 
-ResolutionTaskHolder@165 {
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@167 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
+ResolutionTaskHolder@163 {
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
+}
+
+ResolutionTaskHolder@166 {
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
 }
 
 ResolutionTaskHolder@169 {
     <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@171 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@173 {
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@175 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
+ResolutionTaskHolder@172 {
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
 }
 
-ResolutionTaskHolder@177 {
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@179 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
+ResolutionTaskHolder@175 {
+    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
+}
+
+ResolutionTaskHolder@178 {
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
 }
 
 ResolutionTaskHolder@181 {
     <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@183 }
 }
 
-ResolutionTaskHolder@185 {
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@187 }
+ResolutionTaskHolder@184 {
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
 }
 
-ResolutionTaskHolder@189 {
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@191 }
+ResolutionTaskHolder@187 {
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
+}
+
+ResolutionTaskHolder@190 {
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@192 }
 }
 
 ResolutionTaskHolder@193 {
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@195 }
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@195 }
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+}
+
+ResolutionTaskHolder@194 {
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+}
+
+ResolutionTaskHolder@195 {
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+}
+
+ResolutionTaskHolder@196 {
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
 }
 
 ResolutionTaskHolder@197 {
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@199 }
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@199 }
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+}
+
+ResolutionTaskHolder@198 {
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+}
+
+ResolutionTaskHolder@199 {
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+}
+
+ResolutionTaskHolder@200 {
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
 }
 
 ResolutionTaskHolder@201 {
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@203 }
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+}
+
+ResolutionTaskHolder@202 {
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+}
+
+ResolutionTaskHolder@203 {
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+}
+
+ResolutionTaskHolder@204 {
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
 }
 
 ResolutionTaskHolder@205 {
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@207 }
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@207 }
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@209 {
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@211 }
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@211 }
+ResolutionTaskHolder@206 {
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@213 {
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@215 }
+ResolutionTaskHolder@207 {
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@217 {
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@219 }
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@219 }
-}
-
-ResolutionTaskHolder@221 {
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@223 }
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@223 }
-}
-
-ResolutionTaskHolder@225 {
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@227 }
-}
-
-ResolutionTaskHolder@229 {
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@231 }
-}
-
-ResolutionTaskHolder@233 {
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@235 }
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@235 }
-}
-
-ResolutionTaskHolder@237 {
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@239 }
-}
-
-ResolutionTaskHolder@241 {
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
+ResolutionTaskHolder@208 {
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
@@ -443,29 +684,7 @@ ResolutionTaskHolder@241 {
     <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@242 {
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
+ResolutionTaskHolder@209 {
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
@@ -476,7 +695,173 @@ ResolutionTaskHolder@242 {
     <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@243 {
+null {
+    <name not found> = ArrayList@210[1] { ResolutionCandidate@135 }
+    <name not found> = ArrayList@211[1] { ResolutionCandidate@177 }
+    <name not found> = ArrayList@212[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@213[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@214[1] { ResolutionCandidate@165 }
+    <name not found> = ArrayList@215[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@216[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@217[1] { ResolutionCandidate@156 }
+    <name not found> = ArrayList@218[1] { ResolutionCandidate@147 }
+    <name not found> = ArrayList@219[1] { ResolutionCandidate@126 }
+    <name not found> = ArrayList@220[1] { ResolutionCandidate@180 }
+    <name not found> = ArrayList@221[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@222[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@223[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@224[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@225[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@226[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@132 }
+    <name not found> = ArrayList@228[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@192 }
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@231[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@232[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@233[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@234[1] { ResolutionCandidate@162 }
+    <name not found> = ArrayList@235[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@236[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@237[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@238[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@239[1] { ResolutionCandidate@168 }
+    <name not found> = ArrayList@240[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@241[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@242[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@243[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@244[1] { ResolutionCandidate@171 }
+    <name not found> = ArrayList@245[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@246[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@247[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@248[1] { ResolutionCandidate@186 }
+    <name not found> = ArrayList@249[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@250[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@251[1] { ResolutionCandidate@141 }
+    <name not found> = ArrayList@252[1] { ResolutionCandidate@174 }
+    <name not found> = ArrayList@253[1] { ResolutionCandidate@129 }
+    <name not found> = ArrayList@254[1] { ResolutionCandidate@183 }
+    <name not found> = ArrayList@255[1] { ResolutionCandidate@153 }
+    <name not found> = ArrayList@256[1] { ResolutionCandidate@159 }
+    <name not found> = ArrayList@257[1] { ResolutionCandidate@189 }
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
@@ -508,385 +893,3 @@ ResolutionTaskHolder@243 {
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
 }
-
-ResolutionTaskHolder@244 {
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@245 {
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@246 {
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@247 {
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@248 {
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@249 {
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@250 {
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@251 {
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@252 {
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@253 {
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@254 {
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@255 {
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@256 {
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@257 {
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/ComponentFunctionReturnTypeMismatch.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/ComponentFunctionReturnTypeMismatch.lazy.log
index b2333625adc..d4291d86435 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/ComponentFunctionReturnTypeMismatch.lazy.log
+++ b/compiler/testData/diagnostics/tests/declarationChecks/ComponentFunctionReturnTypeMismatch.lazy.log
@@ -30,15 +30,18 @@ LazyJavaPackageFragment@7['java'] {
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
 }
 
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
 }
 
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
+}
+
+null {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@33 }
 }
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/DataFlowInMultiDeclInFor.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/DataFlowInMultiDeclInFor.lazy.log
index 6a1e275953a..a6444b126af 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/DataFlowInMultiDeclInFor.lazy.log
+++ b/compiler/testData/diagnostics/tests/declarationChecks/DataFlowInMultiDeclInFor.lazy.log
@@ -31,50 +31,53 @@ LazyJavaPackageFragment@11['java'] {
 
 ResolutionTaskHolder@27 {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
 }
 
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
+}
+
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
 }
 
 ResolutionTaskHolder@39 {
     <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
 }
 
 ResolutionTaskHolder@51 {
     <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[8] { ResolutionCandidate@56, ResolutionCandidate@57, ResolutionCandidate@58, ... }
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[8] { ResolutionCandidate@65, ResolutionCandidate@66, ResolutionCandidate@67, ... }
-    <name not found> = ArrayList@68[8] { ResolutionCandidate@65, ResolutionCandidate@66, ResolutionCandidate@67, ... }
+null {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@68[8] { ResolutionCandidate@56, ResolutionCandidate@57, ResolutionCandidate@58, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/DataFlowInfoInMultiDecl.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/DataFlowInfoInMultiDecl.lazy.log
index 6adf0d6dca6..e4aa88b350f 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/DataFlowInfoInMultiDecl.lazy.log
+++ b/compiler/testData/diagnostics/tests/declarationChecks/DataFlowInfoInMultiDecl.lazy.log
@@ -41,49 +41,52 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@32 {
     <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@24[empty]
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
 }
 
 ResolutionTaskHolder@43 {
     <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
 }
 
 ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@56[2] { ResolutionCandidate@57, ResolutionCandidate@58 }
 }
 
 ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@60[2] { ResolutionCandidate@61, ResolutionCandidate@62 }
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[2] { ResolutionCandidate@65, ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[2] { ResolutionCandidate@65, ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[2] { ResolutionCandidate@70, ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[2] { ResolutionCandidate@70, ResolutionCandidate@71 }
+null {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@71[2] { ResolutionCandidate@61, ResolutionCandidate@62 }
+    <name not found> = ArrayList@72[2] { ResolutionCandidate@57, ResolutionCandidate@58 }
+    <name not found> = EmptyList@24[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/MultiDeclarationErrors.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/MultiDeclarationErrors.lazy.log
index 94ca4754c04..4c0cf18cea1 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/MultiDeclarationErrors.lazy.log
+++ b/compiler/testData/diagnostics/tests/declarationChecks/MultiDeclarationErrors.lazy.log
@@ -50,13 +50,7 @@ LazyJavaPackageFragment@18['lang'] {
 
 ResolutionTaskHolder@41 {
     <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@45[2] { ResolutionCandidate@46, ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[2] { ResolutionCandidate@46, ResolutionCandidate@47 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
+    <name not found> = ArrayList@44[2] { ResolutionCandidate@45, ResolutionCandidate@46 }
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
@@ -81,71 +75,80 @@ ResolutionTaskHolder@41 {
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
 
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
+}
+
 ResolutionTaskHolder@53 {
     <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
+}
+
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
 }
 
 ResolutionTaskHolder@65 {
     <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[2] { ResolutionCandidate@70, ResolutionCandidate@71 }
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[2] { ResolutionCandidate@79, ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[2] { ResolutionCandidate@79, ResolutionCandidate@80 }
+ResolutionTaskHolder@72 {
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@82 {
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
+null {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@81[2] { ResolutionCandidate@45, ResolutionCandidate@46 }
+    <name not found> = ArrayList@82[2] { ResolutionCandidate@70, ResolutionCandidate@71 }
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/RedeclarationsInMultiDecl.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/RedeclarationsInMultiDecl.lazy.log
index 7271e4e1e0b..7da5dcd1c17 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/RedeclarationsInMultiDecl.lazy.log
+++ b/compiler/testData/diagnostics/tests/declarationChecks/RedeclarationsInMultiDecl.lazy.log
@@ -43,76 +43,79 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
 }
 
 ResolutionTaskHolder@43 {
     <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
 }
 
 ResolutionTaskHolder@55 {
     <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
 }
 
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
 }
 
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
+null {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@51 }
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/ambiguousObjectExpressionType.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/ambiguousObjectExpressionType.lazy.log
index cff035561de..fca1349caf8 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/ambiguousObjectExpressionType.lazy.log
+++ b/compiler/testData/diagnostics/tests/declarationChecks/ambiguousObjectExpressionType.lazy.log
@@ -239,349 +239,352 @@ LazyJavaPackageFragment@107['lang'] {
 
 ResolutionTaskHolder@136 {
     <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
-    <name not found> = EmptyList@128[empty]
-    <name not found> = EmptyList@128[empty]
     <name not found> = EmptyList@128[empty]
     <name not found> = EmptyList@128[empty]
 }
 
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
-    <name not found> = EmptyList@128[empty]
-    <name not found> = EmptyList@128[empty]
+ResolutionTaskHolder@139 {
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
     <name not found> = EmptyList@128[empty]
     <name not found> = EmptyList@128[empty]
 }
 
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
+ResolutionTaskHolder@142 {
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
     <name not found> = EmptyList@128[empty]
     <name not found> = EmptyList@128[empty]
+}
+
+ResolutionTaskHolder@145 {
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
     <name not found> = EmptyList@128[empty]
     <name not found> = EmptyList@128[empty]
 }
 
 ResolutionTaskHolder@148 {
     <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
-    <name not found> = EmptyList@128[empty]
-    <name not found> = EmptyList@128[empty]
-    <name not found> = EmptyList@128[empty]
     <name not found> = EmptyList@128[empty]
 }
 
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
-    <name not found> = EmptyList@128[empty]
+ResolutionTaskHolder@151 {
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
     <name not found> = EmptyList@128[empty]
 }
 
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
+ResolutionTaskHolder@154 {
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
     <name not found> = EmptyList@128[empty]
+}
+
+ResolutionTaskHolder@157 {
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
     <name not found> = EmptyList@128[empty]
 }
 
 ResolutionTaskHolder@160 {
     <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@162 }
-    <name not found> = EmptyList@128[empty]
-    <name not found> = EmptyList@128[empty]
 }
 
-ResolutionTaskHolder@164 {
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@166 }
-    <name not found> = EmptyList@128[empty]
-    <name not found> = EmptyList@128[empty]
+ResolutionTaskHolder@163 {
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
 }
 
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@170 }
+ResolutionTaskHolder@166 {
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
+}
+
+ResolutionTaskHolder@169 {
+    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
 }
 
 ResolutionTaskHolder@172 {
     <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@174 }
 }
 
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@178 }
+ResolutionTaskHolder@175 {
+    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
 }
 
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@182 }
+ResolutionTaskHolder@178 {
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
+}
+
+ResolutionTaskHolder@181 {
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
 }
 
 ResolutionTaskHolder@184 {
     <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@186 }
 }
 
-ResolutionTaskHolder@188 {
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@190 }
+ResolutionTaskHolder@187 {
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
 }
 
-ResolutionTaskHolder@192 {
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@194 }
+ResolutionTaskHolder@190 {
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@192 }
+}
+
+ResolutionTaskHolder@193 {
+    <name not found> = ArrayList@194[1] { ResolutionCandidate@195 }
 }
 
 ResolutionTaskHolder@196 {
     <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@198 }
 }
 
-ResolutionTaskHolder@200 {
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@202 }
+ResolutionTaskHolder@199 {
+    <name not found> = ArrayList@200[1] { ResolutionCandidate@201 }
 }
 
-ResolutionTaskHolder@204 {
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@206 }
+ResolutionTaskHolder@202 {
+    <name not found> = ArrayList@203[1] { ResolutionCandidate@204 }
+}
+
+ResolutionTaskHolder@205 {
+    <name not found> = ArrayList@206[1] { ResolutionCandidate@207 }
 }
 
 ResolutionTaskHolder@208 {
     <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@210 }
 }
 
-ResolutionTaskHolder@212 {
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@214 }
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@214 }
+ResolutionTaskHolder@211 {
+    <name not found> = ArrayList@212[1] { ResolutionCandidate@213 }
 }
 
-ResolutionTaskHolder@216 {
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@218 }
+ResolutionTaskHolder@214 {
+    <name not found> = ArrayList@215[1] { ResolutionCandidate@216 }
+}
+
+ResolutionTaskHolder@217 {
+    <name not found> = ArrayList@218[1] { ResolutionCandidate@219 }
 }
 
 ResolutionTaskHolder@220 {
     <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@222 }
 }
 
-ResolutionTaskHolder@224 {
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@226 }
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@226 }
+ResolutionTaskHolder@223 {
+    <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
 }
 
-ResolutionTaskHolder@228 {
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@230 }
+ResolutionTaskHolder@226 {
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
+}
+
+ResolutionTaskHolder@229 {
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
 }
 
 ResolutionTaskHolder@232 {
     <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@234 }
 }
 
-ResolutionTaskHolder@236 {
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@238 }
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@238 }
+ResolutionTaskHolder@235 {
+    <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
 }
 
-ResolutionTaskHolder@240 {
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
-    <name not found> = ArrayList@243[1] { ResolutionCandidate@242 }
+ResolutionTaskHolder@238 {
+    <name not found> = ArrayList@239[1] { ResolutionCandidate@240 }
+}
+
+ResolutionTaskHolder@241 {
+    <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
 }
 
 ResolutionTaskHolder@244 {
     <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@246 }
 }
 
-ResolutionTaskHolder@248 {
-    <name not found> = ArrayList@249[1] { ResolutionCandidate@250 }
-    <name not found> = ArrayList@251[1] { ResolutionCandidate@250 }
+ResolutionTaskHolder@247 {
+    <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
 }
 
-ResolutionTaskHolder@252 {
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
-    <name not found> = ArrayList@255[1] { ResolutionCandidate@254 }
+ResolutionTaskHolder@250 {
+    <name not found> = ArrayList@251[1] { ResolutionCandidate@252 }
+}
+
+ResolutionTaskHolder@253 {
+    <name not found> = ArrayList@254[1] { ResolutionCandidate@255 }
 }
 
 ResolutionTaskHolder@256 {
     <name not found> = ArrayList@257[1] { ResolutionCandidate@258 }
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@258 }
 }
 
-ResolutionTaskHolder@260 {
-    <name not found> = ArrayList@261[1] { ResolutionCandidate@262 }
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@262 }
+ResolutionTaskHolder@259 {
+    <name not found> = ArrayList@260[1] { ResolutionCandidate@261 }
 }
 
-ResolutionTaskHolder@264 {
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
-    <name not found> = ArrayList@267[1] { ResolutionCandidate@266 }
+ResolutionTaskHolder@262 {
+    <name not found> = ArrayList@263[1] { ResolutionCandidate@264 }
+}
+
+ResolutionTaskHolder@265 {
+    <name not found> = ArrayList@266[1] { ResolutionCandidate@267 }
 }
 
 ResolutionTaskHolder@268 {
     <name not found> = ArrayList@269[1] { ResolutionCandidate@270 }
-    <name not found> = ArrayList@271[1] { ResolutionCandidate@270 }
 }
 
-ResolutionTaskHolder@272 {
-    <name not found> = ArrayList@273[1] { ResolutionCandidate@274 }
-    <name not found> = ArrayList@275[1] { ResolutionCandidate@274 }
+ResolutionTaskHolder@271 {
+    <name not found> = ArrayList@272[1] { ResolutionCandidate@273 }
 }
 
-ResolutionTaskHolder@276 {
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
-    <name not found> = ArrayList@279[1] { ResolutionCandidate@278 }
+ResolutionTaskHolder@274 {
+    <name not found> = ArrayList@275[1] { ResolutionCandidate@276 }
+}
+
+ResolutionTaskHolder@277 {
+    <name not found> = ArrayList@278[1] { ResolutionCandidate@279 }
 }
 
 ResolutionTaskHolder@280 {
     <name not found> = ArrayList@281[1] { ResolutionCandidate@282 }
-    <name not found> = ArrayList@283[1] { ResolutionCandidate@282 }
 }
 
-ResolutionTaskHolder@284 {
-    <name not found> = ArrayList@285[1] { ResolutionCandidate@286 }
-    <name not found> = ArrayList@287[1] { ResolutionCandidate@286 }
+ResolutionTaskHolder@283 {
+    <name not found> = ArrayList@284[1] { ResolutionCandidate@285 }
 }
 
-ResolutionTaskHolder@288 {
-    <name not found> = ArrayList@289[1] { ResolutionCandidate@290 }
-    <name not found> = ArrayList@291[1] { ResolutionCandidate@290 }
+ResolutionTaskHolder@286 {
+    <name not found> = ArrayList@287[1] { ResolutionCandidate@288 }
+}
+
+ResolutionTaskHolder@289 {
+    <name not found> = ArrayList@290[1] { ResolutionCandidate@291 }
 }
 
 ResolutionTaskHolder@292 {
     <name not found> = ArrayList@293[1] { ResolutionCandidate@294 }
-    <name not found> = ArrayList@295[1] { ResolutionCandidate@294 }
 }
 
-ResolutionTaskHolder@296 {
-    <name not found> = ArrayList@297[1] { ResolutionCandidate@298 }
-    <name not found> = ArrayList@299[1] { ResolutionCandidate@298 }
+ResolutionTaskHolder@295 {
+    <name not found> = ArrayList@296[1] { ResolutionCandidate@297 }
 }
 
-ResolutionTaskHolder@300 {
-    <name not found> = ArrayList@301[1] { ResolutionCandidate@302 }
-    <name not found> = ArrayList@303[1] { ResolutionCandidate@302 }
+ResolutionTaskHolder@298 {
+    <name not found> = ArrayList@299[1] { ResolutionCandidate@300 }
+}
+
+ResolutionTaskHolder@301 {
+    <name not found> = ArrayList@302[1] { ResolutionCandidate@303 }
 }
 
 ResolutionTaskHolder@304 {
     <name not found> = ArrayList@305[1] { ResolutionCandidate@306 }
-    <name not found> = ArrayList@307[1] { ResolutionCandidate@306 }
 }
 
-ResolutionTaskHolder@308 {
-    <name not found> = ArrayList@309[1] { ResolutionCandidate@310 }
-    <name not found> = ArrayList@311[1] { ResolutionCandidate@310 }
+ResolutionTaskHolder@307 {
+    <name not found> = ArrayList@308[1] { ResolutionCandidate@309 }
 }
 
-ResolutionTaskHolder@312 {
-    <name not found> = ArrayList@313[1] { ResolutionCandidate@314 }
-    <name not found> = ArrayList@315[1] { ResolutionCandidate@314 }
+ResolutionTaskHolder@310 {
+    <name not found> = ArrayList@311[1] { ResolutionCandidate@312 }
+}
+
+ResolutionTaskHolder@313 {
+    <name not found> = ArrayList@314[1] { ResolutionCandidate@315 }
 }
 
 ResolutionTaskHolder@316 {
     <name not found> = ArrayList@317[1] { ResolutionCandidate@318 }
-    <name not found> = ArrayList@319[1] { ResolutionCandidate@318 }
 }
 
-ResolutionTaskHolder@320 {
-    <name not found> = ArrayList@321[1] { ResolutionCandidate@322 }
-    <name not found> = ArrayList@323[1] { ResolutionCandidate@322 }
+ResolutionTaskHolder@319 {
+    <name not found> = ArrayList@320[1] { ResolutionCandidate@321 }
 }
 
-ResolutionTaskHolder@324 {
-    <name not found> = ArrayList@325[1] { ResolutionCandidate@326 }
-    <name not found> = ArrayList@327[1] { ResolutionCandidate@326 }
+ResolutionTaskHolder@322 {
+    <name not found> = ArrayList@323[1] { ResolutionCandidate@324 }
+}
+
+ResolutionTaskHolder@325 {
+    <name not found> = ArrayList@326[1] { ResolutionCandidate@327 }
 }
 
 ResolutionTaskHolder@328 {
     <name not found> = ArrayList@329[1] { ResolutionCandidate@330 }
-    <name not found> = ArrayList@331[1] { ResolutionCandidate@330 }
 }
 
-ResolutionTaskHolder@332 {
-    <name not found> = ArrayList@333[1] { ResolutionCandidate@334 }
-    <name not found> = ArrayList@335[1] { ResolutionCandidate@334 }
-}
-
-ResolutionTaskHolder@336 {
-    <name not found> = ArrayList@337[1] { ResolutionCandidate@338 }
-    <name not found> = ArrayList@339[1] { ResolutionCandidate@338 }
-}
-
-ResolutionTaskHolder@340 {
-    <name not found> = ArrayList@341[1] { ResolutionCandidate@342 }
-    <name not found> = ArrayList@343[1] { ResolutionCandidate@342 }
-}
-
-ResolutionTaskHolder@344 {
-    <name not found> = ArrayList@345[1] { ResolutionCandidate@346 }
-    <name not found> = ArrayList@347[1] { ResolutionCandidate@346 }
-}
-
-ResolutionTaskHolder@348 {
-    <name not found> = ArrayList@349[1] { ResolutionCandidate@350 }
-    <name not found> = ArrayList@351[1] { ResolutionCandidate@350 }
-}
-
-ResolutionTaskHolder@352 {
-    <name not found> = ArrayList@353[1] { ResolutionCandidate@354 }
-    <name not found> = ArrayList@355[1] { ResolutionCandidate@354 }
-}
-
-ResolutionTaskHolder@356 {
-    <name not found> = ArrayList@357[1] { ResolutionCandidate@358 }
-    <name not found> = ArrayList@359[1] { ResolutionCandidate@358 }
-}
-
-ResolutionTaskHolder@360 {
-    <name not found> = ArrayList@361[1] { ResolutionCandidate@362 }
-    <name not found> = ArrayList@363[1] { ResolutionCandidate@362 }
-}
-
-ResolutionTaskHolder@364 {
-    <name not found> = ArrayList@365[1] { ResolutionCandidate@366 }
-    <name not found> = ArrayList@367[1] { ResolutionCandidate@366 }
-}
-
-ResolutionTaskHolder@368 {
-    <name not found> = ArrayList@369[1] { ResolutionCandidate@370 }
-    <name not found> = ArrayList@371[1] { ResolutionCandidate@370 }
-}
-
-ResolutionTaskHolder@372 {
-    <name not found> = ArrayList@373[1] { ResolutionCandidate@374 }
-    <name not found> = ArrayList@375[1] { ResolutionCandidate@374 }
-}
-
-ResolutionTaskHolder@376 {
-    <name not found> = ArrayList@377[1] { ResolutionCandidate@378 }
-    <name not found> = ArrayList@379[1] { ResolutionCandidate@378 }
-}
-
-ResolutionTaskHolder@380 {
-    <name not found> = ArrayList@381[1] { ResolutionCandidate@382 }
-    <name not found> = ArrayList@383[1] { ResolutionCandidate@382 }
-}
-
-ResolutionTaskHolder@384 {
-    <name not found> = ArrayList@385[1] { ResolutionCandidate@386 }
-    <name not found> = ArrayList@387[1] { ResolutionCandidate@386 }
-}
-
-ResolutionTaskHolder@388 {
-    <name not found> = ArrayList@389[1] { ResolutionCandidate@390 }
-    <name not found> = ArrayList@391[1] { ResolutionCandidate@390 }
-}
-
-ResolutionTaskHolder@392 {
-    <name not found> = ArrayList@393[1] { ResolutionCandidate@394 }
-    <name not found> = ArrayList@395[1] { ResolutionCandidate@394 }
+null {
+    <name not found> = ArrayList@331[1] { ResolutionCandidate@285 }
+    <name not found> = ArrayList@332[1] { ResolutionCandidate@273 }
+    <name not found> = ArrayList@333[1] { ResolutionCandidate@216 }
+    <name not found> = ArrayList@334[1] { ResolutionCandidate@279 }
+    <name not found> = ArrayList@335[1] { ResolutionCandidate@213 }
+    <name not found> = ArrayList@336[1] { ResolutionCandidate@300 }
+    <name not found> = ArrayList@337[1] { ResolutionCandidate@267 }
+    <name not found> = ArrayList@338[1] { ResolutionCandidate@174 }
+    <name not found> = ArrayList@339[1] { ResolutionCandidate@210 }
+    <name not found> = ArrayList@340[1] { ResolutionCandidate@162 }
+    <name not found> = ArrayList@341[1] { ResolutionCandidate@171 }
+    <name not found> = ArrayList@342[1] { ResolutionCandidate@183 }
+    <name not found> = ArrayList@343[1] { ResolutionCandidate@306 }
+    <name not found> = ArrayList@344[1] { ResolutionCandidate@276 }
+    <name not found> = ArrayList@345[1] { ResolutionCandidate@303 }
+    <name not found> = ArrayList@346[1] { ResolutionCandidate@156 }
+    <name not found> = ArrayList@347[1] { ResolutionCandidate@282 }
+    <name not found> = ArrayList@348[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@349[1] { ResolutionCandidate@312 }
+    <name not found> = ArrayList@350[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@351[1] { ResolutionCandidate@180 }
+    <name not found> = ArrayList@352[1] { ResolutionCandidate@327 }
+    <name not found> = ArrayList@353[1] { ResolutionCandidate@147 }
+    <name not found> = ArrayList@354[1] { ResolutionCandidate@318 }
+    <name not found> = ArrayList@355[1] { ResolutionCandidate@159 }
+    <name not found> = ArrayList@356[1] { ResolutionCandidate@309 }
+    <name not found> = ArrayList@357[1] { ResolutionCandidate@153 }
+    <name not found> = ArrayList@358[1] { ResolutionCandidate@321 }
+    <name not found> = ArrayList@359[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@360[1] { ResolutionCandidate@165 }
+    <name not found> = ArrayList@361[1] { ResolutionCandidate@264 }
+    <name not found> = ArrayList@362[1] { ResolutionCandidate@141 }
+    <name not found> = ArrayList@363[1] { ResolutionCandidate@249 }
+    <name not found> = ArrayList@364[1] { ResolutionCandidate@252 }
+    <name not found> = ArrayList@365[1] { ResolutionCandidate@189 }
+    <name not found> = ArrayList@366[1] { ResolutionCandidate@237 }
+    <name not found> = ArrayList@367[1] { ResolutionCandidate@231 }
+    <name not found> = ArrayList@368[1] { ResolutionCandidate@288 }
+    <name not found> = ArrayList@369[1] { ResolutionCandidate@168 }
+    <name not found> = ArrayList@370[1] { ResolutionCandidate@291 }
+    <name not found> = ArrayList@371[1] { ResolutionCandidate@207 }
+    <name not found> = ArrayList@372[1] { ResolutionCandidate@258 }
+    <name not found> = ArrayList@373[1] { ResolutionCandidate@192 }
+    <name not found> = ArrayList@374[1] { ResolutionCandidate@177 }
+    <name not found> = ArrayList@375[1] { ResolutionCandidate@201 }
+    <name not found> = ArrayList@376[1] { ResolutionCandidate@240 }
+    <name not found> = ArrayList@377[1] { ResolutionCandidate@222 }
+    <name not found> = ArrayList@378[1] { ResolutionCandidate@315 }
+    <name not found> = ArrayList@379[1] { ResolutionCandidate@195 }
+    <name not found> = ArrayList@380[1] { ResolutionCandidate@255 }
+    <name not found> = ArrayList@381[1] { ResolutionCandidate@186 }
+    <name not found> = ArrayList@382[1] { ResolutionCandidate@225 }
+    <name not found> = ArrayList@383[1] { ResolutionCandidate@270 }
+    <name not found> = ArrayList@384[1] { ResolutionCandidate@294 }
+    <name not found> = ArrayList@385[1] { ResolutionCandidate@324 }
+    <name not found> = ArrayList@386[1] { ResolutionCandidate@198 }
+    <name not found> = ArrayList@387[1] { ResolutionCandidate@219 }
+    <name not found> = ArrayList@388[1] { ResolutionCandidate@243 }
+    <name not found> = ArrayList@389[1] { ResolutionCandidate@330 }
+    <name not found> = ArrayList@390[1] { ResolutionCandidate@261 }
+    <name not found> = ArrayList@391[1] { ResolutionCandidate@297 }
+    <name not found> = ArrayList@392[1] { ResolutionCandidate@228 }
+    <name not found> = ArrayList@393[1] { ResolutionCandidate@246 }
+    <name not found> = ArrayList@394[1] { ResolutionCandidate@204 }
+    <name not found> = ArrayList@395[1] { ResolutionCandidate@234 }
+    <name not found> = EmptyList@128[empty]
+    <name not found> = EmptyList@128[empty]
+    <name not found> = EmptyList@128[empty]
+    <name not found> = EmptyList@128[empty]
+    <name not found> = EmptyList@128[empty]
+    <name not found> = EmptyList@128[empty]
+    <name not found> = EmptyList@128[empty]
+    <name not found> = EmptyList@128[empty]
+    <name not found> = EmptyList@128[empty]
+    <name not found> = EmptyList@128[empty]
+    <name not found> = EmptyList@128[empty]
+    <name not found> = EmptyList@128[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/kt1141.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/kt1141.lazy.log
index ad425579d48..8efecb72ff4 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/kt1141.lazy.log
+++ b/compiler/testData/diagnostics/tests/declarationChecks/kt1141.lazy.log
@@ -71,10 +71,13 @@ LazyJavaPackageFragment@47['lang'] {
 
 ResolutionTaskHolder@68 {
     <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
+}
+
+null {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@73 }
 }
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/kt1193.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/kt1193.lazy.log
index 0310865fc61..715d275eddb 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/kt1193.lazy.log
+++ b/compiler/testData/diagnostics/tests/declarationChecks/kt1193.lazy.log
@@ -25,5 +25,8 @@ LazyJavaPackageFragment@6['java'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
+}
+
+null {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
 }
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/kt2142.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/kt2142.lazy.log
index 17f13ca672d..b2d62a2ded1 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/kt2142.lazy.log
+++ b/compiler/testData/diagnostics/tests/declarationChecks/kt2142.lazy.log
@@ -24,9 +24,12 @@ LazyJavaPackageFragment@7['lang'] {
 
 ResolutionTaskHolder@20 {
     <name not found> = ArrayList@21[1] { ResolutionCandidate@22 }
-    <name not found> = ArrayList@23[1] { ResolutionCandidate@22 }
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+}
+
+null {
+    <name not found> = ArrayList@23[1] { ResolutionCandidate@22 }
     <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/kt2631_MultipleDeclaration.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/kt2631_MultipleDeclaration.lazy.log
index 98fbee8a799..5555673e99a 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/kt2631_MultipleDeclaration.lazy.log
+++ b/compiler/testData/diagnostics/tests/declarationChecks/kt2631_MultipleDeclaration.lazy.log
@@ -54,59 +54,62 @@ LazyJavaPackageFragment@23['lang'] {
 
 ResolutionTaskHolder@48 {
     <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+}
+
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
 }
 
 ResolutionTaskHolder@60 {
     <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
+}
+
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
 }
 
 ResolutionTaskHolder@72 {
     <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
 }
 
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
 }
 
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+null {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@74 }
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/kt2643MultiDeclInControlFlow.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/kt2643MultiDeclInControlFlow.lazy.log
index 1a9e8172c30..529e0a58f3f 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/kt2643MultiDeclInControlFlow.lazy.log
+++ b/compiler/testData/diagnostics/tests/declarationChecks/kt2643MultiDeclInControlFlow.lazy.log
@@ -26,90 +26,93 @@ LazyJavaPackageFragment@7['java'] {
 
 ResolutionTaskHolder@23 {
     <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@25 }
 }
 
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
+ResolutionTaskHolder@26 {
+    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
 }
 
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
+ResolutionTaskHolder@29 {
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
+}
+
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
 }
 
 ResolutionTaskHolder@35 {
     <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
+}
+
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
 }
 
 ResolutionTaskHolder@47 {
     <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
+}
+
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
 }
 
 ResolutionTaskHolder@59 {
     <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
 }
 
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
+}
+
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
 }
 
 ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@72[8] { ResolutionCandidate@73, ResolutionCandidate@74, ResolutionCandidate@75, ... }
 }
 
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[8] { ResolutionCandidate@78, ResolutionCandidate@79, ResolutionCandidate@80, ... }
 }
 
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[8] { ResolutionCandidate@89, ResolutionCandidate@90, ResolutionCandidate@91, ... }
-    <name not found> = ArrayList@92[8] { ResolutionCandidate@89, ResolutionCandidate@90, ResolutionCandidate@91, ... }
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[8] { ResolutionCandidate@95, ResolutionCandidate@96, ResolutionCandidate@97, ... }
-    <name not found> = ArrayList@98[8] { ResolutionCandidate@95, ResolutionCandidate@96, ResolutionCandidate@97, ... }
+null {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@25 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@28 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@97[8] { ResolutionCandidate@78, ResolutionCandidate@79, ResolutionCandidate@80, ... }
+    <name not found> = ArrayList@98[8] { ResolutionCandidate@73, ResolutionCandidate@74, ResolutionCandidate@75, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/kt559.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/kt559.lazy.log
index 09ce50efe3d..c1e47577818 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/kt559.lazy.log
+++ b/compiler/testData/diagnostics/tests/declarationChecks/kt559.lazy.log
@@ -35,35 +35,38 @@ LazyJavaPackageFragment@9['java'] {
 
 ResolutionTaskHolder@33 {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+}
+
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
 }
 
 ResolutionTaskHolder@45 {
     <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+null {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@53 }
 }
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/localFunctionNoInheritVisibility.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/localFunctionNoInheritVisibility.lazy.log
index e9b7f36ea63..fe182debeb4 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/localFunctionNoInheritVisibility.lazy.log
+++ b/compiler/testData/diagnostics/tests/declarationChecks/localFunctionNoInheritVisibility.lazy.log
@@ -33,19 +33,22 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@26 {
     <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
+ResolutionTaskHolder@29 {
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
 }
 
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
+}
+
+null {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@28 }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/DoubleDeclForLoop.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/DoubleDeclForLoop.lazy.log
index a63f206b45f..5fcb8477004 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/DoubleDeclForLoop.lazy.log
+++ b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/DoubleDeclForLoop.lazy.log
@@ -43,39 +43,42 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
 }
 
 ResolutionTaskHolder@43 {
     <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+null {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@48 }
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/FolLoopTypeComponentTypeMismatch.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/FolLoopTypeComponentTypeMismatch.lazy.log
index 2acac744320..edeef452cac 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/FolLoopTypeComponentTypeMismatch.lazy.log
+++ b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/FolLoopTypeComponentTypeMismatch.lazy.log
@@ -51,39 +51,42 @@ LazyJavaPackageFragment@14['lang'] {
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
 }
 
 ResolutionTaskHolder@52 {
     <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+null {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@60 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopComponentFunctionAmbiguity.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopComponentFunctionAmbiguity.lazy.log
index a77f92cd400..7f4298e49f7 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopComponentFunctionAmbiguity.lazy.log
+++ b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopComponentFunctionAmbiguity.lazy.log
@@ -44,39 +44,42 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
 }
 
 ResolutionTaskHolder@43 {
     <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[2] { ResolutionCandidate@51, ResolutionCandidate@52 }
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[2] { ResolutionCandidate@57, ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[2] { ResolutionCandidate@57, ResolutionCandidate@58 }
+null {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@59[2] { ResolutionCandidate@51, ResolutionCandidate@52 }
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopComponentFunctionMissing.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopComponentFunctionMissing.lazy.log
index c482ed86e9a..e41d9354300 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopComponentFunctionMissing.lazy.log
+++ b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopComponentFunctionMissing.lazy.log
@@ -46,45 +46,31 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@32 {
     <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
+}
+
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
 }
 
 ResolutionTaskHolder@44 {
     <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@50 {
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -110,3 +96,20 @@ ResolutionTaskHolder@56 {
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
 }
+
+null {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@46 }
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopWithExtensions.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopWithExtensions.lazy.log
index 7108f82c45c..2cba6f9a17d 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopWithExtensions.lazy.log
+++ b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopWithExtensions.lazy.log
@@ -51,47 +51,50 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@33 {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
 
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
+}
+
 ResolutionTaskHolder@45 {
     <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+null {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@44 }
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForWithExplicitTypes.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForWithExplicitTypes.lazy.log
index 2acac744320..6486e768140 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForWithExplicitTypes.lazy.log
+++ b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForWithExplicitTypes.lazy.log
@@ -51,39 +51,42 @@ LazyJavaPackageFragment@14['lang'] {
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
 }
 
 ResolutionTaskHolder@52 {
     <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+null {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@60 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/RedeclarationInForLoop.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/RedeclarationInForLoop.lazy.log
index a63f206b45f..6b7fba8e8cd 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/RedeclarationInForLoop.lazy.log
+++ b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/RedeclarationInForLoop.lazy.log
@@ -43,39 +43,42 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
 }
 
 ResolutionTaskHolder@43 {
     <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+null {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@48 }
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/SingleDeclForLoop.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/SingleDeclForLoop.lazy.log
index 026dd45b1ea..701d1831050 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/SingleDeclForLoop.lazy.log
+++ b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/SingleDeclForLoop.lazy.log
@@ -42,34 +42,37 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
 }
 
 ResolutionTaskHolder@43 {
     <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+null {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@39 }
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/kt2829.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/kt2829.lazy.log
index eae0059e0b8..24415a09850 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/kt2829.lazy.log
+++ b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/kt2829.lazy.log
@@ -60,12 +60,6 @@ LazyJavaPackageFragment@16['lang'] {
 
 ResolutionTaskHolder@49 {
     <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
@@ -74,14 +68,8 @@ ResolutionTaskHolder@49 {
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
@@ -90,78 +78,93 @@ ResolutionTaskHolder@53 {
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
+}
+
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
 }
 
 ResolutionTaskHolder@61 {
     <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
+}
+
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
 }
 
 ResolutionTaskHolder@73 {
     <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
 }
 
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
+}
+
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
 }
 
 ResolutionTaskHolder@85 {
     <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
+null {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@63 }
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/propertyInPackageHasNoInheritVisibility.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/propertyInPackageHasNoInheritVisibility.lazy.log
index cc85d5ac7ac..c11806ca8c9 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/propertyInPackageHasNoInheritVisibility.lazy.log
+++ b/compiler/testData/diagnostics/tests/declarationChecks/propertyInPackageHasNoInheritVisibility.lazy.log
@@ -29,16 +29,19 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
+}
+
+null {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@27 }
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@30 }
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/unambiguousObjectExpressionType.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/unambiguousObjectExpressionType.lazy.log
index 01acede473a..357405212e1 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/unambiguousObjectExpressionType.lazy.log
+++ b/compiler/testData/diagnostics/tests/declarationChecks/unambiguousObjectExpressionType.lazy.log
@@ -312,1938 +312,1901 @@ LazyJavaPackageFragment@129['lang'] {
 
 ResolutionTaskHolder@168 {
     <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@170 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
 }
 
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@174 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
+ResolutionTaskHolder@171 {
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
 }
 
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@178 }
+ResolutionTaskHolder@174 {
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
+}
+
+ResolutionTaskHolder@177 {
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
 }
 
 ResolutionTaskHolder@180 {
     <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@182 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
 }
 
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@186 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
+ResolutionTaskHolder@183 {
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
 }
 
-ResolutionTaskHolder@188 {
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@190 }
+ResolutionTaskHolder@186 {
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
+}
+
+ResolutionTaskHolder@189 {
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
 }
 
 ResolutionTaskHolder@192 {
     <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@194 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
 }
 
-ResolutionTaskHolder@196 {
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@198 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
+ResolutionTaskHolder@195 {
+    <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
 }
 
-ResolutionTaskHolder@200 {
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@202 }
+ResolutionTaskHolder@198 {
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
+}
+
+ResolutionTaskHolder@201 {
+    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
 }
 
 ResolutionTaskHolder@204 {
     <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@206 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
 }
 
-ResolutionTaskHolder@208 {
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@210 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
+ResolutionTaskHolder@207 {
+    <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
 }
 
-ResolutionTaskHolder@212 {
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@214 }
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@214 }
+ResolutionTaskHolder@210 {
+    <name not found> = ArrayList@211[1] { ResolutionCandidate@212 }
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
+}
+
+ResolutionTaskHolder@213 {
+    <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
 }
 
 ResolutionTaskHolder@216 {
     <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@218 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
 }
 
-ResolutionTaskHolder@220 {
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@222 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
+ResolutionTaskHolder@219 {
+    <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
 }
 
-ResolutionTaskHolder@224 {
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@226 }
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@226 }
+ResolutionTaskHolder@222 {
+    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
+}
+
+ResolutionTaskHolder@225 {
+    <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
 }
 
 ResolutionTaskHolder@228 {
     <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@230 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
 }
 
-ResolutionTaskHolder@232 {
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@234 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
+ResolutionTaskHolder@231 {
+    <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
 }
 
-ResolutionTaskHolder@236 {
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@238 }
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@238 }
+ResolutionTaskHolder@234 {
+    <name not found> = ArrayList@235[1] { ResolutionCandidate@236 }
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
+}
+
+ResolutionTaskHolder@237 {
+    <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
 }
 
 ResolutionTaskHolder@240 {
     <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
-    <name not found> = ArrayList@243[1] { ResolutionCandidate@242 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
 }
 
-ResolutionTaskHolder@244 {
-    <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@246 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
+ResolutionTaskHolder@243 {
+    <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
 }
 
-ResolutionTaskHolder@248 {
-    <name not found> = ArrayList@249[1] { ResolutionCandidate@250 }
-    <name not found> = ArrayList@251[1] { ResolutionCandidate@250 }
+ResolutionTaskHolder@246 {
+    <name not found> = ArrayList@247[1] { ResolutionCandidate@248 }
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
+}
+
+ResolutionTaskHolder@249 {
+    <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
 }
 
 ResolutionTaskHolder@252 {
     <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
-    <name not found> = ArrayList@255[1] { ResolutionCandidate@254 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
 }
 
-ResolutionTaskHolder@256 {
-    <name not found> = ArrayList@257[1] { ResolutionCandidate@258 }
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@258 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
+ResolutionTaskHolder@255 {
+    <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
     <name not found> = EmptyList@160[empty]
 }
 
-ResolutionTaskHolder@260 {
-    <name not found> = ArrayList@261[1] { ResolutionCandidate@262 }
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@262 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
+ResolutionTaskHolder@258 {
+    <name not found> = ArrayList@259[1] { ResolutionCandidate@260 }
     <name not found> = EmptyList@160[empty]
+}
+
+ResolutionTaskHolder@261 {
+    <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
     <name not found> = EmptyList@160[empty]
 }
 
 ResolutionTaskHolder@264 {
     <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
-    <name not found> = ArrayList@267[1] { ResolutionCandidate@266 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
 }
 
-ResolutionTaskHolder@268 {
-    <name not found> = ArrayList@269[1] { ResolutionCandidate@270 }
-    <name not found> = ArrayList@271[1] { ResolutionCandidate@270 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
+ResolutionTaskHolder@267 {
+    <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
     <name not found> = EmptyList@160[empty]
 }
 
-ResolutionTaskHolder@272 {
-    <name not found> = ArrayList@273[1] { ResolutionCandidate@274 }
-    <name not found> = ArrayList@275[1] { ResolutionCandidate@274 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
+ResolutionTaskHolder@270 {
+    <name not found> = ArrayList@271[1] { ResolutionCandidate@272 }
     <name not found> = EmptyList@160[empty]
+}
+
+ResolutionTaskHolder@273 {
+    <name not found> = ArrayList@274[1] { ResolutionCandidate@275 }
     <name not found> = EmptyList@160[empty]
 }
 
 ResolutionTaskHolder@276 {
     <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
-    <name not found> = ArrayList@279[1] { ResolutionCandidate@278 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
 }
 
-ResolutionTaskHolder@280 {
-    <name not found> = ArrayList@281[1] { ResolutionCandidate@282 }
-    <name not found> = ArrayList@283[1] { ResolutionCandidate@282 }
-    <name not found> = EmptyList@160[empty]
+ResolutionTaskHolder@279 {
+    <name not found> = ArrayList@280[1] { ResolutionCandidate@281 }
     <name not found> = EmptyList@160[empty]
 }
 
-ResolutionTaskHolder@284 {
-    <name not found> = ArrayList@285[1] { ResolutionCandidate@286 }
-    <name not found> = ArrayList@287[1] { ResolutionCandidate@286 }
+ResolutionTaskHolder@282 {
+    <name not found> = ArrayList@283[1] { ResolutionCandidate@284 }
     <name not found> = EmptyList@160[empty]
+}
+
+ResolutionTaskHolder@285 {
+    <name not found> = ArrayList@286[1] { ResolutionCandidate@287 }
     <name not found> = EmptyList@160[empty]
 }
 
 ResolutionTaskHolder@288 {
     <name not found> = ArrayList@289[1] { ResolutionCandidate@290 }
-    <name not found> = ArrayList@291[1] { ResolutionCandidate@290 }
-    <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
 }
 
-ResolutionTaskHolder@292 {
-    <name not found> = ArrayList@293[1] { ResolutionCandidate@294 }
-    <name not found> = ArrayList@295[1] { ResolutionCandidate@294 }
-    <name not found> = EmptyList@160[empty]
+ResolutionTaskHolder@291 {
+    <name not found> = ArrayList@292[1] { ResolutionCandidate@293 }
     <name not found> = EmptyList@160[empty]
 }
 
-ResolutionTaskHolder@296 {
-    <name not found> = ArrayList@297[1] { ResolutionCandidate@298 }
-    <name not found> = ArrayList@299[1] { ResolutionCandidate@298 }
+ResolutionTaskHolder@294 {
+    <name not found> = ArrayList@295[1] { ResolutionCandidate@296 }
     <name not found> = EmptyList@160[empty]
+}
+
+ResolutionTaskHolder@297 {
+    <name not found> = ArrayList@298[1] { ResolutionCandidate@299 }
     <name not found> = EmptyList@160[empty]
 }
 
 ResolutionTaskHolder@300 {
     <name not found> = ArrayList@301[1] { ResolutionCandidate@302 }
-    <name not found> = ArrayList@303[1] { ResolutionCandidate@302 }
-    <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
 }
 
-ResolutionTaskHolder@304 {
-    <name not found> = ArrayList@305[1] { ResolutionCandidate@306 }
-    <name not found> = ArrayList@307[1] { ResolutionCandidate@306 }
-    <name not found> = EmptyList@160[empty]
+ResolutionTaskHolder@303 {
+    <name not found> = ArrayList@304[1] { ResolutionCandidate@305 }
     <name not found> = EmptyList@160[empty]
 }
 
-ResolutionTaskHolder@308 {
-    <name not found> = ArrayList@309[1] { ResolutionCandidate@310 }
-    <name not found> = ArrayList@311[1] { ResolutionCandidate@310 }
+ResolutionTaskHolder@306 {
+    <name not found> = ArrayList@307[1] { ResolutionCandidate@308 }
     <name not found> = EmptyList@160[empty]
+}
+
+ResolutionTaskHolder@309 {
+    <name not found> = ArrayList@310[1] { ResolutionCandidate@311 }
     <name not found> = EmptyList@160[empty]
 }
 
 ResolutionTaskHolder@312 {
     <name not found> = ArrayList@313[1] { ResolutionCandidate@314 }
-    <name not found> = ArrayList@315[1] { ResolutionCandidate@314 }
-    <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
 }
 
-ResolutionTaskHolder@316 {
-    <name not found> = ArrayList@317[1] { ResolutionCandidate@318 }
-    <name not found> = ArrayList@319[1] { ResolutionCandidate@318 }
-    <name not found> = EmptyList@160[empty]
+ResolutionTaskHolder@315 {
+    <name not found> = ArrayList@316[1] { ResolutionCandidate@317 }
     <name not found> = EmptyList@160[empty]
 }
 
-ResolutionTaskHolder@320 {
-    <name not found> = ArrayList@321[1] { ResolutionCandidate@322 }
-    <name not found> = ArrayList@323[1] { ResolutionCandidate@322 }
+ResolutionTaskHolder@318 {
+    <name not found> = ArrayList@319[1] { ResolutionCandidate@320 }
     <name not found> = EmptyList@160[empty]
+}
+
+ResolutionTaskHolder@321 {
+    <name not found> = ArrayList@322[1] { ResolutionCandidate@323 }
     <name not found> = EmptyList@160[empty]
 }
 
 ResolutionTaskHolder@324 {
     <name not found> = ArrayList@325[1] { ResolutionCandidate@326 }
-    <name not found> = ArrayList@327[1] { ResolutionCandidate@326 }
-    <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
 }
 
-ResolutionTaskHolder@328 {
-    <name not found> = ArrayList@329[1] { ResolutionCandidate@330 }
-    <name not found> = ArrayList@331[1] { ResolutionCandidate@330 }
-    <name not found> = EmptyList@160[empty]
+ResolutionTaskHolder@327 {
+    <name not found> = ArrayList@328[1] { ResolutionCandidate@329 }
     <name not found> = EmptyList@160[empty]
 }
 
-ResolutionTaskHolder@332 {
-    <name not found> = ArrayList@333[1] { ResolutionCandidate@334 }
-    <name not found> = ArrayList@335[1] { ResolutionCandidate@334 }
+ResolutionTaskHolder@330 {
+    <name not found> = ArrayList@331[1] { ResolutionCandidate@332 }
     <name not found> = EmptyList@160[empty]
+}
+
+ResolutionTaskHolder@333 {
+    <name not found> = ArrayList@334[1] { ResolutionCandidate@335 }
     <name not found> = EmptyList@160[empty]
 }
 
 ResolutionTaskHolder@336 {
     <name not found> = ArrayList@337[1] { ResolutionCandidate@338 }
-    <name not found> = ArrayList@339[1] { ResolutionCandidate@338 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
 }
 
-ResolutionTaskHolder@340 {
-    <name not found> = ArrayList@341[1] { ResolutionCandidate@342 }
-    <name not found> = ArrayList@343[1] { ResolutionCandidate@342 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
+ResolutionTaskHolder@339 {
+    <name not found> = ArrayList@340[1] { ResolutionCandidate@341 }
 }
 
-ResolutionTaskHolder@344 {
-    <name not found> = ArrayList@345[1] { ResolutionCandidate@346 }
-    <name not found> = ArrayList@347[1] { ResolutionCandidate@346 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
+ResolutionTaskHolder@342 {
+    <name not found> = ArrayList@343[1] { ResolutionCandidate@344 }
+}
+
+ResolutionTaskHolder@345 {
+    <name not found> = ArrayList@346[1] { ResolutionCandidate@347 }
 }
 
 ResolutionTaskHolder@348 {
     <name not found> = ArrayList@349[1] { ResolutionCandidate@350 }
-    <name not found> = ArrayList@351[1] { ResolutionCandidate@350 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
 }
 
-ResolutionTaskHolder@352 {
-    <name not found> = ArrayList@353[1] { ResolutionCandidate@354 }
-    <name not found> = ArrayList@355[1] { ResolutionCandidate@354 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
+ResolutionTaskHolder@351 {
+    <name not found> = ArrayList@352[1] { ResolutionCandidate@353 }
 }
 
-ResolutionTaskHolder@356 {
-    <name not found> = ArrayList@357[1] { ResolutionCandidate@358 }
-    <name not found> = ArrayList@359[1] { ResolutionCandidate@358 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
+ResolutionTaskHolder@354 {
+    <name not found> = ArrayList@355[1] { ResolutionCandidate@356 }
+}
+
+ResolutionTaskHolder@357 {
+    <name not found> = ArrayList@358[1] { ResolutionCandidate@359 }
 }
 
 ResolutionTaskHolder@360 {
     <name not found> = ArrayList@361[1] { ResolutionCandidate@362 }
-    <name not found> = ArrayList@363[1] { ResolutionCandidate@362 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
 }
 
-ResolutionTaskHolder@364 {
-    <name not found> = ArrayList@365[1] { ResolutionCandidate@366 }
-    <name not found> = ArrayList@367[1] { ResolutionCandidate@366 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
+ResolutionTaskHolder@363 {
+    <name not found> = ArrayList@364[1] { ResolutionCandidate@365 }
 }
 
-ResolutionTaskHolder@368 {
-    <name not found> = ArrayList@369[1] { ResolutionCandidate@370 }
-    <name not found> = ArrayList@371[1] { ResolutionCandidate@370 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
+ResolutionTaskHolder@366 {
+    <name not found> = ArrayList@367[1] { ResolutionCandidate@368 }
+}
+
+ResolutionTaskHolder@369 {
+    <name not found> = ArrayList@370[1] { ResolutionCandidate@371 }
 }
 
 ResolutionTaskHolder@372 {
     <name not found> = ArrayList@373[1] { ResolutionCandidate@374 }
-    <name not found> = ArrayList@375[1] { ResolutionCandidate@374 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
 }
 
-ResolutionTaskHolder@376 {
-    <name not found> = ArrayList@377[1] { ResolutionCandidate@378 }
-    <name not found> = ArrayList@379[1] { ResolutionCandidate@378 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
+ResolutionTaskHolder@375 {
+    <name not found> = ArrayList@376[1] { ResolutionCandidate@377 }
 }
 
-ResolutionTaskHolder@380 {
-    <name not found> = ArrayList@381[1] { ResolutionCandidate@382 }
-    <name not found> = ArrayList@383[1] { ResolutionCandidate@382 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
+ResolutionTaskHolder@378 {
+    <name not found> = ArrayList@379[1] { ResolutionCandidate@380 }
+}
+
+ResolutionTaskHolder@381 {
+    <name not found> = ArrayList@382[1] { ResolutionCandidate@383 }
 }
 
 ResolutionTaskHolder@384 {
     <name not found> = ArrayList@385[1] { ResolutionCandidate@386 }
-    <name not found> = ArrayList@387[1] { ResolutionCandidate@386 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
 }
 
-ResolutionTaskHolder@388 {
-    <name not found> = ArrayList@389[1] { ResolutionCandidate@390 }
-    <name not found> = ArrayList@391[1] { ResolutionCandidate@390 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
+ResolutionTaskHolder@387 {
+    <name not found> = ArrayList@388[1] { ResolutionCandidate@389 }
 }
 
-ResolutionTaskHolder@392 {
-    <name not found> = ArrayList@393[1] { ResolutionCandidate@394 }
-    <name not found> = ArrayList@395[1] { ResolutionCandidate@394 }
+ResolutionTaskHolder@390 {
+    <name not found> = ArrayList@391[1] { ResolutionCandidate@392 }
+}
+
+ResolutionTaskHolder@393 {
+    <name not found> = ArrayList@394[1] { ResolutionCandidate@395 }
 }
 
 ResolutionTaskHolder@396 {
     <name not found> = ArrayList@397[1] { ResolutionCandidate@398 }
-    <name not found> = ArrayList@399[1] { ResolutionCandidate@398 }
 }
 
-ResolutionTaskHolder@400 {
-    <name not found> = ArrayList@401[1] { ResolutionCandidate@402 }
-    <name not found> = ArrayList@403[1] { ResolutionCandidate@402 }
+ResolutionTaskHolder@399 {
+    <name not found> = ArrayList@400[1] { ResolutionCandidate@401 }
 }
 
-ResolutionTaskHolder@404 {
-    <name not found> = ArrayList@405[1] { ResolutionCandidate@406 }
-    <name not found> = ArrayList@407[1] { ResolutionCandidate@406 }
+ResolutionTaskHolder@402 {
+    <name not found> = ArrayList@403[1] { ResolutionCandidate@404 }
+}
+
+ResolutionTaskHolder@405 {
+    <name not found> = ArrayList@406[1] { ResolutionCandidate@407 }
 }
 
 ResolutionTaskHolder@408 {
     <name not found> = ArrayList@409[1] { ResolutionCandidate@410 }
-    <name not found> = ArrayList@411[1] { ResolutionCandidate@410 }
 }
 
-ResolutionTaskHolder@412 {
-    <name not found> = ArrayList@413[1] { ResolutionCandidate@414 }
-    <name not found> = ArrayList@415[1] { ResolutionCandidate@414 }
+ResolutionTaskHolder@411 {
+    <name not found> = ArrayList@412[1] { ResolutionCandidate@413 }
 }
 
-ResolutionTaskHolder@416 {
-    <name not found> = ArrayList@417[1] { ResolutionCandidate@418 }
-    <name not found> = ArrayList@419[1] { ResolutionCandidate@418 }
+ResolutionTaskHolder@414 {
+    <name not found> = ArrayList@415[1] { ResolutionCandidate@416 }
+}
+
+ResolutionTaskHolder@417 {
+    <name not found> = ArrayList@418[1] { ResolutionCandidate@419 }
 }
 
 ResolutionTaskHolder@420 {
     <name not found> = ArrayList@421[1] { ResolutionCandidate@422 }
-    <name not found> = ArrayList@423[1] { ResolutionCandidate@422 }
 }
 
-ResolutionTaskHolder@424 {
-    <name not found> = ArrayList@425[1] { ResolutionCandidate@426 }
-    <name not found> = ArrayList@427[1] { ResolutionCandidate@426 }
+ResolutionTaskHolder@423 {
+    <name not found> = ArrayList@424[1] { ResolutionCandidate@425 }
 }
 
-ResolutionTaskHolder@428 {
-    <name not found> = ArrayList@429[1] { ResolutionCandidate@430 }
-    <name not found> = ArrayList@431[1] { ResolutionCandidate@430 }
+ResolutionTaskHolder@426 {
+    <name not found> = ArrayList@427[1] { ResolutionCandidate@428 }
+}
+
+ResolutionTaskHolder@429 {
+    <name not found> = ArrayList@430[1] { ResolutionCandidate@431 }
 }
 
 ResolutionTaskHolder@432 {
     <name not found> = ArrayList@433[1] { ResolutionCandidate@434 }
-    <name not found> = ArrayList@435[1] { ResolutionCandidate@434 }
 }
 
-ResolutionTaskHolder@436 {
-    <name not found> = ArrayList@437[1] { ResolutionCandidate@438 }
-    <name not found> = ArrayList@439[1] { ResolutionCandidate@438 }
+ResolutionTaskHolder@435 {
+    <name not found> = ArrayList@436[1] { ResolutionCandidate@437 }
 }
 
-ResolutionTaskHolder@440 {
-    <name not found> = ArrayList@441[1] { ResolutionCandidate@442 }
-    <name not found> = ArrayList@443[1] { ResolutionCandidate@442 }
+ResolutionTaskHolder@438 {
+    <name not found> = ArrayList@439[1] { ResolutionCandidate@440 }
+}
+
+ResolutionTaskHolder@441 {
+    <name not found> = ArrayList@442[1] { ResolutionCandidate@443 }
 }
 
 ResolutionTaskHolder@444 {
     <name not found> = ArrayList@445[1] { ResolutionCandidate@446 }
-    <name not found> = ArrayList@447[1] { ResolutionCandidate@446 }
 }
 
-ResolutionTaskHolder@448 {
-    <name not found> = ArrayList@449[1] { ResolutionCandidate@450 }
-    <name not found> = ArrayList@451[1] { ResolutionCandidate@450 }
+ResolutionTaskHolder@447 {
+    <name not found> = ArrayList@448[1] { ResolutionCandidate@449 }
 }
 
-ResolutionTaskHolder@452 {
-    <name not found> = ArrayList@453[1] { ResolutionCandidate@454 }
-    <name not found> = ArrayList@455[1] { ResolutionCandidate@454 }
+ResolutionTaskHolder@450 {
+    <name not found> = ArrayList@451[1] { ResolutionCandidate@452 }
+}
+
+ResolutionTaskHolder@453 {
+    <name not found> = ArrayList@454[1] { ResolutionCandidate@455 }
 }
 
 ResolutionTaskHolder@456 {
     <name not found> = ArrayList@457[1] { ResolutionCandidate@458 }
-    <name not found> = ArrayList@459[1] { ResolutionCandidate@458 }
 }
 
-ResolutionTaskHolder@460 {
-    <name not found> = ArrayList@461[1] { ResolutionCandidate@462 }
-    <name not found> = ArrayList@463[1] { ResolutionCandidate@462 }
+ResolutionTaskHolder@459 {
+    <name not found> = ArrayList@460[1] { ResolutionCandidate@461 }
 }
 
-ResolutionTaskHolder@464 {
-    <name not found> = ArrayList@465[1] { ResolutionCandidate@466 }
-    <name not found> = ArrayList@467[1] { ResolutionCandidate@466 }
+ResolutionTaskHolder@462 {
+    <name not found> = ArrayList@463[1] { ResolutionCandidate@464 }
+}
+
+ResolutionTaskHolder@465 {
+    <name not found> = ArrayList@466[1] { ResolutionCandidate@467 }
 }
 
 ResolutionTaskHolder@468 {
     <name not found> = ArrayList@469[1] { ResolutionCandidate@470 }
-    <name not found> = ArrayList@471[1] { ResolutionCandidate@470 }
 }
 
-ResolutionTaskHolder@472 {
-    <name not found> = ArrayList@473[1] { ResolutionCandidate@474 }
-    <name not found> = ArrayList@475[1] { ResolutionCandidate@474 }
+ResolutionTaskHolder@471 {
+    <name not found> = ArrayList@472[1] { ResolutionCandidate@473 }
 }
 
-ResolutionTaskHolder@476 {
-    <name not found> = ArrayList@477[1] { ResolutionCandidate@478 }
-    <name not found> = ArrayList@479[1] { ResolutionCandidate@478 }
+ResolutionTaskHolder@474 {
+    <name not found> = ArrayList@475[1] { ResolutionCandidate@476 }
+}
+
+ResolutionTaskHolder@477 {
+    <name not found> = ArrayList@478[1] { ResolutionCandidate@479 }
 }
 
 ResolutionTaskHolder@480 {
     <name not found> = ArrayList@481[1] { ResolutionCandidate@482 }
-    <name not found> = ArrayList@483[1] { ResolutionCandidate@482 }
 }
 
-ResolutionTaskHolder@484 {
-    <name not found> = ArrayList@485[1] { ResolutionCandidate@486 }
-    <name not found> = ArrayList@487[1] { ResolutionCandidate@486 }
+ResolutionTaskHolder@483 {
+    <name not found> = ArrayList@484[1] { ResolutionCandidate@485 }
 }
 
-ResolutionTaskHolder@488 {
-    <name not found> = ArrayList@489[1] { ResolutionCandidate@490 }
-    <name not found> = ArrayList@491[1] { ResolutionCandidate@490 }
+ResolutionTaskHolder@486 {
+    <name not found> = ArrayList@487[1] { ResolutionCandidate@488 }
+}
+
+ResolutionTaskHolder@489 {
+    <name not found> = ArrayList@490[1] { ResolutionCandidate@491 }
 }
 
 ResolutionTaskHolder@492 {
     <name not found> = ArrayList@493[1] { ResolutionCandidate@494 }
-    <name not found> = ArrayList@495[1] { ResolutionCandidate@494 }
 }
 
-ResolutionTaskHolder@496 {
-    <name not found> = ArrayList@497[1] { ResolutionCandidate@498 }
-    <name not found> = ArrayList@499[1] { ResolutionCandidate@498 }
+ResolutionTaskHolder@495 {
+    <name not found> = ArrayList@496[1] { ResolutionCandidate@497 }
 }
 
-ResolutionTaskHolder@500 {
-    <name not found> = ArrayList@501[1] { ResolutionCandidate@502 }
-    <name not found> = ArrayList@503[1] { ResolutionCandidate@502 }
+ResolutionTaskHolder@498 {
+    <name not found> = ArrayList@499[1] { ResolutionCandidate@500 }
+}
+
+ResolutionTaskHolder@501 {
+    <name not found> = ArrayList@502[1] { ResolutionCandidate@503 }
 }
 
 ResolutionTaskHolder@504 {
     <name not found> = ArrayList@505[1] { ResolutionCandidate@506 }
-    <name not found> = ArrayList@507[1] { ResolutionCandidate@506 }
 }
 
-ResolutionTaskHolder@508 {
-    <name not found> = ArrayList@509[1] { ResolutionCandidate@510 }
-    <name not found> = ArrayList@511[1] { ResolutionCandidate@510 }
+ResolutionTaskHolder@507 {
+    <name not found> = ArrayList@508[1] { ResolutionCandidate@509 }
 }
 
-ResolutionTaskHolder@512 {
-    <name not found> = ArrayList@513[1] { ResolutionCandidate@514 }
-    <name not found> = ArrayList@515[1] { ResolutionCandidate@514 }
+ResolutionTaskHolder@510 {
+    <name not found> = ArrayList@511[1] { ResolutionCandidate@512 }
+}
+
+ResolutionTaskHolder@513 {
+    <name not found> = ArrayList@514[1] { ResolutionCandidate@515 }
 }
 
 ResolutionTaskHolder@516 {
     <name not found> = ArrayList@517[1] { ResolutionCandidate@518 }
-    <name not found> = ArrayList@519[1] { ResolutionCandidate@518 }
 }
 
-ResolutionTaskHolder@520 {
-    <name not found> = ArrayList@521[1] { ResolutionCandidate@522 }
-    <name not found> = ArrayList@523[1] { ResolutionCandidate@522 }
+ResolutionTaskHolder@519 {
+    <name not found> = ArrayList@520[1] { ResolutionCandidate@521 }
 }
 
-ResolutionTaskHolder@524 {
-    <name not found> = ArrayList@525[1] { ResolutionCandidate@526 }
-    <name not found> = ArrayList@527[1] { ResolutionCandidate@526 }
+ResolutionTaskHolder@522 {
+    <name not found> = ArrayList@523[1] { ResolutionCandidate@524 }
+}
+
+ResolutionTaskHolder@525 {
+    <name not found> = ArrayList@526[1] { ResolutionCandidate@527 }
 }
 
 ResolutionTaskHolder@528 {
     <name not found> = ArrayList@529[1] { ResolutionCandidate@530 }
-    <name not found> = ArrayList@531[1] { ResolutionCandidate@530 }
 }
 
-ResolutionTaskHolder@532 {
-    <name not found> = ArrayList@533[1] { ResolutionCandidate@534 }
-    <name not found> = ArrayList@535[1] { ResolutionCandidate@534 }
+ResolutionTaskHolder@531 {
+    <name not found> = ArrayList@532[1] { ResolutionCandidate@533 }
 }
 
-ResolutionTaskHolder@536 {
-    <name not found> = ArrayList@537[1] { ResolutionCandidate@538 }
-    <name not found> = ArrayList@539[1] { ResolutionCandidate@538 }
+ResolutionTaskHolder@534 {
+    <name not found> = ArrayList@535[1] { ResolutionCandidate@536 }
+}
+
+ResolutionTaskHolder@537 {
+    <name not found> = ArrayList@538[1] { ResolutionCandidate@539 }
 }
 
 ResolutionTaskHolder@540 {
     <name not found> = ArrayList@541[1] { ResolutionCandidate@542 }
-    <name not found> = ArrayList@543[1] { ResolutionCandidate@542 }
 }
 
-ResolutionTaskHolder@544 {
-    <name not found> = ArrayList@545[1] { ResolutionCandidate@546 }
-    <name not found> = ArrayList@547[1] { ResolutionCandidate@546 }
+ResolutionTaskHolder@543 {
+    <name not found> = ArrayList@544[1] { ResolutionCandidate@545 }
 }
 
-ResolutionTaskHolder@548 {
-    <name not found> = ArrayList@549[1] { ResolutionCandidate@550 }
-    <name not found> = ArrayList@551[1] { ResolutionCandidate@550 }
+ResolutionTaskHolder@546 {
+    <name not found> = ArrayList@547[1] { ResolutionCandidate@548 }
+}
+
+ResolutionTaskHolder@549 {
+    <name not found> = ArrayList@550[1] { ResolutionCandidate@551 }
 }
 
 ResolutionTaskHolder@552 {
     <name not found> = ArrayList@553[1] { ResolutionCandidate@554 }
-    <name not found> = ArrayList@555[1] { ResolutionCandidate@554 }
 }
 
-ResolutionTaskHolder@556 {
-    <name not found> = ArrayList@557[1] { ResolutionCandidate@558 }
-    <name not found> = ArrayList@559[1] { ResolutionCandidate@558 }
+ResolutionTaskHolder@555 {
+    <name not found> = ArrayList@556[1] { ResolutionCandidate@557 }
 }
 
-ResolutionTaskHolder@560 {
-    <name not found> = ArrayList@561[1] { ResolutionCandidate@562 }
-    <name not found> = ArrayList@563[1] { ResolutionCandidate@562 }
+ResolutionTaskHolder@558 {
+    <name not found> = ArrayList@559[1] { ResolutionCandidate@560 }
+}
+
+ResolutionTaskHolder@561 {
+    <name not found> = ArrayList@562[1] { ResolutionCandidate@563 }
 }
 
 ResolutionTaskHolder@564 {
     <name not found> = ArrayList@565[1] { ResolutionCandidate@566 }
-    <name not found> = ArrayList@567[1] { ResolutionCandidate@566 }
 }
 
-ResolutionTaskHolder@568 {
-    <name not found> = ArrayList@569[1] { ResolutionCandidate@570 }
-    <name not found> = ArrayList@571[1] { ResolutionCandidate@570 }
+ResolutionTaskHolder@567 {
+    <name not found> = ArrayList@568[1] { ResolutionCandidate@569 }
 }
 
-ResolutionTaskHolder@572 {
-    <name not found> = ArrayList@573[1] { ResolutionCandidate@574 }
-    <name not found> = ArrayList@575[1] { ResolutionCandidate@574 }
+ResolutionTaskHolder@570 {
+    <name not found> = ArrayList@571[1] { ResolutionCandidate@572 }
+}
+
+ResolutionTaskHolder@573 {
+    <name not found> = ArrayList@574[1] { ResolutionCandidate@575 }
 }
 
 ResolutionTaskHolder@576 {
     <name not found> = ArrayList@577[1] { ResolutionCandidate@578 }
-    <name not found> = ArrayList@579[1] { ResolutionCandidate@578 }
 }
 
-ResolutionTaskHolder@580 {
-    <name not found> = ArrayList@581[1] { ResolutionCandidate@582 }
-    <name not found> = ArrayList@583[1] { ResolutionCandidate@582 }
+ResolutionTaskHolder@579 {
+    <name not found> = ArrayList@580[1] { ResolutionCandidate@581 }
 }
 
-ResolutionTaskHolder@584 {
-    <name not found> = ArrayList@585[1] { ResolutionCandidate@586 }
-    <name not found> = ArrayList@587[1] { ResolutionCandidate@586 }
+ResolutionTaskHolder@582 {
+    <name not found> = ArrayList@583[1] { ResolutionCandidate@584 }
+}
+
+ResolutionTaskHolder@585 {
+    <name not found> = ArrayList@586[1] { ResolutionCandidate@587 }
 }
 
 ResolutionTaskHolder@588 {
     <name not found> = ArrayList@589[1] { ResolutionCandidate@590 }
-    <name not found> = ArrayList@591[1] { ResolutionCandidate@590 }
 }
 
-ResolutionTaskHolder@592 {
-    <name not found> = ArrayList@593[1] { ResolutionCandidate@594 }
-    <name not found> = ArrayList@595[1] { ResolutionCandidate@594 }
+ResolutionTaskHolder@591 {
+    <name not found> = ArrayList@592[1] { ResolutionCandidate@593 }
 }
 
-ResolutionTaskHolder@596 {
-    <name not found> = ArrayList@597[1] { ResolutionCandidate@598 }
-    <name not found> = ArrayList@599[1] { ResolutionCandidate@598 }
+ResolutionTaskHolder@594 {
+    <name not found> = ArrayList@595[1] { ResolutionCandidate@596 }
+}
+
+ResolutionTaskHolder@597 {
+    <name not found> = ArrayList@598[1] { ResolutionCandidate@599 }
 }
 
 ResolutionTaskHolder@600 {
-    <name not found> = ArrayList@601[1] { ResolutionCandidate@602 }
-    <name not found> = ArrayList@603[1] { ResolutionCandidate@602 }
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+}
+
+ResolutionTaskHolder@601 {
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+}
+
+ResolutionTaskHolder@602 {
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+}
+
+ResolutionTaskHolder@603 {
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
 }
 
 ResolutionTaskHolder@604 {
-    <name not found> = ArrayList@605[1] { ResolutionCandidate@606 }
-    <name not found> = ArrayList@607[1] { ResolutionCandidate@606 }
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+}
+
+ResolutionTaskHolder@605 {
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+}
+
+ResolutionTaskHolder@606 {
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+}
+
+ResolutionTaskHolder@607 {
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
 }
 
 ResolutionTaskHolder@608 {
-    <name not found> = ArrayList@609[1] { ResolutionCandidate@610 }
-    <name not found> = ArrayList@611[1] { ResolutionCandidate@610 }
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+}
+
+ResolutionTaskHolder@609 {
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+}
+
+ResolutionTaskHolder@610 {
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+}
+
+ResolutionTaskHolder@611 {
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
 }
 
 ResolutionTaskHolder@612 {
-    <name not found> = ArrayList@613[1] { ResolutionCandidate@614 }
-    <name not found> = ArrayList@615[1] { ResolutionCandidate@614 }
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+}
+
+ResolutionTaskHolder@613 {
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+}
+
+ResolutionTaskHolder@614 {
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+}
+
+ResolutionTaskHolder@615 {
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
 }
 
 ResolutionTaskHolder@616 {
-    <name not found> = ArrayList@617[1] { ResolutionCandidate@618 }
-    <name not found> = ArrayList@619[1] { ResolutionCandidate@618 }
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+}
+
+ResolutionTaskHolder@617 {
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+}
+
+ResolutionTaskHolder@618 {
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+}
+
+ResolutionTaskHolder@619 {
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
 }
 
 ResolutionTaskHolder@620 {
-    <name not found> = ArrayList@621[1] { ResolutionCandidate@622 }
-    <name not found> = ArrayList@623[1] { ResolutionCandidate@622 }
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+}
+
+ResolutionTaskHolder@621 {
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+}
+
+ResolutionTaskHolder@622 {
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+}
+
+ResolutionTaskHolder@623 {
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
 }
 
 ResolutionTaskHolder@624 {
-    <name not found> = ArrayList@625[1] { ResolutionCandidate@626 }
-    <name not found> = ArrayList@627[1] { ResolutionCandidate@626 }
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+}
+
+ResolutionTaskHolder@625 {
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+}
+
+ResolutionTaskHolder@626 {
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+}
+
+ResolutionTaskHolder@627 {
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
 }
 
 ResolutionTaskHolder@628 {
-    <name not found> = ArrayList@629[1] { ResolutionCandidate@630 }
-    <name not found> = ArrayList@631[1] { ResolutionCandidate@630 }
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+}
+
+ResolutionTaskHolder@629 {
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+}
+
+ResolutionTaskHolder@630 {
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+}
+
+ResolutionTaskHolder@631 {
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
 }
 
 ResolutionTaskHolder@632 {
-    <name not found> = ArrayList@633[1] { ResolutionCandidate@634 }
-    <name not found> = ArrayList@635[1] { ResolutionCandidate@634 }
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+}
+
+ResolutionTaskHolder@633 {
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+}
+
+ResolutionTaskHolder@634 {
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+}
+
+ResolutionTaskHolder@635 {
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
 }
 
 ResolutionTaskHolder@636 {
-    <name not found> = ArrayList@637[1] { ResolutionCandidate@638 }
-    <name not found> = ArrayList@639[1] { ResolutionCandidate@638 }
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+}
+
+ResolutionTaskHolder@637 {
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+}
+
+ResolutionTaskHolder@638 {
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+}
+
+ResolutionTaskHolder@639 {
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
 }
 
 ResolutionTaskHolder@640 {
-    <name not found> = ArrayList@641[1] { ResolutionCandidate@642 }
-    <name not found> = ArrayList@643[1] { ResolutionCandidate@642 }
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+}
+
+ResolutionTaskHolder@641 {
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+}
+
+ResolutionTaskHolder@642 {
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+}
+
+ResolutionTaskHolder@643 {
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
 }
 
 ResolutionTaskHolder@644 {
-    <name not found> = ArrayList@645[1] { ResolutionCandidate@646 }
-    <name not found> = ArrayList@647[1] { ResolutionCandidate@646 }
-}
-
-ResolutionTaskHolder@648 {
-    <name not found> = ArrayList@649[1] { ResolutionCandidate@650 }
-    <name not found> = ArrayList@651[1] { ResolutionCandidate@650 }
-}
-
-ResolutionTaskHolder@652 {
-    <name not found> = ArrayList@653[1] { ResolutionCandidate@654 }
-    <name not found> = ArrayList@655[1] { ResolutionCandidate@654 }
-}
-
-ResolutionTaskHolder@656 {
-    <name not found> = ArrayList@657[1] { ResolutionCandidate@658 }
-    <name not found> = ArrayList@659[1] { ResolutionCandidate@658 }
-}
-
-ResolutionTaskHolder@660 {
-    <name not found> = ArrayList@661[1] { ResolutionCandidate@662 }
-    <name not found> = ArrayList@663[1] { ResolutionCandidate@662 }
-}
-
-ResolutionTaskHolder@664 {
-    <name not found> = ArrayList@665[1] { ResolutionCandidate@666 }
-    <name not found> = ArrayList@667[1] { ResolutionCandidate@666 }
-}
-
-ResolutionTaskHolder@668 {
-    <name not found> = ArrayList@669[1] { ResolutionCandidate@670 }
-    <name not found> = ArrayList@671[1] { ResolutionCandidate@670 }
-}
-
-ResolutionTaskHolder@672 {
-    <name not found> = ArrayList@673[1] { ResolutionCandidate@674 }
-    <name not found> = ArrayList@675[1] { ResolutionCandidate@674 }
-}
-
-ResolutionTaskHolder@676 {
-    <name not found> = ArrayList@677[1] { ResolutionCandidate@678 }
-    <name not found> = ArrayList@679[1] { ResolutionCandidate@678 }
-}
-
-ResolutionTaskHolder@680 {
-    <name not found> = ArrayList@681[1] { ResolutionCandidate@682 }
-    <name not found> = ArrayList@683[1] { ResolutionCandidate@682 }
-}
-
-ResolutionTaskHolder@684 {
-    <name not found> = ArrayList@685[1] { ResolutionCandidate@686 }
-    <name not found> = ArrayList@687[1] { ResolutionCandidate@686 }
-}
-
-ResolutionTaskHolder@688 {
-    <name not found> = ArrayList@689[1] { ResolutionCandidate@690 }
-    <name not found> = ArrayList@691[1] { ResolutionCandidate@690 }
-}
-
-ResolutionTaskHolder@692 {
-    <name not found> = ArrayList@693[1] { ResolutionCandidate@694 }
-    <name not found> = ArrayList@695[1] { ResolutionCandidate@694 }
-}
-
-ResolutionTaskHolder@696 {
-    <name not found> = ArrayList@697[1] { ResolutionCandidate@698 }
-    <name not found> = ArrayList@699[1] { ResolutionCandidate@698 }
-}
-
-ResolutionTaskHolder@700 {
-    <name not found> = ArrayList@701[1] { ResolutionCandidate@702 }
-    <name not found> = ArrayList@703[1] { ResolutionCandidate@702 }
-}
-
-ResolutionTaskHolder@704 {
-    <name not found> = ArrayList@705[1] { ResolutionCandidate@706 }
-    <name not found> = ArrayList@707[1] { ResolutionCandidate@706 }
-}
-
-ResolutionTaskHolder@708 {
-    <name not found> = ArrayList@709[1] { ResolutionCandidate@710 }
-    <name not found> = ArrayList@711[1] { ResolutionCandidate@710 }
-}
-
-ResolutionTaskHolder@712 {
-    <name not found> = ArrayList@713[1] { ResolutionCandidate@714 }
-    <name not found> = ArrayList@715[1] { ResolutionCandidate@714 }
-}
-
-ResolutionTaskHolder@716 {
-    <name not found> = ArrayList@717[1] { ResolutionCandidate@718 }
-    <name not found> = ArrayList@719[1] { ResolutionCandidate@718 }
-}
-
-ResolutionTaskHolder@720 {
-    <name not found> = ArrayList@721[1] { ResolutionCandidate@722 }
-    <name not found> = ArrayList@723[1] { ResolutionCandidate@722 }
-}
-
-ResolutionTaskHolder@724 {
-    <name not found> = ArrayList@725[1] { ResolutionCandidate@726 }
-    <name not found> = ArrayList@727[1] { ResolutionCandidate@726 }
-}
-
-ResolutionTaskHolder@728 {
-    <name not found> = ArrayList@729[1] { ResolutionCandidate@730 }
-    <name not found> = ArrayList@731[1] { ResolutionCandidate@730 }
-}
-
-ResolutionTaskHolder@732 {
-    <name not found> = ArrayList@733[1] { ResolutionCandidate@734 }
-    <name not found> = ArrayList@735[1] { ResolutionCandidate@734 }
-}
-
-ResolutionTaskHolder@736 {
-    <name not found> = ArrayList@737[1] { ResolutionCandidate@738 }
-    <name not found> = ArrayList@739[1] { ResolutionCandidate@738 }
-}
-
-ResolutionTaskHolder@740 {
-    <name not found> = ArrayList@741[1] { ResolutionCandidate@742 }
-    <name not found> = ArrayList@743[1] { ResolutionCandidate@742 }
-}
-
-ResolutionTaskHolder@744 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@745 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@746 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@747 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@748 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@749 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@750 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@751 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@752 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@753 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@754 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@755 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@756 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@757 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@758 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@759 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@760 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@761 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@762 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@763 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@764 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@765 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@766 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@767 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@768 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
@@ -2258,20 +2221,7 @@ ResolutionTaskHolder@768 {
     <name not found> = EmptyList@160[empty]
 }
 
-ResolutionTaskHolder@769 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
+ResolutionTaskHolder@645 {
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
@@ -2286,20 +2236,7 @@ ResolutionTaskHolder@769 {
     <name not found> = EmptyList@160[empty]
 }
 
-ResolutionTaskHolder@770 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
+ResolutionTaskHolder@646 {
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
@@ -2314,20 +2251,7 @@ ResolutionTaskHolder@770 {
     <name not found> = EmptyList@160[empty]
 }
 
-ResolutionTaskHolder@771 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
+ResolutionTaskHolder@647 {
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
@@ -2342,13 +2266,151 @@ ResolutionTaskHolder@771 {
     <name not found> = EmptyList@160[empty]
 }
 
-ResolutionTaskHolder@772 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
+null {
+    <name not found> = ArrayList@648[1] { ResolutionCandidate@542 }
+    <name not found> = ArrayList@649[1] { ResolutionCandidate@344 }
+    <name not found> = ArrayList@650[1] { ResolutionCandidate@434 }
+    <name not found> = ArrayList@651[1] { ResolutionCandidate@560 }
+    <name not found> = ArrayList@652[1] { ResolutionCandidate@551 }
+    <name not found> = ArrayList@653[1] { ResolutionCandidate@524 }
+    <name not found> = ArrayList@654[1] { ResolutionCandidate@386 }
+    <name not found> = ArrayList@655[1] { ResolutionCandidate@398 }
+    <name not found> = ArrayList@656[1] { ResolutionCandidate@428 }
+    <name not found> = ArrayList@657[1] { ResolutionCandidate@512 }
+    <name not found> = ArrayList@658[1] { ResolutionCandidate@410 }
+    <name not found> = ArrayList@659[1] { ResolutionCandidate@383 }
+    <name not found> = ArrayList@660[1] { ResolutionCandidate@515 }
+    <name not found> = ArrayList@661[1] { ResolutionCandidate@593 }
+    <name not found> = ArrayList@662[1] { ResolutionCandidate@500 }
+    <name not found> = ArrayList@663[1] { ResolutionCandidate@416 }
+    <name not found> = ArrayList@664[1] { ResolutionCandidate@407 }
+    <name not found> = ArrayList@665[1] { ResolutionCandidate@575 }
+    <name not found> = ArrayList@666[1] { ResolutionCandidate@431 }
+    <name not found> = ArrayList@667[1] { ResolutionCandidate@473 }
+    <name not found> = ArrayList@668[1] { ResolutionCandidate@320 }
+    <name not found> = ArrayList@669[1] { ResolutionCandidate@338 }
+    <name not found> = ArrayList@670[1] { ResolutionCandidate@329 }
+    <name not found> = ArrayList@671[1] { ResolutionCandidate@578 }
+    <name not found> = ArrayList@672[1] { ResolutionCandidate@287 }
+    <name not found> = ArrayList@673[1] { ResolutionCandidate@341 }
+    <name not found> = ArrayList@674[1] { ResolutionCandidate@335 }
+    <name not found> = ArrayList@675[1] { ResolutionCandidate@596 }
+    <name not found> = ArrayList@676[1] { ResolutionCandidate@296 }
+    <name not found> = ArrayList@677[1] { ResolutionCandidate@290 }
+    <name not found> = ArrayList@678[1] { ResolutionCandidate@269 }
+    <name not found> = ArrayList@679[1] { ResolutionCandidate@326 }
+    <name not found> = ArrayList@680[1] { ResolutionCandidate@581 }
+    <name not found> = ArrayList@681[1] { ResolutionCandidate@347 }
+    <name not found> = ArrayList@682[1] { ResolutionCandidate@518 }
+    <name not found> = ArrayList@683[1] { ResolutionCandidate@548 }
+    <name not found> = ArrayList@684[1] { ResolutionCandidate@488 }
+    <name not found> = ArrayList@685[1] { ResolutionCandidate@530 }
+    <name not found> = ArrayList@686[1] { ResolutionCandidate@230 }
+    <name not found> = ArrayList@687[1] { ResolutionCandidate@506 }
+    <name not found> = ArrayList@688[1] { ResolutionCandidate@188 }
+    <name not found> = ArrayList@689[1] { ResolutionCandidate@413 }
+    <name not found> = ArrayList@690[1] { ResolutionCandidate@239 }
+    <name not found> = ArrayList@691[1] { ResolutionCandidate@566 }
+    <name not found> = ArrayList@692[1] { ResolutionCandidate@179 }
+    <name not found> = ArrayList@693[1] { ResolutionCandidate@353 }
+    <name not found> = ArrayList@694[1] { ResolutionCandidate@206 }
+    <name not found> = ArrayList@695[1] { ResolutionCandidate@203 }
+    <name not found> = ArrayList@696[1] { ResolutionCandidate@191 }
+    <name not found> = ArrayList@697[1] { ResolutionCandidate@233 }
+    <name not found> = ArrayList@698[1] { ResolutionCandidate@401 }
+    <name not found> = ArrayList@699[1] { ResolutionCandidate@554 }
+    <name not found> = ArrayList@700[1] { ResolutionCandidate@374 }
+    <name not found> = ArrayList@701[1] { ResolutionCandidate@359 }
+    <name not found> = ArrayList@702[1] { ResolutionCandidate@491 }
+    <name not found> = ArrayList@703[1] { ResolutionCandidate@437 }
+    <name not found> = ArrayList@704[1] { ResolutionCandidate@440 }
+    <name not found> = ArrayList@705[1] { ResolutionCandidate@497 }
+    <name not found> = ArrayList@706[1] { ResolutionCandidate@362 }
+    <name not found> = ArrayList@707[1] { ResolutionCandidate@425 }
+    <name not found> = ArrayList@708[1] { ResolutionCandidate@332 }
+    <name not found> = ArrayList@709[1] { ResolutionCandidate@452 }
+    <name not found> = ArrayList@710[1] { ResolutionCandidate@275 }
+    <name not found> = ArrayList@711[1] { ResolutionCandidate@365 }
+    <name not found> = ArrayList@712[1] { ResolutionCandidate@293 }
+    <name not found> = ArrayList@713[1] { ResolutionCandidate@419 }
+    <name not found> = ArrayList@714[1] { ResolutionCandidate@314 }
+    <name not found> = ArrayList@715[1] { ResolutionCandidate@590 }
+    <name not found> = ArrayList@716[1] { ResolutionCandidate@278 }
+    <name not found> = ArrayList@717[1] { ResolutionCandidate@371 }
+    <name not found> = ArrayList@718[1] { ResolutionCandidate@257 }
+    <name not found> = ArrayList@719[1] { ResolutionCandidate@389 }
+    <name not found> = ArrayList@720[1] { ResolutionCandidate@311 }
+    <name not found> = ArrayList@721[1] { ResolutionCandidate@263 }
+    <name not found> = ArrayList@722[1] { ResolutionCandidate@260 }
+    <name not found> = ArrayList@723[1] { ResolutionCandidate@299 }
+    <name not found> = ArrayList@724[1] { ResolutionCandidate@449 }
+    <name not found> = ArrayList@725[1] { ResolutionCandidate@482 }
+    <name not found> = ArrayList@726[1] { ResolutionCandidate@503 }
+    <name not found> = ArrayList@727[1] { ResolutionCandidate@404 }
+    <name not found> = ArrayList@728[1] { ResolutionCandidate@392 }
+    <name not found> = ArrayList@729[1] { ResolutionCandidate@461 }
+    <name not found> = ArrayList@730[1] { ResolutionCandidate@380 }
+    <name not found> = ArrayList@731[1] { ResolutionCandidate@170 }
+    <name not found> = ArrayList@732[1] { ResolutionCandidate@476 }
+    <name not found> = ArrayList@733[1] { ResolutionCandidate@194 }
+    <name not found> = ArrayList@734[1] { ResolutionCandidate@527 }
+    <name not found> = ArrayList@735[1] { ResolutionCandidate@251 }
+    <name not found> = ArrayList@736[1] { ResolutionCandidate@599 }
+    <name not found> = ArrayList@737[1] { ResolutionCandidate@221 }
+    <name not found> = ArrayList@738[1] { ResolutionCandidate@464 }
+    <name not found> = ArrayList@739[1] { ResolutionCandidate@209 }
+    <name not found> = ArrayList@740[1] { ResolutionCandidate@356 }
+    <name not found> = ArrayList@741[1] { ResolutionCandidate@242 }
+    <name not found> = ArrayList@742[1] { ResolutionCandidate@350 }
+    <name not found> = ArrayList@743[1] { ResolutionCandidate@182 }
+    <name not found> = ArrayList@744[1] { ResolutionCandidate@176 }
+    <name not found> = ArrayList@745[1] { ResolutionCandidate@248 }
+    <name not found> = ArrayList@746[1] { ResolutionCandidate@236 }
+    <name not found> = ArrayList@747[1] { ResolutionCandidate@557 }
+    <name not found> = ArrayList@748[1] { ResolutionCandidate@584 }
+    <name not found> = ArrayList@749[1] { ResolutionCandidate@455 }
+    <name not found> = ArrayList@750[1] { ResolutionCandidate@467 }
+    <name not found> = ArrayList@751[1] { ResolutionCandidate@368 }
+    <name not found> = ArrayList@752[1] { ResolutionCandidate@479 }
+    <name not found> = ArrayList@753[1] { ResolutionCandidate@284 }
+    <name not found> = ArrayList@754[1] { ResolutionCandidate@470 }
+    <name not found> = ArrayList@755[1] { ResolutionCandidate@305 }
+    <name not found> = ArrayList@756[1] { ResolutionCandidate@536 }
+    <name not found> = ArrayList@757[1] { ResolutionCandidate@266 }
+    <name not found> = ArrayList@758[1] { ResolutionCandidate@446 }
+    <name not found> = ArrayList@759[1] { ResolutionCandidate@281 }
+    <name not found> = ArrayList@760[1] { ResolutionCandidate@545 }
+    <name not found> = ArrayList@761[1] { ResolutionCandidate@302 }
+    <name not found> = ArrayList@762[1] { ResolutionCandidate@443 }
+    <name not found> = ArrayList@763[1] { ResolutionCandidate@317 }
+    <name not found> = ArrayList@764[1] { ResolutionCandidate@521 }
+    <name not found> = ArrayList@765[1] { ResolutionCandidate@254 }
+    <name not found> = ArrayList@766[1] { ResolutionCandidate@308 }
+    <name not found> = ArrayList@767[1] { ResolutionCandidate@323 }
+    <name not found> = ArrayList@768[1] { ResolutionCandidate@272 }
+    <name not found> = ArrayList@769[1] { ResolutionCandidate@395 }
+    <name not found> = ArrayList@770[1] { ResolutionCandidate@539 }
+    <name not found> = ArrayList@771[1] { ResolutionCandidate@587 }
+    <name not found> = ArrayList@772[1] { ResolutionCandidate@533 }
+    <name not found> = ArrayList@773[1] { ResolutionCandidate@563 }
+    <name not found> = ArrayList@774[1] { ResolutionCandidate@509 }
+    <name not found> = ArrayList@775[1] { ResolutionCandidate@485 }
+    <name not found> = ArrayList@776[1] { ResolutionCandidate@215 }
+    <name not found> = ArrayList@777[1] { ResolutionCandidate@494 }
+    <name not found> = ArrayList@778[1] { ResolutionCandidate@200 }
+    <name not found> = ArrayList@779[1] { ResolutionCandidate@569 }
+    <name not found> = ArrayList@780[1] { ResolutionCandidate@197 }
+    <name not found> = ArrayList@781[1] { ResolutionCandidate@377 }
+    <name not found> = ArrayList@782[1] { ResolutionCandidate@218 }
+    <name not found> = ArrayList@783[1] { ResolutionCandidate@458 }
+    <name not found> = ArrayList@784[1] { ResolutionCandidate@173 }
+    <name not found> = ArrayList@785[1] { ResolutionCandidate@422 }
+    <name not found> = ArrayList@786[1] { ResolutionCandidate@224 }
+    <name not found> = ArrayList@787[1] { ResolutionCandidate@572 }
+    <name not found> = ArrayList@788[1] { ResolutionCandidate@227 }
+    <name not found> = ArrayList@789[1] { ResolutionCandidate@185 }
+    <name not found> = ArrayList@790[1] { ResolutionCandidate@212 }
+    <name not found> = ArrayList@791[1] { ResolutionCandidate@245 }
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
@@ -2368,11 +2430,6 @@ ResolutionTaskHolder@772 {
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@773 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
@@ -2396,9 +2453,6 @@ ResolutionTaskHolder@773 {
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@774 {
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
@@ -2424,9 +2478,6 @@ ResolutionTaskHolder@774 {
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@775 {
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
@@ -2452,9 +2503,6 @@ ResolutionTaskHolder@775 {
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@776 {
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
@@ -2475,9 +2523,6 @@ ResolutionTaskHolder@776 {
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@777 {
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
@@ -2498,9 +2543,6 @@ ResolutionTaskHolder@777 {
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@778 {
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
@@ -2521,9 +2563,6 @@ ResolutionTaskHolder@778 {
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@779 {
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
@@ -2544,9 +2583,6 @@ ResolutionTaskHolder@779 {
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@780 {
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
@@ -2567,9 +2603,6 @@ ResolutionTaskHolder@780 {
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@781 {
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
@@ -2590,9 +2623,6 @@ ResolutionTaskHolder@781 {
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@782 {
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
@@ -2613,9 +2643,6 @@ ResolutionTaskHolder@782 {
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@783 {
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
@@ -2636,9 +2663,6 @@ ResolutionTaskHolder@783 {
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@784 {
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
@@ -2654,9 +2678,6 @@ ResolutionTaskHolder@784 {
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@785 {
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
@@ -2672,9 +2693,6 @@ ResolutionTaskHolder@785 {
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@786 {
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
@@ -2690,9 +2708,6 @@ ResolutionTaskHolder@786 {
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@787 {
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
@@ -2708,9 +2723,6 @@ ResolutionTaskHolder@787 {
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@788 {
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
@@ -2726,9 +2738,6 @@ ResolutionTaskHolder@788 {
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@789 {
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
@@ -2744,9 +2753,6 @@ ResolutionTaskHolder@789 {
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@790 {
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
@@ -2762,9 +2768,6 @@ ResolutionTaskHolder@790 {
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@791 {
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
     <name not found> = EmptyList@160[empty]
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/valVarFunctionParameter.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/valVarFunctionParameter.lazy.log
index 79aafa08b38..48228eaf5d9 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/valVarFunctionParameter.lazy.log
+++ b/compiler/testData/diagnostics/tests/declarationChecks/valVarFunctionParameter.lazy.log
@@ -23,70 +23,73 @@ LazyJavaPackageFragment@5['java'] {
 
 ResolutionTaskHolder@21 {
     <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@23 }
 }
 
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
+ResolutionTaskHolder@24 {
+    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+ResolutionTaskHolder@27 {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
+}
+
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
 }
 
 ResolutionTaskHolder@33 {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+}
+
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
 }
 
 ResolutionTaskHolder@45 {
     <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[8] { ResolutionCandidate@50, ResolutionCandidate@51, ResolutionCandidate@52, ... }
 }
 
 ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@54[8] { ResolutionCandidate@55, ResolutionCandidate@56, ResolutionCandidate@57, ... }
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[8] { ResolutionCandidate@59, ResolutionCandidate@60, ResolutionCandidate@61, ... }
-    <name not found> = ArrayList@62[8] { ResolutionCandidate@59, ResolutionCandidate@60, ResolutionCandidate@61, ... }
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[8] { ResolutionCandidate@60, ResolutionCandidate@61, ResolutionCandidate@62, ... }
 }
 
 ResolutionTaskHolder@63 {
     <name not found> = ArrayList@64[8] { ResolutionCandidate@65, ResolutionCandidate@66, ResolutionCandidate@67, ... }
-    <name not found> = ArrayList@68[8] { ResolutionCandidate@65, ResolutionCandidate@66, ResolutionCandidate@67, ... }
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[8] { ResolutionCandidate@71, ResolutionCandidate@72, ResolutionCandidate@73, ... }
-    <name not found> = ArrayList@74[8] { ResolutionCandidate@71, ResolutionCandidate@72, ResolutionCandidate@73, ... }
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[8] { ResolutionCandidate@70, ResolutionCandidate@71, ResolutionCandidate@72, ... }
 }
 
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[8] { ResolutionCandidate@77, ResolutionCandidate@78, ResolutionCandidate@79, ... }
-    <name not found> = ArrayList@80[8] { ResolutionCandidate@77, ResolutionCandidate@78, ResolutionCandidate@79, ... }
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[8] { ResolutionCandidate@83, ResolutionCandidate@84, ResolutionCandidate@85, ... }
-    <name not found> = ArrayList@86[8] { ResolutionCandidate@83, ResolutionCandidate@84, ResolutionCandidate@85, ... }
+null {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@23 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@26 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@82[8] { ResolutionCandidate@65, ResolutionCandidate@66, ResolutionCandidate@67, ... }
+    <name not found> = ArrayList@83[8] { ResolutionCandidate@70, ResolutionCandidate@71, ResolutionCandidate@72, ... }
+    <name not found> = ArrayList@84[8] { ResolutionCandidate@50, ResolutionCandidate@51, ResolutionCandidate@52, ... }
+    <name not found> = ArrayList@85[8] { ResolutionCandidate@60, ResolutionCandidate@61, ResolutionCandidate@62, ... }
+    <name not found> = ArrayList@86[8] { ResolutionCandidate@55, ResolutionCandidate@56, ResolutionCandidate@57, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/absentErrorAboutInitializer.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/absentErrorAboutInitializer.lazy.log
index 4e08014571e..ab0e66bdd4f 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/absentErrorAboutInitializer.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/absentErrorAboutInitializer.lazy.log
@@ -56,64 +56,42 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@38 {
     <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
 ResolutionTaskHolder@49 {
     <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
+}
+
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
 }
 
 ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -139,3 +117,28 @@ ResolutionTaskHolder@69 {
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
+
+null {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@42 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/absentErrorAboutType.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/absentErrorAboutType.lazy.log
index 714fbf23b1d..9e70b881e1b 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/absentErrorAboutType.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/absentErrorAboutType.lazy.log
@@ -60,64 +60,42 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
 ResolutionTaskHolder@51 {
     <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
 }
 
 ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -143,3 +121,28 @@ ResolutionTaskHolder@71 {
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
+
+null {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@44 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/abstractDelegatedProperty.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/abstractDelegatedProperty.lazy.log
index 3efa2d6452d..682f8f800d6 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/abstractDelegatedProperty.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/abstractDelegatedProperty.lazy.log
@@ -56,26 +56,25 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@38 {
     <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -88,15 +87,6 @@ ResolutionTaskHolder@45 {
 
 ResolutionTaskHolder@49 {
     <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -107,49 +97,62 @@ ResolutionTaskHolder@49 {
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
+}
+
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
 }
 
 ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+null {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/backingField.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/backingField.lazy.log
index 8933ec664c1..fa268831d76 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/backingField.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/backingField.lazy.log
@@ -62,26 +62,25 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@41 {
     <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+}
+
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
@@ -94,15 +93,6 @@ ResolutionTaskHolder@48 {
 
 ResolutionTaskHolder@52 {
     <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
@@ -113,55 +103,68 @@ ResolutionTaskHolder@52 {
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
+}
+
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
 }
 
 ResolutionTaskHolder@64 {
     <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+ResolutionTaskHolder@67 {
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+null {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/delegatedPropertyOverridedInTrait.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/delegatedPropertyOverridedInTrait.lazy.log
index 93f06f6a47a..f2c3c8fb317 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/delegatedPropertyOverridedInTrait.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/delegatedPropertyOverridedInTrait.lazy.log
@@ -67,26 +67,25 @@ LazyJavaPackageFragment@14['lang'] {
 
 ResolutionTaskHolder@44 {
     <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
@@ -99,15 +98,6 @@ ResolutionTaskHolder@51 {
 
 ResolutionTaskHolder@55 {
     <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
@@ -118,61 +108,74 @@ ResolutionTaskHolder@55 {
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
+}
+
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
 }
 
 ResolutionTaskHolder@67 {
     <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
 }
 
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
 }
 
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
+ResolutionTaskHolder@73 {
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
+null {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@48 }
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/delegatedPropertyOverridedInTraitTypeMismatch.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/delegatedPropertyOverridedInTraitTypeMismatch.lazy.log
index 7fdc19230bf..7259c42d110 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/delegatedPropertyOverridedInTraitTypeMismatch.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/delegatedPropertyOverridedInTraitTypeMismatch.lazy.log
@@ -71,26 +71,25 @@ LazyJavaPackageFragment@15['lang'] {
 
 ResolutionTaskHolder@48 {
     <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+}
+
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
@@ -103,15 +102,6 @@ ResolutionTaskHolder@55 {
 
 ResolutionTaskHolder@59 {
     <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
@@ -122,61 +112,74 @@ ResolutionTaskHolder@59 {
     <name not found> = EmptyList@40[empty]
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
 }
 
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
+}
+
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
 }
 
 ResolutionTaskHolder@71 {
     <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
 }
 
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
 }
 
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
+ResolutionTaskHolder@77 {
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
 }
 
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
+null {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@52 }
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/genericGetter.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/genericGetter.lazy.log
index 35b5e84940a..c701e4951f3 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/genericGetter.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/genericGetter.lazy.log
@@ -33,21 +33,21 @@ LazyJavaClassifierType@19['String'] {
 
 LazyJavaClassifierType@22['String'] {
     arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@13['String']
+    classifier = JavaClassImpl@21['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
 
 LazyJavaClassifierType@25['String'] {
     arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@21['String']
+    classifier = JavaClassImpl@18['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@18['String']
+    classifier = JavaClassImpl@13['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
@@ -82,14 +82,14 @@ LazyJavaClassifierType@39['Throwable'] {
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@31['Throwable']
+    classifier = JavaClassImpl@38['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
 
 LazyJavaClassifierType@43['Throwable'] {
     arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@38['Throwable']
+    classifier = JavaClassImpl@31['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
@@ -166,74 +166,72 @@ LazyJavaPackageFragment@59['lang'] {
 
 ResolutionTaskHolder@90 {
     <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
 }
 
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
+}
+
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
 }
 
 ResolutionTaskHolder@101 {
     <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
 }
 
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
 }
 
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
+}
+
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
 }
 
 ResolutionTaskHolder@113 {
     <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
 }
 
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
 }
 
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
+ResolutionTaskHolder@119 {
+    <name not found> = ArrayList@120[4] { ResolutionCandidate@121, ResolutionCandidate@122, ResolutionCandidate@123, ... }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
 }
 
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@127 }
-}
-
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[4] { ResolutionCandidate@131, ResolutionCandidate@132, ResolutionCandidate@133, ... }
-    <name not found> = ArrayList@134[5] { ResolutionCandidate@131, ResolutionCandidate@132, ResolutionCandidate@133, ... }
+ResolutionTaskHolder@124 {
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
@@ -252,13 +250,18 @@ ResolutionTaskHolder@129 {
     <name not found> = EmptyList@82[empty]
 }
 
-ResolutionTaskHolder@135 {
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
+null {
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@135[5] { ResolutionCandidate@121, ResolutionCandidate@122, ResolutionCandidate@123, ... }
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/getterWithSubtype.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/getterWithSubtype.lazy.log
index accac4a7368..e36689fcd49 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/getterWithSubtype.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/getterWithSubtype.lazy.log
@@ -62,90 +62,58 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@41 {
     <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+}
+
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
 ResolutionTaskHolder@52 {
     <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
+}
+
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
 }
 
 ResolutionTaskHolder@64 {
     <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@70 {
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
@@ -171,3 +139,38 @@ ResolutionTaskHolder@80 {
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
+
+null {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@48 }
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/inTrait.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/inTrait.lazy.log
index 0d727c2777f..b89bfd4f522 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/inTrait.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/inTrait.lazy.log
@@ -56,26 +56,25 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@38 {
     <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -88,15 +87,6 @@ ResolutionTaskHolder@45 {
 
 ResolutionTaskHolder@49 {
     <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -107,49 +97,62 @@ ResolutionTaskHolder@49 {
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
+}
+
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
 }
 
 ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+null {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/incompleteTypeInference.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/incompleteTypeInference.lazy.log
index e0300b2ccf8..e1d1eb42f8d 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/incompleteTypeInference.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/incompleteTypeInference.lazy.log
@@ -60,26 +60,25 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@42 {
     <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+}
+
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
@@ -92,15 +91,6 @@ ResolutionTaskHolder@49 {
 
 ResolutionTaskHolder@53 {
     <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
@@ -111,83 +101,41 @@ ResolutionTaskHolder@53 {
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
+}
+
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
 
 ResolutionTaskHolder@65 {
     <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
+}
+
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
 }
 
 ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
@@ -222,7 +170,62 @@ ResolutionTaskHolder@89 {
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@90 {
+ResolutionTaskHolder@78 {
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+}
+
+null {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@46 }
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/inference/differentDelegatedExpressions.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/inference/differentDelegatedExpressions.lazy.log
index 6664ccf43bd..0c87f37f7d4 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/inference/differentDelegatedExpressions.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/inference/differentDelegatedExpressions.lazy.log
@@ -102,14 +102,6 @@ LazyJavaPackageFragment@39['lang'] {
 
 ResolutionTaskHolder@86 {
     <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -143,16 +135,8 @@ ResolutionTaskHolder@86 {
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -186,9 +170,8 @@ ResolutionTaskHolder@90 {
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -220,6 +203,34 @@ ResolutionTaskHolder@94 {
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
+}
+
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -231,14 +242,6 @@ ResolutionTaskHolder@94 {
 
 ResolutionTaskHolder@98 {
     <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -272,16 +275,8 @@ ResolutionTaskHolder@98 {
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -315,9 +310,8 @@ ResolutionTaskHolder@102 {
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -349,6 +343,34 @@ ResolutionTaskHolder@106 {
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
+}
+
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -360,14 +382,6 @@ ResolutionTaskHolder@106 {
 
 ResolutionTaskHolder@110 {
     <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -401,16 +415,8 @@ ResolutionTaskHolder@110 {
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
+ResolutionTaskHolder@113 {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -444,9 +450,8 @@ ResolutionTaskHolder@114 {
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -478,6 +483,34 @@ ResolutionTaskHolder@118 {
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
+}
+
+ResolutionTaskHolder@119 {
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -489,27 +522,6 @@ ResolutionTaskHolder@118 {
 
 ResolutionTaskHolder@122 {
     <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -530,39 +542,8 @@ ResolutionTaskHolder@122 {
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
+ResolutionTaskHolder@125 {
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -573,31 +554,8 @@ ResolutionTaskHolder@126 {
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@132 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
+ResolutionTaskHolder@128 {
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -606,6 +564,10 @@ ResolutionTaskHolder@130 {
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
+}
+
+ResolutionTaskHolder@131 {
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -618,56 +580,6 @@ ResolutionTaskHolder@130 {
 
 ResolutionTaskHolder@134 {
     <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@136 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@140 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -678,9 +590,8 @@ ResolutionTaskHolder@138 {
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@144 }
+ResolutionTaskHolder@137 {
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -689,6 +600,22 @@ ResolutionTaskHolder@142 {
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
+}
+
+ResolutionTaskHolder@140 {
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+}
+
+ResolutionTaskHolder@143 {
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -701,15 +628,6 @@ ResolutionTaskHolder@142 {
 
 ResolutionTaskHolder@146 {
     <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@148 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -720,17 +638,8 @@ ResolutionTaskHolder@146 {
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@152 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
+ResolutionTaskHolder@149 {
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -741,9 +650,8 @@ ResolutionTaskHolder@150 {
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@156 }
+ResolutionTaskHolder@152 {
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -752,6 +660,10 @@ ResolutionTaskHolder@154 {
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
+}
+
+ResolutionTaskHolder@155 {
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -764,15 +676,6 @@ ResolutionTaskHolder@154 {
 
 ResolutionTaskHolder@158 {
     <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@160 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -783,17 +686,8 @@ ResolutionTaskHolder@158 {
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@164 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
+ResolutionTaskHolder@161 {
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -804,9 +698,8 @@ ResolutionTaskHolder@162 {
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@166 {
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@168 }
+ResolutionTaskHolder@164 {
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -815,6 +708,10 @@ ResolutionTaskHolder@166 {
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
+}
+
+ResolutionTaskHolder@167 {
+    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -827,15 +724,6 @@ ResolutionTaskHolder@166 {
 
 ResolutionTaskHolder@170 {
     <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@172 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -846,17 +734,8 @@ ResolutionTaskHolder@170 {
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@174 {
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@176 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
+ResolutionTaskHolder@173 {
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -867,9 +746,8 @@ ResolutionTaskHolder@174 {
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@178 {
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@180 }
+ResolutionTaskHolder@176 {
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -878,6 +756,10 @@ ResolutionTaskHolder@178 {
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
+}
+
+ResolutionTaskHolder@179 {
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -890,15 +772,6 @@ ResolutionTaskHolder@178 {
 
 ResolutionTaskHolder@182 {
     <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@184 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -909,17 +782,8 @@ ResolutionTaskHolder@182 {
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@186 {
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@188 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
+ResolutionTaskHolder@185 {
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -930,9 +794,8 @@ ResolutionTaskHolder@186 {
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@190 {
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@192 }
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@192 }
+ResolutionTaskHolder@188 {
+    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -941,6 +804,10 @@ ResolutionTaskHolder@190 {
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
+}
+
+ResolutionTaskHolder@191 {
+    <name not found> = ArrayList@192[1] { ResolutionCandidate@193 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -953,15 +820,6 @@ ResolutionTaskHolder@190 {
 
 ResolutionTaskHolder@194 {
     <name not found> = ArrayList@195[1] { ResolutionCandidate@196 }
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@196 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -972,17 +830,8 @@ ResolutionTaskHolder@194 {
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@198 {
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@200 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
+ResolutionTaskHolder@197 {
+    <name not found> = ArrayList@198[1] { ResolutionCandidate@199 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -993,9 +842,8 @@ ResolutionTaskHolder@198 {
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@202 {
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@204 }
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@204 }
+ResolutionTaskHolder@200 {
+    <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -1004,6 +852,10 @@ ResolutionTaskHolder@202 {
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
+}
+
+ResolutionTaskHolder@203 {
+    <name not found> = ArrayList@204[1] { ResolutionCandidate@205 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -1016,15 +868,6 @@ ResolutionTaskHolder@202 {
 
 ResolutionTaskHolder@206 {
     <name not found> = ArrayList@207[1] { ResolutionCandidate@208 }
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@208 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -1035,17 +878,8 @@ ResolutionTaskHolder@206 {
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@210 {
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@212 }
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@212 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
+ResolutionTaskHolder@209 {
+    <name not found> = ArrayList@210[1] { ResolutionCandidate@211 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -1056,9 +890,8 @@ ResolutionTaskHolder@210 {
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@214 {
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@216 }
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@216 }
+ResolutionTaskHolder@212 {
+    <name not found> = ArrayList@213[1] { ResolutionCandidate@214 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -1067,6 +900,10 @@ ResolutionTaskHolder@214 {
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
+}
+
+ResolutionTaskHolder@215 {
+    <name not found> = ArrayList@216[1] { ResolutionCandidate@217 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -1079,15 +916,6 @@ ResolutionTaskHolder@214 {
 
 ResolutionTaskHolder@218 {
     <name not found> = ArrayList@219[1] { ResolutionCandidate@220 }
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@220 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -1098,17 +926,8 @@ ResolutionTaskHolder@218 {
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@222 {
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@224 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
+ResolutionTaskHolder@221 {
+    <name not found> = ArrayList@222[1] { ResolutionCandidate@223 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -1119,9 +938,8 @@ ResolutionTaskHolder@222 {
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@226 {
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@228 }
+ResolutionTaskHolder@224 {
+    <name not found> = ArrayList@225[1] { ResolutionCandidate@226 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -1130,6 +948,10 @@ ResolutionTaskHolder@226 {
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
+}
+
+ResolutionTaskHolder@227 {
+    <name not found> = ArrayList@228[1] { ResolutionCandidate@229 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -1142,15 +964,6 @@ ResolutionTaskHolder@226 {
 
 ResolutionTaskHolder@230 {
     <name not found> = ArrayList@231[1] { ResolutionCandidate@232 }
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@232 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -1161,17 +974,8 @@ ResolutionTaskHolder@230 {
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@234 {
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@236 }
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@236 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
+ResolutionTaskHolder@233 {
+    <name not found> = ArrayList@234[1] { ResolutionCandidate@235 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -1182,9 +986,8 @@ ResolutionTaskHolder@234 {
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@238 {
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@240 }
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@240 }
+ResolutionTaskHolder@236 {
+    <name not found> = ArrayList@237[1] { ResolutionCandidate@238 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -1193,6 +996,10 @@ ResolutionTaskHolder@238 {
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
+}
+
+ResolutionTaskHolder@239 {
+    <name not found> = ArrayList@240[1] { ResolutionCandidate@241 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -1205,15 +1012,6 @@ ResolutionTaskHolder@238 {
 
 ResolutionTaskHolder@242 {
     <name not found> = ArrayList@243[1] { ResolutionCandidate@244 }
-    <name not found> = ArrayList@245[1] { ResolutionCandidate@244 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -1224,17 +1022,8 @@ ResolutionTaskHolder@242 {
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@246 {
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@248 }
-    <name not found> = ArrayList@249[1] { ResolutionCandidate@248 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
+ResolutionTaskHolder@245 {
+    <name not found> = ArrayList@246[1] { ResolutionCandidate@247 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -1245,9 +1034,8 @@ ResolutionTaskHolder@246 {
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@250 {
-    <name not found> = ArrayList@251[1] { ResolutionCandidate@252 }
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@252 }
+ResolutionTaskHolder@248 {
+    <name not found> = ArrayList@249[1] { ResolutionCandidate@250 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -1256,6 +1044,10 @@ ResolutionTaskHolder@250 {
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
+}
+
+ResolutionTaskHolder@251 {
+    <name not found> = ArrayList@252[1] { ResolutionCandidate@253 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -1268,15 +1060,6 @@ ResolutionTaskHolder@250 {
 
 ResolutionTaskHolder@254 {
     <name not found> = ArrayList@255[1] { ResolutionCandidate@256 }
-    <name not found> = ArrayList@257[1] { ResolutionCandidate@256 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -1287,17 +1070,8 @@ ResolutionTaskHolder@254 {
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@258 {
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@260 }
-    <name not found> = ArrayList@261[1] { ResolutionCandidate@260 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
+ResolutionTaskHolder@257 {
+    <name not found> = ArrayList@258[1] { ResolutionCandidate@259 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -1308,9 +1082,8 @@ ResolutionTaskHolder@258 {
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@262 {
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@264 }
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@264 }
+ResolutionTaskHolder@260 {
+    <name not found> = ArrayList@261[1] { ResolutionCandidate@262 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -1319,6 +1092,10 @@ ResolutionTaskHolder@262 {
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
+}
+
+ResolutionTaskHolder@263 {
+    <name not found> = ArrayList@264[1] { ResolutionCandidate@265 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -1331,15 +1108,6 @@ ResolutionTaskHolder@262 {
 
 ResolutionTaskHolder@266 {
     <name not found> = ArrayList@267[1] { ResolutionCandidate@268 }
-    <name not found> = ArrayList@269[1] { ResolutionCandidate@268 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -1350,17 +1118,8 @@ ResolutionTaskHolder@266 {
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@270 {
-    <name not found> = ArrayList@271[1] { ResolutionCandidate@272 }
-    <name not found> = ArrayList@273[1] { ResolutionCandidate@272 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
+ResolutionTaskHolder@269 {
+    <name not found> = ArrayList@270[1] { ResolutionCandidate@271 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -1371,21 +1130,16 @@ ResolutionTaskHolder@270 {
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@274 {
-    <name not found> = ArrayList@275[1] { ResolutionCandidate@276 }
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@276 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
+ResolutionTaskHolder@272 {
+    <name not found> = ArrayList@273[1] { ResolutionCandidate@274 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
+}
+
+ResolutionTaskHolder@275 {
+    <name not found> = ArrayList@276[1] { ResolutionCandidate@277 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -1394,544 +1148,173 @@ ResolutionTaskHolder@274 {
 
 ResolutionTaskHolder@278 {
     <name not found> = ArrayList@279[1] { ResolutionCandidate@280 }
-    <name not found> = ArrayList@281[1] { ResolutionCandidate@280 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@282 {
-    <name not found> = ArrayList@283[1] { ResolutionCandidate@284 }
-    <name not found> = ArrayList@285[1] { ResolutionCandidate@284 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
+ResolutionTaskHolder@281 {
+    <name not found> = ArrayList@282[1] { ResolutionCandidate@283 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@286 {
-    <name not found> = ArrayList@287[1] { ResolutionCandidate@288 }
-    <name not found> = ArrayList@289[1] { ResolutionCandidate@288 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
+ResolutionTaskHolder@284 {
+    <name not found> = ArrayList@285[1] { ResolutionCandidate@286 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
+}
+
+ResolutionTaskHolder@287 {
+    <name not found> = ArrayList@288[1] { ResolutionCandidate@289 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
 }
 
 ResolutionTaskHolder@290 {
     <name not found> = ArrayList@291[1] { ResolutionCandidate@292 }
-    <name not found> = ArrayList@293[1] { ResolutionCandidate@292 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@294 {
-    <name not found> = ArrayList@295[1] { ResolutionCandidate@296 }
-    <name not found> = ArrayList@297[1] { ResolutionCandidate@296 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
+ResolutionTaskHolder@293 {
+    <name not found> = ArrayList@294[1] { ResolutionCandidate@295 }
 }
 
-ResolutionTaskHolder@298 {
-    <name not found> = ArrayList@299[1] { ResolutionCandidate@300 }
-    <name not found> = ArrayList@301[1] { ResolutionCandidate@300 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
+ResolutionTaskHolder@296 {
+    <name not found> = ArrayList@297[1] { ResolutionCandidate@298 }
+}
+
+ResolutionTaskHolder@299 {
+    <name not found> = ArrayList@300[1] { ResolutionCandidate@301 }
 }
 
 ResolutionTaskHolder@302 {
     <name not found> = ArrayList@303[1] { ResolutionCandidate@304 }
-    <name not found> = ArrayList@305[1] { ResolutionCandidate@304 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@306 {
-    <name not found> = ArrayList@307[1] { ResolutionCandidate@308 }
-    <name not found> = ArrayList@309[1] { ResolutionCandidate@308 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
+ResolutionTaskHolder@305 {
+    <name not found> = ArrayList@306[1] { ResolutionCandidate@307 }
 }
 
-ResolutionTaskHolder@310 {
-    <name not found> = ArrayList@311[1] { ResolutionCandidate@312 }
-    <name not found> = ArrayList@313[1] { ResolutionCandidate@312 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
+ResolutionTaskHolder@308 {
+    <name not found> = ArrayList@309[1] { ResolutionCandidate@310 }
+}
+
+ResolutionTaskHolder@311 {
+    <name not found> = ArrayList@312[1] { ResolutionCandidate@313 }
 }
 
 ResolutionTaskHolder@314 {
     <name not found> = ArrayList@315[1] { ResolutionCandidate@316 }
-    <name not found> = ArrayList@317[1] { ResolutionCandidate@316 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@318 {
-    <name not found> = ArrayList@319[1] { ResolutionCandidate@320 }
-    <name not found> = ArrayList@321[1] { ResolutionCandidate@320 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
+ResolutionTaskHolder@317 {
+    <name not found> = ArrayList@318[1] { ResolutionCandidate@319 }
 }
 
-ResolutionTaskHolder@322 {
-    <name not found> = ArrayList@323[1] { ResolutionCandidate@324 }
-    <name not found> = ArrayList@325[1] { ResolutionCandidate@324 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
+ResolutionTaskHolder@320 {
+    <name not found> = ArrayList@321[1] { ResolutionCandidate@322 }
+}
+
+ResolutionTaskHolder@323 {
+    <name not found> = ArrayList@324[1] { ResolutionCandidate@325 }
 }
 
 ResolutionTaskHolder@326 {
     <name not found> = ArrayList@327[1] { ResolutionCandidate@328 }
-    <name not found> = ArrayList@329[1] { ResolutionCandidate@328 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@330 {
-    <name not found> = ArrayList@331[1] { ResolutionCandidate@332 }
-    <name not found> = ArrayList@333[1] { ResolutionCandidate@332 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
+ResolutionTaskHolder@329 {
+    <name not found> = ArrayList@330[1] { ResolutionCandidate@331 }
 }
 
-ResolutionTaskHolder@334 {
-    <name not found> = ArrayList@335[1] { ResolutionCandidate@336 }
-    <name not found> = ArrayList@337[1] { ResolutionCandidate@336 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
+ResolutionTaskHolder@332 {
+    <name not found> = ArrayList@333[1] { ResolutionCandidate@334 }
+}
+
+ResolutionTaskHolder@335 {
+    <name not found> = ArrayList@336[1] { ResolutionCandidate@337 }
 }
 
 ResolutionTaskHolder@338 {
     <name not found> = ArrayList@339[1] { ResolutionCandidate@340 }
-    <name not found> = ArrayList@341[1] { ResolutionCandidate@340 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@342 {
-    <name not found> = ArrayList@343[1] { ResolutionCandidate@344 }
-    <name not found> = ArrayList@345[1] { ResolutionCandidate@344 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
+ResolutionTaskHolder@341 {
+    <name not found> = ArrayList@342[1] { ResolutionCandidate@343 }
 }
 
-ResolutionTaskHolder@346 {
-    <name not found> = ArrayList@347[1] { ResolutionCandidate@348 }
-    <name not found> = ArrayList@349[1] { ResolutionCandidate@348 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
+ResolutionTaskHolder@344 {
+    <name not found> = ArrayList@345[1] { ResolutionCandidate@346 }
+}
+
+ResolutionTaskHolder@347 {
+    <name not found> = ArrayList@348[1] { ResolutionCandidate@349 }
 }
 
 ResolutionTaskHolder@350 {
     <name not found> = ArrayList@351[1] { ResolutionCandidate@352 }
-    <name not found> = ArrayList@353[1] { ResolutionCandidate@352 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@354 {
-    <name not found> = ArrayList@355[1] { ResolutionCandidate@356 }
-    <name not found> = ArrayList@357[1] { ResolutionCandidate@356 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
+ResolutionTaskHolder@353 {
+    <name not found> = ArrayList@354[1] { ResolutionCandidate@355 }
 }
 
-ResolutionTaskHolder@358 {
-    <name not found> = ArrayList@359[1] { ResolutionCandidate@360 }
-    <name not found> = ArrayList@361[1] { ResolutionCandidate@360 }
+ResolutionTaskHolder@356 {
+    <name not found> = ArrayList@357[1] { ResolutionCandidate@358 }
+}
+
+ResolutionTaskHolder@359 {
+    <name not found> = ArrayList@360[1] { ResolutionCandidate@361 }
 }
 
 ResolutionTaskHolder@362 {
     <name not found> = ArrayList@363[1] { ResolutionCandidate@364 }
-    <name not found> = ArrayList@365[1] { ResolutionCandidate@364 }
 }
 
-ResolutionTaskHolder@366 {
-    <name not found> = ArrayList@367[1] { ResolutionCandidate@368 }
-    <name not found> = ArrayList@369[1] { ResolutionCandidate@368 }
+ResolutionTaskHolder@365 {
+    <name not found> = ArrayList@366[1] { ResolutionCandidate@367 }
 }
 
-ResolutionTaskHolder@370 {
-    <name not found> = ArrayList@371[1] { ResolutionCandidate@372 }
-    <name not found> = ArrayList@373[1] { ResolutionCandidate@372 }
+ResolutionTaskHolder@368 {
+    <name not found> = ArrayList@369[1] { ResolutionCandidate@370 }
+}
+
+ResolutionTaskHolder@371 {
+    <name not found> = ArrayList@372[1] { ResolutionCandidate@373 }
 }
 
 ResolutionTaskHolder@374 {
     <name not found> = ArrayList@375[1] { ResolutionCandidate@376 }
-    <name not found> = ArrayList@377[1] { ResolutionCandidate@376 }
 }
 
-ResolutionTaskHolder@378 {
-    <name not found> = ArrayList@379[1] { ResolutionCandidate@380 }
-    <name not found> = ArrayList@381[1] { ResolutionCandidate@380 }
+ResolutionTaskHolder@377 {
+    <name not found> = ArrayList@378[1] { ResolutionCandidate@379 }
 }
 
-ResolutionTaskHolder@382 {
-    <name not found> = ArrayList@383[1] { ResolutionCandidate@384 }
-    <name not found> = ArrayList@385[1] { ResolutionCandidate@384 }
+ResolutionTaskHolder@380 {
+    <name not found> = ArrayList@381[1] { ResolutionCandidate@382 }
+}
+
+ResolutionTaskHolder@383 {
+    <name not found> = ArrayList@384[1] { ResolutionCandidate@385 }
 }
 
 ResolutionTaskHolder@386 {
     <name not found> = ArrayList@387[1] { ResolutionCandidate@388 }
-    <name not found> = ArrayList@389[1] { ResolutionCandidate@388 }
 }
 
-ResolutionTaskHolder@390 {
-    <name not found> = ArrayList@391[1] { ResolutionCandidate@392 }
-    <name not found> = ArrayList@393[1] { ResolutionCandidate@392 }
+ResolutionTaskHolder@389 {
+    <name not found> = ArrayList@390[1] { ResolutionCandidate@391 }
 }
 
-ResolutionTaskHolder@394 {
-    <name not found> = ArrayList@395[1] { ResolutionCandidate@396 }
-    <name not found> = ArrayList@397[1] { ResolutionCandidate@396 }
-}
-
-ResolutionTaskHolder@398 {
-    <name not found> = ArrayList@399[1] { ResolutionCandidate@400 }
-    <name not found> = ArrayList@401[1] { ResolutionCandidate@400 }
-}
-
-ResolutionTaskHolder@402 {
-    <name not found> = ArrayList@403[1] { ResolutionCandidate@404 }
-    <name not found> = ArrayList@405[1] { ResolutionCandidate@404 }
-}
-
-ResolutionTaskHolder@406 {
-    <name not found> = ArrayList@407[1] { ResolutionCandidate@408 }
-    <name not found> = ArrayList@409[1] { ResolutionCandidate@408 }
-}
-
-ResolutionTaskHolder@410 {
-    <name not found> = ArrayList@411[1] { ResolutionCandidate@412 }
-    <name not found> = ArrayList@413[1] { ResolutionCandidate@412 }
-}
-
-ResolutionTaskHolder@414 {
-    <name not found> = ArrayList@415[1] { ResolutionCandidate@416 }
-    <name not found> = ArrayList@417[1] { ResolutionCandidate@416 }
-}
-
-ResolutionTaskHolder@418 {
-    <name not found> = ArrayList@419[1] { ResolutionCandidate@420 }
-    <name not found> = ArrayList@421[1] { ResolutionCandidate@420 }
-}
-
-ResolutionTaskHolder@422 {
-    <name not found> = ArrayList@423[1] { ResolutionCandidate@424 }
-    <name not found> = ArrayList@425[1] { ResolutionCandidate@424 }
-}
-
-ResolutionTaskHolder@426 {
-    <name not found> = ArrayList@427[1] { ResolutionCandidate@428 }
-    <name not found> = ArrayList@429[1] { ResolutionCandidate@428 }
-}
-
-ResolutionTaskHolder@430 {
-    <name not found> = ArrayList@431[1] { ResolutionCandidate@432 }
-    <name not found> = ArrayList@433[1] { ResolutionCandidate@432 }
-}
-
-ResolutionTaskHolder@434 {
-    <name not found> = ArrayList@435[1] { ResolutionCandidate@436 }
-    <name not found> = ArrayList@437[1] { ResolutionCandidate@436 }
-}
-
-ResolutionTaskHolder@438 {
-    <name not found> = ArrayList@439[1] { ResolutionCandidate@440 }
-    <name not found> = ArrayList@441[1] { ResolutionCandidate@440 }
-}
-
-ResolutionTaskHolder@442 {
-    <name not found> = ArrayList@443[1] { ResolutionCandidate@444 }
-    <name not found> = ArrayList@445[1] { ResolutionCandidate@444 }
-}
-
-ResolutionTaskHolder@446 {
-    <name not found> = ArrayList@447[1] { ResolutionCandidate@448 }
-    <name not found> = ArrayList@449[1] { ResolutionCandidate@448 }
-}
-
-ResolutionTaskHolder@450 {
-    <name not found> = ArrayList@451[1] { ResolutionCandidate@452 }
-    <name not found> = ArrayList@453[1] { ResolutionCandidate@452 }
-}
-
-ResolutionTaskHolder@454 {
-    <name not found> = ArrayList@455[1] { ResolutionCandidate@456 }
-    <name not found> = ArrayList@457[1] { ResolutionCandidate@456 }
-}
-
-ResolutionTaskHolder@458 {
-    <name not found> = ArrayList@459[1] { ResolutionCandidate@460 }
-    <name not found> = ArrayList@461[1] { ResolutionCandidate@460 }
-}
-
-ResolutionTaskHolder@462 {
-    <name not found> = ArrayList@463[1] { ResolutionCandidate@464 }
-    <name not found> = ArrayList@465[1] { ResolutionCandidate@464 }
-}
-
-ResolutionTaskHolder@466 {
-    <name not found> = ArrayList@467[1] { ResolutionCandidate@468 }
-    <name not found> = ArrayList@469[1] { ResolutionCandidate@468 }
-}
-
-ResolutionTaskHolder@470 {
-    <name not found> = ArrayList@471[1] { ResolutionCandidate@472 }
-    <name not found> = ArrayList@473[1] { ResolutionCandidate@472 }
-}
-
-ResolutionTaskHolder@474 {
-    <name not found> = ArrayList@475[1] { ResolutionCandidate@476 }
-    <name not found> = ArrayList@477[1] { ResolutionCandidate@476 }
-}
-
-ResolutionTaskHolder@478 {
-    <name not found> = ArrayList@479[1] { ResolutionCandidate@480 }
-    <name not found> = ArrayList@481[1] { ResolutionCandidate@480 }
-}
-
-ResolutionTaskHolder@482 {
-    <name not found> = ArrayList@483[1] { ResolutionCandidate@484 }
-    <name not found> = ArrayList@485[1] { ResolutionCandidate@484 }
-}
-
-ResolutionTaskHolder@486 {
-    <name not found> = ArrayList@487[1] { ResolutionCandidate@488 }
-    <name not found> = ArrayList@489[1] { ResolutionCandidate@488 }
-}
-
-ResolutionTaskHolder@490 {
-    <name not found> = ArrayList@491[1] { ResolutionCandidate@492 }
-    <name not found> = ArrayList@493[1] { ResolutionCandidate@492 }
-}
-
-ResolutionTaskHolder@494 {
-    <name not found> = ArrayList@495[2] { ResolutionCandidate@496, ResolutionCandidate@497 }
-    <name not found> = ArrayList@498[2] { ResolutionCandidate@496, ResolutionCandidate@497 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
+ResolutionTaskHolder@392 {
+    <name not found> = ArrayList@393[2] { ResolutionCandidate@394, ResolutionCandidate@395 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@499 {
+ResolutionTaskHolder@396 {
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -1964,6 +1347,33 @@ ResolutionTaskHolder@499 {
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
+}
+
+ResolutionTaskHolder@397 {
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -1974,15 +1384,7 @@ ResolutionTaskHolder@499 {
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@500 {
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
+ResolutionTaskHolder@398 {
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -2017,15 +1419,7 @@ ResolutionTaskHolder@500 {
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@501 {
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
+ResolutionTaskHolder@399 {
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -2060,15 +1454,7 @@ ResolutionTaskHolder@501 {
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@502 {
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
+ResolutionTaskHolder@400 {
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -2103,15 +1489,7 @@ ResolutionTaskHolder@502 {
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@503 {
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
+ResolutionTaskHolder@401 {
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -2146,7 +1524,632 @@ ResolutionTaskHolder@503 {
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@504 {
+null {
+    <name not found> = ArrayList@402[1] { ResolutionCandidate@124 }
+    <name not found> = ArrayList@403[1] { ResolutionCandidate@232 }
+    <name not found> = ArrayList@404[1] { ResolutionCandidate@286 }
+    <name not found> = ArrayList@405[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@406[1] { ResolutionCandidate@256 }
+    <name not found> = ArrayList@407[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@408[1] { ResolutionCandidate@151 }
+    <name not found> = ArrayList@409[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@410[1] { ResolutionCandidate@208 }
+    <name not found> = ArrayList@411[1] { ResolutionCandidate@316 }
+    <name not found> = ArrayList@412[1] { ResolutionCandidate@178 }
+    <name not found> = ArrayList@413[1] { ResolutionCandidate@367 }
+    <name not found> = ArrayList@414[1] { ResolutionCandidate@235 }
+    <name not found> = ArrayList@415[1] { ResolutionCandidate@166 }
+    <name not found> = ArrayList@416[1] { ResolutionCandidate@280 }
+    <name not found> = ArrayList@417[1] { ResolutionCandidate@244 }
+    <name not found> = ArrayList@418[1] { ResolutionCandidate@190 }
+    <name not found> = ArrayList@419[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@420[1] { ResolutionCandidate@127 }
+    <name not found> = ArrayList@421[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@422[1] { ResolutionCandidate@199 }
+    <name not found> = ArrayList@423[1] { ResolutionCandidate@334 }
+    <name not found> = ArrayList@424[1] { ResolutionCandidate@223 }
+    <name not found> = ArrayList@425[1] { ResolutionCandidate@382 }
+    <name not found> = ArrayList@426[1] { ResolutionCandidate@175 }
+    <name not found> = ArrayList@427[1] { ResolutionCandidate@274 }
+    <name not found> = ArrayList@428[1] { ResolutionCandidate@277 }
+    <name not found> = ArrayList@429[1] { ResolutionCandidate@154 }
+    <name not found> = ArrayList@430[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@431[1] { ResolutionCandidate@184 }
+    <name not found> = ArrayList@432[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@433[1] { ResolutionCandidate@148 }
+    <name not found> = ArrayList@434[1] { ResolutionCandidate@295 }
+    <name not found> = ArrayList@435[1] { ResolutionCandidate@238 }
+    <name not found> = ArrayList@436[1] { ResolutionCandidate@328 }
+    <name not found> = ArrayList@437[1] { ResolutionCandidate@202 }
+    <name not found> = ArrayList@438[1] { ResolutionCandidate@388 }
+    <name not found> = ArrayList@439[1] { ResolutionCandidate@364 }
+    <name not found> = ArrayList@440[1] { ResolutionCandidate@325 }
+    <name not found> = ArrayList@441[1] { ResolutionCandidate@250 }
+    <name not found> = ArrayList@442[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@443[1] { ResolutionCandidate@211 }
+    <name not found> = ArrayList@444[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@445[1] { ResolutionCandidate@187 }
+    <name not found> = ArrayList@446[1] { ResolutionCandidate@304 }
+    <name not found> = ArrayList@447[1] { ResolutionCandidate@169 }
+    <name not found> = ArrayList@448[1] { ResolutionCandidate@352 }
+    <name not found> = ArrayList@449[1] { ResolutionCandidate@229 }
+    <name not found> = ArrayList@450[1] { ResolutionCandidate@205 }
+    <name not found> = ArrayList@451[1] { ResolutionCandidate@289 }
+    <name not found> = ArrayList@452[1] { ResolutionCandidate@133 }
+    <name not found> = ArrayList@453[1] { ResolutionCandidate@283 }
+    <name not found> = ArrayList@454[1] { ResolutionCandidate@157 }
+    <name not found> = ArrayList@455[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@456[1] { ResolutionCandidate@262 }
+    <name not found> = ArrayList@457[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@458[1] { ResolutionCandidate@220 }
+    <name not found> = ArrayList@459[1] { ResolutionCandidate@298 }
+    <name not found> = ArrayList@460[1] { ResolutionCandidate@259 }
+    <name not found> = ArrayList@461[1] { ResolutionCandidate@319 }
+    <name not found> = ArrayList@462[1] { ResolutionCandidate@181 }
+    <name not found> = ArrayList@463[1] { ResolutionCandidate@337 }
+    <name not found> = ArrayList@464[1] { ResolutionCandidate@313 }
+    <name not found> = ArrayList@465[1] { ResolutionCandidate@301 }
+    <name not found> = ArrayList@466[1] { ResolutionCandidate@142 }
+    <name not found> = ArrayList@467[1] { ResolutionCandidate@241 }
+    <name not found> = ArrayList@468[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@469[1] { ResolutionCandidate@139 }
+    <name not found> = ArrayList@470[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@471[1] { ResolutionCandidate@214 }
+    <name not found> = ArrayList@472[1] { ResolutionCandidate@349 }
+    <name not found> = ArrayList@473[1] { ResolutionCandidate@172 }
+    <name not found> = ArrayList@474[1] { ResolutionCandidate@373 }
+    <name not found> = ArrayList@475[1] { ResolutionCandidate@265 }
+    <name not found> = ArrayList@476[1] { ResolutionCandidate@253 }
+    <name not found> = ArrayList@477[1] { ResolutionCandidate@193 }
+    <name not found> = ArrayList@478[1] { ResolutionCandidate@355 }
+    <name not found> = ArrayList@479[1] { ResolutionCandidate@160 }
+    <name not found> = ArrayList@480[1] { ResolutionCandidate@379 }
+    <name not found> = ArrayList@481[1] { ResolutionCandidate@247 }
+    <name not found> = ArrayList@482[1] { ResolutionCandidate@343 }
+    <name not found> = ArrayList@483[1] { ResolutionCandidate@163 }
+    <name not found> = ArrayList@484[1] { ResolutionCandidate@307 }
+    <name not found> = ArrayList@485[1] { ResolutionCandidate@196 }
+    <name not found> = ArrayList@486[1] { ResolutionCandidate@271 }
+    <name not found> = ArrayList@487[1] { ResolutionCandidate@361 }
+    <name not found> = ArrayList@488[1] { ResolutionCandidate@226 }
+    <name not found> = ArrayList@489[1] { ResolutionCandidate@340 }
+    <name not found> = ArrayList@490[1] { ResolutionCandidate@136 }
+    <name not found> = ArrayList@491[1] { ResolutionCandidate@322 }
+    <name not found> = ArrayList@492[1] { ResolutionCandidate@268 }
+    <name not found> = ArrayList@493[1] { ResolutionCandidate@370 }
+    <name not found> = ArrayList@494[1] { ResolutionCandidate@385 }
+    <name not found> = ArrayList@495[1] { ResolutionCandidate@292 }
+    <name not found> = ArrayList@496[1] { ResolutionCandidate@310 }
+    <name not found> = ArrayList@497[1] { ResolutionCandidate@358 }
+    <name not found> = ArrayList@498[1] { ResolutionCandidate@145 }
+    <name not found> = ArrayList@499[1] { ResolutionCandidate@376 }
+    <name not found> = ArrayList@500[1] { ResolutionCandidate@346 }
+    <name not found> = ArrayList@501[1] { ResolutionCandidate@391 }
+    <name not found> = ArrayList@502[1] { ResolutionCandidate@331 }
+    <name not found> = ArrayList@503[1] { ResolutionCandidate@217 }
+    <name not found> = ArrayList@504[2] { ResolutionCandidate@394, ResolutionCandidate@395 }
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/inference/extensionGet.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/inference/extensionGet.lazy.log
index 22c774d95a0..0899205956d 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/inference/extensionGet.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/inference/extensionGet.lazy.log
@@ -33,21 +33,21 @@ LazyJavaClassifierType@19['String'] {
 
 LazyJavaClassifierType@22['String'] {
     arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@18['String']
+    classifier = JavaClassImpl@13['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
 
 LazyJavaClassifierType@25['String'] {
     arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@13['String']
+    classifier = JavaClassImpl@21['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@21['String']
+    classifier = JavaClassImpl@18['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
@@ -82,14 +82,14 @@ LazyJavaClassifierType@39['Throwable'] {
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@38['Throwable']
+    classifier = JavaClassImpl@35['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
 
 LazyJavaClassifierType@43['Throwable'] {
     arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@35['Throwable']
+    classifier = JavaClassImpl@38['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
@@ -170,15 +170,6 @@ LazyJavaPackageFragment@71['lang'] {
 
 ResolutionTaskHolder@105 {
     <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
@@ -189,17 +180,8 @@ ResolutionTaskHolder@105 {
     <name not found> = EmptyList@94[empty]
 }
 
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
@@ -210,9 +192,8 @@ ResolutionTaskHolder@109 {
     <name not found> = EmptyList@94[empty]
 }
 
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
+ResolutionTaskHolder@111 {
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
@@ -221,6 +202,10 @@ ResolutionTaskHolder@113 {
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
+}
+
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
@@ -233,15 +218,6 @@ ResolutionTaskHolder@113 {
 
 ResolutionTaskHolder@117 {
     <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
@@ -252,17 +228,8 @@ ResolutionTaskHolder@117 {
     <name not found> = EmptyList@94[empty]
 }
 
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
+ResolutionTaskHolder@120 {
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
@@ -273,9 +240,8 @@ ResolutionTaskHolder@121 {
     <name not found> = EmptyList@94[empty]
 }
 
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@127 }
+ResolutionTaskHolder@123 {
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
@@ -284,6 +250,10 @@ ResolutionTaskHolder@125 {
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
+}
+
+ResolutionTaskHolder@126 {
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
@@ -296,15 +266,6 @@ ResolutionTaskHolder@125 {
 
 ResolutionTaskHolder@129 {
     <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@131 }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
@@ -315,17 +276,8 @@ ResolutionTaskHolder@129 {
     <name not found> = EmptyList@94[empty]
 }
 
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@135 }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
+ResolutionTaskHolder@132 {
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
@@ -336,15 +288,8 @@ ResolutionTaskHolder@133 {
     <name not found> = EmptyList@94[empty]
 }
 
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@139 }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
+ResolutionTaskHolder@135 {
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
@@ -353,103 +298,79 @@ ResolutionTaskHolder@137 {
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
+}
+
+ResolutionTaskHolder@138 {
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
 }
 
 ResolutionTaskHolder@141 {
     <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@143 }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
 }
 
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@147 }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
+ResolutionTaskHolder@144 {
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
 }
 
-ResolutionTaskHolder@149 {
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@151 }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
+ResolutionTaskHolder@147 {
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
+}
+
+ResolutionTaskHolder@150 {
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
 }
 
 ResolutionTaskHolder@153 {
     <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@155 }
+}
+
+ResolutionTaskHolder@156 {
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
+}
+
+ResolutionTaskHolder@159 {
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
+}
+
+ResolutionTaskHolder@162 {
+    <name not found> = ArrayList@163[2] { ResolutionCandidate@164, ResolutionCandidate@165 }
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+}
+
+ResolutionTaskHolder@166 {
+    <name not found> = ArrayList@167[2] { ResolutionCandidate@168, ResolutionCandidate@169 }
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+}
+
+ResolutionTaskHolder@170 {
+    <name not found> = ArrayList@171[2] { ResolutionCandidate@172, ResolutionCandidate@173 }
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+}
+
+ResolutionTaskHolder@174 {
+    <name not found> = ArrayList@175[4] { ResolutionCandidate@176, ResolutionCandidate@177, ResolutionCandidate@178, ... }
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
-}
-
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@159 }
-}
-
-ResolutionTaskHolder@161 {
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@163 }
-}
-
-ResolutionTaskHolder@165 {
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@167 }
-}
-
-ResolutionTaskHolder@169 {
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@171 }
-}
-
-ResolutionTaskHolder@173 {
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@175 }
-}
-
-ResolutionTaskHolder@177 {
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@179 }
-}
-
-ResolutionTaskHolder@181 {
-    <name not found> = ArrayList@182[2] { ResolutionCandidate@183, ResolutionCandidate@184 }
-    <name not found> = ArrayList@185[2] { ResolutionCandidate@183, ResolutionCandidate@184 }
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
@@ -458,9 +379,92 @@ ResolutionTaskHolder@181 {
     <name not found> = EmptyList@94[empty]
 }
 
-ResolutionTaskHolder@186 {
-    <name not found> = ArrayList@187[2] { ResolutionCandidate@188, ResolutionCandidate@189 }
-    <name not found> = ArrayList@190[2] { ResolutionCandidate@188, ResolutionCandidate@189 }
+ResolutionTaskHolder@179 {
+    <name not found> = ArrayList@180[4] { ResolutionCandidate@181, ResolutionCandidate@182, ResolutionCandidate@183, ... }
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+}
+
+ResolutionTaskHolder@184 {
+    <name not found> = ArrayList@185[4] { ResolutionCandidate@186, ResolutionCandidate@187, ResolutionCandidate@188, ... }
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+}
+
+ResolutionTaskHolder@189 {
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+}
+
+ResolutionTaskHolder@190 {
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
@@ -470,23 +474,6 @@ ResolutionTaskHolder@186 {
 }
 
 ResolutionTaskHolder@191 {
-    <name not found> = ArrayList@192[2] { ResolutionCandidate@193, ResolutionCandidate@194 }
-    <name not found> = ArrayList@195[2] { ResolutionCandidate@193, ResolutionCandidate@194 }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-}
-
-ResolutionTaskHolder@196 {
-    <name not found> = ArrayList@197[4] { ResolutionCandidate@198, ResolutionCandidate@199, ResolutionCandidate@200, ... }
-    <name not found> = ArrayList@201[5] { ResolutionCandidate@198, ResolutionCandidate@199, ResolutionCandidate@200, ... }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
@@ -521,9 +508,119 @@ ResolutionTaskHolder@196 {
     <name not found> = EmptyList@94[empty]
 }
 
-ResolutionTaskHolder@202 {
-    <name not found> = ArrayList@203[4] { ResolutionCandidate@204, ResolutionCandidate@205, ResolutionCandidate@206, ... }
-    <name not found> = ArrayList@207[5] { ResolutionCandidate@204, ResolutionCandidate@205, ResolutionCandidate@206, ... }
+null {
+    <name not found> = ArrayList@192[1] { ResolutionCandidate@122 }
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@128 }
+    <name not found> = ArrayList@194[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@137 }
+    <name not found> = ArrayList@196[1] { ResolutionCandidate@134 }
+    <name not found> = ArrayList@197[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@198[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@125 }
+    <name not found> = ArrayList@200[1] { ResolutionCandidate@113 }
+    <name not found> = ArrayList@201[1] { ResolutionCandidate@143 }
+    <name not found> = ArrayList@202[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@203[1] { ResolutionCandidate@140 }
+    <name not found> = ArrayList@204[1] { ResolutionCandidate@131 }
+    <name not found> = ArrayList@205[1] { ResolutionCandidate@149 }
+    <name not found> = ArrayList@206[1] { ResolutionCandidate@161 }
+    <name not found> = ArrayList@207[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@208[1] { ResolutionCandidate@146 }
+    <name not found> = ArrayList@209[1] { ResolutionCandidate@152 }
+    <name not found> = ArrayList@210[1] { ResolutionCandidate@155 }
+    <name not found> = ArrayList@211[2] { ResolutionCandidate@172, ResolutionCandidate@173 }
+    <name not found> = ArrayList@212[2] { ResolutionCandidate@168, ResolutionCandidate@169 }
+    <name not found> = ArrayList@213[2] { ResolutionCandidate@164, ResolutionCandidate@165 }
+    <name not found> = ArrayList@214[5] { ResolutionCandidate@186, ResolutionCandidate@187, ResolutionCandidate@188, ... }
+    <name not found> = ArrayList@215[5] { ResolutionCandidate@181, ResolutionCandidate@182, ResolutionCandidate@183, ... }
+    <name not found> = ArrayList@216[5] { ResolutionCandidate@176, ResolutionCandidate@177, ResolutionCandidate@178, ... }
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
@@ -540,11 +637,6 @@ ResolutionTaskHolder@202 {
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
-}
-
-ResolutionTaskHolder@208 {
-    <name not found> = ArrayList@209[4] { ResolutionCandidate@210, ResolutionCandidate@211, ResolutionCandidate@212, ... }
-    <name not found> = ArrayList@213[5] { ResolutionCandidate@210, ResolutionCandidate@211, ResolutionCandidate@212, ... }
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
@@ -561,95 +653,6 @@ ResolutionTaskHolder@208 {
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
-}
-
-ResolutionTaskHolder@214 {
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-}
-
-ResolutionTaskHolder@215 {
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-}
-
-ResolutionTaskHolder@216 {
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/inference/extensionProperty.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/inference/extensionProperty.lazy.log
index 1760bd7fbdf..0705ce4545d 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/inference/extensionProperty.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/inference/extensionProperty.lazy.log
@@ -33,14 +33,14 @@ LazyJavaClassifierType@19['String'] {
 
 LazyJavaClassifierType@22['String'] {
     arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@13['String']
+    classifier = JavaClassImpl@18['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
 
 LazyJavaClassifierType@25['String'] {
     arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@18['String']
+    classifier = JavaClassImpl@13['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
@@ -75,7 +75,7 @@ LazyJavaClassifierType@36['Throwable'] {
 
 LazyJavaClassifierType@39['Throwable'] {
     arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@38['Throwable']
+    classifier = JavaClassImpl@35['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
@@ -89,7 +89,7 @@ LazyJavaClassifierType@41['Throwable'] {
 
 LazyJavaClassifierType@43['Throwable'] {
     arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@35['Throwable']
+    classifier = JavaClassImpl@38['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
@@ -162,16 +162,6 @@ LazyJavaPackageFragment@69['lang'] {
 
 ResolutionTaskHolder@99 {
     <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
@@ -213,18 +203,8 @@ ResolutionTaskHolder@99 {
     <name not found> = EmptyList@90[empty]
 }
 
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
     <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
@@ -266,9 +246,8 @@ ResolutionTaskHolder@103 {
     <name not found> = EmptyList@90[empty]
 }
 
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
     <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
@@ -300,6 +279,34 @@ ResolutionTaskHolder@107 {
     <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
+}
+
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
@@ -311,27 +318,6 @@ ResolutionTaskHolder@107 {
 
 ResolutionTaskHolder@111 {
     <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@113 }
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
@@ -352,27 +338,8 @@ ResolutionTaskHolder@111 {
     <name not found> = EmptyList@90[empty]
 }
 
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@117 }
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
     <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
@@ -393,9 +360,8 @@ ResolutionTaskHolder@115 {
     <name not found> = EmptyList@90[empty]
 }
 
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@121 }
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
     <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
@@ -414,6 +380,10 @@ ResolutionTaskHolder@119 {
     <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
+}
+
+ResolutionTaskHolder@120 {
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
     <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
@@ -436,25 +406,6 @@ ResolutionTaskHolder@119 {
 
 ResolutionTaskHolder@123 {
     <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@125 }
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
@@ -475,27 +426,8 @@ ResolutionTaskHolder@123 {
     <name not found> = EmptyList@90[empty]
 }
 
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@129 }
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
+ResolutionTaskHolder@126 {
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
     <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
@@ -516,29 +448,8 @@ ResolutionTaskHolder@127 {
     <name not found> = EmptyList@90[empty]
 }
 
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@133 }
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
+ResolutionTaskHolder@129 {
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
     <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
@@ -547,6 +458,10 @@ ResolutionTaskHolder@131 {
     <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
+}
+
+ResolutionTaskHolder@132 {
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
     <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
@@ -559,56 +474,6 @@ ResolutionTaskHolder@131 {
 
 ResolutionTaskHolder@135 {
     <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@137 }
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-}
-
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@141 }
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
@@ -619,9 +484,8 @@ ResolutionTaskHolder@139 {
     <name not found> = EmptyList@90[empty]
 }
 
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@145 }
+ResolutionTaskHolder@138 {
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
     <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
@@ -630,6 +494,22 @@ ResolutionTaskHolder@143 {
     <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
+}
+
+ResolutionTaskHolder@141 {
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+}
+
+ResolutionTaskHolder@144 {
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
     <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
@@ -642,15 +522,6 @@ ResolutionTaskHolder@143 {
 
 ResolutionTaskHolder@147 {
     <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@149 }
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
@@ -661,17 +532,8 @@ ResolutionTaskHolder@147 {
     <name not found> = EmptyList@90[empty]
 }
 
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@153 }
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
+ResolutionTaskHolder@150 {
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
     <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
@@ -682,159 +544,52 @@ ResolutionTaskHolder@151 {
     <name not found> = EmptyList@90[empty]
 }
 
-ResolutionTaskHolder@155 {
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@157 }
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
+ResolutionTaskHolder@153 {
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
     <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
+}
+
+ResolutionTaskHolder@156 {
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
     <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
 }
 
 ResolutionTaskHolder@159 {
     <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@161 }
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
 }
 
-ResolutionTaskHolder@163 {
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@165 }
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
+ResolutionTaskHolder@162 {
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
 }
 
-ResolutionTaskHolder@167 {
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@169 }
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
+ResolutionTaskHolder@165 {
+    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
+}
+
+ResolutionTaskHolder@168 {
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
 }
 
 ResolutionTaskHolder@171 {
     <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@173 }
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
 }
 
-ResolutionTaskHolder@175 {
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@177 }
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
+ResolutionTaskHolder@174 {
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
 }
 
-ResolutionTaskHolder@179 {
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@181 }
+ResolutionTaskHolder@177 {
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
+}
+
+ResolutionTaskHolder@180 {
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
 }
 
 ResolutionTaskHolder@183 {
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@185 }
-}
-
-ResolutionTaskHolder@187 {
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@189 }
-}
-
-ResolutionTaskHolder@191 {
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@193 }
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@193 }
-}
-
-ResolutionTaskHolder@195 {
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@197 }
-}
-
-ResolutionTaskHolder@199 {
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@201 }
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@201 }
-}
-
-ResolutionTaskHolder@203 {
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@205 }
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@205 }
-}
-
-ResolutionTaskHolder@207 {
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@209 }
-}
-
-ResolutionTaskHolder@211 {
-    <name not found> = ArrayList@212[4] { ResolutionCandidate@213, ResolutionCandidate@214, ResolutionCandidate@215, ... }
-    <name not found> = ArrayList@216[5] { ResolutionCandidate@213, ResolutionCandidate@214, ResolutionCandidate@215, ... }
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
+    <name not found> = ArrayList@184[4] { ResolutionCandidate@185, ResolutionCandidate@186, ResolutionCandidate@187, ... }
     <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
@@ -845,17 +600,7 @@ ResolutionTaskHolder@211 {
     <name not found> = EmptyList@90[empty]
 }
 
-ResolutionTaskHolder@217 {
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
+ResolutionTaskHolder@188 {
     <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
@@ -898,7 +643,265 @@ ResolutionTaskHolder@217 {
     <name not found> = EmptyList@90[empty]
 }
 
-ResolutionTaskHolder@218 {
+ResolutionTaskHolder@189 {
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+}
+
+null {
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@149 }
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@192[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@128 }
+    <name not found> = ArrayList@194[1] { ResolutionCandidate@182 }
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@196[1] { ResolutionCandidate@161 }
+    <name not found> = ArrayList@197[1] { ResolutionCandidate@146 }
+    <name not found> = ArrayList@198[1] { ResolutionCandidate@122 }
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@200[1] { ResolutionCandidate@125 }
+    <name not found> = ArrayList@201[1] { ResolutionCandidate@170 }
+    <name not found> = ArrayList@202[1] { ResolutionCandidate@113 }
+    <name not found> = ArrayList@203[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@204[1] { ResolutionCandidate@140 }
+    <name not found> = ArrayList@205[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@206[1] { ResolutionCandidate@152 }
+    <name not found> = ArrayList@207[1] { ResolutionCandidate@167 }
+    <name not found> = ArrayList@208[1] { ResolutionCandidate@137 }
+    <name not found> = ArrayList@209[1] { ResolutionCandidate@164 }
+    <name not found> = ArrayList@210[1] { ResolutionCandidate@155 }
+    <name not found> = ArrayList@211[1] { ResolutionCandidate@134 }
+    <name not found> = ArrayList@212[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@213[1] { ResolutionCandidate@143 }
+    <name not found> = ArrayList@214[1] { ResolutionCandidate@176 }
+    <name not found> = ArrayList@215[1] { ResolutionCandidate@131 }
+    <name not found> = ArrayList@216[1] { ResolutionCandidate@173 }
+    <name not found> = ArrayList@217[1] { ResolutionCandidate@179 }
+    <name not found> = ArrayList@218[5] { ResolutionCandidate@185, ResolutionCandidate@186, ResolutionCandidate@187, ... }
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/inference/labeledDelegatedExpression.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/inference/labeledDelegatedExpression.lazy.log
index 3e6a764a80e..9950c9265cd 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/inference/labeledDelegatedExpression.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/inference/labeledDelegatedExpression.lazy.log
@@ -40,14 +40,14 @@ LazyJavaClassifierType@22['String'] {
 
 LazyJavaClassifierType@25['String'] {
     arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@18['String']
+    classifier = JavaClassImpl@21['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@21['String']
+    classifier = JavaClassImpl@18['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
@@ -75,14 +75,14 @@ LazyJavaClassifierType@36['Throwable'] {
 
 LazyJavaClassifierType@39['Throwable'] {
     arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@38['Throwable']
+    classifier = JavaClassImpl@31['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@31['Throwable']
+    classifier = JavaClassImpl@38['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
@@ -164,15 +164,6 @@ LazyJavaPackageFragment@59['lang'] {
 
 ResolutionTaskHolder@91 {
     <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
@@ -183,17 +174,8 @@ ResolutionTaskHolder@91 {
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
@@ -204,9 +186,8 @@ ResolutionTaskHolder@95 {
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
@@ -215,6 +196,10 @@ ResolutionTaskHolder@99 {
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
+}
+
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
@@ -227,60 +212,47 @@ ResolutionTaskHolder@99 {
 
 ResolutionTaskHolder@103 {
     <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@113 }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
+}
+
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
 }
 
 ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@116[4] { ResolutionCandidate@117, ResolutionCandidate@118, ResolutionCandidate@119, ... }
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@121 }
-}
-
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[4] { ResolutionCandidate@125, ResolutionCandidate@126, ResolutionCandidate@127, ... }
-    <name not found> = ArrayList@128[5] { ResolutionCandidate@125, ResolutionCandidate@126, ResolutionCandidate@127, ... }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
+ResolutionTaskHolder@120 {
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
@@ -315,7 +287,38 @@ ResolutionTaskHolder@123 {
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@129 {
+null {
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@129[5] { ResolutionCandidate@117, ResolutionCandidate@118, ResolutionCandidate@119, ... }
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/inference/noErrorsForImplicitConstraints.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/inference/noErrorsForImplicitConstraints.lazy.log
index 04ebacd2347..a7aff13eae2 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/inference/noErrorsForImplicitConstraints.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/inference/noErrorsForImplicitConstraints.lazy.log
@@ -46,14 +46,14 @@ LazyJavaClassifierType@26['String'] {
 
 LazyJavaClassifierType@29['String'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@22['String']
+    classifier = JavaClassImpl@25['String']
     nullable = 'true': Boolean@28
     typeConstructor = DeserializedClassTypeConstructor@19
 }
 
 LazyJavaClassifierType@31['String'] {
     arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@25['String']
+    classifier = JavaClassImpl@22['String']
     nullable = 'true': Boolean@28
     typeConstructor = DeserializedClassTypeConstructor@19
 }
@@ -81,21 +81,21 @@ LazyJavaClassifierType@40['Throwable'] {
 
 LazyJavaClassifierType@43['Throwable'] {
     arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@42['Throwable']
+    classifier = JavaClassImpl@39['Throwable']
     nullable = 'true': Boolean@28
     typeConstructor = DeserializedClassTypeConstructor@36
 }
 
 LazyJavaClassifierType@45['Throwable'] {
     arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@35['Throwable']
+    classifier = JavaClassImpl@42['Throwable']
     nullable = 'true': Boolean@28
     typeConstructor = DeserializedClassTypeConstructor@36
 }
 
 LazyJavaClassifierType@47['Throwable'] {
     arguments = ArrayList@48[empty]
-    classifier = JavaClassImpl@39['Throwable']
+    classifier = JavaClassImpl@35['Throwable']
     nullable = 'true': Boolean@28
     typeConstructor = DeserializedClassTypeConstructor@36
 }
@@ -185,14 +185,6 @@ LazyJavaPackageFragment@76['lang'] {
 
 ResolutionTaskHolder@115 {
     <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@117 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
@@ -226,16 +218,8 @@ ResolutionTaskHolder@115 {
     <name not found> = EmptyList@101[empty]
 }
 
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@121 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
+ResolutionTaskHolder@118 {
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
@@ -269,9 +253,8 @@ ResolutionTaskHolder@119 {
     <name not found> = EmptyList@101[empty]
 }
 
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@125 }
+ResolutionTaskHolder@121 {
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
@@ -303,6 +286,34 @@ ResolutionTaskHolder@123 {
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
+}
+
+ResolutionTaskHolder@124 {
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
@@ -314,14 +325,6 @@ ResolutionTaskHolder@123 {
 
 ResolutionTaskHolder@127 {
     <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@129 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
@@ -355,16 +358,8 @@ ResolutionTaskHolder@127 {
     <name not found> = EmptyList@101[empty]
 }
 
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@133 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
+ResolutionTaskHolder@130 {
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
@@ -398,9 +393,8 @@ ResolutionTaskHolder@131 {
     <name not found> = EmptyList@101[empty]
 }
 
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@137 }
+ResolutionTaskHolder@133 {
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
@@ -432,6 +426,34 @@ ResolutionTaskHolder@135 {
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
+}
+
+ResolutionTaskHolder@136 {
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
@@ -443,14 +465,6 @@ ResolutionTaskHolder@135 {
 
 ResolutionTaskHolder@139 {
     <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@141 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
@@ -484,16 +498,8 @@ ResolutionTaskHolder@139 {
     <name not found> = EmptyList@101[empty]
 }
 
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@145 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
+ResolutionTaskHolder@142 {
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
@@ -527,31 +533,8 @@ ResolutionTaskHolder@143 {
     <name not found> = EmptyList@101[empty]
 }
 
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@149 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
+ResolutionTaskHolder@145 {
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
@@ -560,6 +543,10 @@ ResolutionTaskHolder@147 {
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
+}
+
+ResolutionTaskHolder@148 {
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
@@ -572,58 +559,6 @@ ResolutionTaskHolder@147 {
 
 ResolutionTaskHolder@151 {
     <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@153 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-}
-
-ResolutionTaskHolder@155 {
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@157 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
@@ -634,9 +569,8 @@ ResolutionTaskHolder@155 {
     <name not found> = EmptyList@101[empty]
 }
 
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@161 }
+ResolutionTaskHolder@154 {
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
@@ -645,6 +579,22 @@ ResolutionTaskHolder@159 {
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
+}
+
+ResolutionTaskHolder@157 {
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+}
+
+ResolutionTaskHolder@160 {
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
@@ -657,15 +607,6 @@ ResolutionTaskHolder@159 {
 
 ResolutionTaskHolder@163 {
     <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@165 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
@@ -676,17 +617,8 @@ ResolutionTaskHolder@163 {
     <name not found> = EmptyList@101[empty]
 }
 
-ResolutionTaskHolder@167 {
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@169 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
+ResolutionTaskHolder@166 {
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
@@ -697,9 +629,8 @@ ResolutionTaskHolder@167 {
     <name not found> = EmptyList@101[empty]
 }
 
-ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@173 }
+ResolutionTaskHolder@169 {
+    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
@@ -708,6 +639,10 @@ ResolutionTaskHolder@171 {
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
+}
+
+ResolutionTaskHolder@172 {
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
@@ -720,15 +655,6 @@ ResolutionTaskHolder@171 {
 
 ResolutionTaskHolder@175 {
     <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@177 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
@@ -739,17 +665,8 @@ ResolutionTaskHolder@175 {
     <name not found> = EmptyList@101[empty]
 }
 
-ResolutionTaskHolder@179 {
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@181 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
+ResolutionTaskHolder@178 {
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
@@ -760,9 +677,8 @@ ResolutionTaskHolder@179 {
     <name not found> = EmptyList@101[empty]
 }
 
-ResolutionTaskHolder@183 {
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@185 }
+ResolutionTaskHolder@181 {
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
@@ -771,6 +687,10 @@ ResolutionTaskHolder@183 {
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
+}
+
+ResolutionTaskHolder@184 {
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
@@ -783,15 +703,6 @@ ResolutionTaskHolder@183 {
 
 ResolutionTaskHolder@187 {
     <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@189 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
@@ -802,17 +713,8 @@ ResolutionTaskHolder@187 {
     <name not found> = EmptyList@101[empty]
 }
 
-ResolutionTaskHolder@191 {
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@193 }
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@193 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
+ResolutionTaskHolder@190 {
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@192 }
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
@@ -823,9 +725,8 @@ ResolutionTaskHolder@191 {
     <name not found> = EmptyList@101[empty]
 }
 
-ResolutionTaskHolder@195 {
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@197 }
+ResolutionTaskHolder@193 {
+    <name not found> = ArrayList@194[1] { ResolutionCandidate@195 }
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
@@ -834,6 +735,10 @@ ResolutionTaskHolder@195 {
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
+}
+
+ResolutionTaskHolder@196 {
+    <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
@@ -846,15 +751,6 @@ ResolutionTaskHolder@195 {
 
 ResolutionTaskHolder@199 {
     <name not found> = ArrayList@200[1] { ResolutionCandidate@201 }
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@201 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
@@ -865,17 +761,8 @@ ResolutionTaskHolder@199 {
     <name not found> = EmptyList@101[empty]
 }
 
-ResolutionTaskHolder@203 {
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@205 }
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@205 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
+ResolutionTaskHolder@202 {
+    <name not found> = ArrayList@203[1] { ResolutionCandidate@204 }
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
@@ -886,9 +773,8 @@ ResolutionTaskHolder@203 {
     <name not found> = EmptyList@101[empty]
 }
 
-ResolutionTaskHolder@207 {
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@209 }
+ResolutionTaskHolder@205 {
+    <name not found> = ArrayList@206[1] { ResolutionCandidate@207 }
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
@@ -897,6 +783,10 @@ ResolutionTaskHolder@207 {
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
+}
+
+ResolutionTaskHolder@208 {
+    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
@@ -909,15 +799,6 @@ ResolutionTaskHolder@207 {
 
 ResolutionTaskHolder@211 {
     <name not found> = ArrayList@212[1] { ResolutionCandidate@213 }
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@213 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
@@ -928,17 +809,8 @@ ResolutionTaskHolder@211 {
     <name not found> = EmptyList@101[empty]
 }
 
-ResolutionTaskHolder@215 {
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@217 }
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@217 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
+ResolutionTaskHolder@214 {
+    <name not found> = ArrayList@215[1] { ResolutionCandidate@216 }
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
@@ -949,9 +821,8 @@ ResolutionTaskHolder@215 {
     <name not found> = EmptyList@101[empty]
 }
 
-ResolutionTaskHolder@219 {
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@221 }
+ResolutionTaskHolder@217 {
+    <name not found> = ArrayList@218[1] { ResolutionCandidate@219 }
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
@@ -960,6 +831,10 @@ ResolutionTaskHolder@219 {
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
+}
+
+ResolutionTaskHolder@220 {
+    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
@@ -972,141 +847,54 @@ ResolutionTaskHolder@219 {
 
 ResolutionTaskHolder@223 {
     <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@225 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
 }
 
-ResolutionTaskHolder@227 {
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@229 }
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@229 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
+ResolutionTaskHolder@226 {
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
 }
 
-ResolutionTaskHolder@231 {
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@233 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
+ResolutionTaskHolder@229 {
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
+}
+
+ResolutionTaskHolder@232 {
+    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
 }
 
 ResolutionTaskHolder@235 {
     <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@237 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
 }
 
-ResolutionTaskHolder@239 {
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@241 }
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@241 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
+ResolutionTaskHolder@238 {
+    <name not found> = ArrayList@239[1] { ResolutionCandidate@240 }
 }
 
-ResolutionTaskHolder@243 {
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@245 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
+ResolutionTaskHolder@241 {
+    <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
+}
+
+ResolutionTaskHolder@244 {
+    <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
 }
 
 ResolutionTaskHolder@247 {
     <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@249 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
+}
+
+ResolutionTaskHolder@250 {
+    <name not found> = ArrayList@251[1] { ResolutionCandidate@252 }
+}
+
+ResolutionTaskHolder@253 {
+    <name not found> = ArrayList@254[1] { ResolutionCandidate@255 }
+}
+
+ResolutionTaskHolder@256 {
+    <name not found> = ArrayList@257[4] { ResolutionCandidate@258, ResolutionCandidate@259, ResolutionCandidate@260, ... }
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
@@ -1117,17 +905,8 @@ ResolutionTaskHolder@247 {
     <name not found> = EmptyList@101[empty]
 }
 
-ResolutionTaskHolder@251 {
-    <name not found> = ArrayList@252[1] { ResolutionCandidate@253 }
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@253 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
+ResolutionTaskHolder@261 {
+    <name not found> = ArrayList@262[4] { ResolutionCandidate@263, ResolutionCandidate@264, ResolutionCandidate@265, ... }
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
@@ -1138,9 +917,15 @@ ResolutionTaskHolder@251 {
     <name not found> = EmptyList@101[empty]
 }
 
-ResolutionTaskHolder@255 {
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
-    <name not found> = ArrayList@258[1] { ResolutionCandidate@257 }
+ResolutionTaskHolder@266 {
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
@@ -1157,20 +942,10 @@ ResolutionTaskHolder@255 {
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
-}
-
-ResolutionTaskHolder@259 {
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@261 }
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@261 }
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
-}
-
-ResolutionTaskHolder@263 {
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@265 }
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@265 }
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
@@ -1178,101 +953,6 @@ ResolutionTaskHolder@263 {
 }
 
 ResolutionTaskHolder@267 {
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
-    <name not found> = ArrayList@270[1] { ResolutionCandidate@269 }
-}
-
-ResolutionTaskHolder@271 {
-    <name not found> = ArrayList@272[1] { ResolutionCandidate@273 }
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@273 }
-}
-
-ResolutionTaskHolder@275 {
-    <name not found> = ArrayList@276[1] { ResolutionCandidate@277 }
-    <name not found> = ArrayList@278[1] { ResolutionCandidate@277 }
-}
-
-ResolutionTaskHolder@279 {
-    <name not found> = ArrayList@280[1] { ResolutionCandidate@281 }
-    <name not found> = ArrayList@282[1] { ResolutionCandidate@281 }
-}
-
-ResolutionTaskHolder@283 {
-    <name not found> = ArrayList@284[1] { ResolutionCandidate@285 }
-    <name not found> = ArrayList@286[1] { ResolutionCandidate@285 }
-}
-
-ResolutionTaskHolder@287 {
-    <name not found> = ArrayList@288[1] { ResolutionCandidate@289 }
-    <name not found> = ArrayList@290[1] { ResolutionCandidate@289 }
-}
-
-ResolutionTaskHolder@291 {
-    <name not found> = ArrayList@292[1] { ResolutionCandidate@293 }
-    <name not found> = ArrayList@294[1] { ResolutionCandidate@293 }
-}
-
-ResolutionTaskHolder@295 {
-    <name not found> = ArrayList@296[1] { ResolutionCandidate@297 }
-    <name not found> = ArrayList@298[1] { ResolutionCandidate@297 }
-}
-
-ResolutionTaskHolder@299 {
-    <name not found> = ArrayList@300[1] { ResolutionCandidate@301 }
-    <name not found> = ArrayList@302[1] { ResolutionCandidate@301 }
-}
-
-ResolutionTaskHolder@303 {
-    <name not found> = ArrayList@304[4] { ResolutionCandidate@305, ResolutionCandidate@306, ResolutionCandidate@307, ... }
-    <name not found> = ArrayList@308[5] { ResolutionCandidate@305, ResolutionCandidate@306, ResolutionCandidate@307, ... }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-}
-
-ResolutionTaskHolder@309 {
-    <name not found> = ArrayList@310[4] { ResolutionCandidate@311, ResolutionCandidate@312, ResolutionCandidate@313, ... }
-    <name not found> = ArrayList@314[5] { ResolutionCandidate@311, ResolutionCandidate@312, ResolutionCandidate@313, ... }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-}
-
-ResolutionTaskHolder@315 {
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
@@ -1307,7 +987,330 @@ ResolutionTaskHolder@315 {
     <name not found> = EmptyList@101[empty]
 }
 
-ResolutionTaskHolder@316 {
+null {
+    <name not found> = ArrayList@268[1] { ResolutionCandidate@189 }
+    <name not found> = ArrayList@269[1] { ResolutionCandidate@207 }
+    <name not found> = ArrayList@270[1] { ResolutionCandidate@141 }
+    <name not found> = ArrayList@271[1] { ResolutionCandidate@153 }
+    <name not found> = ArrayList@272[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@273[1] { ResolutionCandidate@147 }
+    <name not found> = ArrayList@274[1] { ResolutionCandidate@252 }
+    <name not found> = ArrayList@275[1] { ResolutionCandidate@201 }
+    <name not found> = ArrayList@276[1] { ResolutionCandidate@243 }
+    <name not found> = ArrayList@277[1] { ResolutionCandidate@156 }
+    <name not found> = ArrayList@278[1] { ResolutionCandidate@249 }
+    <name not found> = ArrayList@279[1] { ResolutionCandidate@219 }
+    <name not found> = ArrayList@280[1] { ResolutionCandidate@225 }
+    <name not found> = ArrayList@281[1] { ResolutionCandidate@165 }
+    <name not found> = ArrayList@282[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@283[1] { ResolutionCandidate@192 }
+    <name not found> = ArrayList@284[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@285[1] { ResolutionCandidate@195 }
+    <name not found> = ArrayList@286[1] { ResolutionCandidate@231 }
+    <name not found> = ArrayList@287[1] { ResolutionCandidate@210 }
+    <name not found> = ArrayList@288[1] { ResolutionCandidate@246 }
+    <name not found> = ArrayList@289[1] { ResolutionCandidate@222 }
+    <name not found> = ArrayList@290[1] { ResolutionCandidate@240 }
+    <name not found> = ArrayList@291[1] { ResolutionCandidate@216 }
+    <name not found> = ArrayList@292[1] { ResolutionCandidate@213 }
+    <name not found> = ArrayList@293[1] { ResolutionCandidate@135 }
+    <name not found> = ArrayList@294[1] { ResolutionCandidate@186 }
+    <name not found> = ArrayList@295[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@296[1] { ResolutionCandidate@177 }
+    <name not found> = ArrayList@297[1] { ResolutionCandidate@234 }
+    <name not found> = ArrayList@298[1] { ResolutionCandidate@180 }
+    <name not found> = ArrayList@299[1] { ResolutionCandidate@129 }
+    <name not found> = ArrayList@300[1] { ResolutionCandidate@159 }
+    <name not found> = ArrayList@301[1] { ResolutionCandidate@162 }
+    <name not found> = ArrayList@302[1] { ResolutionCandidate@228 }
+    <name not found> = ArrayList@303[1] { ResolutionCandidate@198 }
+    <name not found> = ArrayList@304[1] { ResolutionCandidate@126 }
+    <name not found> = ArrayList@305[1] { ResolutionCandidate@168 }
+    <name not found> = ArrayList@306[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@307[1] { ResolutionCandidate@171 }
+    <name not found> = ArrayList@308[1] { ResolutionCandidate@255 }
+    <name not found> = ArrayList@309[1] { ResolutionCandidate@204 }
+    <name not found> = ArrayList@310[1] { ResolutionCandidate@132 }
+    <name not found> = ArrayList@311[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@312[1] { ResolutionCandidate@237 }
+    <name not found> = ArrayList@313[1] { ResolutionCandidate@183 }
+    <name not found> = ArrayList@314[1] { ResolutionCandidate@174 }
+    <name not found> = ArrayList@315[5] { ResolutionCandidate@258, ResolutionCandidate@259, ResolutionCandidate@260, ... }
+    <name not found> = ArrayList@316[5] { ResolutionCandidate@263, ResolutionCandidate@264, ResolutionCandidate@265, ... }
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
     <name not found> = EmptyList@101[empty]
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/inference/noExpectedTypeForSupertypeConstraint.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/inference/noExpectedTypeForSupertypeConstraint.lazy.log
index 9441dac8f49..5bee2af45c7 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/inference/noExpectedTypeForSupertypeConstraint.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/inference/noExpectedTypeForSupertypeConstraint.lazy.log
@@ -37,21 +37,21 @@ LazyJavaClassifierType@21['String'] {
 
 LazyJavaClassifierType@24['String'] {
     arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@20['String']
+    classifier = JavaClassImpl@15['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@23['String']
+    classifier = JavaClassImpl@20['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@29['String'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@15['String']
+    classifier = JavaClassImpl@23['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -79,7 +79,7 @@ LazyJavaClassifierType@38['Throwable'] {
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@40['Throwable']
+    classifier = JavaClassImpl@33['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -93,7 +93,7 @@ LazyJavaClassifierType@43['Throwable'] {
 
 LazyJavaClassifierType@45['Throwable'] {
     arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@33['Throwable']
+    classifier = JavaClassImpl@40['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -161,14 +161,6 @@ LazyJavaPackageFragment@60['lang'] {
 
 ResolutionTaskHolder@86 {
     <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
     <name not found> = EmptyList@78[empty]
     <name not found> = EmptyList@78[empty]
     <name not found> = EmptyList@78[empty]
@@ -202,17 +194,8 @@ ResolutionTaskHolder@86 {
     <name not found> = EmptyList@78[empty]
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
     <name not found> = EmptyList@78[empty]
     <name not found> = EmptyList@78[empty]
     <name not found> = EmptyList@78[empty]
@@ -223,9 +206,8 @@ ResolutionTaskHolder@90 {
     <name not found> = EmptyList@78[empty]
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
     <name not found> = EmptyList@78[empty]
     <name not found> = EmptyList@78[empty]
     <name not found> = EmptyList@78[empty]
@@ -234,6 +216,10 @@ ResolutionTaskHolder@94 {
     <name not found> = EmptyList@78[empty]
     <name not found> = EmptyList@78[empty]
     <name not found> = EmptyList@78[empty]
+}
+
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
     <name not found> = EmptyList@78[empty]
     <name not found> = EmptyList@78[empty]
     <name not found> = EmptyList@78[empty]
@@ -246,15 +232,6 @@ ResolutionTaskHolder@94 {
 
 ResolutionTaskHolder@98 {
     <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
     <name not found> = EmptyList@78[empty]
     <name not found> = EmptyList@78[empty]
     <name not found> = EmptyList@78[empty]
@@ -265,17 +242,8 @@ ResolutionTaskHolder@98 {
     <name not found> = EmptyList@78[empty]
 }
 
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
     <name not found> = EmptyList@78[empty]
     <name not found> = EmptyList@78[empty]
     <name not found> = EmptyList@78[empty]
@@ -286,78 +254,40 @@ ResolutionTaskHolder@102 {
     <name not found> = EmptyList@78[empty]
 }
 
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
+}
+
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
 }
 
 ResolutionTaskHolder@110 {
     <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
 }
 
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
+ResolutionTaskHolder@113 {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
 }
 
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
+}
+
+ResolutionTaskHolder@119 {
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
 }
 
 ResolutionTaskHolder@122 {
     <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
 }
 
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
+ResolutionTaskHolder@125 {
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
 }
 
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@132 }
-}
-
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@136 }
-}
-
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@140 }
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[4] { ResolutionCandidate@144, ResolutionCandidate@145, ResolutionCandidate@146, ... }
-    <name not found> = ArrayList@147[5] { ResolutionCandidate@144, ResolutionCandidate@145, ResolutionCandidate@146, ... }
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
+ResolutionTaskHolder@128 {
+    <name not found> = ArrayList@129[4] { ResolutionCandidate@130, ResolutionCandidate@131, ResolutionCandidate@132, ... }
     <name not found> = EmptyList@78[empty]
     <name not found> = EmptyList@78[empty]
     <name not found> = EmptyList@78[empty]
@@ -368,9 +298,82 @@ ResolutionTaskHolder@142 {
     <name not found> = EmptyList@78[empty]
 }
 
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[4] { ResolutionCandidate@150, ResolutionCandidate@151, ResolutionCandidate@152, ... }
-    <name not found> = ArrayList@153[5] { ResolutionCandidate@150, ResolutionCandidate@151, ResolutionCandidate@152, ... }
+ResolutionTaskHolder@133 {
+    <name not found> = ArrayList@134[4] { ResolutionCandidate@135, ResolutionCandidate@136, ResolutionCandidate@137, ... }
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+}
+
+null {
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@124 }
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@127 }
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@152[5] { ResolutionCandidate@130, ResolutionCandidate@131, ResolutionCandidate@132, ... }
+    <name not found> = ArrayList@153[5] { ResolutionCandidate@135, ResolutionCandidate@136, ResolutionCandidate@137, ... }
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
     <name not found> = EmptyList@78[empty]
     <name not found> = EmptyList@78[empty]
     <name not found> = EmptyList@78[empty]
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/inference/useCompleterWithoutExpectedType.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/inference/useCompleterWithoutExpectedType.lazy.log
index 7939dfdf750..0297d95aed3 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/inference/useCompleterWithoutExpectedType.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/inference/useCompleterWithoutExpectedType.lazy.log
@@ -37,21 +37,21 @@ LazyJavaClassifierType@21['String'] {
 
 LazyJavaClassifierType@24['String'] {
     arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@20['String']
+    classifier = JavaClassImpl@23['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@15['String']
+    classifier = JavaClassImpl@20['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@29['String'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@23['String']
+    classifier = JavaClassImpl@15['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -79,14 +79,14 @@ LazyJavaClassifierType@38['Throwable'] {
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@40['Throwable']
+    classifier = JavaClassImpl@33['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@43['Throwable'] {
     arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@33['Throwable']
+    classifier = JavaClassImpl@40['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -168,14 +168,6 @@ LazyJavaPackageFragment@60['lang'] {
 
 ResolutionTaskHolder@89 {
     <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
     <name not found> = EmptyList@81[empty]
     <name not found> = EmptyList@81[empty]
     <name not found> = EmptyList@81[empty]
@@ -209,17 +201,8 @@ ResolutionTaskHolder@89 {
     <name not found> = EmptyList@81[empty]
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
     <name not found> = EmptyList@81[empty]
     <name not found> = EmptyList@81[empty]
     <name not found> = EmptyList@81[empty]
@@ -230,9 +213,8 @@ ResolutionTaskHolder@93 {
     <name not found> = EmptyList@81[empty]
 }
 
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
     <name not found> = EmptyList@81[empty]
     <name not found> = EmptyList@81[empty]
     <name not found> = EmptyList@81[empty]
@@ -241,6 +223,10 @@ ResolutionTaskHolder@97 {
     <name not found> = EmptyList@81[empty]
     <name not found> = EmptyList@81[empty]
     <name not found> = EmptyList@81[empty]
+}
+
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
     <name not found> = EmptyList@81[empty]
     <name not found> = EmptyList@81[empty]
     <name not found> = EmptyList@81[empty]
@@ -253,15 +239,6 @@ ResolutionTaskHolder@97 {
 
 ResolutionTaskHolder@101 {
     <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
     <name not found> = EmptyList@81[empty]
     <name not found> = EmptyList@81[empty]
     <name not found> = EmptyList@81[empty]
@@ -272,52 +249,52 @@ ResolutionTaskHolder@101 {
     <name not found> = EmptyList@81[empty]
 }
 
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
     <name not found> = EmptyList@81[empty]
 }
 
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
+}
+
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
 }
 
 ResolutionTaskHolder@113 {
     <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
 }
 
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[4] { ResolutionCandidate@118, ResolutionCandidate@119, ResolutionCandidate@120, ... }
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
 }
 
 ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[4] { ResolutionCandidate@127, ResolutionCandidate@128, ResolutionCandidate@129, ... }
-    <name not found> = ArrayList@130[5] { ResolutionCandidate@127, ResolutionCandidate@128, ResolutionCandidate@129, ... }
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
     <name not found> = EmptyList@81[empty]
     <name not found> = EmptyList@81[empty]
     <name not found> = EmptyList@81[empty]
@@ -336,7 +313,33 @@ ResolutionTaskHolder@125 {
     <name not found> = EmptyList@81[empty]
 }
 
-ResolutionTaskHolder@131 {
+null {
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@131[5] { ResolutionCandidate@118, ResolutionCandidate@119, ResolutionCandidate@120, ... }
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
     <name not found> = EmptyList@81[empty]
     <name not found> = EmptyList@81[empty]
     <name not found> = EmptyList@81[empty]
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/inference/useExpectedType.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/inference/useExpectedType.lazy.log
index f60468d2e97..2fbec7f5204 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/inference/useExpectedType.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/inference/useExpectedType.lazy.log
@@ -40,7 +40,7 @@ LazyJavaClassifierType@24['String'] {
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@18['String']
+    classifier = JavaClassImpl@23['String']
     nullable = 'true': Boolean@29
     typeConstructor = DeserializedClassTypeConstructor@20
 }
@@ -54,7 +54,7 @@ LazyJavaClassifierType@30['String'] {
 
 LazyJavaClassifierType@32['String'] {
     arguments = ArrayList@33[empty]
-    classifier = JavaClassImpl@23['String']
+    classifier = JavaClassImpl@18['String']
     nullable = 'true': Boolean@29
     typeConstructor = DeserializedClassTypeConstructor@20
 }
@@ -82,21 +82,21 @@ LazyJavaClassifierType@41['Throwable'] {
 
 LazyJavaClassifierType@44['Throwable'] {
     arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@40['Throwable']
+    classifier = JavaClassImpl@36['Throwable']
     nullable = 'true': Boolean@29
     typeConstructor = DeserializedClassTypeConstructor@37
 }
 
 LazyJavaClassifierType@46['Throwable'] {
     arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@43['Throwable']
+    classifier = JavaClassImpl@40['Throwable']
     nullable = 'true': Boolean@29
     typeConstructor = DeserializedClassTypeConstructor@37
 }
 
 LazyJavaClassifierType@48['Throwable'] {
     arguments = ArrayList@49[empty]
-    classifier = JavaClassImpl@36['Throwable']
+    classifier = JavaClassImpl@43['Throwable']
     nullable = 'true': Boolean@29
     typeConstructor = DeserializedClassTypeConstructor@37
 }
@@ -196,14 +196,6 @@ LazyJavaPackageFragment@85['lang'] {
 
 ResolutionTaskHolder@124 {
     <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@126 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -237,16 +229,8 @@ ResolutionTaskHolder@124 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@127 {
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -280,9 +264,8 @@ ResolutionTaskHolder@128 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
+ResolutionTaskHolder@130 {
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -314,6 +297,34 @@ ResolutionTaskHolder@132 {
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
+}
+
+ResolutionTaskHolder@133 {
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -325,14 +336,6 @@ ResolutionTaskHolder@132 {
 
 ResolutionTaskHolder@136 {
     <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -366,16 +369,8 @@ ResolutionTaskHolder@136 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@139 {
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -409,9 +404,8 @@ ResolutionTaskHolder@140 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
+ResolutionTaskHolder@142 {
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -443,6 +437,34 @@ ResolutionTaskHolder@144 {
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
+}
+
+ResolutionTaskHolder@145 {
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -454,14 +476,6 @@ ResolutionTaskHolder@144 {
 
 ResolutionTaskHolder@148 {
     <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -495,16 +509,8 @@ ResolutionTaskHolder@148 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@151 {
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -538,9 +544,8 @@ ResolutionTaskHolder@152 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
+ResolutionTaskHolder@154 {
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -564,6 +569,18 @@ ResolutionTaskHolder@156 {
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
+}
+
+ResolutionTaskHolder@157 {
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -583,22 +600,6 @@ ResolutionTaskHolder@156 {
 
 ResolutionTaskHolder@160 {
     <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@162 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -624,14 +625,8 @@ ResolutionTaskHolder@160 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@164 {
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@166 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@163 {
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -657,9 +652,8 @@ ResolutionTaskHolder@164 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@170 }
+ResolutionTaskHolder@166 {
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -683,6 +677,28 @@ ResolutionTaskHolder@168 {
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
+}
+
+ResolutionTaskHolder@169 {
+    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -692,12 +708,6 @@ ResolutionTaskHolder@168 {
 
 ResolutionTaskHolder@172 {
     <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@174 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -723,14 +733,8 @@ ResolutionTaskHolder@172 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@178 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@175 {
+    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -756,9 +760,8 @@ ResolutionTaskHolder@176 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@182 }
+ResolutionTaskHolder@178 {
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -782,6 +785,28 @@ ResolutionTaskHolder@180 {
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
+}
+
+ResolutionTaskHolder@181 {
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -791,27 +816,6 @@ ResolutionTaskHolder@180 {
 
 ResolutionTaskHolder@184 {
     <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@186 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -822,29 +826,8 @@ ResolutionTaskHolder@184 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@188 {
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@190 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@187 {
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -855,21 +838,8 @@ ResolutionTaskHolder@188 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@192 {
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@194 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@190 {
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@192 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -878,6 +848,10 @@ ResolutionTaskHolder@192 {
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
+}
+
+ResolutionTaskHolder@193 {
+    <name not found> = ArrayList@194[1] { ResolutionCandidate@195 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -890,27 +864,6 @@ ResolutionTaskHolder@192 {
 
 ResolutionTaskHolder@196 {
     <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@198 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -921,29 +874,8 @@ ResolutionTaskHolder@196 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@200 {
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@202 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@199 {
+    <name not found> = ArrayList@200[1] { ResolutionCandidate@201 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -954,9 +886,8 @@ ResolutionTaskHolder@200 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@204 {
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@206 }
+ResolutionTaskHolder@202 {
+    <name not found> = ArrayList@203[1] { ResolutionCandidate@204 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -965,6 +896,10 @@ ResolutionTaskHolder@204 {
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
+}
+
+ResolutionTaskHolder@205 {
+    <name not found> = ArrayList@206[1] { ResolutionCandidate@207 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -977,15 +912,6 @@ ResolutionTaskHolder@204 {
 
 ResolutionTaskHolder@208 {
     <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@210 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -996,17 +922,8 @@ ResolutionTaskHolder@208 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@212 {
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@214 }
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@214 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@211 {
+    <name not found> = ArrayList@212[1] { ResolutionCandidate@213 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -1017,9 +934,8 @@ ResolutionTaskHolder@212 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@216 {
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@218 }
+ResolutionTaskHolder@214 {
+    <name not found> = ArrayList@215[1] { ResolutionCandidate@216 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -1028,6 +944,10 @@ ResolutionTaskHolder@216 {
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
+}
+
+ResolutionTaskHolder@217 {
+    <name not found> = ArrayList@218[1] { ResolutionCandidate@219 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -1040,15 +960,6 @@ ResolutionTaskHolder@216 {
 
 ResolutionTaskHolder@220 {
     <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@222 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -1059,17 +970,8 @@ ResolutionTaskHolder@220 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@224 {
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@226 }
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@226 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@223 {
+    <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -1080,9 +982,8 @@ ResolutionTaskHolder@224 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@228 {
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@230 }
+ResolutionTaskHolder@226 {
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -1091,6 +992,10 @@ ResolutionTaskHolder@228 {
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
+}
+
+ResolutionTaskHolder@229 {
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -1103,15 +1008,6 @@ ResolutionTaskHolder@228 {
 
 ResolutionTaskHolder@232 {
     <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@234 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -1122,17 +1018,8 @@ ResolutionTaskHolder@232 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@236 {
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@238 }
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@238 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@235 {
+    <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -1143,9 +1030,8 @@ ResolutionTaskHolder@236 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@240 {
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
-    <name not found> = ArrayList@243[1] { ResolutionCandidate@242 }
+ResolutionTaskHolder@238 {
+    <name not found> = ArrayList@239[1] { ResolutionCandidate@240 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -1154,6 +1040,10 @@ ResolutionTaskHolder@240 {
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
+}
+
+ResolutionTaskHolder@241 {
+    <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -1166,15 +1056,6 @@ ResolutionTaskHolder@240 {
 
 ResolutionTaskHolder@244 {
     <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@246 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -1185,17 +1066,8 @@ ResolutionTaskHolder@244 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@248 {
-    <name not found> = ArrayList@249[1] { ResolutionCandidate@250 }
-    <name not found> = ArrayList@251[1] { ResolutionCandidate@250 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@247 {
+    <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -1206,9 +1078,8 @@ ResolutionTaskHolder@248 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@252 {
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
-    <name not found> = ArrayList@255[1] { ResolutionCandidate@254 }
+ResolutionTaskHolder@250 {
+    <name not found> = ArrayList@251[1] { ResolutionCandidate@252 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -1217,6 +1088,10 @@ ResolutionTaskHolder@252 {
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
+}
+
+ResolutionTaskHolder@253 {
+    <name not found> = ArrayList@254[1] { ResolutionCandidate@255 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -1229,15 +1104,6 @@ ResolutionTaskHolder@252 {
 
 ResolutionTaskHolder@256 {
     <name not found> = ArrayList@257[1] { ResolutionCandidate@258 }
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@258 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -1248,17 +1114,8 @@ ResolutionTaskHolder@256 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@260 {
-    <name not found> = ArrayList@261[1] { ResolutionCandidate@262 }
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@262 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@259 {
+    <name not found> = ArrayList@260[1] { ResolutionCandidate@261 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -1269,9 +1126,8 @@ ResolutionTaskHolder@260 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@264 {
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
-    <name not found> = ArrayList@267[1] { ResolutionCandidate@266 }
+ResolutionTaskHolder@262 {
+    <name not found> = ArrayList@263[1] { ResolutionCandidate@264 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -1280,6 +1136,10 @@ ResolutionTaskHolder@264 {
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
+}
+
+ResolutionTaskHolder@265 {
+    <name not found> = ArrayList@266[1] { ResolutionCandidate@267 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -1292,15 +1152,6 @@ ResolutionTaskHolder@264 {
 
 ResolutionTaskHolder@268 {
     <name not found> = ArrayList@269[1] { ResolutionCandidate@270 }
-    <name not found> = ArrayList@271[1] { ResolutionCandidate@270 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -1311,17 +1162,8 @@ ResolutionTaskHolder@268 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@272 {
-    <name not found> = ArrayList@273[1] { ResolutionCandidate@274 }
-    <name not found> = ArrayList@275[1] { ResolutionCandidate@274 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@271 {
+    <name not found> = ArrayList@272[1] { ResolutionCandidate@273 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -1332,9 +1174,8 @@ ResolutionTaskHolder@272 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@276 {
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
-    <name not found> = ArrayList@279[1] { ResolutionCandidate@278 }
+ResolutionTaskHolder@274 {
+    <name not found> = ArrayList@275[1] { ResolutionCandidate@276 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -1343,6 +1184,10 @@ ResolutionTaskHolder@276 {
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
+}
+
+ResolutionTaskHolder@277 {
+    <name not found> = ArrayList@278[1] { ResolutionCandidate@279 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -1355,15 +1200,6 @@ ResolutionTaskHolder@276 {
 
 ResolutionTaskHolder@280 {
     <name not found> = ArrayList@281[1] { ResolutionCandidate@282 }
-    <name not found> = ArrayList@283[1] { ResolutionCandidate@282 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -1374,17 +1210,8 @@ ResolutionTaskHolder@280 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@284 {
-    <name not found> = ArrayList@285[1] { ResolutionCandidate@286 }
-    <name not found> = ArrayList@287[1] { ResolutionCandidate@286 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@283 {
+    <name not found> = ArrayList@284[1] { ResolutionCandidate@285 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -1395,9 +1222,8 @@ ResolutionTaskHolder@284 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@288 {
-    <name not found> = ArrayList@289[1] { ResolutionCandidate@290 }
-    <name not found> = ArrayList@291[1] { ResolutionCandidate@290 }
+ResolutionTaskHolder@286 {
+    <name not found> = ArrayList@287[1] { ResolutionCandidate@288 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -1406,6 +1232,10 @@ ResolutionTaskHolder@288 {
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
+}
+
+ResolutionTaskHolder@289 {
+    <name not found> = ArrayList@290[1] { ResolutionCandidate@291 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -1418,15 +1248,6 @@ ResolutionTaskHolder@288 {
 
 ResolutionTaskHolder@292 {
     <name not found> = ArrayList@293[1] { ResolutionCandidate@294 }
-    <name not found> = ArrayList@295[1] { ResolutionCandidate@294 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -1437,17 +1258,8 @@ ResolutionTaskHolder@292 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@296 {
-    <name not found> = ArrayList@297[1] { ResolutionCandidate@298 }
-    <name not found> = ArrayList@299[1] { ResolutionCandidate@298 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@295 {
+    <name not found> = ArrayList@296[1] { ResolutionCandidate@297 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -1458,9 +1270,8 @@ ResolutionTaskHolder@296 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@300 {
-    <name not found> = ArrayList@301[1] { ResolutionCandidate@302 }
-    <name not found> = ArrayList@303[1] { ResolutionCandidate@302 }
+ResolutionTaskHolder@298 {
+    <name not found> = ArrayList@299[1] { ResolutionCandidate@300 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -1469,6 +1280,10 @@ ResolutionTaskHolder@300 {
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
+}
+
+ResolutionTaskHolder@301 {
+    <name not found> = ArrayList@302[1] { ResolutionCandidate@303 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -1481,15 +1296,6 @@ ResolutionTaskHolder@300 {
 
 ResolutionTaskHolder@304 {
     <name not found> = ArrayList@305[1] { ResolutionCandidate@306 }
-    <name not found> = ArrayList@307[1] { ResolutionCandidate@306 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -1500,17 +1306,8 @@ ResolutionTaskHolder@304 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@308 {
-    <name not found> = ArrayList@309[1] { ResolutionCandidate@310 }
-    <name not found> = ArrayList@311[1] { ResolutionCandidate@310 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@307 {
+    <name not found> = ArrayList@308[1] { ResolutionCandidate@309 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -1521,925 +1318,621 @@ ResolutionTaskHolder@308 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@312 {
-    <name not found> = ArrayList@313[1] { ResolutionCandidate@314 }
-    <name not found> = ArrayList@315[1] { ResolutionCandidate@314 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@310 {
+    <name not found> = ArrayList@311[1] { ResolutionCandidate@312 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
+}
+
+ResolutionTaskHolder@313 {
+    <name not found> = ArrayList@314[1] { ResolutionCandidate@315 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
 }
 
 ResolutionTaskHolder@316 {
     <name not found> = ArrayList@317[1] { ResolutionCandidate@318 }
-    <name not found> = ArrayList@319[1] { ResolutionCandidate@318 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@320 {
-    <name not found> = ArrayList@321[1] { ResolutionCandidate@322 }
-    <name not found> = ArrayList@323[1] { ResolutionCandidate@322 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@319 {
+    <name not found> = ArrayList@320[1] { ResolutionCandidate@321 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@324 {
-    <name not found> = ArrayList@325[1] { ResolutionCandidate@326 }
-    <name not found> = ArrayList@327[1] { ResolutionCandidate@326 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@322 {
+    <name not found> = ArrayList@323[1] { ResolutionCandidate@324 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
+}
+
+ResolutionTaskHolder@325 {
+    <name not found> = ArrayList@326[1] { ResolutionCandidate@327 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
 }
 
 ResolutionTaskHolder@328 {
     <name not found> = ArrayList@329[1] { ResolutionCandidate@330 }
-    <name not found> = ArrayList@331[1] { ResolutionCandidate@330 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@332 {
-    <name not found> = ArrayList@333[1] { ResolutionCandidate@334 }
-    <name not found> = ArrayList@335[1] { ResolutionCandidate@334 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@331 {
+    <name not found> = ArrayList@332[1] { ResolutionCandidate@333 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@336 {
-    <name not found> = ArrayList@337[1] { ResolutionCandidate@338 }
-    <name not found> = ArrayList@339[1] { ResolutionCandidate@338 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@334 {
+    <name not found> = ArrayList@335[1] { ResolutionCandidate@336 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
+}
+
+ResolutionTaskHolder@337 {
+    <name not found> = ArrayList@338[1] { ResolutionCandidate@339 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
 }
 
 ResolutionTaskHolder@340 {
     <name not found> = ArrayList@341[1] { ResolutionCandidate@342 }
-    <name not found> = ArrayList@343[1] { ResolutionCandidate@342 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@344 {
-    <name not found> = ArrayList@345[1] { ResolutionCandidate@346 }
-    <name not found> = ArrayList@347[1] { ResolutionCandidate@346 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@343 {
+    <name not found> = ArrayList@344[1] { ResolutionCandidate@345 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@348 {
-    <name not found> = ArrayList@349[1] { ResolutionCandidate@350 }
-    <name not found> = ArrayList@351[1] { ResolutionCandidate@350 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@346 {
+    <name not found> = ArrayList@347[1] { ResolutionCandidate@348 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
+}
+
+ResolutionTaskHolder@349 {
+    <name not found> = ArrayList@350[1] { ResolutionCandidate@351 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
 }
 
 ResolutionTaskHolder@352 {
     <name not found> = ArrayList@353[1] { ResolutionCandidate@354 }
-    <name not found> = ArrayList@355[1] { ResolutionCandidate@354 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@356 {
-    <name not found> = ArrayList@357[1] { ResolutionCandidate@358 }
-    <name not found> = ArrayList@359[1] { ResolutionCandidate@358 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@355 {
+    <name not found> = ArrayList@356[1] { ResolutionCandidate@357 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@360 {
-    <name not found> = ArrayList@361[1] { ResolutionCandidate@362 }
-    <name not found> = ArrayList@363[1] { ResolutionCandidate@362 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@358 {
+    <name not found> = ArrayList@359[1] { ResolutionCandidate@360 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
+}
+
+ResolutionTaskHolder@361 {
+    <name not found> = ArrayList@362[1] { ResolutionCandidate@363 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
 }
 
 ResolutionTaskHolder@364 {
     <name not found> = ArrayList@365[1] { ResolutionCandidate@366 }
-    <name not found> = ArrayList@367[1] { ResolutionCandidate@366 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@368 {
-    <name not found> = ArrayList@369[1] { ResolutionCandidate@370 }
-    <name not found> = ArrayList@371[1] { ResolutionCandidate@370 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@367 {
+    <name not found> = ArrayList@368[1] { ResolutionCandidate@369 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@372 {
-    <name not found> = ArrayList@373[1] { ResolutionCandidate@374 }
-    <name not found> = ArrayList@375[1] { ResolutionCandidate@374 }
+ResolutionTaskHolder@370 {
+    <name not found> = ArrayList@371[1] { ResolutionCandidate@372 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
+}
+
+ResolutionTaskHolder@373 {
+    <name not found> = ArrayList@374[1] { ResolutionCandidate@375 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
 }
 
 ResolutionTaskHolder@376 {
     <name not found> = ArrayList@377[1] { ResolutionCandidate@378 }
-    <name not found> = ArrayList@379[1] { ResolutionCandidate@378 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@380 {
-    <name not found> = ArrayList@381[1] { ResolutionCandidate@382 }
-    <name not found> = ArrayList@383[1] { ResolutionCandidate@382 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@379 {
+    <name not found> = ArrayList@380[1] { ResolutionCandidate@381 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@384 {
-    <name not found> = ArrayList@385[1] { ResolutionCandidate@386 }
-    <name not found> = ArrayList@387[1] { ResolutionCandidate@386 }
+ResolutionTaskHolder@382 {
+    <name not found> = ArrayList@383[1] { ResolutionCandidate@384 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
+}
+
+ResolutionTaskHolder@385 {
+    <name not found> = ArrayList@386[1] { ResolutionCandidate@387 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
 }
 
 ResolutionTaskHolder@388 {
     <name not found> = ArrayList@389[1] { ResolutionCandidate@390 }
-    <name not found> = ArrayList@391[1] { ResolutionCandidate@390 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@392 {
-    <name not found> = ArrayList@393[1] { ResolutionCandidate@394 }
-    <name not found> = ArrayList@395[1] { ResolutionCandidate@394 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@391 {
+    <name not found> = ArrayList@392[1] { ResolutionCandidate@393 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@396 {
-    <name not found> = ArrayList@397[1] { ResolutionCandidate@398 }
-    <name not found> = ArrayList@399[1] { ResolutionCandidate@398 }
+ResolutionTaskHolder@394 {
+    <name not found> = ArrayList@395[1] { ResolutionCandidate@396 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
+}
+
+ResolutionTaskHolder@397 {
+    <name not found> = ArrayList@398[1] { ResolutionCandidate@399 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
 }
 
 ResolutionTaskHolder@400 {
     <name not found> = ArrayList@401[1] { ResolutionCandidate@402 }
-    <name not found> = ArrayList@403[1] { ResolutionCandidate@402 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@404 {
-    <name not found> = ArrayList@405[1] { ResolutionCandidate@406 }
-    <name not found> = ArrayList@407[1] { ResolutionCandidate@406 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@403 {
+    <name not found> = ArrayList@404[1] { ResolutionCandidate@405 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@408 {
-    <name not found> = ArrayList@409[1] { ResolutionCandidate@410 }
-    <name not found> = ArrayList@411[1] { ResolutionCandidate@410 }
+ResolutionTaskHolder@406 {
+    <name not found> = ArrayList@407[1] { ResolutionCandidate@408 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
+}
+
+ResolutionTaskHolder@409 {
+    <name not found> = ArrayList@410[1] { ResolutionCandidate@411 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
 }
 
 ResolutionTaskHolder@412 {
     <name not found> = ArrayList@413[1] { ResolutionCandidate@414 }
-    <name not found> = ArrayList@415[1] { ResolutionCandidate@414 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@416 {
-    <name not found> = ArrayList@417[1] { ResolutionCandidate@418 }
-    <name not found> = ArrayList@419[1] { ResolutionCandidate@418 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@415 {
+    <name not found> = ArrayList@416[1] { ResolutionCandidate@417 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@420 {
-    <name not found> = ArrayList@421[1] { ResolutionCandidate@422 }
-    <name not found> = ArrayList@423[1] { ResolutionCandidate@422 }
+ResolutionTaskHolder@418 {
+    <name not found> = ArrayList@419[1] { ResolutionCandidate@420 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
+}
+
+ResolutionTaskHolder@421 {
+    <name not found> = ArrayList@422[1] { ResolutionCandidate@423 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
 }
 
 ResolutionTaskHolder@424 {
     <name not found> = ArrayList@425[1] { ResolutionCandidate@426 }
-    <name not found> = ArrayList@427[1] { ResolutionCandidate@426 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@428 {
-    <name not found> = ArrayList@429[1] { ResolutionCandidate@430 }
-    <name not found> = ArrayList@431[1] { ResolutionCandidate@430 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@427 {
+    <name not found> = ArrayList@428[1] { ResolutionCandidate@429 }
 }
 
-ResolutionTaskHolder@432 {
-    <name not found> = ArrayList@433[1] { ResolutionCandidate@434 }
-    <name not found> = ArrayList@435[1] { ResolutionCandidate@434 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@430 {
+    <name not found> = ArrayList@431[1] { ResolutionCandidate@432 }
+}
+
+ResolutionTaskHolder@433 {
+    <name not found> = ArrayList@434[1] { ResolutionCandidate@435 }
 }
 
 ResolutionTaskHolder@436 {
     <name not found> = ArrayList@437[1] { ResolutionCandidate@438 }
-    <name not found> = ArrayList@439[1] { ResolutionCandidate@438 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@440 {
-    <name not found> = ArrayList@441[1] { ResolutionCandidate@442 }
-    <name not found> = ArrayList@443[1] { ResolutionCandidate@442 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@439 {
+    <name not found> = ArrayList@440[1] { ResolutionCandidate@441 }
 }
 
-ResolutionTaskHolder@444 {
-    <name not found> = ArrayList@445[1] { ResolutionCandidate@446 }
-    <name not found> = ArrayList@447[1] { ResolutionCandidate@446 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@442 {
+    <name not found> = ArrayList@443[1] { ResolutionCandidate@444 }
+}
+
+ResolutionTaskHolder@445 {
+    <name not found> = ArrayList@446[1] { ResolutionCandidate@447 }
 }
 
 ResolutionTaskHolder@448 {
     <name not found> = ArrayList@449[1] { ResolutionCandidate@450 }
-    <name not found> = ArrayList@451[1] { ResolutionCandidate@450 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@452 {
-    <name not found> = ArrayList@453[1] { ResolutionCandidate@454 }
-    <name not found> = ArrayList@455[1] { ResolutionCandidate@454 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@451 {
+    <name not found> = ArrayList@452[1] { ResolutionCandidate@453 }
 }
 
-ResolutionTaskHolder@456 {
-    <name not found> = ArrayList@457[1] { ResolutionCandidate@458 }
-    <name not found> = ArrayList@459[1] { ResolutionCandidate@458 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@454 {
+    <name not found> = ArrayList@455[1] { ResolutionCandidate@456 }
+}
+
+ResolutionTaskHolder@457 {
+    <name not found> = ArrayList@458[1] { ResolutionCandidate@459 }
 }
 
 ResolutionTaskHolder@460 {
     <name not found> = ArrayList@461[1] { ResolutionCandidate@462 }
-    <name not found> = ArrayList@463[1] { ResolutionCandidate@462 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@464 {
-    <name not found> = ArrayList@465[1] { ResolutionCandidate@466 }
-    <name not found> = ArrayList@467[1] { ResolutionCandidate@466 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@463 {
+    <name not found> = ArrayList@464[1] { ResolutionCandidate@465 }
 }
 
-ResolutionTaskHolder@468 {
-    <name not found> = ArrayList@469[1] { ResolutionCandidate@470 }
-    <name not found> = ArrayList@471[1] { ResolutionCandidate@470 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@466 {
+    <name not found> = ArrayList@467[1] { ResolutionCandidate@468 }
+}
+
+ResolutionTaskHolder@469 {
+    <name not found> = ArrayList@470[1] { ResolutionCandidate@471 }
 }
 
 ResolutionTaskHolder@472 {
     <name not found> = ArrayList@473[1] { ResolutionCandidate@474 }
-    <name not found> = ArrayList@475[1] { ResolutionCandidate@474 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@476 {
-    <name not found> = ArrayList@477[1] { ResolutionCandidate@478 }
-    <name not found> = ArrayList@479[1] { ResolutionCandidate@478 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@475 {
+    <name not found> = ArrayList@476[1] { ResolutionCandidate@477 }
 }
 
-ResolutionTaskHolder@480 {
-    <name not found> = ArrayList@481[1] { ResolutionCandidate@482 }
-    <name not found> = ArrayList@483[1] { ResolutionCandidate@482 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@478 {
+    <name not found> = ArrayList@479[1] { ResolutionCandidate@480 }
+}
+
+ResolutionTaskHolder@481 {
+    <name not found> = ArrayList@482[1] { ResolutionCandidate@483 }
 }
 
 ResolutionTaskHolder@484 {
     <name not found> = ArrayList@485[1] { ResolutionCandidate@486 }
-    <name not found> = ArrayList@487[1] { ResolutionCandidate@486 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@488 {
-    <name not found> = ArrayList@489[1] { ResolutionCandidate@490 }
-    <name not found> = ArrayList@491[1] { ResolutionCandidate@490 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@487 {
+    <name not found> = ArrayList@488[1] { ResolutionCandidate@489 }
 }
 
-ResolutionTaskHolder@492 {
-    <name not found> = ArrayList@493[1] { ResolutionCandidate@494 }
-    <name not found> = ArrayList@495[1] { ResolutionCandidate@494 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@490 {
+    <name not found> = ArrayList@491[1] { ResolutionCandidate@492 }
+}
+
+ResolutionTaskHolder@493 {
+    <name not found> = ArrayList@494[1] { ResolutionCandidate@495 }
 }
 
 ResolutionTaskHolder@496 {
     <name not found> = ArrayList@497[1] { ResolutionCandidate@498 }
-    <name not found> = ArrayList@499[1] { ResolutionCandidate@498 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@500 {
-    <name not found> = ArrayList@501[1] { ResolutionCandidate@502 }
-    <name not found> = ArrayList@503[1] { ResolutionCandidate@502 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@499 {
+    <name not found> = ArrayList@500[1] { ResolutionCandidate@501 }
 }
 
-ResolutionTaskHolder@504 {
-    <name not found> = ArrayList@505[1] { ResolutionCandidate@506 }
-    <name not found> = ArrayList@507[1] { ResolutionCandidate@506 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@502 {
+    <name not found> = ArrayList@503[1] { ResolutionCandidate@504 }
+}
+
+ResolutionTaskHolder@505 {
+    <name not found> = ArrayList@506[1] { ResolutionCandidate@507 }
 }
 
 ResolutionTaskHolder@508 {
     <name not found> = ArrayList@509[1] { ResolutionCandidate@510 }
-    <name not found> = ArrayList@511[1] { ResolutionCandidate@510 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@512 {
-    <name not found> = ArrayList@513[1] { ResolutionCandidate@514 }
-    <name not found> = ArrayList@515[1] { ResolutionCandidate@514 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@511 {
+    <name not found> = ArrayList@512[1] { ResolutionCandidate@513 }
 }
 
-ResolutionTaskHolder@516 {
-    <name not found> = ArrayList@517[1] { ResolutionCandidate@518 }
-    <name not found> = ArrayList@519[1] { ResolutionCandidate@518 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@514 {
+    <name not found> = ArrayList@515[1] { ResolutionCandidate@516 }
+}
+
+ResolutionTaskHolder@517 {
+    <name not found> = ArrayList@518[1] { ResolutionCandidate@519 }
 }
 
 ResolutionTaskHolder@520 {
     <name not found> = ArrayList@521[1] { ResolutionCandidate@522 }
-    <name not found> = ArrayList@523[1] { ResolutionCandidate@522 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@524 {
-    <name not found> = ArrayList@525[1] { ResolutionCandidate@526 }
-    <name not found> = ArrayList@527[1] { ResolutionCandidate@526 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@523 {
+    <name not found> = ArrayList@524[1] { ResolutionCandidate@525 }
 }
 
-ResolutionTaskHolder@528 {
-    <name not found> = ArrayList@529[1] { ResolutionCandidate@530 }
-    <name not found> = ArrayList@531[1] { ResolutionCandidate@530 }
+ResolutionTaskHolder@526 {
+    <name not found> = ArrayList@527[1] { ResolutionCandidate@528 }
+}
+
+ResolutionTaskHolder@529 {
+    <name not found> = ArrayList@530[1] { ResolutionCandidate@531 }
 }
 
 ResolutionTaskHolder@532 {
     <name not found> = ArrayList@533[1] { ResolutionCandidate@534 }
-    <name not found> = ArrayList@535[1] { ResolutionCandidate@534 }
 }
 
-ResolutionTaskHolder@536 {
-    <name not found> = ArrayList@537[1] { ResolutionCandidate@538 }
-    <name not found> = ArrayList@539[1] { ResolutionCandidate@538 }
+ResolutionTaskHolder@535 {
+    <name not found> = ArrayList@536[1] { ResolutionCandidate@537 }
 }
 
-ResolutionTaskHolder@540 {
-    <name not found> = ArrayList@541[1] { ResolutionCandidate@542 }
-    <name not found> = ArrayList@543[1] { ResolutionCandidate@542 }
+ResolutionTaskHolder@538 {
+    <name not found> = ArrayList@539[1] { ResolutionCandidate@540 }
+}
+
+ResolutionTaskHolder@541 {
+    <name not found> = ArrayList@542[1] { ResolutionCandidate@543 }
 }
 
 ResolutionTaskHolder@544 {
     <name not found> = ArrayList@545[1] { ResolutionCandidate@546 }
-    <name not found> = ArrayList@547[1] { ResolutionCandidate@546 }
 }
 
-ResolutionTaskHolder@548 {
-    <name not found> = ArrayList@549[1] { ResolutionCandidate@550 }
-    <name not found> = ArrayList@551[1] { ResolutionCandidate@550 }
+ResolutionTaskHolder@547 {
+    <name not found> = ArrayList@548[1] { ResolutionCandidate@549 }
 }
 
-ResolutionTaskHolder@552 {
-    <name not found> = ArrayList@553[1] { ResolutionCandidate@554 }
-    <name not found> = ArrayList@555[1] { ResolutionCandidate@554 }
+ResolutionTaskHolder@550 {
+    <name not found> = ArrayList@551[1] { ResolutionCandidate@552 }
+}
+
+ResolutionTaskHolder@553 {
+    <name not found> = ArrayList@554[1] { ResolutionCandidate@555 }
 }
 
 ResolutionTaskHolder@556 {
     <name not found> = ArrayList@557[1] { ResolutionCandidate@558 }
-    <name not found> = ArrayList@559[1] { ResolutionCandidate@558 }
 }
 
-ResolutionTaskHolder@560 {
-    <name not found> = ArrayList@561[1] { ResolutionCandidate@562 }
-    <name not found> = ArrayList@563[1] { ResolutionCandidate@562 }
+ResolutionTaskHolder@559 {
+    <name not found> = ArrayList@560[1] { ResolutionCandidate@561 }
 }
 
-ResolutionTaskHolder@564 {
-    <name not found> = ArrayList@565[1] { ResolutionCandidate@566 }
-    <name not found> = ArrayList@567[1] { ResolutionCandidate@566 }
+ResolutionTaskHolder@562 {
+    <name not found> = ArrayList@563[1] { ResolutionCandidate@564 }
+}
+
+ResolutionTaskHolder@565 {
+    <name not found> = ArrayList@566[1] { ResolutionCandidate@567 }
 }
 
 ResolutionTaskHolder@568 {
     <name not found> = ArrayList@569[1] { ResolutionCandidate@570 }
-    <name not found> = ArrayList@571[1] { ResolutionCandidate@570 }
 }
 
-ResolutionTaskHolder@572 {
-    <name not found> = ArrayList@573[1] { ResolutionCandidate@574 }
-    <name not found> = ArrayList@575[1] { ResolutionCandidate@574 }
+ResolutionTaskHolder@571 {
+    <name not found> = ArrayList@572[1] { ResolutionCandidate@573 }
 }
 
-ResolutionTaskHolder@576 {
-    <name not found> = ArrayList@577[1] { ResolutionCandidate@578 }
-    <name not found> = ArrayList@579[1] { ResolutionCandidate@578 }
+ResolutionTaskHolder@574 {
+    <name not found> = ArrayList@575[1] { ResolutionCandidate@576 }
 }
 
-ResolutionTaskHolder@580 {
-    <name not found> = ArrayList@581[1] { ResolutionCandidate@582 }
-    <name not found> = ArrayList@583[1] { ResolutionCandidate@582 }
+ResolutionTaskHolder@577 {
+    <name not found> = ArrayList@578[4] { ResolutionCandidate@579, ResolutionCandidate@580, ResolutionCandidate@581, ... }
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@584 {
-    <name not found> = ArrayList@585[1] { ResolutionCandidate@586 }
-    <name not found> = ArrayList@587[1] { ResolutionCandidate@586 }
+ResolutionTaskHolder@582 {
+    <name not found> = ArrayList@583[4] { ResolutionCandidate@584, ResolutionCandidate@585, ResolutionCandidate@586, ... }
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+}
+
+ResolutionTaskHolder@587 {
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
 }
 
 ResolutionTaskHolder@588 {
-    <name not found> = ArrayList@589[1] { ResolutionCandidate@590 }
-    <name not found> = ArrayList@591[1] { ResolutionCandidate@590 }
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@592 {
-    <name not found> = ArrayList@593[1] { ResolutionCandidate@594 }
-    <name not found> = ArrayList@595[1] { ResolutionCandidate@594 }
+ResolutionTaskHolder@589 {
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@596 {
-    <name not found> = ArrayList@597[1] { ResolutionCandidate@598 }
-    <name not found> = ArrayList@599[1] { ResolutionCandidate@598 }
+ResolutionTaskHolder@590 {
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@600 {
-    <name not found> = ArrayList@601[1] { ResolutionCandidate@602 }
-    <name not found> = ArrayList@603[1] { ResolutionCandidate@602 }
-}
-
-ResolutionTaskHolder@604 {
-    <name not found> = ArrayList@605[1] { ResolutionCandidate@606 }
-    <name not found> = ArrayList@607[1] { ResolutionCandidate@606 }
-}
-
-ResolutionTaskHolder@608 {
-    <name not found> = ArrayList@609[1] { ResolutionCandidate@610 }
-    <name not found> = ArrayList@611[1] { ResolutionCandidate@610 }
-}
-
-ResolutionTaskHolder@612 {
-    <name not found> = ArrayList@613[1] { ResolutionCandidate@614 }
-    <name not found> = ArrayList@615[1] { ResolutionCandidate@614 }
-}
-
-ResolutionTaskHolder@616 {
-    <name not found> = ArrayList@617[1] { ResolutionCandidate@618 }
-    <name not found> = ArrayList@619[1] { ResolutionCandidate@618 }
-}
-
-ResolutionTaskHolder@620 {
-    <name not found> = ArrayList@621[1] { ResolutionCandidate@622 }
-    <name not found> = ArrayList@623[1] { ResolutionCandidate@622 }
-}
-
-ResolutionTaskHolder@624 {
-    <name not found> = ArrayList@625[1] { ResolutionCandidate@626 }
-    <name not found> = ArrayList@627[1] { ResolutionCandidate@626 }
-}
-
-ResolutionTaskHolder@628 {
-    <name not found> = ArrayList@629[1] { ResolutionCandidate@630 }
-    <name not found> = ArrayList@631[1] { ResolutionCandidate@630 }
-}
-
-ResolutionTaskHolder@632 {
-    <name not found> = ArrayList@633[1] { ResolutionCandidate@634 }
-    <name not found> = ArrayList@635[1] { ResolutionCandidate@634 }
-}
-
-ResolutionTaskHolder@636 {
-    <name not found> = ArrayList@637[1] { ResolutionCandidate@638 }
-    <name not found> = ArrayList@639[1] { ResolutionCandidate@638 }
-}
-
-ResolutionTaskHolder@640 {
-    <name not found> = ArrayList@641[1] { ResolutionCandidate@642 }
-    <name not found> = ArrayList@643[1] { ResolutionCandidate@642 }
-}
-
-ResolutionTaskHolder@644 {
-    <name not found> = ArrayList@645[1] { ResolutionCandidate@646 }
-    <name not found> = ArrayList@647[1] { ResolutionCandidate@646 }
-}
-
-ResolutionTaskHolder@648 {
-    <name not found> = ArrayList@649[1] { ResolutionCandidate@650 }
-    <name not found> = ArrayList@651[1] { ResolutionCandidate@650 }
-}
-
-ResolutionTaskHolder@652 {
-    <name not found> = ArrayList@653[1] { ResolutionCandidate@654 }
-    <name not found> = ArrayList@655[1] { ResolutionCandidate@654 }
-}
-
-ResolutionTaskHolder@656 {
-    <name not found> = ArrayList@657[1] { ResolutionCandidate@658 }
-    <name not found> = ArrayList@659[1] { ResolutionCandidate@658 }
-}
-
-ResolutionTaskHolder@660 {
-    <name not found> = ArrayList@661[1] { ResolutionCandidate@662 }
-    <name not found> = ArrayList@663[1] { ResolutionCandidate@662 }
-}
-
-ResolutionTaskHolder@664 {
-    <name not found> = ArrayList@665[1] { ResolutionCandidate@666 }
-    <name not found> = ArrayList@667[1] { ResolutionCandidate@666 }
-}
-
-ResolutionTaskHolder@668 {
-    <name not found> = ArrayList@669[1] { ResolutionCandidate@670 }
-    <name not found> = ArrayList@671[1] { ResolutionCandidate@670 }
-}
-
-ResolutionTaskHolder@672 {
-    <name not found> = ArrayList@673[1] { ResolutionCandidate@674 }
-    <name not found> = ArrayList@675[1] { ResolutionCandidate@674 }
-}
-
-ResolutionTaskHolder@676 {
-    <name not found> = ArrayList@677[1] { ResolutionCandidate@678 }
-    <name not found> = ArrayList@679[1] { ResolutionCandidate@678 }
-}
-
-ResolutionTaskHolder@680 {
-    <name not found> = ArrayList@681[1] { ResolutionCandidate@682 }
-    <name not found> = ArrayList@683[1] { ResolutionCandidate@682 }
-}
-
-ResolutionTaskHolder@684 {
-    <name not found> = ArrayList@685[1] { ResolutionCandidate@686 }
-    <name not found> = ArrayList@687[1] { ResolutionCandidate@686 }
-}
-
-ResolutionTaskHolder@688 {
-    <name not found> = ArrayList@689[1] { ResolutionCandidate@690 }
-    <name not found> = ArrayList@691[1] { ResolutionCandidate@690 }
-}
-
-ResolutionTaskHolder@692 {
-    <name not found> = ArrayList@693[1] { ResolutionCandidate@694 }
-    <name not found> = ArrayList@695[1] { ResolutionCandidate@694 }
-}
-
-ResolutionTaskHolder@696 {
-    <name not found> = ArrayList@697[1] { ResolutionCandidate@698 }
-    <name not found> = ArrayList@699[1] { ResolutionCandidate@698 }
-}
-
-ResolutionTaskHolder@700 {
-    <name not found> = ArrayList@701[1] { ResolutionCandidate@702 }
-    <name not found> = ArrayList@703[1] { ResolutionCandidate@702 }
-}
-
-ResolutionTaskHolder@704 {
-    <name not found> = ArrayList@705[1] { ResolutionCandidate@706 }
-    <name not found> = ArrayList@707[1] { ResolutionCandidate@706 }
-}
-
-ResolutionTaskHolder@708 {
-    <name not found> = ArrayList@709[1] { ResolutionCandidate@710 }
-    <name not found> = ArrayList@711[1] { ResolutionCandidate@710 }
-}
-
-ResolutionTaskHolder@712 {
-    <name not found> = ArrayList@713[1] { ResolutionCandidate@714 }
-    <name not found> = ArrayList@715[1] { ResolutionCandidate@714 }
-}
-
-ResolutionTaskHolder@716 {
-    <name not found> = ArrayList@717[1] { ResolutionCandidate@718 }
-    <name not found> = ArrayList@719[1] { ResolutionCandidate@718 }
-}
-
-ResolutionTaskHolder@720 {
-    <name not found> = ArrayList@721[1] { ResolutionCandidate@722 }
-    <name not found> = ArrayList@723[1] { ResolutionCandidate@722 }
-}
-
-ResolutionTaskHolder@724 {
-    <name not found> = ArrayList@725[1] { ResolutionCandidate@726 }
-    <name not found> = ArrayList@727[1] { ResolutionCandidate@726 }
-}
-
-ResolutionTaskHolder@728 {
-    <name not found> = ArrayList@729[4] { ResolutionCandidate@730, ResolutionCandidate@731, ResolutionCandidate@732, ... }
-    <name not found> = ArrayList@733[5] { ResolutionCandidate@730, ResolutionCandidate@731, ResolutionCandidate@732, ... }
+ResolutionTaskHolder@591 {
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -2458,9 +1951,23 @@ ResolutionTaskHolder@728 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@734 {
-    <name not found> = ArrayList@735[4] { ResolutionCandidate@736, ResolutionCandidate@737, ResolutionCandidate@738, ... }
-    <name not found> = ArrayList@739[5] { ResolutionCandidate@736, ResolutionCandidate@737, ResolutionCandidate@738, ... }
+ResolutionTaskHolder@592 {
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -2479,7 +1986,7 @@ ResolutionTaskHolder@734 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@740 {
+ResolutionTaskHolder@593 {
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -2504,6 +2011,44 @@ ResolutionTaskHolder@740 {
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
+}
+
+ResolutionTaskHolder@594 {
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+}
+
+ResolutionTaskHolder@595 {
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -2522,23 +2067,7 @@ ResolutionTaskHolder@740 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@741 {
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@596 {
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -2565,23 +2094,7 @@ ResolutionTaskHolder@741 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@742 {
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@597 {
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -2608,23 +2121,7 @@ ResolutionTaskHolder@742 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@743 {
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@598 {
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -2651,7 +2148,754 @@ ResolutionTaskHolder@743 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@744 {
+null {
+    <name not found> = ArrayList@599[1] { ResolutionCandidate@210 }
+    <name not found> = ArrayList@600[1] { ResolutionCandidate@258 }
+    <name not found> = ArrayList@601[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@602[1] { ResolutionCandidate@195 }
+    <name not found> = ArrayList@603[1] { ResolutionCandidate@141 }
+    <name not found> = ArrayList@604[1] { ResolutionCandidate@300 }
+    <name not found> = ArrayList@605[1] { ResolutionCandidate@522 }
+    <name not found> = ArrayList@606[1] { ResolutionCandidate@192 }
+    <name not found> = ArrayList@607[1] { ResolutionCandidate@549 }
+    <name not found> = ArrayList@608[1] { ResolutionCandidate@186 }
+    <name not found> = ArrayList@609[1] { ResolutionCandidate@297 }
+    <name not found> = ArrayList@610[1] { ResolutionCandidate@363 }
+    <name not found> = ArrayList@611[1] { ResolutionCandidate@267 }
+    <name not found> = ArrayList@612[1] { ResolutionCandidate@132 }
+    <name not found> = ArrayList@613[1] { ResolutionCandidate@222 }
+    <name not found> = ArrayList@614[1] { ResolutionCandidate@153 }
+    <name not found> = ArrayList@615[1] { ResolutionCandidate@201 }
+    <name not found> = ArrayList@616[1] { ResolutionCandidate@438 }
+    <name not found> = ArrayList@617[1] { ResolutionCandidate@264 }
+    <name not found> = ArrayList@618[1] { ResolutionCandidate@567 }
+    <name not found> = ArrayList@619[1] { ResolutionCandidate@246 }
+    <name not found> = ArrayList@620[1] { ResolutionCandidate@240 }
+    <name not found> = ArrayList@621[1] { ResolutionCandidate@231 }
+    <name not found> = ArrayList@622[1] { ResolutionCandidate@525 }
+    <name not found> = ArrayList@623[1] { ResolutionCandidate@189 }
+    <name not found> = ArrayList@624[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@625[1] { ResolutionCandidate@279 }
+    <name not found> = ArrayList@626[1] { ResolutionCandidate@474 }
+    <name not found> = ArrayList@627[1] { ResolutionCandidate@282 }
+    <name not found> = ArrayList@628[1] { ResolutionCandidate@537 }
+    <name not found> = ArrayList@629[1] { ResolutionCandidate@219 }
+    <name not found> = ArrayList@630[1] { ResolutionCandidate@204 }
+    <name not found> = ArrayList@631[1] { ResolutionCandidate@396 }
+    <name not found> = ArrayList@632[1] { ResolutionCandidate@270 }
+    <name not found> = ArrayList@633[1] { ResolutionCandidate@543 }
+    <name not found> = ArrayList@634[1] { ResolutionCandidate@273 }
+    <name not found> = ArrayList@635[1] { ResolutionCandidate@147 }
+    <name not found> = ArrayList@636[1] { ResolutionCandidate@249 }
+    <name not found> = ArrayList@637[1] { ResolutionCandidate@507 }
+    <name not found> = ArrayList@638[1] { ResolutionCandidate@234 }
+    <name not found> = ArrayList@639[1] { ResolutionCandidate@492 }
+    <name not found> = ArrayList@640[1] { ResolutionCandidate@198 }
+    <name not found> = ArrayList@641[1] { ResolutionCandidate@306 }
+    <name not found> = ArrayList@642[1] { ResolutionCandidate@216 }
+    <name not found> = ArrayList@643[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@644[1] { ResolutionCandidate@207 }
+    <name not found> = ArrayList@645[1] { ResolutionCandidate@126 }
+    <name not found> = ArrayList@646[1] { ResolutionCandidate@261 }
+    <name not found> = ArrayList@647[1] { ResolutionCandidate@534 }
+    <name not found> = ArrayList@648[1] { ResolutionCandidate@276 }
+    <name not found> = ArrayList@649[1] { ResolutionCandidate@564 }
+    <name not found> = ArrayList@650[1] { ResolutionCandidate@237 }
+    <name not found> = ArrayList@651[1] { ResolutionCandidate@303 }
+    <name not found> = ArrayList@652[1] { ResolutionCandidate@399 }
+    <name not found> = ArrayList@653[1] { ResolutionCandidate@243 }
+    <name not found> = ArrayList@654[1] { ResolutionCandidate@129 }
+    <name not found> = ArrayList@655[1] { ResolutionCandidate@213 }
+    <name not found> = ArrayList@656[1] { ResolutionCandidate@135 }
+    <name not found> = ArrayList@657[1] { ResolutionCandidate@285 }
+    <name not found> = ArrayList@658[1] { ResolutionCandidate@471 }
+    <name not found> = ArrayList@659[1] { ResolutionCandidate@225 }
+    <name not found> = ArrayList@660[1] { ResolutionCandidate@516 }
+    <name not found> = ArrayList@661[1] { ResolutionCandidate@228 }
+    <name not found> = ArrayList@662[1] { ResolutionCandidate@411 }
+    <name not found> = ArrayList@663[1] { ResolutionCandidate@369 }
+    <name not found> = ArrayList@664[1] { ResolutionCandidate@171 }
+    <name not found> = ArrayList@665[1] { ResolutionCandidate@348 }
+    <name not found> = ArrayList@666[1] { ResolutionCandidate@156 }
+    <name not found> = ArrayList@667[1] { ResolutionCandidate@405 }
+    <name not found> = ArrayList@668[1] { ResolutionCandidate@513 }
+    <name not found> = ArrayList@669[1] { ResolutionCandidate@339 }
+    <name not found> = ArrayList@670[1] { ResolutionCandidate@531 }
+    <name not found> = ArrayList@671[1] { ResolutionCandidate@360 }
+    <name not found> = ArrayList@672[1] { ResolutionCandidate@357 }
+    <name not found> = ArrayList@673[1] { ResolutionCandidate@372 }
+    <name not found> = ArrayList@674[1] { ResolutionCandidate@165 }
+    <name not found> = ArrayList@675[1] { ResolutionCandidate@342 }
+    <name not found> = ArrayList@676[1] { ResolutionCandidate@183 }
+    <name not found> = ArrayList@677[1] { ResolutionCandidate@345 }
+    <name not found> = ArrayList@678[1] { ResolutionCandidate@501 }
+    <name not found> = ArrayList@679[1] { ResolutionCandidate@402 }
+    <name not found> = ArrayList@680[1] { ResolutionCandidate@441 }
+    <name not found> = ArrayList@681[1] { ResolutionCandidate@417 }
+    <name not found> = ArrayList@682[1] { ResolutionCandidate@336 }
+    <name not found> = ArrayList@683[1] { ResolutionCandidate@312 }
+    <name not found> = ArrayList@684[1] { ResolutionCandidate@483 }
+    <name not found> = ArrayList@685[1] { ResolutionCandidate@423 }
+    <name not found> = ArrayList@686[1] { ResolutionCandidate@180 }
+    <name not found> = ArrayList@687[1] { ResolutionCandidate@351 }
+    <name not found> = ArrayList@688[1] { ResolutionCandidate@552 }
+    <name not found> = ArrayList@689[1] { ResolutionCandidate@420 }
+    <name not found> = ArrayList@690[1] { ResolutionCandidate@540 }
+    <name not found> = ArrayList@691[1] { ResolutionCandidate@375 }
+    <name not found> = ArrayList@692[1] { ResolutionCandidate@426 }
+    <name not found> = ArrayList@693[1] { ResolutionCandidate@390 }
+    <name not found> = ArrayList@694[1] { ResolutionCandidate@510 }
+    <name not found> = ArrayList@695[1] { ResolutionCandidate@366 }
+    <name not found> = ArrayList@696[1] { ResolutionCandidate@162 }
+    <name not found> = ArrayList@697[1] { ResolutionCandidate@318 }
+    <name not found> = ArrayList@698[1] { ResolutionCandidate@528 }
+    <name not found> = ArrayList@699[1] { ResolutionCandidate@414 }
+    <name not found> = ArrayList@700[1] { ResolutionCandidate@432 }
+    <name not found> = ArrayList@701[1] { ResolutionCandidate@354 }
+    <name not found> = ArrayList@702[1] { ResolutionCandidate@327 }
+    <name not found> = ArrayList@703[1] { ResolutionCandidate@378 }
+    <name not found> = ArrayList@704[1] { ResolutionCandidate@159 }
+    <name not found> = ArrayList@705[1] { ResolutionCandidate@324 }
+    <name not found> = ArrayList@706[1] { ResolutionCandidate@174 }
+    <name not found> = ArrayList@707[1] { ResolutionCandidate@393 }
+    <name not found> = ArrayList@708[1] { ResolutionCandidate@429 }
+    <name not found> = ArrayList@709[1] { ResolutionCandidate@321 }
+    <name not found> = ArrayList@710[1] { ResolutionCandidate@489 }
+    <name not found> = ArrayList@711[1] { ResolutionCandidate@387 }
+    <name not found> = ArrayList@712[1] { ResolutionCandidate@333 }
+    <name not found> = ArrayList@713[1] { ResolutionCandidate@381 }
+    <name not found> = ArrayList@714[1] { ResolutionCandidate@177 }
+    <name not found> = ArrayList@715[1] { ResolutionCandidate@408 }
+    <name not found> = ArrayList@716[1] { ResolutionCandidate@168 }
+    <name not found> = ArrayList@717[1] { ResolutionCandidate@330 }
+    <name not found> = ArrayList@718[1] { ResolutionCandidate@498 }
+    <name not found> = ArrayList@719[1] { ResolutionCandidate@315 }
+    <name not found> = ArrayList@720[1] { ResolutionCandidate@558 }
+    <name not found> = ArrayList@721[1] { ResolutionCandidate@384 }
+    <name not found> = ArrayList@722[1] { ResolutionCandidate@447 }
+    <name not found> = ArrayList@723[1] { ResolutionCandidate@480 }
+    <name not found> = ArrayList@724[1] { ResolutionCandidate@570 }
+    <name not found> = ArrayList@725[1] { ResolutionCandidate@453 }
+    <name not found> = ArrayList@726[1] { ResolutionCandidate@291 }
+    <name not found> = ArrayList@727[1] { ResolutionCandidate@573 }
+    <name not found> = ArrayList@728[1] { ResolutionCandidate@576 }
+    <name not found> = ArrayList@729[1] { ResolutionCandidate@555 }
+    <name not found> = ArrayList@730[1] { ResolutionCandidate@486 }
+    <name not found> = ArrayList@731[1] { ResolutionCandidate@294 }
+    <name not found> = ArrayList@732[1] { ResolutionCandidate@435 }
+    <name not found> = ArrayList@733[1] { ResolutionCandidate@477 }
+    <name not found> = ArrayList@734[1] { ResolutionCandidate@450 }
+    <name not found> = ArrayList@735[1] { ResolutionCandidate@255 }
+    <name not found> = ArrayList@736[1] { ResolutionCandidate@456 }
+    <name not found> = ArrayList@737[1] { ResolutionCandidate@546 }
+    <name not found> = ArrayList@738[1] { ResolutionCandidate@462 }
+    <name not found> = ArrayList@739[1] { ResolutionCandidate@468 }
+    <name not found> = ArrayList@740[1] { ResolutionCandidate@252 }
+    <name not found> = ArrayList@741[1] { ResolutionCandidate@519 }
+    <name not found> = ArrayList@742[1] { ResolutionCandidate@495 }
+    <name not found> = ArrayList@743[1] { ResolutionCandidate@444 }
+    <name not found> = ArrayList@744[1] { ResolutionCandidate@288 }
+    <name not found> = ArrayList@745[1] { ResolutionCandidate@561 }
+    <name not found> = ArrayList@746[1] { ResolutionCandidate@465 }
+    <name not found> = ArrayList@747[1] { ResolutionCandidate@459 }
+    <name not found> = ArrayList@748[1] { ResolutionCandidate@504 }
+    <name not found> = ArrayList@749[1] { ResolutionCandidate@309 }
+    <name not found> = ArrayList@750[5] { ResolutionCandidate@579, ResolutionCandidate@580, ResolutionCandidate@581, ... }
+    <name not found> = ArrayList@751[5] { ResolutionCandidate@584, ResolutionCandidate@585, ResolutionCandidate@586, ... }
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -2693,244 +2937,3 @@ ResolutionTaskHolder@744 {
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
 }
-
-ResolutionTaskHolder@745 {
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@746 {
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@747 {
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@748 {
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@749 {
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@750 {
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@751 {
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/inference/useExpectedTypeForVal.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/inference/useExpectedTypeForVal.lazy.log
index cf3e0ed8df5..133064eea79 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/inference/useExpectedTypeForVal.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/inference/useExpectedTypeForVal.lazy.log
@@ -40,14 +40,14 @@ LazyJavaClassifierType@24['String'] {
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@23['String']
+    classifier = JavaClassImpl@18['String']
     nullable = 'true': Boolean@29
     typeConstructor = DeserializedClassTypeConstructor@20
 }
 
 LazyJavaClassifierType@30['String'] {
     arguments = ArrayList@31[empty]
-    classifier = JavaClassImpl@18['String']
+    classifier = JavaClassImpl@23['String']
     nullable = 'true': Boolean@29
     typeConstructor = DeserializedClassTypeConstructor@20
 }
@@ -82,14 +82,14 @@ LazyJavaClassifierType@41['Throwable'] {
 
 LazyJavaClassifierType@44['Throwable'] {
     arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@36['Throwable']
+    classifier = JavaClassImpl@43['Throwable']
     nullable = 'true': Boolean@29
     typeConstructor = DeserializedClassTypeConstructor@37
 }
 
 LazyJavaClassifierType@46['Throwable'] {
     arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@43['Throwable']
+    classifier = JavaClassImpl@36['Throwable']
     nullable = 'true': Boolean@29
     typeConstructor = DeserializedClassTypeConstructor@37
 }
@@ -194,14 +194,6 @@ LazyJavaPackageFragment@85['lang'] {
 
 ResolutionTaskHolder@123 {
     <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@125 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -235,16 +227,8 @@ ResolutionTaskHolder@123 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@129 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@126 {
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -278,9 +262,8 @@ ResolutionTaskHolder@127 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@133 }
+ResolutionTaskHolder@129 {
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -312,6 +295,34 @@ ResolutionTaskHolder@131 {
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
+}
+
+ResolutionTaskHolder@132 {
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -323,22 +334,6 @@ ResolutionTaskHolder@131 {
 
 ResolutionTaskHolder@135 {
     <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@137 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -364,14 +359,8 @@ ResolutionTaskHolder@135 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@141 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@138 {
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -397,9 +386,8 @@ ResolutionTaskHolder@139 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@145 }
+ResolutionTaskHolder@141 {
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -423,6 +411,28 @@ ResolutionTaskHolder@143 {
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
+}
+
+ResolutionTaskHolder@144 {
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -432,27 +442,6 @@ ResolutionTaskHolder@143 {
 
 ResolutionTaskHolder@147 {
     <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@149 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -463,29 +452,8 @@ ResolutionTaskHolder@147 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@153 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@150 {
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -496,9 +464,8 @@ ResolutionTaskHolder@151 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@155 {
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@157 }
+ResolutionTaskHolder@153 {
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -507,6 +474,10 @@ ResolutionTaskHolder@155 {
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
+}
+
+ResolutionTaskHolder@156 {
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -519,15 +490,6 @@ ResolutionTaskHolder@155 {
 
 ResolutionTaskHolder@159 {
     <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@161 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -538,17 +500,8 @@ ResolutionTaskHolder@159 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@163 {
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@165 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@162 {
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -559,9 +512,8 @@ ResolutionTaskHolder@163 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@167 {
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@169 }
+ResolutionTaskHolder@165 {
+    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -570,6 +522,10 @@ ResolutionTaskHolder@167 {
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
+}
+
+ResolutionTaskHolder@168 {
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -582,15 +538,6 @@ ResolutionTaskHolder@167 {
 
 ResolutionTaskHolder@171 {
     <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@173 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -601,17 +548,8 @@ ResolutionTaskHolder@171 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@175 {
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@177 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@174 {
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -622,9 +560,8 @@ ResolutionTaskHolder@175 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@179 {
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@181 }
+ResolutionTaskHolder@177 {
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -633,6 +570,10 @@ ResolutionTaskHolder@179 {
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
+}
+
+ResolutionTaskHolder@180 {
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -645,15 +586,6 @@ ResolutionTaskHolder@179 {
 
 ResolutionTaskHolder@183 {
     <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@185 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -664,17 +596,8 @@ ResolutionTaskHolder@183 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@187 {
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@189 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@186 {
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -685,9 +608,8 @@ ResolutionTaskHolder@187 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@191 {
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@193 }
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@193 }
+ResolutionTaskHolder@189 {
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -696,6 +618,10 @@ ResolutionTaskHolder@191 {
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
+}
+
+ResolutionTaskHolder@192 {
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -708,15 +634,6 @@ ResolutionTaskHolder@191 {
 
 ResolutionTaskHolder@195 {
     <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@197 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -727,17 +644,8 @@ ResolutionTaskHolder@195 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@199 {
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@201 }
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@201 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@198 {
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -748,9 +656,8 @@ ResolutionTaskHolder@199 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@203 {
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@205 }
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@205 }
+ResolutionTaskHolder@201 {
+    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -759,6 +666,10 @@ ResolutionTaskHolder@203 {
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
+}
+
+ResolutionTaskHolder@204 {
+    <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -771,15 +682,6 @@ ResolutionTaskHolder@203 {
 
 ResolutionTaskHolder@207 {
     <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@209 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -790,17 +692,8 @@ ResolutionTaskHolder@207 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@211 {
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@213 }
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@213 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@210 {
+    <name not found> = ArrayList@211[1] { ResolutionCandidate@212 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -811,9 +704,8 @@ ResolutionTaskHolder@211 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@215 {
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@217 }
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@217 }
+ResolutionTaskHolder@213 {
+    <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -822,6 +714,10 @@ ResolutionTaskHolder@215 {
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
+}
+
+ResolutionTaskHolder@216 {
+    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -834,15 +730,6 @@ ResolutionTaskHolder@215 {
 
 ResolutionTaskHolder@219 {
     <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@221 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -853,17 +740,8 @@ ResolutionTaskHolder@219 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@223 {
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@225 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@222 {
+    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -874,15 +752,8 @@ ResolutionTaskHolder@223 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@227 {
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@229 }
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@229 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@225 {
+    <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -891,554 +762,490 @@ ResolutionTaskHolder@227 {
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
+}
+
+ResolutionTaskHolder@228 {
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
 }
 
 ResolutionTaskHolder@231 {
     <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@233 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@235 {
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@237 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@234 {
+    <name not found> = ArrayList@235[1] { ResolutionCandidate@236 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@239 {
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@241 }
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@241 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@237 {
+    <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
+}
+
+ResolutionTaskHolder@240 {
+    <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
 }
 
 ResolutionTaskHolder@243 {
     <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@245 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@247 {
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@249 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@246 {
+    <name not found> = ArrayList@247[1] { ResolutionCandidate@248 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@251 {
-    <name not found> = ArrayList@252[1] { ResolutionCandidate@253 }
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@253 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@249 {
+    <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
+}
+
+ResolutionTaskHolder@252 {
+    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
 }
 
 ResolutionTaskHolder@255 {
     <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
-    <name not found> = ArrayList@258[1] { ResolutionCandidate@257 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@259 {
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@261 }
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@261 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@258 {
+    <name not found> = ArrayList@259[1] { ResolutionCandidate@260 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@263 {
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@265 }
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@265 }
+ResolutionTaskHolder@261 {
+    <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
+}
+
+ResolutionTaskHolder@264 {
+    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
 }
 
 ResolutionTaskHolder@267 {
     <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
-    <name not found> = ArrayList@270[1] { ResolutionCandidate@269 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@271 {
-    <name not found> = ArrayList@272[1] { ResolutionCandidate@273 }
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@273 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@270 {
+    <name not found> = ArrayList@271[1] { ResolutionCandidate@272 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@275 {
-    <name not found> = ArrayList@276[1] { ResolutionCandidate@277 }
-    <name not found> = ArrayList@278[1] { ResolutionCandidate@277 }
+ResolutionTaskHolder@273 {
+    <name not found> = ArrayList@274[1] { ResolutionCandidate@275 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
+}
+
+ResolutionTaskHolder@276 {
+    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
 }
 
 ResolutionTaskHolder@279 {
     <name not found> = ArrayList@280[1] { ResolutionCandidate@281 }
-    <name not found> = ArrayList@282[1] { ResolutionCandidate@281 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@283 {
-    <name not found> = ArrayList@284[1] { ResolutionCandidate@285 }
-    <name not found> = ArrayList@286[1] { ResolutionCandidate@285 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@282 {
+    <name not found> = ArrayList@283[1] { ResolutionCandidate@284 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@287 {
-    <name not found> = ArrayList@288[1] { ResolutionCandidate@289 }
-    <name not found> = ArrayList@290[1] { ResolutionCandidate@289 }
+ResolutionTaskHolder@285 {
+    <name not found> = ArrayList@286[1] { ResolutionCandidate@287 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
+}
+
+ResolutionTaskHolder@288 {
+    <name not found> = ArrayList@289[1] { ResolutionCandidate@290 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
 }
 
 ResolutionTaskHolder@291 {
     <name not found> = ArrayList@292[1] { ResolutionCandidate@293 }
-    <name not found> = ArrayList@294[1] { ResolutionCandidate@293 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@295 {
-    <name not found> = ArrayList@296[1] { ResolutionCandidate@297 }
-    <name not found> = ArrayList@298[1] { ResolutionCandidate@297 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@294 {
+    <name not found> = ArrayList@295[1] { ResolutionCandidate@296 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@299 {
-    <name not found> = ArrayList@300[1] { ResolutionCandidate@301 }
-    <name not found> = ArrayList@302[1] { ResolutionCandidate@301 }
+ResolutionTaskHolder@297 {
+    <name not found> = ArrayList@298[1] { ResolutionCandidate@299 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
+}
+
+ResolutionTaskHolder@300 {
+    <name not found> = ArrayList@301[1] { ResolutionCandidate@302 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
 }
 
 ResolutionTaskHolder@303 {
     <name not found> = ArrayList@304[1] { ResolutionCandidate@305 }
-    <name not found> = ArrayList@306[1] { ResolutionCandidate@305 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@307 {
-    <name not found> = ArrayList@308[1] { ResolutionCandidate@309 }
-    <name not found> = ArrayList@310[1] { ResolutionCandidate@309 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@306 {
+    <name not found> = ArrayList@307[1] { ResolutionCandidate@308 }
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@311 {
-    <name not found> = ArrayList@312[1] { ResolutionCandidate@313 }
-    <name not found> = ArrayList@314[1] { ResolutionCandidate@313 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@309 {
+    <name not found> = ArrayList@310[1] { ResolutionCandidate@311 }
+}
+
+ResolutionTaskHolder@312 {
+    <name not found> = ArrayList@313[1] { ResolutionCandidate@314 }
 }
 
 ResolutionTaskHolder@315 {
     <name not found> = ArrayList@316[1] { ResolutionCandidate@317 }
-    <name not found> = ArrayList@318[1] { ResolutionCandidate@317 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@319 {
-    <name not found> = ArrayList@320[1] { ResolutionCandidate@321 }
-    <name not found> = ArrayList@322[1] { ResolutionCandidate@321 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@318 {
+    <name not found> = ArrayList@319[1] { ResolutionCandidate@320 }
 }
 
-ResolutionTaskHolder@323 {
-    <name not found> = ArrayList@324[1] { ResolutionCandidate@325 }
-    <name not found> = ArrayList@326[1] { ResolutionCandidate@325 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@321 {
+    <name not found> = ArrayList@322[1] { ResolutionCandidate@323 }
+}
+
+ResolutionTaskHolder@324 {
+    <name not found> = ArrayList@325[1] { ResolutionCandidate@326 }
 }
 
 ResolutionTaskHolder@327 {
     <name not found> = ArrayList@328[1] { ResolutionCandidate@329 }
-    <name not found> = ArrayList@330[1] { ResolutionCandidate@329 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@331 {
-    <name not found> = ArrayList@332[1] { ResolutionCandidate@333 }
-    <name not found> = ArrayList@334[1] { ResolutionCandidate@333 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@330 {
+    <name not found> = ArrayList@331[1] { ResolutionCandidate@332 }
 }
 
-ResolutionTaskHolder@335 {
-    <name not found> = ArrayList@336[1] { ResolutionCandidate@337 }
-    <name not found> = ArrayList@338[1] { ResolutionCandidate@337 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@333 {
+    <name not found> = ArrayList@334[1] { ResolutionCandidate@335 }
+}
+
+ResolutionTaskHolder@336 {
+    <name not found> = ArrayList@337[1] { ResolutionCandidate@338 }
 }
 
 ResolutionTaskHolder@339 {
     <name not found> = ArrayList@340[1] { ResolutionCandidate@341 }
-    <name not found> = ArrayList@342[1] { ResolutionCandidate@341 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@343 {
-    <name not found> = ArrayList@344[1] { ResolutionCandidate@345 }
-    <name not found> = ArrayList@346[1] { ResolutionCandidate@345 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@342 {
+    <name not found> = ArrayList@343[1] { ResolutionCandidate@344 }
 }
 
-ResolutionTaskHolder@347 {
-    <name not found> = ArrayList@348[1] { ResolutionCandidate@349 }
-    <name not found> = ArrayList@350[1] { ResolutionCandidate@349 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@345 {
+    <name not found> = ArrayList@346[1] { ResolutionCandidate@347 }
+}
+
+ResolutionTaskHolder@348 {
+    <name not found> = ArrayList@349[1] { ResolutionCandidate@350 }
 }
 
 ResolutionTaskHolder@351 {
     <name not found> = ArrayList@352[1] { ResolutionCandidate@353 }
-    <name not found> = ArrayList@354[1] { ResolutionCandidate@353 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@355 {
-    <name not found> = ArrayList@356[1] { ResolutionCandidate@357 }
-    <name not found> = ArrayList@358[1] { ResolutionCandidate@357 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@354 {
+    <name not found> = ArrayList@355[1] { ResolutionCandidate@356 }
 }
 
-ResolutionTaskHolder@359 {
-    <name not found> = ArrayList@360[1] { ResolutionCandidate@361 }
-    <name not found> = ArrayList@362[1] { ResolutionCandidate@361 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@357 {
+    <name not found> = ArrayList@358[1] { ResolutionCandidate@359 }
+}
+
+ResolutionTaskHolder@360 {
+    <name not found> = ArrayList@361[1] { ResolutionCandidate@362 }
 }
 
 ResolutionTaskHolder@363 {
     <name not found> = ArrayList@364[1] { ResolutionCandidate@365 }
-    <name not found> = ArrayList@366[1] { ResolutionCandidate@365 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@367 {
-    <name not found> = ArrayList@368[1] { ResolutionCandidate@369 }
-    <name not found> = ArrayList@370[1] { ResolutionCandidate@369 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@366 {
+    <name not found> = ArrayList@367[1] { ResolutionCandidate@368 }
 }
 
-ResolutionTaskHolder@371 {
-    <name not found> = ArrayList@372[1] { ResolutionCandidate@373 }
-    <name not found> = ArrayList@374[1] { ResolutionCandidate@373 }
+ResolutionTaskHolder@369 {
+    <name not found> = ArrayList@370[1] { ResolutionCandidate@371 }
+}
+
+ResolutionTaskHolder@372 {
+    <name not found> = ArrayList@373[1] { ResolutionCandidate@374 }
 }
 
 ResolutionTaskHolder@375 {
     <name not found> = ArrayList@376[1] { ResolutionCandidate@377 }
-    <name not found> = ArrayList@378[1] { ResolutionCandidate@377 }
 }
 
-ResolutionTaskHolder@379 {
-    <name not found> = ArrayList@380[1] { ResolutionCandidate@381 }
-    <name not found> = ArrayList@382[1] { ResolutionCandidate@381 }
+ResolutionTaskHolder@378 {
+    <name not found> = ArrayList@379[1] { ResolutionCandidate@380 }
 }
 
-ResolutionTaskHolder@383 {
-    <name not found> = ArrayList@384[1] { ResolutionCandidate@385 }
-    <name not found> = ArrayList@386[1] { ResolutionCandidate@385 }
+ResolutionTaskHolder@381 {
+    <name not found> = ArrayList@382[1] { ResolutionCandidate@383 }
+}
+
+ResolutionTaskHolder@384 {
+    <name not found> = ArrayList@385[1] { ResolutionCandidate@386 }
 }
 
 ResolutionTaskHolder@387 {
-    <name not found> = ArrayList@388[1] { ResolutionCandidate@389 }
-    <name not found> = ArrayList@390[1] { ResolutionCandidate@389 }
+    <name not found> = ArrayList@388[4] { ResolutionCandidate@389, ResolutionCandidate@390, ResolutionCandidate@391, ... }
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@391 {
-    <name not found> = ArrayList@392[1] { ResolutionCandidate@393 }
-    <name not found> = ArrayList@394[1] { ResolutionCandidate@393 }
+ResolutionTaskHolder@392 {
+    <name not found> = ArrayList@393[4] { ResolutionCandidate@394, ResolutionCandidate@395, ResolutionCandidate@396, ... }
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@395 {
-    <name not found> = ArrayList@396[1] { ResolutionCandidate@397 }
-    <name not found> = ArrayList@398[1] { ResolutionCandidate@397 }
+ResolutionTaskHolder@397 {
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+}
+
+ResolutionTaskHolder@398 {
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
 }
 
 ResolutionTaskHolder@399 {
-    <name not found> = ArrayList@400[1] { ResolutionCandidate@401 }
-    <name not found> = ArrayList@402[1] { ResolutionCandidate@401 }
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@403 {
-    <name not found> = ArrayList@404[1] { ResolutionCandidate@405 }
-    <name not found> = ArrayList@406[1] { ResolutionCandidate@405 }
+ResolutionTaskHolder@400 {
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@407 {
-    <name not found> = ArrayList@408[1] { ResolutionCandidate@409 }
-    <name not found> = ArrayList@410[1] { ResolutionCandidate@409 }
+ResolutionTaskHolder@401 {
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@411 {
-    <name not found> = ArrayList@412[1] { ResolutionCandidate@413 }
-    <name not found> = ArrayList@414[1] { ResolutionCandidate@413 }
-}
-
-ResolutionTaskHolder@415 {
-    <name not found> = ArrayList@416[1] { ResolutionCandidate@417 }
-    <name not found> = ArrayList@418[1] { ResolutionCandidate@417 }
-}
-
-ResolutionTaskHolder@419 {
-    <name not found> = ArrayList@420[1] { ResolutionCandidate@421 }
-    <name not found> = ArrayList@422[1] { ResolutionCandidate@421 }
-}
-
-ResolutionTaskHolder@423 {
-    <name not found> = ArrayList@424[1] { ResolutionCandidate@425 }
-    <name not found> = ArrayList@426[1] { ResolutionCandidate@425 }
-}
-
-ResolutionTaskHolder@427 {
-    <name not found> = ArrayList@428[1] { ResolutionCandidate@429 }
-    <name not found> = ArrayList@430[1] { ResolutionCandidate@429 }
-}
-
-ResolutionTaskHolder@431 {
-    <name not found> = ArrayList@432[1] { ResolutionCandidate@433 }
-    <name not found> = ArrayList@434[1] { ResolutionCandidate@433 }
-}
-
-ResolutionTaskHolder@435 {
-    <name not found> = ArrayList@436[1] { ResolutionCandidate@437 }
-    <name not found> = ArrayList@438[1] { ResolutionCandidate@437 }
-}
-
-ResolutionTaskHolder@439 {
-    <name not found> = ArrayList@440[1] { ResolutionCandidate@441 }
-    <name not found> = ArrayList@442[1] { ResolutionCandidate@441 }
-}
-
-ResolutionTaskHolder@443 {
-    <name not found> = ArrayList@444[1] { ResolutionCandidate@445 }
-    <name not found> = ArrayList@446[1] { ResolutionCandidate@445 }
-}
-
-ResolutionTaskHolder@447 {
-    <name not found> = ArrayList@448[1] { ResolutionCandidate@449 }
-    <name not found> = ArrayList@450[1] { ResolutionCandidate@449 }
-}
-
-ResolutionTaskHolder@451 {
-    <name not found> = ArrayList@452[1] { ResolutionCandidate@453 }
-    <name not found> = ArrayList@454[1] { ResolutionCandidate@453 }
-}
-
-ResolutionTaskHolder@455 {
-    <name not found> = ArrayList@456[1] { ResolutionCandidate@457 }
-    <name not found> = ArrayList@458[1] { ResolutionCandidate@457 }
-}
-
-ResolutionTaskHolder@459 {
-    <name not found> = ArrayList@460[1] { ResolutionCandidate@461 }
-    <name not found> = ArrayList@462[1] { ResolutionCandidate@461 }
-}
-
-ResolutionTaskHolder@463 {
-    <name not found> = ArrayList@464[1] { ResolutionCandidate@465 }
-    <name not found> = ArrayList@466[1] { ResolutionCandidate@465 }
-}
-
-ResolutionTaskHolder@467 {
-    <name not found> = ArrayList@468[1] { ResolutionCandidate@469 }
-    <name not found> = ArrayList@470[1] { ResolutionCandidate@469 }
-}
-
-ResolutionTaskHolder@471 {
-    <name not found> = ArrayList@472[1] { ResolutionCandidate@473 }
-    <name not found> = ArrayList@474[1] { ResolutionCandidate@473 }
-}
-
-ResolutionTaskHolder@475 {
-    <name not found> = ArrayList@476[4] { ResolutionCandidate@477, ResolutionCandidate@478, ResolutionCandidate@479, ... }
-    <name not found> = ArrayList@480[5] { ResolutionCandidate@477, ResolutionCandidate@478, ResolutionCandidate@479, ... }
+ResolutionTaskHolder@402 {
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -1457,9 +1264,15 @@ ResolutionTaskHolder@475 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@481 {
-    <name not found> = ArrayList@482[4] { ResolutionCandidate@483, ResolutionCandidate@484, ResolutionCandidate@485, ... }
-    <name not found> = ArrayList@486[5] { ResolutionCandidate@483, ResolutionCandidate@484, ResolutionCandidate@485, ... }
+ResolutionTaskHolder@403 {
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -1478,7 +1291,7 @@ ResolutionTaskHolder@481 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@487 {
+ResolutionTaskHolder@404 {
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -1503,6 +1316,44 @@ ResolutionTaskHolder@487 {
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
+}
+
+ResolutionTaskHolder@405 {
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+}
+
+ResolutionTaskHolder@406 {
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -1521,23 +1372,7 @@ ResolutionTaskHolder@487 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@488 {
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@407 {
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -1564,23 +1399,7 @@ ResolutionTaskHolder@488 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@489 {
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
+ResolutionTaskHolder@408 {
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -1607,7 +1426,475 @@ ResolutionTaskHolder@489 {
     <name not found> = EmptyList@108[empty]
 }
 
-ResolutionTaskHolder@490 {
+null {
+    <name not found> = ArrayList@409[1] { ResolutionCandidate@218 }
+    <name not found> = ArrayList@410[1] { ResolutionCandidate@188 }
+    <name not found> = ArrayList@411[1] { ResolutionCandidate@134 }
+    <name not found> = ArrayList@412[1] { ResolutionCandidate@224 }
+    <name not found> = ArrayList@413[1] { ResolutionCandidate@368 }
+    <name not found> = ArrayList@414[1] { ResolutionCandidate@221 }
+    <name not found> = ArrayList@415[1] { ResolutionCandidate@227 }
+    <name not found> = ArrayList@416[1] { ResolutionCandidate@284 }
+    <name not found> = ArrayList@417[1] { ResolutionCandidate@197 }
+    <name not found> = ArrayList@418[1] { ResolutionCandidate@125 }
+    <name not found> = ArrayList@419[1] { ResolutionCandidate@209 }
+    <name not found> = ArrayList@420[1] { ResolutionCandidate@323 }
+    <name not found> = ArrayList@421[1] { ResolutionCandidate@203 }
+    <name not found> = ArrayList@422[1] { ResolutionCandidate@185 }
+    <name not found> = ArrayList@423[1] { ResolutionCandidate@212 }
+    <name not found> = ArrayList@424[1] { ResolutionCandidate@311 }
+    <name not found> = ArrayList@425[1] { ResolutionCandidate@182 }
+    <name not found> = ArrayList@426[1] { ResolutionCandidate@326 }
+    <name not found> = ArrayList@427[1] { ResolutionCandidate@176 }
+    <name not found> = ArrayList@428[1] { ResolutionCandidate@206 }
+    <name not found> = ArrayList@429[1] { ResolutionCandidate@236 }
+    <name not found> = ArrayList@430[1] { ResolutionCandidate@155 }
+    <name not found> = ArrayList@431[1] { ResolutionCandidate@380 }
+    <name not found> = ArrayList@432[1] { ResolutionCandidate@173 }
+    <name not found> = ArrayList@433[1] { ResolutionCandidate@347 }
+    <name not found> = ArrayList@434[1] { ResolutionCandidate@161 }
+    <name not found> = ArrayList@435[1] { ResolutionCandidate@191 }
+    <name not found> = ArrayList@436[1] { ResolutionCandidate@164 }
+    <name not found> = ArrayList@437[1] { ResolutionCandidate@128 }
+    <name not found> = ArrayList@438[1] { ResolutionCandidate@170 }
+    <name not found> = ArrayList@439[1] { ResolutionCandidate@335 }
+    <name not found> = ArrayList@440[1] { ResolutionCandidate@152 }
+    <name not found> = ArrayList@441[1] { ResolutionCandidate@200 }
+    <name not found> = ArrayList@442[1] { ResolutionCandidate@257 }
+    <name not found> = ArrayList@443[1] { ResolutionCandidate@215 }
+    <name not found> = ArrayList@444[1] { ResolutionCandidate@131 }
+    <name not found> = ArrayList@445[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@446[1] { ResolutionCandidate@344 }
+    <name not found> = ArrayList@447[1] { ResolutionCandidate@167 }
+    <name not found> = ArrayList@448[1] { ResolutionCandidate@296 }
+    <name not found> = ArrayList@449[1] { ResolutionCandidate@248 }
+    <name not found> = ArrayList@450[1] { ResolutionCandidate@146 }
+    <name not found> = ArrayList@451[1] { ResolutionCandidate@275 }
+    <name not found> = ArrayList@452[1] { ResolutionCandidate@377 }
+    <name not found> = ArrayList@453[1] { ResolutionCandidate@278 }
+    <name not found> = ArrayList@454[1] { ResolutionCandidate@305 }
+    <name not found> = ArrayList@455[1] { ResolutionCandidate@260 }
+    <name not found> = ArrayList@456[1] { ResolutionCandidate@143 }
+    <name not found> = ArrayList@457[1] { ResolutionCandidate@308 }
+    <name not found> = ArrayList@458[1] { ResolutionCandidate@374 }
+    <name not found> = ArrayList@459[1] { ResolutionCandidate@299 }
+    <name not found> = ArrayList@460[1] { ResolutionCandidate@266 }
+    <name not found> = ArrayList@461[1] { ResolutionCandidate@254 }
+    <name not found> = ArrayList@462[1] { ResolutionCandidate@350 }
+    <name not found> = ArrayList@463[1] { ResolutionCandidate@233 }
+    <name not found> = ArrayList@464[1] { ResolutionCandidate@371 }
+    <name not found> = ArrayList@465[1] { ResolutionCandidate@290 }
+    <name not found> = ArrayList@466[1] { ResolutionCandidate@242 }
+    <name not found> = ArrayList@467[1] { ResolutionCandidate@263 }
+    <name not found> = ArrayList@468[1] { ResolutionCandidate@383 }
+    <name not found> = ArrayList@469[1] { ResolutionCandidate@245 }
+    <name not found> = ArrayList@470[1] { ResolutionCandidate@386 }
+    <name not found> = ArrayList@471[1] { ResolutionCandidate@251 }
+    <name not found> = ArrayList@472[1] { ResolutionCandidate@230 }
+    <name not found> = ArrayList@473[1] { ResolutionCandidate@269 }
+    <name not found> = ArrayList@474[1] { ResolutionCandidate@137 }
+    <name not found> = ArrayList@475[1] { ResolutionCandidate@293 }
+    <name not found> = ArrayList@476[1] { ResolutionCandidate@320 }
+    <name not found> = ArrayList@477[1] { ResolutionCandidate@239 }
+    <name not found> = ArrayList@478[1] { ResolutionCandidate@302 }
+    <name not found> = ArrayList@479[1] { ResolutionCandidate@272 }
+    <name not found> = ArrayList@480[1] { ResolutionCandidate@140 }
+    <name not found> = ArrayList@481[1] { ResolutionCandidate@287 }
+    <name not found> = ArrayList@482[1] { ResolutionCandidate@356 }
+    <name not found> = ArrayList@483[1] { ResolutionCandidate@281 }
+    <name not found> = ArrayList@484[1] { ResolutionCandidate@332 }
+    <name not found> = ArrayList@485[1] { ResolutionCandidate@317 }
+    <name not found> = ArrayList@486[1] { ResolutionCandidate@365 }
+    <name not found> = ArrayList@487[1] { ResolutionCandidate@329 }
+    <name not found> = ArrayList@488[1] { ResolutionCandidate@179 }
+    <name not found> = ArrayList@489[1] { ResolutionCandidate@353 }
+    <name not found> = ArrayList@490[1] { ResolutionCandidate@314 }
+    <name not found> = ArrayList@491[1] { ResolutionCandidate@362 }
+    <name not found> = ArrayList@492[1] { ResolutionCandidate@194 }
+    <name not found> = ArrayList@493[1] { ResolutionCandidate@341 }
+    <name not found> = ArrayList@494[1] { ResolutionCandidate@338 }
+    <name not found> = ArrayList@495[1] { ResolutionCandidate@359 }
+    <name not found> = ArrayList@496[1] { ResolutionCandidate@149 }
+    <name not found> = ArrayList@497[5] { ResolutionCandidate@394, ResolutionCandidate@395, ResolutionCandidate@396, ... }
+    <name not found> = ArrayList@498[5] { ResolutionCandidate@389, ResolutionCandidate@390, ResolutionCandidate@391, ... }
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
@@ -1649,287 +1936,3 @@ ResolutionTaskHolder@490 {
     <name not found> = EmptyList@108[empty]
     <name not found> = EmptyList@108[empty]
 }
-
-ResolutionTaskHolder@491 {
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@492 {
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@493 {
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@494 {
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@495 {
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@496 {
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@497 {
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@498 {
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/kt4640.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/kt4640.lazy.log
index d0bc1992330..67135bf1fff 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/kt4640.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/kt4640.lazy.log
@@ -55,12 +55,6 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@34 {
     <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
@@ -86,64 +80,73 @@ ResolutionTaskHolder@34 {
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
+}
+
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
 ResolutionTaskHolder@46 {
     <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+    <name not found> = EmptyList@26[empty]
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
+    <name not found> = EmptyList@26[empty]
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
+null {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@54 }
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/localVariable.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/localVariable.lazy.log
index 2dcc3b001e7..d2cd80fc369 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/localVariable.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/localVariable.lazy.log
@@ -48,42 +48,45 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@36 {
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+}
+
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
 }
 
 ResolutionTaskHolder@47 {
     <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+null {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@40 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/missedGetter.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/missedGetter.lazy.log
index 17d22835fc6..c66db4b368f 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/missedGetter.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/missedGetter.lazy.log
@@ -48,38 +48,23 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@30 {
     <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@39 {
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
@@ -106,13 +91,7 @@ ResolutionTaskHolder@42 {
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@40 {
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
@@ -138,3 +117,27 @@ ResolutionTaskHolder@43 {
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
+
+null {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@32 }
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/missedSetter.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/missedSetter.lazy.log
index 1bc2f871ba3..9a1babd0a4f 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/missedSetter.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/missedSetter.lazy.log
@@ -60,73 +60,48 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@39 {
     <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
+}
+
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
 ResolutionTaskHolder@50 {
     <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+}
+
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
 }
 
 ResolutionTaskHolder@62 {
     <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
+ResolutionTaskHolder@65 {
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
@@ -153,13 +128,7 @@ ResolutionTaskHolder@74 {
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@75 {
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
+ResolutionTaskHolder@66 {
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
@@ -185,3 +154,37 @@ ResolutionTaskHolder@75 {
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
+
+null {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@43 }
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/propertyDefferedType.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/propertyDefferedType.lazy.log
index a85306d78d2..60d78f39646 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/propertyDefferedType.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/propertyDefferedType.lazy.log
@@ -37,7 +37,7 @@ LazyJavaClassifierType@21['String'] {
 
 LazyJavaClassifierType@24['String'] {
     arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@23['String']
+    classifier = JavaClassImpl@20['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -51,7 +51,7 @@ LazyJavaClassifierType@27['String'] {
 
 LazyJavaClassifierType@29['String'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@20['String']
+    classifier = JavaClassImpl@23['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -173,26 +173,25 @@ LazyJavaPackageFragment@62['lang'] {
 
 ResolutionTaskHolder@96 {
     <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+}
+
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
 }
 
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
     <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
@@ -205,15 +204,6 @@ ResolutionTaskHolder@103 {
 
 ResolutionTaskHolder@107 {
     <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
@@ -224,17 +214,8 @@ ResolutionTaskHolder@107 {
     <name not found> = EmptyList@87[empty]
 }
 
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@113 }
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
     <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
@@ -245,63 +226,28 @@ ResolutionTaskHolder@111 {
     <name not found> = EmptyList@87[empty]
 }
 
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@117 }
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
+ResolutionTaskHolder@113 {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
+}
+
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
 }
 
 ResolutionTaskHolder@119 {
     <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@121 }
 }
 
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@125 }
+ResolutionTaskHolder@122 {
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
 }
 
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@129 }
+ResolutionTaskHolder@125 {
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
 }
 
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@133 }
-}
-
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@137 }
-}
-
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[4] { ResolutionCandidate@141, ResolutionCandidate@142, ResolutionCandidate@143, ... }
-    <name not found> = ArrayList@144[5] { ResolutionCandidate@141, ResolutionCandidate@142, ResolutionCandidate@143, ... }
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
+ResolutionTaskHolder@128 {
+    <name not found> = ArrayList@129[4] { ResolutionCandidate@130, ResolutionCandidate@131, ResolutionCandidate@132, ... }
     <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
@@ -312,19 +258,7 @@ ResolutionTaskHolder@139 {
     <name not found> = EmptyList@87[empty]
 }
 
-ResolutionTaskHolder@145 {
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
+ResolutionTaskHolder@133 {
     <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
@@ -375,7 +309,76 @@ ResolutionTaskHolder@145 {
     <name not found> = EmptyList@87[empty]
 }
 
-ResolutionTaskHolder@146 {
+ResolutionTaskHolder@134 {
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+}
+
+null {
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@124 }
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@127 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@146[5] { ResolutionCandidate@130, ResolutionCandidate@131, ResolutionCandidate@132, ... }
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedAmbiguity.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedAmbiguity.lazy.log
index 978b5a31f5a..8943c0f9982 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedAmbiguity.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedAmbiguity.lazy.log
@@ -56,88 +56,91 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@41 {
     <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
 ResolutionTaskHolder@52 {
     <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
+}
+
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
 }
 
 ResolutionTaskHolder@64 {
     <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
+}
+
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
 }
 
 ResolutionTaskHolder@76 {
     <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
 }
 
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[2] { ResolutionCandidate@84, ResolutionCandidate@85 }
 }
 
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[2] { ResolutionCandidate@98, ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[2] { ResolutionCandidate@98, ResolutionCandidate@99 }
+null {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@100[2] { ResolutionCandidate@84, ResolutionCandidate@85 }
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedIncomplete.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedIncomplete.lazy.log
index 2bff7aa408d..fe3ccd06029 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedIncomplete.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedIncomplete.lazy.log
@@ -52,73 +52,76 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@37 {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
 ResolutionTaskHolder@48 {
     <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+}
+
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
 }
 
 ResolutionTaskHolder@60 {
     <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
 }
 
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+null {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@62 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedMissing.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedMissing.lazy.log
index 4e08014571e..72263ba12d8 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedMissing.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedMissing.lazy.log
@@ -56,64 +56,42 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@38 {
     <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
 ResolutionTaskHolder@49 {
     <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
+}
+
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
 }
 
 ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -139,3 +117,28 @@ ResolutionTaskHolder@69 {
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
+
+null {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@42 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedPrivate.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedPrivate.lazy.log
index a9ec8bb64a2..cf0b4ace765 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedPrivate.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedPrivate.lazy.log
@@ -56,101 +56,104 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@38 {
     <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
 ResolutionTaskHolder@49 {
     <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
+}
+
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
 }
 
 ResolutionTaskHolder@61 {
     <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
+null {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@57 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedWrongArguments.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedWrongArguments.lazy.log
index 29933ed526c..119b62e8e92 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedWrongArguments.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedWrongArguments.lazy.log
@@ -60,110 +60,79 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@42 {
     <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
+}
+
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
 
 ResolutionTaskHolder@53 {
     <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
+}
+
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
 }
 
 ResolutionTaskHolder@65 {
     <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
+}
+
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
 }
 
 ResolutionTaskHolder@77 {
     <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
 }
 
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
 }
 
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
+}
+
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
 }
 
 ResolutionTaskHolder@89 {
     <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[4] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113, ... }
-    <name not found> = ArrayList@114[4] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113, ... }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[4] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
@@ -188,3 +157,37 @@ ResolutionTaskHolder@109 {
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
+
+null {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@114[4] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/publicDelegatedProperty.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/publicDelegatedProperty.lazy.log
index 714fbf23b1d..294227030e9 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/publicDelegatedProperty.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/publicDelegatedProperty.lazy.log
@@ -60,64 +60,42 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
 ResolutionTaskHolder@51 {
     <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
 }
 
 ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -143,3 +121,28 @@ ResolutionTaskHolder@71 {
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
+
+null {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@44 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/recursiveType.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/recursiveType.lazy.log
index ae8c8304ede..19a5ff6bf1e 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/recursiveType.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/recursiveType.lazy.log
@@ -74,170 +74,173 @@ LazyJavaPackageFragment@19['lang'] {
 
 ResolutionTaskHolder@50 {
     <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
     <name not found> = EmptyList@42[empty]
     <name not found> = EmptyList@42[empty]
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@42[empty]
     <name not found> = EmptyList@42[empty]
+}
+
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
     <name not found> = EmptyList@42[empty]
     <name not found> = EmptyList@42[empty]
 }
 
 ResolutionTaskHolder@61 {
     <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
     <name not found> = EmptyList@42[empty]
     <name not found> = EmptyList@42[empty]
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
     <name not found> = EmptyList@42[empty]
     <name not found> = EmptyList@42[empty]
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
     <name not found> = EmptyList@42[empty]
     <name not found> = EmptyList@42[empty]
+}
+
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
     <name not found> = EmptyList@42[empty]
     <name not found> = EmptyList@42[empty]
 }
 
 ResolutionTaskHolder@73 {
     <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
     <name not found> = EmptyList@42[empty]
     <name not found> = EmptyList@42[empty]
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
     <name not found> = EmptyList@42[empty]
     <name not found> = EmptyList@42[empty]
 }
 
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@42[empty]
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
     <name not found> = EmptyList@42[empty]
     <name not found> = EmptyList@42[empty]
+}
+
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
     <name not found> = EmptyList@42[empty]
 }
 
 ResolutionTaskHolder@85 {
     <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
     <name not found> = EmptyList@42[empty]
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
     <name not found> = EmptyList@42[empty]
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@42[empty]
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
     <name not found> = EmptyList@42[empty]
 }
 
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
+}
+
 ResolutionTaskHolder@97 {
     <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
 }
 
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
 }
 
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
+}
+
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
 }
 
 ResolutionTaskHolder@109 {
     <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
 }
 
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
 }
 
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
+ResolutionTaskHolder@115 {
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
+}
+
+ResolutionTaskHolder@118 {
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
 }
 
 ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
 }
 
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@127 }
-}
-
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@131 }
-}
-
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@135 }
-}
-
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@139 }
-}
-
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@143 }
-}
-
-ResolutionTaskHolder@145 {
+null {
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@54 }
     <name not found> = EmptyList@42[empty]
     <name not found> = EmptyList@42[empty]
     <name not found> = EmptyList@42[empty]
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/redundantGetter.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/redundantGetter.lazy.log
index 4e08014571e..580c920c50c 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/redundantGetter.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/redundantGetter.lazy.log
@@ -56,64 +56,42 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@38 {
     <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
 ResolutionTaskHolder@49 {
     <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
+}
+
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
 }
 
 ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -139,3 +117,28 @@ ResolutionTaskHolder@69 {
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
+
+null {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@42 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/redundantSetter.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/redundantSetter.lazy.log
index 312652b57a8..3f655eef0e9 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/redundantSetter.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/redundantSetter.lazy.log
@@ -56,109 +56,75 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@38 {
     <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@45 {
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@48 {
     <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
 ResolutionTaskHolder@60 {
     <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
+}
+
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
 }
 
 ResolutionTaskHolder@72 {
     <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
 }
 
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
+}
+
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
 }
 
 ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -184,3 +150,40 @@ ResolutionTaskHolder@100 {
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
+
+null {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@71 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/setterThisTypeMismatch.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/setterThisTypeMismatch.lazy.log
index 365848f16a6..4bfd3febc1a 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/setterThisTypeMismatch.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/setterThisTypeMismatch.lazy.log
@@ -64,33 +64,48 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@43 {
     <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
@@ -118,48 +133,6 @@ ResolutionTaskHolder@50 {
 
 ResolutionTaskHolder@54 {
     <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
@@ -170,9 +143,8 @@ ResolutionTaskHolder@58 {
     <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
@@ -181,6 +153,22 @@ ResolutionTaskHolder@62 {
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+}
+
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
@@ -193,136 +181,65 @@ ResolutionTaskHolder@62 {
 
 ResolutionTaskHolder@66 {
     <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
+}
+
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
 }
 
 ResolutionTaskHolder@78 {
     <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
 }
 
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
+}
+
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
 }
 
 ResolutionTaskHolder@90 {
     <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
 }
 
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
+}
+
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
 }
 
 ResolutionTaskHolder@102 {
     <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
 }
 
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
+ResolutionTaskHolder@105 {
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
@@ -357,7 +274,93 @@ ResolutionTaskHolder@126 {
     <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@127 {
+ResolutionTaskHolder@106 {
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+}
+
+null {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@89 }
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/setterWithSupertype.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/setterWithSupertype.lazy.log
index d5323f79ea9..09cf64f8117 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/setterWithSupertype.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/setterWithSupertype.lazy.log
@@ -62,37 +62,20 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@41 {
     <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@48 {
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
     <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+}
+
+ResolutionTaskHolder@51 {
     <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
@@ -103,88 +86,67 @@ ResolutionTaskHolder@55 {
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
+}
+
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
 ResolutionTaskHolder@63 {
     <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
 }
 
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
+}
+
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
 }
 
 ResolutionTaskHolder@75 {
     <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
 }
 
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
 }
 
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
+}
+
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
 }
 
 ResolutionTaskHolder@87 {
     <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
 }
 
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
 }
 
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
-}
-
-ResolutionTaskHolder@111 {
+ResolutionTaskHolder@93 {
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
@@ -209,6 +171,47 @@ ResolutionTaskHolder@111 {
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
+}
+
+null {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@80 }
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/thisInDelegate.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/thisInDelegate.lazy.log
index 96b2ff8a916..6f1e8119c2e 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/thisInDelegate.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/thisInDelegate.lazy.log
@@ -62,58 +62,64 @@ LazyJavaPackageFragment@14['lang'] {
 
 ResolutionTaskHolder@41 {
     <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+}
+
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
@@ -136,25 +142,6 @@ ResolutionTaskHolder@48 {
 
 ResolutionTaskHolder@52 {
     <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
@@ -175,37 +162,8 @@ ResolutionTaskHolder@52 {
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
@@ -216,15 +174,8 @@ ResolutionTaskHolder@56 {
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
@@ -233,71 +184,31 @@ ResolutionTaskHolder@60 {
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
+}
+
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
 ResolutionTaskHolder@64 {
     <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
+}
+
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
 }
 
 ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
@@ -340,7 +251,99 @@ ResolutionTaskHolder@88 {
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@89 {
+ResolutionTaskHolder@77 {
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+}
+
+null {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@45 }
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/thisOfAnyType.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/thisOfAnyType.lazy.log
index b5428774c43..1a9c7bc1993 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/thisOfAnyType.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/thisOfAnyType.lazy.log
@@ -57,37 +57,20 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@39 {
     <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@46 {
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
     <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+}
+
+ResolutionTaskHolder@49 {
     <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
@@ -98,9 +81,8 @@ ResolutionTaskHolder@53 {
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
@@ -109,6 +91,22 @@ ResolutionTaskHolder@57 {
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+}
+
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
@@ -121,141 +119,69 @@ ResolutionTaskHolder@57 {
 
 ResolutionTaskHolder@61 {
     <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
+}
+
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
 ResolutionTaskHolder@73 {
     <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
 }
 
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
+}
+
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
 }
 
 ResolutionTaskHolder@85 {
     <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
+}
+
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
 }
 
 ResolutionTaskHolder@97 {
     <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
 }
 
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
 }
 
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
+ResolutionTaskHolder@103 {
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
@@ -290,7 +216,84 @@ ResolutionTaskHolder@125 {
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@126 {
+ResolutionTaskHolder@104 {
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+}
+
+null {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@99 }
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/thisOfNothingNullableType.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/thisOfNothingNullableType.lazy.log
index 0fc2000e825..91dba9a736d 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/thisOfNothingNullableType.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/thisOfNothingNullableType.lazy.log
@@ -61,14 +61,6 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -102,16 +94,8 @@ ResolutionTaskHolder@40 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -145,9 +129,8 @@ ResolutionTaskHolder@44 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -156,6 +139,10 @@ ResolutionTaskHolder@48 {
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -168,15 +155,6 @@ ResolutionTaskHolder@48 {
 
 ResolutionTaskHolder@52 {
     <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -187,17 +165,8 @@ ResolutionTaskHolder@52 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -208,107 +177,59 @@ ResolutionTaskHolder@56 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
 ResolutionTaskHolder@64 {
     <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
+}
+
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
 }
 
 ResolutionTaskHolder@76 {
     <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
 }
 
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
+}
+
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
 }
 
 ResolutionTaskHolder@88 {
     <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@91 {
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -343,7 +264,89 @@ ResolutionTaskHolder@108 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@109 {
+ResolutionTaskHolder@92 {
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+}
+
+null {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@90 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/thisOfNothingType.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/thisOfNothingType.lazy.log
index 31f9974adb6..de2599fbe1d 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/thisOfNothingType.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/thisOfNothingType.lazy.log
@@ -61,14 +61,6 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -102,16 +94,8 @@ ResolutionTaskHolder@40 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -145,9 +129,8 @@ ResolutionTaskHolder@44 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -171,6 +154,28 @@ ResolutionTaskHolder@48 {
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -180,48 +185,6 @@ ResolutionTaskHolder@48 {
 
 ResolutionTaskHolder@52 {
     <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -232,9 +195,8 @@ ResolutionTaskHolder@56 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -243,6 +205,22 @@ ResolutionTaskHolder@60 {
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -255,116 +233,49 @@ ResolutionTaskHolder@60 {
 
 ResolutionTaskHolder@64 {
     <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
 ResolutionTaskHolder@76 {
     <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
 }
 
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
+}
+
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
 }
 
 ResolutionTaskHolder@88 {
     <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@91 {
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -399,7 +310,99 @@ ResolutionTaskHolder@108 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@109 {
+ResolutionTaskHolder@92 {
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+}
+
+null {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@84 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/twoGetMethods.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/twoGetMethods.lazy.log
index 0fe0baad176..befe8a912a1 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/twoGetMethods.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/twoGetMethods.lazy.log
@@ -56,15 +56,6 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@38 {
     <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -75,17 +66,8 @@ ResolutionTaskHolder@38 {
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -96,17 +78,8 @@ ResolutionTaskHolder@42 {
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -117,45 +90,66 @@ ResolutionTaskHolder@46 {
     <name not found> = EmptyList@30[empty]
 }
 
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
+}
+
 ResolutionTaskHolder@50 {
     <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+}
+
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
 }
 
 ResolutionTaskHolder@62 {
     <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[2] { ResolutionCandidate@67, ResolutionCandidate@68 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[2] { ResolutionCandidate@76, ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[2] { ResolutionCandidate@76, ResolutionCandidate@77 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@69 {
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -190,8 +184,17 @@ ResolutionTaskHolder@74 {
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@79 {
-    <name not found> = EmptyList@30[empty]
+null {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@79[2] { ResolutionCandidate@67, ResolutionCandidate@68 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForGetReturnType.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForGetReturnType.lazy.log
index 0d8a5316e3b..c7916d93877 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForGetReturnType.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForGetReturnType.lazy.log
@@ -60,64 +60,42 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@42 {
     <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
+}
+
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
 
 ResolutionTaskHolder@53 {
     <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
+}
+
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
 }
 
 ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
@@ -143,3 +121,28 @@ ResolutionTaskHolder@73 {
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
+
+null {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@46 }
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForGetWithGeneric.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForGetWithGeneric.lazy.log
index 1b3b6b90111..b37ebf27831 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForGetWithGeneric.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForGetWithGeneric.lazy.log
@@ -67,14 +67,6 @@ LazyJavaPackageFragment@16['lang'] {
 
 ResolutionTaskHolder@49 {
     <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
@@ -108,14 +100,8 @@ ResolutionTaskHolder@49 {
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
@@ -141,9 +127,8 @@ ResolutionTaskHolder@53 {
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
@@ -152,6 +137,10 @@ ResolutionTaskHolder@57 {
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
+}
+
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
@@ -164,15 +153,6 @@ ResolutionTaskHolder@57 {
 
 ResolutionTaskHolder@61 {
     <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
@@ -183,17 +163,8 @@ ResolutionTaskHolder@61 {
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
@@ -204,9 +175,8 @@ ResolutionTaskHolder@65 {
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
@@ -215,6 +185,10 @@ ResolutionTaskHolder@69 {
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
+}
+
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
@@ -227,142 +201,131 @@ ResolutionTaskHolder@69 {
 
 ResolutionTaskHolder@73 {
     <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
+}
+
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
 }
 
 ResolutionTaskHolder@85 {
     <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
+}
+
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
 }
 
 ResolutionTaskHolder@97 {
     <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
+}
+
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
+}
+
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
+}
+
+ResolutionTaskHolder@106 {
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
+ResolutionTaskHolder@107 {
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
+ResolutionTaskHolder@108 {
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
@@ -389,23 +352,7 @@ ResolutionTaskHolder@125 {
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@126 {
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
+ResolutionTaskHolder@109 {
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
@@ -432,40 +379,96 @@ ResolutionTaskHolder@126 {
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@127 {
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@128 {
+null {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@102 }
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForSetParameter.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForSetParameter.lazy.log
index 674669efac2..f272757f048 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForSetParameter.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForSetParameter.lazy.log
@@ -65,36 +65,20 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@44 {
     <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@51 {
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
     <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+}
+
+ResolutionTaskHolder@54 {
     <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
@@ -128,9 +112,8 @@ ResolutionTaskHolder@58 {
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
@@ -154,6 +137,25 @@ ResolutionTaskHolder@62 {
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+}
+
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
@@ -163,15 +165,6 @@ ResolutionTaskHolder@62 {
 
 ResolutionTaskHolder@66 {
     <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
@@ -182,17 +175,8 @@ ResolutionTaskHolder@66 {
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
@@ -203,133 +187,63 @@ ResolutionTaskHolder@70 {
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
+}
+
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
 }
 
 ResolutionTaskHolder@78 {
     <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
+}
+
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
 }
 
 ResolutionTaskHolder@90 {
     <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
 }
 
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
+}
+
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
 }
 
 ResolutionTaskHolder@102 {
     <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
 }
 
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
 }
 
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
+ResolutionTaskHolder@108 {
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
@@ -364,7 +278,96 @@ ResolutionTaskHolder@130 {
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@131 {
+ResolutionTaskHolder@109 {
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+}
+
+null {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@104 }
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForThisGetParameter.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForThisGetParameter.lazy.log
index 8917a023cb3..ff945c4db0e 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForThisGetParameter.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForThisGetParameter.lazy.log
@@ -56,14 +56,6 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@38 {
     <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -97,14 +89,8 @@ ResolutionTaskHolder@38 {
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -130,9 +116,8 @@ ResolutionTaskHolder@42 {
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -141,6 +126,10 @@ ResolutionTaskHolder@46 {
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -153,15 +142,6 @@ ResolutionTaskHolder@46 {
 
 ResolutionTaskHolder@50 {
     <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -172,78 +152,37 @@ ResolutionTaskHolder@50 {
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
 ResolutionTaskHolder@62 {
     <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@71 {
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -278,7 +217,71 @@ ResolutionTaskHolder@82 {
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@83 {
+ResolutionTaskHolder@72 {
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+}
+
+null {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@67 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/wrongCountOfParametersInGet.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/wrongCountOfParametersInGet.lazy.log
index ee234e7ab76..59a7b281806 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/wrongCountOfParametersInGet.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/wrongCountOfParametersInGet.lazy.log
@@ -61,33 +61,48 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -115,48 +130,6 @@ ResolutionTaskHolder@47 {
 
 ResolutionTaskHolder@51 {
     <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -167,9 +140,8 @@ ResolutionTaskHolder@55 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -178,6 +150,10 @@ ResolutionTaskHolder@59 {
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -188,48 +164,65 @@ ResolutionTaskHolder@59 {
     <name not found> = EmptyList@32[empty]
 }
 
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+}
+
 ResolutionTaskHolder@63 {
     <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
+}
+
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
 }
 
 ResolutionTaskHolder@75 {
     <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
+}
+
+ResolutionTaskHolder@78 {
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -237,37 +230,6 @@ ResolutionTaskHolder@75 {
 }
 
 ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -294,7 +256,48 @@ ResolutionTaskHolder@91 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@92 {
+null {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@74 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/wrongCountOfParametersInSet.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/wrongCountOfParametersInSet.lazy.log
index 2f4da7cb111..2b1d0dc946c 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/wrongCountOfParametersInSet.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/wrongCountOfParametersInSet.lazy.log
@@ -61,36 +61,20 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@47 {
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
     <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@50 {
     <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -124,9 +108,8 @@ ResolutionTaskHolder@54 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -150,6 +133,25 @@ ResolutionTaskHolder@58 {
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -159,15 +161,6 @@ ResolutionTaskHolder@58 {
 
 ResolutionTaskHolder@62 {
     <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -178,17 +171,8 @@ ResolutionTaskHolder@62 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -199,138 +183,67 @@ ResolutionTaskHolder@66 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
 ResolutionTaskHolder@74 {
     <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
+}
+
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
 }
 
 ResolutionTaskHolder@86 {
     <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
+}
+
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
 }
 
 ResolutionTaskHolder@98 {
     <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
 }
 
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
 }
 
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
 }
 
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@107 {
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -365,7 +278,97 @@ ResolutionTaskHolder@130 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@131 {
+ResolutionTaskHolder@108 {
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+}
+
+null {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@100 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/wrongSetterReturnType.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/wrongSetterReturnType.lazy.log
index 9e31a6ae850..50939fcbc04 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/wrongSetterReturnType.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/wrongSetterReturnType.lazy.log
@@ -56,104 +56,71 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@38 {
     <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@45 {
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@48 {
     <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
 ResolutionTaskHolder@60 {
     <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
+}
+
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
 }
 
 ResolutionTaskHolder@72 {
     <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
 }
 
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
 }
 
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@81 {
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -179,3 +146,39 @@ ResolutionTaskHolder@96 {
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
+
+null {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@77 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/delegation/DelegationAndOverriding.lazy.log b/compiler/testData/diagnostics/tests/delegation/DelegationAndOverriding.lazy.log
index bd65f4b75bf..6153f6c4545 100644
--- a/compiler/testData/diagnostics/tests/delegation/DelegationAndOverriding.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegation/DelegationAndOverriding.lazy.log
@@ -45,40 +45,43 @@ LazyJavaPackageFragment@10['java'] {
 
 ResolutionTaskHolder@45 {
     <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
+}
+
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
 }
 
 ResolutionTaskHolder@57 {
     <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+null {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@68 }
 }
diff --git a/compiler/testData/diagnostics/tests/delegation/DelegationExpectedType.lazy.log b/compiler/testData/diagnostics/tests/delegation/DelegationExpectedType.lazy.log
index e970931aa66..f617861466c 100644
--- a/compiler/testData/diagnostics/tests/delegation/DelegationExpectedType.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegation/DelegationExpectedType.lazy.log
@@ -66,82 +66,85 @@ LazyJavaPackageFragment@18['lang'] {
 
 ResolutionTaskHolder@46 {
     <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
 ResolutionTaskHolder@58 {
     <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
+}
+
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
 ResolutionTaskHolder@70 {
     <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[8] { ResolutionCandidate@75, ResolutionCandidate@76, ResolutionCandidate@77, ... }
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[8] { ResolutionCandidate@84, ResolutionCandidate@85, ResolutionCandidate@86, ... }
-    <name not found> = ArrayList@87[8] { ResolutionCandidate@84, ResolutionCandidate@85, ResolutionCandidate@86, ... }
+null {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@87[8] { ResolutionCandidate@75, ResolutionCandidate@76, ResolutionCandidate@77, ... }
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/delegation/DelegationNotTotrait.lazy.log b/compiler/testData/diagnostics/tests/delegation/DelegationNotTotrait.lazy.log
index c92dcdd741c..1c224458c02 100644
--- a/compiler/testData/diagnostics/tests/delegation/DelegationNotTotrait.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegation/DelegationNotTotrait.lazy.log
@@ -42,19 +42,22 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@33 {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+}
+
+null {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@41 }
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/delegation/DelegationToJavaIface.lazy.log b/compiler/testData/diagnostics/tests/delegation/DelegationToJavaIface.lazy.log
index ada6b13e086..64371907769 100644
--- a/compiler/testData/diagnostics/tests/delegation/DelegationToJavaIface.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegation/DelegationToJavaIface.lazy.log
@@ -85,14 +85,14 @@ LazyJavaClassifierType@88['Object'] {
 
 LazyJavaClassifierType@91['Object'] {
     arguments = ArrayList@92[empty]
-    classifier = JavaClassImpl@90['Object']
+    classifier = JavaClassImpl@86['Object']
     nullable = 'true': Boolean@83
     typeConstructor = DeserializedClassTypeConstructor@87
 }
 
 LazyJavaClassifierType@93['Object'] {
     arguments = ArrayList@94[empty]
-    classifier = JavaClassImpl@86['Object']
+    classifier = JavaClassImpl@90['Object']
     nullable = 'true': Boolean@83
     typeConstructor = DeserializedClassTypeConstructor@87
 }
@@ -164,10 +164,13 @@ LazyJavaTypeParameterResolver@134 {
 
 ResolutionTaskHolder@136 {
     <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
 }
 
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
+ResolutionTaskHolder@139 {
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
+}
+
+null {
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@141 }
 }
diff --git a/compiler/testData/diagnostics/tests/delegation/Delegation_ClashingFunctions.lazy.log b/compiler/testData/diagnostics/tests/delegation/Delegation_ClashingFunctions.lazy.log
index bcc8c0acfc9..fcd70412e4d 100644
--- a/compiler/testData/diagnostics/tests/delegation/Delegation_ClashingFunctions.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegation/Delegation_ClashingFunctions.lazy.log
@@ -42,90 +42,93 @@ LazyJavaPackageFragment@15['java'] {
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
 }
 
 ResolutionTaskHolder@52 {
     <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
+}
+
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
 }
 
 ResolutionTaskHolder@64 {
     <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
+}
+
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
 }
 
 ResolutionTaskHolder@76 {
     <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
 }
 
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
+}
+
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
 }
 
 ResolutionTaskHolder@88 {
     <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
 }
 
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
+null {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@72 }
 }
diff --git a/compiler/testData/diagnostics/tests/delegation/Delegation_Hierarchy.lazy.log b/compiler/testData/diagnostics/tests/delegation/Delegation_Hierarchy.lazy.log
index 8123e6e1437..d53ceacdd9c 100644
--- a/compiler/testData/diagnostics/tests/delegation/Delegation_Hierarchy.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegation/Delegation_Hierarchy.lazy.log
@@ -25,25 +25,28 @@ LazyJavaPackageFragment@7['java'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+}
+
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
 }
 
 ResolutionTaskHolder@37 {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+null {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@27 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@39 }
 }
diff --git a/compiler/testData/diagnostics/tests/delegation/Delegation_MultipleDelegates.lazy.log b/compiler/testData/diagnostics/tests/delegation/Delegation_MultipleDelegates.lazy.log
index d1f31868fd9..3d353ee6e47 100644
--- a/compiler/testData/diagnostics/tests/delegation/Delegation_MultipleDelegates.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegation/Delegation_MultipleDelegates.lazy.log
@@ -44,15 +44,18 @@ LazyJavaPackageFragment@14['java'] {
 
 ResolutionTaskHolder@38 {
     <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+}
+
+null {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@40 }
 }
diff --git a/compiler/testData/diagnostics/tests/delegation/Delegation_ScopeInitializationOrder.lazy.log b/compiler/testData/diagnostics/tests/delegation/Delegation_ScopeInitializationOrder.lazy.log
index fab4def36c0..c96784838c5 100644
--- a/compiler/testData/diagnostics/tests/delegation/Delegation_ScopeInitializationOrder.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegation/Delegation_ScopeInitializationOrder.lazy.log
@@ -23,5 +23,8 @@ LazyJavaPackageFragment@7['java'] {
 
 ResolutionTaskHolder@23 {
     <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
+}
+
+null {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@25 }
 }
diff --git a/compiler/testData/diagnostics/tests/deparenthesize/ArrayAccessAssignment.lazy.log b/compiler/testData/diagnostics/tests/deparenthesize/ArrayAccessAssignment.lazy.log
index e3afc0d0352..16228b78ff7 100644
--- a/compiler/testData/diagnostics/tests/deparenthesize/ArrayAccessAssignment.lazy.log
+++ b/compiler/testData/diagnostics/tests/deparenthesize/ArrayAccessAssignment.lazy.log
@@ -25,10 +25,13 @@ LazyJavaPackageFragment@6['java'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
+}
+
+null {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@27 }
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@30 }
 }
diff --git a/compiler/testData/diagnostics/tests/deparenthesize/checkDeparenthesizedType.lazy.log b/compiler/testData/diagnostics/tests/deparenthesize/checkDeparenthesizedType.lazy.log
index bd53bf98f86..f26c4e02ddc 100644
--- a/compiler/testData/diagnostics/tests/deparenthesize/checkDeparenthesizedType.lazy.log
+++ b/compiler/testData/diagnostics/tests/deparenthesize/checkDeparenthesizedType.lazy.log
@@ -45,19 +45,31 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@37 {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+    <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -77,10 +89,6 @@ ResolutionTaskHolder@44 {
 
 ResolutionTaskHolder@48 {
     <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -98,134 +106,129 @@ ResolutionTaskHolder@48 {
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
 ResolutionTaskHolder@60 {
     <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
+}
+
 ResolutionTaskHolder@72 {
     <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
+}
+
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
 }
 
 ResolutionTaskHolder@84 {
     <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
 }
 
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
+}
+
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
 }
 
 ResolutionTaskHolder@96 {
     <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
 }
 
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
+null {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@77 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByProperty.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByProperty.lazy.log
index 31a991b4919..e8c0c22bff9 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByProperty.lazy.log
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByProperty.lazy.log
@@ -31,5 +31,8 @@ LazyJavaPackageFragment@9['java'] {
 
 ResolutionTaskHolder@27 {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
+}
+
+null {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
 }
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyInConstructor.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyInConstructor.lazy.log
index 31a991b4919..e8c0c22bff9 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyInConstructor.lazy.log
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyInConstructor.lazy.log
@@ -31,5 +31,8 @@ LazyJavaPackageFragment@9['java'] {
 
 ResolutionTaskHolder@27 {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
+}
+
+null {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
 }
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyNoGetter.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyNoGetter.lazy.log
index ab94ec3a49c..d8100e4ebde 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyNoGetter.lazy.log
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyNoGetter.lazy.log
@@ -32,5 +32,8 @@ LazyJavaPackageFragment@10['java'] {
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
+}
+
+null {
     <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
 }
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classPropertyOverriddenByFunction.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classPropertyOverriddenByFunction.lazy.log
index 31a991b4919..e8c0c22bff9 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classPropertyOverriddenByFunction.lazy.log
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classPropertyOverriddenByFunction.lazy.log
@@ -31,5 +31,8 @@ LazyJavaPackageFragment@9['java'] {
 
 ResolutionTaskHolder@27 {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
+}
+
+null {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
 }
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/defaultFunction.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/defaultFunction.lazy.log
index cc697e29a05..b084a22f453 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/defaultFunction.lazy.log
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/defaultFunction.lazy.log
@@ -29,5 +29,8 @@ LazyJavaPackageFragment@7['java'] {
 
 ResolutionTaskHolder@27 {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
+}
+
+null {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
 }
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty.lazy.log
index c4a88889b64..5799c7b75c1 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty.lazy.log
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty.lazy.log
@@ -34,5 +34,8 @@ LazyJavaPackageFragment@10['java'] {
 
 ResolutionTaskHolder@30 {
     <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
+}
+
+null {
     <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
 }
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/genericClassFunction.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/genericClassFunction.lazy.log
index 9507dee98df..53298de5e98 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/genericClassFunction.lazy.log
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/genericClassFunction.lazy.log
@@ -35,5 +35,8 @@ LazyJavaPackageFragment@9['java'] {
 
 ResolutionTaskHolder@33 {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
+}
+
+null {
     <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
 }
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/phantomClashWithSamAdapter.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/phantomClashWithSamAdapter.lazy.log
index 852155d6ce1..d8f4e6761a1 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/phantomClashWithSamAdapter.lazy.log
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/phantomClashWithSamAdapter.lazy.log
@@ -107,10 +107,13 @@ LazyJavaPackageFragment@73['p'] {
 
 ResolutionTaskHolder@90 {
     <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
+}
+
+null {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@92 }
 }
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/privateClassFunctionOverriddenByProperty.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/privateClassFunctionOverriddenByProperty.lazy.log
index 31a991b4919..e8c0c22bff9 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/privateClassFunctionOverriddenByProperty.lazy.log
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/privateClassFunctionOverriddenByProperty.lazy.log
@@ -31,5 +31,8 @@ LazyJavaPackageFragment@9['java'] {
 
 ResolutionTaskHolder@27 {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
+}
+
+null {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
 }
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/class.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/class.lazy.log
index a53f0278720..d8c63ebf633 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/class.lazy.log
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/class.lazy.log
@@ -34,5 +34,8 @@ LazyJavaPackageFragment@9['java'] {
 
 ResolutionTaskHolder@32 {
     <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
+}
+
+null {
     <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
 }
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegateToTwoTraits.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegateToTwoTraits.lazy.log
index b22b73c7d28..418fa5d2d1b 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegateToTwoTraits.lazy.log
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegateToTwoTraits.lazy.log
@@ -41,10 +41,13 @@ LazyJavaPackageFragment@11['java'] {
 
 ResolutionTaskHolder@39 {
     <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
+}
+
+null {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@44 }
 }
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationAndOwnMethod.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationAndOwnMethod.lazy.log
index 11f0a174d7a..142711908f9 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationAndOwnMethod.lazy.log
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationAndOwnMethod.lazy.log
@@ -38,5 +38,8 @@ LazyJavaPackageFragment@10['java'] {
 
 ResolutionTaskHolder@36 {
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+}
+
+null {
     <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
 }
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/genericType.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/genericType.lazy.log
index edb66f3efc9..520b12d800f 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/genericType.lazy.log
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/genericType.lazy.log
@@ -30,10 +30,13 @@ LazyJavaPackageFragment@7['java'] {
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
 }
 
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+}
+
+null {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@33 }
 }
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameter.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameter.lazy.log
index fc91f67701a..edc51d278c0 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameter.lazy.log
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameter.lazy.log
@@ -26,10 +26,13 @@ LazyJavaPackageFragment@6['java'] {
 
 ResolutionTaskHolder@24 {
     <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
 }
 
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
+ResolutionTaskHolder@27 {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
+}
+
+null {
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@26 }
 }
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithBound.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithBound.lazy.log
index 691c9c33be5..6f595162625 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithBound.lazy.log
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithBound.lazy.log
@@ -22,10 +22,13 @@ LazyJavaPackageFragment@6['java'] {
 
 ResolutionTaskHolder@22 {
     <name not found> = ArrayList@23[1] { ResolutionCandidate@24 }
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@24 }
 }
 
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
+ResolutionTaskHolder@25 {
+    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
+}
+
+null {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@24 }
 }
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBounds.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBounds.lazy.log
index 56ae7dff25b..69d4d95a801 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBounds.lazy.log
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBounds.lazy.log
@@ -25,15 +25,18 @@ LazyJavaPackageFragment@7['java'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+}
+
+null {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@27 }
 }
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBoundsInWhere.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBoundsInWhere.lazy.log
index 56ae7dff25b..8e7b123b236 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBoundsInWhere.lazy.log
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBoundsInWhere.lazy.log
@@ -25,15 +25,18 @@ LazyJavaPackageFragment@7['java'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+}
+
+null {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@27 }
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@33 }
 }
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/privateClassPropertyNoClash.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/privateClassPropertyNoClash.lazy.log
index af9b4ad8937..3d9cf9aff0b 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/privateClassPropertyNoClash.lazy.log
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/privateClassPropertyNoClash.lazy.log
@@ -81,12 +81,15 @@ LazyJavaPackageFragment@53['lang'] {
 
 ResolutionTaskHolder@72 {
     <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
 }
 
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
+}
+
+null {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@74 }
+    <name not found> = EmptyList@11[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.lazy.log
index 08817952726..1211bb85f2b 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.lazy.log
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.lazy.log
@@ -29,16 +29,19 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@21 {
     <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@23 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+}
+
+null {
+    <name not found> = ArrayList@24[1] { ResolutionCandidate@23 }
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.lazy.log
index 8bdbb57b839..34808fffef2 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.lazy.log
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.lazy.log
@@ -30,16 +30,19 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@21 {
     <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@23 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+}
+
+null {
+    <name not found> = ArrayList@24[1] { ResolutionCandidate@23 }
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/dataClassCopy.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/dataClassCopy.lazy.log
index cc8f6d6890f..27d701dffc4 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/dataClassCopy.lazy.log
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/dataClassCopy.lazy.log
@@ -50,15 +50,6 @@ LazyJavaPackageFragment@14['lang'] {
 
 ResolutionTaskHolder@37 {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -69,12 +60,24 @@ ResolutionTaskHolder@37 {
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+}
+
+null {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@39 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/delegationBy.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/delegationBy.lazy.log
index 821fdf9753c..408fbff7c77 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/delegationBy.lazy.log
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/delegationBy.lazy.log
@@ -24,5 +24,8 @@ LazyJavaPackageFragment@8['java'] {
 
 ResolutionTaskHolder@22 {
     <name not found> = ArrayList@23[1] { ResolutionCandidate@24 }
+}
+
+null {
     <name not found> = ArrayList@25[1] { ResolutionCandidate@24 }
 }
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/enum.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/enum.lazy.log
index 7477439cc2a..55780c8035d 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/enum.lazy.log
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/enum.lazy.log
@@ -30,10 +30,13 @@ LazyJavaPackageFragment@7['java'] {
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
 }
 
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+}
+
+null {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@33 }
 }
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/instance.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/instance.lazy.log
index 4b97268efe5..29e803fff76 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/instance.lazy.log
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/instance.lazy.log
@@ -19,5 +19,8 @@ LazyJavaPackageFragment@5['java'] {
 
 ResolutionTaskHolder@19 {
     <name not found> = ArrayList@20[1] { ResolutionCandidate@21 }
+}
+
+null {
     <name not found> = ArrayList@22[1] { ResolutionCandidate@21 }
 }
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/propertyMetadataCache.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/propertyMetadataCache.lazy.log
index d1dbf5bf2ac..8a4ce8c4912 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/propertyMetadataCache.lazy.log
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/propertyMetadataCache.lazy.log
@@ -58,15 +58,6 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -77,17 +68,8 @@ ResolutionTaskHolder@40 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -98,68 +80,44 @@ ResolutionTaskHolder@44 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
 ResolutionTaskHolder@52 {
     <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
+}
+
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
 }
 
 ResolutionTaskHolder@64 {
     <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@67 {
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -194,7 +152,52 @@ ResolutionTaskHolder@76 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@77 {
+ResolutionTaskHolder@68 {
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+}
+
+null {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@66 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized/enumValuesValueOf.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized/enumValuesValueOf.lazy.log
index 36352a1f968..2827927211b 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized/enumValuesValueOf.lazy.log
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized/enumValuesValueOf.lazy.log
@@ -46,24 +46,27 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@35 {
     <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[2] { ResolutionCandidate@49, ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[2] { ResolutionCandidate@49, ResolutionCandidate@50 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[2] { ResolutionCandidate@46, ResolutionCandidate@47 }
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+}
+
+null {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@51[2] { ResolutionCandidate@46, ResolutionCandidate@47 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/enum/AbstractInEnum.lazy.log b/compiler/testData/diagnostics/tests/enum/AbstractInEnum.lazy.log
index 4ccf73cc3e2..4202d5dc3fc 100644
--- a/compiler/testData/diagnostics/tests/enum/AbstractInEnum.lazy.log
+++ b/compiler/testData/diagnostics/tests/enum/AbstractInEnum.lazy.log
@@ -39,90 +39,93 @@ LazyJavaPackageFragment@15['lang'] {
 
 ResolutionTaskHolder@34 {
     <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@25[empty]
+}
+
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@25[empty]
 }
 
 ResolutionTaskHolder@46 {
     <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
     <name not found> = EmptyList@25[empty]
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@25[empty]
 }
 
 ResolutionTaskHolder@58 {
     <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
+}
+
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
 }
 
 ResolutionTaskHolder@70 {
     <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+}
+
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
+}
+
+null {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@42 }
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
-}
diff --git a/compiler/testData/diagnostics/tests/enum/classObjectInEnum.lazy.log b/compiler/testData/diagnostics/tests/enum/classObjectInEnum.lazy.log
index a210312e687..842751d710c 100644
--- a/compiler/testData/diagnostics/tests/enum/classObjectInEnum.lazy.log
+++ b/compiler/testData/diagnostics/tests/enum/classObjectInEnum.lazy.log
@@ -32,17 +32,7 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@23 {
     <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@25 }
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
@@ -53,22 +43,35 @@ ResolutionTaskHolder@23 {
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+    <name not found> = EmptyList@20[empty]
+}
+
+null {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@25 }
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@27 }
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.lazy.log b/compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.lazy.log
index 5d5adda7d8f..5733530a499 100644
--- a/compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.lazy.log
+++ b/compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.lazy.log
@@ -44,16 +44,6 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@29 {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
@@ -68,18 +58,8 @@ ResolutionTaskHolder@29 {
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
@@ -94,9 +74,8 @@ ResolutionTaskHolder@33 {
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
@@ -104,13 +83,21 @@ ResolutionTaskHolder@37 {
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
+}
+
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
 ResolutionTaskHolder@41 {
     <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
@@ -120,10 +107,8 @@ ResolutionTaskHolder@41 {
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
@@ -133,22 +118,40 @@ ResolutionTaskHolder@45 {
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+null {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@46 }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/enum/commonSupertype.lazy.log b/compiler/testData/diagnostics/tests/enum/commonSupertype.lazy.log
index f2f3c84b824..ead13fe430e 100644
--- a/compiler/testData/diagnostics/tests/enum/commonSupertype.lazy.log
+++ b/compiler/testData/diagnostics/tests/enum/commonSupertype.lazy.log
@@ -35,26 +35,19 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@27 {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@36 {
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -65,9 +58,7 @@ ResolutionTaskHolder@39 {
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@37 {
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -77,3 +68,15 @@ ResolutionTaskHolder@40 {
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
 }
+
+null {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@35 }
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry.lazy.log b/compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry.lazy.log
index 0029e6fd936..a0e75661f13 100644
--- a/compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry.lazy.log
+++ b/compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry.lazy.log
@@ -58,43 +58,52 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@38 {
     <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@30[empty]
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@45 {
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+    <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@48 {
     <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@30[empty]
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
     <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+    <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -102,6 +111,10 @@ ResolutionTaskHolder@66 {
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -113,141 +126,106 @@ ResolutionTaskHolder@66 {
 
 ResolutionTaskHolder@70 {
     <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
     <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
     <name not found> = EmptyList@30[empty]
 }
 
 ResolutionTaskHolder@82 {
     <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
+    <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
+    <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
+    <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@91 {
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+ResolutionTaskHolder@92 {
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@93 {
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -258,24 +236,7 @@ ResolutionTaskHolder@110 {
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@111 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@94 {
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -286,9 +247,7 @@ ResolutionTaskHolder@111 {
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@112 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@95 {
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -299,9 +258,7 @@ ResolutionTaskHolder@112 {
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@113 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@96 {
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -312,9 +269,7 @@ ResolutionTaskHolder@113 {
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@114 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@97 {
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -325,20 +280,68 @@ ResolutionTaskHolder@114 {
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@115 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@116 {
+null {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@81 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
diff --git a/compiler/testData/diagnostics/tests/enum/entryShouldBeOfEnumType.lazy.log b/compiler/testData/diagnostics/tests/enum/entryShouldBeOfEnumType.lazy.log
index c423bc413c1..31c181c4378 100644
--- a/compiler/testData/diagnostics/tests/enum/entryShouldBeOfEnumType.lazy.log
+++ b/compiler/testData/diagnostics/tests/enum/entryShouldBeOfEnumType.lazy.log
@@ -27,26 +27,19 @@ LazyJavaPackageFragment@7['lang'] {
 
 ResolutionTaskHolder@21 {
     <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@23 }
-    <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
 }
 
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
-    <name not found> = EmptyList@18[empty]
+ResolutionTaskHolder@24 {
+    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
     <name not found> = EmptyList@18[empty]
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+ResolutionTaskHolder@27 {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
+ResolutionTaskHolder@30 {
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
@@ -57,9 +50,7 @@ ResolutionTaskHolder@33 {
     <name not found> = EmptyList@18[empty]
 }
 
-ResolutionTaskHolder@34 {
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
+ResolutionTaskHolder@31 {
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
@@ -69,3 +60,15 @@ ResolutionTaskHolder@34 {
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
 }
+
+null {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@23 }
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@26 }
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.lazy.log b/compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.lazy.log
index bb39d73de41..daab533aa80 100644
--- a/compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.lazy.log
+++ b/compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.lazy.log
@@ -38,7 +38,48 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@27 {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
+    <name not found> = EmptyList@19[empty]
+}
+
+ResolutionTaskHolder@30 {
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
 }
@@ -64,36 +105,6 @@ ResolutionTaskHolder@31 {
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
 }
 
 ResolutionTaskHolder@32 {
@@ -105,26 +116,18 @@ ResolutionTaskHolder@32 {
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
 }
 
-ResolutionTaskHolder@33 {
+null {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@29 }
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
diff --git a/compiler/testData/diagnostics/tests/enum/enumInheritance.lazy.log b/compiler/testData/diagnostics/tests/enum/enumInheritance.lazy.log
index 23484a4f1ed..5a6fd032d2e 100644
--- a/compiler/testData/diagnostics/tests/enum/enumInheritance.lazy.log
+++ b/compiler/testData/diagnostics/tests/enum/enumInheritance.lazy.log
@@ -28,13 +28,16 @@ LazyJavaPackageFragment@10['java'] {
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+}
+
+null {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@30 }
 }
diff --git a/compiler/testData/diagnostics/tests/enum/enumIsAssignableToBuiltInEnum.lazy.log b/compiler/testData/diagnostics/tests/enum/enumIsAssignableToBuiltInEnum.lazy.log
index ffc5f598777..a880c06b2f1 100644
--- a/compiler/testData/diagnostics/tests/enum/enumIsAssignableToBuiltInEnum.lazy.log
+++ b/compiler/testData/diagnostics/tests/enum/enumIsAssignableToBuiltInEnum.lazy.log
@@ -105,28 +105,20 @@ LazyJavaPackageFragment@43['lang'] {
 
 ResolutionTaskHolder@79 {
     <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
 }
 
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@13[empty]
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
     <name not found> = EmptyList@13[empty]
 }
 
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
-    <name not found> = EmptyList@13[empty]
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
     <name not found> = EmptyList@13[empty]
 }
 
-ResolutionTaskHolder@91 {
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
+ResolutionTaskHolder@88 {
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
@@ -137,9 +129,7 @@ ResolutionTaskHolder@91 {
     <name not found> = EmptyList@13[empty]
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
+ResolutionTaskHolder@89 {
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
@@ -150,7 +140,7 @@ ResolutionTaskHolder@92 {
     <name not found> = EmptyList@13[empty]
 }
 
-ResolutionTaskHolder@93 {
+ResolutionTaskHolder@90 {
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
@@ -159,6 +149,19 @@ ResolutionTaskHolder@93 {
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
+}
+
+null {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@87 }
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/enum/enumStarImport.lazy.log b/compiler/testData/diagnostics/tests/enum/enumStarImport.lazy.log
index fe152fcdc40..d0195c7aa11 100644
--- a/compiler/testData/diagnostics/tests/enum/enumStarImport.lazy.log
+++ b/compiler/testData/diagnostics/tests/enum/enumStarImport.lazy.log
@@ -147,35 +147,38 @@ LazyJavaPackageFragment@60['lang'] {
 
 ResolutionTaskHolder@83 {
     <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
+    <name not found> = EmptyList@74[empty]
+}
+
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
+    <name not found> = EmptyList@74[empty]
+}
+
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
+}
+
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[4] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
     <name not found> = EmptyList@74[empty]
     <name not found> = EmptyList@74[empty]
 }
 
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[4] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
     <name not found> = EmptyList@74[empty]
     <name not found> = EmptyList@74[empty]
 }
 
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[4] { ResolutionCandidate@97, ResolutionCandidate@98, ResolutionCandidate@99, ... }
-    <name not found> = ArrayList@100[4] { ResolutionCandidate@97, ResolutionCandidate@98, ResolutionCandidate@99, ... }
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[4] { ResolutionCandidate@103, ResolutionCandidate@104, ResolutionCandidate@105, ... }
-    <name not found> = ArrayList@106[4] { ResolutionCandidate@103, ResolutionCandidate@104, ResolutionCandidate@105, ... }
+null {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@105[4] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
+    <name not found> = ArrayList@106[4] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
     <name not found> = EmptyList@74[empty]
     <name not found> = EmptyList@74[empty]
     <name not found> = EmptyList@74[empty]
diff --git a/compiler/testData/diagnostics/tests/enum/extensionNamedAsEnumEntry.lazy.log b/compiler/testData/diagnostics/tests/enum/extensionNamedAsEnumEntry.lazy.log
index a4f6e0c8f49..6e67a31419e 100644
--- a/compiler/testData/diagnostics/tests/enum/extensionNamedAsEnumEntry.lazy.log
+++ b/compiler/testData/diagnostics/tests/enum/extensionNamedAsEnumEntry.lazy.log
@@ -41,19 +41,22 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@33 {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+    <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@36 {
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+null {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@35 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
diff --git a/compiler/testData/diagnostics/tests/enum/importEnumFromJava.lazy.log b/compiler/testData/diagnostics/tests/enum/importEnumFromJava.lazy.log
index e6fb81413ae..f31fd51ec68 100644
--- a/compiler/testData/diagnostics/tests/enum/importEnumFromJava.lazy.log
+++ b/compiler/testData/diagnostics/tests/enum/importEnumFromJava.lazy.log
@@ -93,7 +93,10 @@ LazyJavaPackageFragment@39['util'] {
 
 ResolutionTaskHolder@65 {
     <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@14[empty]
+    <name not found> = EmptyList@14[empty]
+}
+
+null {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
     <name not found> = EmptyList@14[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/enum/inheritanceFromEnum.lazy.log b/compiler/testData/diagnostics/tests/enum/inheritanceFromEnum.lazy.log
index 753bc121839..e8064b3ce7b 100644
--- a/compiler/testData/diagnostics/tests/enum/inheritanceFromEnum.lazy.log
+++ b/compiler/testData/diagnostics/tests/enum/inheritanceFromEnum.lazy.log
@@ -86,18 +86,21 @@ LazyJavaPackageFragment@64['java'] {
 
 ResolutionTaskHolder@84 {
     <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
 }
 
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
+}
+
+null {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@92 }
 }
diff --git a/compiler/testData/diagnostics/tests/enum/javaEnumValueOfMethod.lazy.log b/compiler/testData/diagnostics/tests/enum/javaEnumValueOfMethod.lazy.log
index e7b9f57d03e..ada0ecc47e2 100644
--- a/compiler/testData/diagnostics/tests/enum/javaEnumValueOfMethod.lazy.log
+++ b/compiler/testData/diagnostics/tests/enum/javaEnumValueOfMethod.lazy.log
@@ -69,24 +69,27 @@ LazyJavaPackageFragment@35['lang'] {
 
 ResolutionTaskHolder@50 {
     <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
     <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
+}
+
+ResolutionTaskHolder@53 {
+    <name not found> = EmptyList@8[empty]
+    <name not found> = EmptyList@8[empty]
+    <name not found> = EmptyList@8[empty]
+    <name not found> = EmptyList@8[empty]
+    <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
+null {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@52 }
     <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
diff --git a/compiler/testData/diagnostics/tests/enum/javaEnumValuesMethod.lazy.log b/compiler/testData/diagnostics/tests/enum/javaEnumValuesMethod.lazy.log
index 7e3ff69e1da..37773b6eafc 100644
--- a/compiler/testData/diagnostics/tests/enum/javaEnumValuesMethod.lazy.log
+++ b/compiler/testData/diagnostics/tests/enum/javaEnumValuesMethod.lazy.log
@@ -73,24 +73,27 @@ LazyJavaPackageFragment@36['lang'] {
 
 ResolutionTaskHolder@54 {
     <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
     <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
+}
+
+ResolutionTaskHolder@57 {
+    <name not found> = EmptyList@8[empty]
+    <name not found> = EmptyList@8[empty]
+    <name not found> = EmptyList@8[empty]
+    <name not found> = EmptyList@8[empty]
+    <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
+null {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@56 }
     <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
diff --git a/compiler/testData/diagnostics/tests/enum/javaEnumWithAbstractFun.lazy.log b/compiler/testData/diagnostics/tests/enum/javaEnumWithAbstractFun.lazy.log
index 6a82f570bce..6dbfdfcddcb 100644
--- a/compiler/testData/diagnostics/tests/enum/javaEnumWithAbstractFun.lazy.log
+++ b/compiler/testData/diagnostics/tests/enum/javaEnumWithAbstractFun.lazy.log
@@ -102,7 +102,18 @@ LazyJavaPackageFragment@57['lang'] {
 
 ResolutionTaskHolder@75 {
     <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+}
+
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
+    <name not found> = EmptyList@25[empty]
+}
+
+ResolutionTaskHolder@81 {
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
@@ -113,17 +124,9 @@ ResolutionTaskHolder@75 {
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
+null {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@77 }
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
diff --git a/compiler/testData/diagnostics/tests/enum/javaEnumWithFuns.lazy.log b/compiler/testData/diagnostics/tests/enum/javaEnumWithFuns.lazy.log
index 74359759881..146669a75ea 100644
--- a/compiler/testData/diagnostics/tests/enum/javaEnumWithFuns.lazy.log
+++ b/compiler/testData/diagnostics/tests/enum/javaEnumWithFuns.lazy.log
@@ -92,29 +92,32 @@ LazyJavaPackageFragment@47['lang'] {
 
 ResolutionTaskHolder@62 {
     <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
+    <name not found> = EmptyList@16[empty]
+}
+
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
+}
+
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
+}
+
+ResolutionTaskHolder@71 {
+    <name not found> = EmptyList@16[empty]
+    <name not found> = EmptyList@16[empty]
+    <name not found> = EmptyList@16[empty]
+    <name not found> = EmptyList@16[empty]
+    <name not found> = EmptyList@16[empty]
+    <name not found> = EmptyList@16[empty]
     <name not found> = EmptyList@16[empty]
     <name not found> = EmptyList@16[empty]
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = EmptyList@16[empty]
-    <name not found> = EmptyList@16[empty]
-    <name not found> = EmptyList@16[empty]
-    <name not found> = EmptyList@16[empty]
-    <name not found> = EmptyList@16[empty]
-    <name not found> = EmptyList@16[empty]
-    <name not found> = EmptyList@16[empty]
+null {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@70 }
     <name not found> = EmptyList@16[empty]
     <name not found> = EmptyList@16[empty]
     <name not found> = EmptyList@16[empty]
diff --git a/compiler/testData/diagnostics/tests/enum/javaEnumWithNameClashing.lazy.log b/compiler/testData/diagnostics/tests/enum/javaEnumWithNameClashing.lazy.log
index 66516605074..73f154e3190 100644
--- a/compiler/testData/diagnostics/tests/enum/javaEnumWithNameClashing.lazy.log
+++ b/compiler/testData/diagnostics/tests/enum/javaEnumWithNameClashing.lazy.log
@@ -108,40 +108,29 @@ LazyJavaPackageFragment@60['lang'] {
 
 ResolutionTaskHolder@78 {
     <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
+    <name not found> = EmptyList@26[empty]
+}
+
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
+    <name not found> = EmptyList@26[empty]
+}
+
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
+}
+
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[2] { ResolutionCandidate@89, ResolutionCandidate@90 }
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[2] { ResolutionCandidate@92, ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[2] { ResolutionCandidate@92, ResolutionCandidate@93 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[2] { ResolutionCandidate@93, ResolutionCandidate@94 }
 }
 
 ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[2] { ResolutionCandidate@97, ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[2] { ResolutionCandidate@97, ResolutionCandidate@98 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
@@ -152,9 +141,23 @@ ResolutionTaskHolder@100 {
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@101 {
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
+ResolutionTaskHolder@96 {
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+}
+
+null {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@100[2] { ResolutionCandidate@93, ResolutionCandidate@94 }
+    <name not found> = ArrayList@101[2] { ResolutionCandidate@89, ResolutionCandidate@90 }
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
diff --git a/compiler/testData/diagnostics/tests/enum/javaEnumWithProperty.lazy.log b/compiler/testData/diagnostics/tests/enum/javaEnumWithProperty.lazy.log
index f96be977fc1..5dfbc6e1583 100644
--- a/compiler/testData/diagnostics/tests/enum/javaEnumWithProperty.lazy.log
+++ b/compiler/testData/diagnostics/tests/enum/javaEnumWithProperty.lazy.log
@@ -106,40 +106,29 @@ LazyJavaPackageFragment@60['lang'] {
 
 ResolutionTaskHolder@75 {
     <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
     <name not found> = EmptyList@27[empty]
 }
 
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
+}
+
 ResolutionTaskHolder@87 {
     <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
 }
 
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@90 {
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -150,9 +139,23 @@ ResolutionTaskHolder@95 {
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@96 {
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@91 {
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+}
+
+null {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@77 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
diff --git a/compiler/testData/diagnostics/tests/enum/kt2834.lazy.log b/compiler/testData/diagnostics/tests/enum/kt2834.lazy.log
index a0bd2a09d7e..295e668bac4 100644
--- a/compiler/testData/diagnostics/tests/enum/kt2834.lazy.log
+++ b/compiler/testData/diagnostics/tests/enum/kt2834.lazy.log
@@ -31,40 +31,43 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@23 {
     <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@25 }
+    <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@26 {
+    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
+}
+
+ResolutionTaskHolder@29 {
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+null {
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@25 }
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@28 }
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
diff --git a/compiler/testData/diagnostics/tests/enum/localEnums.lazy.log b/compiler/testData/diagnostics/tests/enum/localEnums.lazy.log
index 98c625417a0..a365be76806 100644
--- a/compiler/testData/diagnostics/tests/enum/localEnums.lazy.log
+++ b/compiler/testData/diagnostics/tests/enum/localEnums.lazy.log
@@ -31,19 +31,22 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@23 {
     <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@25 }
+    <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@26 {
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@27 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+null {
+    <name not found> = ArrayList@27[1] { ResolutionCandidate@25 }
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
diff --git a/compiler/testData/diagnostics/tests/enum/overrideFinalEnumMethods.lazy.log b/compiler/testData/diagnostics/tests/enum/overrideFinalEnumMethods.lazy.log
index febf2c0f5af..75b4b2c532f 100644
--- a/compiler/testData/diagnostics/tests/enum/overrideFinalEnumMethods.lazy.log
+++ b/compiler/testData/diagnostics/tests/enum/overrideFinalEnumMethods.lazy.log
@@ -40,10 +40,13 @@ LazyJavaPackageFragment@11['java'] {
 
 ResolutionTaskHolder@35 {
     <name not found> = ArrayList@36[8] { ResolutionCandidate@37, ResolutionCandidate@38, ResolutionCandidate@39, ... }
-    <name not found> = ArrayList@40[8] { ResolutionCandidate@37, ResolutionCandidate@38, ResolutionCandidate@39, ... }
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[8] { ResolutionCandidate@43, ResolutionCandidate@44, ResolutionCandidate@45, ... }
-    <name not found> = ArrayList@46[8] { ResolutionCandidate@43, ResolutionCandidate@44, ResolutionCandidate@45, ... }
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[8] { ResolutionCandidate@42, ResolutionCandidate@43, ResolutionCandidate@44, ... }
+}
+
+null {
+    <name not found> = ArrayList@45[8] { ResolutionCandidate@42, ResolutionCandidate@43, ResolutionCandidate@44, ... }
+    <name not found> = ArrayList@46[8] { ResolutionCandidate@37, ResolutionCandidate@38, ResolutionCandidate@39, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.lazy.log b/compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.lazy.log
index afb396b4f8f..a04739355ec 100644
--- a/compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.lazy.log
+++ b/compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.lazy.log
@@ -41,10 +41,6 @@ LazyJavaPackageFragment@16['lang'] {
 
 ResolutionTaskHolder@32 {
     <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
@@ -53,45 +49,52 @@ ResolutionTaskHolder@32 {
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@26[empty]
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
+}
+
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
     <name not found> = EmptyList@26[empty]
 }
 
 ResolutionTaskHolder@44 {
     <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@26[empty]
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+null {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@34 }
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/enum/typeParametersInEnum.lazy.log b/compiler/testData/diagnostics/tests/enum/typeParametersInEnum.lazy.log
index 6cd3cc53433..89f31f66146 100644
--- a/compiler/testData/diagnostics/tests/enum/typeParametersInEnum.lazy.log
+++ b/compiler/testData/diagnostics/tests/enum/typeParametersInEnum.lazy.log
@@ -25,5 +25,8 @@ LazyJavaPackageFragment@9['java'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
+}
+
+null {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
 }
diff --git a/compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.lazy.log b/compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.lazy.log
index 5ce27ed771e..a461a662717 100644
--- a/compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.lazy.log
+++ b/compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.lazy.log
@@ -48,17 +48,7 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@32 {
     <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -69,55 +59,21 @@ ResolutionTaskHolder@32 {
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@39 {
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
     <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+}
+
+ResolutionTaskHolder@42 {
     <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -162,9 +118,8 @@ ResolutionTaskHolder@46 {
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -207,6 +162,75 @@ ResolutionTaskHolder@50 {
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+}
+
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -234,30 +258,6 @@ ResolutionTaskHolder@50 {
 
 ResolutionTaskHolder@54 {
     <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -302,62 +302,8 @@ ResolutionTaskHolder@54 {
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -372,61 +318,8 @@ ResolutionTaskHolder@58 {
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -439,85 +332,195 @@ ResolutionTaskHolder@62 {
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
+}
+
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
     <name not found> = EmptyList@24[empty]
 }
 
 ResolutionTaskHolder@66 {
     <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+null {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@56 }
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/evaluate/binaryMinusDepOnExpType.lazy.log b/compiler/testData/diagnostics/tests/evaluate/binaryMinusDepOnExpType.lazy.log
index 23cb438c86c..17ebe0a42c7 100644
--- a/compiler/testData/diagnostics/tests/evaluate/binaryMinusDepOnExpType.lazy.log
+++ b/compiler/testData/diagnostics/tests/evaluate/binaryMinusDepOnExpType.lazy.log
@@ -65,10 +65,6 @@ LazyJavaPackageFragment@15['lang'] {
 
 ResolutionTaskHolder@45 {
     <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
@@ -86,12 +82,8 @@ ResolutionTaskHolder@45 {
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
@@ -109,9 +101,8 @@ ResolutionTaskHolder@49 {
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
@@ -127,6 +118,22 @@ ResolutionTaskHolder@53 {
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
@@ -134,10 +141,6 @@ ResolutionTaskHolder@53 {
 
 ResolutionTaskHolder@57 {
     <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
@@ -155,12 +158,8 @@ ResolutionTaskHolder@57 {
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
@@ -178,9 +177,8 @@ ResolutionTaskHolder@61 {
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
@@ -196,6 +194,22 @@ ResolutionTaskHolder@65 {
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
@@ -203,10 +217,6 @@ ResolutionTaskHolder@65 {
 
 ResolutionTaskHolder@69 {
     <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
@@ -224,12 +234,8 @@ ResolutionTaskHolder@69 {
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
@@ -247,9 +253,8 @@ ResolutionTaskHolder@73 {
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
@@ -265,6 +270,22 @@ ResolutionTaskHolder@77 {
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
@@ -272,341 +293,323 @@ ResolutionTaskHolder@77 {
 
 ResolutionTaskHolder@81 {
     <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
 ResolutionTaskHolder@93 {
     <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
 ResolutionTaskHolder@105 {
     <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
 }
 
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@111 {
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
+}
+
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
 }
 
 ResolutionTaskHolder@117 {
     <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@120 {
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
 }
 
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@127 }
+ResolutionTaskHolder@123 {
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
+}
+
+ResolutionTaskHolder@126 {
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
 }
 
 ResolutionTaskHolder@129 {
     <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@131 }
 }
 
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@135 }
+ResolutionTaskHolder@132 {
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
 }
 
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@139 }
+ResolutionTaskHolder@135 {
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
+}
+
+ResolutionTaskHolder@138 {
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
 }
 
 ResolutionTaskHolder@141 {
     <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@143 }
 }
 
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@147 }
+ResolutionTaskHolder@144 {
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
 }
 
-ResolutionTaskHolder@149 {
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@151 }
+ResolutionTaskHolder@147 {
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
+}
+
+ResolutionTaskHolder@150 {
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
 }
 
 ResolutionTaskHolder@153 {
     <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@155 }
 }
 
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@159 }
+ResolutionTaskHolder@156 {
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
 }
 
-ResolutionTaskHolder@161 {
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@163 }
+ResolutionTaskHolder@159 {
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
+}
+
+ResolutionTaskHolder@162 {
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
 }
 
 ResolutionTaskHolder@165 {
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@167 }
+    <name not found> = ArrayList@166[8] { ResolutionCandidate@167, ResolutionCandidate@168, ResolutionCandidate@169, ... }
 }
 
-ResolutionTaskHolder@169 {
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@171 }
+ResolutionTaskHolder@170 {
+    <name not found> = ArrayList@171[8] { ResolutionCandidate@172, ResolutionCandidate@173, ResolutionCandidate@174, ... }
 }
 
-ResolutionTaskHolder@173 {
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@175 }
+ResolutionTaskHolder@175 {
+    <name not found> = ArrayList@176[8] { ResolutionCandidate@177, ResolutionCandidate@178, ResolutionCandidate@179, ... }
 }
 
-ResolutionTaskHolder@177 {
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@179 }
-}
-
-ResolutionTaskHolder@181 {
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@183 }
+ResolutionTaskHolder@180 {
+    <name not found> = ArrayList@181[8] { ResolutionCandidate@182, ResolutionCandidate@183, ResolutionCandidate@184, ... }
 }
 
 ResolutionTaskHolder@185 {
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@187 }
+    <name not found> = ArrayList@186[8] { ResolutionCandidate@187, ResolutionCandidate@188, ResolutionCandidate@189, ... }
 }
 
-ResolutionTaskHolder@189 {
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@191 }
+ResolutionTaskHolder@190 {
+    <name not found> = ArrayList@191[8] { ResolutionCandidate@192, ResolutionCandidate@193, ResolutionCandidate@194, ... }
 }
 
-ResolutionTaskHolder@193 {
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@195 }
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@195 }
+ResolutionTaskHolder@195 {
+    <name not found> = ArrayList@196[8] { ResolutionCandidate@197, ResolutionCandidate@198, ResolutionCandidate@199, ... }
 }
 
-ResolutionTaskHolder@197 {
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@199 }
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@199 }
-}
-
-ResolutionTaskHolder@201 {
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@203 }
+ResolutionTaskHolder@200 {
+    <name not found> = ArrayList@201[8] { ResolutionCandidate@202, ResolutionCandidate@203, ResolutionCandidate@204, ... }
 }
 
 ResolutionTaskHolder@205 {
     <name not found> = ArrayList@206[8] { ResolutionCandidate@207, ResolutionCandidate@208, ResolutionCandidate@209, ... }
-    <name not found> = ArrayList@210[8] { ResolutionCandidate@207, ResolutionCandidate@208, ResolutionCandidate@209, ... }
 }
 
-ResolutionTaskHolder@211 {
-    <name not found> = ArrayList@212[8] { ResolutionCandidate@213, ResolutionCandidate@214, ResolutionCandidate@215, ... }
-    <name not found> = ArrayList@216[8] { ResolutionCandidate@213, ResolutionCandidate@214, ResolutionCandidate@215, ... }
+ResolutionTaskHolder@210 {
+    <name not found> = ArrayList@211[8] { ResolutionCandidate@212, ResolutionCandidate@213, ResolutionCandidate@214, ... }
 }
 
-ResolutionTaskHolder@217 {
-    <name not found> = ArrayList@218[8] { ResolutionCandidate@219, ResolutionCandidate@220, ResolutionCandidate@221, ... }
-    <name not found> = ArrayList@222[8] { ResolutionCandidate@219, ResolutionCandidate@220, ResolutionCandidate@221, ... }
+ResolutionTaskHolder@215 {
+    <name not found> = ArrayList@216[8] { ResolutionCandidate@217, ResolutionCandidate@218, ResolutionCandidate@219, ... }
 }
 
-ResolutionTaskHolder@223 {
-    <name not found> = ArrayList@224[8] { ResolutionCandidate@225, ResolutionCandidate@226, ResolutionCandidate@227, ... }
-    <name not found> = ArrayList@228[8] { ResolutionCandidate@225, ResolutionCandidate@226, ResolutionCandidate@227, ... }
+ResolutionTaskHolder@220 {
+    <name not found> = ArrayList@221[8] { ResolutionCandidate@222, ResolutionCandidate@223, ResolutionCandidate@224, ... }
 }
 
-ResolutionTaskHolder@229 {
-    <name not found> = ArrayList@230[8] { ResolutionCandidate@231, ResolutionCandidate@232, ResolutionCandidate@233, ... }
-    <name not found> = ArrayList@234[8] { ResolutionCandidate@231, ResolutionCandidate@232, ResolutionCandidate@233, ... }
+ResolutionTaskHolder@225 {
+    <name not found> = ArrayList@226[8] { ResolutionCandidate@227, ResolutionCandidate@228, ResolutionCandidate@229, ... }
+}
+
+ResolutionTaskHolder@230 {
+    <name not found> = ArrayList@231[8] { ResolutionCandidate@232, ResolutionCandidate@233, ResolutionCandidate@234, ... }
 }
 
 ResolutionTaskHolder@235 {
     <name not found> = ArrayList@236[8] { ResolutionCandidate@237, ResolutionCandidate@238, ResolutionCandidate@239, ... }
-    <name not found> = ArrayList@240[8] { ResolutionCandidate@237, ResolutionCandidate@238, ResolutionCandidate@239, ... }
 }
 
-ResolutionTaskHolder@241 {
-    <name not found> = ArrayList@242[8] { ResolutionCandidate@243, ResolutionCandidate@244, ResolutionCandidate@245, ... }
-    <name not found> = ArrayList@246[8] { ResolutionCandidate@243, ResolutionCandidate@244, ResolutionCandidate@245, ... }
+ResolutionTaskHolder@240 {
+    <name not found> = ArrayList@241[8] { ResolutionCandidate@242, ResolutionCandidate@243, ResolutionCandidate@244, ... }
 }
 
-ResolutionTaskHolder@247 {
-    <name not found> = ArrayList@248[8] { ResolutionCandidate@249, ResolutionCandidate@250, ResolutionCandidate@251, ... }
-    <name not found> = ArrayList@252[8] { ResolutionCandidate@249, ResolutionCandidate@250, ResolutionCandidate@251, ... }
+ResolutionTaskHolder@245 {
+    <name not found> = ArrayList@246[8] { ResolutionCandidate@247, ResolutionCandidate@248, ResolutionCandidate@249, ... }
 }
 
-ResolutionTaskHolder@253 {
-    <name not found> = ArrayList@254[8] { ResolutionCandidate@255, ResolutionCandidate@256, ResolutionCandidate@257, ... }
-    <name not found> = ArrayList@258[8] { ResolutionCandidate@255, ResolutionCandidate@256, ResolutionCandidate@257, ... }
+ResolutionTaskHolder@250 {
+    <name not found> = ArrayList@251[8] { ResolutionCandidate@252, ResolutionCandidate@253, ResolutionCandidate@254, ... }
 }
 
-ResolutionTaskHolder@259 {
-    <name not found> = ArrayList@260[8] { ResolutionCandidate@261, ResolutionCandidate@262, ResolutionCandidate@263, ... }
-    <name not found> = ArrayList@264[8] { ResolutionCandidate@261, ResolutionCandidate@262, ResolutionCandidate@263, ... }
+ResolutionTaskHolder@255 {
+    <name not found> = ArrayList@256[8] { ResolutionCandidate@257, ResolutionCandidate@258, ResolutionCandidate@259, ... }
 }
 
-ResolutionTaskHolder@265 {
-    <name not found> = ArrayList@266[8] { ResolutionCandidate@267, ResolutionCandidate@268, ResolutionCandidate@269, ... }
-    <name not found> = ArrayList@270[8] { ResolutionCandidate@267, ResolutionCandidate@268, ResolutionCandidate@269, ... }
+ResolutionTaskHolder@260 {
+    <name not found> = ArrayList@261[8] { ResolutionCandidate@262, ResolutionCandidate@263, ResolutionCandidate@264, ... }
 }
 
-ResolutionTaskHolder@271 {
-    <name not found> = ArrayList@272[8] { ResolutionCandidate@273, ResolutionCandidate@274, ResolutionCandidate@275, ... }
-    <name not found> = ArrayList@276[8] { ResolutionCandidate@273, ResolutionCandidate@274, ResolutionCandidate@275, ... }
-}
-
-ResolutionTaskHolder@277 {
-    <name not found> = ArrayList@278[8] { ResolutionCandidate@279, ResolutionCandidate@280, ResolutionCandidate@281, ... }
-    <name not found> = ArrayList@282[8] { ResolutionCandidate@279, ResolutionCandidate@280, ResolutionCandidate@281, ... }
-}
-
-ResolutionTaskHolder@283 {
-    <name not found> = ArrayList@284[8] { ResolutionCandidate@285, ResolutionCandidate@286, ResolutionCandidate@287, ... }
-    <name not found> = ArrayList@288[8] { ResolutionCandidate@285, ResolutionCandidate@286, ResolutionCandidate@287, ... }
-}
-
-ResolutionTaskHolder@289 {
-    <name not found> = ArrayList@290[8] { ResolutionCandidate@291, ResolutionCandidate@292, ResolutionCandidate@293, ... }
-    <name not found> = ArrayList@294[8] { ResolutionCandidate@291, ResolutionCandidate@292, ResolutionCandidate@293, ... }
-}
-
-ResolutionTaskHolder@295 {
-    <name not found> = ArrayList@296[8] { ResolutionCandidate@297, ResolutionCandidate@298, ResolutionCandidate@299, ... }
-    <name not found> = ArrayList@300[8] { ResolutionCandidate@297, ResolutionCandidate@298, ResolutionCandidate@299, ... }
-}
-
-ResolutionTaskHolder@301 {
-    <name not found> = ArrayList@302[8] { ResolutionCandidate@303, ResolutionCandidate@304, ResolutionCandidate@305, ... }
-    <name not found> = ArrayList@306[8] { ResolutionCandidate@303, ResolutionCandidate@304, ResolutionCandidate@305, ... }
-}
-
-ResolutionTaskHolder@307 {
-    <name not found> = ArrayList@308[8] { ResolutionCandidate@309, ResolutionCandidate@310, ResolutionCandidate@311, ... }
-    <name not found> = ArrayList@312[8] { ResolutionCandidate@309, ResolutionCandidate@310, ResolutionCandidate@311, ... }
-}
-
-ResolutionTaskHolder@313 {
-    <name not found> = ArrayList@314[8] { ResolutionCandidate@315, ResolutionCandidate@316, ResolutionCandidate@317, ... }
-    <name not found> = ArrayList@318[8] { ResolutionCandidate@315, ResolutionCandidate@316, ResolutionCandidate@317, ... }
-}
-
-ResolutionTaskHolder@319 {
-    <name not found> = ArrayList@320[8] { ResolutionCandidate@321, ResolutionCandidate@322, ResolutionCandidate@323, ... }
-    <name not found> = ArrayList@324[8] { ResolutionCandidate@321, ResolutionCandidate@322, ResolutionCandidate@323, ... }
+null {
+    <name not found> = ArrayList@265[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@266[1] { ResolutionCandidate@125 }
+    <name not found> = ArrayList@267[1] { ResolutionCandidate@113 }
+    <name not found> = ArrayList@268[1] { ResolutionCandidate@146 }
+    <name not found> = ArrayList@269[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@270[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@271[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@272[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@273[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@274[1] { ResolutionCandidate@161 }
+    <name not found> = ArrayList@275[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@276[1] { ResolutionCandidate@131 }
+    <name not found> = ArrayList@277[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@278[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@279[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@280[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@281[1] { ResolutionCandidate@122 }
+    <name not found> = ArrayList@282[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@283[1] { ResolutionCandidate@140 }
+    <name not found> = ArrayList@284[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@285[1] { ResolutionCandidate@155 }
+    <name not found> = ArrayList@286[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@287[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@288[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@289[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@290[1] { ResolutionCandidate@149 }
+    <name not found> = ArrayList@291[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@292[1] { ResolutionCandidate@164 }
+    <name not found> = ArrayList@293[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@294[1] { ResolutionCandidate@128 }
+    <name not found> = ArrayList@295[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@296[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@297[1] { ResolutionCandidate@137 }
+    <name not found> = ArrayList@298[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@299[1] { ResolutionCandidate@134 }
+    <name not found> = ArrayList@300[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@301[1] { ResolutionCandidate@152 }
+    <name not found> = ArrayList@302[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@303[1] { ResolutionCandidate@143 }
+    <name not found> = ArrayList@304[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@305[8] { ResolutionCandidate@207, ResolutionCandidate@208, ResolutionCandidate@209, ... }
+    <name not found> = ArrayList@306[8] { ResolutionCandidate@217, ResolutionCandidate@218, ResolutionCandidate@219, ... }
+    <name not found> = ArrayList@307[8] { ResolutionCandidate@252, ResolutionCandidate@253, ResolutionCandidate@254, ... }
+    <name not found> = ArrayList@308[8] { ResolutionCandidate@212, ResolutionCandidate@213, ResolutionCandidate@214, ... }
+    <name not found> = ArrayList@309[8] { ResolutionCandidate@232, ResolutionCandidate@233, ResolutionCandidate@234, ... }
+    <name not found> = ArrayList@310[8] { ResolutionCandidate@197, ResolutionCandidate@198, ResolutionCandidate@199, ... }
+    <name not found> = ArrayList@311[8] { ResolutionCandidate@177, ResolutionCandidate@178, ResolutionCandidate@179, ... }
+    <name not found> = ArrayList@312[8] { ResolutionCandidate@222, ResolutionCandidate@223, ResolutionCandidate@224, ... }
+    <name not found> = ArrayList@313[8] { ResolutionCandidate@227, ResolutionCandidate@228, ResolutionCandidate@229, ... }
+    <name not found> = ArrayList@314[8] { ResolutionCandidate@187, ResolutionCandidate@188, ResolutionCandidate@189, ... }
+    <name not found> = ArrayList@315[8] { ResolutionCandidate@257, ResolutionCandidate@258, ResolutionCandidate@259, ... }
+    <name not found> = ArrayList@316[8] { ResolutionCandidate@182, ResolutionCandidate@183, ResolutionCandidate@184, ... }
+    <name not found> = ArrayList@317[8] { ResolutionCandidate@172, ResolutionCandidate@173, ResolutionCandidate@174, ... }
+    <name not found> = ArrayList@318[8] { ResolutionCandidate@262, ResolutionCandidate@263, ResolutionCandidate@264, ... }
+    <name not found> = ArrayList@319[8] { ResolutionCandidate@202, ResolutionCandidate@203, ResolutionCandidate@204, ... }
+    <name not found> = ArrayList@320[8] { ResolutionCandidate@242, ResolutionCandidate@243, ResolutionCandidate@244, ... }
+    <name not found> = ArrayList@321[8] { ResolutionCandidate@247, ResolutionCandidate@248, ResolutionCandidate@249, ... }
+    <name not found> = ArrayList@322[8] { ResolutionCandidate@192, ResolutionCandidate@193, ResolutionCandidate@194, ... }
+    <name not found> = ArrayList@323[8] { ResolutionCandidate@167, ResolutionCandidate@168, ResolutionCandidate@169, ... }
+    <name not found> = ArrayList@324[8] { ResolutionCandidate@237, ResolutionCandidate@238, ResolutionCandidate@239, ... }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/evaluate/binaryMinusIndepWoExpType.lazy.log b/compiler/testData/diagnostics/tests/evaluate/binaryMinusIndepWoExpType.lazy.log
index bde3a0a75e8..90cab6455a9 100644
--- a/compiler/testData/diagnostics/tests/evaluate/binaryMinusIndepWoExpType.lazy.log
+++ b/compiler/testData/diagnostics/tests/evaluate/binaryMinusIndepWoExpType.lazy.log
@@ -90,10 +90,6 @@ LazyJavaPackageFragment@22['lang'] {
 
 ResolutionTaskHolder@62 {
     <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
@@ -111,12 +107,8 @@ ResolutionTaskHolder@62 {
     <name not found> = EmptyList@54[empty]
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
@@ -134,9 +126,8 @@ ResolutionTaskHolder@66 {
     <name not found> = EmptyList@54[empty]
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
@@ -152,6 +143,22 @@ ResolutionTaskHolder@70 {
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
+}
+
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
@@ -159,10 +166,6 @@ ResolutionTaskHolder@70 {
 
 ResolutionTaskHolder@74 {
     <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
@@ -180,12 +183,8 @@ ResolutionTaskHolder@74 {
     <name not found> = EmptyList@54[empty]
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
@@ -203,9 +202,8 @@ ResolutionTaskHolder@78 {
     <name not found> = EmptyList@54[empty]
 }
 
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
@@ -221,6 +219,22 @@ ResolutionTaskHolder@82 {
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
+}
+
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
@@ -228,10 +242,6 @@ ResolutionTaskHolder@82 {
 
 ResolutionTaskHolder@86 {
     <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
@@ -249,12 +259,8 @@ ResolutionTaskHolder@86 {
     <name not found> = EmptyList@54[empty]
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
@@ -272,9 +278,8 @@ ResolutionTaskHolder@90 {
     <name not found> = EmptyList@54[empty]
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
@@ -290,6 +295,22 @@ ResolutionTaskHolder@94 {
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
+}
+
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
@@ -297,10 +318,6 @@ ResolutionTaskHolder@94 {
 
 ResolutionTaskHolder@98 {
     <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
@@ -318,12 +335,8 @@ ResolutionTaskHolder@98 {
     <name not found> = EmptyList@54[empty]
 }
 
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
@@ -341,10 +354,8 @@ ResolutionTaskHolder@102 {
     <name not found> = EmptyList@54[empty]
 }
 
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
-    <name not found> = EmptyList@54[empty]
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
@@ -360,325 +371,317 @@ ResolutionTaskHolder@106 {
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
+}
+
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
 }
 
 ResolutionTaskHolder@110 {
     <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
 }
 
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
+ResolutionTaskHolder@113 {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
 }
 
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
+}
+
+ResolutionTaskHolder@119 {
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
 }
 
 ResolutionTaskHolder@122 {
     <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
 }
 
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
+ResolutionTaskHolder@125 {
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
     <name not found> = EmptyList@54[empty]
 }
 
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@132 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
+ResolutionTaskHolder@128 {
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
     <name not found> = EmptyList@54[empty]
+}
+
+ResolutionTaskHolder@131 {
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
     <name not found> = EmptyList@54[empty]
 }
 
 ResolutionTaskHolder@134 {
     <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@136 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
 }
 
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@140 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
+ResolutionTaskHolder@137 {
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
     <name not found> = EmptyList@54[empty]
 }
 
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@144 }
+ResolutionTaskHolder@140 {
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
     <name not found> = EmptyList@54[empty]
+}
+
+ResolutionTaskHolder@143 {
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
     <name not found> = EmptyList@54[empty]
 }
 
 ResolutionTaskHolder@146 {
     <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@148 }
-    <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
 }
 
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@152 }
-    <name not found> = EmptyList@54[empty]
+ResolutionTaskHolder@149 {
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
     <name not found> = EmptyList@54[empty]
 }
 
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@156 }
+ResolutionTaskHolder@152 {
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
     <name not found> = EmptyList@54[empty]
+}
+
+ResolutionTaskHolder@155 {
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
     <name not found> = EmptyList@54[empty]
 }
 
 ResolutionTaskHolder@158 {
     <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@160 }
-    <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
 }
 
-ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@164 }
-    <name not found> = EmptyList@54[empty]
+ResolutionTaskHolder@161 {
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
     <name not found> = EmptyList@54[empty]
 }
 
-ResolutionTaskHolder@166 {
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@168 }
+ResolutionTaskHolder@164 {
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
     <name not found> = EmptyList@54[empty]
+}
+
+ResolutionTaskHolder@167 {
+    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
     <name not found> = EmptyList@54[empty]
 }
 
 ResolutionTaskHolder@170 {
     <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@172 }
-    <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
 }
 
-ResolutionTaskHolder@174 {
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@176 }
-    <name not found> = EmptyList@54[empty]
+ResolutionTaskHolder@173 {
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
     <name not found> = EmptyList@54[empty]
 }
 
-ResolutionTaskHolder@178 {
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@180 }
+ResolutionTaskHolder@176 {
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
     <name not found> = EmptyList@54[empty]
+}
+
+ResolutionTaskHolder@179 {
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
     <name not found> = EmptyList@54[empty]
 }
 
 ResolutionTaskHolder@182 {
     <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@184 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
 }
 
-ResolutionTaskHolder@186 {
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@188 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
+ResolutionTaskHolder@185 {
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
 }
 
-ResolutionTaskHolder@190 {
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@192 }
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@192 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
+ResolutionTaskHolder@188 {
+    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
+}
+
+ResolutionTaskHolder@191 {
+    <name not found> = ArrayList@192[1] { ResolutionCandidate@193 }
 }
 
 ResolutionTaskHolder@194 {
     <name not found> = ArrayList@195[1] { ResolutionCandidate@196 }
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@196 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
 }
 
-ResolutionTaskHolder@198 {
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@200 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
+ResolutionTaskHolder@197 {
+    <name not found> = ArrayList@198[1] { ResolutionCandidate@199 }
 }
 
-ResolutionTaskHolder@202 {
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@204 }
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@204 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
+ResolutionTaskHolder@200 {
+    <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
+}
+
+ResolutionTaskHolder@203 {
+    <name not found> = ArrayList@204[1] { ResolutionCandidate@205 }
 }
 
 ResolutionTaskHolder@206 {
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@208 }
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@208 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
+    <name not found> = ArrayList@207[8] { ResolutionCandidate@208, ResolutionCandidate@209, ResolutionCandidate@210, ... }
 }
 
-ResolutionTaskHolder@210 {
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@212 }
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@212 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
+ResolutionTaskHolder@211 {
+    <name not found> = ArrayList@212[8] { ResolutionCandidate@213, ResolutionCandidate@214, ResolutionCandidate@215, ... }
 }
 
-ResolutionTaskHolder@214 {
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@216 }
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@216 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
+ResolutionTaskHolder@216 {
+    <name not found> = ArrayList@217[8] { ResolutionCandidate@218, ResolutionCandidate@219, ResolutionCandidate@220, ... }
 }
 
-ResolutionTaskHolder@218 {
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@220 }
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@220 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@222 {
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@224 }
+ResolutionTaskHolder@221 {
+    <name not found> = ArrayList@222[8] { ResolutionCandidate@223, ResolutionCandidate@224, ResolutionCandidate@225, ... }
 }
 
 ResolutionTaskHolder@226 {
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@228 }
+    <name not found> = ArrayList@227[8] { ResolutionCandidate@228, ResolutionCandidate@229, ResolutionCandidate@230, ... }
 }
 
-ResolutionTaskHolder@230 {
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@232 }
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@232 }
-}
-
-ResolutionTaskHolder@234 {
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@236 }
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@236 }
-}
-
-ResolutionTaskHolder@238 {
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@240 }
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@240 }
-}
-
-ResolutionTaskHolder@242 {
-    <name not found> = ArrayList@243[1] { ResolutionCandidate@244 }
-    <name not found> = ArrayList@245[1] { ResolutionCandidate@244 }
-}
-
-ResolutionTaskHolder@246 {
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@248 }
-    <name not found> = ArrayList@249[1] { ResolutionCandidate@248 }
-}
-
-ResolutionTaskHolder@250 {
-    <name not found> = ArrayList@251[1] { ResolutionCandidate@252 }
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@252 }
-}
-
-ResolutionTaskHolder@254 {
-    <name not found> = ArrayList@255[8] { ResolutionCandidate@256, ResolutionCandidate@257, ResolutionCandidate@258, ... }
-    <name not found> = ArrayList@259[8] { ResolutionCandidate@256, ResolutionCandidate@257, ResolutionCandidate@258, ... }
-}
-
-ResolutionTaskHolder@260 {
-    <name not found> = ArrayList@261[8] { ResolutionCandidate@262, ResolutionCandidate@263, ResolutionCandidate@264, ... }
-    <name not found> = ArrayList@265[8] { ResolutionCandidate@262, ResolutionCandidate@263, ResolutionCandidate@264, ... }
-}
-
-ResolutionTaskHolder@266 {
-    <name not found> = ArrayList@267[8] { ResolutionCandidate@268, ResolutionCandidate@269, ResolutionCandidate@270, ... }
-    <name not found> = ArrayList@271[8] { ResolutionCandidate@268, ResolutionCandidate@269, ResolutionCandidate@270, ... }
-}
-
-ResolutionTaskHolder@272 {
-    <name not found> = ArrayList@273[8] { ResolutionCandidate@274, ResolutionCandidate@275, ResolutionCandidate@276, ... }
-    <name not found> = ArrayList@277[8] { ResolutionCandidate@274, ResolutionCandidate@275, ResolutionCandidate@276, ... }
-}
-
-ResolutionTaskHolder@278 {
-    <name not found> = ArrayList@279[8] { ResolutionCandidate@280, ResolutionCandidate@281, ResolutionCandidate@282, ... }
-    <name not found> = ArrayList@283[8] { ResolutionCandidate@280, ResolutionCandidate@281, ResolutionCandidate@282, ... }
+null {
+    <name not found> = ArrayList@231[1] { ResolutionCandidate@193 }
+    <name not found> = ArrayList@232[1] { ResolutionCandidate@190 }
+    <name not found> = ArrayList@233[1] { ResolutionCandidate@187 }
+    <name not found> = ArrayList@234[1] { ResolutionCandidate@196 }
+    <name not found> = ArrayList@235[1] { ResolutionCandidate@205 }
+    <name not found> = ArrayList@236[1] { ResolutionCandidate@199 }
+    <name not found> = ArrayList@237[1] { ResolutionCandidate@202 }
+    <name not found> = ArrayList@238[1] { ResolutionCandidate@184 }
+    <name not found> = ArrayList@239[1] { ResolutionCandidate@139 }
+    <name not found> = ArrayList@240[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@241[1] { ResolutionCandidate@133 }
+    <name not found> = ArrayList@242[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@243[1] { ResolutionCandidate@124 }
+    <name not found> = ArrayList@244[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@245[1] { ResolutionCandidate@175 }
+    <name not found> = ArrayList@246[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@247[1] { ResolutionCandidate@136 }
+    <name not found> = ArrayList@248[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@249[1] { ResolutionCandidate@181 }
+    <name not found> = ArrayList@250[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@251[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@252[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@253[1] { ResolutionCandidate@163 }
+    <name not found> = ArrayList@254[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@255[1] { ResolutionCandidate@178 }
+    <name not found> = ArrayList@256[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@257[1] { ResolutionCandidate@157 }
+    <name not found> = ArrayList@258[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@259[1] { ResolutionCandidate@142 }
+    <name not found> = ArrayList@260[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@261[1] { ResolutionCandidate@160 }
+    <name not found> = ArrayList@262[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@263[1] { ResolutionCandidate@166 }
+    <name not found> = ArrayList@264[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@265[1] { ResolutionCandidate@154 }
+    <name not found> = ArrayList@266[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@267[1] { ResolutionCandidate@169 }
+    <name not found> = ArrayList@268[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@269[1] { ResolutionCandidate@148 }
+    <name not found> = ArrayList@270[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@271[1] { ResolutionCandidate@172 }
+    <name not found> = ArrayList@272[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@273[1] { ResolutionCandidate@127 }
+    <name not found> = ArrayList@274[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@275[1] { ResolutionCandidate@151 }
+    <name not found> = ArrayList@276[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@277[1] { ResolutionCandidate@145 }
+    <name not found> = ArrayList@278[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@279[8] { ResolutionCandidate@223, ResolutionCandidate@224, ResolutionCandidate@225, ... }
+    <name not found> = ArrayList@280[8] { ResolutionCandidate@213, ResolutionCandidate@214, ResolutionCandidate@215, ... }
+    <name not found> = ArrayList@281[8] { ResolutionCandidate@218, ResolutionCandidate@219, ResolutionCandidate@220, ... }
+    <name not found> = ArrayList@282[8] { ResolutionCandidate@208, ResolutionCandidate@209, ResolutionCandidate@210, ... }
+    <name not found> = ArrayList@283[8] { ResolutionCandidate@228, ResolutionCandidate@229, ResolutionCandidate@230, ... }
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/evaluate/binaryMinusIndependentExpType.lazy.log b/compiler/testData/diagnostics/tests/evaluate/binaryMinusIndependentExpType.lazy.log
index 36ff48e0823..808615069e9 100644
--- a/compiler/testData/diagnostics/tests/evaluate/binaryMinusIndependentExpType.lazy.log
+++ b/compiler/testData/diagnostics/tests/evaluate/binaryMinusIndependentExpType.lazy.log
@@ -78,180 +78,183 @@ LazyJavaPackageFragment@37['java'] {
 
 ResolutionTaskHolder@74 {
     <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
 }
 
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
+}
+
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
 }
 
 ResolutionTaskHolder@86 {
     <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
+}
+
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
 }
 
 ResolutionTaskHolder@98 {
     <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
 }
 
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
 }
 
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
+}
+
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
 }
 
 ResolutionTaskHolder@110 {
     <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
 }
 
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
+ResolutionTaskHolder@113 {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
 }
 
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
+}
+
+ResolutionTaskHolder@119 {
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
 }
 
 ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
+    <name not found> = ArrayList@123[8] { ResolutionCandidate@124, ResolutionCandidate@125, ResolutionCandidate@126, ... }
 }
 
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
+ResolutionTaskHolder@127 {
+    <name not found> = ArrayList@128[8] { ResolutionCandidate@129, ResolutionCandidate@130, ResolutionCandidate@131, ... }
 }
 
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@132 }
+ResolutionTaskHolder@132 {
+    <name not found> = ArrayList@133[8] { ResolutionCandidate@134, ResolutionCandidate@135, ResolutionCandidate@136, ... }
 }
 
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@136 }
+ResolutionTaskHolder@137 {
+    <name not found> = ArrayList@138[8] { ResolutionCandidate@139, ResolutionCandidate@140, ResolutionCandidate@141, ... }
 }
 
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[8] { ResolutionCandidate@140, ResolutionCandidate@141, ResolutionCandidate@142, ... }
-    <name not found> = ArrayList@143[8] { ResolutionCandidate@140, ResolutionCandidate@141, ResolutionCandidate@142, ... }
+ResolutionTaskHolder@142 {
+    <name not found> = ArrayList@143[8] { ResolutionCandidate@144, ResolutionCandidate@145, ResolutionCandidate@146, ... }
 }
 
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[8] { ResolutionCandidate@146, ResolutionCandidate@147, ResolutionCandidate@148, ... }
-    <name not found> = ArrayList@149[8] { ResolutionCandidate@146, ResolutionCandidate@147, ResolutionCandidate@148, ... }
+ResolutionTaskHolder@147 {
+    <name not found> = ArrayList@148[8] { ResolutionCandidate@149, ResolutionCandidate@150, ResolutionCandidate@151, ... }
 }
 
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[8] { ResolutionCandidate@152, ResolutionCandidate@153, ResolutionCandidate@154, ... }
-    <name not found> = ArrayList@155[8] { ResolutionCandidate@152, ResolutionCandidate@153, ResolutionCandidate@154, ... }
+ResolutionTaskHolder@152 {
+    <name not found> = ArrayList@153[8] { ResolutionCandidate@154, ResolutionCandidate@155, ResolutionCandidate@156, ... }
 }
 
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[8] { ResolutionCandidate@158, ResolutionCandidate@159, ResolutionCandidate@160, ... }
-    <name not found> = ArrayList@161[8] { ResolutionCandidate@158, ResolutionCandidate@159, ResolutionCandidate@160, ... }
+ResolutionTaskHolder@157 {
+    <name not found> = ArrayList@158[8] { ResolutionCandidate@159, ResolutionCandidate@160, ResolutionCandidate@161, ... }
 }
 
 ResolutionTaskHolder@162 {
     <name not found> = ArrayList@163[8] { ResolutionCandidate@164, ResolutionCandidate@165, ResolutionCandidate@166, ... }
-    <name not found> = ArrayList@167[8] { ResolutionCandidate@164, ResolutionCandidate@165, ResolutionCandidate@166, ... }
 }
 
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[8] { ResolutionCandidate@170, ResolutionCandidate@171, ResolutionCandidate@172, ... }
-    <name not found> = ArrayList@173[8] { ResolutionCandidate@170, ResolutionCandidate@171, ResolutionCandidate@172, ... }
+ResolutionTaskHolder@167 {
+    <name not found> = ArrayList@168[8] { ResolutionCandidate@169, ResolutionCandidate@170, ResolutionCandidate@171, ... }
 }
 
-ResolutionTaskHolder@174 {
-    <name not found> = ArrayList@175[8] { ResolutionCandidate@176, ResolutionCandidate@177, ResolutionCandidate@178, ... }
-    <name not found> = ArrayList@179[8] { ResolutionCandidate@176, ResolutionCandidate@177, ResolutionCandidate@178, ... }
+ResolutionTaskHolder@172 {
+    <name not found> = ArrayList@173[8] { ResolutionCandidate@174, ResolutionCandidate@175, ResolutionCandidate@176, ... }
 }
 
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[8] { ResolutionCandidate@182, ResolutionCandidate@183, ResolutionCandidate@184, ... }
-    <name not found> = ArrayList@185[8] { ResolutionCandidate@182, ResolutionCandidate@183, ResolutionCandidate@184, ... }
+ResolutionTaskHolder@177 {
+    <name not found> = ArrayList@178[8] { ResolutionCandidate@179, ResolutionCandidate@180, ResolutionCandidate@181, ... }
 }
 
-ResolutionTaskHolder@186 {
-    <name not found> = ArrayList@187[8] { ResolutionCandidate@188, ResolutionCandidate@189, ResolutionCandidate@190, ... }
-    <name not found> = ArrayList@191[8] { ResolutionCandidate@188, ResolutionCandidate@189, ResolutionCandidate@190, ... }
+ResolutionTaskHolder@182 {
+    <name not found> = ArrayList@183[8] { ResolutionCandidate@184, ResolutionCandidate@185, ResolutionCandidate@186, ... }
+}
+
+ResolutionTaskHolder@187 {
+    <name not found> = ArrayList@188[8] { ResolutionCandidate@189, ResolutionCandidate@190, ResolutionCandidate@191, ... }
 }
 
 ResolutionTaskHolder@192 {
     <name not found> = ArrayList@193[8] { ResolutionCandidate@194, ResolutionCandidate@195, ResolutionCandidate@196, ... }
-    <name not found> = ArrayList@197[8] { ResolutionCandidate@194, ResolutionCandidate@195, ResolutionCandidate@196, ... }
 }
 
-ResolutionTaskHolder@198 {
-    <name not found> = ArrayList@199[8] { ResolutionCandidate@200, ResolutionCandidate@201, ResolutionCandidate@202, ... }
-    <name not found> = ArrayList@203[8] { ResolutionCandidate@200, ResolutionCandidate@201, ResolutionCandidate@202, ... }
+ResolutionTaskHolder@197 {
+    <name not found> = ArrayList@198[8] { ResolutionCandidate@199, ResolutionCandidate@200, ResolutionCandidate@201, ... }
 }
 
-ResolutionTaskHolder@204 {
-    <name not found> = ArrayList@205[8] { ResolutionCandidate@206, ResolutionCandidate@207, ResolutionCandidate@208, ... }
-    <name not found> = ArrayList@209[8] { ResolutionCandidate@206, ResolutionCandidate@207, ResolutionCandidate@208, ... }
+ResolutionTaskHolder@202 {
+    <name not found> = ArrayList@203[8] { ResolutionCandidate@204, ResolutionCandidate@205, ResolutionCandidate@206, ... }
 }
 
-ResolutionTaskHolder@210 {
-    <name not found> = ArrayList@211[8] { ResolutionCandidate@212, ResolutionCandidate@213, ResolutionCandidate@214, ... }
-    <name not found> = ArrayList@215[8] { ResolutionCandidate@212, ResolutionCandidate@213, ResolutionCandidate@214, ... }
+ResolutionTaskHolder@207 {
+    <name not found> = ArrayList@208[8] { ResolutionCandidate@209, ResolutionCandidate@210, ResolutionCandidate@211, ... }
 }
 
-ResolutionTaskHolder@216 {
-    <name not found> = ArrayList@217[8] { ResolutionCandidate@218, ResolutionCandidate@219, ResolutionCandidate@220, ... }
-    <name not found> = ArrayList@221[8] { ResolutionCandidate@218, ResolutionCandidate@219, ResolutionCandidate@220, ... }
+ResolutionTaskHolder@212 {
+    <name not found> = ArrayList@213[8] { ResolutionCandidate@214, ResolutionCandidate@215, ResolutionCandidate@216, ... }
 }
 
-ResolutionTaskHolder@222 {
-    <name not found> = ArrayList@223[8] { ResolutionCandidate@224, ResolutionCandidate@225, ResolutionCandidate@226, ... }
-    <name not found> = ArrayList@227[8] { ResolutionCandidate@224, ResolutionCandidate@225, ResolutionCandidate@226, ... }
+ResolutionTaskHolder@217 {
+    <name not found> = ArrayList@218[8] { ResolutionCandidate@219, ResolutionCandidate@220, ResolutionCandidate@221, ... }
 }
 
-ResolutionTaskHolder@228 {
-    <name not found> = ArrayList@229[8] { ResolutionCandidate@230, ResolutionCandidate@231, ResolutionCandidate@232, ... }
-    <name not found> = ArrayList@233[8] { ResolutionCandidate@230, ResolutionCandidate@231, ResolutionCandidate@232, ... }
-}
-
-ResolutionTaskHolder@234 {
-    <name not found> = ArrayList@235[8] { ResolutionCandidate@236, ResolutionCandidate@237, ResolutionCandidate@238, ... }
-    <name not found> = ArrayList@239[8] { ResolutionCandidate@236, ResolutionCandidate@237, ResolutionCandidate@238, ... }
-}
-
-ResolutionTaskHolder@240 {
-    <name not found> = ArrayList@241[8] { ResolutionCandidate@242, ResolutionCandidate@243, ResolutionCandidate@244, ... }
-    <name not found> = ArrayList@245[8] { ResolutionCandidate@242, ResolutionCandidate@243, ResolutionCandidate@244, ... }
-}
-
-ResolutionTaskHolder@246 {
-    <name not found> = ArrayList@247[8] { ResolutionCandidate@248, ResolutionCandidate@249, ResolutionCandidate@250, ... }
-    <name not found> = ArrayList@251[8] { ResolutionCandidate@248, ResolutionCandidate@249, ResolutionCandidate@250, ... }
-}
-
-ResolutionTaskHolder@252 {
-    <name not found> = ArrayList@253[8] { ResolutionCandidate@254, ResolutionCandidate@255, ResolutionCandidate@256, ... }
-    <name not found> = ArrayList@257[8] { ResolutionCandidate@254, ResolutionCandidate@255, ResolutionCandidate@256, ... }
+null {
+    <name not found> = ArrayList@222[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@223[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@224[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@225[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@226[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@228[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@231[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@232[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@233[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@234[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@235[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@236[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@237[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@238[8] { ResolutionCandidate@209, ResolutionCandidate@210, ResolutionCandidate@211, ... }
+    <name not found> = ArrayList@239[8] { ResolutionCandidate@219, ResolutionCandidate@220, ResolutionCandidate@221, ... }
+    <name not found> = ArrayList@240[8] { ResolutionCandidate@179, ResolutionCandidate@180, ResolutionCandidate@181, ... }
+    <name not found> = ArrayList@241[8] { ResolutionCandidate@204, ResolutionCandidate@205, ResolutionCandidate@206, ... }
+    <name not found> = ArrayList@242[8] { ResolutionCandidate@134, ResolutionCandidate@135, ResolutionCandidate@136, ... }
+    <name not found> = ArrayList@243[8] { ResolutionCandidate@184, ResolutionCandidate@185, ResolutionCandidate@186, ... }
+    <name not found> = ArrayList@244[8] { ResolutionCandidate@149, ResolutionCandidate@150, ResolutionCandidate@151, ... }
+    <name not found> = ArrayList@245[8] { ResolutionCandidate@174, ResolutionCandidate@175, ResolutionCandidate@176, ... }
+    <name not found> = ArrayList@246[8] { ResolutionCandidate@159, ResolutionCandidate@160, ResolutionCandidate@161, ... }
+    <name not found> = ArrayList@247[8] { ResolutionCandidate@169, ResolutionCandidate@170, ResolutionCandidate@171, ... }
+    <name not found> = ArrayList@248[8] { ResolutionCandidate@139, ResolutionCandidate@140, ResolutionCandidate@141, ... }
+    <name not found> = ArrayList@249[8] { ResolutionCandidate@124, ResolutionCandidate@125, ResolutionCandidate@126, ... }
+    <name not found> = ArrayList@250[8] { ResolutionCandidate@154, ResolutionCandidate@155, ResolutionCandidate@156, ... }
+    <name not found> = ArrayList@251[8] { ResolutionCandidate@129, ResolutionCandidate@130, ResolutionCandidate@131, ... }
+    <name not found> = ArrayList@252[8] { ResolutionCandidate@164, ResolutionCandidate@165, ResolutionCandidate@166, ... }
+    <name not found> = ArrayList@253[8] { ResolutionCandidate@189, ResolutionCandidate@190, ResolutionCandidate@191, ... }
+    <name not found> = ArrayList@254[8] { ResolutionCandidate@144, ResolutionCandidate@145, ResolutionCandidate@146, ... }
+    <name not found> = ArrayList@255[8] { ResolutionCandidate@199, ResolutionCandidate@200, ResolutionCandidate@201, ... }
+    <name not found> = ArrayList@256[8] { ResolutionCandidate@194, ResolutionCandidate@195, ResolutionCandidate@196, ... }
+    <name not found> = ArrayList@257[8] { ResolutionCandidate@214, ResolutionCandidate@215, ResolutionCandidate@216, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/evaluate/intOverflow.lazy.log b/compiler/testData/diagnostics/tests/evaluate/intOverflow.lazy.log
index 71de135cf2c..976448353b0 100644
--- a/compiler/testData/diagnostics/tests/evaluate/intOverflow.lazy.log
+++ b/compiler/testData/diagnostics/tests/evaluate/intOverflow.lazy.log
@@ -76,64 +76,55 @@ LazyJavaPackageFragment@45['lang'] {
 
 ResolutionTaskHolder@66 {
     <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
     <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
 }
 
-ResolutionTaskHolder@73 {
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
     <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+}
+
+ResolutionTaskHolder@76 {
     <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
     <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
     <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
 }
 
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
     <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
     <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
+}
+
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
     <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
@@ -141,64 +132,55 @@ ResolutionTaskHolder@94 {
 
 ResolutionTaskHolder@101 {
     <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
     <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
 }
 
-ResolutionTaskHolder@108 {
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
     <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+}
+
+ResolutionTaskHolder@111 {
     <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@113 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
     <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
 }
 
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@117 }
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
     <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
 }
 
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@127 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
+ResolutionTaskHolder@121 {
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
     <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
 }
 
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
+ResolutionTaskHolder@126 {
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
     <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
+}
+
+ResolutionTaskHolder@131 {
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
     <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
@@ -206,64 +188,55 @@ ResolutionTaskHolder@129 {
 
 ResolutionTaskHolder@136 {
     <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@141 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
     <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
 }
 
-ResolutionTaskHolder@143 {
+ResolutionTaskHolder@141 {
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
     <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@145 }
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+}
+
+ResolutionTaskHolder@146 {
     <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@148 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
     <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
 }
 
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@152 }
+ResolutionTaskHolder@151 {
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
     <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@155 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
 }
 
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@162 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
+ResolutionTaskHolder@156 {
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
     <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
 }
 
-ResolutionTaskHolder@164 {
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@169 }
+ResolutionTaskHolder@161 {
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
     <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
+}
+
+ResolutionTaskHolder@166 {
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
     <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
@@ -271,881 +244,911 @@ ResolutionTaskHolder@164 {
 
 ResolutionTaskHolder@171 {
     <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@176 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
     <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
 }
 
-ResolutionTaskHolder@178 {
+ResolutionTaskHolder@176 {
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
     <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@180 }
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+}
+
+ResolutionTaskHolder@181 {
     <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@183 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
 }
 
-ResolutionTaskHolder@185 {
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@187 }
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@190 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
+ResolutionTaskHolder@184 {
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
     <name not found> = EmptyList@63[empty]
 }
 
-ResolutionTaskHolder@192 {
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@194 }
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@197 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
+ResolutionTaskHolder@187 {
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
     <name not found> = EmptyList@63[empty]
+}
+
+ResolutionTaskHolder@190 {
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@192 }
     <name not found> = EmptyList@63[empty]
+}
+
+ResolutionTaskHolder@193 {
+    <name not found> = ArrayList@194[1] { ResolutionCandidate@195 }
     <name not found> = EmptyList@63[empty]
+}
+
+ResolutionTaskHolder@196 {
+    <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
     <name not found> = EmptyList@63[empty]
 }
 
 ResolutionTaskHolder@199 {
     <name not found> = ArrayList@200[1] { ResolutionCandidate@201 }
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@201 }
+    <name not found> = EmptyList@63[empty]
+}
+
+ResolutionTaskHolder@202 {
     <name not found> = ArrayList@203[1] { ResolutionCandidate@204 }
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@204 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
 }
 
-ResolutionTaskHolder@206 {
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@208 }
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@208 }
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@211 }
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@211 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
+ResolutionTaskHolder@205 {
+    <name not found> = ArrayList@206[1] { ResolutionCandidate@207 }
     <name not found> = EmptyList@63[empty]
 }
 
-ResolutionTaskHolder@213 {
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@215 }
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@218 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
+ResolutionTaskHolder@208 {
+    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
     <name not found> = EmptyList@63[empty]
+}
+
+ResolutionTaskHolder@211 {
+    <name not found> = ArrayList@212[1] { ResolutionCandidate@213 }
     <name not found> = EmptyList@63[empty]
+}
+
+ResolutionTaskHolder@214 {
+    <name not found> = ArrayList@215[1] { ResolutionCandidate@216 }
     <name not found> = EmptyList@63[empty]
+}
+
+ResolutionTaskHolder@217 {
+    <name not found> = ArrayList@218[1] { ResolutionCandidate@219 }
     <name not found> = EmptyList@63[empty]
 }
 
 ResolutionTaskHolder@220 {
     <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@222 }
+    <name not found> = EmptyList@63[empty]
+}
+
+ResolutionTaskHolder@223 {
     <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@225 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
 }
 
-ResolutionTaskHolder@227 {
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@229 }
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@229 }
-    <name not found> = EmptyList@63[empty]
+ResolutionTaskHolder@226 {
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
     <name not found> = EmptyList@63[empty]
 }
 
-ResolutionTaskHolder@231 {
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@233 }
+ResolutionTaskHolder@229 {
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
     <name not found> = EmptyList@63[empty]
+}
+
+ResolutionTaskHolder@232 {
+    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
     <name not found> = EmptyList@63[empty]
 }
 
 ResolutionTaskHolder@235 {
     <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@237 }
-    <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
 }
 
-ResolutionTaskHolder@239 {
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@241 }
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@241 }
-    <name not found> = EmptyList@63[empty]
+ResolutionTaskHolder@238 {
+    <name not found> = ArrayList@239[1] { ResolutionCandidate@240 }
     <name not found> = EmptyList@63[empty]
 }
 
-ResolutionTaskHolder@243 {
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@245 }
+ResolutionTaskHolder@241 {
+    <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
     <name not found> = EmptyList@63[empty]
+}
+
+ResolutionTaskHolder@244 {
+    <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
     <name not found> = EmptyList@63[empty]
 }
 
 ResolutionTaskHolder@247 {
     <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@249 }
-    <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
 }
 
-ResolutionTaskHolder@251 {
-    <name not found> = ArrayList@252[1] { ResolutionCandidate@253 }
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@253 }
-    <name not found> = EmptyList@63[empty]
+ResolutionTaskHolder@250 {
+    <name not found> = ArrayList@251[1] { ResolutionCandidate@252 }
     <name not found> = EmptyList@63[empty]
 }
 
-ResolutionTaskHolder@255 {
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
-    <name not found> = ArrayList@258[1] { ResolutionCandidate@257 }
+ResolutionTaskHolder@253 {
+    <name not found> = ArrayList@254[1] { ResolutionCandidate@255 }
     <name not found> = EmptyList@63[empty]
+}
+
+ResolutionTaskHolder@256 {
+    <name not found> = ArrayList@257[1] { ResolutionCandidate@258 }
     <name not found> = EmptyList@63[empty]
 }
 
 ResolutionTaskHolder@259 {
     <name not found> = ArrayList@260[1] { ResolutionCandidate@261 }
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@261 }
-    <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
 }
 
-ResolutionTaskHolder@263 {
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@265 }
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@265 }
-    <name not found> = EmptyList@63[empty]
+ResolutionTaskHolder@262 {
+    <name not found> = ArrayList@263[1] { ResolutionCandidate@264 }
     <name not found> = EmptyList@63[empty]
 }
 
-ResolutionTaskHolder@267 {
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
-    <name not found> = ArrayList@270[1] { ResolutionCandidate@269 }
+ResolutionTaskHolder@265 {
+    <name not found> = ArrayList@266[1] { ResolutionCandidate@267 }
     <name not found> = EmptyList@63[empty]
+}
+
+ResolutionTaskHolder@268 {
+    <name not found> = ArrayList@269[1] { ResolutionCandidate@270 }
     <name not found> = EmptyList@63[empty]
 }
 
 ResolutionTaskHolder@271 {
     <name not found> = ArrayList@272[1] { ResolutionCandidate@273 }
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@273 }
-    <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
 }
 
-ResolutionTaskHolder@275 {
-    <name not found> = ArrayList@276[1] { ResolutionCandidate@277 }
-    <name not found> = ArrayList@278[1] { ResolutionCandidate@277 }
-    <name not found> = EmptyList@63[empty]
+ResolutionTaskHolder@274 {
+    <name not found> = ArrayList@275[1] { ResolutionCandidate@276 }
     <name not found> = EmptyList@63[empty]
 }
 
-ResolutionTaskHolder@279 {
-    <name not found> = ArrayList@280[1] { ResolutionCandidate@281 }
-    <name not found> = ArrayList@282[1] { ResolutionCandidate@281 }
+ResolutionTaskHolder@277 {
+    <name not found> = ArrayList@278[1] { ResolutionCandidate@279 }
     <name not found> = EmptyList@63[empty]
+}
+
+ResolutionTaskHolder@280 {
+    <name not found> = ArrayList@281[1] { ResolutionCandidate@282 }
     <name not found> = EmptyList@63[empty]
 }
 
 ResolutionTaskHolder@283 {
     <name not found> = ArrayList@284[1] { ResolutionCandidate@285 }
-    <name not found> = ArrayList@286[1] { ResolutionCandidate@285 }
-    <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
 }
 
-ResolutionTaskHolder@287 {
-    <name not found> = ArrayList@288[1] { ResolutionCandidate@289 }
-    <name not found> = ArrayList@290[1] { ResolutionCandidate@289 }
-    <name not found> = EmptyList@63[empty]
+ResolutionTaskHolder@286 {
+    <name not found> = ArrayList@287[1] { ResolutionCandidate@288 }
     <name not found> = EmptyList@63[empty]
 }
 
-ResolutionTaskHolder@291 {
-    <name not found> = ArrayList@292[1] { ResolutionCandidate@293 }
-    <name not found> = ArrayList@294[1] { ResolutionCandidate@293 }
+ResolutionTaskHolder@289 {
+    <name not found> = ArrayList@290[1] { ResolutionCandidate@291 }
     <name not found> = EmptyList@63[empty]
+}
+
+ResolutionTaskHolder@292 {
+    <name not found> = ArrayList@293[1] { ResolutionCandidate@294 }
     <name not found> = EmptyList@63[empty]
 }
 
 ResolutionTaskHolder@295 {
     <name not found> = ArrayList@296[1] { ResolutionCandidate@297 }
-    <name not found> = ArrayList@298[1] { ResolutionCandidate@297 }
-    <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
 }
 
-ResolutionTaskHolder@299 {
-    <name not found> = ArrayList@300[1] { ResolutionCandidate@301 }
-    <name not found> = ArrayList@302[1] { ResolutionCandidate@301 }
-    <name not found> = EmptyList@63[empty]
+ResolutionTaskHolder@298 {
+    <name not found> = ArrayList@299[1] { ResolutionCandidate@300 }
     <name not found> = EmptyList@63[empty]
 }
 
-ResolutionTaskHolder@303 {
-    <name not found> = ArrayList@304[1] { ResolutionCandidate@305 }
-    <name not found> = ArrayList@306[1] { ResolutionCandidate@305 }
+ResolutionTaskHolder@301 {
+    <name not found> = ArrayList@302[1] { ResolutionCandidate@303 }
     <name not found> = EmptyList@63[empty]
+}
+
+ResolutionTaskHolder@304 {
+    <name not found> = ArrayList@305[1] { ResolutionCandidate@306 }
     <name not found> = EmptyList@63[empty]
 }
 
 ResolutionTaskHolder@307 {
     <name not found> = ArrayList@308[1] { ResolutionCandidate@309 }
-    <name not found> = ArrayList@310[1] { ResolutionCandidate@309 }
-    <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
 }
 
-ResolutionTaskHolder@311 {
-    <name not found> = ArrayList@312[1] { ResolutionCandidate@313 }
-    <name not found> = ArrayList@314[1] { ResolutionCandidate@313 }
-    <name not found> = EmptyList@63[empty]
+ResolutionTaskHolder@310 {
+    <name not found> = ArrayList@311[1] { ResolutionCandidate@312 }
     <name not found> = EmptyList@63[empty]
 }
 
-ResolutionTaskHolder@315 {
-    <name not found> = ArrayList@316[1] { ResolutionCandidate@317 }
-    <name not found> = ArrayList@318[1] { ResolutionCandidate@317 }
+ResolutionTaskHolder@313 {
+    <name not found> = ArrayList@314[1] { ResolutionCandidate@315 }
     <name not found> = EmptyList@63[empty]
+}
+
+ResolutionTaskHolder@316 {
+    <name not found> = ArrayList@317[1] { ResolutionCandidate@318 }
     <name not found> = EmptyList@63[empty]
 }
 
 ResolutionTaskHolder@319 {
     <name not found> = ArrayList@320[1] { ResolutionCandidate@321 }
-    <name not found> = ArrayList@322[1] { ResolutionCandidate@321 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
 }
 
-ResolutionTaskHolder@323 {
-    <name not found> = ArrayList@324[1] { ResolutionCandidate@325 }
-    <name not found> = ArrayList@326[1] { ResolutionCandidate@325 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
+ResolutionTaskHolder@322 {
+    <name not found> = ArrayList@323[7] { ResolutionCandidate@324, ResolutionCandidate@325, ResolutionCandidate@326, ... }
 }
 
 ResolutionTaskHolder@327 {
-    <name not found> = ArrayList@328[1] { ResolutionCandidate@329 }
-    <name not found> = ArrayList@330[1] { ResolutionCandidate@329 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
+    <name not found> = ArrayList@328[7] { ResolutionCandidate@329, ResolutionCandidate@330, ResolutionCandidate@331, ... }
 }
 
-ResolutionTaskHolder@331 {
-    <name not found> = ArrayList@332[1] { ResolutionCandidate@333 }
-    <name not found> = ArrayList@334[1] { ResolutionCandidate@333 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
+ResolutionTaskHolder@332 {
+    <name not found> = ArrayList@333[7] { ResolutionCandidate@334, ResolutionCandidate@335, ResolutionCandidate@336, ... }
 }
 
-ResolutionTaskHolder@335 {
-    <name not found> = ArrayList@336[1] { ResolutionCandidate@337 }
-    <name not found> = ArrayList@338[1] { ResolutionCandidate@337 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
+ResolutionTaskHolder@337 {
+    <name not found> = ArrayList@338[7] { ResolutionCandidate@339, ResolutionCandidate@340, ResolutionCandidate@341, ... }
 }
 
-ResolutionTaskHolder@339 {
-    <name not found> = ArrayList@340[1] { ResolutionCandidate@341 }
-    <name not found> = ArrayList@342[1] { ResolutionCandidate@341 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@343 {
-    <name not found> = ArrayList@344[1] { ResolutionCandidate@345 }
-    <name not found> = ArrayList@346[1] { ResolutionCandidate@345 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
+ResolutionTaskHolder@342 {
+    <name not found> = ArrayList@343[7] { ResolutionCandidate@344, ResolutionCandidate@345, ResolutionCandidate@346, ... }
 }
 
 ResolutionTaskHolder@347 {
-    <name not found> = ArrayList@348[1] { ResolutionCandidate@349 }
-    <name not found> = ArrayList@350[1] { ResolutionCandidate@349 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
+    <name not found> = ArrayList@348[7] { ResolutionCandidate@349, ResolutionCandidate@350, ResolutionCandidate@351, ... }
 }
 
-ResolutionTaskHolder@351 {
-    <name not found> = ArrayList@352[1] { ResolutionCandidate@353 }
-    <name not found> = ArrayList@354[1] { ResolutionCandidate@353 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
+ResolutionTaskHolder@352 {
+    <name not found> = ArrayList@353[7] { ResolutionCandidate@354, ResolutionCandidate@355, ResolutionCandidate@356, ... }
 }
 
-ResolutionTaskHolder@355 {
-    <name not found> = ArrayList@356[1] { ResolutionCandidate@357 }
-    <name not found> = ArrayList@358[1] { ResolutionCandidate@357 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
+ResolutionTaskHolder@357 {
+    <name not found> = ArrayList@358[7] { ResolutionCandidate@359, ResolutionCandidate@360, ResolutionCandidate@361, ... }
 }
 
-ResolutionTaskHolder@359 {
-    <name not found> = ArrayList@360[1] { ResolutionCandidate@361 }
-    <name not found> = ArrayList@362[1] { ResolutionCandidate@361 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@363 {
-    <name not found> = ArrayList@364[1] { ResolutionCandidate@365 }
-    <name not found> = ArrayList@366[1] { ResolutionCandidate@365 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
+ResolutionTaskHolder@362 {
+    <name not found> = ArrayList@363[7] { ResolutionCandidate@364, ResolutionCandidate@365, ResolutionCandidate@366, ... }
 }
 
 ResolutionTaskHolder@367 {
-    <name not found> = ArrayList@368[1] { ResolutionCandidate@369 }
-    <name not found> = ArrayList@370[1] { ResolutionCandidate@369 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
+    <name not found> = ArrayList@368[7] { ResolutionCandidate@369, ResolutionCandidate@370, ResolutionCandidate@371, ... }
 }
 
-ResolutionTaskHolder@371 {
-    <name not found> = ArrayList@372[1] { ResolutionCandidate@373 }
-    <name not found> = ArrayList@374[1] { ResolutionCandidate@373 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
+ResolutionTaskHolder@372 {
+    <name not found> = ArrayList@373[7] { ResolutionCandidate@374, ResolutionCandidate@375, ResolutionCandidate@376, ... }
 }
 
-ResolutionTaskHolder@375 {
-    <name not found> = ArrayList@376[1] { ResolutionCandidate@377 }
-    <name not found> = ArrayList@378[1] { ResolutionCandidate@377 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
+ResolutionTaskHolder@377 {
+    <name not found> = ArrayList@378[7] { ResolutionCandidate@379, ResolutionCandidate@380, ResolutionCandidate@381, ... }
 }
 
-ResolutionTaskHolder@379 {
-    <name not found> = ArrayList@380[1] { ResolutionCandidate@381 }
-    <name not found> = ArrayList@382[1] { ResolutionCandidate@381 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@383 {
-    <name not found> = ArrayList@384[1] { ResolutionCandidate@385 }
-    <name not found> = ArrayList@386[1] { ResolutionCandidate@385 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
+ResolutionTaskHolder@382 {
+    <name not found> = ArrayList@383[7] { ResolutionCandidate@384, ResolutionCandidate@385, ResolutionCandidate@386, ... }
 }
 
 ResolutionTaskHolder@387 {
-    <name not found> = ArrayList@388[1] { ResolutionCandidate@389 }
-    <name not found> = ArrayList@390[1] { ResolutionCandidate@389 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
+    <name not found> = ArrayList@388[7] { ResolutionCandidate@389, ResolutionCandidate@390, ResolutionCandidate@391, ... }
 }
 
-ResolutionTaskHolder@391 {
-    <name not found> = ArrayList@392[1] { ResolutionCandidate@393 }
-    <name not found> = ArrayList@394[1] { ResolutionCandidate@393 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
+ResolutionTaskHolder@392 {
+    <name not found> = ArrayList@393[7] { ResolutionCandidate@394, ResolutionCandidate@395, ResolutionCandidate@396, ... }
 }
 
-ResolutionTaskHolder@395 {
-    <name not found> = ArrayList@396[1] { ResolutionCandidate@397 }
-    <name not found> = ArrayList@398[1] { ResolutionCandidate@397 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
+ResolutionTaskHolder@397 {
+    <name not found> = ArrayList@398[7] { ResolutionCandidate@399, ResolutionCandidate@400, ResolutionCandidate@401, ... }
 }
 
-ResolutionTaskHolder@399 {
-    <name not found> = ArrayList@400[1] { ResolutionCandidate@401 }
-    <name not found> = ArrayList@402[1] { ResolutionCandidate@401 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@403 {
-    <name not found> = ArrayList@404[1] { ResolutionCandidate@405 }
-    <name not found> = ArrayList@406[1] { ResolutionCandidate@405 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
+ResolutionTaskHolder@402 {
+    <name not found> = ArrayList@403[7] { ResolutionCandidate@404, ResolutionCandidate@405, ResolutionCandidate@406, ... }
 }
 
 ResolutionTaskHolder@407 {
-    <name not found> = ArrayList@408[1] { ResolutionCandidate@409 }
-    <name not found> = ArrayList@410[1] { ResolutionCandidate@409 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
+    <name not found> = ArrayList@408[7] { ResolutionCandidate@409, ResolutionCandidate@410, ResolutionCandidate@411, ... }
 }
 
-ResolutionTaskHolder@411 {
-    <name not found> = ArrayList@412[1] { ResolutionCandidate@413 }
-    <name not found> = ArrayList@414[1] { ResolutionCandidate@413 }
+ResolutionTaskHolder@412 {
+    <name not found> = ArrayList@413[7] { ResolutionCandidate@414, ResolutionCandidate@415, ResolutionCandidate@416, ... }
 }
 
-ResolutionTaskHolder@415 {
-    <name not found> = ArrayList@416[7] { ResolutionCandidate@417, ResolutionCandidate@418, ResolutionCandidate@419, ... }
-    <name not found> = ArrayList@420[7] { ResolutionCandidate@417, ResolutionCandidate@418, ResolutionCandidate@419, ... }
+ResolutionTaskHolder@417 {
+    <name not found> = ArrayList@418[7] { ResolutionCandidate@419, ResolutionCandidate@420, ResolutionCandidate@421, ... }
 }
 
-ResolutionTaskHolder@421 {
-    <name not found> = ArrayList@422[7] { ResolutionCandidate@423, ResolutionCandidate@424, ResolutionCandidate@425, ... }
-    <name not found> = ArrayList@426[7] { ResolutionCandidate@423, ResolutionCandidate@424, ResolutionCandidate@425, ... }
+ResolutionTaskHolder@422 {
+    <name not found> = ArrayList@423[7] { ResolutionCandidate@424, ResolutionCandidate@425, ResolutionCandidate@426, ... }
 }
 
 ResolutionTaskHolder@427 {
     <name not found> = ArrayList@428[7] { ResolutionCandidate@429, ResolutionCandidate@430, ResolutionCandidate@431, ... }
-    <name not found> = ArrayList@432[7] { ResolutionCandidate@429, ResolutionCandidate@430, ResolutionCandidate@431, ... }
 }
 
-ResolutionTaskHolder@433 {
-    <name not found> = ArrayList@434[7] { ResolutionCandidate@435, ResolutionCandidate@436, ResolutionCandidate@437, ... }
-    <name not found> = ArrayList@438[7] { ResolutionCandidate@435, ResolutionCandidate@436, ResolutionCandidate@437, ... }
+ResolutionTaskHolder@432 {
+    <name not found> = ArrayList@433[7] { ResolutionCandidate@434, ResolutionCandidate@435, ResolutionCandidate@436, ... }
 }
 
-ResolutionTaskHolder@439 {
-    <name not found> = ArrayList@440[7] { ResolutionCandidate@441, ResolutionCandidate@442, ResolutionCandidate@443, ... }
-    <name not found> = ArrayList@444[7] { ResolutionCandidate@441, ResolutionCandidate@442, ResolutionCandidate@443, ... }
+ResolutionTaskHolder@437 {
+    <name not found> = ArrayList@438[7] { ResolutionCandidate@439, ResolutionCandidate@440, ResolutionCandidate@441, ... }
 }
 
-ResolutionTaskHolder@445 {
-    <name not found> = ArrayList@446[7] { ResolutionCandidate@447, ResolutionCandidate@448, ResolutionCandidate@449, ... }
-    <name not found> = ArrayList@450[7] { ResolutionCandidate@447, ResolutionCandidate@448, ResolutionCandidate@449, ... }
+ResolutionTaskHolder@442 {
+    <name not found> = ArrayList@443[7] { ResolutionCandidate@444, ResolutionCandidate@445, ResolutionCandidate@446, ... }
 }
 
-ResolutionTaskHolder@451 {
-    <name not found> = ArrayList@452[7] { ResolutionCandidate@453, ResolutionCandidate@454, ResolutionCandidate@455, ... }
-    <name not found> = ArrayList@456[7] { ResolutionCandidate@453, ResolutionCandidate@454, ResolutionCandidate@455, ... }
+ResolutionTaskHolder@447 {
+    <name not found> = ArrayList@448[7] { ResolutionCandidate@449, ResolutionCandidate@450, ResolutionCandidate@451, ... }
+}
+
+ResolutionTaskHolder@452 {
+    <name not found> = ArrayList@453[7] { ResolutionCandidate@454, ResolutionCandidate@455, ResolutionCandidate@456, ... }
 }
 
 ResolutionTaskHolder@457 {
-    <name not found> = ArrayList@458[7] { ResolutionCandidate@459, ResolutionCandidate@460, ResolutionCandidate@461, ... }
-    <name not found> = ArrayList@462[7] { ResolutionCandidate@459, ResolutionCandidate@460, ResolutionCandidate@461, ... }
+    <name not found> = ArrayList@458[8] { ResolutionCandidate@459, ResolutionCandidate@460, ResolutionCandidate@461, ... }
 }
 
-ResolutionTaskHolder@463 {
-    <name not found> = ArrayList@464[7] { ResolutionCandidate@465, ResolutionCandidate@466, ResolutionCandidate@467, ... }
-    <name not found> = ArrayList@468[7] { ResolutionCandidate@465, ResolutionCandidate@466, ResolutionCandidate@467, ... }
+ResolutionTaskHolder@462 {
+    <name not found> = ArrayList@463[8] { ResolutionCandidate@464, ResolutionCandidate@465, ResolutionCandidate@466, ... }
 }
 
-ResolutionTaskHolder@469 {
-    <name not found> = ArrayList@470[7] { ResolutionCandidate@471, ResolutionCandidate@472, ResolutionCandidate@473, ... }
-    <name not found> = ArrayList@474[7] { ResolutionCandidate@471, ResolutionCandidate@472, ResolutionCandidate@473, ... }
+ResolutionTaskHolder@467 {
+    <name not found> = ArrayList@468[8] { ResolutionCandidate@469, ResolutionCandidate@470, ResolutionCandidate@471, ... }
 }
 
-ResolutionTaskHolder@475 {
-    <name not found> = ArrayList@476[7] { ResolutionCandidate@477, ResolutionCandidate@478, ResolutionCandidate@479, ... }
-    <name not found> = ArrayList@480[7] { ResolutionCandidate@477, ResolutionCandidate@478, ResolutionCandidate@479, ... }
+ResolutionTaskHolder@472 {
+    <name not found> = ArrayList@473[8] { ResolutionCandidate@474, ResolutionCandidate@475, ResolutionCandidate@476, ... }
 }
 
-ResolutionTaskHolder@481 {
-    <name not found> = ArrayList@482[7] { ResolutionCandidate@483, ResolutionCandidate@484, ResolutionCandidate@485, ... }
-    <name not found> = ArrayList@486[7] { ResolutionCandidate@483, ResolutionCandidate@484, ResolutionCandidate@485, ... }
+ResolutionTaskHolder@477 {
+    <name not found> = ArrayList@478[8] { ResolutionCandidate@479, ResolutionCandidate@480, ResolutionCandidate@481, ... }
+}
+
+ResolutionTaskHolder@482 {
+    <name not found> = ArrayList@483[8] { ResolutionCandidate@484, ResolutionCandidate@485, ResolutionCandidate@486, ... }
 }
 
 ResolutionTaskHolder@487 {
-    <name not found> = ArrayList@488[7] { ResolutionCandidate@489, ResolutionCandidate@490, ResolutionCandidate@491, ... }
-    <name not found> = ArrayList@492[7] { ResolutionCandidate@489, ResolutionCandidate@490, ResolutionCandidate@491, ... }
+    <name not found> = ArrayList@488[8] { ResolutionCandidate@489, ResolutionCandidate@490, ResolutionCandidate@491, ... }
 }
 
-ResolutionTaskHolder@493 {
-    <name not found> = ArrayList@494[7] { ResolutionCandidate@495, ResolutionCandidate@496, ResolutionCandidate@497, ... }
-    <name not found> = ArrayList@498[7] { ResolutionCandidate@495, ResolutionCandidate@496, ResolutionCandidate@497, ... }
+ResolutionTaskHolder@492 {
+    <name not found> = ArrayList@493[8] { ResolutionCandidate@494, ResolutionCandidate@495, ResolutionCandidate@496, ... }
 }
 
-ResolutionTaskHolder@499 {
-    <name not found> = ArrayList@500[7] { ResolutionCandidate@501, ResolutionCandidate@502, ResolutionCandidate@503, ... }
-    <name not found> = ArrayList@504[7] { ResolutionCandidate@501, ResolutionCandidate@502, ResolutionCandidate@503, ... }
+ResolutionTaskHolder@497 {
+    <name not found> = ArrayList@498[8] { ResolutionCandidate@499, ResolutionCandidate@500, ResolutionCandidate@501, ... }
 }
 
-ResolutionTaskHolder@505 {
-    <name not found> = ArrayList@506[7] { ResolutionCandidate@507, ResolutionCandidate@508, ResolutionCandidate@509, ... }
-    <name not found> = ArrayList@510[7] { ResolutionCandidate@507, ResolutionCandidate@508, ResolutionCandidate@509, ... }
+ResolutionTaskHolder@502 {
+    <name not found> = ArrayList@503[8] { ResolutionCandidate@504, ResolutionCandidate@505, ResolutionCandidate@506, ... }
 }
 
-ResolutionTaskHolder@511 {
-    <name not found> = ArrayList@512[7] { ResolutionCandidate@513, ResolutionCandidate@514, ResolutionCandidate@515, ... }
-    <name not found> = ArrayList@516[7] { ResolutionCandidate@513, ResolutionCandidate@514, ResolutionCandidate@515, ... }
+ResolutionTaskHolder@507 {
+    <name not found> = ArrayList@508[8] { ResolutionCandidate@509, ResolutionCandidate@510, ResolutionCandidate@511, ... }
+}
+
+ResolutionTaskHolder@512 {
+    <name not found> = ArrayList@513[8] { ResolutionCandidate@514, ResolutionCandidate@515, ResolutionCandidate@516, ... }
 }
 
 ResolutionTaskHolder@517 {
-    <name not found> = ArrayList@518[7] { ResolutionCandidate@519, ResolutionCandidate@520, ResolutionCandidate@521, ... }
-    <name not found> = ArrayList@522[7] { ResolutionCandidate@519, ResolutionCandidate@520, ResolutionCandidate@521, ... }
+    <name not found> = ArrayList@518[8] { ResolutionCandidate@519, ResolutionCandidate@520, ResolutionCandidate@521, ... }
 }
 
-ResolutionTaskHolder@523 {
-    <name not found> = ArrayList@524[7] { ResolutionCandidate@525, ResolutionCandidate@526, ResolutionCandidate@527, ... }
-    <name not found> = ArrayList@528[7] { ResolutionCandidate@525, ResolutionCandidate@526, ResolutionCandidate@527, ... }
+ResolutionTaskHolder@522 {
+    <name not found> = ArrayList@523[8] { ResolutionCandidate@524, ResolutionCandidate@525, ResolutionCandidate@526, ... }
 }
 
-ResolutionTaskHolder@529 {
-    <name not found> = ArrayList@530[7] { ResolutionCandidate@531, ResolutionCandidate@532, ResolutionCandidate@533, ... }
-    <name not found> = ArrayList@534[7] { ResolutionCandidate@531, ResolutionCandidate@532, ResolutionCandidate@533, ... }
+ResolutionTaskHolder@527 {
+    <name not found> = ArrayList@528[8] { ResolutionCandidate@529, ResolutionCandidate@530, ResolutionCandidate@531, ... }
 }
 
-ResolutionTaskHolder@535 {
-    <name not found> = ArrayList@536[7] { ResolutionCandidate@537, ResolutionCandidate@538, ResolutionCandidate@539, ... }
-    <name not found> = ArrayList@540[7] { ResolutionCandidate@537, ResolutionCandidate@538, ResolutionCandidate@539, ... }
+ResolutionTaskHolder@532 {
+    <name not found> = ArrayList@533[8] { ResolutionCandidate@534, ResolutionCandidate@535, ResolutionCandidate@536, ... }
 }
 
-ResolutionTaskHolder@541 {
-    <name not found> = ArrayList@542[7] { ResolutionCandidate@543, ResolutionCandidate@544, ResolutionCandidate@545, ... }
-    <name not found> = ArrayList@546[7] { ResolutionCandidate@543, ResolutionCandidate@544, ResolutionCandidate@545, ... }
+ResolutionTaskHolder@537 {
+    <name not found> = ArrayList@538[8] { ResolutionCandidate@539, ResolutionCandidate@540, ResolutionCandidate@541, ... }
+}
+
+ResolutionTaskHolder@542 {
+    <name not found> = ArrayList@543[8] { ResolutionCandidate@544, ResolutionCandidate@545, ResolutionCandidate@546, ... }
 }
 
 ResolutionTaskHolder@547 {
-    <name not found> = ArrayList@548[7] { ResolutionCandidate@549, ResolutionCandidate@550, ResolutionCandidate@551, ... }
-    <name not found> = ArrayList@552[7] { ResolutionCandidate@549, ResolutionCandidate@550, ResolutionCandidate@551, ... }
+    <name not found> = ArrayList@548[8] { ResolutionCandidate@549, ResolutionCandidate@550, ResolutionCandidate@551, ... }
 }
 
-ResolutionTaskHolder@553 {
-    <name not found> = ArrayList@554[7] { ResolutionCandidate@555, ResolutionCandidate@556, ResolutionCandidate@557, ... }
-    <name not found> = ArrayList@558[7] { ResolutionCandidate@555, ResolutionCandidate@556, ResolutionCandidate@557, ... }
+ResolutionTaskHolder@552 {
+    <name not found> = ArrayList@553[8] { ResolutionCandidate@554, ResolutionCandidate@555, ResolutionCandidate@556, ... }
 }
 
-ResolutionTaskHolder@559 {
-    <name not found> = ArrayList@560[7] { ResolutionCandidate@561, ResolutionCandidate@562, ResolutionCandidate@563, ... }
-    <name not found> = ArrayList@564[7] { ResolutionCandidate@561, ResolutionCandidate@562, ResolutionCandidate@563, ... }
+ResolutionTaskHolder@557 {
+    <name not found> = ArrayList@558[8] { ResolutionCandidate@559, ResolutionCandidate@560, ResolutionCandidate@561, ... }
 }
 
-ResolutionTaskHolder@565 {
-    <name not found> = ArrayList@566[7] { ResolutionCandidate@567, ResolutionCandidate@568, ResolutionCandidate@569, ... }
-    <name not found> = ArrayList@570[7] { ResolutionCandidate@567, ResolutionCandidate@568, ResolutionCandidate@569, ... }
+ResolutionTaskHolder@562 {
+    <name not found> = ArrayList@563[8] { ResolutionCandidate@564, ResolutionCandidate@565, ResolutionCandidate@566, ... }
 }
 
-ResolutionTaskHolder@571 {
-    <name not found> = ArrayList@572[7] { ResolutionCandidate@573, ResolutionCandidate@574, ResolutionCandidate@575, ... }
-    <name not found> = ArrayList@576[7] { ResolutionCandidate@573, ResolutionCandidate@574, ResolutionCandidate@575, ... }
+ResolutionTaskHolder@567 {
+    <name not found> = ArrayList@568[8] { ResolutionCandidate@569, ResolutionCandidate@570, ResolutionCandidate@571, ... }
+}
+
+ResolutionTaskHolder@572 {
+    <name not found> = ArrayList@573[8] { ResolutionCandidate@574, ResolutionCandidate@575, ResolutionCandidate@576, ... }
 }
 
 ResolutionTaskHolder@577 {
     <name not found> = ArrayList@578[8] { ResolutionCandidate@579, ResolutionCandidate@580, ResolutionCandidate@581, ... }
-    <name not found> = ArrayList@582[8] { ResolutionCandidate@579, ResolutionCandidate@580, ResolutionCandidate@581, ... }
 }
 
-ResolutionTaskHolder@583 {
-    <name not found> = ArrayList@584[8] { ResolutionCandidate@585, ResolutionCandidate@586, ResolutionCandidate@587, ... }
-    <name not found> = ArrayList@588[8] { ResolutionCandidate@585, ResolutionCandidate@586, ResolutionCandidate@587, ... }
+ResolutionTaskHolder@582 {
+    <name not found> = ArrayList@583[8] { ResolutionCandidate@584, ResolutionCandidate@585, ResolutionCandidate@586, ... }
 }
 
-ResolutionTaskHolder@589 {
-    <name not found> = ArrayList@590[8] { ResolutionCandidate@591, ResolutionCandidate@592, ResolutionCandidate@593, ... }
-    <name not found> = ArrayList@594[8] { ResolutionCandidate@591, ResolutionCandidate@592, ResolutionCandidate@593, ... }
+ResolutionTaskHolder@587 {
+    <name not found> = ArrayList@588[8] { ResolutionCandidate@589, ResolutionCandidate@590, ResolutionCandidate@591, ... }
 }
 
-ResolutionTaskHolder@595 {
-    <name not found> = ArrayList@596[8] { ResolutionCandidate@597, ResolutionCandidate@598, ResolutionCandidate@599, ... }
-    <name not found> = ArrayList@600[8] { ResolutionCandidate@597, ResolutionCandidate@598, ResolutionCandidate@599, ... }
+ResolutionTaskHolder@592 {
+    <name not found> = ArrayList@593[8] { ResolutionCandidate@594, ResolutionCandidate@595, ResolutionCandidate@596, ... }
 }
 
-ResolutionTaskHolder@601 {
-    <name not found> = ArrayList@602[8] { ResolutionCandidate@603, ResolutionCandidate@604, ResolutionCandidate@605, ... }
-    <name not found> = ArrayList@606[8] { ResolutionCandidate@603, ResolutionCandidate@604, ResolutionCandidate@605, ... }
+ResolutionTaskHolder@597 {
+    <name not found> = ArrayList@598[8] { ResolutionCandidate@599, ResolutionCandidate@600, ResolutionCandidate@601, ... }
+}
+
+ResolutionTaskHolder@602 {
+    <name not found> = ArrayList@603[8] { ResolutionCandidate@604, ResolutionCandidate@605, ResolutionCandidate@606, ... }
 }
 
 ResolutionTaskHolder@607 {
     <name not found> = ArrayList@608[8] { ResolutionCandidate@609, ResolutionCandidate@610, ResolutionCandidate@611, ... }
-    <name not found> = ArrayList@612[8] { ResolutionCandidate@609, ResolutionCandidate@610, ResolutionCandidate@611, ... }
 }
 
-ResolutionTaskHolder@613 {
-    <name not found> = ArrayList@614[8] { ResolutionCandidate@615, ResolutionCandidate@616, ResolutionCandidate@617, ... }
-    <name not found> = ArrayList@618[8] { ResolutionCandidate@615, ResolutionCandidate@616, ResolutionCandidate@617, ... }
+ResolutionTaskHolder@612 {
+    <name not found> = ArrayList@613[8] { ResolutionCandidate@614, ResolutionCandidate@615, ResolutionCandidate@616, ... }
 }
 
-ResolutionTaskHolder@619 {
-    <name not found> = ArrayList@620[8] { ResolutionCandidate@621, ResolutionCandidate@622, ResolutionCandidate@623, ... }
-    <name not found> = ArrayList@624[8] { ResolutionCandidate@621, ResolutionCandidate@622, ResolutionCandidate@623, ... }
+ResolutionTaskHolder@617 {
+    <name not found> = ArrayList@618[8] { ResolutionCandidate@619, ResolutionCandidate@620, ResolutionCandidate@621, ... }
 }
 
-ResolutionTaskHolder@625 {
-    <name not found> = ArrayList@626[8] { ResolutionCandidate@627, ResolutionCandidate@628, ResolutionCandidate@629, ... }
-    <name not found> = ArrayList@630[8] { ResolutionCandidate@627, ResolutionCandidate@628, ResolutionCandidate@629, ... }
+ResolutionTaskHolder@622 {
+    <name not found> = ArrayList@623[8] { ResolutionCandidate@624, ResolutionCandidate@625, ResolutionCandidate@626, ... }
 }
 
-ResolutionTaskHolder@631 {
-    <name not found> = ArrayList@632[8] { ResolutionCandidate@633, ResolutionCandidate@634, ResolutionCandidate@635, ... }
-    <name not found> = ArrayList@636[8] { ResolutionCandidate@633, ResolutionCandidate@634, ResolutionCandidate@635, ... }
+ResolutionTaskHolder@627 {
+    <name not found> = ArrayList@628[8] { ResolutionCandidate@629, ResolutionCandidate@630, ResolutionCandidate@631, ... }
+}
+
+ResolutionTaskHolder@632 {
+    <name not found> = ArrayList@633[8] { ResolutionCandidate@634, ResolutionCandidate@635, ResolutionCandidate@636, ... }
 }
 
 ResolutionTaskHolder@637 {
     <name not found> = ArrayList@638[8] { ResolutionCandidate@639, ResolutionCandidate@640, ResolutionCandidate@641, ... }
-    <name not found> = ArrayList@642[8] { ResolutionCandidate@639, ResolutionCandidate@640, ResolutionCandidate@641, ... }
 }
 
-ResolutionTaskHolder@643 {
-    <name not found> = ArrayList@644[8] { ResolutionCandidate@645, ResolutionCandidate@646, ResolutionCandidate@647, ... }
-    <name not found> = ArrayList@648[8] { ResolutionCandidate@645, ResolutionCandidate@646, ResolutionCandidate@647, ... }
+ResolutionTaskHolder@642 {
+    <name not found> = ArrayList@643[8] { ResolutionCandidate@644, ResolutionCandidate@645, ResolutionCandidate@646, ... }
 }
 
-ResolutionTaskHolder@649 {
-    <name not found> = ArrayList@650[8] { ResolutionCandidate@651, ResolutionCandidate@652, ResolutionCandidate@653, ... }
-    <name not found> = ArrayList@654[8] { ResolutionCandidate@651, ResolutionCandidate@652, ResolutionCandidate@653, ... }
+ResolutionTaskHolder@647 {
+    <name not found> = ArrayList@648[8] { ResolutionCandidate@649, ResolutionCandidate@650, ResolutionCandidate@651, ... }
 }
 
-ResolutionTaskHolder@655 {
-    <name not found> = ArrayList@656[8] { ResolutionCandidate@657, ResolutionCandidate@658, ResolutionCandidate@659, ... }
-    <name not found> = ArrayList@660[8] { ResolutionCandidate@657, ResolutionCandidate@658, ResolutionCandidate@659, ... }
+ResolutionTaskHolder@652 {
+    <name not found> = ArrayList@653[8] { ResolutionCandidate@654, ResolutionCandidate@655, ResolutionCandidate@656, ... }
 }
 
-ResolutionTaskHolder@661 {
-    <name not found> = ArrayList@662[8] { ResolutionCandidate@663, ResolutionCandidate@664, ResolutionCandidate@665, ... }
-    <name not found> = ArrayList@666[8] { ResolutionCandidate@663, ResolutionCandidate@664, ResolutionCandidate@665, ... }
+ResolutionTaskHolder@657 {
+    <name not found> = ArrayList@658[8] { ResolutionCandidate@659, ResolutionCandidate@660, ResolutionCandidate@661, ... }
+}
+
+ResolutionTaskHolder@662 {
+    <name not found> = ArrayList@663[8] { ResolutionCandidate@664, ResolutionCandidate@665, ResolutionCandidate@666, ... }
 }
 
 ResolutionTaskHolder@667 {
     <name not found> = ArrayList@668[8] { ResolutionCandidate@669, ResolutionCandidate@670, ResolutionCandidate@671, ... }
-    <name not found> = ArrayList@672[8] { ResolutionCandidate@669, ResolutionCandidate@670, ResolutionCandidate@671, ... }
 }
 
-ResolutionTaskHolder@673 {
-    <name not found> = ArrayList@674[8] { ResolutionCandidate@675, ResolutionCandidate@676, ResolutionCandidate@677, ... }
-    <name not found> = ArrayList@678[8] { ResolutionCandidate@675, ResolutionCandidate@676, ResolutionCandidate@677, ... }
+ResolutionTaskHolder@672 {
+    <name not found> = ArrayList@673[8] { ResolutionCandidate@674, ResolutionCandidate@675, ResolutionCandidate@676, ... }
 }
 
-ResolutionTaskHolder@679 {
-    <name not found> = ArrayList@680[8] { ResolutionCandidate@681, ResolutionCandidate@682, ResolutionCandidate@683, ... }
-    <name not found> = ArrayList@684[8] { ResolutionCandidate@681, ResolutionCandidate@682, ResolutionCandidate@683, ... }
+ResolutionTaskHolder@677 {
+    <name not found> = ArrayList@678[8] { ResolutionCandidate@679, ResolutionCandidate@680, ResolutionCandidate@681, ... }
 }
 
-ResolutionTaskHolder@685 {
-    <name not found> = ArrayList@686[8] { ResolutionCandidate@687, ResolutionCandidate@688, ResolutionCandidate@689, ... }
-    <name not found> = ArrayList@690[8] { ResolutionCandidate@687, ResolutionCandidate@688, ResolutionCandidate@689, ... }
+ResolutionTaskHolder@682 {
+    <name not found> = ArrayList@683[8] { ResolutionCandidate@684, ResolutionCandidate@685, ResolutionCandidate@686, ... }
 }
 
-ResolutionTaskHolder@691 {
-    <name not found> = ArrayList@692[8] { ResolutionCandidate@693, ResolutionCandidate@694, ResolutionCandidate@695, ... }
-    <name not found> = ArrayList@696[8] { ResolutionCandidate@693, ResolutionCandidate@694, ResolutionCandidate@695, ... }
+ResolutionTaskHolder@687 {
+    <name not found> = ArrayList@688[8] { ResolutionCandidate@689, ResolutionCandidate@690, ResolutionCandidate@691, ... }
+}
+
+ResolutionTaskHolder@692 {
+    <name not found> = ArrayList@693[8] { ResolutionCandidate@694, ResolutionCandidate@695, ResolutionCandidate@696, ... }
 }
 
 ResolutionTaskHolder@697 {
     <name not found> = ArrayList@698[8] { ResolutionCandidate@699, ResolutionCandidate@700, ResolutionCandidate@701, ... }
-    <name not found> = ArrayList@702[8] { ResolutionCandidate@699, ResolutionCandidate@700, ResolutionCandidate@701, ... }
 }
 
-ResolutionTaskHolder@703 {
-    <name not found> = ArrayList@704[8] { ResolutionCandidate@705, ResolutionCandidate@706, ResolutionCandidate@707, ... }
-    <name not found> = ArrayList@708[8] { ResolutionCandidate@705, ResolutionCandidate@706, ResolutionCandidate@707, ... }
+ResolutionTaskHolder@702 {
+    <name not found> = ArrayList@703[8] { ResolutionCandidate@704, ResolutionCandidate@705, ResolutionCandidate@706, ... }
 }
 
-ResolutionTaskHolder@709 {
-    <name not found> = ArrayList@710[8] { ResolutionCandidate@711, ResolutionCandidate@712, ResolutionCandidate@713, ... }
-    <name not found> = ArrayList@714[8] { ResolutionCandidate@711, ResolutionCandidate@712, ResolutionCandidate@713, ... }
+ResolutionTaskHolder@707 {
+    <name not found> = ArrayList@708[8] { ResolutionCandidate@709, ResolutionCandidate@710, ResolutionCandidate@711, ... }
 }
 
-ResolutionTaskHolder@715 {
-    <name not found> = ArrayList@716[8] { ResolutionCandidate@717, ResolutionCandidate@718, ResolutionCandidate@719, ... }
-    <name not found> = ArrayList@720[8] { ResolutionCandidate@717, ResolutionCandidate@718, ResolutionCandidate@719, ... }
+ResolutionTaskHolder@712 {
+    <name not found> = ArrayList@713[8] { ResolutionCandidate@714, ResolutionCandidate@715, ResolutionCandidate@716, ... }
 }
 
-ResolutionTaskHolder@721 {
-    <name not found> = ArrayList@722[8] { ResolutionCandidate@723, ResolutionCandidate@724, ResolutionCandidate@725, ... }
-    <name not found> = ArrayList@726[8] { ResolutionCandidate@723, ResolutionCandidate@724, ResolutionCandidate@725, ... }
+ResolutionTaskHolder@717 {
+    <name not found> = ArrayList@718[8] { ResolutionCandidate@719, ResolutionCandidate@720, ResolutionCandidate@721, ... }
+}
+
+ResolutionTaskHolder@722 {
+    <name not found> = ArrayList@723[8] { ResolutionCandidate@724, ResolutionCandidate@725, ResolutionCandidate@726, ... }
 }
 
 ResolutionTaskHolder@727 {
     <name not found> = ArrayList@728[8] { ResolutionCandidate@729, ResolutionCandidate@730, ResolutionCandidate@731, ... }
-    <name not found> = ArrayList@732[8] { ResolutionCandidate@729, ResolutionCandidate@730, ResolutionCandidate@731, ... }
 }
 
-ResolutionTaskHolder@733 {
-    <name not found> = ArrayList@734[8] { ResolutionCandidate@735, ResolutionCandidate@736, ResolutionCandidate@737, ... }
-    <name not found> = ArrayList@738[8] { ResolutionCandidate@735, ResolutionCandidate@736, ResolutionCandidate@737, ... }
+ResolutionTaskHolder@732 {
+    <name not found> = ArrayList@733[8] { ResolutionCandidate@734, ResolutionCandidate@735, ResolutionCandidate@736, ... }
 }
 
-ResolutionTaskHolder@739 {
-    <name not found> = ArrayList@740[8] { ResolutionCandidate@741, ResolutionCandidate@742, ResolutionCandidate@743, ... }
-    <name not found> = ArrayList@744[8] { ResolutionCandidate@741, ResolutionCandidate@742, ResolutionCandidate@743, ... }
+ResolutionTaskHolder@737 {
+    <name not found> = ArrayList@738[8] { ResolutionCandidate@739, ResolutionCandidate@740, ResolutionCandidate@741, ... }
 }
 
-ResolutionTaskHolder@745 {
-    <name not found> = ArrayList@746[8] { ResolutionCandidate@747, ResolutionCandidate@748, ResolutionCandidate@749, ... }
-    <name not found> = ArrayList@750[8] { ResolutionCandidate@747, ResolutionCandidate@748, ResolutionCandidate@749, ... }
+ResolutionTaskHolder@742 {
+    <name not found> = ArrayList@743[8] { ResolutionCandidate@744, ResolutionCandidate@745, ResolutionCandidate@746, ... }
 }
 
-ResolutionTaskHolder@751 {
-    <name not found> = ArrayList@752[8] { ResolutionCandidate@753, ResolutionCandidate@754, ResolutionCandidate@755, ... }
-    <name not found> = ArrayList@756[8] { ResolutionCandidate@753, ResolutionCandidate@754, ResolutionCandidate@755, ... }
+ResolutionTaskHolder@747 {
+    <name not found> = ArrayList@748[8] { ResolutionCandidate@749, ResolutionCandidate@750, ResolutionCandidate@751, ... }
+}
+
+ResolutionTaskHolder@752 {
+    <name not found> = ArrayList@753[8] { ResolutionCandidate@754, ResolutionCandidate@755, ResolutionCandidate@756, ... }
 }
 
 ResolutionTaskHolder@757 {
     <name not found> = ArrayList@758[8] { ResolutionCandidate@759, ResolutionCandidate@760, ResolutionCandidate@761, ... }
-    <name not found> = ArrayList@762[8] { ResolutionCandidate@759, ResolutionCandidate@760, ResolutionCandidate@761, ... }
 }
 
-ResolutionTaskHolder@763 {
-    <name not found> = ArrayList@764[8] { ResolutionCandidate@765, ResolutionCandidate@766, ResolutionCandidate@767, ... }
-    <name not found> = ArrayList@768[8] { ResolutionCandidate@765, ResolutionCandidate@766, ResolutionCandidate@767, ... }
+ResolutionTaskHolder@762 {
+    <name not found> = ArrayList@763[8] { ResolutionCandidate@764, ResolutionCandidate@765, ResolutionCandidate@766, ... }
 }
 
-ResolutionTaskHolder@769 {
-    <name not found> = ArrayList@770[8] { ResolutionCandidate@771, ResolutionCandidate@772, ResolutionCandidate@773, ... }
-    <name not found> = ArrayList@774[8] { ResolutionCandidate@771, ResolutionCandidate@772, ResolutionCandidate@773, ... }
+ResolutionTaskHolder@767 {
+    <name not found> = ArrayList@768[8] { ResolutionCandidate@769, ResolutionCandidate@770, ResolutionCandidate@771, ... }
 }
 
-ResolutionTaskHolder@775 {
-    <name not found> = ArrayList@776[8] { ResolutionCandidate@777, ResolutionCandidate@778, ResolutionCandidate@779, ... }
-    <name not found> = ArrayList@780[8] { ResolutionCandidate@777, ResolutionCandidate@778, ResolutionCandidate@779, ... }
-}
-
-ResolutionTaskHolder@781 {
-    <name not found> = ArrayList@782[8] { ResolutionCandidate@783, ResolutionCandidate@784, ResolutionCandidate@785, ... }
-    <name not found> = ArrayList@786[8] { ResolutionCandidate@783, ResolutionCandidate@784, ResolutionCandidate@785, ... }
-}
-
-ResolutionTaskHolder@787 {
-    <name not found> = ArrayList@788[8] { ResolutionCandidate@789, ResolutionCandidate@790, ResolutionCandidate@791, ... }
-    <name not found> = ArrayList@792[8] { ResolutionCandidate@789, ResolutionCandidate@790, ResolutionCandidate@791, ... }
-}
-
-ResolutionTaskHolder@793 {
-    <name not found> = ArrayList@794[8] { ResolutionCandidate@795, ResolutionCandidate@796, ResolutionCandidate@797, ... }
-    <name not found> = ArrayList@798[8] { ResolutionCandidate@795, ResolutionCandidate@796, ResolutionCandidate@797, ... }
-}
-
-ResolutionTaskHolder@799 {
-    <name not found> = ArrayList@800[8] { ResolutionCandidate@801, ResolutionCandidate@802, ResolutionCandidate@803, ... }
-    <name not found> = ArrayList@804[8] { ResolutionCandidate@801, ResolutionCandidate@802, ResolutionCandidate@803, ... }
-}
-
-ResolutionTaskHolder@805 {
-    <name not found> = ArrayList@806[8] { ResolutionCandidate@807, ResolutionCandidate@808, ResolutionCandidate@809, ... }
-    <name not found> = ArrayList@810[8] { ResolutionCandidate@807, ResolutionCandidate@808, ResolutionCandidate@809, ... }
-}
-
-ResolutionTaskHolder@811 {
-    <name not found> = ArrayList@812[8] { ResolutionCandidate@813, ResolutionCandidate@814, ResolutionCandidate@815, ... }
-    <name not found> = ArrayList@816[8] { ResolutionCandidate@813, ResolutionCandidate@814, ResolutionCandidate@815, ... }
-}
-
-ResolutionTaskHolder@817 {
-    <name not found> = ArrayList@818[8] { ResolutionCandidate@819, ResolutionCandidate@820, ResolutionCandidate@821, ... }
-    <name not found> = ArrayList@822[8] { ResolutionCandidate@819, ResolutionCandidate@820, ResolutionCandidate@821, ... }
-}
-
-ResolutionTaskHolder@823 {
-    <name not found> = ArrayList@824[8] { ResolutionCandidate@825, ResolutionCandidate@826, ResolutionCandidate@827, ... }
-    <name not found> = ArrayList@828[8] { ResolutionCandidate@825, ResolutionCandidate@826, ResolutionCandidate@827, ... }
-}
-
-ResolutionTaskHolder@829 {
-    <name not found> = ArrayList@830[8] { ResolutionCandidate@831, ResolutionCandidate@832, ResolutionCandidate@833, ... }
-    <name not found> = ArrayList@834[8] { ResolutionCandidate@831, ResolutionCandidate@832, ResolutionCandidate@833, ... }
-}
-
-ResolutionTaskHolder@835 {
-    <name not found> = ArrayList@836[8] { ResolutionCandidate@837, ResolutionCandidate@838, ResolutionCandidate@839, ... }
-    <name not found> = ArrayList@840[8] { ResolutionCandidate@837, ResolutionCandidate@838, ResolutionCandidate@839, ... }
-}
-
-ResolutionTaskHolder@841 {
-    <name not found> = ArrayList@842[8] { ResolutionCandidate@843, ResolutionCandidate@844, ResolutionCandidate@845, ... }
-    <name not found> = ArrayList@846[8] { ResolutionCandidate@843, ResolutionCandidate@844, ResolutionCandidate@845, ... }
-}
-
-ResolutionTaskHolder@847 {
-    <name not found> = ArrayList@848[8] { ResolutionCandidate@849, ResolutionCandidate@850, ResolutionCandidate@851, ... }
-    <name not found> = ArrayList@852[8] { ResolutionCandidate@849, ResolutionCandidate@850, ResolutionCandidate@851, ... }
-}
-
-ResolutionTaskHolder@853 {
-    <name not found> = ArrayList@854[8] { ResolutionCandidate@855, ResolutionCandidate@856, ResolutionCandidate@857, ... }
-    <name not found> = ArrayList@858[8] { ResolutionCandidate@855, ResolutionCandidate@856, ResolutionCandidate@857, ... }
-}
-
-ResolutionTaskHolder@859 {
-    <name not found> = ArrayList@860[8] { ResolutionCandidate@861, ResolutionCandidate@862, ResolutionCandidate@863, ... }
-    <name not found> = ArrayList@864[8] { ResolutionCandidate@861, ResolutionCandidate@862, ResolutionCandidate@863, ... }
-}
-
-ResolutionTaskHolder@865 {
-    <name not found> = ArrayList@866[8] { ResolutionCandidate@867, ResolutionCandidate@868, ResolutionCandidate@869, ... }
-    <name not found> = ArrayList@870[8] { ResolutionCandidate@867, ResolutionCandidate@868, ResolutionCandidate@869, ... }
-}
-
-ResolutionTaskHolder@871 {
-    <name not found> = ArrayList@872[8] { ResolutionCandidate@873, ResolutionCandidate@874, ResolutionCandidate@875, ... }
-    <name not found> = ArrayList@876[8] { ResolutionCandidate@873, ResolutionCandidate@874, ResolutionCandidate@875, ... }
-}
-
-ResolutionTaskHolder@877 {
-    <name not found> = ArrayList@878[8] { ResolutionCandidate@879, ResolutionCandidate@880, ResolutionCandidate@881, ... }
-    <name not found> = ArrayList@882[8] { ResolutionCandidate@879, ResolutionCandidate@880, ResolutionCandidate@881, ... }
-}
-
-ResolutionTaskHolder@883 {
-    <name not found> = ArrayList@884[8] { ResolutionCandidate@885, ResolutionCandidate@886, ResolutionCandidate@887, ... }
-    <name not found> = ArrayList@888[8] { ResolutionCandidate@885, ResolutionCandidate@886, ResolutionCandidate@887, ... }
-}
-
-ResolutionTaskHolder@889 {
-    <name not found> = ArrayList@890[8] { ResolutionCandidate@891, ResolutionCandidate@892, ResolutionCandidate@893, ... }
-    <name not found> = ArrayList@894[8] { ResolutionCandidate@891, ResolutionCandidate@892, ResolutionCandidate@893, ... }
-}
-
-ResolutionTaskHolder@895 {
-    <name not found> = ArrayList@896[8] { ResolutionCandidate@897, ResolutionCandidate@898, ResolutionCandidate@899, ... }
-    <name not found> = ArrayList@900[8] { ResolutionCandidate@897, ResolutionCandidate@898, ResolutionCandidate@899, ... }
-}
-
-ResolutionTaskHolder@901 {
-    <name not found> = ArrayList@902[8] { ResolutionCandidate@903, ResolutionCandidate@904, ResolutionCandidate@905, ... }
-    <name not found> = ArrayList@906[8] { ResolutionCandidate@903, ResolutionCandidate@904, ResolutionCandidate@905, ... }
-}
-
-ResolutionTaskHolder@907 {
-    <name not found> = ArrayList@908[8] { ResolutionCandidate@909, ResolutionCandidate@910, ResolutionCandidate@911, ... }
-    <name not found> = ArrayList@912[8] { ResolutionCandidate@909, ResolutionCandidate@910, ResolutionCandidate@911, ... }
-}
-
-ResolutionTaskHolder@913 {
-    <name not found> = ArrayList@914[8] { ResolutionCandidate@915, ResolutionCandidate@916, ResolutionCandidate@917, ... }
-    <name not found> = ArrayList@918[8] { ResolutionCandidate@915, ResolutionCandidate@916, ResolutionCandidate@917, ... }
-}
-
-ResolutionTaskHolder@919 {
-    <name not found> = ArrayList@920[8] { ResolutionCandidate@921, ResolutionCandidate@922, ResolutionCandidate@923, ... }
-    <name not found> = ArrayList@924[8] { ResolutionCandidate@921, ResolutionCandidate@922, ResolutionCandidate@923, ... }
-}
-
-ResolutionTaskHolder@925 {
-    <name not found> = ArrayList@926[8] { ResolutionCandidate@927, ResolutionCandidate@928, ResolutionCandidate@929, ... }
-    <name not found> = ArrayList@930[8] { ResolutionCandidate@927, ResolutionCandidate@928, ResolutionCandidate@929, ... }
-}
-
-ResolutionTaskHolder@931 {
-    <name not found> = ArrayList@932[8] { ResolutionCandidate@933, ResolutionCandidate@934, ResolutionCandidate@935, ... }
-    <name not found> = ArrayList@936[8] { ResolutionCandidate@933, ResolutionCandidate@934, ResolutionCandidate@935, ... }
-}
-
-ResolutionTaskHolder@937 {
-    <name not found> = ArrayList@938[8] { ResolutionCandidate@939, ResolutionCandidate@940, ResolutionCandidate@941, ... }
-    <name not found> = ArrayList@942[8] { ResolutionCandidate@939, ResolutionCandidate@940, ResolutionCandidate@941, ... }
-}
-
-ResolutionTaskHolder@943 {
-    <name not found> = ArrayList@944[8] { ResolutionCandidate@945, ResolutionCandidate@946, ResolutionCandidate@947, ... }
-    <name not found> = ArrayList@948[8] { ResolutionCandidate@945, ResolutionCandidate@946, ResolutionCandidate@947, ... }
-}
-
-ResolutionTaskHolder@949 {
-    <name not found> = ArrayList@950[8] { ResolutionCandidate@951, ResolutionCandidate@952, ResolutionCandidate@953, ... }
-    <name not found> = ArrayList@954[8] { ResolutionCandidate@951, ResolutionCandidate@952, ResolutionCandidate@953, ... }
+null {
+    <name not found> = ArrayList@772[1] { ResolutionCandidate@321 }
+    <name not found> = ArrayList@773[1] { ResolutionCandidate@204 }
+    <name not found> = ArrayList@774[1] { ResolutionCandidate@207 }
+    <name not found> = ArrayList@775[1] { ResolutionCandidate@276 }
+    <name not found> = ArrayList@776[1] { ResolutionCandidate@183 }
+    <name not found> = ArrayList@777[1] { ResolutionCandidate@312 }
+    <name not found> = ArrayList@778[1] { ResolutionCandidate@318 }
+    <name not found> = ArrayList@779[1] { ResolutionCandidate@273 }
+    <name not found> = ArrayList@780[1] { ResolutionCandidate@255 }
+    <name not found> = ArrayList@781[1] { ResolutionCandidate@288 }
+    <name not found> = ArrayList@782[1] { ResolutionCandidate@225 }
+    <name not found> = ArrayList@783[1] { ResolutionCandidate@264 }
+    <name not found> = ArrayList@784[1] { ResolutionCandidate@243 }
+    <name not found> = ArrayList@785[1] { ResolutionCandidate@201 }
+    <name not found> = ArrayList@786[1] { ResolutionCandidate@222 }
+    <name not found> = ArrayList@787[1] { ResolutionCandidate@267 }
+    <name not found> = ArrayList@788[1] { ResolutionCandidate@303 }
+    <name not found> = ArrayList@789[1] { ResolutionCandidate@306 }
+    <name not found> = ArrayList@790[1] { ResolutionCandidate@186 }
+    <name not found> = ArrayList@791[1] { ResolutionCandidate@297 }
+    <name not found> = ArrayList@792[1] { ResolutionCandidate@300 }
+    <name not found> = ArrayList@793[1] { ResolutionCandidate@258 }
+    <name not found> = ArrayList@794[1] { ResolutionCandidate@246 }
+    <name not found> = ArrayList@795[1] { ResolutionCandidate@279 }
+    <name not found> = ArrayList@796[1] { ResolutionCandidate@249 }
+    <name not found> = ArrayList@797[1] { ResolutionCandidate@285 }
+    <name not found> = ArrayList@798[1] { ResolutionCandidate@210 }
+    <name not found> = ArrayList@799[1] { ResolutionCandidate@213 }
+    <name not found> = ArrayList@800[1] { ResolutionCandidate@261 }
+    <name not found> = ArrayList@801[1] { ResolutionCandidate@216 }
+    <name not found> = ArrayList@802[1] { ResolutionCandidate@198 }
+    <name not found> = ArrayList@803[1] { ResolutionCandidate@189 }
+    <name not found> = ArrayList@804[1] { ResolutionCandidate@231 }
+    <name not found> = ArrayList@805[1] { ResolutionCandidate@282 }
+    <name not found> = ArrayList@806[1] { ResolutionCandidate@291 }
+    <name not found> = ArrayList@807[1] { ResolutionCandidate@219 }
+    <name not found> = ArrayList@808[1] { ResolutionCandidate@195 }
+    <name not found> = ArrayList@809[1] { ResolutionCandidate@315 }
+    <name not found> = ArrayList@810[1] { ResolutionCandidate@309 }
+    <name not found> = ArrayList@811[1] { ResolutionCandidate@252 }
+    <name not found> = ArrayList@812[1] { ResolutionCandidate@270 }
+    <name not found> = ArrayList@813[1] { ResolutionCandidate@192 }
+    <name not found> = ArrayList@814[1] { ResolutionCandidate@228 }
+    <name not found> = ArrayList@815[1] { ResolutionCandidate@234 }
+    <name not found> = ArrayList@816[1] { ResolutionCandidate@240 }
+    <name not found> = ArrayList@817[1] { ResolutionCandidate@294 }
+    <name not found> = ArrayList@818[1] { ResolutionCandidate@237 }
+    <name not found> = ArrayList@819[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@820[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@821[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@822[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@823[1] { ResolutionCandidate@128 }
+    <name not found> = ArrayList@824[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@825[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@826[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@827[1] { ResolutionCandidate@153 }
+    <name not found> = ArrayList@828[1] { ResolutionCandidate@155 }
+    <name not found> = ArrayList@829[1] { ResolutionCandidate@178 }
+    <name not found> = ArrayList@830[1] { ResolutionCandidate@180 }
+    <name not found> = ArrayList@831[1] { ResolutionCandidate@133 }
+    <name not found> = ArrayList@832[1] { ResolutionCandidate@135 }
+    <name not found> = ArrayList@833[1] { ResolutionCandidate@113 }
+    <name not found> = ArrayList@834[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@835[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@836[1] { ResolutionCandidate@140 }
+    <name not found> = ArrayList@837[1] { ResolutionCandidate@148 }
+    <name not found> = ArrayList@838[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@839[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@840[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@841[1] { ResolutionCandidate@143 }
+    <name not found> = ArrayList@842[1] { ResolutionCandidate@145 }
+    <name not found> = ArrayList@843[1] { ResolutionCandidate@163 }
+    <name not found> = ArrayList@844[1] { ResolutionCandidate@165 }
+    <name not found> = ArrayList@845[1] { ResolutionCandidate@173 }
+    <name not found> = ArrayList@846[1] { ResolutionCandidate@175 }
+    <name not found> = ArrayList@847[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@848[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@849[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@850[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@851[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@852[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@853[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@854[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@855[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@856[1] { ResolutionCandidate@160 }
+    <name not found> = ArrayList@857[1] { ResolutionCandidate@168 }
+    <name not found> = ArrayList@858[1] { ResolutionCandidate@170 }
+    <name not found> = ArrayList@859[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@860[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@861[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@862[1] { ResolutionCandidate@125 }
+    <name not found> = ArrayList@863[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@864[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@865[7] { ResolutionCandidate@334, ResolutionCandidate@335, ResolutionCandidate@336, ... }
+    <name not found> = ArrayList@866[7] { ResolutionCandidate@349, ResolutionCandidate@350, ResolutionCandidate@351, ... }
+    <name not found> = ArrayList@867[7] { ResolutionCandidate@449, ResolutionCandidate@450, ResolutionCandidate@451, ... }
+    <name not found> = ArrayList@868[7] { ResolutionCandidate@439, ResolutionCandidate@440, ResolutionCandidate@441, ... }
+    <name not found> = ArrayList@869[7] { ResolutionCandidate@359, ResolutionCandidate@360, ResolutionCandidate@361, ... }
+    <name not found> = ArrayList@870[7] { ResolutionCandidate@344, ResolutionCandidate@345, ResolutionCandidate@346, ... }
+    <name not found> = ArrayList@871[7] { ResolutionCandidate@369, ResolutionCandidate@370, ResolutionCandidate@371, ... }
+    <name not found> = ArrayList@872[7] { ResolutionCandidate@394, ResolutionCandidate@395, ResolutionCandidate@396, ... }
+    <name not found> = ArrayList@873[7] { ResolutionCandidate@374, ResolutionCandidate@375, ResolutionCandidate@376, ... }
+    <name not found> = ArrayList@874[7] { ResolutionCandidate@434, ResolutionCandidate@435, ResolutionCandidate@436, ... }
+    <name not found> = ArrayList@875[7] { ResolutionCandidate@339, ResolutionCandidate@340, ResolutionCandidate@341, ... }
+    <name not found> = ArrayList@876[7] { ResolutionCandidate@429, ResolutionCandidate@430, ResolutionCandidate@431, ... }
+    <name not found> = ArrayList@877[7] { ResolutionCandidate@414, ResolutionCandidate@415, ResolutionCandidate@416, ... }
+    <name not found> = ArrayList@878[7] { ResolutionCandidate@424, ResolutionCandidate@425, ResolutionCandidate@426, ... }
+    <name not found> = ArrayList@879[7] { ResolutionCandidate@419, ResolutionCandidate@420, ResolutionCandidate@421, ... }
+    <name not found> = ArrayList@880[7] { ResolutionCandidate@364, ResolutionCandidate@365, ResolutionCandidate@366, ... }
+    <name not found> = ArrayList@881[7] { ResolutionCandidate@324, ResolutionCandidate@325, ResolutionCandidate@326, ... }
+    <name not found> = ArrayList@882[7] { ResolutionCandidate@329, ResolutionCandidate@330, ResolutionCandidate@331, ... }
+    <name not found> = ArrayList@883[7] { ResolutionCandidate@399, ResolutionCandidate@400, ResolutionCandidate@401, ... }
+    <name not found> = ArrayList@884[7] { ResolutionCandidate@379, ResolutionCandidate@380, ResolutionCandidate@381, ... }
+    <name not found> = ArrayList@885[7] { ResolutionCandidate@384, ResolutionCandidate@385, ResolutionCandidate@386, ... }
+    <name not found> = ArrayList@886[7] { ResolutionCandidate@444, ResolutionCandidate@445, ResolutionCandidate@446, ... }
+    <name not found> = ArrayList@887[7] { ResolutionCandidate@404, ResolutionCandidate@405, ResolutionCandidate@406, ... }
+    <name not found> = ArrayList@888[7] { ResolutionCandidate@389, ResolutionCandidate@390, ResolutionCandidate@391, ... }
+    <name not found> = ArrayList@889[7] { ResolutionCandidate@354, ResolutionCandidate@355, ResolutionCandidate@356, ... }
+    <name not found> = ArrayList@890[7] { ResolutionCandidate@454, ResolutionCandidate@455, ResolutionCandidate@456, ... }
+    <name not found> = ArrayList@891[7] { ResolutionCandidate@409, ResolutionCandidate@410, ResolutionCandidate@411, ... }
+    <name not found> = ArrayList@892[8] { ResolutionCandidate@684, ResolutionCandidate@685, ResolutionCandidate@686, ... }
+    <name not found> = ArrayList@893[8] { ResolutionCandidate@614, ResolutionCandidate@615, ResolutionCandidate@616, ... }
+    <name not found> = ArrayList@894[8] { ResolutionCandidate@484, ResolutionCandidate@485, ResolutionCandidate@486, ... }
+    <name not found> = ArrayList@895[8] { ResolutionCandidate@674, ResolutionCandidate@675, ResolutionCandidate@676, ... }
+    <name not found> = ArrayList@896[8] { ResolutionCandidate@664, ResolutionCandidate@665, ResolutionCandidate@666, ... }
+    <name not found> = ArrayList@897[8] { ResolutionCandidate@464, ResolutionCandidate@465, ResolutionCandidate@466, ... }
+    <name not found> = ArrayList@898[8] { ResolutionCandidate@724, ResolutionCandidate@725, ResolutionCandidate@726, ... }
+    <name not found> = ArrayList@899[8] { ResolutionCandidate@504, ResolutionCandidate@505, ResolutionCandidate@506, ... }
+    <name not found> = ArrayList@900[8] { ResolutionCandidate@494, ResolutionCandidate@495, ResolutionCandidate@496, ... }
+    <name not found> = ArrayList@901[8] { ResolutionCandidate@769, ResolutionCandidate@770, ResolutionCandidate@771, ... }
+    <name not found> = ArrayList@902[8] { ResolutionCandidate@604, ResolutionCandidate@605, ResolutionCandidate@606, ... }
+    <name not found> = ArrayList@903[8] { ResolutionCandidate@654, ResolutionCandidate@655, ResolutionCandidate@656, ... }
+    <name not found> = ArrayList@904[8] { ResolutionCandidate@524, ResolutionCandidate@525, ResolutionCandidate@526, ... }
+    <name not found> = ArrayList@905[8] { ResolutionCandidate@574, ResolutionCandidate@575, ResolutionCandidate@576, ... }
+    <name not found> = ArrayList@906[8] { ResolutionCandidate@744, ResolutionCandidate@745, ResolutionCandidate@746, ... }
+    <name not found> = ArrayList@907[8] { ResolutionCandidate@509, ResolutionCandidate@510, ResolutionCandidate@511, ... }
+    <name not found> = ArrayList@908[8] { ResolutionCandidate@599, ResolutionCandidate@600, ResolutionCandidate@601, ... }
+    <name not found> = ArrayList@909[8] { ResolutionCandidate@729, ResolutionCandidate@730, ResolutionCandidate@731, ... }
+    <name not found> = ArrayList@910[8] { ResolutionCandidate@704, ResolutionCandidate@705, ResolutionCandidate@706, ... }
+    <name not found> = ArrayList@911[8] { ResolutionCandidate@734, ResolutionCandidate@735, ResolutionCandidate@736, ... }
+    <name not found> = ArrayList@912[8] { ResolutionCandidate@559, ResolutionCandidate@560, ResolutionCandidate@561, ... }
+    <name not found> = ArrayList@913[8] { ResolutionCandidate@634, ResolutionCandidate@635, ResolutionCandidate@636, ... }
+    <name not found> = ArrayList@914[8] { ResolutionCandidate@514, ResolutionCandidate@515, ResolutionCandidate@516, ... }
+    <name not found> = ArrayList@915[8] { ResolutionCandidate@759, ResolutionCandidate@760, ResolutionCandidate@761, ... }
+    <name not found> = ArrayList@916[8] { ResolutionCandidate@644, ResolutionCandidate@645, ResolutionCandidate@646, ... }
+    <name not found> = ArrayList@917[8] { ResolutionCandidate@579, ResolutionCandidate@580, ResolutionCandidate@581, ... }
+    <name not found> = ArrayList@918[8] { ResolutionCandidate@659, ResolutionCandidate@660, ResolutionCandidate@661, ... }
+    <name not found> = ArrayList@919[8] { ResolutionCandidate@564, ResolutionCandidate@565, ResolutionCandidate@566, ... }
+    <name not found> = ArrayList@920[8] { ResolutionCandidate@739, ResolutionCandidate@740, ResolutionCandidate@741, ... }
+    <name not found> = ArrayList@921[8] { ResolutionCandidate@719, ResolutionCandidate@720, ResolutionCandidate@721, ... }
+    <name not found> = ArrayList@922[8] { ResolutionCandidate@554, ResolutionCandidate@555, ResolutionCandidate@556, ... }
+    <name not found> = ArrayList@923[8] { ResolutionCandidate@479, ResolutionCandidate@480, ResolutionCandidate@481, ... }
+    <name not found> = ArrayList@924[8] { ResolutionCandidate@584, ResolutionCandidate@585, ResolutionCandidate@586, ... }
+    <name not found> = ArrayList@925[8] { ResolutionCandidate@609, ResolutionCandidate@610, ResolutionCandidate@611, ... }
+    <name not found> = ArrayList@926[8] { ResolutionCandidate@519, ResolutionCandidate@520, ResolutionCandidate@521, ... }
+    <name not found> = ArrayList@927[8] { ResolutionCandidate@474, ResolutionCandidate@475, ResolutionCandidate@476, ... }
+    <name not found> = ArrayList@928[8] { ResolutionCandidate@594, ResolutionCandidate@595, ResolutionCandidate@596, ... }
+    <name not found> = ArrayList@929[8] { ResolutionCandidate@679, ResolutionCandidate@680, ResolutionCandidate@681, ... }
+    <name not found> = ArrayList@930[8] { ResolutionCandidate@709, ResolutionCandidate@710, ResolutionCandidate@711, ... }
+    <name not found> = ArrayList@931[8] { ResolutionCandidate@469, ResolutionCandidate@470, ResolutionCandidate@471, ... }
+    <name not found> = ArrayList@932[8] { ResolutionCandidate@749, ResolutionCandidate@750, ResolutionCandidate@751, ... }
+    <name not found> = ArrayList@933[8] { ResolutionCandidate@624, ResolutionCandidate@625, ResolutionCandidate@626, ... }
+    <name not found> = ArrayList@934[8] { ResolutionCandidate@589, ResolutionCandidate@590, ResolutionCandidate@591, ... }
+    <name not found> = ArrayList@935[8] { ResolutionCandidate@639, ResolutionCandidate@640, ResolutionCandidate@641, ... }
+    <name not found> = ArrayList@936[8] { ResolutionCandidate@549, ResolutionCandidate@550, ResolutionCandidate@551, ... }
+    <name not found> = ArrayList@937[8] { ResolutionCandidate@669, ResolutionCandidate@670, ResolutionCandidate@671, ... }
+    <name not found> = ArrayList@938[8] { ResolutionCandidate@529, ResolutionCandidate@530, ResolutionCandidate@531, ... }
+    <name not found> = ArrayList@939[8] { ResolutionCandidate@629, ResolutionCandidate@630, ResolutionCandidate@631, ... }
+    <name not found> = ArrayList@940[8] { ResolutionCandidate@534, ResolutionCandidate@535, ResolutionCandidate@536, ... }
+    <name not found> = ArrayList@941[8] { ResolutionCandidate@714, ResolutionCandidate@715, ResolutionCandidate@716, ... }
+    <name not found> = ArrayList@942[8] { ResolutionCandidate@619, ResolutionCandidate@620, ResolutionCandidate@621, ... }
+    <name not found> = ArrayList@943[8] { ResolutionCandidate@754, ResolutionCandidate@755, ResolutionCandidate@756, ... }
+    <name not found> = ArrayList@944[8] { ResolutionCandidate@499, ResolutionCandidate@500, ResolutionCandidate@501, ... }
+    <name not found> = ArrayList@945[8] { ResolutionCandidate@699, ResolutionCandidate@700, ResolutionCandidate@701, ... }
+    <name not found> = ArrayList@946[8] { ResolutionCandidate@569, ResolutionCandidate@570, ResolutionCandidate@571, ... }
+    <name not found> = ArrayList@947[8] { ResolutionCandidate@649, ResolutionCandidate@650, ResolutionCandidate@651, ... }
+    <name not found> = ArrayList@948[8] { ResolutionCandidate@689, ResolutionCandidate@690, ResolutionCandidate@691, ... }
+    <name not found> = ArrayList@949[8] { ResolutionCandidate@694, ResolutionCandidate@695, ResolutionCandidate@696, ... }
+    <name not found> = ArrayList@950[8] { ResolutionCandidate@539, ResolutionCandidate@540, ResolutionCandidate@541, ... }
+    <name not found> = ArrayList@951[8] { ResolutionCandidate@489, ResolutionCandidate@490, ResolutionCandidate@491, ... }
+    <name not found> = ArrayList@952[8] { ResolutionCandidate@544, ResolutionCandidate@545, ResolutionCandidate@546, ... }
+    <name not found> = ArrayList@953[8] { ResolutionCandidate@459, ResolutionCandidate@460, ResolutionCandidate@461, ... }
+    <name not found> = ArrayList@954[8] { ResolutionCandidate@764, ResolutionCandidate@765, ResolutionCandidate@766, ... }
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/evaluate/intOverflowWithJavaProperties.lazy.log b/compiler/testData/diagnostics/tests/evaluate/intOverflowWithJavaProperties.lazy.log
index 0bb55cef038..293eabc3716 100644
--- a/compiler/testData/diagnostics/tests/evaluate/intOverflowWithJavaProperties.lazy.log
+++ b/compiler/testData/diagnostics/tests/evaluate/intOverflowWithJavaProperties.lazy.log
@@ -83,69 +83,51 @@ LazyJavaPackageFragment@48['lang'] {
 
 ResolutionTaskHolder@69 {
     <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
     <name not found> = EmptyList@21[empty]
+}
+
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
     <name not found> = EmptyList@21[empty]
 }
 
 ResolutionTaskHolder@81 {
     <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[8] { ResolutionCandidate@89, ResolutionCandidate@90, ResolutionCandidate@91, ... }
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[8] { ResolutionCandidate@95, ResolutionCandidate@96, ResolutionCandidate@97, ... }
-    <name not found> = ArrayList@98[8] { ResolutionCandidate@95, ResolutionCandidate@96, ResolutionCandidate@97, ... }
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[8] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
 }
 
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[8] { ResolutionCandidate@101, ResolutionCandidate@102, ResolutionCandidate@103, ... }
-    <name not found> = ArrayList@104[8] { ResolutionCandidate@101, ResolutionCandidate@102, ResolutionCandidate@103, ... }
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[8] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
 }
 
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[8] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
-    <name not found> = ArrayList@110[8] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[8] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
 }
 
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[8] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
-    <name not found> = ArrayList@116[8] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@107 {
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
@@ -156,7 +138,28 @@ ResolutionTaskHolder@117 {
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@118 {
+ResolutionTaskHolder@108 {
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+}
+
+null {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@115[8] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
+    <name not found> = ArrayList@116[8] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
+    <name not found> = ArrayList@117[8] { ResolutionCandidate@89, ResolutionCandidate@90, ResolutionCandidate@91, ... }
+    <name not found> = ArrayList@118[8] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
diff --git a/compiler/testData/diagnostics/tests/evaluate/longOverflow.lazy.log b/compiler/testData/diagnostics/tests/evaluate/longOverflow.lazy.log
index 325810e99fd..497d461b70b 100644
--- a/compiler/testData/diagnostics/tests/evaluate/longOverflow.lazy.log
+++ b/compiler/testData/diagnostics/tests/evaluate/longOverflow.lazy.log
@@ -84,64 +84,55 @@ LazyJavaPackageFragment@34['lang'] {
 
 ResolutionTaskHolder@73 {
     <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
     <name not found> = EmptyList@70[empty]
     <name not found> = EmptyList@70[empty]
     <name not found> = EmptyList@70[empty]
 }
 
-ResolutionTaskHolder@80 {
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
     <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+}
+
+ResolutionTaskHolder@83 {
     <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
     <name not found> = EmptyList@70[empty]
     <name not found> = EmptyList@70[empty]
     <name not found> = EmptyList@70[empty]
 }
 
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
     <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
     <name not found> = EmptyList@70[empty]
     <name not found> = EmptyList@70[empty]
     <name not found> = EmptyList@70[empty]
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
     <name not found> = EmptyList@70[empty]
     <name not found> = EmptyList@70[empty]
     <name not found> = EmptyList@70[empty]
 }
 
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
     <name not found> = EmptyList@70[empty]
     <name not found> = EmptyList@70[empty]
     <name not found> = EmptyList@70[empty]
+}
+
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
     <name not found> = EmptyList@70[empty]
     <name not found> = EmptyList@70[empty]
     <name not found> = EmptyList@70[empty]
@@ -149,64 +140,55 @@ ResolutionTaskHolder@101 {
 
 ResolutionTaskHolder@108 {
     <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@113 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
     <name not found> = EmptyList@70[empty]
     <name not found> = EmptyList@70[empty]
     <name not found> = EmptyList@70[empty]
 }
 
-ResolutionTaskHolder@115 {
+ResolutionTaskHolder@113 {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
     <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@117 }
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+}
+
+ResolutionTaskHolder@118 {
     <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
     <name not found> = EmptyList@70[empty]
     <name not found> = EmptyList@70[empty]
     <name not found> = EmptyList@70[empty]
 }
 
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
+ResolutionTaskHolder@123 {
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
     <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@127 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
     <name not found> = EmptyList@70[empty]
     <name not found> = EmptyList@70[empty]
     <name not found> = EmptyList@70[empty]
 }
 
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
+ResolutionTaskHolder@128 {
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
     <name not found> = EmptyList@70[empty]
     <name not found> = EmptyList@70[empty]
     <name not found> = EmptyList@70[empty]
 }
 
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@141 }
+ResolutionTaskHolder@133 {
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
     <name not found> = EmptyList@70[empty]
     <name not found> = EmptyList@70[empty]
     <name not found> = EmptyList@70[empty]
+}
+
+ResolutionTaskHolder@138 {
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
     <name not found> = EmptyList@70[empty]
     <name not found> = EmptyList@70[empty]
     <name not found> = EmptyList@70[empty]
@@ -214,819 +196,840 @@ ResolutionTaskHolder@136 {
 
 ResolutionTaskHolder@143 {
     <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@148 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
     <name not found> = EmptyList@70[empty]
     <name not found> = EmptyList@70[empty]
     <name not found> = EmptyList@70[empty]
 }
 
-ResolutionTaskHolder@150 {
+ResolutionTaskHolder@148 {
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
     <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@152 }
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+}
+
+ResolutionTaskHolder@153 {
     <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@155 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
     <name not found> = EmptyList@70[empty]
     <name not found> = EmptyList@70[empty]
     <name not found> = EmptyList@70[empty]
 }
 
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@159 }
+ResolutionTaskHolder@158 {
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
     <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@162 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
     <name not found> = EmptyList@70[empty]
     <name not found> = EmptyList@70[empty]
     <name not found> = EmptyList@70[empty]
 }
 
-ResolutionTaskHolder@164 {
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@169 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
+ResolutionTaskHolder@163 {
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
+    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
     <name not found> = EmptyList@70[empty]
     <name not found> = EmptyList@70[empty]
     <name not found> = EmptyList@70[empty]
 }
 
-ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@176 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
+ResolutionTaskHolder@168 {
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
     <name not found> = EmptyList@70[empty]
     <name not found> = EmptyList@70[empty]
     <name not found> = EmptyList@70[empty]
 }
 
-ResolutionTaskHolder@178 {
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@180 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@183 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
+ResolutionTaskHolder@173 {
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
     <name not found> = EmptyList@70[empty]
+}
+
+ResolutionTaskHolder@176 {
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
     <name not found> = EmptyList@70[empty]
+}
+
+ResolutionTaskHolder@179 {
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
     <name not found> = EmptyList@70[empty]
+}
+
+ResolutionTaskHolder@182 {
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
     <name not found> = EmptyList@70[empty]
 }
 
 ResolutionTaskHolder@185 {
     <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@187 }
+    <name not found> = EmptyList@70[empty]
+}
+
+ResolutionTaskHolder@188 {
     <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@190 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
     <name not found> = EmptyList@70[empty]
 }
 
-ResolutionTaskHolder@192 {
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@194 }
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@197 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
+ResolutionTaskHolder@191 {
+    <name not found> = ArrayList@192[1] { ResolutionCandidate@193 }
     <name not found> = EmptyList@70[empty]
 }
 
-ResolutionTaskHolder@199 {
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@201 }
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@201 }
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@204 }
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@204 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
+ResolutionTaskHolder@194 {
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@196 }
     <name not found> = EmptyList@70[empty]
+}
+
+ResolutionTaskHolder@197 {
+    <name not found> = ArrayList@198[1] { ResolutionCandidate@199 }
     <name not found> = EmptyList@70[empty]
+}
+
+ResolutionTaskHolder@200 {
+    <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
     <name not found> = EmptyList@70[empty]
+}
+
+ResolutionTaskHolder@203 {
+    <name not found> = ArrayList@204[1] { ResolutionCandidate@205 }
     <name not found> = EmptyList@70[empty]
 }
 
 ResolutionTaskHolder@206 {
     <name not found> = ArrayList@207[1] { ResolutionCandidate@208 }
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@208 }
+    <name not found> = EmptyList@70[empty]
+}
+
+ResolutionTaskHolder@209 {
     <name not found> = ArrayList@210[1] { ResolutionCandidate@211 }
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@211 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
     <name not found> = EmptyList@70[empty]
 }
 
-ResolutionTaskHolder@213 {
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@215 }
-    <name not found> = EmptyList@70[empty]
+ResolutionTaskHolder@212 {
+    <name not found> = ArrayList@213[1] { ResolutionCandidate@214 }
     <name not found> = EmptyList@70[empty]
 }
 
-ResolutionTaskHolder@217 {
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@219 }
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@219 }
+ResolutionTaskHolder@215 {
+    <name not found> = ArrayList@216[1] { ResolutionCandidate@217 }
     <name not found> = EmptyList@70[empty]
+}
+
+ResolutionTaskHolder@218 {
+    <name not found> = ArrayList@219[1] { ResolutionCandidate@220 }
     <name not found> = EmptyList@70[empty]
 }
 
 ResolutionTaskHolder@221 {
     <name not found> = ArrayList@222[1] { ResolutionCandidate@223 }
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@223 }
-    <name not found> = EmptyList@70[empty]
     <name not found> = EmptyList@70[empty]
 }
 
-ResolutionTaskHolder@225 {
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@227 }
-    <name not found> = EmptyList@70[empty]
+ResolutionTaskHolder@224 {
+    <name not found> = ArrayList@225[1] { ResolutionCandidate@226 }
     <name not found> = EmptyList@70[empty]
 }
 
-ResolutionTaskHolder@229 {
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@231 }
+ResolutionTaskHolder@227 {
+    <name not found> = ArrayList@228[1] { ResolutionCandidate@229 }
     <name not found> = EmptyList@70[empty]
+}
+
+ResolutionTaskHolder@230 {
+    <name not found> = ArrayList@231[1] { ResolutionCandidate@232 }
     <name not found> = EmptyList@70[empty]
 }
 
 ResolutionTaskHolder@233 {
     <name not found> = ArrayList@234[1] { ResolutionCandidate@235 }
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@235 }
-    <name not found> = EmptyList@70[empty]
     <name not found> = EmptyList@70[empty]
 }
 
-ResolutionTaskHolder@237 {
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@239 }
-    <name not found> = EmptyList@70[empty]
+ResolutionTaskHolder@236 {
+    <name not found> = ArrayList@237[1] { ResolutionCandidate@238 }
     <name not found> = EmptyList@70[empty]
 }
 
-ResolutionTaskHolder@241 {
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@243 }
+ResolutionTaskHolder@239 {
+    <name not found> = ArrayList@240[1] { ResolutionCandidate@241 }
     <name not found> = EmptyList@70[empty]
+}
+
+ResolutionTaskHolder@242 {
+    <name not found> = ArrayList@243[1] { ResolutionCandidate@244 }
     <name not found> = EmptyList@70[empty]
 }
 
 ResolutionTaskHolder@245 {
     <name not found> = ArrayList@246[1] { ResolutionCandidate@247 }
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@247 }
-    <name not found> = EmptyList@70[empty]
     <name not found> = EmptyList@70[empty]
 }
 
-ResolutionTaskHolder@249 {
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
-    <name not found> = ArrayList@252[1] { ResolutionCandidate@251 }
-    <name not found> = EmptyList@70[empty]
+ResolutionTaskHolder@248 {
+    <name not found> = ArrayList@249[1] { ResolutionCandidate@250 }
     <name not found> = EmptyList@70[empty]
 }
 
-ResolutionTaskHolder@253 {
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@255 }
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@255 }
+ResolutionTaskHolder@251 {
+    <name not found> = ArrayList@252[1] { ResolutionCandidate@253 }
     <name not found> = EmptyList@70[empty]
+}
+
+ResolutionTaskHolder@254 {
+    <name not found> = ArrayList@255[1] { ResolutionCandidate@256 }
     <name not found> = EmptyList@70[empty]
 }
 
 ResolutionTaskHolder@257 {
     <name not found> = ArrayList@258[1] { ResolutionCandidate@259 }
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@259 }
-    <name not found> = EmptyList@70[empty]
     <name not found> = EmptyList@70[empty]
 }
 
-ResolutionTaskHolder@261 {
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@263 }
-    <name not found> = EmptyList@70[empty]
+ResolutionTaskHolder@260 {
+    <name not found> = ArrayList@261[1] { ResolutionCandidate@262 }
     <name not found> = EmptyList@70[empty]
 }
 
-ResolutionTaskHolder@265 {
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@267 }
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@267 }
+ResolutionTaskHolder@263 {
+    <name not found> = ArrayList@264[1] { ResolutionCandidate@265 }
     <name not found> = EmptyList@70[empty]
+}
+
+ResolutionTaskHolder@266 {
+    <name not found> = ArrayList@267[1] { ResolutionCandidate@268 }
     <name not found> = EmptyList@70[empty]
 }
 
 ResolutionTaskHolder@269 {
     <name not found> = ArrayList@270[1] { ResolutionCandidate@271 }
-    <name not found> = ArrayList@272[1] { ResolutionCandidate@271 }
-    <name not found> = EmptyList@70[empty]
     <name not found> = EmptyList@70[empty]
 }
 
-ResolutionTaskHolder@273 {
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@275 }
-    <name not found> = ArrayList@276[1] { ResolutionCandidate@275 }
-    <name not found> = EmptyList@70[empty]
+ResolutionTaskHolder@272 {
+    <name not found> = ArrayList@273[1] { ResolutionCandidate@274 }
     <name not found> = EmptyList@70[empty]
 }
 
-ResolutionTaskHolder@277 {
-    <name not found> = ArrayList@278[1] { ResolutionCandidate@279 }
-    <name not found> = ArrayList@280[1] { ResolutionCandidate@279 }
+ResolutionTaskHolder@275 {
+    <name not found> = ArrayList@276[1] { ResolutionCandidate@277 }
     <name not found> = EmptyList@70[empty]
+}
+
+ResolutionTaskHolder@278 {
+    <name not found> = ArrayList@279[1] { ResolutionCandidate@280 }
     <name not found> = EmptyList@70[empty]
 }
 
 ResolutionTaskHolder@281 {
     <name not found> = ArrayList@282[1] { ResolutionCandidate@283 }
-    <name not found> = ArrayList@284[1] { ResolutionCandidate@283 }
-    <name not found> = EmptyList@70[empty]
     <name not found> = EmptyList@70[empty]
 }
 
-ResolutionTaskHolder@285 {
-    <name not found> = ArrayList@286[1] { ResolutionCandidate@287 }
-    <name not found> = ArrayList@288[1] { ResolutionCandidate@287 }
-    <name not found> = EmptyList@70[empty]
+ResolutionTaskHolder@284 {
+    <name not found> = ArrayList@285[1] { ResolutionCandidate@286 }
     <name not found> = EmptyList@70[empty]
 }
 
-ResolutionTaskHolder@289 {
-    <name not found> = ArrayList@290[1] { ResolutionCandidate@291 }
-    <name not found> = ArrayList@292[1] { ResolutionCandidate@291 }
+ResolutionTaskHolder@287 {
+    <name not found> = ArrayList@288[1] { ResolutionCandidate@289 }
     <name not found> = EmptyList@70[empty]
+}
+
+ResolutionTaskHolder@290 {
+    <name not found> = ArrayList@291[1] { ResolutionCandidate@292 }
     <name not found> = EmptyList@70[empty]
 }
 
 ResolutionTaskHolder@293 {
     <name not found> = ArrayList@294[1] { ResolutionCandidate@295 }
-    <name not found> = ArrayList@296[1] { ResolutionCandidate@295 }
-    <name not found> = EmptyList@70[empty]
     <name not found> = EmptyList@70[empty]
 }
 
-ResolutionTaskHolder@297 {
-    <name not found> = ArrayList@298[1] { ResolutionCandidate@299 }
-    <name not found> = ArrayList@300[1] { ResolutionCandidate@299 }
-    <name not found> = EmptyList@70[empty]
+ResolutionTaskHolder@296 {
+    <name not found> = ArrayList@297[1] { ResolutionCandidate@298 }
     <name not found> = EmptyList@70[empty]
 }
 
-ResolutionTaskHolder@301 {
-    <name not found> = ArrayList@302[1] { ResolutionCandidate@303 }
-    <name not found> = ArrayList@304[1] { ResolutionCandidate@303 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
+ResolutionTaskHolder@299 {
+    <name not found> = ArrayList@300[1] { ResolutionCandidate@301 }
+}
+
+ResolutionTaskHolder@302 {
+    <name not found> = ArrayList@303[1] { ResolutionCandidate@304 }
 }
 
 ResolutionTaskHolder@305 {
     <name not found> = ArrayList@306[1] { ResolutionCandidate@307 }
-    <name not found> = ArrayList@308[1] { ResolutionCandidate@307 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
 }
 
-ResolutionTaskHolder@309 {
-    <name not found> = ArrayList@310[1] { ResolutionCandidate@311 }
-    <name not found> = ArrayList@312[1] { ResolutionCandidate@311 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
+ResolutionTaskHolder@308 {
+    <name not found> = ArrayList@309[1] { ResolutionCandidate@310 }
 }
 
-ResolutionTaskHolder@313 {
-    <name not found> = ArrayList@314[1] { ResolutionCandidate@315 }
-    <name not found> = ArrayList@316[1] { ResolutionCandidate@315 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
+ResolutionTaskHolder@311 {
+    <name not found> = ArrayList@312[1] { ResolutionCandidate@313 }
+}
+
+ResolutionTaskHolder@314 {
+    <name not found> = ArrayList@315[1] { ResolutionCandidate@316 }
 }
 
 ResolutionTaskHolder@317 {
     <name not found> = ArrayList@318[1] { ResolutionCandidate@319 }
-    <name not found> = ArrayList@320[1] { ResolutionCandidate@319 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
 }
 
-ResolutionTaskHolder@321 {
-    <name not found> = ArrayList@322[1] { ResolutionCandidate@323 }
-    <name not found> = ArrayList@324[1] { ResolutionCandidate@323 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
+ResolutionTaskHolder@320 {
+    <name not found> = ArrayList@321[1] { ResolutionCandidate@322 }
 }
 
-ResolutionTaskHolder@325 {
-    <name not found> = ArrayList@326[1] { ResolutionCandidate@327 }
-    <name not found> = ArrayList@328[1] { ResolutionCandidate@327 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
+ResolutionTaskHolder@323 {
+    <name not found> = ArrayList@324[1] { ResolutionCandidate@325 }
+}
+
+ResolutionTaskHolder@326 {
+    <name not found> = ArrayList@327[1] { ResolutionCandidate@328 }
 }
 
 ResolutionTaskHolder@329 {
-    <name not found> = ArrayList@330[1] { ResolutionCandidate@331 }
-    <name not found> = ArrayList@332[1] { ResolutionCandidate@331 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
+    <name not found> = ArrayList@330[7] { ResolutionCandidate@331, ResolutionCandidate@332, ResolutionCandidate@333, ... }
 }
 
-ResolutionTaskHolder@333 {
-    <name not found> = ArrayList@334[1] { ResolutionCandidate@335 }
-    <name not found> = ArrayList@336[1] { ResolutionCandidate@335 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
+ResolutionTaskHolder@334 {
+    <name not found> = ArrayList@335[7] { ResolutionCandidate@336, ResolutionCandidate@337, ResolutionCandidate@338, ... }
 }
 
-ResolutionTaskHolder@337 {
-    <name not found> = ArrayList@338[1] { ResolutionCandidate@339 }
-    <name not found> = ArrayList@340[1] { ResolutionCandidate@339 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
+ResolutionTaskHolder@339 {
+    <name not found> = ArrayList@340[7] { ResolutionCandidate@341, ResolutionCandidate@342, ResolutionCandidate@343, ... }
 }
 
-ResolutionTaskHolder@341 {
-    <name not found> = ArrayList@342[1] { ResolutionCandidate@343 }
-    <name not found> = ArrayList@344[1] { ResolutionCandidate@343 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@345 {
-    <name not found> = ArrayList@346[1] { ResolutionCandidate@347 }
-    <name not found> = ArrayList@348[1] { ResolutionCandidate@347 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
+ResolutionTaskHolder@344 {
+    <name not found> = ArrayList@345[7] { ResolutionCandidate@346, ResolutionCandidate@347, ResolutionCandidate@348, ... }
 }
 
 ResolutionTaskHolder@349 {
-    <name not found> = ArrayList@350[1] { ResolutionCandidate@351 }
-    <name not found> = ArrayList@352[1] { ResolutionCandidate@351 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
+    <name not found> = ArrayList@350[7] { ResolutionCandidate@351, ResolutionCandidate@352, ResolutionCandidate@353, ... }
 }
 
-ResolutionTaskHolder@353 {
-    <name not found> = ArrayList@354[1] { ResolutionCandidate@355 }
-    <name not found> = ArrayList@356[1] { ResolutionCandidate@355 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
+ResolutionTaskHolder@354 {
+    <name not found> = ArrayList@355[7] { ResolutionCandidate@356, ResolutionCandidate@357, ResolutionCandidate@358, ... }
 }
 
-ResolutionTaskHolder@357 {
-    <name not found> = ArrayList@358[1] { ResolutionCandidate@359 }
-    <name not found> = ArrayList@360[1] { ResolutionCandidate@359 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
+ResolutionTaskHolder@359 {
+    <name not found> = ArrayList@360[7] { ResolutionCandidate@361, ResolutionCandidate@362, ResolutionCandidate@363, ... }
 }
 
-ResolutionTaskHolder@361 {
-    <name not found> = ArrayList@362[1] { ResolutionCandidate@363 }
-    <name not found> = ArrayList@364[1] { ResolutionCandidate@363 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@365 {
-    <name not found> = ArrayList@366[1] { ResolutionCandidate@367 }
-    <name not found> = ArrayList@368[1] { ResolutionCandidate@367 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
+ResolutionTaskHolder@364 {
+    <name not found> = ArrayList@365[7] { ResolutionCandidate@366, ResolutionCandidate@367, ResolutionCandidate@368, ... }
 }
 
 ResolutionTaskHolder@369 {
-    <name not found> = ArrayList@370[1] { ResolutionCandidate@371 }
-    <name not found> = ArrayList@372[1] { ResolutionCandidate@371 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
+    <name not found> = ArrayList@370[7] { ResolutionCandidate@371, ResolutionCandidate@372, ResolutionCandidate@373, ... }
 }
 
-ResolutionTaskHolder@373 {
-    <name not found> = ArrayList@374[1] { ResolutionCandidate@375 }
-    <name not found> = ArrayList@376[1] { ResolutionCandidate@375 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
+ResolutionTaskHolder@374 {
+    <name not found> = ArrayList@375[7] { ResolutionCandidate@376, ResolutionCandidate@377, ResolutionCandidate@378, ... }
 }
 
-ResolutionTaskHolder@377 {
-    <name not found> = ArrayList@378[1] { ResolutionCandidate@379 }
-    <name not found> = ArrayList@380[1] { ResolutionCandidate@379 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
+ResolutionTaskHolder@379 {
+    <name not found> = ArrayList@380[7] { ResolutionCandidate@381, ResolutionCandidate@382, ResolutionCandidate@383, ... }
 }
 
-ResolutionTaskHolder@381 {
-    <name not found> = ArrayList@382[1] { ResolutionCandidate@383 }
-    <name not found> = ArrayList@384[1] { ResolutionCandidate@383 }
-}
-
-ResolutionTaskHolder@385 {
-    <name not found> = ArrayList@386[1] { ResolutionCandidate@387 }
-    <name not found> = ArrayList@388[1] { ResolutionCandidate@387 }
+ResolutionTaskHolder@384 {
+    <name not found> = ArrayList@385[7] { ResolutionCandidate@386, ResolutionCandidate@387, ResolutionCandidate@388, ... }
 }
 
 ResolutionTaskHolder@389 {
-    <name not found> = ArrayList@390[1] { ResolutionCandidate@391 }
-    <name not found> = ArrayList@392[1] { ResolutionCandidate@391 }
+    <name not found> = ArrayList@390[7] { ResolutionCandidate@391, ResolutionCandidate@392, ResolutionCandidate@393, ... }
 }
 
-ResolutionTaskHolder@393 {
-    <name not found> = ArrayList@394[1] { ResolutionCandidate@395 }
-    <name not found> = ArrayList@396[1] { ResolutionCandidate@395 }
+ResolutionTaskHolder@394 {
+    <name not found> = ArrayList@395[7] { ResolutionCandidate@396, ResolutionCandidate@397, ResolutionCandidate@398, ... }
 }
 
-ResolutionTaskHolder@397 {
-    <name not found> = ArrayList@398[1] { ResolutionCandidate@399 }
-    <name not found> = ArrayList@400[1] { ResolutionCandidate@399 }
+ResolutionTaskHolder@399 {
+    <name not found> = ArrayList@400[7] { ResolutionCandidate@401, ResolutionCandidate@402, ResolutionCandidate@403, ... }
 }
 
-ResolutionTaskHolder@401 {
-    <name not found> = ArrayList@402[1] { ResolutionCandidate@403 }
-    <name not found> = ArrayList@404[1] { ResolutionCandidate@403 }
-}
-
-ResolutionTaskHolder@405 {
-    <name not found> = ArrayList@406[1] { ResolutionCandidate@407 }
-    <name not found> = ArrayList@408[1] { ResolutionCandidate@407 }
+ResolutionTaskHolder@404 {
+    <name not found> = ArrayList@405[7] { ResolutionCandidate@406, ResolutionCandidate@407, ResolutionCandidate@408, ... }
 }
 
 ResolutionTaskHolder@409 {
-    <name not found> = ArrayList@410[1] { ResolutionCandidate@411 }
-    <name not found> = ArrayList@412[1] { ResolutionCandidate@411 }
+    <name not found> = ArrayList@410[7] { ResolutionCandidate@411, ResolutionCandidate@412, ResolutionCandidate@413, ... }
 }
 
-ResolutionTaskHolder@413 {
-    <name not found> = ArrayList@414[1] { ResolutionCandidate@415 }
-    <name not found> = ArrayList@416[1] { ResolutionCandidate@415 }
+ResolutionTaskHolder@414 {
+    <name not found> = ArrayList@415[7] { ResolutionCandidate@416, ResolutionCandidate@417, ResolutionCandidate@418, ... }
 }
 
-ResolutionTaskHolder@417 {
-    <name not found> = ArrayList@418[1] { ResolutionCandidate@419 }
-    <name not found> = ArrayList@420[1] { ResolutionCandidate@419 }
+ResolutionTaskHolder@419 {
+    <name not found> = ArrayList@420[8] { ResolutionCandidate@421, ResolutionCandidate@422, ResolutionCandidate@423, ... }
 }
 
-ResolutionTaskHolder@421 {
-    <name not found> = ArrayList@422[7] { ResolutionCandidate@423, ResolutionCandidate@424, ResolutionCandidate@425, ... }
-    <name not found> = ArrayList@426[7] { ResolutionCandidate@423, ResolutionCandidate@424, ResolutionCandidate@425, ... }
+ResolutionTaskHolder@424 {
+    <name not found> = ArrayList@425[8] { ResolutionCandidate@426, ResolutionCandidate@427, ResolutionCandidate@428, ... }
 }
 
-ResolutionTaskHolder@427 {
-    <name not found> = ArrayList@428[7] { ResolutionCandidate@429, ResolutionCandidate@430, ResolutionCandidate@431, ... }
-    <name not found> = ArrayList@432[7] { ResolutionCandidate@429, ResolutionCandidate@430, ResolutionCandidate@431, ... }
+ResolutionTaskHolder@429 {
+    <name not found> = ArrayList@430[8] { ResolutionCandidate@431, ResolutionCandidate@432, ResolutionCandidate@433, ... }
 }
 
-ResolutionTaskHolder@433 {
-    <name not found> = ArrayList@434[7] { ResolutionCandidate@435, ResolutionCandidate@436, ResolutionCandidate@437, ... }
-    <name not found> = ArrayList@438[7] { ResolutionCandidate@435, ResolutionCandidate@436, ResolutionCandidate@437, ... }
+ResolutionTaskHolder@434 {
+    <name not found> = ArrayList@435[8] { ResolutionCandidate@436, ResolutionCandidate@437, ResolutionCandidate@438, ... }
 }
 
 ResolutionTaskHolder@439 {
-    <name not found> = ArrayList@440[7] { ResolutionCandidate@441, ResolutionCandidate@442, ResolutionCandidate@443, ... }
-    <name not found> = ArrayList@444[7] { ResolutionCandidate@441, ResolutionCandidate@442, ResolutionCandidate@443, ... }
+    <name not found> = ArrayList@440[8] { ResolutionCandidate@441, ResolutionCandidate@442, ResolutionCandidate@443, ... }
 }
 
-ResolutionTaskHolder@445 {
-    <name not found> = ArrayList@446[7] { ResolutionCandidate@447, ResolutionCandidate@448, ResolutionCandidate@449, ... }
-    <name not found> = ArrayList@450[7] { ResolutionCandidate@447, ResolutionCandidate@448, ResolutionCandidate@449, ... }
+ResolutionTaskHolder@444 {
+    <name not found> = ArrayList@445[8] { ResolutionCandidate@446, ResolutionCandidate@447, ResolutionCandidate@448, ... }
 }
 
-ResolutionTaskHolder@451 {
-    <name not found> = ArrayList@452[7] { ResolutionCandidate@453, ResolutionCandidate@454, ResolutionCandidate@455, ... }
-    <name not found> = ArrayList@456[7] { ResolutionCandidate@453, ResolutionCandidate@454, ResolutionCandidate@455, ... }
+ResolutionTaskHolder@449 {
+    <name not found> = ArrayList@450[8] { ResolutionCandidate@451, ResolutionCandidate@452, ResolutionCandidate@453, ... }
 }
 
-ResolutionTaskHolder@457 {
-    <name not found> = ArrayList@458[7] { ResolutionCandidate@459, ResolutionCandidate@460, ResolutionCandidate@461, ... }
-    <name not found> = ArrayList@462[7] { ResolutionCandidate@459, ResolutionCandidate@460, ResolutionCandidate@461, ... }
+ResolutionTaskHolder@454 {
+    <name not found> = ArrayList@455[8] { ResolutionCandidate@456, ResolutionCandidate@457, ResolutionCandidate@458, ... }
 }
 
-ResolutionTaskHolder@463 {
-    <name not found> = ArrayList@464[7] { ResolutionCandidate@465, ResolutionCandidate@466, ResolutionCandidate@467, ... }
-    <name not found> = ArrayList@468[7] { ResolutionCandidate@465, ResolutionCandidate@466, ResolutionCandidate@467, ... }
+ResolutionTaskHolder@459 {
+    <name not found> = ArrayList@460[8] { ResolutionCandidate@461, ResolutionCandidate@462, ResolutionCandidate@463, ... }
+}
+
+ResolutionTaskHolder@464 {
+    <name not found> = ArrayList@465[8] { ResolutionCandidate@466, ResolutionCandidate@467, ResolutionCandidate@468, ... }
 }
 
 ResolutionTaskHolder@469 {
-    <name not found> = ArrayList@470[7] { ResolutionCandidate@471, ResolutionCandidate@472, ResolutionCandidate@473, ... }
-    <name not found> = ArrayList@474[7] { ResolutionCandidate@471, ResolutionCandidate@472, ResolutionCandidate@473, ... }
+    <name not found> = ArrayList@470[8] { ResolutionCandidate@471, ResolutionCandidate@472, ResolutionCandidate@473, ... }
 }
 
-ResolutionTaskHolder@475 {
-    <name not found> = ArrayList@476[7] { ResolutionCandidate@477, ResolutionCandidate@478, ResolutionCandidate@479, ... }
-    <name not found> = ArrayList@480[7] { ResolutionCandidate@477, ResolutionCandidate@478, ResolutionCandidate@479, ... }
+ResolutionTaskHolder@474 {
+    <name not found> = ArrayList@475[8] { ResolutionCandidate@476, ResolutionCandidate@477, ResolutionCandidate@478, ... }
 }
 
-ResolutionTaskHolder@481 {
-    <name not found> = ArrayList@482[7] { ResolutionCandidate@483, ResolutionCandidate@484, ResolutionCandidate@485, ... }
-    <name not found> = ArrayList@486[7] { ResolutionCandidate@483, ResolutionCandidate@484, ResolutionCandidate@485, ... }
+ResolutionTaskHolder@479 {
+    <name not found> = ArrayList@480[8] { ResolutionCandidate@481, ResolutionCandidate@482, ResolutionCandidate@483, ... }
 }
 
-ResolutionTaskHolder@487 {
-    <name not found> = ArrayList@488[7] { ResolutionCandidate@489, ResolutionCandidate@490, ResolutionCandidate@491, ... }
-    <name not found> = ArrayList@492[7] { ResolutionCandidate@489, ResolutionCandidate@490, ResolutionCandidate@491, ... }
+ResolutionTaskHolder@484 {
+    <name not found> = ArrayList@485[8] { ResolutionCandidate@486, ResolutionCandidate@487, ResolutionCandidate@488, ... }
 }
 
-ResolutionTaskHolder@493 {
-    <name not found> = ArrayList@494[7] { ResolutionCandidate@495, ResolutionCandidate@496, ResolutionCandidate@497, ... }
-    <name not found> = ArrayList@498[7] { ResolutionCandidate@495, ResolutionCandidate@496, ResolutionCandidate@497, ... }
+ResolutionTaskHolder@489 {
+    <name not found> = ArrayList@490[8] { ResolutionCandidate@491, ResolutionCandidate@492, ResolutionCandidate@493, ... }
+}
+
+ResolutionTaskHolder@494 {
+    <name not found> = ArrayList@495[8] { ResolutionCandidate@496, ResolutionCandidate@497, ResolutionCandidate@498, ... }
 }
 
 ResolutionTaskHolder@499 {
-    <name not found> = ArrayList@500[7] { ResolutionCandidate@501, ResolutionCandidate@502, ResolutionCandidate@503, ... }
-    <name not found> = ArrayList@504[7] { ResolutionCandidate@501, ResolutionCandidate@502, ResolutionCandidate@503, ... }
+    <name not found> = ArrayList@500[8] { ResolutionCandidate@501, ResolutionCandidate@502, ResolutionCandidate@503, ... }
 }
 
-ResolutionTaskHolder@505 {
-    <name not found> = ArrayList@506[7] { ResolutionCandidate@507, ResolutionCandidate@508, ResolutionCandidate@509, ... }
-    <name not found> = ArrayList@510[7] { ResolutionCandidate@507, ResolutionCandidate@508, ResolutionCandidate@509, ... }
+ResolutionTaskHolder@504 {
+    <name not found> = ArrayList@505[8] { ResolutionCandidate@506, ResolutionCandidate@507, ResolutionCandidate@508, ... }
 }
 
-ResolutionTaskHolder@511 {
-    <name not found> = ArrayList@512[7] { ResolutionCandidate@513, ResolutionCandidate@514, ResolutionCandidate@515, ... }
-    <name not found> = ArrayList@516[7] { ResolutionCandidate@513, ResolutionCandidate@514, ResolutionCandidate@515, ... }
+ResolutionTaskHolder@509 {
+    <name not found> = ArrayList@510[8] { ResolutionCandidate@511, ResolutionCandidate@512, ResolutionCandidate@513, ... }
 }
 
-ResolutionTaskHolder@517 {
-    <name not found> = ArrayList@518[7] { ResolutionCandidate@519, ResolutionCandidate@520, ResolutionCandidate@521, ... }
-    <name not found> = ArrayList@522[7] { ResolutionCandidate@519, ResolutionCandidate@520, ResolutionCandidate@521, ... }
+ResolutionTaskHolder@514 {
+    <name not found> = ArrayList@515[8] { ResolutionCandidate@516, ResolutionCandidate@517, ResolutionCandidate@518, ... }
 }
 
-ResolutionTaskHolder@523 {
-    <name not found> = ArrayList@524[7] { ResolutionCandidate@525, ResolutionCandidate@526, ResolutionCandidate@527, ... }
-    <name not found> = ArrayList@528[7] { ResolutionCandidate@525, ResolutionCandidate@526, ResolutionCandidate@527, ... }
+ResolutionTaskHolder@519 {
+    <name not found> = ArrayList@520[8] { ResolutionCandidate@521, ResolutionCandidate@522, ResolutionCandidate@523, ... }
+}
+
+ResolutionTaskHolder@524 {
+    <name not found> = ArrayList@525[8] { ResolutionCandidate@526, ResolutionCandidate@527, ResolutionCandidate@528, ... }
 }
 
 ResolutionTaskHolder@529 {
     <name not found> = ArrayList@530[8] { ResolutionCandidate@531, ResolutionCandidate@532, ResolutionCandidate@533, ... }
-    <name not found> = ArrayList@534[8] { ResolutionCandidate@531, ResolutionCandidate@532, ResolutionCandidate@533, ... }
 }
 
-ResolutionTaskHolder@535 {
-    <name not found> = ArrayList@536[8] { ResolutionCandidate@537, ResolutionCandidate@538, ResolutionCandidate@539, ... }
-    <name not found> = ArrayList@540[8] { ResolutionCandidate@537, ResolutionCandidate@538, ResolutionCandidate@539, ... }
+ResolutionTaskHolder@534 {
+    <name not found> = ArrayList@535[8] { ResolutionCandidate@536, ResolutionCandidate@537, ResolutionCandidate@538, ... }
 }
 
-ResolutionTaskHolder@541 {
-    <name not found> = ArrayList@542[8] { ResolutionCandidate@543, ResolutionCandidate@544, ResolutionCandidate@545, ... }
-    <name not found> = ArrayList@546[8] { ResolutionCandidate@543, ResolutionCandidate@544, ResolutionCandidate@545, ... }
+ResolutionTaskHolder@539 {
+    <name not found> = ArrayList@540[8] { ResolutionCandidate@541, ResolutionCandidate@542, ResolutionCandidate@543, ... }
 }
 
-ResolutionTaskHolder@547 {
-    <name not found> = ArrayList@548[8] { ResolutionCandidate@549, ResolutionCandidate@550, ResolutionCandidate@551, ... }
-    <name not found> = ArrayList@552[8] { ResolutionCandidate@549, ResolutionCandidate@550, ResolutionCandidate@551, ... }
+ResolutionTaskHolder@544 {
+    <name not found> = ArrayList@545[8] { ResolutionCandidate@546, ResolutionCandidate@547, ResolutionCandidate@548, ... }
 }
 
-ResolutionTaskHolder@553 {
-    <name not found> = ArrayList@554[8] { ResolutionCandidate@555, ResolutionCandidate@556, ResolutionCandidate@557, ... }
-    <name not found> = ArrayList@558[8] { ResolutionCandidate@555, ResolutionCandidate@556, ResolutionCandidate@557, ... }
+ResolutionTaskHolder@549 {
+    <name not found> = ArrayList@550[8] { ResolutionCandidate@551, ResolutionCandidate@552, ResolutionCandidate@553, ... }
+}
+
+ResolutionTaskHolder@554 {
+    <name not found> = ArrayList@555[8] { ResolutionCandidate@556, ResolutionCandidate@557, ResolutionCandidate@558, ... }
 }
 
 ResolutionTaskHolder@559 {
     <name not found> = ArrayList@560[8] { ResolutionCandidate@561, ResolutionCandidate@562, ResolutionCandidate@563, ... }
-    <name not found> = ArrayList@564[8] { ResolutionCandidate@561, ResolutionCandidate@562, ResolutionCandidate@563, ... }
 }
 
-ResolutionTaskHolder@565 {
-    <name not found> = ArrayList@566[8] { ResolutionCandidate@567, ResolutionCandidate@568, ResolutionCandidate@569, ... }
-    <name not found> = ArrayList@570[8] { ResolutionCandidate@567, ResolutionCandidate@568, ResolutionCandidate@569, ... }
+ResolutionTaskHolder@564 {
+    <name not found> = ArrayList@565[8] { ResolutionCandidate@566, ResolutionCandidate@567, ResolutionCandidate@568, ... }
 }
 
-ResolutionTaskHolder@571 {
-    <name not found> = ArrayList@572[8] { ResolutionCandidate@573, ResolutionCandidate@574, ResolutionCandidate@575, ... }
-    <name not found> = ArrayList@576[8] { ResolutionCandidate@573, ResolutionCandidate@574, ResolutionCandidate@575, ... }
+ResolutionTaskHolder@569 {
+    <name not found> = ArrayList@570[8] { ResolutionCandidate@571, ResolutionCandidate@572, ResolutionCandidate@573, ... }
 }
 
-ResolutionTaskHolder@577 {
-    <name not found> = ArrayList@578[8] { ResolutionCandidate@579, ResolutionCandidate@580, ResolutionCandidate@581, ... }
-    <name not found> = ArrayList@582[8] { ResolutionCandidate@579, ResolutionCandidate@580, ResolutionCandidate@581, ... }
+ResolutionTaskHolder@574 {
+    <name not found> = ArrayList@575[8] { ResolutionCandidate@576, ResolutionCandidate@577, ResolutionCandidate@578, ... }
 }
 
-ResolutionTaskHolder@583 {
-    <name not found> = ArrayList@584[8] { ResolutionCandidate@585, ResolutionCandidate@586, ResolutionCandidate@587, ... }
-    <name not found> = ArrayList@588[8] { ResolutionCandidate@585, ResolutionCandidate@586, ResolutionCandidate@587, ... }
+ResolutionTaskHolder@579 {
+    <name not found> = ArrayList@580[8] { ResolutionCandidate@581, ResolutionCandidate@582, ResolutionCandidate@583, ... }
+}
+
+ResolutionTaskHolder@584 {
+    <name not found> = ArrayList@585[8] { ResolutionCandidate@586, ResolutionCandidate@587, ResolutionCandidate@588, ... }
 }
 
 ResolutionTaskHolder@589 {
     <name not found> = ArrayList@590[8] { ResolutionCandidate@591, ResolutionCandidate@592, ResolutionCandidate@593, ... }
-    <name not found> = ArrayList@594[8] { ResolutionCandidate@591, ResolutionCandidate@592, ResolutionCandidate@593, ... }
 }
 
-ResolutionTaskHolder@595 {
-    <name not found> = ArrayList@596[8] { ResolutionCandidate@597, ResolutionCandidate@598, ResolutionCandidate@599, ... }
-    <name not found> = ArrayList@600[8] { ResolutionCandidate@597, ResolutionCandidate@598, ResolutionCandidate@599, ... }
+ResolutionTaskHolder@594 {
+    <name not found> = ArrayList@595[8] { ResolutionCandidate@596, ResolutionCandidate@597, ResolutionCandidate@598, ... }
 }
 
-ResolutionTaskHolder@601 {
-    <name not found> = ArrayList@602[8] { ResolutionCandidate@603, ResolutionCandidate@604, ResolutionCandidate@605, ... }
-    <name not found> = ArrayList@606[8] { ResolutionCandidate@603, ResolutionCandidate@604, ResolutionCandidate@605, ... }
+ResolutionTaskHolder@599 {
+    <name not found> = ArrayList@600[8] { ResolutionCandidate@601, ResolutionCandidate@602, ResolutionCandidate@603, ... }
 }
 
-ResolutionTaskHolder@607 {
-    <name not found> = ArrayList@608[8] { ResolutionCandidate@609, ResolutionCandidate@610, ResolutionCandidate@611, ... }
-    <name not found> = ArrayList@612[8] { ResolutionCandidate@609, ResolutionCandidate@610, ResolutionCandidate@611, ... }
+ResolutionTaskHolder@604 {
+    <name not found> = ArrayList@605[8] { ResolutionCandidate@606, ResolutionCandidate@607, ResolutionCandidate@608, ... }
 }
 
-ResolutionTaskHolder@613 {
-    <name not found> = ArrayList@614[8] { ResolutionCandidate@615, ResolutionCandidate@616, ResolutionCandidate@617, ... }
-    <name not found> = ArrayList@618[8] { ResolutionCandidate@615, ResolutionCandidate@616, ResolutionCandidate@617, ... }
+ResolutionTaskHolder@609 {
+    <name not found> = ArrayList@610[8] { ResolutionCandidate@611, ResolutionCandidate@612, ResolutionCandidate@613, ... }
+}
+
+ResolutionTaskHolder@614 {
+    <name not found> = ArrayList@615[8] { ResolutionCandidate@616, ResolutionCandidate@617, ResolutionCandidate@618, ... }
 }
 
 ResolutionTaskHolder@619 {
     <name not found> = ArrayList@620[8] { ResolutionCandidate@621, ResolutionCandidate@622, ResolutionCandidate@623, ... }
-    <name not found> = ArrayList@624[8] { ResolutionCandidate@621, ResolutionCandidate@622, ResolutionCandidate@623, ... }
 }
 
-ResolutionTaskHolder@625 {
-    <name not found> = ArrayList@626[8] { ResolutionCandidate@627, ResolutionCandidate@628, ResolutionCandidate@629, ... }
-    <name not found> = ArrayList@630[8] { ResolutionCandidate@627, ResolutionCandidate@628, ResolutionCandidate@629, ... }
+ResolutionTaskHolder@624 {
+    <name not found> = ArrayList@625[8] { ResolutionCandidate@626, ResolutionCandidate@627, ResolutionCandidate@628, ... }
 }
 
-ResolutionTaskHolder@631 {
-    <name not found> = ArrayList@632[8] { ResolutionCandidate@633, ResolutionCandidate@634, ResolutionCandidate@635, ... }
-    <name not found> = ArrayList@636[8] { ResolutionCandidate@633, ResolutionCandidate@634, ResolutionCandidate@635, ... }
+ResolutionTaskHolder@629 {
+    <name not found> = ArrayList@630[8] { ResolutionCandidate@631, ResolutionCandidate@632, ResolutionCandidate@633, ... }
 }
 
-ResolutionTaskHolder@637 {
-    <name not found> = ArrayList@638[8] { ResolutionCandidate@639, ResolutionCandidate@640, ResolutionCandidate@641, ... }
-    <name not found> = ArrayList@642[8] { ResolutionCandidate@639, ResolutionCandidate@640, ResolutionCandidate@641, ... }
+ResolutionTaskHolder@634 {
+    <name not found> = ArrayList@635[8] { ResolutionCandidate@636, ResolutionCandidate@637, ResolutionCandidate@638, ... }
 }
 
-ResolutionTaskHolder@643 {
-    <name not found> = ArrayList@644[8] { ResolutionCandidate@645, ResolutionCandidate@646, ResolutionCandidate@647, ... }
-    <name not found> = ArrayList@648[8] { ResolutionCandidate@645, ResolutionCandidate@646, ResolutionCandidate@647, ... }
+ResolutionTaskHolder@639 {
+    <name not found> = ArrayList@640[8] { ResolutionCandidate@641, ResolutionCandidate@642, ResolutionCandidate@643, ... }
+}
+
+ResolutionTaskHolder@644 {
+    <name not found> = ArrayList@645[8] { ResolutionCandidate@646, ResolutionCandidate@647, ResolutionCandidate@648, ... }
 }
 
 ResolutionTaskHolder@649 {
     <name not found> = ArrayList@650[8] { ResolutionCandidate@651, ResolutionCandidate@652, ResolutionCandidate@653, ... }
-    <name not found> = ArrayList@654[8] { ResolutionCandidate@651, ResolutionCandidate@652, ResolutionCandidate@653, ... }
 }
 
-ResolutionTaskHolder@655 {
-    <name not found> = ArrayList@656[8] { ResolutionCandidate@657, ResolutionCandidate@658, ResolutionCandidate@659, ... }
-    <name not found> = ArrayList@660[8] { ResolutionCandidate@657, ResolutionCandidate@658, ResolutionCandidate@659, ... }
+ResolutionTaskHolder@654 {
+    <name not found> = ArrayList@655[8] { ResolutionCandidate@656, ResolutionCandidate@657, ResolutionCandidate@658, ... }
 }
 
-ResolutionTaskHolder@661 {
-    <name not found> = ArrayList@662[8] { ResolutionCandidate@663, ResolutionCandidate@664, ResolutionCandidate@665, ... }
-    <name not found> = ArrayList@666[8] { ResolutionCandidate@663, ResolutionCandidate@664, ResolutionCandidate@665, ... }
+ResolutionTaskHolder@659 {
+    <name not found> = ArrayList@660[8] { ResolutionCandidate@661, ResolutionCandidate@662, ResolutionCandidate@663, ... }
 }
 
-ResolutionTaskHolder@667 {
-    <name not found> = ArrayList@668[8] { ResolutionCandidate@669, ResolutionCandidate@670, ResolutionCandidate@671, ... }
-    <name not found> = ArrayList@672[8] { ResolutionCandidate@669, ResolutionCandidate@670, ResolutionCandidate@671, ... }
+ResolutionTaskHolder@664 {
+    <name not found> = ArrayList@665[8] { ResolutionCandidate@666, ResolutionCandidate@667, ResolutionCandidate@668, ... }
 }
 
-ResolutionTaskHolder@673 {
-    <name not found> = ArrayList@674[8] { ResolutionCandidate@675, ResolutionCandidate@676, ResolutionCandidate@677, ... }
-    <name not found> = ArrayList@678[8] { ResolutionCandidate@675, ResolutionCandidate@676, ResolutionCandidate@677, ... }
+ResolutionTaskHolder@669 {
+    <name not found> = ArrayList@670[8] { ResolutionCandidate@671, ResolutionCandidate@672, ResolutionCandidate@673, ... }
 }
 
-ResolutionTaskHolder@679 {
-    <name not found> = ArrayList@680[8] { ResolutionCandidate@681, ResolutionCandidate@682, ResolutionCandidate@683, ... }
-    <name not found> = ArrayList@684[8] { ResolutionCandidate@681, ResolutionCandidate@682, ResolutionCandidate@683, ... }
-}
-
-ResolutionTaskHolder@685 {
-    <name not found> = ArrayList@686[8] { ResolutionCandidate@687, ResolutionCandidate@688, ResolutionCandidate@689, ... }
-    <name not found> = ArrayList@690[8] { ResolutionCandidate@687, ResolutionCandidate@688, ResolutionCandidate@689, ... }
-}
-
-ResolutionTaskHolder@691 {
-    <name not found> = ArrayList@692[8] { ResolutionCandidate@693, ResolutionCandidate@694, ResolutionCandidate@695, ... }
-    <name not found> = ArrayList@696[8] { ResolutionCandidate@693, ResolutionCandidate@694, ResolutionCandidate@695, ... }
-}
-
-ResolutionTaskHolder@697 {
-    <name not found> = ArrayList@698[8] { ResolutionCandidate@699, ResolutionCandidate@700, ResolutionCandidate@701, ... }
-    <name not found> = ArrayList@702[8] { ResolutionCandidate@699, ResolutionCandidate@700, ResolutionCandidate@701, ... }
-}
-
-ResolutionTaskHolder@703 {
-    <name not found> = ArrayList@704[8] { ResolutionCandidate@705, ResolutionCandidate@706, ResolutionCandidate@707, ... }
-    <name not found> = ArrayList@708[8] { ResolutionCandidate@705, ResolutionCandidate@706, ResolutionCandidate@707, ... }
-}
-
-ResolutionTaskHolder@709 {
-    <name not found> = ArrayList@710[8] { ResolutionCandidate@711, ResolutionCandidate@712, ResolutionCandidate@713, ... }
-    <name not found> = ArrayList@714[8] { ResolutionCandidate@711, ResolutionCandidate@712, ResolutionCandidate@713, ... }
-}
-
-ResolutionTaskHolder@715 {
-    <name not found> = ArrayList@716[8] { ResolutionCandidate@717, ResolutionCandidate@718, ResolutionCandidate@719, ... }
-    <name not found> = ArrayList@720[8] { ResolutionCandidate@717, ResolutionCandidate@718, ResolutionCandidate@719, ... }
-}
-
-ResolutionTaskHolder@721 {
-    <name not found> = ArrayList@722[8] { ResolutionCandidate@723, ResolutionCandidate@724, ResolutionCandidate@725, ... }
-    <name not found> = ArrayList@726[8] { ResolutionCandidate@723, ResolutionCandidate@724, ResolutionCandidate@725, ... }
-}
-
-ResolutionTaskHolder@727 {
-    <name not found> = ArrayList@728[8] { ResolutionCandidate@729, ResolutionCandidate@730, ResolutionCandidate@731, ... }
-    <name not found> = ArrayList@732[8] { ResolutionCandidate@729, ResolutionCandidate@730, ResolutionCandidate@731, ... }
-}
-
-ResolutionTaskHolder@733 {
-    <name not found> = ArrayList@734[8] { ResolutionCandidate@735, ResolutionCandidate@736, ResolutionCandidate@737, ... }
-    <name not found> = ArrayList@738[8] { ResolutionCandidate@735, ResolutionCandidate@736, ResolutionCandidate@737, ... }
-}
-
-ResolutionTaskHolder@739 {
-    <name not found> = ArrayList@740[8] { ResolutionCandidate@741, ResolutionCandidate@742, ResolutionCandidate@743, ... }
-    <name not found> = ArrayList@744[8] { ResolutionCandidate@741, ResolutionCandidate@742, ResolutionCandidate@743, ... }
-}
-
-ResolutionTaskHolder@745 {
-    <name not found> = ArrayList@746[8] { ResolutionCandidate@747, ResolutionCandidate@748, ResolutionCandidate@749, ... }
-    <name not found> = ArrayList@750[8] { ResolutionCandidate@747, ResolutionCandidate@748, ResolutionCandidate@749, ... }
-}
-
-ResolutionTaskHolder@751 {
-    <name not found> = ArrayList@752[8] { ResolutionCandidate@753, ResolutionCandidate@754, ResolutionCandidate@755, ... }
-    <name not found> = ArrayList@756[8] { ResolutionCandidate@753, ResolutionCandidate@754, ResolutionCandidate@755, ... }
-}
-
-ResolutionTaskHolder@757 {
-    <name not found> = ArrayList@758[8] { ResolutionCandidate@759, ResolutionCandidate@760, ResolutionCandidate@761, ... }
-    <name not found> = ArrayList@762[8] { ResolutionCandidate@759, ResolutionCandidate@760, ResolutionCandidate@761, ... }
-}
-
-ResolutionTaskHolder@763 {
-    <name not found> = ArrayList@764[8] { ResolutionCandidate@765, ResolutionCandidate@766, ResolutionCandidate@767, ... }
-    <name not found> = ArrayList@768[8] { ResolutionCandidate@765, ResolutionCandidate@766, ResolutionCandidate@767, ... }
-}
-
-ResolutionTaskHolder@769 {
-    <name not found> = ArrayList@770[8] { ResolutionCandidate@771, ResolutionCandidate@772, ResolutionCandidate@773, ... }
-    <name not found> = ArrayList@774[8] { ResolutionCandidate@771, ResolutionCandidate@772, ResolutionCandidate@773, ... }
-}
-
-ResolutionTaskHolder@775 {
-    <name not found> = ArrayList@776[8] { ResolutionCandidate@777, ResolutionCandidate@778, ResolutionCandidate@779, ... }
-    <name not found> = ArrayList@780[8] { ResolutionCandidate@777, ResolutionCandidate@778, ResolutionCandidate@779, ... }
-}
-
-ResolutionTaskHolder@781 {
-    <name not found> = ArrayList@782[8] { ResolutionCandidate@783, ResolutionCandidate@784, ResolutionCandidate@785, ... }
-    <name not found> = ArrayList@786[8] { ResolutionCandidate@783, ResolutionCandidate@784, ResolutionCandidate@785, ... }
-}
-
-ResolutionTaskHolder@787 {
-    <name not found> = ArrayList@788[8] { ResolutionCandidate@789, ResolutionCandidate@790, ResolutionCandidate@791, ... }
-    <name not found> = ArrayList@792[8] { ResolutionCandidate@789, ResolutionCandidate@790, ResolutionCandidate@791, ... }
-}
-
-ResolutionTaskHolder@793 {
-    <name not found> = ArrayList@794[8] { ResolutionCandidate@795, ResolutionCandidate@796, ResolutionCandidate@797, ... }
-    <name not found> = ArrayList@798[8] { ResolutionCandidate@795, ResolutionCandidate@796, ResolutionCandidate@797, ... }
-}
-
-ResolutionTaskHolder@799 {
-    <name not found> = ArrayList@800[8] { ResolutionCandidate@801, ResolutionCandidate@802, ResolutionCandidate@803, ... }
-    <name not found> = ArrayList@804[8] { ResolutionCandidate@801, ResolutionCandidate@802, ResolutionCandidate@803, ... }
-}
-
-ResolutionTaskHolder@805 {
-    <name not found> = ArrayList@806[8] { ResolutionCandidate@807, ResolutionCandidate@808, ResolutionCandidate@809, ... }
-    <name not found> = ArrayList@810[8] { ResolutionCandidate@807, ResolutionCandidate@808, ResolutionCandidate@809, ... }
-}
-
-ResolutionTaskHolder@811 {
-    <name not found> = ArrayList@812[8] { ResolutionCandidate@813, ResolutionCandidate@814, ResolutionCandidate@815, ... }
-    <name not found> = ArrayList@816[8] { ResolutionCandidate@813, ResolutionCandidate@814, ResolutionCandidate@815, ... }
-}
-
-ResolutionTaskHolder@817 {
-    <name not found> = ArrayList@818[8] { ResolutionCandidate@819, ResolutionCandidate@820, ResolutionCandidate@821, ... }
-    <name not found> = ArrayList@822[8] { ResolutionCandidate@819, ResolutionCandidate@820, ResolutionCandidate@821, ... }
-}
-
-ResolutionTaskHolder@823 {
-    <name not found> = ArrayList@824[8] { ResolutionCandidate@825, ResolutionCandidate@826, ResolutionCandidate@827, ... }
-    <name not found> = ArrayList@828[8] { ResolutionCandidate@825, ResolutionCandidate@826, ResolutionCandidate@827, ... }
-}
-
-ResolutionTaskHolder@829 {
-    <name not found> = ArrayList@830[8] { ResolutionCandidate@831, ResolutionCandidate@832, ResolutionCandidate@833, ... }
-    <name not found> = ArrayList@834[8] { ResolutionCandidate@831, ResolutionCandidate@832, ResolutionCandidate@833, ... }
+null {
+    <name not found> = ArrayList@674[1] { ResolutionCandidate@220 }
+    <name not found> = ArrayList@675[1] { ResolutionCandidate@310 }
+    <name not found> = ArrayList@676[1] { ResolutionCandidate@274 }
+    <name not found> = ArrayList@677[1] { ResolutionCandidate@286 }
+    <name not found> = ArrayList@678[1] { ResolutionCandidate@205 }
+    <name not found> = ArrayList@679[1] { ResolutionCandidate@211 }
+    <name not found> = ArrayList@680[1] { ResolutionCandidate@247 }
+    <name not found> = ArrayList@681[1] { ResolutionCandidate@178 }
+    <name not found> = ArrayList@682[1] { ResolutionCandidate@253 }
+    <name not found> = ArrayList@683[1] { ResolutionCandidate@241 }
+    <name not found> = ArrayList@684[1] { ResolutionCandidate@190 }
+    <name not found> = ArrayList@685[1] { ResolutionCandidate@187 }
+    <name not found> = ArrayList@686[1] { ResolutionCandidate@214 }
+    <name not found> = ArrayList@687[1] { ResolutionCandidate@229 }
+    <name not found> = ArrayList@688[1] { ResolutionCandidate@202 }
+    <name not found> = ArrayList@689[1] { ResolutionCandidate@322 }
+    <name not found> = ArrayList@690[1] { ResolutionCandidate@259 }
+    <name not found> = ArrayList@691[1] { ResolutionCandidate@328 }
+    <name not found> = ArrayList@692[1] { ResolutionCandidate@292 }
+    <name not found> = ArrayList@693[1] { ResolutionCandidate@262 }
+    <name not found> = ArrayList@694[1] { ResolutionCandidate@208 }
+    <name not found> = ArrayList@695[1] { ResolutionCandidate@280 }
+    <name not found> = ArrayList@696[1] { ResolutionCandidate@175 }
+    <name not found> = ArrayList@697[1] { ResolutionCandidate@277 }
+    <name not found> = ArrayList@698[1] { ResolutionCandidate@319 }
+    <name not found> = ArrayList@699[1] { ResolutionCandidate@223 }
+    <name not found> = ArrayList@700[1] { ResolutionCandidate@181 }
+    <name not found> = ArrayList@701[1] { ResolutionCandidate@298 }
+    <name not found> = ArrayList@702[1] { ResolutionCandidate@244 }
+    <name not found> = ArrayList@703[1] { ResolutionCandidate@217 }
+    <name not found> = ArrayList@704[1] { ResolutionCandidate@283 }
+    <name not found> = ArrayList@705[1] { ResolutionCandidate@250 }
+    <name not found> = ArrayList@706[1] { ResolutionCandidate@193 }
+    <name not found> = ArrayList@707[1] { ResolutionCandidate@268 }
+    <name not found> = ArrayList@708[1] { ResolutionCandidate@265 }
+    <name not found> = ArrayList@709[1] { ResolutionCandidate@184 }
+    <name not found> = ArrayList@710[1] { ResolutionCandidate@232 }
+    <name not found> = ArrayList@711[1] { ResolutionCandidate@196 }
+    <name not found> = ArrayList@712[1] { ResolutionCandidate@316 }
+    <name not found> = ArrayList@713[1] { ResolutionCandidate@256 }
+    <name not found> = ArrayList@714[1] { ResolutionCandidate@325 }
+    <name not found> = ArrayList@715[1] { ResolutionCandidate@295 }
+    <name not found> = ArrayList@716[1] { ResolutionCandidate@226 }
+    <name not found> = ArrayList@717[1] { ResolutionCandidate@235 }
+    <name not found> = ArrayList@718[1] { ResolutionCandidate@238 }
+    <name not found> = ArrayList@719[1] { ResolutionCandidate@199 }
+    <name not found> = ArrayList@720[1] { ResolutionCandidate@271 }
+    <name not found> = ArrayList@721[1] { ResolutionCandidate@313 }
+    <name not found> = ArrayList@722[1] { ResolutionCandidate@289 }
+    <name not found> = ArrayList@723[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@724[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@725[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@726[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@727[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@728[1] { ResolutionCandidate@122 }
+    <name not found> = ArrayList@729[1] { ResolutionCandidate@140 }
+    <name not found> = ArrayList@730[1] { ResolutionCandidate@142 }
+    <name not found> = ArrayList@731[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@732[1] { ResolutionCandidate@152 }
+    <name not found> = ArrayList@733[1] { ResolutionCandidate@145 }
+    <name not found> = ArrayList@734[1] { ResolutionCandidate@147 }
+    <name not found> = ArrayList@735[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@736[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@737[1] { ResolutionCandidate@170 }
+    <name not found> = ArrayList@738[1] { ResolutionCandidate@172 }
+    <name not found> = ArrayList@739[1] { ResolutionCandidate@165 }
+    <name not found> = ArrayList@740[1] { ResolutionCandidate@167 }
+    <name not found> = ArrayList@741[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@742[1] { ResolutionCandidate@132 }
+    <name not found> = ArrayList@743[1] { ResolutionCandidate@155 }
+    <name not found> = ArrayList@744[1] { ResolutionCandidate@157 }
+    <name not found> = ArrayList@745[1] { ResolutionCandidate@160 }
+    <name not found> = ArrayList@746[1] { ResolutionCandidate@162 }
+    <name not found> = ArrayList@747[1] { ResolutionCandidate@301 }
+    <name not found> = ArrayList@748[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@749[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@750[1] { ResolutionCandidate@304 }
+    <name not found> = ArrayList@751[1] { ResolutionCandidate@125 }
+    <name not found> = ArrayList@752[1] { ResolutionCandidate@127 }
+    <name not found> = ArrayList@753[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@754[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@755[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@756[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@757[1] { ResolutionCandidate@135 }
+    <name not found> = ArrayList@758[1] { ResolutionCandidate@137 }
+    <name not found> = ArrayList@759[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@760[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@761[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@762[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@763[1] { ResolutionCandidate@307 }
+    <name not found> = ArrayList@764[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@765[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@766[7] { ResolutionCandidate@411, ResolutionCandidate@412, ResolutionCandidate@413, ... }
+    <name not found> = ArrayList@767[7] { ResolutionCandidate@331, ResolutionCandidate@332, ResolutionCandidate@333, ... }
+    <name not found> = ArrayList@768[7] { ResolutionCandidate@346, ResolutionCandidate@347, ResolutionCandidate@348, ... }
+    <name not found> = ArrayList@769[7] { ResolutionCandidate@406, ResolutionCandidate@407, ResolutionCandidate@408, ... }
+    <name not found> = ArrayList@770[7] { ResolutionCandidate@391, ResolutionCandidate@392, ResolutionCandidate@393, ... }
+    <name not found> = ArrayList@771[7] { ResolutionCandidate@371, ResolutionCandidate@372, ResolutionCandidate@373, ... }
+    <name not found> = ArrayList@772[7] { ResolutionCandidate@416, ResolutionCandidate@417, ResolutionCandidate@418, ... }
+    <name not found> = ArrayList@773[7] { ResolutionCandidate@341, ResolutionCandidate@342, ResolutionCandidate@343, ... }
+    <name not found> = ArrayList@774[7] { ResolutionCandidate@401, ResolutionCandidate@402, ResolutionCandidate@403, ... }
+    <name not found> = ArrayList@775[7] { ResolutionCandidate@396, ResolutionCandidate@397, ResolutionCandidate@398, ... }
+    <name not found> = ArrayList@776[7] { ResolutionCandidate@381, ResolutionCandidate@382, ResolutionCandidate@383, ... }
+    <name not found> = ArrayList@777[7] { ResolutionCandidate@336, ResolutionCandidate@337, ResolutionCandidate@338, ... }
+    <name not found> = ArrayList@778[7] { ResolutionCandidate@351, ResolutionCandidate@352, ResolutionCandidate@353, ... }
+    <name not found> = ArrayList@779[7] { ResolutionCandidate@386, ResolutionCandidate@387, ResolutionCandidate@388, ... }
+    <name not found> = ArrayList@780[7] { ResolutionCandidate@356, ResolutionCandidate@357, ResolutionCandidate@358, ... }
+    <name not found> = ArrayList@781[7] { ResolutionCandidate@376, ResolutionCandidate@377, ResolutionCandidate@378, ... }
+    <name not found> = ArrayList@782[7] { ResolutionCandidate@361, ResolutionCandidate@362, ResolutionCandidate@363, ... }
+    <name not found> = ArrayList@783[7] { ResolutionCandidate@366, ResolutionCandidate@367, ResolutionCandidate@368, ... }
+    <name not found> = ArrayList@784[8] { ResolutionCandidate@476, ResolutionCandidate@477, ResolutionCandidate@478, ... }
+    <name not found> = ArrayList@785[8] { ResolutionCandidate@421, ResolutionCandidate@422, ResolutionCandidate@423, ... }
+    <name not found> = ArrayList@786[8] { ResolutionCandidate@521, ResolutionCandidate@522, ResolutionCandidate@523, ... }
+    <name not found> = ArrayList@787[8] { ResolutionCandidate@666, ResolutionCandidate@667, ResolutionCandidate@668, ... }
+    <name not found> = ArrayList@788[8] { ResolutionCandidate@426, ResolutionCandidate@427, ResolutionCandidate@428, ... }
+    <name not found> = ArrayList@789[8] { ResolutionCandidate@551, ResolutionCandidate@552, ResolutionCandidate@553, ... }
+    <name not found> = ArrayList@790[8] { ResolutionCandidate@591, ResolutionCandidate@592, ResolutionCandidate@593, ... }
+    <name not found> = ArrayList@791[8] { ResolutionCandidate@576, ResolutionCandidate@577, ResolutionCandidate@578, ... }
+    <name not found> = ArrayList@792[8] { ResolutionCandidate@516, ResolutionCandidate@517, ResolutionCandidate@518, ... }
+    <name not found> = ArrayList@793[8] { ResolutionCandidate@656, ResolutionCandidate@657, ResolutionCandidate@658, ... }
+    <name not found> = ArrayList@794[8] { ResolutionCandidate@441, ResolutionCandidate@442, ResolutionCandidate@443, ... }
+    <name not found> = ArrayList@795[8] { ResolutionCandidate@436, ResolutionCandidate@437, ResolutionCandidate@438, ... }
+    <name not found> = ArrayList@796[8] { ResolutionCandidate@581, ResolutionCandidate@582, ResolutionCandidate@583, ... }
+    <name not found> = ArrayList@797[8] { ResolutionCandidate@611, ResolutionCandidate@612, ResolutionCandidate@613, ... }
+    <name not found> = ArrayList@798[8] { ResolutionCandidate@671, ResolutionCandidate@672, ResolutionCandidate@673, ... }
+    <name not found> = ArrayList@799[8] { ResolutionCandidate@596, ResolutionCandidate@597, ResolutionCandidate@598, ... }
+    <name not found> = ArrayList@800[8] { ResolutionCandidate@601, ResolutionCandidate@602, ResolutionCandidate@603, ... }
+    <name not found> = ArrayList@801[8] { ResolutionCandidate@536, ResolutionCandidate@537, ResolutionCandidate@538, ... }
+    <name not found> = ArrayList@802[8] { ResolutionCandidate@631, ResolutionCandidate@632, ResolutionCandidate@633, ... }
+    <name not found> = ArrayList@803[8] { ResolutionCandidate@466, ResolutionCandidate@467, ResolutionCandidate@468, ... }
+    <name not found> = ArrayList@804[8] { ResolutionCandidate@451, ResolutionCandidate@452, ResolutionCandidate@453, ... }
+    <name not found> = ArrayList@805[8] { ResolutionCandidate@541, ResolutionCandidate@542, ResolutionCandidate@543, ... }
+    <name not found> = ArrayList@806[8] { ResolutionCandidate@456, ResolutionCandidate@457, ResolutionCandidate@458, ... }
+    <name not found> = ArrayList@807[8] { ResolutionCandidate@621, ResolutionCandidate@622, ResolutionCandidate@623, ... }
+    <name not found> = ArrayList@808[8] { ResolutionCandidate@626, ResolutionCandidate@627, ResolutionCandidate@628, ... }
+    <name not found> = ArrayList@809[8] { ResolutionCandidate@546, ResolutionCandidate@547, ResolutionCandidate@548, ... }
+    <name not found> = ArrayList@810[8] { ResolutionCandidate@501, ResolutionCandidate@502, ResolutionCandidate@503, ... }
+    <name not found> = ArrayList@811[8] { ResolutionCandidate@471, ResolutionCandidate@472, ResolutionCandidate@473, ... }
+    <name not found> = ArrayList@812[8] { ResolutionCandidate@431, ResolutionCandidate@432, ResolutionCandidate@433, ... }
+    <name not found> = ArrayList@813[8] { ResolutionCandidate@511, ResolutionCandidate@512, ResolutionCandidate@513, ... }
+    <name not found> = ArrayList@814[8] { ResolutionCandidate@566, ResolutionCandidate@567, ResolutionCandidate@568, ... }
+    <name not found> = ArrayList@815[8] { ResolutionCandidate@586, ResolutionCandidate@587, ResolutionCandidate@588, ... }
+    <name not found> = ArrayList@816[8] { ResolutionCandidate@616, ResolutionCandidate@617, ResolutionCandidate@618, ... }
+    <name not found> = ArrayList@817[8] { ResolutionCandidate@636, ResolutionCandidate@637, ResolutionCandidate@638, ... }
+    <name not found> = ArrayList@818[8] { ResolutionCandidate@561, ResolutionCandidate@562, ResolutionCandidate@563, ... }
+    <name not found> = ArrayList@819[8] { ResolutionCandidate@556, ResolutionCandidate@557, ResolutionCandidate@558, ... }
+    <name not found> = ArrayList@820[8] { ResolutionCandidate@461, ResolutionCandidate@462, ResolutionCandidate@463, ... }
+    <name not found> = ArrayList@821[8] { ResolutionCandidate@491, ResolutionCandidate@492, ResolutionCandidate@493, ... }
+    <name not found> = ArrayList@822[8] { ResolutionCandidate@641, ResolutionCandidate@642, ResolutionCandidate@643, ... }
+    <name not found> = ArrayList@823[8] { ResolutionCandidate@506, ResolutionCandidate@507, ResolutionCandidate@508, ... }
+    <name not found> = ArrayList@824[8] { ResolutionCandidate@481, ResolutionCandidate@482, ResolutionCandidate@483, ... }
+    <name not found> = ArrayList@825[8] { ResolutionCandidate@571, ResolutionCandidate@572, ResolutionCandidate@573, ... }
+    <name not found> = ArrayList@826[8] { ResolutionCandidate@496, ResolutionCandidate@497, ResolutionCandidate@498, ... }
+    <name not found> = ArrayList@827[8] { ResolutionCandidate@446, ResolutionCandidate@447, ResolutionCandidate@448, ... }
+    <name not found> = ArrayList@828[8] { ResolutionCandidate@486, ResolutionCandidate@487, ResolutionCandidate@488, ... }
+    <name not found> = ArrayList@829[8] { ResolutionCandidate@661, ResolutionCandidate@662, ResolutionCandidate@663, ... }
+    <name not found> = ArrayList@830[8] { ResolutionCandidate@646, ResolutionCandidate@647, ResolutionCandidate@648, ... }
+    <name not found> = ArrayList@831[8] { ResolutionCandidate@526, ResolutionCandidate@527, ResolutionCandidate@528, ... }
+    <name not found> = ArrayList@832[8] { ResolutionCandidate@651, ResolutionCandidate@652, ResolutionCandidate@653, ... }
+    <name not found> = ArrayList@833[8] { ResolutionCandidate@531, ResolutionCandidate@532, ResolutionCandidate@533, ... }
+    <name not found> = ArrayList@834[8] { ResolutionCandidate@606, ResolutionCandidate@607, ResolutionCandidate@608, ... }
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/evaluate/numberBinaryOperations.lazy.log b/compiler/testData/diagnostics/tests/evaluate/numberBinaryOperations.lazy.log
index b9c12da3536..289cb0f8eff 100644
--- a/compiler/testData/diagnostics/tests/evaluate/numberBinaryOperations.lazy.log
+++ b/compiler/testData/diagnostics/tests/evaluate/numberBinaryOperations.lazy.log
@@ -65,244 +65,247 @@ LazyJavaPackageFragment@15['lang'] {
 
 ResolutionTaskHolder@45 {
     <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
 ResolutionTaskHolder@57 {
     <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
 ResolutionTaskHolder@69 {
     <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
 ResolutionTaskHolder@81 {
     <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
 ResolutionTaskHolder@93 {
     <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
 }
 
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
+}
+
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
 }
 
 ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+    <name not found> = ArrayList@106[7] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
 }
 
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[7] { ResolutionCandidate@112, ResolutionCandidate@113, ResolutionCandidate@114, ... }
 }
 
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
+ResolutionTaskHolder@115 {
+    <name not found> = ArrayList@116[7] { ResolutionCandidate@117, ResolutionCandidate@118, ResolutionCandidate@119, ... }
 }
 
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
+ResolutionTaskHolder@120 {
+    <name not found> = ArrayList@121[7] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
 }
 
 ResolutionTaskHolder@125 {
     <name not found> = ArrayList@126[7] { ResolutionCandidate@127, ResolutionCandidate@128, ResolutionCandidate@129, ... }
-    <name not found> = ArrayList@130[7] { ResolutionCandidate@127, ResolutionCandidate@128, ResolutionCandidate@129, ... }
 }
 
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[7] { ResolutionCandidate@133, ResolutionCandidate@134, ResolutionCandidate@135, ... }
-    <name not found> = ArrayList@136[7] { ResolutionCandidate@133, ResolutionCandidate@134, ResolutionCandidate@135, ... }
+ResolutionTaskHolder@130 {
+    <name not found> = ArrayList@131[7] { ResolutionCandidate@132, ResolutionCandidate@133, ResolutionCandidate@134, ... }
 }
 
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[7] { ResolutionCandidate@139, ResolutionCandidate@140, ResolutionCandidate@141, ... }
-    <name not found> = ArrayList@142[7] { ResolutionCandidate@139, ResolutionCandidate@140, ResolutionCandidate@141, ... }
+ResolutionTaskHolder@135 {
+    <name not found> = ArrayList@136[7] { ResolutionCandidate@137, ResolutionCandidate@138, ResolutionCandidate@139, ... }
 }
 
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[7] { ResolutionCandidate@145, ResolutionCandidate@146, ResolutionCandidate@147, ... }
-    <name not found> = ArrayList@148[7] { ResolutionCandidate@145, ResolutionCandidate@146, ResolutionCandidate@147, ... }
+ResolutionTaskHolder@140 {
+    <name not found> = ArrayList@141[7] { ResolutionCandidate@142, ResolutionCandidate@143, ResolutionCandidate@144, ... }
 }
 
-ResolutionTaskHolder@149 {
-    <name not found> = ArrayList@150[7] { ResolutionCandidate@151, ResolutionCandidate@152, ResolutionCandidate@153, ... }
-    <name not found> = ArrayList@154[7] { ResolutionCandidate@151, ResolutionCandidate@152, ResolutionCandidate@153, ... }
+ResolutionTaskHolder@145 {
+    <name not found> = ArrayList@146[7] { ResolutionCandidate@147, ResolutionCandidate@148, ResolutionCandidate@149, ... }
+}
+
+ResolutionTaskHolder@150 {
+    <name not found> = ArrayList@151[7] { ResolutionCandidate@152, ResolutionCandidate@153, ResolutionCandidate@154, ... }
 }
 
 ResolutionTaskHolder@155 {
     <name not found> = ArrayList@156[7] { ResolutionCandidate@157, ResolutionCandidate@158, ResolutionCandidate@159, ... }
-    <name not found> = ArrayList@160[7] { ResolutionCandidate@157, ResolutionCandidate@158, ResolutionCandidate@159, ... }
 }
 
-ResolutionTaskHolder@161 {
-    <name not found> = ArrayList@162[7] { ResolutionCandidate@163, ResolutionCandidate@164, ResolutionCandidate@165, ... }
-    <name not found> = ArrayList@166[7] { ResolutionCandidate@163, ResolutionCandidate@164, ResolutionCandidate@165, ... }
+ResolutionTaskHolder@160 {
+    <name not found> = ArrayList@161[7] { ResolutionCandidate@162, ResolutionCandidate@163, ResolutionCandidate@164, ... }
 }
 
-ResolutionTaskHolder@167 {
-    <name not found> = ArrayList@168[7] { ResolutionCandidate@169, ResolutionCandidate@170, ResolutionCandidate@171, ... }
-    <name not found> = ArrayList@172[7] { ResolutionCandidate@169, ResolutionCandidate@170, ResolutionCandidate@171, ... }
+ResolutionTaskHolder@165 {
+    <name not found> = ArrayList@166[8] { ResolutionCandidate@167, ResolutionCandidate@168, ResolutionCandidate@169, ... }
 }
 
-ResolutionTaskHolder@173 {
-    <name not found> = ArrayList@174[7] { ResolutionCandidate@175, ResolutionCandidate@176, ResolutionCandidate@177, ... }
-    <name not found> = ArrayList@178[7] { ResolutionCandidate@175, ResolutionCandidate@176, ResolutionCandidate@177, ... }
+ResolutionTaskHolder@170 {
+    <name not found> = ArrayList@171[8] { ResolutionCandidate@172, ResolutionCandidate@173, ResolutionCandidate@174, ... }
 }
 
-ResolutionTaskHolder@179 {
-    <name not found> = ArrayList@180[7] { ResolutionCandidate@181, ResolutionCandidate@182, ResolutionCandidate@183, ... }
-    <name not found> = ArrayList@184[7] { ResolutionCandidate@181, ResolutionCandidate@182, ResolutionCandidate@183, ... }
+ResolutionTaskHolder@175 {
+    <name not found> = ArrayList@176[8] { ResolutionCandidate@177, ResolutionCandidate@178, ResolutionCandidate@179, ... }
 }
 
-ResolutionTaskHolder@185 {
-    <name not found> = ArrayList@186[7] { ResolutionCandidate@187, ResolutionCandidate@188, ResolutionCandidate@189, ... }
-    <name not found> = ArrayList@190[7] { ResolutionCandidate@187, ResolutionCandidate@188, ResolutionCandidate@189, ... }
+ResolutionTaskHolder@180 {
+    <name not found> = ArrayList@181[8] { ResolutionCandidate@182, ResolutionCandidate@183, ResolutionCandidate@184, ... }
 }
 
-ResolutionTaskHolder@191 {
-    <name not found> = ArrayList@192[7] { ResolutionCandidate@193, ResolutionCandidate@194, ResolutionCandidate@195, ... }
-    <name not found> = ArrayList@196[7] { ResolutionCandidate@193, ResolutionCandidate@194, ResolutionCandidate@195, ... }
-}
-
-ResolutionTaskHolder@197 {
-    <name not found> = ArrayList@198[8] { ResolutionCandidate@199, ResolutionCandidate@200, ResolutionCandidate@201, ... }
-    <name not found> = ArrayList@202[8] { ResolutionCandidate@199, ResolutionCandidate@200, ResolutionCandidate@201, ... }
-}
-
-ResolutionTaskHolder@203 {
-    <name not found> = ArrayList@204[8] { ResolutionCandidate@205, ResolutionCandidate@206, ResolutionCandidate@207, ... }
-    <name not found> = ArrayList@208[8] { ResolutionCandidate@205, ResolutionCandidate@206, ResolutionCandidate@207, ... }
-}
-
-ResolutionTaskHolder@209 {
-    <name not found> = ArrayList@210[8] { ResolutionCandidate@211, ResolutionCandidate@212, ResolutionCandidate@213, ... }
-    <name not found> = ArrayList@214[8] { ResolutionCandidate@211, ResolutionCandidate@212, ResolutionCandidate@213, ... }
-}
-
-ResolutionTaskHolder@215 {
-    <name not found> = ArrayList@216[8] { ResolutionCandidate@217, ResolutionCandidate@218, ResolutionCandidate@219, ... }
-    <name not found> = ArrayList@220[8] { ResolutionCandidate@217, ResolutionCandidate@218, ResolutionCandidate@219, ... }
+null {
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@189[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@192[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@194[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@196[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@197[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@198[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@200[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@201[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@202[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@203[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@204[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@205[7] { ResolutionCandidate@147, ResolutionCandidate@148, ResolutionCandidate@149, ... }
+    <name not found> = ArrayList@206[7] { ResolutionCandidate@162, ResolutionCandidate@163, ResolutionCandidate@164, ... }
+    <name not found> = ArrayList@207[7] { ResolutionCandidate@127, ResolutionCandidate@128, ResolutionCandidate@129, ... }
+    <name not found> = ArrayList@208[7] { ResolutionCandidate@137, ResolutionCandidate@138, ResolutionCandidate@139, ... }
+    <name not found> = ArrayList@209[7] { ResolutionCandidate@152, ResolutionCandidate@153, ResolutionCandidate@154, ... }
+    <name not found> = ArrayList@210[7] { ResolutionCandidate@112, ResolutionCandidate@113, ResolutionCandidate@114, ... }
+    <name not found> = ArrayList@211[7] { ResolutionCandidate@157, ResolutionCandidate@158, ResolutionCandidate@159, ... }
+    <name not found> = ArrayList@212[7] { ResolutionCandidate@132, ResolutionCandidate@133, ResolutionCandidate@134, ... }
+    <name not found> = ArrayList@213[7] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
+    <name not found> = ArrayList@214[7] { ResolutionCandidate@142, ResolutionCandidate@143, ResolutionCandidate@144, ... }
+    <name not found> = ArrayList@215[7] { ResolutionCandidate@117, ResolutionCandidate@118, ResolutionCandidate@119, ... }
+    <name not found> = ArrayList@216[7] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
+    <name not found> = ArrayList@217[8] { ResolutionCandidate@182, ResolutionCandidate@183, ResolutionCandidate@184, ... }
+    <name not found> = ArrayList@218[8] { ResolutionCandidate@172, ResolutionCandidate@173, ResolutionCandidate@174, ... }
+    <name not found> = ArrayList@219[8] { ResolutionCandidate@177, ResolutionCandidate@178, ResolutionCandidate@179, ... }
+    <name not found> = ArrayList@220[8] { ResolutionCandidate@167, ResolutionCandidate@168, ResolutionCandidate@169, ... }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/evaluate/numberBinaryOperationsCall.lazy.log b/compiler/testData/diagnostics/tests/evaluate/numberBinaryOperationsCall.lazy.log
index b9c12da3536..f68bea1a352 100644
--- a/compiler/testData/diagnostics/tests/evaluate/numberBinaryOperationsCall.lazy.log
+++ b/compiler/testData/diagnostics/tests/evaluate/numberBinaryOperationsCall.lazy.log
@@ -65,244 +65,247 @@ LazyJavaPackageFragment@15['lang'] {
 
 ResolutionTaskHolder@45 {
     <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
 ResolutionTaskHolder@57 {
     <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
 ResolutionTaskHolder@69 {
     <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
 ResolutionTaskHolder@81 {
     <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
 ResolutionTaskHolder@93 {
     <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
 }
 
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
+}
+
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
 }
 
 ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+    <name not found> = ArrayList@106[7] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
 }
 
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[7] { ResolutionCandidate@112, ResolutionCandidate@113, ResolutionCandidate@114, ... }
 }
 
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
+ResolutionTaskHolder@115 {
+    <name not found> = ArrayList@116[7] { ResolutionCandidate@117, ResolutionCandidate@118, ResolutionCandidate@119, ... }
 }
 
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
+ResolutionTaskHolder@120 {
+    <name not found> = ArrayList@121[7] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
 }
 
 ResolutionTaskHolder@125 {
     <name not found> = ArrayList@126[7] { ResolutionCandidate@127, ResolutionCandidate@128, ResolutionCandidate@129, ... }
-    <name not found> = ArrayList@130[7] { ResolutionCandidate@127, ResolutionCandidate@128, ResolutionCandidate@129, ... }
 }
 
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[7] { ResolutionCandidate@133, ResolutionCandidate@134, ResolutionCandidate@135, ... }
-    <name not found> = ArrayList@136[7] { ResolutionCandidate@133, ResolutionCandidate@134, ResolutionCandidate@135, ... }
+ResolutionTaskHolder@130 {
+    <name not found> = ArrayList@131[7] { ResolutionCandidate@132, ResolutionCandidate@133, ResolutionCandidate@134, ... }
 }
 
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[7] { ResolutionCandidate@139, ResolutionCandidate@140, ResolutionCandidate@141, ... }
-    <name not found> = ArrayList@142[7] { ResolutionCandidate@139, ResolutionCandidate@140, ResolutionCandidate@141, ... }
+ResolutionTaskHolder@135 {
+    <name not found> = ArrayList@136[7] { ResolutionCandidate@137, ResolutionCandidate@138, ResolutionCandidate@139, ... }
 }
 
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[7] { ResolutionCandidate@145, ResolutionCandidate@146, ResolutionCandidate@147, ... }
-    <name not found> = ArrayList@148[7] { ResolutionCandidate@145, ResolutionCandidate@146, ResolutionCandidate@147, ... }
+ResolutionTaskHolder@140 {
+    <name not found> = ArrayList@141[7] { ResolutionCandidate@142, ResolutionCandidate@143, ResolutionCandidate@144, ... }
 }
 
-ResolutionTaskHolder@149 {
-    <name not found> = ArrayList@150[7] { ResolutionCandidate@151, ResolutionCandidate@152, ResolutionCandidate@153, ... }
-    <name not found> = ArrayList@154[7] { ResolutionCandidate@151, ResolutionCandidate@152, ResolutionCandidate@153, ... }
+ResolutionTaskHolder@145 {
+    <name not found> = ArrayList@146[7] { ResolutionCandidate@147, ResolutionCandidate@148, ResolutionCandidate@149, ... }
+}
+
+ResolutionTaskHolder@150 {
+    <name not found> = ArrayList@151[7] { ResolutionCandidate@152, ResolutionCandidate@153, ResolutionCandidate@154, ... }
 }
 
 ResolutionTaskHolder@155 {
     <name not found> = ArrayList@156[7] { ResolutionCandidate@157, ResolutionCandidate@158, ResolutionCandidate@159, ... }
-    <name not found> = ArrayList@160[7] { ResolutionCandidate@157, ResolutionCandidate@158, ResolutionCandidate@159, ... }
 }
 
-ResolutionTaskHolder@161 {
-    <name not found> = ArrayList@162[7] { ResolutionCandidate@163, ResolutionCandidate@164, ResolutionCandidate@165, ... }
-    <name not found> = ArrayList@166[7] { ResolutionCandidate@163, ResolutionCandidate@164, ResolutionCandidate@165, ... }
+ResolutionTaskHolder@160 {
+    <name not found> = ArrayList@161[7] { ResolutionCandidate@162, ResolutionCandidate@163, ResolutionCandidate@164, ... }
 }
 
-ResolutionTaskHolder@167 {
-    <name not found> = ArrayList@168[7] { ResolutionCandidate@169, ResolutionCandidate@170, ResolutionCandidate@171, ... }
-    <name not found> = ArrayList@172[7] { ResolutionCandidate@169, ResolutionCandidate@170, ResolutionCandidate@171, ... }
+ResolutionTaskHolder@165 {
+    <name not found> = ArrayList@166[8] { ResolutionCandidate@167, ResolutionCandidate@168, ResolutionCandidate@169, ... }
 }
 
-ResolutionTaskHolder@173 {
-    <name not found> = ArrayList@174[7] { ResolutionCandidate@175, ResolutionCandidate@176, ResolutionCandidate@177, ... }
-    <name not found> = ArrayList@178[7] { ResolutionCandidate@175, ResolutionCandidate@176, ResolutionCandidate@177, ... }
+ResolutionTaskHolder@170 {
+    <name not found> = ArrayList@171[8] { ResolutionCandidate@172, ResolutionCandidate@173, ResolutionCandidate@174, ... }
 }
 
-ResolutionTaskHolder@179 {
-    <name not found> = ArrayList@180[7] { ResolutionCandidate@181, ResolutionCandidate@182, ResolutionCandidate@183, ... }
-    <name not found> = ArrayList@184[7] { ResolutionCandidate@181, ResolutionCandidate@182, ResolutionCandidate@183, ... }
+ResolutionTaskHolder@175 {
+    <name not found> = ArrayList@176[8] { ResolutionCandidate@177, ResolutionCandidate@178, ResolutionCandidate@179, ... }
 }
 
-ResolutionTaskHolder@185 {
-    <name not found> = ArrayList@186[7] { ResolutionCandidate@187, ResolutionCandidate@188, ResolutionCandidate@189, ... }
-    <name not found> = ArrayList@190[7] { ResolutionCandidate@187, ResolutionCandidate@188, ResolutionCandidate@189, ... }
+ResolutionTaskHolder@180 {
+    <name not found> = ArrayList@181[8] { ResolutionCandidate@182, ResolutionCandidate@183, ResolutionCandidate@184, ... }
 }
 
-ResolutionTaskHolder@191 {
-    <name not found> = ArrayList@192[7] { ResolutionCandidate@193, ResolutionCandidate@194, ResolutionCandidate@195, ... }
-    <name not found> = ArrayList@196[7] { ResolutionCandidate@193, ResolutionCandidate@194, ResolutionCandidate@195, ... }
-}
-
-ResolutionTaskHolder@197 {
-    <name not found> = ArrayList@198[8] { ResolutionCandidate@199, ResolutionCandidate@200, ResolutionCandidate@201, ... }
-    <name not found> = ArrayList@202[8] { ResolutionCandidate@199, ResolutionCandidate@200, ResolutionCandidate@201, ... }
-}
-
-ResolutionTaskHolder@203 {
-    <name not found> = ArrayList@204[8] { ResolutionCandidate@205, ResolutionCandidate@206, ResolutionCandidate@207, ... }
-    <name not found> = ArrayList@208[8] { ResolutionCandidate@205, ResolutionCandidate@206, ResolutionCandidate@207, ... }
-}
-
-ResolutionTaskHolder@209 {
-    <name not found> = ArrayList@210[8] { ResolutionCandidate@211, ResolutionCandidate@212, ResolutionCandidate@213, ... }
-    <name not found> = ArrayList@214[8] { ResolutionCandidate@211, ResolutionCandidate@212, ResolutionCandidate@213, ... }
-}
-
-ResolutionTaskHolder@215 {
-    <name not found> = ArrayList@216[8] { ResolutionCandidate@217, ResolutionCandidate@218, ResolutionCandidate@219, ... }
-    <name not found> = ArrayList@220[8] { ResolutionCandidate@217, ResolutionCandidate@218, ResolutionCandidate@219, ... }
+null {
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@189[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@192[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@194[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@196[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@197[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@198[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@200[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@201[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@202[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@203[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@204[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@205[7] { ResolutionCandidate@137, ResolutionCandidate@138, ResolutionCandidate@139, ... }
+    <name not found> = ArrayList@206[7] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
+    <name not found> = ArrayList@207[7] { ResolutionCandidate@152, ResolutionCandidate@153, ResolutionCandidate@154, ... }
+    <name not found> = ArrayList@208[7] { ResolutionCandidate@112, ResolutionCandidate@113, ResolutionCandidate@114, ... }
+    <name not found> = ArrayList@209[7] { ResolutionCandidate@147, ResolutionCandidate@148, ResolutionCandidate@149, ... }
+    <name not found> = ArrayList@210[7] { ResolutionCandidate@117, ResolutionCandidate@118, ResolutionCandidate@119, ... }
+    <name not found> = ArrayList@211[7] { ResolutionCandidate@157, ResolutionCandidate@158, ResolutionCandidate@159, ... }
+    <name not found> = ArrayList@212[7] { ResolutionCandidate@127, ResolutionCandidate@128, ResolutionCandidate@129, ... }
+    <name not found> = ArrayList@213[7] { ResolutionCandidate@132, ResolutionCandidate@133, ResolutionCandidate@134, ... }
+    <name not found> = ArrayList@214[7] { ResolutionCandidate@162, ResolutionCandidate@163, ResolutionCandidate@164, ... }
+    <name not found> = ArrayList@215[7] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
+    <name not found> = ArrayList@216[7] { ResolutionCandidate@142, ResolutionCandidate@143, ResolutionCandidate@144, ... }
+    <name not found> = ArrayList@217[8] { ResolutionCandidate@177, ResolutionCandidate@178, ResolutionCandidate@179, ... }
+    <name not found> = ArrayList@218[8] { ResolutionCandidate@172, ResolutionCandidate@173, ResolutionCandidate@174, ... }
+    <name not found> = ArrayList@219[8] { ResolutionCandidate@167, ResolutionCandidate@168, ResolutionCandidate@169, ... }
+    <name not found> = ArrayList@220[8] { ResolutionCandidate@182, ResolutionCandidate@183, ResolutionCandidate@184, ... }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/evaluate/numberBinaryOperationsInfixCall.lazy.log b/compiler/testData/diagnostics/tests/evaluate/numberBinaryOperationsInfixCall.lazy.log
index b9c12da3536..58ba338c798 100644
--- a/compiler/testData/diagnostics/tests/evaluate/numberBinaryOperationsInfixCall.lazy.log
+++ b/compiler/testData/diagnostics/tests/evaluate/numberBinaryOperationsInfixCall.lazy.log
@@ -65,244 +65,247 @@ LazyJavaPackageFragment@15['lang'] {
 
 ResolutionTaskHolder@45 {
     <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
 ResolutionTaskHolder@57 {
     <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
 ResolutionTaskHolder@69 {
     <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
 ResolutionTaskHolder@81 {
     <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
 ResolutionTaskHolder@93 {
     <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
 }
 
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
+}
+
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
 }
 
 ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+    <name not found> = ArrayList@106[7] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
 }
 
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[7] { ResolutionCandidate@112, ResolutionCandidate@113, ResolutionCandidate@114, ... }
 }
 
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
+ResolutionTaskHolder@115 {
+    <name not found> = ArrayList@116[7] { ResolutionCandidate@117, ResolutionCandidate@118, ResolutionCandidate@119, ... }
 }
 
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
+ResolutionTaskHolder@120 {
+    <name not found> = ArrayList@121[7] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
 }
 
 ResolutionTaskHolder@125 {
     <name not found> = ArrayList@126[7] { ResolutionCandidate@127, ResolutionCandidate@128, ResolutionCandidate@129, ... }
-    <name not found> = ArrayList@130[7] { ResolutionCandidate@127, ResolutionCandidate@128, ResolutionCandidate@129, ... }
 }
 
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[7] { ResolutionCandidate@133, ResolutionCandidate@134, ResolutionCandidate@135, ... }
-    <name not found> = ArrayList@136[7] { ResolutionCandidate@133, ResolutionCandidate@134, ResolutionCandidate@135, ... }
+ResolutionTaskHolder@130 {
+    <name not found> = ArrayList@131[7] { ResolutionCandidate@132, ResolutionCandidate@133, ResolutionCandidate@134, ... }
 }
 
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[7] { ResolutionCandidate@139, ResolutionCandidate@140, ResolutionCandidate@141, ... }
-    <name not found> = ArrayList@142[7] { ResolutionCandidate@139, ResolutionCandidate@140, ResolutionCandidate@141, ... }
+ResolutionTaskHolder@135 {
+    <name not found> = ArrayList@136[7] { ResolutionCandidate@137, ResolutionCandidate@138, ResolutionCandidate@139, ... }
 }
 
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[7] { ResolutionCandidate@145, ResolutionCandidate@146, ResolutionCandidate@147, ... }
-    <name not found> = ArrayList@148[7] { ResolutionCandidate@145, ResolutionCandidate@146, ResolutionCandidate@147, ... }
+ResolutionTaskHolder@140 {
+    <name not found> = ArrayList@141[7] { ResolutionCandidate@142, ResolutionCandidate@143, ResolutionCandidate@144, ... }
 }
 
-ResolutionTaskHolder@149 {
-    <name not found> = ArrayList@150[7] { ResolutionCandidate@151, ResolutionCandidate@152, ResolutionCandidate@153, ... }
-    <name not found> = ArrayList@154[7] { ResolutionCandidate@151, ResolutionCandidate@152, ResolutionCandidate@153, ... }
+ResolutionTaskHolder@145 {
+    <name not found> = ArrayList@146[7] { ResolutionCandidate@147, ResolutionCandidate@148, ResolutionCandidate@149, ... }
+}
+
+ResolutionTaskHolder@150 {
+    <name not found> = ArrayList@151[7] { ResolutionCandidate@152, ResolutionCandidate@153, ResolutionCandidate@154, ... }
 }
 
 ResolutionTaskHolder@155 {
     <name not found> = ArrayList@156[7] { ResolutionCandidate@157, ResolutionCandidate@158, ResolutionCandidate@159, ... }
-    <name not found> = ArrayList@160[7] { ResolutionCandidate@157, ResolutionCandidate@158, ResolutionCandidate@159, ... }
 }
 
-ResolutionTaskHolder@161 {
-    <name not found> = ArrayList@162[7] { ResolutionCandidate@163, ResolutionCandidate@164, ResolutionCandidate@165, ... }
-    <name not found> = ArrayList@166[7] { ResolutionCandidate@163, ResolutionCandidate@164, ResolutionCandidate@165, ... }
+ResolutionTaskHolder@160 {
+    <name not found> = ArrayList@161[7] { ResolutionCandidate@162, ResolutionCandidate@163, ResolutionCandidate@164, ... }
 }
 
-ResolutionTaskHolder@167 {
-    <name not found> = ArrayList@168[7] { ResolutionCandidate@169, ResolutionCandidate@170, ResolutionCandidate@171, ... }
-    <name not found> = ArrayList@172[7] { ResolutionCandidate@169, ResolutionCandidate@170, ResolutionCandidate@171, ... }
+ResolutionTaskHolder@165 {
+    <name not found> = ArrayList@166[8] { ResolutionCandidate@167, ResolutionCandidate@168, ResolutionCandidate@169, ... }
 }
 
-ResolutionTaskHolder@173 {
-    <name not found> = ArrayList@174[7] { ResolutionCandidate@175, ResolutionCandidate@176, ResolutionCandidate@177, ... }
-    <name not found> = ArrayList@178[7] { ResolutionCandidate@175, ResolutionCandidate@176, ResolutionCandidate@177, ... }
+ResolutionTaskHolder@170 {
+    <name not found> = ArrayList@171[8] { ResolutionCandidate@172, ResolutionCandidate@173, ResolutionCandidate@174, ... }
 }
 
-ResolutionTaskHolder@179 {
-    <name not found> = ArrayList@180[7] { ResolutionCandidate@181, ResolutionCandidate@182, ResolutionCandidate@183, ... }
-    <name not found> = ArrayList@184[7] { ResolutionCandidate@181, ResolutionCandidate@182, ResolutionCandidate@183, ... }
+ResolutionTaskHolder@175 {
+    <name not found> = ArrayList@176[8] { ResolutionCandidate@177, ResolutionCandidate@178, ResolutionCandidate@179, ... }
 }
 
-ResolutionTaskHolder@185 {
-    <name not found> = ArrayList@186[7] { ResolutionCandidate@187, ResolutionCandidate@188, ResolutionCandidate@189, ... }
-    <name not found> = ArrayList@190[7] { ResolutionCandidate@187, ResolutionCandidate@188, ResolutionCandidate@189, ... }
+ResolutionTaskHolder@180 {
+    <name not found> = ArrayList@181[8] { ResolutionCandidate@182, ResolutionCandidate@183, ResolutionCandidate@184, ... }
 }
 
-ResolutionTaskHolder@191 {
-    <name not found> = ArrayList@192[7] { ResolutionCandidate@193, ResolutionCandidate@194, ResolutionCandidate@195, ... }
-    <name not found> = ArrayList@196[7] { ResolutionCandidate@193, ResolutionCandidate@194, ResolutionCandidate@195, ... }
-}
-
-ResolutionTaskHolder@197 {
-    <name not found> = ArrayList@198[8] { ResolutionCandidate@199, ResolutionCandidate@200, ResolutionCandidate@201, ... }
-    <name not found> = ArrayList@202[8] { ResolutionCandidate@199, ResolutionCandidate@200, ResolutionCandidate@201, ... }
-}
-
-ResolutionTaskHolder@203 {
-    <name not found> = ArrayList@204[8] { ResolutionCandidate@205, ResolutionCandidate@206, ResolutionCandidate@207, ... }
-    <name not found> = ArrayList@208[8] { ResolutionCandidate@205, ResolutionCandidate@206, ResolutionCandidate@207, ... }
-}
-
-ResolutionTaskHolder@209 {
-    <name not found> = ArrayList@210[8] { ResolutionCandidate@211, ResolutionCandidate@212, ResolutionCandidate@213, ... }
-    <name not found> = ArrayList@214[8] { ResolutionCandidate@211, ResolutionCandidate@212, ResolutionCandidate@213, ... }
-}
-
-ResolutionTaskHolder@215 {
-    <name not found> = ArrayList@216[8] { ResolutionCandidate@217, ResolutionCandidate@218, ResolutionCandidate@219, ... }
-    <name not found> = ArrayList@220[8] { ResolutionCandidate@217, ResolutionCandidate@218, ResolutionCandidate@219, ... }
+null {
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@189[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@192[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@194[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@196[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@197[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@198[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@200[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@201[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@202[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@203[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@204[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@205[7] { ResolutionCandidate@137, ResolutionCandidate@138, ResolutionCandidate@139, ... }
+    <name not found> = ArrayList@206[7] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
+    <name not found> = ArrayList@207[7] { ResolutionCandidate@112, ResolutionCandidate@113, ResolutionCandidate@114, ... }
+    <name not found> = ArrayList@208[7] { ResolutionCandidate@117, ResolutionCandidate@118, ResolutionCandidate@119, ... }
+    <name not found> = ArrayList@209[7] { ResolutionCandidate@157, ResolutionCandidate@158, ResolutionCandidate@159, ... }
+    <name not found> = ArrayList@210[7] { ResolutionCandidate@162, ResolutionCandidate@163, ResolutionCandidate@164, ... }
+    <name not found> = ArrayList@211[7] { ResolutionCandidate@132, ResolutionCandidate@133, ResolutionCandidate@134, ... }
+    <name not found> = ArrayList@212[7] { ResolutionCandidate@127, ResolutionCandidate@128, ResolutionCandidate@129, ... }
+    <name not found> = ArrayList@213[7] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
+    <name not found> = ArrayList@214[7] { ResolutionCandidate@147, ResolutionCandidate@148, ResolutionCandidate@149, ... }
+    <name not found> = ArrayList@215[7] { ResolutionCandidate@142, ResolutionCandidate@143, ResolutionCandidate@144, ... }
+    <name not found> = ArrayList@216[7] { ResolutionCandidate@152, ResolutionCandidate@153, ResolutionCandidate@154, ... }
+    <name not found> = ArrayList@217[8] { ResolutionCandidate@167, ResolutionCandidate@168, ResolutionCandidate@169, ... }
+    <name not found> = ArrayList@218[8] { ResolutionCandidate@177, ResolutionCandidate@178, ResolutionCandidate@179, ... }
+    <name not found> = ArrayList@219[8] { ResolutionCandidate@182, ResolutionCandidate@183, ResolutionCandidate@184, ... }
+    <name not found> = ArrayList@220[8] { ResolutionCandidate@172, ResolutionCandidate@173, ResolutionCandidate@174, ... }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/evaluate/otherOverflow.lazy.log b/compiler/testData/diagnostics/tests/evaluate/otherOverflow.lazy.log
index 5c58df20797..c11d2ebe0e7 100644
--- a/compiler/testData/diagnostics/tests/evaluate/otherOverflow.lazy.log
+++ b/compiler/testData/diagnostics/tests/evaluate/otherOverflow.lazy.log
@@ -30,70 +30,73 @@ LazyJavaPackageFragment@10['java'] {
 
 ResolutionTaskHolder@26 {
     <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
 }
 
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
+ResolutionTaskHolder@29 {
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
 }
 
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
+}
+
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
 }
 
 ResolutionTaskHolder@38 {
     <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+}
+
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
 }
 
 ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@51[7] { ResolutionCandidate@52, ResolutionCandidate@53, ResolutionCandidate@54, ... }
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[7] { ResolutionCandidate@57, ResolutionCandidate@58, ResolutionCandidate@59, ... }
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[7] { ResolutionCandidate@60, ResolutionCandidate@61, ResolutionCandidate@62, ... }
-    <name not found> = ArrayList@63[7] { ResolutionCandidate@60, ResolutionCandidate@61, ResolutionCandidate@62, ... }
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[7] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64, ... }
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[7] { ResolutionCandidate@66, ResolutionCandidate@67, ResolutionCandidate@68, ... }
-    <name not found> = ArrayList@69[7] { ResolutionCandidate@66, ResolutionCandidate@67, ResolutionCandidate@68, ... }
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[7] { ResolutionCandidate@67, ResolutionCandidate@68, ResolutionCandidate@69, ... }
 }
 
 ResolutionTaskHolder@70 {
     <name not found> = ArrayList@71[7] { ResolutionCandidate@72, ResolutionCandidate@73, ResolutionCandidate@74, ... }
-    <name not found> = ArrayList@75[7] { ResolutionCandidate@72, ResolutionCandidate@73, ResolutionCandidate@74, ... }
 }
 
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[7] { ResolutionCandidate@78, ResolutionCandidate@79, ResolutionCandidate@80, ... }
-    <name not found> = ArrayList@81[7] { ResolutionCandidate@78, ResolutionCandidate@79, ResolutionCandidate@80, ... }
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[7] { ResolutionCandidate@77, ResolutionCandidate@78, ResolutionCandidate@79, ... }
 }
 
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[7] { ResolutionCandidate@84, ResolutionCandidate@85, ResolutionCandidate@86, ... }
-    <name not found> = ArrayList@87[7] { ResolutionCandidate@84, ResolutionCandidate@85, ResolutionCandidate@86, ... }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[7] { ResolutionCandidate@90, ResolutionCandidate@91, ResolutionCandidate@92, ... }
-    <name not found> = ArrayList@93[7] { ResolutionCandidate@90, ResolutionCandidate@91, ResolutionCandidate@92, ... }
+null {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@28 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@88[7] { ResolutionCandidate@67, ResolutionCandidate@68, ResolutionCandidate@69, ... }
+    <name not found> = ArrayList@89[7] { ResolutionCandidate@72, ResolutionCandidate@73, ResolutionCandidate@74, ... }
+    <name not found> = ArrayList@90[7] { ResolutionCandidate@52, ResolutionCandidate@53, ResolutionCandidate@54, ... }
+    <name not found> = ArrayList@91[7] { ResolutionCandidate@77, ResolutionCandidate@78, ResolutionCandidate@79, ... }
+    <name not found> = ArrayList@92[7] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64, ... }
+    <name not found> = ArrayList@93[7] { ResolutionCandidate@57, ResolutionCandidate@58, ResolutionCandidate@59, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/evaluate/parentesized.lazy.log b/compiler/testData/diagnostics/tests/evaluate/parentesized.lazy.log
index 70ebdd5d0a6..855104588db 100644
--- a/compiler/testData/diagnostics/tests/evaluate/parentesized.lazy.log
+++ b/compiler/testData/diagnostics/tests/evaluate/parentesized.lazy.log
@@ -58,130 +58,133 @@ LazyJavaPackageFragment@25['java'] {
 
 ResolutionTaskHolder@54 {
     <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
+}
+
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
 }
 
 ResolutionTaskHolder@66 {
     <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[7] { ResolutionCandidate@74, ResolutionCandidate@75, ResolutionCandidate@76, ... }
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[7] { ResolutionCandidate@80, ResolutionCandidate@81, ResolutionCandidate@82, ... }
-    <name not found> = ArrayList@83[7] { ResolutionCandidate@80, ResolutionCandidate@81, ResolutionCandidate@82, ... }
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[7] { ResolutionCandidate@79, ResolutionCandidate@80, ResolutionCandidate@81, ... }
 }
 
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[7] { ResolutionCandidate@86, ResolutionCandidate@87, ResolutionCandidate@88, ... }
-    <name not found> = ArrayList@89[7] { ResolutionCandidate@86, ResolutionCandidate@87, ResolutionCandidate@88, ... }
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[7] { ResolutionCandidate@84, ResolutionCandidate@85, ResolutionCandidate@86, ... }
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[7] { ResolutionCandidate@92, ResolutionCandidate@93, ResolutionCandidate@94, ... }
-    <name not found> = ArrayList@95[7] { ResolutionCandidate@92, ResolutionCandidate@93, ResolutionCandidate@94, ... }
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[7] { ResolutionCandidate@89, ResolutionCandidate@90, ResolutionCandidate@91, ... }
 }
 
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[7] { ResolutionCandidate@98, ResolutionCandidate@99, ResolutionCandidate@100, ... }
-    <name not found> = ArrayList@101[7] { ResolutionCandidate@98, ResolutionCandidate@99, ResolutionCandidate@100, ... }
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[7] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
+}
+
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[7] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
 }
 
 ResolutionTaskHolder@102 {
     <name not found> = ArrayList@103[7] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
-    <name not found> = ArrayList@107[7] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
 }
 
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[7] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
-    <name not found> = ArrayList@113[7] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[7] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111, ... }
 }
 
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[7] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
-    <name not found> = ArrayList@119[7] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[7] { ResolutionCandidate@114, ResolutionCandidate@115, ResolutionCandidate@116, ... }
 }
 
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[7] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
-    <name not found> = ArrayList@125[7] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[7] { ResolutionCandidate@119, ResolutionCandidate@120, ResolutionCandidate@121, ... }
 }
 
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[7] { ResolutionCandidate@128, ResolutionCandidate@129, ResolutionCandidate@130, ... }
-    <name not found> = ArrayList@131[7] { ResolutionCandidate@128, ResolutionCandidate@129, ResolutionCandidate@130, ... }
+ResolutionTaskHolder@122 {
+    <name not found> = ArrayList@123[8] { ResolutionCandidate@124, ResolutionCandidate@125, ResolutionCandidate@126, ... }
+}
+
+ResolutionTaskHolder@127 {
+    <name not found> = ArrayList@128[8] { ResolutionCandidate@129, ResolutionCandidate@130, ResolutionCandidate@131, ... }
 }
 
 ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[7] { ResolutionCandidate@134, ResolutionCandidate@135, ResolutionCandidate@136, ... }
-    <name not found> = ArrayList@137[7] { ResolutionCandidate@134, ResolutionCandidate@135, ResolutionCandidate@136, ... }
+    <name not found> = ArrayList@133[8] { ResolutionCandidate@134, ResolutionCandidate@135, ResolutionCandidate@136, ... }
 }
 
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[8] { ResolutionCandidate@140, ResolutionCandidate@141, ResolutionCandidate@142, ... }
-    <name not found> = ArrayList@143[8] { ResolutionCandidate@140, ResolutionCandidate@141, ResolutionCandidate@142, ... }
+ResolutionTaskHolder@137 {
+    <name not found> = ArrayList@138[8] { ResolutionCandidate@139, ResolutionCandidate@140, ResolutionCandidate@141, ... }
 }
 
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[8] { ResolutionCandidate@146, ResolutionCandidate@147, ResolutionCandidate@148, ... }
-    <name not found> = ArrayList@149[8] { ResolutionCandidate@146, ResolutionCandidate@147, ResolutionCandidate@148, ... }
+ResolutionTaskHolder@142 {
+    <name not found> = ArrayList@143[8] { ResolutionCandidate@144, ResolutionCandidate@145, ResolutionCandidate@146, ... }
 }
 
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[8] { ResolutionCandidate@152, ResolutionCandidate@153, ResolutionCandidate@154, ... }
-    <name not found> = ArrayList@155[8] { ResolutionCandidate@152, ResolutionCandidate@153, ResolutionCandidate@154, ... }
+ResolutionTaskHolder@147 {
+    <name not found> = ArrayList@148[8] { ResolutionCandidate@149, ResolutionCandidate@150, ResolutionCandidate@151, ... }
 }
 
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[8] { ResolutionCandidate@158, ResolutionCandidate@159, ResolutionCandidate@160, ... }
-    <name not found> = ArrayList@161[8] { ResolutionCandidate@158, ResolutionCandidate@159, ResolutionCandidate@160, ... }
+ResolutionTaskHolder@152 {
+    <name not found> = ArrayList@153[8] { ResolutionCandidate@154, ResolutionCandidate@155, ResolutionCandidate@156, ... }
+}
+
+ResolutionTaskHolder@157 {
+    <name not found> = ArrayList@158[8] { ResolutionCandidate@159, ResolutionCandidate@160, ResolutionCandidate@161, ... }
 }
 
 ResolutionTaskHolder@162 {
     <name not found> = ArrayList@163[8] { ResolutionCandidate@164, ResolutionCandidate@165, ResolutionCandidate@166, ... }
-    <name not found> = ArrayList@167[8] { ResolutionCandidate@164, ResolutionCandidate@165, ResolutionCandidate@166, ... }
 }
 
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[8] { ResolutionCandidate@170, ResolutionCandidate@171, ResolutionCandidate@172, ... }
-    <name not found> = ArrayList@173[8] { ResolutionCandidate@170, ResolutionCandidate@171, ResolutionCandidate@172, ... }
+ResolutionTaskHolder@167 {
+    <name not found> = ArrayList@168[8] { ResolutionCandidate@169, ResolutionCandidate@170, ResolutionCandidate@171, ... }
 }
 
-ResolutionTaskHolder@174 {
-    <name not found> = ArrayList@175[8] { ResolutionCandidate@176, ResolutionCandidate@177, ResolutionCandidate@178, ... }
-    <name not found> = ArrayList@179[8] { ResolutionCandidate@176, ResolutionCandidate@177, ResolutionCandidate@178, ... }
-}
-
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[8] { ResolutionCandidate@182, ResolutionCandidate@183, ResolutionCandidate@184, ... }
-    <name not found> = ArrayList@185[8] { ResolutionCandidate@182, ResolutionCandidate@183, ResolutionCandidate@184, ... }
-}
-
-ResolutionTaskHolder@186 {
-    <name not found> = ArrayList@187[8] { ResolutionCandidate@188, ResolutionCandidate@189, ResolutionCandidate@190, ... }
-    <name not found> = ArrayList@191[8] { ResolutionCandidate@188, ResolutionCandidate@189, ResolutionCandidate@190, ... }
-}
-
-ResolutionTaskHolder@192 {
-    <name not found> = ArrayList@193[8] { ResolutionCandidate@194, ResolutionCandidate@195, ResolutionCandidate@196, ... }
-    <name not found> = ArrayList@197[8] { ResolutionCandidate@194, ResolutionCandidate@195, ResolutionCandidate@196, ... }
+null {
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@176[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@178[7] { ResolutionCandidate@74, ResolutionCandidate@75, ResolutionCandidate@76, ... }
+    <name not found> = ArrayList@179[7] { ResolutionCandidate@79, ResolutionCandidate@80, ResolutionCandidate@81, ... }
+    <name not found> = ArrayList@180[7] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
+    <name not found> = ArrayList@181[7] { ResolutionCandidate@84, ResolutionCandidate@85, ResolutionCandidate@86, ... }
+    <name not found> = ArrayList@182[7] { ResolutionCandidate@119, ResolutionCandidate@120, ResolutionCandidate@121, ... }
+    <name not found> = ArrayList@183[7] { ResolutionCandidate@89, ResolutionCandidate@90, ResolutionCandidate@91, ... }
+    <name not found> = ArrayList@184[7] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111, ... }
+    <name not found> = ArrayList@185[7] { ResolutionCandidate@114, ResolutionCandidate@115, ResolutionCandidate@116, ... }
+    <name not found> = ArrayList@186[7] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
+    <name not found> = ArrayList@187[7] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
+    <name not found> = ArrayList@188[8] { ResolutionCandidate@154, ResolutionCandidate@155, ResolutionCandidate@156, ... }
+    <name not found> = ArrayList@189[8] { ResolutionCandidate@129, ResolutionCandidate@130, ResolutionCandidate@131, ... }
+    <name not found> = ArrayList@190[8] { ResolutionCandidate@134, ResolutionCandidate@135, ResolutionCandidate@136, ... }
+    <name not found> = ArrayList@191[8] { ResolutionCandidate@139, ResolutionCandidate@140, ResolutionCandidate@141, ... }
+    <name not found> = ArrayList@192[8] { ResolutionCandidate@124, ResolutionCandidate@125, ResolutionCandidate@126, ... }
+    <name not found> = ArrayList@193[8] { ResolutionCandidate@144, ResolutionCandidate@145, ResolutionCandidate@146, ... }
+    <name not found> = ArrayList@194[8] { ResolutionCandidate@159, ResolutionCandidate@160, ResolutionCandidate@161, ... }
+    <name not found> = ArrayList@195[8] { ResolutionCandidate@169, ResolutionCandidate@170, ResolutionCandidate@171, ... }
+    <name not found> = ArrayList@196[8] { ResolutionCandidate@164, ResolutionCandidate@165, ResolutionCandidate@166, ... }
+    <name not found> = ArrayList@197[8] { ResolutionCandidate@149, ResolutionCandidate@150, ResolutionCandidate@151, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/evaluate/qualifiedExpressions.lazy.log b/compiler/testData/diagnostics/tests/evaluate/qualifiedExpressions.lazy.log
index 7237049f3bd..281d8aed2fc 100644
--- a/compiler/testData/diagnostics/tests/evaluate/qualifiedExpressions.lazy.log
+++ b/compiler/testData/diagnostics/tests/evaluate/qualifiedExpressions.lazy.log
@@ -38,26 +38,19 @@ LazyJavaPackageFragment@16['lang'] {
 
 ResolutionTaskHolder@32 {
     <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@28[empty]
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
+ResolutionTaskHolder@41 {
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
@@ -68,9 +61,7 @@ ResolutionTaskHolder@44 {
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
+ResolutionTaskHolder@42 {
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
@@ -80,3 +71,15 @@ ResolutionTaskHolder@45 {
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
+
+null {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@40 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/evaluate/unaryMinusDepOnExpType.lazy.log b/compiler/testData/diagnostics/tests/evaluate/unaryMinusDepOnExpType.lazy.log
index 90a691a2ef3..a9b74567805 100644
--- a/compiler/testData/diagnostics/tests/evaluate/unaryMinusDepOnExpType.lazy.log
+++ b/compiler/testData/diagnostics/tests/evaluate/unaryMinusDepOnExpType.lazy.log
@@ -65,10 +65,6 @@ LazyJavaPackageFragment@15['lang'] {
 
 ResolutionTaskHolder@45 {
     <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
@@ -86,12 +82,8 @@ ResolutionTaskHolder@45 {
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
@@ -109,9 +101,8 @@ ResolutionTaskHolder@49 {
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
@@ -127,6 +118,22 @@ ResolutionTaskHolder@53 {
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
@@ -134,10 +141,6 @@ ResolutionTaskHolder@53 {
 
 ResolutionTaskHolder@57 {
     <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
@@ -155,12 +158,8 @@ ResolutionTaskHolder@57 {
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
@@ -178,9 +177,8 @@ ResolutionTaskHolder@61 {
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
@@ -196,6 +194,22 @@ ResolutionTaskHolder@65 {
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
@@ -203,10 +217,6 @@ ResolutionTaskHolder@65 {
 
 ResolutionTaskHolder@69 {
     <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
@@ -224,12 +234,8 @@ ResolutionTaskHolder@69 {
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
@@ -247,9 +253,8 @@ ResolutionTaskHolder@73 {
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
@@ -265,6 +270,22 @@ ResolutionTaskHolder@77 {
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
@@ -272,10 +293,6 @@ ResolutionTaskHolder@77 {
 
 ResolutionTaskHolder@81 {
     <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
@@ -293,12 +310,8 @@ ResolutionTaskHolder@81 {
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
@@ -316,10 +329,8 @@ ResolutionTaskHolder@85 {
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
@@ -335,414 +346,406 @@ ResolutionTaskHolder@89 {
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
 ResolutionTaskHolder@93 {
     <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
 ResolutionTaskHolder@105 {
     <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
+ResolutionTaskHolder@111 {
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
 ResolutionTaskHolder@117 {
     <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@120 {
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@127 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@123 {
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
+}
+
+ResolutionTaskHolder@126 {
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
 }
 
 ResolutionTaskHolder@129 {
     <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@131 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@135 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@132 {
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
 }
 
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@139 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@135 {
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
+}
+
+ResolutionTaskHolder@138 {
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
 }
 
 ResolutionTaskHolder@141 {
     <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@143 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@147 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@144 {
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
 }
 
-ResolutionTaskHolder@149 {
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@151 }
+ResolutionTaskHolder@147 {
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
+}
+
+ResolutionTaskHolder@150 {
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
 }
 
 ResolutionTaskHolder@153 {
     <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@155 }
 }
 
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@159 }
+ResolutionTaskHolder@156 {
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
 }
 
-ResolutionTaskHolder@161 {
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@163 }
+ResolutionTaskHolder@159 {
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
+}
+
+ResolutionTaskHolder@162 {
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
 }
 
 ResolutionTaskHolder@165 {
     <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@167 }
 }
 
-ResolutionTaskHolder@169 {
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@171 }
+ResolutionTaskHolder@168 {
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
 }
 
-ResolutionTaskHolder@173 {
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@175 }
+ResolutionTaskHolder@171 {
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
+}
+
+ResolutionTaskHolder@174 {
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
 }
 
 ResolutionTaskHolder@177 {
     <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@179 }
 }
 
-ResolutionTaskHolder@181 {
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@183 }
+ResolutionTaskHolder@180 {
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
 }
 
-ResolutionTaskHolder@185 {
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@187 }
+ResolutionTaskHolder@183 {
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
+}
+
+ResolutionTaskHolder@186 {
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
 }
 
 ResolutionTaskHolder@189 {
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@191 }
+    <name not found> = ArrayList@190[8] { ResolutionCandidate@191, ResolutionCandidate@192, ResolutionCandidate@193, ... }
 }
 
-ResolutionTaskHolder@193 {
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@195 }
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@195 }
+ResolutionTaskHolder@194 {
+    <name not found> = ArrayList@195[8] { ResolutionCandidate@196, ResolutionCandidate@197, ResolutionCandidate@198, ... }
 }
 
-ResolutionTaskHolder@197 {
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@199 }
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@199 }
+ResolutionTaskHolder@199 {
+    <name not found> = ArrayList@200[8] { ResolutionCandidate@201, ResolutionCandidate@202, ResolutionCandidate@203, ... }
 }
 
-ResolutionTaskHolder@201 {
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@203 }
-}
-
-ResolutionTaskHolder@205 {
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@207 }
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@207 }
+ResolutionTaskHolder@204 {
+    <name not found> = ArrayList@205[8] { ResolutionCandidate@206, ResolutionCandidate@207, ResolutionCandidate@208, ... }
 }
 
 ResolutionTaskHolder@209 {
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@211 }
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@211 }
+    <name not found> = ArrayList@210[8] { ResolutionCandidate@211, ResolutionCandidate@212, ResolutionCandidate@213, ... }
 }
 
-ResolutionTaskHolder@213 {
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@215 }
+ResolutionTaskHolder@214 {
+    <name not found> = ArrayList@215[8] { ResolutionCandidate@216, ResolutionCandidate@217, ResolutionCandidate@218, ... }
 }
 
-ResolutionTaskHolder@217 {
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@219 }
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@219 }
+ResolutionTaskHolder@219 {
+    <name not found> = ArrayList@220[8] { ResolutionCandidate@221, ResolutionCandidate@222, ResolutionCandidate@223, ... }
 }
 
-ResolutionTaskHolder@221 {
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@223 }
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@223 }
-}
-
-ResolutionTaskHolder@225 {
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@227 }
+ResolutionTaskHolder@224 {
+    <name not found> = ArrayList@225[8] { ResolutionCandidate@226, ResolutionCandidate@227, ResolutionCandidate@228, ... }
 }
 
 ResolutionTaskHolder@229 {
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@231 }
+    <name not found> = ArrayList@230[8] { ResolutionCandidate@231, ResolutionCandidate@232, ResolutionCandidate@233, ... }
 }
 
-ResolutionTaskHolder@233 {
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@235 }
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@235 }
+ResolutionTaskHolder@234 {
+    <name not found> = ArrayList@235[8] { ResolutionCandidate@236, ResolutionCandidate@237, ResolutionCandidate@238, ... }
 }
 
-ResolutionTaskHolder@237 {
-    <name not found> = ArrayList@238[8] { ResolutionCandidate@239, ResolutionCandidate@240, ResolutionCandidate@241, ... }
-    <name not found> = ArrayList@242[8] { ResolutionCandidate@239, ResolutionCandidate@240, ResolutionCandidate@241, ... }
+ResolutionTaskHolder@239 {
+    <name not found> = ArrayList@240[8] { ResolutionCandidate@241, ResolutionCandidate@242, ResolutionCandidate@243, ... }
 }
 
-ResolutionTaskHolder@243 {
-    <name not found> = ArrayList@244[8] { ResolutionCandidate@245, ResolutionCandidate@246, ResolutionCandidate@247, ... }
-    <name not found> = ArrayList@248[8] { ResolutionCandidate@245, ResolutionCandidate@246, ResolutionCandidate@247, ... }
+ResolutionTaskHolder@244 {
+    <name not found> = ArrayList@245[8] { ResolutionCandidate@246, ResolutionCandidate@247, ResolutionCandidate@248, ... }
 }
 
 ResolutionTaskHolder@249 {
     <name not found> = ArrayList@250[8] { ResolutionCandidate@251, ResolutionCandidate@252, ResolutionCandidate@253, ... }
-    <name not found> = ArrayList@254[8] { ResolutionCandidate@251, ResolutionCandidate@252, ResolutionCandidate@253, ... }
 }
 
-ResolutionTaskHolder@255 {
-    <name not found> = ArrayList@256[8] { ResolutionCandidate@257, ResolutionCandidate@258, ResolutionCandidate@259, ... }
-    <name not found> = ArrayList@260[8] { ResolutionCandidate@257, ResolutionCandidate@258, ResolutionCandidate@259, ... }
+ResolutionTaskHolder@254 {
+    <name not found> = ArrayList@255[8] { ResolutionCandidate@256, ResolutionCandidate@257, ResolutionCandidate@258, ... }
 }
 
-ResolutionTaskHolder@261 {
-    <name not found> = ArrayList@262[8] { ResolutionCandidate@263, ResolutionCandidate@264, ResolutionCandidate@265, ... }
-    <name not found> = ArrayList@266[8] { ResolutionCandidate@263, ResolutionCandidate@264, ResolutionCandidate@265, ... }
+ResolutionTaskHolder@259 {
+    <name not found> = ArrayList@260[8] { ResolutionCandidate@261, ResolutionCandidate@262, ResolutionCandidate@263, ... }
 }
 
-ResolutionTaskHolder@267 {
-    <name not found> = ArrayList@268[8] { ResolutionCandidate@269, ResolutionCandidate@270, ResolutionCandidate@271, ... }
-    <name not found> = ArrayList@272[8] { ResolutionCandidate@269, ResolutionCandidate@270, ResolutionCandidate@271, ... }
+ResolutionTaskHolder@264 {
+    <name not found> = ArrayList@265[8] { ResolutionCandidate@266, ResolutionCandidate@267, ResolutionCandidate@268, ... }
 }
 
-ResolutionTaskHolder@273 {
-    <name not found> = ArrayList@274[8] { ResolutionCandidate@275, ResolutionCandidate@276, ResolutionCandidate@277, ... }
-    <name not found> = ArrayList@278[8] { ResolutionCandidate@275, ResolutionCandidate@276, ResolutionCandidate@277, ... }
+ResolutionTaskHolder@269 {
+    <name not found> = ArrayList@270[8] { ResolutionCandidate@271, ResolutionCandidate@272, ResolutionCandidate@273, ... }
+}
+
+ResolutionTaskHolder@274 {
+    <name not found> = ArrayList@275[8] { ResolutionCandidate@276, ResolutionCandidate@277, ResolutionCandidate@278, ... }
 }
 
 ResolutionTaskHolder@279 {
     <name not found> = ArrayList@280[8] { ResolutionCandidate@281, ResolutionCandidate@282, ResolutionCandidate@283, ... }
-    <name not found> = ArrayList@284[8] { ResolutionCandidate@281, ResolutionCandidate@282, ResolutionCandidate@283, ... }
 }
 
-ResolutionTaskHolder@285 {
-    <name not found> = ArrayList@286[8] { ResolutionCandidate@287, ResolutionCandidate@288, ResolutionCandidate@289, ... }
-    <name not found> = ArrayList@290[8] { ResolutionCandidate@287, ResolutionCandidate@288, ResolutionCandidate@289, ... }
+ResolutionTaskHolder@284 {
+    <name not found> = ArrayList@285[8] { ResolutionCandidate@286, ResolutionCandidate@287, ResolutionCandidate@288, ... }
 }
 
-ResolutionTaskHolder@291 {
-    <name not found> = ArrayList@292[8] { ResolutionCandidate@293, ResolutionCandidate@294, ResolutionCandidate@295, ... }
-    <name not found> = ArrayList@296[8] { ResolutionCandidate@293, ResolutionCandidate@294, ResolutionCandidate@295, ... }
+ResolutionTaskHolder@289 {
+    <name not found> = ArrayList@290[8] { ResolutionCandidate@291, ResolutionCandidate@292, ResolutionCandidate@293, ... }
 }
 
-ResolutionTaskHolder@297 {
-    <name not found> = ArrayList@298[8] { ResolutionCandidate@299, ResolutionCandidate@300, ResolutionCandidate@301, ... }
-    <name not found> = ArrayList@302[8] { ResolutionCandidate@299, ResolutionCandidate@300, ResolutionCandidate@301, ... }
+ResolutionTaskHolder@294 {
+    <name not found> = ArrayList@295[8] { ResolutionCandidate@296, ResolutionCandidate@297, ResolutionCandidate@298, ... }
 }
 
-ResolutionTaskHolder@303 {
-    <name not found> = ArrayList@304[8] { ResolutionCandidate@305, ResolutionCandidate@306, ResolutionCandidate@307, ... }
-    <name not found> = ArrayList@308[8] { ResolutionCandidate@305, ResolutionCandidate@306, ResolutionCandidate@307, ... }
+ResolutionTaskHolder@299 {
+    <name not found> = ArrayList@300[8] { ResolutionCandidate@301, ResolutionCandidate@302, ResolutionCandidate@303, ... }
+}
+
+ResolutionTaskHolder@304 {
+    <name not found> = ArrayList@305[8] { ResolutionCandidate@306, ResolutionCandidate@307, ResolutionCandidate@308, ... }
 }
 
 ResolutionTaskHolder@309 {
     <name not found> = ArrayList@310[8] { ResolutionCandidate@311, ResolutionCandidate@312, ResolutionCandidate@313, ... }
-    <name not found> = ArrayList@314[8] { ResolutionCandidate@311, ResolutionCandidate@312, ResolutionCandidate@313, ... }
 }
 
-ResolutionTaskHolder@315 {
-    <name not found> = ArrayList@316[8] { ResolutionCandidate@317, ResolutionCandidate@318, ResolutionCandidate@319, ... }
-    <name not found> = ArrayList@320[8] { ResolutionCandidate@317, ResolutionCandidate@318, ResolutionCandidate@319, ... }
+ResolutionTaskHolder@314 {
+    <name not found> = ArrayList@315[8] { ResolutionCandidate@316, ResolutionCandidate@317, ResolutionCandidate@318, ... }
 }
 
-ResolutionTaskHolder@321 {
-    <name not found> = ArrayList@322[8] { ResolutionCandidate@323, ResolutionCandidate@324, ResolutionCandidate@325, ... }
-    <name not found> = ArrayList@326[8] { ResolutionCandidate@323, ResolutionCandidate@324, ResolutionCandidate@325, ... }
-}
-
-ResolutionTaskHolder@327 {
-    <name not found> = ArrayList@328[8] { ResolutionCandidate@329, ResolutionCandidate@330, ResolutionCandidate@331, ... }
-    <name not found> = ArrayList@332[8] { ResolutionCandidate@329, ResolutionCandidate@330, ResolutionCandidate@331, ... }
-}
-
-ResolutionTaskHolder@333 {
-    <name not found> = ArrayList@334[8] { ResolutionCandidate@335, ResolutionCandidate@336, ResolutionCandidate@337, ... }
-    <name not found> = ArrayList@338[8] { ResolutionCandidate@335, ResolutionCandidate@336, ResolutionCandidate@337, ... }
-}
-
-ResolutionTaskHolder@339 {
-    <name not found> = ArrayList@340[8] { ResolutionCandidate@341, ResolutionCandidate@342, ResolutionCandidate@343, ... }
-    <name not found> = ArrayList@344[8] { ResolutionCandidate@341, ResolutionCandidate@342, ResolutionCandidate@343, ... }
-}
-
-ResolutionTaskHolder@345 {
-    <name not found> = ArrayList@346[8] { ResolutionCandidate@347, ResolutionCandidate@348, ResolutionCandidate@349, ... }
-    <name not found> = ArrayList@350[8] { ResolutionCandidate@347, ResolutionCandidate@348, ResolutionCandidate@349, ... }
-}
-
-ResolutionTaskHolder@351 {
-    <name not found> = ArrayList@352[8] { ResolutionCandidate@353, ResolutionCandidate@354, ResolutionCandidate@355, ... }
-    <name not found> = ArrayList@356[8] { ResolutionCandidate@353, ResolutionCandidate@354, ResolutionCandidate@355, ... }
-}
-
-ResolutionTaskHolder@357 {
-    <name not found> = ArrayList@358[8] { ResolutionCandidate@359, ResolutionCandidate@360, ResolutionCandidate@361, ... }
-    <name not found> = ArrayList@362[8] { ResolutionCandidate@359, ResolutionCandidate@360, ResolutionCandidate@361, ... }
-}
-
-ResolutionTaskHolder@363 {
-    <name not found> = ArrayList@364[8] { ResolutionCandidate@365, ResolutionCandidate@366, ResolutionCandidate@367, ... }
-    <name not found> = ArrayList@368[8] { ResolutionCandidate@365, ResolutionCandidate@366, ResolutionCandidate@367, ... }
-}
-
-ResolutionTaskHolder@369 {
-    <name not found> = ArrayList@370[8] { ResolutionCandidate@371, ResolutionCandidate@372, ResolutionCandidate@373, ... }
-    <name not found> = ArrayList@374[8] { ResolutionCandidate@371, ResolutionCandidate@372, ResolutionCandidate@373, ... }
-}
-
-ResolutionTaskHolder@375 {
-    <name not found> = ArrayList@376[8] { ResolutionCandidate@377, ResolutionCandidate@378, ResolutionCandidate@379, ... }
-    <name not found> = ArrayList@380[8] { ResolutionCandidate@377, ResolutionCandidate@378, ResolutionCandidate@379, ... }
-}
-
-ResolutionTaskHolder@381 {
-    <name not found> = ArrayList@382[8] { ResolutionCandidate@383, ResolutionCandidate@384, ResolutionCandidate@385, ... }
-    <name not found> = ArrayList@386[8] { ResolutionCandidate@383, ResolutionCandidate@384, ResolutionCandidate@385, ... }
-}
-
-ResolutionTaskHolder@387 {
-    <name not found> = ArrayList@388[8] { ResolutionCandidate@389, ResolutionCandidate@390, ResolutionCandidate@391, ... }
-    <name not found> = ArrayList@392[8] { ResolutionCandidate@389, ResolutionCandidate@390, ResolutionCandidate@391, ... }
+null {
+    <name not found> = ArrayList@319[1] { ResolutionCandidate@149 }
+    <name not found> = ArrayList@320[1] { ResolutionCandidate@164 }
+    <name not found> = ArrayList@321[1] { ResolutionCandidate@137 }
+    <name not found> = ArrayList@322[1] { ResolutionCandidate@167 }
+    <name not found> = ArrayList@323[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@324[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@325[1] { ResolutionCandidate@128 }
+    <name not found> = ArrayList@326[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@327[1] { ResolutionCandidate@179 }
+    <name not found> = ArrayList@328[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@329[1] { ResolutionCandidate@182 }
+    <name not found> = ArrayList@330[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@331[1] { ResolutionCandidate@140 }
+    <name not found> = ArrayList@332[1] { ResolutionCandidate@122 }
+    <name not found> = ArrayList@333[1] { ResolutionCandidate@113 }
+    <name not found> = ArrayList@334[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@335[1] { ResolutionCandidate@185 }
+    <name not found> = ArrayList@336[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@337[1] { ResolutionCandidate@188 }
+    <name not found> = ArrayList@338[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@339[1] { ResolutionCandidate@125 }
+    <name not found> = ArrayList@340[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@341[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@342[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@343[1] { ResolutionCandidate@131 }
+    <name not found> = ArrayList@344[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@345[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@346[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@347[1] { ResolutionCandidate@170 }
+    <name not found> = ArrayList@348[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@349[1] { ResolutionCandidate@176 }
+    <name not found> = ArrayList@350[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@351[1] { ResolutionCandidate@146 }
+    <name not found> = ArrayList@352[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@353[1] { ResolutionCandidate@173 }
+    <name not found> = ArrayList@354[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@355[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@356[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@357[1] { ResolutionCandidate@134 }
+    <name not found> = ArrayList@358[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@359[1] { ResolutionCandidate@161 }
+    <name not found> = ArrayList@360[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@361[1] { ResolutionCandidate@143 }
+    <name not found> = ArrayList@362[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@363[1] { ResolutionCandidate@155 }
+    <name not found> = ArrayList@364[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@365[1] { ResolutionCandidate@152 }
+    <name not found> = ArrayList@366[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@367[8] { ResolutionCandidate@191, ResolutionCandidate@192, ResolutionCandidate@193, ... }
+    <name not found> = ArrayList@368[8] { ResolutionCandidate@276, ResolutionCandidate@277, ResolutionCandidate@278, ... }
+    <name not found> = ArrayList@369[8] { ResolutionCandidate@231, ResolutionCandidate@232, ResolutionCandidate@233, ... }
+    <name not found> = ArrayList@370[8] { ResolutionCandidate@256, ResolutionCandidate@257, ResolutionCandidate@258, ... }
+    <name not found> = ArrayList@371[8] { ResolutionCandidate@206, ResolutionCandidate@207, ResolutionCandidate@208, ... }
+    <name not found> = ArrayList@372[8] { ResolutionCandidate@306, ResolutionCandidate@307, ResolutionCandidate@308, ... }
+    <name not found> = ArrayList@373[8] { ResolutionCandidate@216, ResolutionCandidate@217, ResolutionCandidate@218, ... }
+    <name not found> = ArrayList@374[8] { ResolutionCandidate@271, ResolutionCandidate@272, ResolutionCandidate@273, ... }
+    <name not found> = ArrayList@375[8] { ResolutionCandidate@261, ResolutionCandidate@262, ResolutionCandidate@263, ... }
+    <name not found> = ArrayList@376[8] { ResolutionCandidate@211, ResolutionCandidate@212, ResolutionCandidate@213, ... }
+    <name not found> = ArrayList@377[8] { ResolutionCandidate@311, ResolutionCandidate@312, ResolutionCandidate@313, ... }
+    <name not found> = ArrayList@378[8] { ResolutionCandidate@246, ResolutionCandidate@247, ResolutionCandidate@248, ... }
+    <name not found> = ArrayList@379[8] { ResolutionCandidate@296, ResolutionCandidate@297, ResolutionCandidate@298, ... }
+    <name not found> = ArrayList@380[8] { ResolutionCandidate@196, ResolutionCandidate@197, ResolutionCandidate@198, ... }
+    <name not found> = ArrayList@381[8] { ResolutionCandidate@251, ResolutionCandidate@252, ResolutionCandidate@253, ... }
+    <name not found> = ArrayList@382[8] { ResolutionCandidate@236, ResolutionCandidate@237, ResolutionCandidate@238, ... }
+    <name not found> = ArrayList@383[8] { ResolutionCandidate@266, ResolutionCandidate@267, ResolutionCandidate@268, ... }
+    <name not found> = ArrayList@384[8] { ResolutionCandidate@286, ResolutionCandidate@287, ResolutionCandidate@288, ... }
+    <name not found> = ArrayList@385[8] { ResolutionCandidate@201, ResolutionCandidate@202, ResolutionCandidate@203, ... }
+    <name not found> = ArrayList@386[8] { ResolutionCandidate@241, ResolutionCandidate@242, ResolutionCandidate@243, ... }
+    <name not found> = ArrayList@387[8] { ResolutionCandidate@226, ResolutionCandidate@227, ResolutionCandidate@228, ... }
+    <name not found> = ArrayList@388[8] { ResolutionCandidate@221, ResolutionCandidate@222, ResolutionCandidate@223, ... }
+    <name not found> = ArrayList@389[8] { ResolutionCandidate@281, ResolutionCandidate@282, ResolutionCandidate@283, ... }
+    <name not found> = ArrayList@390[8] { ResolutionCandidate@301, ResolutionCandidate@302, ResolutionCandidate@303, ... }
+    <name not found> = ArrayList@391[8] { ResolutionCandidate@291, ResolutionCandidate@292, ResolutionCandidate@293, ... }
+    <name not found> = ArrayList@392[8] { ResolutionCandidate@316, ResolutionCandidate@317, ResolutionCandidate@318, ... }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/evaluate/unaryMinusIndepWoExpType.lazy.log b/compiler/testData/diagnostics/tests/evaluate/unaryMinusIndepWoExpType.lazy.log
index eef762052c3..a01ce48c379 100644
--- a/compiler/testData/diagnostics/tests/evaluate/unaryMinusIndepWoExpType.lazy.log
+++ b/compiler/testData/diagnostics/tests/evaluate/unaryMinusIndepWoExpType.lazy.log
@@ -95,10 +95,6 @@ LazyJavaPackageFragment@25['lang'] {
 
 ResolutionTaskHolder@67 {
     <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
@@ -116,12 +112,8 @@ ResolutionTaskHolder@67 {
     <name not found> = EmptyList@59[empty]
 }
 
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
@@ -139,9 +131,8 @@ ResolutionTaskHolder@71 {
     <name not found> = EmptyList@59[empty]
 }
 
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
@@ -157,6 +148,22 @@ ResolutionTaskHolder@75 {
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
+}
+
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
@@ -164,10 +171,6 @@ ResolutionTaskHolder@75 {
 
 ResolutionTaskHolder@79 {
     <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
@@ -185,12 +188,8 @@ ResolutionTaskHolder@79 {
     <name not found> = EmptyList@59[empty]
 }
 
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
@@ -208,9 +207,8 @@ ResolutionTaskHolder@83 {
     <name not found> = EmptyList@59[empty]
 }
 
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
@@ -226,6 +224,22 @@ ResolutionTaskHolder@87 {
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
+}
+
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
@@ -233,10 +247,6 @@ ResolutionTaskHolder@87 {
 
 ResolutionTaskHolder@91 {
     <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
@@ -254,12 +264,8 @@ ResolutionTaskHolder@91 {
     <name not found> = EmptyList@59[empty]
 }
 
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
@@ -277,9 +283,8 @@ ResolutionTaskHolder@95 {
     <name not found> = EmptyList@59[empty]
 }
 
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
@@ -295,6 +300,22 @@ ResolutionTaskHolder@99 {
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
+}
+
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
@@ -302,10 +323,6 @@ ResolutionTaskHolder@99 {
 
 ResolutionTaskHolder@103 {
     <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
@@ -323,12 +340,8 @@ ResolutionTaskHolder@103 {
     <name not found> = EmptyList@59[empty]
 }
 
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
@@ -346,9 +359,8 @@ ResolutionTaskHolder@107 {
     <name not found> = EmptyList@59[empty]
 }
 
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@113 }
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
@@ -364,6 +376,22 @@ ResolutionTaskHolder@111 {
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
+}
+
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
@@ -371,10 +399,6 @@ ResolutionTaskHolder@111 {
 
 ResolutionTaskHolder@115 {
     <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@117 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
@@ -392,12 +416,8 @@ ResolutionTaskHolder@115 {
     <name not found> = EmptyList@59[empty]
 }
 
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@121 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
+ResolutionTaskHolder@118 {
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
@@ -415,386 +435,369 @@ ResolutionTaskHolder@119 {
     <name not found> = EmptyList@59[empty]
 }
 
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@125 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
+ResolutionTaskHolder@121 {
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
+}
+
+ResolutionTaskHolder@124 {
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
 }
 
 ResolutionTaskHolder@127 {
     <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@129 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
 }
 
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@133 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
+ResolutionTaskHolder@130 {
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
 }
 
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@137 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
+ResolutionTaskHolder@133 {
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
+}
+
+ResolutionTaskHolder@136 {
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
 }
 
 ResolutionTaskHolder@139 {
     <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@141 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
 }
 
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@145 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
+ResolutionTaskHolder@142 {
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
     <name not found> = EmptyList@59[empty]
 }
 
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@149 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
+ResolutionTaskHolder@145 {
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
     <name not found> = EmptyList@59[empty]
+}
+
+ResolutionTaskHolder@148 {
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
     <name not found> = EmptyList@59[empty]
 }
 
 ResolutionTaskHolder@151 {
     <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@153 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
 }
 
-ResolutionTaskHolder@155 {
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@157 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
+ResolutionTaskHolder@154 {
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
     <name not found> = EmptyList@59[empty]
 }
 
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@161 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
+ResolutionTaskHolder@157 {
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
     <name not found> = EmptyList@59[empty]
+}
+
+ResolutionTaskHolder@160 {
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
     <name not found> = EmptyList@59[empty]
 }
 
 ResolutionTaskHolder@163 {
     <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@165 }
-    <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
 }
 
-ResolutionTaskHolder@167 {
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@169 }
-    <name not found> = EmptyList@59[empty]
+ResolutionTaskHolder@166 {
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
     <name not found> = EmptyList@59[empty]
 }
 
-ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@173 }
+ResolutionTaskHolder@169 {
+    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
     <name not found> = EmptyList@59[empty]
+}
+
+ResolutionTaskHolder@172 {
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
     <name not found> = EmptyList@59[empty]
 }
 
 ResolutionTaskHolder@175 {
     <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@177 }
-    <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
 }
 
-ResolutionTaskHolder@179 {
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@181 }
-    <name not found> = EmptyList@59[empty]
+ResolutionTaskHolder@178 {
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
     <name not found> = EmptyList@59[empty]
 }
 
-ResolutionTaskHolder@183 {
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@185 }
+ResolutionTaskHolder@181 {
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
     <name not found> = EmptyList@59[empty]
+}
+
+ResolutionTaskHolder@184 {
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
     <name not found> = EmptyList@59[empty]
 }
 
 ResolutionTaskHolder@187 {
     <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@189 }
-    <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
 }
 
-ResolutionTaskHolder@191 {
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@193 }
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@193 }
-    <name not found> = EmptyList@59[empty]
+ResolutionTaskHolder@190 {
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@192 }
     <name not found> = EmptyList@59[empty]
 }
 
-ResolutionTaskHolder@195 {
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@197 }
+ResolutionTaskHolder@193 {
+    <name not found> = ArrayList@194[1] { ResolutionCandidate@195 }
     <name not found> = EmptyList@59[empty]
+}
+
+ResolutionTaskHolder@196 {
+    <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
     <name not found> = EmptyList@59[empty]
 }
 
 ResolutionTaskHolder@199 {
     <name not found> = ArrayList@200[1] { ResolutionCandidate@201 }
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@201 }
-    <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
 }
 
-ResolutionTaskHolder@203 {
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@205 }
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@205 }
-    <name not found> = EmptyList@59[empty]
+ResolutionTaskHolder@202 {
+    <name not found> = ArrayList@203[1] { ResolutionCandidate@204 }
     <name not found> = EmptyList@59[empty]
 }
 
-ResolutionTaskHolder@207 {
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@209 }
+ResolutionTaskHolder@205 {
+    <name not found> = ArrayList@206[1] { ResolutionCandidate@207 }
     <name not found> = EmptyList@59[empty]
+}
+
+ResolutionTaskHolder@208 {
+    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
     <name not found> = EmptyList@59[empty]
 }
 
 ResolutionTaskHolder@211 {
     <name not found> = ArrayList@212[1] { ResolutionCandidate@213 }
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@213 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
 }
 
-ResolutionTaskHolder@215 {
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@217 }
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@217 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
+ResolutionTaskHolder@214 {
+    <name not found> = ArrayList@215[1] { ResolutionCandidate@216 }
 }
 
-ResolutionTaskHolder@219 {
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@221 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
+ResolutionTaskHolder@217 {
+    <name not found> = ArrayList@218[1] { ResolutionCandidate@219 }
+}
+
+ResolutionTaskHolder@220 {
+    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
 }
 
 ResolutionTaskHolder@223 {
     <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@225 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
 }
 
-ResolutionTaskHolder@227 {
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@229 }
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@229 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
+ResolutionTaskHolder@226 {
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
 }
 
-ResolutionTaskHolder@231 {
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@233 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
+ResolutionTaskHolder@229 {
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
+}
+
+ResolutionTaskHolder@232 {
+    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
 }
 
 ResolutionTaskHolder@235 {
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@237 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
+    <name not found> = ArrayList@236[8] { ResolutionCandidate@237, ResolutionCandidate@238, ResolutionCandidate@239, ... }
 }
 
-ResolutionTaskHolder@239 {
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@241 }
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@241 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
+ResolutionTaskHolder@240 {
+    <name not found> = ArrayList@241[8] { ResolutionCandidate@242, ResolutionCandidate@243, ResolutionCandidate@244, ... }
 }
 
-ResolutionTaskHolder@243 {
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@245 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
+ResolutionTaskHolder@245 {
+    <name not found> = ArrayList@246[8] { ResolutionCandidate@247, ResolutionCandidate@248, ResolutionCandidate@249, ... }
 }
 
-ResolutionTaskHolder@247 {
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@249 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-}
-
-ResolutionTaskHolder@251 {
-    <name not found> = ArrayList@252[1] { ResolutionCandidate@253 }
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@253 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
+ResolutionTaskHolder@250 {
+    <name not found> = ArrayList@251[8] { ResolutionCandidate@252, ResolutionCandidate@253, ResolutionCandidate@254, ... }
 }
 
 ResolutionTaskHolder@255 {
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
-    <name not found> = ArrayList@258[1] { ResolutionCandidate@257 }
+    <name not found> = ArrayList@256[8] { ResolutionCandidate@257, ResolutionCandidate@258, ResolutionCandidate@259, ... }
+}
+
+ResolutionTaskHolder@260 {
+    <name not found> = ArrayList@261[8] { ResolutionCandidate@262, ResolutionCandidate@263, ResolutionCandidate@264, ... }
+}
+
+null {
+    <name not found> = ArrayList@265[1] { ResolutionCandidate@222 }
+    <name not found> = ArrayList@266[1] { ResolutionCandidate@216 }
+    <name not found> = ArrayList@267[1] { ResolutionCandidate@225 }
+    <name not found> = ArrayList@268[1] { ResolutionCandidate@219 }
+    <name not found> = ArrayList@269[1] { ResolutionCandidate@228 }
+    <name not found> = ArrayList@270[1] { ResolutionCandidate@234 }
+    <name not found> = ArrayList@271[1] { ResolutionCandidate@231 }
+    <name not found> = ArrayList@272[1] { ResolutionCandidate@213 }
+    <name not found> = ArrayList@273[1] { ResolutionCandidate@156 }
+    <name not found> = ArrayList@274[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@275[1] { ResolutionCandidate@201 }
+    <name not found> = ArrayList@276[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@277[1] { ResolutionCandidate@204 }
+    <name not found> = ArrayList@278[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@279[1] { ResolutionCandidate@141 }
+    <name not found> = ArrayList@280[1] { ResolutionCandidate@132 }
+    <name not found> = ArrayList@281[1] { ResolutionCandidate@171 }
+    <name not found> = ArrayList@282[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@283[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@284[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@285[1] { ResolutionCandidate@195 }
+    <name not found> = ArrayList@286[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@287[1] { ResolutionCandidate@159 }
+    <name not found> = ArrayList@288[1] { ResolutionCandidate@126 }
+    <name not found> = ArrayList@289[1] { ResolutionCandidate@189 }
+    <name not found> = ArrayList@290[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@291[1] { ResolutionCandidate@210 }
+    <name not found> = ArrayList@292[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@293[1] { ResolutionCandidate@174 }
+    <name not found> = ArrayList@294[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@295[1] { ResolutionCandidate@183 }
+    <name not found> = ArrayList@296[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@297[1] { ResolutionCandidate@162 }
+    <name not found> = ArrayList@298[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@299[1] { ResolutionCandidate@192 }
+    <name not found> = ArrayList@300[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@301[1] { ResolutionCandidate@180 }
+    <name not found> = ArrayList@302[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@303[1] { ResolutionCandidate@207 }
+    <name not found> = ArrayList@304[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@305[1] { ResolutionCandidate@186 }
+    <name not found> = ArrayList@306[1] { ResolutionCandidate@135 }
+    <name not found> = ArrayList@307[1] { ResolutionCandidate@177 }
+    <name not found> = ArrayList@308[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@309[1] { ResolutionCandidate@168 }
+    <name not found> = ArrayList@310[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@311[1] { ResolutionCandidate@198 }
+    <name not found> = ArrayList@312[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@313[1] { ResolutionCandidate@147 }
+    <name not found> = ArrayList@314[1] { ResolutionCandidate@129 }
+    <name not found> = ArrayList@315[1] { ResolutionCandidate@165 }
+    <name not found> = ArrayList@316[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@317[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@318[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@319[1] { ResolutionCandidate@153 }
+    <name not found> = ArrayList@320[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@321[8] { ResolutionCandidate@242, ResolutionCandidate@243, ResolutionCandidate@244, ... }
+    <name not found> = ArrayList@322[8] { ResolutionCandidate@252, ResolutionCandidate@253, ResolutionCandidate@254, ... }
+    <name not found> = ArrayList@323[8] { ResolutionCandidate@262, ResolutionCandidate@263, ResolutionCandidate@264, ... }
+    <name not found> = ArrayList@324[8] { ResolutionCandidate@237, ResolutionCandidate@238, ResolutionCandidate@239, ... }
+    <name not found> = ArrayList@325[8] { ResolutionCandidate@257, ResolutionCandidate@258, ResolutionCandidate@259, ... }
+    <name not found> = ArrayList@326[8] { ResolutionCandidate@247, ResolutionCandidate@248, ResolutionCandidate@249, ... }
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
 }
-
-ResolutionTaskHolder@259 {
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@261 }
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@261 }
-}
-
-ResolutionTaskHolder@263 {
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@265 }
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@265 }
-}
-
-ResolutionTaskHolder@267 {
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
-    <name not found> = ArrayList@270[1] { ResolutionCandidate@269 }
-}
-
-ResolutionTaskHolder@271 {
-    <name not found> = ArrayList@272[1] { ResolutionCandidate@273 }
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@273 }
-}
-
-ResolutionTaskHolder@275 {
-    <name not found> = ArrayList@276[1] { ResolutionCandidate@277 }
-    <name not found> = ArrayList@278[1] { ResolutionCandidate@277 }
-}
-
-ResolutionTaskHolder@279 {
-    <name not found> = ArrayList@280[1] { ResolutionCandidate@281 }
-    <name not found> = ArrayList@282[1] { ResolutionCandidate@281 }
-}
-
-ResolutionTaskHolder@283 {
-    <name not found> = ArrayList@284[1] { ResolutionCandidate@285 }
-    <name not found> = ArrayList@286[1] { ResolutionCandidate@285 }
-}
-
-ResolutionTaskHolder@287 {
-    <name not found> = ArrayList@288[1] { ResolutionCandidate@289 }
-    <name not found> = ArrayList@290[1] { ResolutionCandidate@289 }
-}
-
-ResolutionTaskHolder@291 {
-    <name not found> = ArrayList@292[8] { ResolutionCandidate@293, ResolutionCandidate@294, ResolutionCandidate@295, ... }
-    <name not found> = ArrayList@296[8] { ResolutionCandidate@293, ResolutionCandidate@294, ResolutionCandidate@295, ... }
-}
-
-ResolutionTaskHolder@297 {
-    <name not found> = ArrayList@298[8] { ResolutionCandidate@299, ResolutionCandidate@300, ResolutionCandidate@301, ... }
-    <name not found> = ArrayList@302[8] { ResolutionCandidate@299, ResolutionCandidate@300, ResolutionCandidate@301, ... }
-}
-
-ResolutionTaskHolder@303 {
-    <name not found> = ArrayList@304[8] { ResolutionCandidate@305, ResolutionCandidate@306, ResolutionCandidate@307, ... }
-    <name not found> = ArrayList@308[8] { ResolutionCandidate@305, ResolutionCandidate@306, ResolutionCandidate@307, ... }
-}
-
-ResolutionTaskHolder@309 {
-    <name not found> = ArrayList@310[8] { ResolutionCandidate@311, ResolutionCandidate@312, ResolutionCandidate@313, ... }
-    <name not found> = ArrayList@314[8] { ResolutionCandidate@311, ResolutionCandidate@312, ResolutionCandidate@313, ... }
-}
-
-ResolutionTaskHolder@315 {
-    <name not found> = ArrayList@316[8] { ResolutionCandidate@317, ResolutionCandidate@318, ResolutionCandidate@319, ... }
-    <name not found> = ArrayList@320[8] { ResolutionCandidate@317, ResolutionCandidate@318, ResolutionCandidate@319, ... }
-}
-
-ResolutionTaskHolder@321 {
-    <name not found> = ArrayList@322[8] { ResolutionCandidate@323, ResolutionCandidate@324, ResolutionCandidate@325, ... }
-    <name not found> = ArrayList@326[8] { ResolutionCandidate@323, ResolutionCandidate@324, ResolutionCandidate@325, ... }
-}
diff --git a/compiler/testData/diagnostics/tests/evaluate/unaryMinusIndependentExpType.lazy.log b/compiler/testData/diagnostics/tests/evaluate/unaryMinusIndependentExpType.lazy.log
index a24839fd896..6e50761da8b 100644
--- a/compiler/testData/diagnostics/tests/evaluate/unaryMinusIndependentExpType.lazy.log
+++ b/compiler/testData/diagnostics/tests/evaluate/unaryMinusIndependentExpType.lazy.log
@@ -86,200 +86,203 @@ LazyJavaPackageFragment@41['java'] {
 
 ResolutionTaskHolder@82 {
     <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
 }
 
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
+}
+
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
 }
 
 ResolutionTaskHolder@94 {
     <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
 }
 
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
 }
 
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
+}
+
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
 }
 
 ResolutionTaskHolder@106 {
     <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
 }
 
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
 }
 
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
+}
+
+ResolutionTaskHolder@115 {
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
 }
 
 ResolutionTaskHolder@118 {
     <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
 }
 
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
+ResolutionTaskHolder@121 {
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
 }
 
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
+ResolutionTaskHolder@124 {
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
+}
+
+ResolutionTaskHolder@127 {
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
 }
 
 ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@132 }
+    <name not found> = ArrayList@131[8] { ResolutionCandidate@132, ResolutionCandidate@133, ResolutionCandidate@134, ... }
 }
 
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@136 }
+ResolutionTaskHolder@135 {
+    <name not found> = ArrayList@136[8] { ResolutionCandidate@137, ResolutionCandidate@138, ResolutionCandidate@139, ... }
 }
 
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@140 }
+ResolutionTaskHolder@140 {
+    <name not found> = ArrayList@141[8] { ResolutionCandidate@142, ResolutionCandidate@143, ResolutionCandidate@144, ... }
 }
 
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@144 }
+ResolutionTaskHolder@145 {
+    <name not found> = ArrayList@146[8] { ResolutionCandidate@147, ResolutionCandidate@148, ResolutionCandidate@149, ... }
 }
 
-ResolutionTaskHolder@146 {
-    <name not found> = ArrayList@147[8] { ResolutionCandidate@148, ResolutionCandidate@149, ResolutionCandidate@150, ... }
-    <name not found> = ArrayList@151[8] { ResolutionCandidate@148, ResolutionCandidate@149, ResolutionCandidate@150, ... }
+ResolutionTaskHolder@150 {
+    <name not found> = ArrayList@151[8] { ResolutionCandidate@152, ResolutionCandidate@153, ResolutionCandidate@154, ... }
 }
 
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[8] { ResolutionCandidate@154, ResolutionCandidate@155, ResolutionCandidate@156, ... }
-    <name not found> = ArrayList@157[8] { ResolutionCandidate@154, ResolutionCandidate@155, ResolutionCandidate@156, ... }
+ResolutionTaskHolder@155 {
+    <name not found> = ArrayList@156[8] { ResolutionCandidate@157, ResolutionCandidate@158, ResolutionCandidate@159, ... }
 }
 
-ResolutionTaskHolder@158 {
-    <name not found> = ArrayList@159[8] { ResolutionCandidate@160, ResolutionCandidate@161, ResolutionCandidate@162, ... }
-    <name not found> = ArrayList@163[8] { ResolutionCandidate@160, ResolutionCandidate@161, ResolutionCandidate@162, ... }
+ResolutionTaskHolder@160 {
+    <name not found> = ArrayList@161[8] { ResolutionCandidate@162, ResolutionCandidate@163, ResolutionCandidate@164, ... }
 }
 
-ResolutionTaskHolder@164 {
-    <name not found> = ArrayList@165[8] { ResolutionCandidate@166, ResolutionCandidate@167, ResolutionCandidate@168, ... }
-    <name not found> = ArrayList@169[8] { ResolutionCandidate@166, ResolutionCandidate@167, ResolutionCandidate@168, ... }
+ResolutionTaskHolder@165 {
+    <name not found> = ArrayList@166[8] { ResolutionCandidate@167, ResolutionCandidate@168, ResolutionCandidate@169, ... }
 }
 
 ResolutionTaskHolder@170 {
     <name not found> = ArrayList@171[8] { ResolutionCandidate@172, ResolutionCandidate@173, ResolutionCandidate@174, ... }
-    <name not found> = ArrayList@175[8] { ResolutionCandidate@172, ResolutionCandidate@173, ResolutionCandidate@174, ... }
 }
 
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[8] { ResolutionCandidate@178, ResolutionCandidate@179, ResolutionCandidate@180, ... }
-    <name not found> = ArrayList@181[8] { ResolutionCandidate@178, ResolutionCandidate@179, ResolutionCandidate@180, ... }
+ResolutionTaskHolder@175 {
+    <name not found> = ArrayList@176[8] { ResolutionCandidate@177, ResolutionCandidate@178, ResolutionCandidate@179, ... }
 }
 
-ResolutionTaskHolder@182 {
-    <name not found> = ArrayList@183[8] { ResolutionCandidate@184, ResolutionCandidate@185, ResolutionCandidate@186, ... }
-    <name not found> = ArrayList@187[8] { ResolutionCandidate@184, ResolutionCandidate@185, ResolutionCandidate@186, ... }
+ResolutionTaskHolder@180 {
+    <name not found> = ArrayList@181[8] { ResolutionCandidate@182, ResolutionCandidate@183, ResolutionCandidate@184, ... }
 }
 
-ResolutionTaskHolder@188 {
-    <name not found> = ArrayList@189[8] { ResolutionCandidate@190, ResolutionCandidate@191, ResolutionCandidate@192, ... }
-    <name not found> = ArrayList@193[8] { ResolutionCandidate@190, ResolutionCandidate@191, ResolutionCandidate@192, ... }
+ResolutionTaskHolder@185 {
+    <name not found> = ArrayList@186[8] { ResolutionCandidate@187, ResolutionCandidate@188, ResolutionCandidate@189, ... }
 }
 
-ResolutionTaskHolder@194 {
-    <name not found> = ArrayList@195[8] { ResolutionCandidate@196, ResolutionCandidate@197, ResolutionCandidate@198, ... }
-    <name not found> = ArrayList@199[8] { ResolutionCandidate@196, ResolutionCandidate@197, ResolutionCandidate@198, ... }
+ResolutionTaskHolder@190 {
+    <name not found> = ArrayList@191[8] { ResolutionCandidate@192, ResolutionCandidate@193, ResolutionCandidate@194, ... }
+}
+
+ResolutionTaskHolder@195 {
+    <name not found> = ArrayList@196[8] { ResolutionCandidate@197, ResolutionCandidate@198, ResolutionCandidate@199, ... }
 }
 
 ResolutionTaskHolder@200 {
     <name not found> = ArrayList@201[8] { ResolutionCandidate@202, ResolutionCandidate@203, ResolutionCandidate@204, ... }
-    <name not found> = ArrayList@205[8] { ResolutionCandidate@202, ResolutionCandidate@203, ResolutionCandidate@204, ... }
 }
 
-ResolutionTaskHolder@206 {
-    <name not found> = ArrayList@207[8] { ResolutionCandidate@208, ResolutionCandidate@209, ResolutionCandidate@210, ... }
-    <name not found> = ArrayList@211[8] { ResolutionCandidate@208, ResolutionCandidate@209, ResolutionCandidate@210, ... }
+ResolutionTaskHolder@205 {
+    <name not found> = ArrayList@206[8] { ResolutionCandidate@207, ResolutionCandidate@208, ResolutionCandidate@209, ... }
 }
 
-ResolutionTaskHolder@212 {
-    <name not found> = ArrayList@213[8] { ResolutionCandidate@214, ResolutionCandidate@215, ResolutionCandidate@216, ... }
-    <name not found> = ArrayList@217[8] { ResolutionCandidate@214, ResolutionCandidate@215, ResolutionCandidate@216, ... }
+ResolutionTaskHolder@210 {
+    <name not found> = ArrayList@211[8] { ResolutionCandidate@212, ResolutionCandidate@213, ResolutionCandidate@214, ... }
 }
 
-ResolutionTaskHolder@218 {
-    <name not found> = ArrayList@219[8] { ResolutionCandidate@220, ResolutionCandidate@221, ResolutionCandidate@222, ... }
-    <name not found> = ArrayList@223[8] { ResolutionCandidate@220, ResolutionCandidate@221, ResolutionCandidate@222, ... }
+ResolutionTaskHolder@215 {
+    <name not found> = ArrayList@216[8] { ResolutionCandidate@217, ResolutionCandidate@218, ResolutionCandidate@219, ... }
 }
 
-ResolutionTaskHolder@224 {
-    <name not found> = ArrayList@225[8] { ResolutionCandidate@226, ResolutionCandidate@227, ResolutionCandidate@228, ... }
-    <name not found> = ArrayList@229[8] { ResolutionCandidate@226, ResolutionCandidate@227, ResolutionCandidate@228, ... }
+ResolutionTaskHolder@220 {
+    <name not found> = ArrayList@221[8] { ResolutionCandidate@222, ResolutionCandidate@223, ResolutionCandidate@224, ... }
+}
+
+ResolutionTaskHolder@225 {
+    <name not found> = ArrayList@226[8] { ResolutionCandidate@227, ResolutionCandidate@228, ResolutionCandidate@229, ... }
 }
 
 ResolutionTaskHolder@230 {
     <name not found> = ArrayList@231[8] { ResolutionCandidate@232, ResolutionCandidate@233, ResolutionCandidate@234, ... }
-    <name not found> = ArrayList@235[8] { ResolutionCandidate@232, ResolutionCandidate@233, ResolutionCandidate@234, ... }
 }
 
-ResolutionTaskHolder@236 {
-    <name not found> = ArrayList@237[8] { ResolutionCandidate@238, ResolutionCandidate@239, ResolutionCandidate@240, ... }
-    <name not found> = ArrayList@241[8] { ResolutionCandidate@238, ResolutionCandidate@239, ResolutionCandidate@240, ... }
+ResolutionTaskHolder@235 {
+    <name not found> = ArrayList@236[8] { ResolutionCandidate@237, ResolutionCandidate@238, ResolutionCandidate@239, ... }
 }
 
-ResolutionTaskHolder@242 {
-    <name not found> = ArrayList@243[8] { ResolutionCandidate@244, ResolutionCandidate@245, ResolutionCandidate@246, ... }
-    <name not found> = ArrayList@247[8] { ResolutionCandidate@244, ResolutionCandidate@245, ResolutionCandidate@246, ... }
+ResolutionTaskHolder@240 {
+    <name not found> = ArrayList@241[8] { ResolutionCandidate@242, ResolutionCandidate@243, ResolutionCandidate@244, ... }
 }
 
-ResolutionTaskHolder@248 {
-    <name not found> = ArrayList@249[8] { ResolutionCandidate@250, ResolutionCandidate@251, ResolutionCandidate@252, ... }
-    <name not found> = ArrayList@253[8] { ResolutionCandidate@250, ResolutionCandidate@251, ResolutionCandidate@252, ... }
+ResolutionTaskHolder@245 {
+    <name not found> = ArrayList@246[8] { ResolutionCandidate@247, ResolutionCandidate@248, ResolutionCandidate@249, ... }
 }
 
-ResolutionTaskHolder@254 {
-    <name not found> = ArrayList@255[8] { ResolutionCandidate@256, ResolutionCandidate@257, ResolutionCandidate@258, ... }
-    <name not found> = ArrayList@259[8] { ResolutionCandidate@256, ResolutionCandidate@257, ResolutionCandidate@258, ... }
-}
-
-ResolutionTaskHolder@260 {
-    <name not found> = ArrayList@261[8] { ResolutionCandidate@262, ResolutionCandidate@263, ResolutionCandidate@264, ... }
-    <name not found> = ArrayList@265[8] { ResolutionCandidate@262, ResolutionCandidate@263, ResolutionCandidate@264, ... }
-}
-
-ResolutionTaskHolder@266 {
-    <name not found> = ArrayList@267[8] { ResolutionCandidate@268, ResolutionCandidate@269, ResolutionCandidate@270, ... }
-    <name not found> = ArrayList@271[8] { ResolutionCandidate@268, ResolutionCandidate@269, ResolutionCandidate@270, ... }
-}
-
-ResolutionTaskHolder@272 {
-    <name not found> = ArrayList@273[8] { ResolutionCandidate@274, ResolutionCandidate@275, ResolutionCandidate@276, ... }
-    <name not found> = ArrayList@277[8] { ResolutionCandidate@274, ResolutionCandidate@275, ResolutionCandidate@276, ... }
-}
-
-ResolutionTaskHolder@278 {
-    <name not found> = ArrayList@279[8] { ResolutionCandidate@280, ResolutionCandidate@281, ResolutionCandidate@282, ... }
-    <name not found> = ArrayList@283[8] { ResolutionCandidate@280, ResolutionCandidate@281, ResolutionCandidate@282, ... }
-}
-
-ResolutionTaskHolder@284 {
-    <name not found> = ArrayList@285[8] { ResolutionCandidate@286, ResolutionCandidate@287, ResolutionCandidate@288, ... }
-    <name not found> = ArrayList@289[8] { ResolutionCandidate@286, ResolutionCandidate@287, ResolutionCandidate@288, ... }
+null {
+    <name not found> = ArrayList@250[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@251[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@252[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@253[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@254[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@255[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@256[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@257[1] { ResolutionCandidate@129 }
+    <name not found> = ArrayList@258[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@259[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@260[1] { ResolutionCandidate@126 }
+    <name not found> = ArrayList@261[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@262[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@263[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@264[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@265[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@266[8] { ResolutionCandidate@177, ResolutionCandidate@178, ResolutionCandidate@179, ... }
+    <name not found> = ArrayList@267[8] { ResolutionCandidate@222, ResolutionCandidate@223, ResolutionCandidate@224, ... }
+    <name not found> = ArrayList@268[8] { ResolutionCandidate@147, ResolutionCandidate@148, ResolutionCandidate@149, ... }
+    <name not found> = ArrayList@269[8] { ResolutionCandidate@187, ResolutionCandidate@188, ResolutionCandidate@189, ... }
+    <name not found> = ArrayList@270[8] { ResolutionCandidate@182, ResolutionCandidate@183, ResolutionCandidate@184, ... }
+    <name not found> = ArrayList@271[8] { ResolutionCandidate@137, ResolutionCandidate@138, ResolutionCandidate@139, ... }
+    <name not found> = ArrayList@272[8] { ResolutionCandidate@197, ResolutionCandidate@198, ResolutionCandidate@199, ... }
+    <name not found> = ArrayList@273[8] { ResolutionCandidate@247, ResolutionCandidate@248, ResolutionCandidate@249, ... }
+    <name not found> = ArrayList@274[8] { ResolutionCandidate@167, ResolutionCandidate@168, ResolutionCandidate@169, ... }
+    <name not found> = ArrayList@275[8] { ResolutionCandidate@162, ResolutionCandidate@163, ResolutionCandidate@164, ... }
+    <name not found> = ArrayList@276[8] { ResolutionCandidate@237, ResolutionCandidate@238, ResolutionCandidate@239, ... }
+    <name not found> = ArrayList@277[8] { ResolutionCandidate@212, ResolutionCandidate@213, ResolutionCandidate@214, ... }
+    <name not found> = ArrayList@278[8] { ResolutionCandidate@152, ResolutionCandidate@153, ResolutionCandidate@154, ... }
+    <name not found> = ArrayList@279[8] { ResolutionCandidate@227, ResolutionCandidate@228, ResolutionCandidate@229, ... }
+    <name not found> = ArrayList@280[8] { ResolutionCandidate@202, ResolutionCandidate@203, ResolutionCandidate@204, ... }
+    <name not found> = ArrayList@281[8] { ResolutionCandidate@172, ResolutionCandidate@173, ResolutionCandidate@174, ... }
+    <name not found> = ArrayList@282[8] { ResolutionCandidate@232, ResolutionCandidate@233, ResolutionCandidate@234, ... }
+    <name not found> = ArrayList@283[8] { ResolutionCandidate@157, ResolutionCandidate@158, ResolutionCandidate@159, ... }
+    <name not found> = ArrayList@284[8] { ResolutionCandidate@132, ResolutionCandidate@133, ResolutionCandidate@134, ... }
+    <name not found> = ArrayList@285[8] { ResolutionCandidate@242, ResolutionCandidate@243, ResolutionCandidate@244, ... }
+    <name not found> = ArrayList@286[8] { ResolutionCandidate@142, ResolutionCandidate@143, ResolutionCandidate@144, ... }
+    <name not found> = ArrayList@287[8] { ResolutionCandidate@207, ResolutionCandidate@208, ResolutionCandidate@209, ... }
+    <name not found> = ArrayList@288[8] { ResolutionCandidate@192, ResolutionCandidate@193, ResolutionCandidate@194, ... }
+    <name not found> = ArrayList@289[8] { ResolutionCandidate@217, ResolutionCandidate@218, ResolutionCandidate@219, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/extensions/ExtensionFunctions.lazy.log b/compiler/testData/diagnostics/tests/extensions/ExtensionFunctions.lazy.log
index 7762fa8854b..4d3004c9260 100644
--- a/compiler/testData/diagnostics/tests/extensions/ExtensionFunctions.lazy.log
+++ b/compiler/testData/diagnostics/tests/extensions/ExtensionFunctions.lazy.log
@@ -103,14 +103,14 @@ LazyJavaClassifierType@56['AutoCloseable'] {
     typeConstructor = LazyJavaClassTypeConstructor@12['AutoCloseable']
 }
 
-LazyJavaClassifierType@67['Closeable'] {
+LazyJavaClassifierType@62['Closeable'] {
     arguments = ArrayList@73[empty]
     classifier = JavaClassImpl@74['Closeable']
     memberScope = LazyJavaClassMemberScope@14
     typeConstructor = LazyJavaClassTypeConstructor@16['Closeable']
 }
 
-LazyJavaClassifierType@62['Closeable'] {
+LazyJavaClassifierType@67['Closeable'] {
     arguments = ArrayList@75[empty]
     classifier = JavaClassImpl@76['Closeable']
     memberScope = LazyJavaClassMemberScope@14
@@ -265,7 +265,7 @@ LazyJavaPackageFragmentProvider@110 {
     packageFragments('outer.optval': FqName@177) = null
     topLevelClasses(JavaClassImpl@70['Appendable']) = LazyJavaClassDescriptor@3['Appendable']
     topLevelClasses(JavaClassImpl@72['AutoCloseable']) = LazyJavaClassDescriptor@9['AutoCloseable']
-    topLevelClasses(JavaClassImpl@74['Closeable']) = LazyJavaClassDescriptor@13['Closeable']
+    topLevelClasses(JavaClassImpl@76['Closeable']) = LazyJavaClassDescriptor@13['Closeable']
     topLevelClasses(JavaClassImpl@78['FilterOutputStream']) = LazyJavaClassDescriptor@17['FilterOutputStream']
     topLevelClasses(JavaClassImpl@98['OutputStream']) = LazyJavaClassDescriptor@21['OutputStream']
     topLevelClasses(JavaClassImpl@101['PrintStream']) = LazyJavaClassDescriptor@25['PrintStream']
@@ -305,22 +305,12 @@ LazyJavaPackageFragment@129['lang'] {
 
 ResolutionTaskHolder@196 {
     <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@198 }
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@201 }
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@201 }
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
 }
 
-ResolutionTaskHolder@203 {
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@205 }
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@205 }
-    <name not found> = ArrayList@207[2] { ResolutionCandidate@208, ResolutionCandidate@209 }
-    <name not found> = ArrayList@210[2] { ResolutionCandidate@208, ResolutionCandidate@209 }
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
+ResolutionTaskHolder@201 {
+    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
+    <name not found> = ArrayList@204[2] { ResolutionCandidate@205, ResolutionCandidate@206 }
     <name not found> = EmptyList@5[empty]
     <name not found> = EmptyList@5[empty]
     <name not found> = EmptyList@5[empty]
@@ -353,231 +343,162 @@ ResolutionTaskHolder@203 {
     <name not found> = EmptyList@5[empty]
 }
 
-ResolutionTaskHolder@211 {
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@213 }
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@213 }
-    <name not found> = ArrayList@215[2] { ResolutionCandidate@216, ResolutionCandidate@217 }
-    <name not found> = ArrayList@218[2] { ResolutionCandidate@216, ResolutionCandidate@217 }
+ResolutionTaskHolder@207 {
+    <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
+    <name not found> = ArrayList@210[2] { ResolutionCandidate@211, ResolutionCandidate@212 }
     <name not found> = EmptyList@5[empty]
+}
+
+ResolutionTaskHolder@213 {
+    <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
+    <name not found> = ArrayList@216[2] { ResolutionCandidate@217, ResolutionCandidate@218 }
     <name not found> = EmptyList@5[empty]
 }
 
 ResolutionTaskHolder@219 {
     <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@221 }
-    <name not found> = ArrayList@223[2] { ResolutionCandidate@224, ResolutionCandidate@225 }
-    <name not found> = ArrayList@226[2] { ResolutionCandidate@224, ResolutionCandidate@225 }
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
     <name not found> = EmptyList@5[empty]
     <name not found> = EmptyList@5[empty]
 }
 
-ResolutionTaskHolder@227 {
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@229 }
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@229 }
-    <name not found> = EmptyList@5[empty]
+ResolutionTaskHolder@222 {
+    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
     <name not found> = EmptyList@5[empty]
     <name not found> = EmptyList@5[empty]
     <name not found> = EmptyList@5[empty]
+}
+
+ResolutionTaskHolder@225 {
+    <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
     <name not found> = EmptyList@5[empty]
     <name not found> = EmptyList@5[empty]
+}
+
+ResolutionTaskHolder@228 {
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
     <name not found> = EmptyList@5[empty]
     <name not found> = EmptyList@5[empty]
 }
 
 ResolutionTaskHolder@231 {
     <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@233 }
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
     <name not found> = EmptyList@5[empty]
     <name not found> = EmptyList@5[empty]
 }
 
-ResolutionTaskHolder@235 {
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@237 }
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
+ResolutionTaskHolder@234 {
+    <name not found> = ArrayList@235[1] { ResolutionCandidate@236 }
     <name not found> = EmptyList@5[empty]
     <name not found> = EmptyList@5[empty]
 }
 
-ResolutionTaskHolder@239 {
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@241 }
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@241 }
-    <name not found> = EmptyList@5[empty]
+ResolutionTaskHolder@237 {
+    <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
     <name not found> = EmptyList@5[empty]
     <name not found> = EmptyList@5[empty]
+}
+
+ResolutionTaskHolder@240 {
+    <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
     <name not found> = EmptyList@5[empty]
 }
 
 ResolutionTaskHolder@243 {
     <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@245 }
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
     <name not found> = EmptyList@5[empty]
 }
 
-ResolutionTaskHolder@247 {
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@249 }
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
+ResolutionTaskHolder@246 {
+    <name not found> = ArrayList@247[1] { ResolutionCandidate@248 }
 }
 
-ResolutionTaskHolder@251 {
-    <name not found> = ArrayList@252[1] { ResolutionCandidate@253 }
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@253 }
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
+ResolutionTaskHolder@249 {
+    <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
+}
+
+ResolutionTaskHolder@252 {
+    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
 }
 
 ResolutionTaskHolder@255 {
     <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
-    <name not found> = ArrayList@258[1] { ResolutionCandidate@257 }
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
 }
 
-ResolutionTaskHolder@259 {
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@261 }
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@261 }
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
+ResolutionTaskHolder@258 {
+    <name not found> = ArrayList@259[1] { ResolutionCandidate@260 }
 }
 
-ResolutionTaskHolder@263 {
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@265 }
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@265 }
+ResolutionTaskHolder@261 {
+    <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
+}
+
+ResolutionTaskHolder@264 {
+    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
 }
 
 ResolutionTaskHolder@267 {
     <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
-    <name not found> = ArrayList@270[1] { ResolutionCandidate@269 }
 }
 
-ResolutionTaskHolder@271 {
-    <name not found> = ArrayList@272[1] { ResolutionCandidate@273 }
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@273 }
+ResolutionTaskHolder@270 {
+    <name not found> = ArrayList@271[1] { ResolutionCandidate@272 }
 }
 
-ResolutionTaskHolder@275 {
-    <name not found> = ArrayList@276[1] { ResolutionCandidate@277 }
-    <name not found> = ArrayList@278[1] { ResolutionCandidate@277 }
+ResolutionTaskHolder@273 {
+    <name not found> = ArrayList@274[1] { ResolutionCandidate@275 }
+}
+
+ResolutionTaskHolder@276 {
+    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
 }
 
 ResolutionTaskHolder@279 {
     <name not found> = ArrayList@280[1] { ResolutionCandidate@281 }
-    <name not found> = ArrayList@282[1] { ResolutionCandidate@281 }
 }
 
-ResolutionTaskHolder@283 {
-    <name not found> = ArrayList@284[1] { ResolutionCandidate@285 }
-    <name not found> = ArrayList@286[1] { ResolutionCandidate@285 }
+ResolutionTaskHolder@282 {
+    <name not found> = ArrayList@283[2] { ResolutionCandidate@284, ResolutionCandidate@285 }
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
 }
 
-ResolutionTaskHolder@287 {
-    <name not found> = ArrayList@288[1] { ResolutionCandidate@289 }
-    <name not found> = ArrayList@290[1] { ResolutionCandidate@289 }
+ResolutionTaskHolder@286 {
+    <name not found> = ArrayList@287[3] { ResolutionCandidate@288, ResolutionCandidate@289, ResolutionCandidate@290 }
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
 }
 
 ResolutionTaskHolder@291 {
-    <name not found> = ArrayList@292[1] { ResolutionCandidate@293 }
-    <name not found> = ArrayList@294[1] { ResolutionCandidate@293 }
+    <name not found> = ArrayList@292[3] { ResolutionCandidate@293, ResolutionCandidate@294, ResolutionCandidate@295 }
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
 }
 
-ResolutionTaskHolder@295 {
-    <name not found> = ArrayList@296[1] { ResolutionCandidate@297 }
-    <name not found> = ArrayList@298[1] { ResolutionCandidate@297 }
+ResolutionTaskHolder@296 {
+    <name not found> = ArrayList@297[3] { ResolutionCandidate@298, ResolutionCandidate@299, ResolutionCandidate@300 }
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
 }
 
-ResolutionTaskHolder@299 {
-    <name not found> = ArrayList@300[1] { ResolutionCandidate@301 }
-    <name not found> = ArrayList@302[1] { ResolutionCandidate@301 }
+ResolutionTaskHolder@301 {
+    <name not found> = ArrayList@302[7] { ResolutionCandidate@303, ResolutionCandidate@304, ResolutionCandidate@305, ... }
 }
 
-ResolutionTaskHolder@303 {
-    <name not found> = ArrayList@304[1] { ResolutionCandidate@305 }
-    <name not found> = ArrayList@306[1] { ResolutionCandidate@305 }
-}
-
-ResolutionTaskHolder@307 {
-    <name not found> = ArrayList@308[1] { ResolutionCandidate@309 }
-    <name not found> = ArrayList@310[1] { ResolutionCandidate@309 }
+ResolutionTaskHolder@306 {
+    <name not found> = ArrayList@307[8] { ResolutionCandidate@308, ResolutionCandidate@309, ResolutionCandidate@310, ... }
 }
 
 ResolutionTaskHolder@311 {
-    <name not found> = ArrayList@312[2] { ResolutionCandidate@313, ResolutionCandidate@314 }
-    <name not found> = ArrayList@315[2] { ResolutionCandidate@313, ResolutionCandidate@314 }
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
+    <name not found> = ArrayList@312[9] { ResolutionCandidate@313, ResolutionCandidate@314, ResolutionCandidate@315, ... }
 }
 
 ResolutionTaskHolder@316 {
-    <name not found> = ArrayList@317[3] { ResolutionCandidate@318, ResolutionCandidate@319, ResolutionCandidate@320 }
-    <name not found> = ArrayList@321[3] { ResolutionCandidate@318, ResolutionCandidate@319, ResolutionCandidate@320 }
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-}
-
-ResolutionTaskHolder@322 {
-    <name not found> = ArrayList@323[3] { ResolutionCandidate@324, ResolutionCandidate@325, ResolutionCandidate@326 }
-    <name not found> = ArrayList@327[3] { ResolutionCandidate@324, ResolutionCandidate@325, ResolutionCandidate@326 }
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-}
-
-ResolutionTaskHolder@328 {
-    <name not found> = ArrayList@329[3] { ResolutionCandidate@330, ResolutionCandidate@331, ResolutionCandidate@332 }
-    <name not found> = ArrayList@333[3] { ResolutionCandidate@330, ResolutionCandidate@331, ResolutionCandidate@332 }
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-}
-
-ResolutionTaskHolder@334 {
-    <name not found> = ArrayList@335[7] { ResolutionCandidate@336, ResolutionCandidate@337, ResolutionCandidate@338, ... }
-    <name not found> = ArrayList@339[7] { ResolutionCandidate@336, ResolutionCandidate@337, ResolutionCandidate@338, ... }
-}
-
-ResolutionTaskHolder@340 {
-    <name not found> = ArrayList@341[8] { ResolutionCandidate@342, ResolutionCandidate@343, ResolutionCandidate@344, ... }
-    <name not found> = ArrayList@345[8] { ResolutionCandidate@342, ResolutionCandidate@343, ResolutionCandidate@344, ... }
-}
-
-ResolutionTaskHolder@346 {
-    <name not found> = ArrayList@347[9] { ResolutionCandidate@348, ResolutionCandidate@349, ResolutionCandidate@350, ... }
-    <name not found> = ArrayList@351[9] { ResolutionCandidate@348, ResolutionCandidate@349, ResolutionCandidate@350, ... }
-}
-
-ResolutionTaskHolder@352 {
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
     <name not found> = EmptyList@5[empty]
     <name not found> = EmptyList@5[empty]
     <name not found> = EmptyList@5[empty]
@@ -596,9 +517,7 @@ ResolutionTaskHolder@352 {
     <name not found> = EmptyList@5[empty]
 }
 
-ResolutionTaskHolder@353 {
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
+ResolutionTaskHolder@317 {
     <name not found> = EmptyList@5[empty]
     <name not found> = EmptyList@5[empty]
     <name not found> = EmptyList@5[empty]
@@ -609,7 +528,91 @@ ResolutionTaskHolder@353 {
     <name not found> = EmptyList@5[empty]
 }
 
-ResolutionTaskHolder@354 {
+ResolutionTaskHolder@318 {
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
+}
+
+null {
+    <name not found> = ArrayList@319[1] { ResolutionCandidate@221 }
+    <name not found> = ArrayList@320[1] { ResolutionCandidate@260 }
+    <name not found> = ArrayList@321[1] { ResolutionCandidate@278 }
+    <name not found> = ArrayList@322[1] { ResolutionCandidate@257 }
+    <name not found> = ArrayList@323[1] { ResolutionCandidate@248 }
+    <name not found> = ArrayList@324[1] { ResolutionCandidate@224 }
+    <name not found> = ArrayList@325[1] { ResolutionCandidate@203 }
+    <name not found> = ArrayList@326[1] { ResolutionCandidate@242 }
+    <name not found> = ArrayList@327[1] { ResolutionCandidate@245 }
+    <name not found> = ArrayList@328[1] { ResolutionCandidate@227 }
+    <name not found> = ArrayList@329[1] { ResolutionCandidate@266 }
+    <name not found> = ArrayList@330[1] { ResolutionCandidate@198 }
+    <name not found> = ArrayList@331[1] { ResolutionCandidate@200 }
+    <name not found> = ArrayList@332[1] { ResolutionCandidate@269 }
+    <name not found> = ArrayList@333[1] { ResolutionCandidate@209 }
+    <name not found> = ArrayList@334[1] { ResolutionCandidate@251 }
+    <name not found> = ArrayList@335[1] { ResolutionCandidate@275 }
+    <name not found> = ArrayList@336[1] { ResolutionCandidate@281 }
+    <name not found> = ArrayList@337[1] { ResolutionCandidate@236 }
+    <name not found> = ArrayList@338[1] { ResolutionCandidate@254 }
+    <name not found> = ArrayList@339[1] { ResolutionCandidate@233 }
+    <name not found> = ArrayList@340[1] { ResolutionCandidate@230 }
+    <name not found> = ArrayList@341[1] { ResolutionCandidate@272 }
+    <name not found> = ArrayList@342[1] { ResolutionCandidate@239 }
+    <name not found> = ArrayList@343[1] { ResolutionCandidate@263 }
+    <name not found> = ArrayList@344[1] { ResolutionCandidate@215 }
+    <name not found> = ArrayList@345[2] { ResolutionCandidate@284, ResolutionCandidate@285 }
+    <name not found> = ArrayList@346[2] { ResolutionCandidate@205, ResolutionCandidate@206 }
+    <name not found> = ArrayList@347[2] { ResolutionCandidate@211, ResolutionCandidate@212 }
+    <name not found> = ArrayList@348[2] { ResolutionCandidate@217, ResolutionCandidate@218 }
+    <name not found> = ArrayList@349[3] { ResolutionCandidate@298, ResolutionCandidate@299, ResolutionCandidate@300 }
+    <name not found> = ArrayList@350[3] { ResolutionCandidate@288, ResolutionCandidate@289, ResolutionCandidate@290 }
+    <name not found> = ArrayList@351[3] { ResolutionCandidate@293, ResolutionCandidate@294, ResolutionCandidate@295 }
+    <name not found> = ArrayList@352[7] { ResolutionCandidate@303, ResolutionCandidate@304, ResolutionCandidate@305, ... }
+    <name not found> = ArrayList@353[8] { ResolutionCandidate@308, ResolutionCandidate@309, ResolutionCandidate@310, ... }
+    <name not found> = ArrayList@354[9] { ResolutionCandidate@313, ResolutionCandidate@314, ResolutionCandidate@315, ... }
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
     <name not found> = EmptyList@5[empty]
     <name not found> = EmptyList@5[empty]
     <name not found> = EmptyList@5[empty]
diff --git a/compiler/testData/diagnostics/tests/extensions/ExtensionsCalledOnSuper.lazy.log b/compiler/testData/diagnostics/tests/extensions/ExtensionsCalledOnSuper.lazy.log
index e7bcf9e2ae8..4983e103b8b 100644
--- a/compiler/testData/diagnostics/tests/extensions/ExtensionsCalledOnSuper.lazy.log
+++ b/compiler/testData/diagnostics/tests/extensions/ExtensionsCalledOnSuper.lazy.log
@@ -42,9 +42,7 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@30 {
     <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@34[2] { ResolutionCandidate@35, ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[2] { ResolutionCandidate@35, ResolutionCandidate@36 }
+    <name not found> = ArrayList@33[2] { ResolutionCandidate@34, ResolutionCandidate@35 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
@@ -75,6 +73,35 @@ ResolutionTaskHolder@30 {
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
@@ -83,55 +110,31 @@ ResolutionTaskHolder@30 {
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
 }
 
 ResolutionTaskHolder@42 {
     <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+null {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@49[2] { ResolutionCandidate@34, ResolutionCandidate@35 }
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/extensions/GenericIterator.lazy.log b/compiler/testData/diagnostics/tests/extensions/GenericIterator.lazy.log
index 402ff5575c2..e76d5e3ad7d 100644
--- a/compiler/testData/diagnostics/tests/extensions/GenericIterator.lazy.log
+++ b/compiler/testData/diagnostics/tests/extensions/GenericIterator.lazy.log
@@ -443,35 +443,18 @@ LazyJavaTypeParameterResolver@255 {
 
 ResolutionTaskHolder@256 {
     <name not found> = ArrayList@257[10] { ResolutionCandidate@258, ResolutionCandidate@259, ResolutionCandidate@260, ... }
-    <name not found> = ArrayList@261[10] { ResolutionCandidate@258, ResolutionCandidate@259, ResolutionCandidate@260, ... }
 }
 
-ResolutionTaskHolder@262 {
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@264 }
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@264 }
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@267 }
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@267 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
+ResolutionTaskHolder@261 {
+    <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
+    <name not found> = ArrayList@264[1] { ResolutionCandidate@265 }
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
 }
 
-ResolutionTaskHolder@269 {
-    <name not found> = ArrayList@270[1] { ResolutionCandidate@271 }
-    <name not found> = ArrayList@272[1] { ResolutionCandidate@271 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
+ResolutionTaskHolder@266 {
+    <name not found> = ArrayList@267[1] { ResolutionCandidate@268 }
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
@@ -484,19 +467,8 @@ ResolutionTaskHolder@269 {
     <name not found> = EmptyList@13[empty]
 }
 
-ResolutionTaskHolder@273 {
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@275 }
-    <name not found> = ArrayList@276[1] { ResolutionCandidate@275 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
+ResolutionTaskHolder@269 {
+    <name not found> = ArrayList@270[1] { ResolutionCandidate@271 }
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
@@ -509,130 +481,110 @@ ResolutionTaskHolder@273 {
     <name not found> = EmptyList@13[empty]
 }
 
-ResolutionTaskHolder@277 {
-    <name not found> = ArrayList@278[1] { ResolutionCandidate@279 }
-    <name not found> = ArrayList@280[1] { ResolutionCandidate@279 }
+ResolutionTaskHolder@272 {
+    <name not found> = ArrayList@273[1] { ResolutionCandidate@274 }
     <name not found> = EmptyList@13[empty]
+}
+
+ResolutionTaskHolder@275 {
+    <name not found> = ArrayList@276[1] { ResolutionCandidate@277 }
+    <name not found> = EmptyList@13[empty]
+}
+
+ResolutionTaskHolder@278 {
+    <name not found> = ArrayList@279[1] { ResolutionCandidate@280 }
     <name not found> = EmptyList@13[empty]
 }
 
 ResolutionTaskHolder@281 {
     <name not found> = ArrayList@282[1] { ResolutionCandidate@283 }
-    <name not found> = ArrayList@284[1] { ResolutionCandidate@283 }
-    <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
 }
 
-ResolutionTaskHolder@285 {
-    <name not found> = ArrayList@286[1] { ResolutionCandidate@287 }
-    <name not found> = ArrayList@288[1] { ResolutionCandidate@287 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
+ResolutionTaskHolder@284 {
+    <name not found> = ArrayList@285[1] { ResolutionCandidate@286 }
 }
 
-ResolutionTaskHolder@289 {
-    <name not found> = ArrayList@290[1] { ResolutionCandidate@291 }
-    <name not found> = ArrayList@292[1] { ResolutionCandidate@291 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
+ResolutionTaskHolder@287 {
+    <name not found> = ArrayList@288[1] { ResolutionCandidate@289 }
+}
+
+ResolutionTaskHolder@290 {
+    <name not found> = ArrayList@291[1] { ResolutionCandidate@292 }
 }
 
 ResolutionTaskHolder@293 {
     <name not found> = ArrayList@294[1] { ResolutionCandidate@295 }
-    <name not found> = ArrayList@296[1] { ResolutionCandidate@295 }
 }
 
-ResolutionTaskHolder@297 {
-    <name not found> = ArrayList@298[1] { ResolutionCandidate@299 }
-    <name not found> = ArrayList@300[1] { ResolutionCandidate@299 }
+ResolutionTaskHolder@296 {
+    <name not found> = ArrayList@297[1] { ResolutionCandidate@298 }
 }
 
-ResolutionTaskHolder@301 {
-    <name not found> = ArrayList@302[1] { ResolutionCandidate@303 }
-    <name not found> = ArrayList@304[1] { ResolutionCandidate@303 }
+ResolutionTaskHolder@299 {
+    <name not found> = ArrayList@300[2] { ResolutionCandidate@301, ResolutionCandidate@302 }
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
 }
 
-ResolutionTaskHolder@305 {
-    <name not found> = ArrayList@306[1] { ResolutionCandidate@307 }
-    <name not found> = ArrayList@308[1] { ResolutionCandidate@307 }
+ResolutionTaskHolder@303 {
+    <name not found> = ArrayList@304[2] { ResolutionCandidate@305, ResolutionCandidate@306 }
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
 }
 
-ResolutionTaskHolder@309 {
-    <name not found> = ArrayList@310[1] { ResolutionCandidate@311 }
-    <name not found> = ArrayList@312[1] { ResolutionCandidate@311 }
-}
-
-ResolutionTaskHolder@313 {
-    <name not found> = ArrayList@314[2] { ResolutionCandidate@315, ResolutionCandidate@316 }
-    <name not found> = ArrayList@317[2] { ResolutionCandidate@315, ResolutionCandidate@316 }
+ResolutionTaskHolder@307 {
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
 }
 
-ResolutionTaskHolder@318 {
-    <name not found> = ArrayList@319[2] { ResolutionCandidate@320, ResolutionCandidate@321 }
-    <name not found> = ArrayList@322[2] { ResolutionCandidate@320, ResolutionCandidate@321 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@323 {
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
+ResolutionTaskHolder@308 {
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
@@ -643,9 +595,7 @@ ResolutionTaskHolder@323 {
     <name not found> = EmptyList@13[empty]
 }
 
-ResolutionTaskHolder@324 {
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
+ResolutionTaskHolder@309 {
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
@@ -656,7 +606,60 @@ ResolutionTaskHolder@324 {
     <name not found> = EmptyList@13[empty]
 }
 
-ResolutionTaskHolder@325 {
+null {
+    <name not found> = ArrayList@310[10] { ResolutionCandidate@258, ResolutionCandidate@259, ResolutionCandidate@260, ... }
+    <name not found> = ArrayList@311[1] { ResolutionCandidate@268 }
+    <name not found> = ArrayList@312[1] { ResolutionCandidate@271 }
+    <name not found> = ArrayList@313[1] { ResolutionCandidate@274 }
+    <name not found> = ArrayList@314[1] { ResolutionCandidate@263 }
+    <name not found> = ArrayList@315[1] { ResolutionCandidate@265 }
+    <name not found> = ArrayList@316[1] { ResolutionCandidate@277 }
+    <name not found> = ArrayList@317[1] { ResolutionCandidate@280 }
+    <name not found> = ArrayList@318[1] { ResolutionCandidate@298 }
+    <name not found> = ArrayList@319[1] { ResolutionCandidate@286 }
+    <name not found> = ArrayList@320[1] { ResolutionCandidate@289 }
+    <name not found> = ArrayList@321[1] { ResolutionCandidate@295 }
+    <name not found> = ArrayList@322[1] { ResolutionCandidate@283 }
+    <name not found> = ArrayList@323[1] { ResolutionCandidate@292 }
+    <name not found> = ArrayList@324[2] { ResolutionCandidate@305, ResolutionCandidate@306 }
+    <name not found> = ArrayList@325[2] { ResolutionCandidate@301, ResolutionCandidate@302 }
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
diff --git a/compiler/testData/diagnostics/tests/extensions/GenericIterator2.lazy.log b/compiler/testData/diagnostics/tests/extensions/GenericIterator2.lazy.log
index c7bdaa4dd12..e6cbd0ad4e3 100644
--- a/compiler/testData/diagnostics/tests/extensions/GenericIterator2.lazy.log
+++ b/compiler/testData/diagnostics/tests/extensions/GenericIterator2.lazy.log
@@ -139,17 +139,6 @@ LazyJavaTypeParameterResolver@90 {
 
 ResolutionTaskHolder@91 {
     <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
     <name not found> = EmptyList@14[empty]
     <name not found> = EmptyList@14[empty]
     <name not found> = EmptyList@14[empty]
@@ -162,19 +151,8 @@ ResolutionTaskHolder@91 {
     <name not found> = EmptyList@14[empty]
 }
 
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
     <name not found> = EmptyList@14[empty]
     <name not found> = EmptyList@14[empty]
     <name not found> = EmptyList@14[empty]
@@ -187,31 +165,56 @@ ResolutionTaskHolder@95 {
     <name not found> = EmptyList@14[empty]
 }
 
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
     <name not found> = EmptyList@14[empty]
     <name not found> = EmptyList@14[empty]
 }
 
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
+}
+
 ResolutionTaskHolder@103 {
     <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
 }
 
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
 }
 
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@113 }
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
 }
 
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@117 }
+null {
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@108 }
+    <name not found> = EmptyList@14[empty]
+    <name not found> = EmptyList@14[empty]
+    <name not found> = EmptyList@14[empty]
+    <name not found> = EmptyList@14[empty]
+    <name not found> = EmptyList@14[empty]
+    <name not found> = EmptyList@14[empty]
+    <name not found> = EmptyList@14[empty]
+    <name not found> = EmptyList@14[empty]
+    <name not found> = EmptyList@14[empty]
+    <name not found> = EmptyList@14[empty]
+    <name not found> = EmptyList@14[empty]
+    <name not found> = EmptyList@14[empty]
+    <name not found> = EmptyList@14[empty]
+    <name not found> = EmptyList@14[empty]
+    <name not found> = EmptyList@14[empty]
+    <name not found> = EmptyList@14[empty]
+    <name not found> = EmptyList@14[empty]
+    <name not found> = EmptyList@14[empty]
+    <name not found> = EmptyList@14[empty]
+    <name not found> = EmptyList@14[empty]
+    <name not found> = EmptyList@14[empty]
+    <name not found> = EmptyList@14[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/extensions/classObject.lazy.log b/compiler/testData/diagnostics/tests/extensions/classObject.lazy.log
index 57ee2e21131..ed8f82ac30b 100644
--- a/compiler/testData/diagnostics/tests/extensions/classObject.lazy.log
+++ b/compiler/testData/diagnostics/tests/extensions/classObject.lazy.log
@@ -59,16 +59,6 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@38 {
     <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -110,18 +100,8 @@ ResolutionTaskHolder@38 {
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -163,15 +143,18 @@ ResolutionTaskHolder@42 {
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -182,13 +165,6 @@ ResolutionTaskHolder@46 {
 
 ResolutionTaskHolder@50 {
     <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -197,15 +173,8 @@ ResolutionTaskHolder@50 {
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -214,61 +183,95 @@ ResolutionTaskHolder@54 {
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
     <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
     <name not found> = EmptyList@30[empty]
 }
 
 ResolutionTaskHolder@62 {
     <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
+null {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@40 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/extensions/extensionMemberInClassObject.lazy.log b/compiler/testData/diagnostics/tests/extensions/extensionMemberInClassObject.lazy.log
index b6764eaf557..fc7c8cf28d9 100644
--- a/compiler/testData/diagnostics/tests/extensions/extensionMemberInClassObject.lazy.log
+++ b/compiler/testData/diagnostics/tests/extensions/extensionMemberInClassObject.lazy.log
@@ -58,18 +58,6 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@46 {
     <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
@@ -119,20 +107,8 @@ ResolutionTaskHolder@46 {
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
@@ -182,13 +158,16 @@ ResolutionTaskHolder@50 {
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
@@ -197,27 +176,51 @@ ResolutionTaskHolder@54 {
 
 ResolutionTaskHolder@58 {
     <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+null {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@63 }
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/extensions/kt1875.lazy.log b/compiler/testData/diagnostics/tests/extensions/kt1875.lazy.log
index 6828a31f0a4..bd0bf83cb58 100644
--- a/compiler/testData/diagnostics/tests/extensions/kt1875.lazy.log
+++ b/compiler/testData/diagnostics/tests/extensions/kt1875.lazy.log
@@ -44,12 +44,6 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@36 {
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -75,14 +69,8 @@ ResolutionTaskHolder@36 {
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -108,9 +96,8 @@ ResolutionTaskHolder@40 {
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -134,6 +121,16 @@ ResolutionTaskHolder@44 {
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -143,13 +140,6 @@ ResolutionTaskHolder@44 {
 
 ResolutionTaskHolder@48 {
     <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -159,10 +149,8 @@ ResolutionTaskHolder@48 {
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -172,9 +160,8 @@ ResolutionTaskHolder@52 {
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -182,107 +169,123 @@ ResolutionTaskHolder@56 {
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
 ResolutionTaskHolder@60 {
     <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
+}
+
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
 }
 
 ResolutionTaskHolder@72 {
     <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
 }
 
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
+}
+
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
 }
 
 ResolutionTaskHolder@84 {
     <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
 }
 
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
+}
+
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
 }
 
 ResolutionTaskHolder@96 {
     <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
 }
 
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
+null {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@77 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/extensions/kt2317.lazy.log b/compiler/testData/diagnostics/tests/extensions/kt2317.lazy.log
index 898408555fc..47f6a2adccb 100644
--- a/compiler/testData/diagnostics/tests/extensions/kt2317.lazy.log
+++ b/compiler/testData/diagnostics/tests/extensions/kt2317.lazy.log
@@ -47,42 +47,45 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
 
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
+}
+
 ResolutionTaskHolder@52 {
     <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+null {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@42 }
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/extensions/kt3470.lazy.log b/compiler/testData/diagnostics/tests/extensions/kt3470.lazy.log
index 0de2cdfb282..03fa57e8456 100644
--- a/compiler/testData/diagnostics/tests/extensions/kt3470.lazy.log
+++ b/compiler/testData/diagnostics/tests/extensions/kt3470.lazy.log
@@ -40,29 +40,32 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@27 {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
 }
 
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
+    <name not found> = EmptyList@19[empty]
+}
+
+null {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@32 }
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/extensions/kt3563.lazy.log b/compiler/testData/diagnostics/tests/extensions/kt3563.lazy.log
index 06192613bfc..3564357a649 100644
--- a/compiler/testData/diagnostics/tests/extensions/kt3563.lazy.log
+++ b/compiler/testData/diagnostics/tests/extensions/kt3563.lazy.log
@@ -133,9 +133,6 @@ LazyJavaPackageFragment@67['lang'] {
 
 ResolutionTaskHolder@91 {
     <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
@@ -149,28 +146,34 @@ ResolutionTaskHolder@91 {
     <name not found> = EmptyList@10[empty]
 }
 
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
 }
 
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
-    <name not found> = EmptyList@10[empty]
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
     <name not found> = EmptyList@10[empty]
 }
 
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
+}
+
 ResolutionTaskHolder@103 {
     <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
 }
 
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
+null {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@93 }
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/extensions/kt819ExtensionProperties.lazy.log b/compiler/testData/diagnostics/tests/extensions/kt819ExtensionProperties.lazy.log
index a2f381291c6..8afa66f0d65 100644
--- a/compiler/testData/diagnostics/tests/extensions/kt819ExtensionProperties.lazy.log
+++ b/compiler/testData/diagnostics/tests/extensions/kt819ExtensionProperties.lazy.log
@@ -148,14 +148,14 @@ LazyJavaClassifierType@80['InputStream'] {
 
 LazyJavaClassifierType@83['InputStream'] {
     arguments = ArrayList@84[empty]
-    classifier = JavaClassImpl@82['InputStream']
+    classifier = JavaClassImpl@78['InputStream']
     nullable = 'true': Boolean@85
     typeConstructor = LazyJavaClassTypeConstructor@37['InputStream']
 }
 
 LazyJavaClassifierType@86['InputStream'] {
     arguments = ArrayList@87[empty]
-    classifier = JavaClassImpl@78['InputStream']
+    classifier = JavaClassImpl@82['InputStream']
     nullable = 'true': Boolean@85
     typeConstructor = LazyJavaClassTypeConstructor@37['InputStream']
 }
@@ -203,14 +203,14 @@ LazyJavaClassifierType@102['Reader'] {
 
 LazyJavaClassifierType@105['Reader'] {
     arguments = ArrayList@106[empty]
-    classifier = JavaClassImpl@104['Reader']
+    classifier = JavaClassImpl@101['Reader']
     nullable = 'true': Boolean@85
     typeConstructor = LazyJavaClassTypeConstructor@47['Reader']
 }
 
 LazyJavaClassifierType@107['Reader'] {
     arguments = ArrayList@108[empty]
-    classifier = JavaClassImpl@101['Reader']
+    classifier = JavaClassImpl@104['Reader']
     nullable = 'true': Boolean@85
     typeConstructor = LazyJavaClassTypeConstructor@47['Reader']
 }
@@ -322,48 +322,46 @@ LazyJavaPackageFragment@137['lang'] {
 
 ResolutionTaskHolder@183 {
     <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@185 }
 }
 
-ResolutionTaskHolder@187 {
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@189 }
+ResolutionTaskHolder@186 {
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
 }
 
-ResolutionTaskHolder@191 {
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@193 }
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@193 }
+ResolutionTaskHolder@189 {
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
+}
+
+ResolutionTaskHolder@192 {
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
 }
 
 ResolutionTaskHolder@195 {
     <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@197 }
 }
 
-ResolutionTaskHolder@199 {
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@201 }
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@201 }
+ResolutionTaskHolder@198 {
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
 }
 
-ResolutionTaskHolder@203 {
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@205 }
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@205 }
+ResolutionTaskHolder@201 {
+    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
 }
 
-ResolutionTaskHolder@207 {
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@209 }
+ResolutionTaskHolder@204 {
+    <name not found> = ArrayList@205[2] { ResolutionCandidate@206, ResolutionCandidate@207 }
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@211 {
-    <name not found> = ArrayList@212[2] { ResolutionCandidate@213, ResolutionCandidate@214 }
-    <name not found> = ArrayList@215[2] { ResolutionCandidate@213, ResolutionCandidate@214 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
+ResolutionTaskHolder@208 {
+    <name not found> = ArrayList@209[2] { ResolutionCandidate@210, ResolutionCandidate@211 }
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
@@ -372,43 +370,48 @@ ResolutionTaskHolder@211 {
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
+}
+
+ResolutionTaskHolder@212 {
+    <name not found> = ArrayList@213[2] { ResolutionCandidate@214, ResolutionCandidate@215 }
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
 }
 
 ResolutionTaskHolder@216 {
     <name not found> = ArrayList@217[2] { ResolutionCandidate@218, ResolutionCandidate@219 }
-    <name not found> = ArrayList@220[2] { ResolutionCandidate@218, ResolutionCandidate@219 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@221 {
-    <name not found> = ArrayList@222[2] { ResolutionCandidate@223, ResolutionCandidate@224 }
-    <name not found> = ArrayList@225[2] { ResolutionCandidate@223, ResolutionCandidate@224 }
+null {
+    <name not found> = ArrayList@220[1] { ResolutionCandidate@185 }
+    <name not found> = ArrayList@221[1] { ResolutionCandidate@197 }
+    <name not found> = ArrayList@222[1] { ResolutionCandidate@188 }
+    <name not found> = ArrayList@223[1] { ResolutionCandidate@203 }
+    <name not found> = ArrayList@224[1] { ResolutionCandidate@200 }
+    <name not found> = ArrayList@225[1] { ResolutionCandidate@191 }
+    <name not found> = ArrayList@226[1] { ResolutionCandidate@194 }
+    <name not found> = ArrayList@227[2] { ResolutionCandidate@210, ResolutionCandidate@211 }
+    <name not found> = ArrayList@228[2] { ResolutionCandidate@206, ResolutionCandidate@207 }
+    <name not found> = ArrayList@229[2] { ResolutionCandidate@218, ResolutionCandidate@219 }
+    <name not found> = ArrayList@230[2] { ResolutionCandidate@214, ResolutionCandidate@215 }
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
 }
-
-ResolutionTaskHolder@226 {
-    <name not found> = ArrayList@227[2] { ResolutionCandidate@228, ResolutionCandidate@229 }
-    <name not found> = ArrayList@230[2] { ResolutionCandidate@228, ResolutionCandidate@229 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/extensions/noClassObjectsInJava.lazy.log b/compiler/testData/diagnostics/tests/extensions/noClassObjectsInJava.lazy.log
index 2c978dc58d7..15b2080e3f7 100644
--- a/compiler/testData/diagnostics/tests/extensions/noClassObjectsInJava.lazy.log
+++ b/compiler/testData/diagnostics/tests/extensions/noClassObjectsInJava.lazy.log
@@ -101,10 +101,6 @@ ResolutionTaskHolder@58 {
     <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
 }
 
 ResolutionTaskHolder@59 {
@@ -124,10 +120,6 @@ ResolutionTaskHolder@59 {
     <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
 }
 
 ResolutionTaskHolder@60 {
@@ -139,8 +131,6 @@ ResolutionTaskHolder@60 {
     <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
 }
 
 ResolutionTaskHolder@61 {
@@ -152,8 +142,6 @@ ResolutionTaskHolder@61 {
     <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
 }
 
 ResolutionTaskHolder@62 {
@@ -165,8 +153,6 @@ ResolutionTaskHolder@62 {
     <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
 }
 
 ResolutionTaskHolder@63 {
@@ -178,8 +164,6 @@ ResolutionTaskHolder@63 {
     <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
 }
 
 ResolutionTaskHolder@64 {
@@ -191,6 +175,25 @@ ResolutionTaskHolder@64 {
     <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
+}
+
+null {
+    <name not found> = EmptyList@8[empty]
+    <name not found> = EmptyList@8[empty]
+    <name not found> = EmptyList@8[empty]
+    <name not found> = EmptyList@8[empty]
+    <name not found> = EmptyList@8[empty]
+    <name not found> = EmptyList@8[empty]
+    <name not found> = EmptyList@8[empty]
+    <name not found> = EmptyList@8[empty]
+    <name not found> = EmptyList@8[empty]
+    <name not found> = EmptyList@8[empty]
+    <name not found> = EmptyList@8[empty]
+    <name not found> = EmptyList@8[empty]
+    <name not found> = EmptyList@8[empty]
+    <name not found> = EmptyList@8[empty]
+    <name not found> = EmptyList@8[empty]
+    <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/extensions/object.lazy.log b/compiler/testData/diagnostics/tests/extensions/object.lazy.log
index accdb062e17..415b20d0275 100644
--- a/compiler/testData/diagnostics/tests/extensions/object.lazy.log
+++ b/compiler/testData/diagnostics/tests/extensions/object.lazy.log
@@ -49,13 +49,6 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@37 {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -64,32 +57,42 @@ ResolutionTaskHolder@37 {
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
     <name not found> = EmptyList@29[empty]
 }
 
 ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+    <name not found> = ArrayList@50[8] { ResolutionCandidate@51, ResolutionCandidate@52, ResolutionCandidate@53, ... }
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[8] { ResolutionCandidate@55, ResolutionCandidate@56, ResolutionCandidate@57, ... }
-    <name not found> = ArrayList@58[8] { ResolutionCandidate@55, ResolutionCandidate@56, ResolutionCandidate@57, ... }
+null {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@58[8] { ResolutionCandidate@51, ResolutionCandidate@52, ResolutionCandidate@53, ... }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver.lazy.log b/compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver.lazy.log
index 3b432d9f4bb..4a236081435 100644
--- a/compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver.lazy.log
+++ b/compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver.lazy.log
@@ -64,12 +64,6 @@ LazyJavaPackageFragment@23['lang'] {
 
 ResolutionTaskHolder@56 {
     <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
@@ -95,14 +89,8 @@ ResolutionTaskHolder@56 {
     <name not found> = EmptyList@47[empty]
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
     <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
@@ -128,9 +116,8 @@ ResolutionTaskHolder@60 {
     <name not found> = EmptyList@47[empty]
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
     <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
@@ -154,6 +141,28 @@ ResolutionTaskHolder@64 {
     <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
+}
+
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
@@ -163,12 +172,6 @@ ResolutionTaskHolder@64 {
 
 ResolutionTaskHolder@68 {
     <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
@@ -194,14 +197,8 @@ ResolutionTaskHolder@68 {
     <name not found> = EmptyList@47[empty]
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
     <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
@@ -227,9 +224,8 @@ ResolutionTaskHolder@72 {
     <name not found> = EmptyList@47[empty]
 }
 
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
     <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
@@ -253,6 +249,28 @@ ResolutionTaskHolder@76 {
     <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
+}
+
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
@@ -262,12 +280,6 @@ ResolutionTaskHolder@76 {
 
 ResolutionTaskHolder@80 {
     <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
@@ -293,14 +305,8 @@ ResolutionTaskHolder@80 {
     <name not found> = EmptyList@47[empty]
 }
 
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
     <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
@@ -326,11 +332,8 @@ ResolutionTaskHolder@84 {
     <name not found> = EmptyList@47[empty]
 }
 
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
     <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
@@ -354,6 +357,10 @@ ResolutionTaskHolder@88 {
     <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
+}
+
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
     <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
@@ -361,114 +368,110 @@ ResolutionTaskHolder@88 {
 
 ResolutionTaskHolder@92 {
     <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
 }
 
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
 }
 
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
+}
+
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
 }
 
 ResolutionTaskHolder@104 {
     <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
 }
 
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
 }
 
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
 }
 
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
+ResolutionTaskHolder@113 {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
 }
 
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@126 }
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
-}
-
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
+null {
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@67 }
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver2.lazy.log b/compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver2.lazy.log
index 7eaab2d6af3..846c9705252 100644
--- a/compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver2.lazy.log
+++ b/compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver2.lazy.log
@@ -56,14 +56,14 @@ LazyJavaClassifierType@30['String'] {
 
 LazyJavaClassifierType@33['String'] {
     arguments = ArrayList@34[empty]
-    classifier = JavaClassImpl@32['String']
+    classifier = JavaClassImpl@27['String']
     nullable = 'true': Boolean@35
     typeConstructor = DeserializedClassTypeConstructor@29
 }
 
 LazyJavaClassifierType@36['String'] {
     arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@27['String']
+    classifier = JavaClassImpl@32['String']
     nullable = 'true': Boolean@35
     typeConstructor = DeserializedClassTypeConstructor@29
 }
@@ -149,12 +149,6 @@ LazyJavaPackageFragment@66['lang'] {
 
 ResolutionTaskHolder@89 {
     <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
@@ -180,29 +174,38 @@ ResolutionTaskHolder@89 {
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
+}
+
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
 }
 
 ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@102[4] { ResolutionCandidate@103, ResolutionCandidate@104, ResolutionCandidate@105, ... }
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[4] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
-    <name not found> = ArrayList@110[4] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
-    <name not found> = EmptyList@83[empty]
+null {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@110[4] { ResolutionCandidate@103, ResolutionCandidate@104, ResolutionCandidate@105, ... }
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/DanglingFunctionLiteral.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/DanglingFunctionLiteral.lazy.log
index 5b8c06a7be6..c8699b3bc16 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/DanglingFunctionLiteral.lazy.log
+++ b/compiler/testData/diagnostics/tests/functionLiterals/DanglingFunctionLiteral.lazy.log
@@ -91,10 +91,6 @@ LazyJavaPackageFragment@37['lang'] {
 
 ResolutionTaskHolder@60 {
     <name not found> = ArrayList@61[3] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[3] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64 }
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
     <name not found> = EmptyList@52[empty]
     <name not found> = EmptyList@52[empty]
     <name not found> = EmptyList@52[empty]
@@ -112,29 +108,14 @@ ResolutionTaskHolder@60 {
     <name not found> = EmptyList@52[empty]
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[3] { ResolutionCandidate@68, ResolutionCandidate@69, ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[3] { ResolutionCandidate@68, ResolutionCandidate@69, ResolutionCandidate@70 }
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[3] { ResolutionCandidate@67, ResolutionCandidate@68, ResolutionCandidate@69 }
     <name not found> = EmptyList@52[empty]
     <name not found> = EmptyList@52[empty]
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[4] { ResolutionCandidate@74, ResolutionCandidate@75, ResolutionCandidate@76, ... }
-    <name not found> = ArrayList@77[4] { ResolutionCandidate@74, ResolutionCandidate@75, ResolutionCandidate@76, ... }
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[4] { ResolutionCandidate@72, ResolutionCandidate@73, ResolutionCandidate@74, ... }
     <name not found> = EmptyList@52[empty]
     <name not found> = EmptyList@52[empty]
     <name not found> = EmptyList@52[empty]
@@ -184,9 +165,31 @@ ResolutionTaskHolder@72 {
     <name not found> = EmptyList@52[empty]
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[4] { ResolutionCandidate@80, ResolutionCandidate@81, ResolutionCandidate@82, ... }
-    <name not found> = ArrayList@83[4] { ResolutionCandidate@80, ResolutionCandidate@81, ResolutionCandidate@82, ... }
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[4] { ResolutionCandidate@77, ResolutionCandidate@78, ResolutionCandidate@79, ... }
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+}
+
+null {
+    <name not found> = ArrayList@80[3] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64 }
+    <name not found> = ArrayList@81[3] { ResolutionCandidate@67, ResolutionCandidate@68, ResolutionCandidate@69 }
+    <name not found> = ArrayList@82[4] { ResolutionCandidate@77, ResolutionCandidate@78, ResolutionCandidate@79, ... }
+    <name not found> = ArrayList@83[4] { ResolutionCandidate@72, ResolutionCandidate@73, ResolutionCandidate@74, ... }
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
     <name not found> = EmptyList@52[empty]
     <name not found> = EmptyList@52[empty]
     <name not found> = EmptyList@52[empty]
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/ExpectedParameterTypeMismatchVariance.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/ExpectedParameterTypeMismatchVariance.lazy.log
index 4d159ec879c..8a43323cd03 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/ExpectedParameterTypeMismatchVariance.lazy.log
+++ b/compiler/testData/diagnostics/tests/functionLiterals/ExpectedParameterTypeMismatchVariance.lazy.log
@@ -40,10 +40,6 @@ LazyJavaPackageFragment@15['lang'] {
 
 ResolutionTaskHolder@34 {
     <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -61,40 +57,47 @@ ResolutionTaskHolder@34 {
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+}
+
 ResolutionTaskHolder@46 {
     <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
+null {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@54 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/ExpectedParametersTypesMismatch.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/ExpectedParametersTypesMismatch.lazy.log
index e78550d0a69..9561e6989b3 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/ExpectedParametersTypesMismatch.lazy.log
+++ b/compiler/testData/diagnostics/tests/functionLiterals/ExpectedParametersTypesMismatch.lazy.log
@@ -42,10 +42,6 @@ LazyJavaPackageFragment@15['lang'] {
 
 ResolutionTaskHolder@34 {
     <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -63,12 +59,8 @@ ResolutionTaskHolder@34 {
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -86,9 +78,8 @@ ResolutionTaskHolder@38 {
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -104,6 +95,22 @@ ResolutionTaskHolder@42 {
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
+}
+
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -111,10 +118,6 @@ ResolutionTaskHolder@42 {
 
 ResolutionTaskHolder@46 {
     <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -132,12 +135,8 @@ ResolutionTaskHolder@46 {
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -155,9 +154,8 @@ ResolutionTaskHolder@50 {
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -173,6 +171,22 @@ ResolutionTaskHolder@54 {
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -180,10 +194,6 @@ ResolutionTaskHolder@54 {
 
 ResolutionTaskHolder@58 {
     <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -201,90 +211,83 @@ ResolutionTaskHolder@58 {
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
+}
+
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
 
 ResolutionTaskHolder@70 {
     <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
 }
 
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+null {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@42 }
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/LabeledFunctionLiterals.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/LabeledFunctionLiterals.lazy.log
index 1f0f217d7fd..6934b83f5f1 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/LabeledFunctionLiterals.lazy.log
+++ b/compiler/testData/diagnostics/tests/functionLiterals/LabeledFunctionLiterals.lazy.log
@@ -42,46 +42,49 @@ LazyJavaPackageFragment@15['lang'] {
 
 ResolutionTaskHolder@37 {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@31[empty]
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+}
+
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
 }
 
 ResolutionTaskHolder@49 {
     <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[2] { ResolutionCandidate@60, ResolutionCandidate@61 }
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[2] { ResolutionCandidate@67, ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[2] { ResolutionCandidate@67, ResolutionCandidate@68 }
+null {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@69[2] { ResolutionCandidate@60, ResolutionCandidate@61 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/NoDanglingFunctionLiteralForNestedCalls.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/NoDanglingFunctionLiteralForNestedCalls.lazy.log
index 165db5ebeaf..246be8f86fa 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/NoDanglingFunctionLiteralForNestedCalls.lazy.log
+++ b/compiler/testData/diagnostics/tests/functionLiterals/NoDanglingFunctionLiteralForNestedCalls.lazy.log
@@ -32,10 +32,6 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[2] { ResolutionCandidate@30, ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[2] { ResolutionCandidate@30, ResolutionCandidate@31 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
@@ -53,12 +49,8 @@ ResolutionTaskHolder@28 {
     <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[2] { ResolutionCandidate@35, ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[2] { ResolutionCandidate@35, ResolutionCandidate@36 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[2] { ResolutionCandidate@34, ResolutionCandidate@35 }
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
@@ -76,9 +68,20 @@ ResolutionTaskHolder@33 {
     <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[2] { ResolutionCandidate@40, ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[2] { ResolutionCandidate@40, ResolutionCandidate@41 }
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[2] { ResolutionCandidate@38, ResolutionCandidate@39 }
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+}
+
+null {
+    <name not found> = ArrayList@40[2] { ResolutionCandidate@34, ResolutionCandidate@35 }
+    <name not found> = ArrayList@41[2] { ResolutionCandidate@30, ResolutionCandidate@31 }
+    <name not found> = ArrayList@42[2] { ResolutionCandidate@38, ResolutionCandidate@39 }
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/functionLIteralInBlockInIf.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/functionLIteralInBlockInIf.lazy.log
index ccc7e8d390e..03f335dfefe 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/functionLIteralInBlockInIf.lazy.log
+++ b/compiler/testData/diagnostics/tests/functionLiterals/functionLIteralInBlockInIf.lazy.log
@@ -56,34 +56,37 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@45 {
     <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
+}
+
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
 }
 
 ResolutionTaskHolder@57 {
     <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+null {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@50 }
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/functionLiteralInIf.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/functionLiteralInIf.lazy.log
index a8138460f42..37a23f221c7 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/functionLiteralInIf.lazy.log
+++ b/compiler/testData/diagnostics/tests/functionLiterals/functionLiteralInIf.lazy.log
@@ -2,51 +2,47 @@ LazyJavaClassDescriptor@0['AbstractCollection'] {
     defaultType = JetTypeImpl@1['AbstractCollection<1>']
     functions('add': Name@2) = ArrayList@3[1] { JavaMethodDescriptor@4['add'] } // through LazyJavaClassMemberScope@5
     memberIndex = computeMemberIndex$1@6 // through LazyJavaClassMemberScope@5
-    properties('add': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@5
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@9['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@10['AbstractCollection']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@7['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@8['AbstractCollection']
 }
 
-LazyJavaClassDescriptor@11['AbstractSet'] {
-    defaultType = JetTypeImpl@12['AbstractSet<1>']
-    functions('add': Name@2) = ArrayList@13[1] { DeserializedSimpleFunctionDescriptor@14['add'] } // through LazyJavaClassMemberScope@15
-    memberIndex = computeMemberIndex$1@16 // through LazyJavaClassMemberScope@15
-    properties('add': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@15
-    typeConstructor = LazyJavaClassTypeConstructor@17['AbstractSet']
+LazyJavaClassDescriptor@9['AbstractSet'] {
+    defaultType = JetTypeImpl@10['AbstractSet<1>']
+    functions('add': Name@2) = ArrayList@11[1] { DeserializedSimpleFunctionDescriptor@12['add'] } // through LazyJavaClassMemberScope@13
+    memberIndex = computeMemberIndex$1@14 // through LazyJavaClassMemberScope@13
+    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractSet']
 }
 
-LazyJavaClassDescriptor@18['HashSet'] {
-    constructors = ArrayList@19[5] { JavaConstructorDescriptor@20['<init>'], JavaConstructorDescriptor@21['<init>'], JavaConstructorDescriptor@22['<init>'], ... } // through LazyJavaClassMemberScope@23
-    defaultType = JetTypeImpl@24['HashSet<1>']
-    enumEntryIndex = LinkedHashMap@25 // through LazyJavaClassMemberScope@23
+LazyJavaClassDescriptor@16['HashSet'] {
+    constructors = ArrayList@17[5] { JavaConstructorDescriptor@18['<init>'], JavaConstructorDescriptor@19['<init>'], JavaConstructorDescriptor@20['<init>'], ... } // through LazyJavaClassMemberScope@21
+    defaultType = JetTypeImpl@22['HashSet<1>']
+    enumEntryIndex = LinkedHashMap@23 // through LazyJavaClassMemberScope@21
     functionTypeForSamInterface = null
-    functions('add': Name@7) = ArrayList@26[1] { JavaMethodDescriptor@27['add'] } // through LazyJavaClassMemberScope@23
-    memberIndex = computeMemberIndex$1@28 // through LazyJavaClassMemberScope@23
-    nestedClassIndex = LinkedHashMap@29 // through LazyJavaClassMemberScope@23
-    nestedClasses('add': Name@7) = null // through LazyJavaClassMemberScope@23
-    properties('add': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@23
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@30['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@31['HashSet']
+    functions('add': Name@24) = ArrayList@25[1] { JavaMethodDescriptor@26['add'] } // through LazyJavaClassMemberScope@21
+    memberIndex = computeMemberIndex$1@27 // through LazyJavaClassMemberScope@21
+    nestedClassIndex = LinkedHashMap@28 // through LazyJavaClassMemberScope@21
+    nestedClasses('add': Name@24) = null // through LazyJavaClassMemberScope@21
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@29['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@30['HashSet']
 }
 
-LazyJavaClassDescriptor@32['Serializable'] {
-    functions('add': Name@2) = EmptyList@8[empty] // through LazyJavaClassMemberScope@33
+LazyJavaClassDescriptor@31['Serializable'] {
+    functions('add': Name@2) = EmptyList@32[empty] // through LazyJavaClassMemberScope@33
     memberIndex = computeMemberIndex$1@34 // through LazyJavaClassMemberScope@33
-    properties('add': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@33
     typeConstructor = LazyJavaClassTypeConstructor@35['Serializable']
 }
 
-LazyJavaClassTypeConstructor@10['AbstractCollection'] {
+LazyJavaClassTypeConstructor@8['AbstractCollection'] {
     parameters = ArrayList@36[1] { LazyJavaTypeParameterDescriptor@37['E'] }
     supertypes = ArrayList@38[1] { LazyJavaClassifierType@39['Collection<E>'] }
 }
 
-LazyJavaClassTypeConstructor@17['AbstractSet'] {
+LazyJavaClassTypeConstructor@15['AbstractSet'] {
     parameters = ArrayList@40[1] { LazyJavaTypeParameterDescriptor@41['E'] }
     supertypes = ArrayList@42[2] { LazyJavaClassifierType@43['AbstractCollection<E>'], LazyJavaClassifierType@44['Set<E>'] }
 }
 
-LazyJavaClassTypeConstructor@31['HashSet'] {
+LazyJavaClassTypeConstructor@30['HashSet'] {
     parameters = ArrayList@45[1] { LazyJavaTypeParameterDescriptor@46['E'] }
     supertypes = ArrayList@47[4] { LazyJavaClassifierType@48['AbstractSet<E>'], LazyJavaClassifierType@49['Set<E>'], LazyJavaClassifierType@50['Cloneable'], ... }
 }
@@ -61,14 +57,14 @@ LazyJavaClassifierType@43['AbstractCollection<E>'] {
     classifier = JavaClassImpl@56['AbstractCollection']
     memberScope = SubstitutingScope@57
     nullable = 'false': Boolean@58
-    typeConstructor = LazyJavaClassTypeConstructor@10['AbstractCollection']
+    typeConstructor = LazyJavaClassTypeConstructor@8['AbstractCollection']
 }
 
 LazyJavaClassifierType@48['AbstractSet<E>'] {
     arguments = ArrayList@59[1] { TypeProjectionImpl@60 }
     classifier = JavaClassImpl@61['AbstractSet']
     memberScope = SubstitutingScope@62
-    typeConstructor = LazyJavaClassTypeConstructor@17['AbstractSet']
+    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractSet']
 }
 
 LazyJavaClassifierType@50['Cloneable'] {
@@ -112,119 +108,119 @@ LazyJavaClassifierType@87['E'] {
     arguments = ArrayList@88[empty]
     classifier = JavaTypeParameterImpl@89['E']
     nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@86
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
-LazyJavaClassifierType@90['E'] {
-    arguments = ArrayList@91[empty]
-    classifier = JavaTypeParameterImpl@92['E']
+LazyJavaClassifierType@91['E'] {
+    arguments = ArrayList@92[empty]
+    classifier = JavaTypeParameterImpl@93['E']
     nullable = 'false': Boolean@58
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@86
 }
 
-LazyJavaClassifierType@93['E'] {
-    arguments = ArrayList@94[empty]
-    classifier = JavaTypeParameterImpl@95['E']
+LazyJavaClassifierType@94['E'] {
+    arguments = ArrayList@95[empty]
+    classifier = JavaTypeParameterImpl@96['E']
     nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@86
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
-LazyJavaClassifierType@96['E'] {
-    arguments = ArrayList@97[empty]
-    classifier = JavaTypeParameterImpl@98['E']
+LazyJavaClassifierType@97['E'] {
+    arguments = ArrayList@98[empty]
+    classifier = JavaTypeParameterImpl@99['E']
     nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
 LazyJavaClassifierType@100['E'] {
     arguments = ArrayList@101[empty]
     classifier = JavaTypeParameterImpl@102['E']
     nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
-LazyJavaClassifierType@104['E'] {
-    arguments = ArrayList@105[empty]
-    classifier = JavaTypeParameterImpl@106['E']
+LazyJavaClassifierType@103['E'] {
+    arguments = ArrayList@104[empty]
+    classifier = JavaTypeParameterImpl@105['E']
     nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
-LazyJavaClassifierType@107['E'] {
-    arguments = ArrayList@108[empty]
-    classifier = JavaTypeParameterImpl@109['E']
+LazyJavaClassifierType@106['E'] {
+    arguments = ArrayList@107[empty]
+    classifier = JavaTypeParameterImpl@108['E']
     nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@86
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@109
 }
 
 LazyJavaClassifierType@110['E'] {
     arguments = ArrayList@111[empty]
     classifier = JavaTypeParameterImpl@112['E']
     nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@109
 }
 
 LazyJavaClassifierType@113['E'] {
     arguments = ArrayList@114[empty]
-    classifier = JavaTypeParameterImpl@112['E']
+    classifier = JavaTypeParameterImpl@105['E']
     nullable = 'true': Boolean@77
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
 LazyJavaClassifierType@115['E'] {
     arguments = ArrayList@116[empty]
+    classifier = JavaTypeParameterImpl@89['E']
+    nullable = 'true': Boolean@77
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
+}
+
+LazyJavaClassifierType@117['E'] {
+    arguments = ArrayList@118[empty]
+    classifier = JavaTypeParameterImpl@112['E']
+    nullable = 'true': Boolean@77
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@109
+}
+
+LazyJavaClassifierType@119['E'] {
+    arguments = ArrayList@120[empty]
+    classifier = JavaTypeParameterImpl@93['E']
+    nullable = 'true': Boolean@77
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@86
+}
+
+LazyJavaClassifierType@121['E'] {
+    arguments = ArrayList@122[empty]
+    classifier = JavaTypeParameterImpl@102['E']
+    nullable = 'true': Boolean@77
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
+}
+
+LazyJavaClassifierType@123['E'] {
+    arguments = ArrayList@124[empty]
     classifier = JavaTypeParameterImpl@85['E']
     nullable = 'true': Boolean@77
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@86
 }
 
-LazyJavaClassifierType@117['E'] {
-    arguments = ArrayList@118[empty]
-    classifier = JavaTypeParameterImpl@109['E']
-    nullable = 'true': Boolean@77
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@86
-}
-
-LazyJavaClassifierType@119['E'] {
-    arguments = ArrayList@120[empty]
-    classifier = JavaTypeParameterImpl@106['E']
-    nullable = 'true': Boolean@77
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
-}
-
-LazyJavaClassifierType@121['E'] {
-    arguments = ArrayList@122[empty]
-    classifier = JavaTypeParameterImpl@98['E']
-    nullable = 'true': Boolean@77
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
-}
-
-LazyJavaClassifierType@123['E'] {
-    arguments = ArrayList@124[empty]
-    classifier = JavaTypeParameterImpl@102['E']
-    nullable = 'true': Boolean@77
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
-}
-
 LazyJavaClassifierType@125['E'] {
     arguments = ArrayList@126[empty]
-    classifier = JavaTypeParameterImpl@95['E']
+    classifier = JavaTypeParameterImpl@96['E']
     nullable = 'true': Boolean@77
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@86
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
 LazyJavaClassifierType@127['E'] {
     arguments = ArrayList@128[empty]
-    classifier = JavaTypeParameterImpl@92['E']
+    classifier = JavaTypeParameterImpl@99['E']
     nullable = 'true': Boolean@77
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@86
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
 LazyJavaClassifierType@129['E'] {
     arguments = ArrayList@130[empty]
-    classifier = JavaTypeParameterImpl@89['E']
+    classifier = JavaTypeParameterImpl@108['E']
     nullable = 'true': Boolean@77
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@86
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@109
 }
 
 LazyJavaClassifierType@131['Object'] {
@@ -276,21 +272,19 @@ LazyJavaPackageFragmentProvider@148 {
     packageFragments('kotlin.io': FqName@167) = null
     packageFragments('kotlin.jvm': FqName@168) = null
     topLevelClasses(JavaClassImpl@56['AbstractCollection']) = LazyJavaClassDescriptor@0['AbstractCollection']
-    topLevelClasses(JavaClassImpl@61['AbstractSet']) = LazyJavaClassDescriptor@11['AbstractSet']
-    topLevelClasses(JavaClassImpl@169['HashSet']) = LazyJavaClassDescriptor@18['HashSet']
-    topLevelClasses(JavaClassImpl@138['Serializable']) = LazyJavaClassDescriptor@32['Serializable']
+    topLevelClasses(JavaClassImpl@61['AbstractSet']) = LazyJavaClassDescriptor@9['AbstractSet']
+    topLevelClasses(JavaClassImpl@169['HashSet']) = LazyJavaClassDescriptor@16['HashSet']
+    topLevelClasses(JavaClassImpl@138['Serializable']) = LazyJavaClassDescriptor@31['Serializable']
 }
 
 LazyJavaPackageFragment@150['<root>'] {
     classes('HashSet': Name@170) = null // through LazyPackageFragmentScopeForJavaPackage@171
     classes('Int': Name@172) = null // through LazyPackageFragmentScopeForJavaPackage@171
     classes('Unit': Name@173) = null // through LazyPackageFragmentScopeForJavaPackage@171
-    classes('add': Name@7) = null // through LazyPackageFragmentScopeForJavaPackage@171
     classes('java': Name@174) = null // through LazyPackageFragmentScopeForJavaPackage@171
     deserializedPackageScope = Empty@175 // through LazyPackageFragmentScopeForJavaPackage@171
-    functions('HashSet': Name@176) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@171
-    functions('add': Name@7) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@171
-    functions('java': Name@177) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@171
+    functions('HashSet': Name@176) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@171
+    functions('java': Name@177) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@171
     memberIndex = computeMemberIndex$1@178 // through LazyPackageFragmentScopeForJavaPackage@171
 }
 
@@ -298,35 +292,33 @@ LazyJavaPackageFragment@154['java'] {
     classes('lang': Name@179) = null // through LazyPackageFragmentScopeForJavaPackage@180
     classes('util': Name@181) = null // through LazyPackageFragmentScopeForJavaPackage@180
     deserializedPackageScope = Empty@175 // through LazyPackageFragmentScopeForJavaPackage@180
-    functions('lang': Name@182) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@180
-    functions('util': Name@183) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@180
+    functions('lang': Name@182) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@180
+    functions('util': Name@183) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@180
     memberIndex = computeMemberIndex$1@184 // through LazyPackageFragmentScopeForJavaPackage@180
 }
 
 LazyJavaPackageFragment@158['lang'] {
     classes('HashSet': Name@176) = null // through LazyPackageFragmentScopeForJavaPackage@185
-    classes('add': Name@7) = null // through LazyPackageFragmentScopeForJavaPackage@185
     deserializedPackageScope = Empty@175 // through LazyPackageFragmentScopeForJavaPackage@185
-    functions('HashSet': Name@176) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@185
-    functions('add': Name@7) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@185
+    functions('HashSet': Name@176) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@185
     memberIndex = computeMemberIndex$1@186 // through LazyPackageFragmentScopeForJavaPackage@185
 }
 
 LazyJavaPackageFragment@162['util'] {
-    classes('HashSet': Name@187) = LazyJavaClassDescriptor@18['HashSet'] // through LazyPackageFragmentScopeForJavaPackage@188
+    classes('HashSet': Name@187) = LazyJavaClassDescriptor@16['HashSet'] // through LazyPackageFragmentScopeForJavaPackage@188
     deserializedPackageScope = Empty@175 // through LazyPackageFragmentScopeForJavaPackage@188
-    functions('HashSet': Name@189) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@188
+    functions('HashSet': Name@189) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@188
     memberIndex = computeMemberIndex$1@190 // through LazyPackageFragmentScopeForJavaPackage@188
 }
 
-LazyJavaTypeParameterDescriptor@37['E'] {
+LazyJavaTypeParameterDescriptor@46['E'] {
     defaultType = JetTypeImpl@191['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
     upperBounds = LinkedHashSet@192[1] { NullableType@193 }
     upperBoundsAsType = NullableType@193
 }
 
-LazyJavaTypeParameterDescriptor@46['E'] {
+LazyJavaTypeParameterDescriptor@37['E'] {
     defaultType = JetTypeImpl@194['E']
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@86
     upperBounds = LinkedHashSet@195[1] { NullableType@196 }
@@ -335,7 +327,7 @@ LazyJavaTypeParameterDescriptor@46['E'] {
 
 LazyJavaTypeParameterDescriptor@41['E'] {
     defaultType = JetTypeImpl@197['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@109
 }
 
 LazyJavaTypeParameterResolver@198 {
@@ -351,9 +343,46 @@ LazyJavaTypeParameterResolver@202 {
 }
 
 LazyJavaTypeParameterResolver@204 {
-    resolve(JavaTypeParameterImpl@92['E']) = null
+    resolve(JavaTypeParameterImpl@93['E']) = null
 }
 
 LazyJavaTypeParameterResolver@205 {
-    resolve(JavaTypeParameterImpl@98['E']) = null
+    resolve(JavaTypeParameterImpl@105['E']) = null
+}
+
+ResolutionTaskHolder@206 {
+    <name not found> = ArrayList@207[1] { ResolutionCandidate@208 }
+}
+
+ResolutionTaskHolder@209 {
+    <name not found> = ArrayList@210[1] { ResolutionCandidate@211 }
+}
+
+ResolutionTaskHolder@212 {
+    <name not found> = ArrayList@213[1] { ResolutionCandidate@214 }
+}
+
+ResolutionTaskHolder@215 {
+    <name not found> = ArrayList@216[1] { ResolutionCandidate@217 }
+}
+
+ResolutionTaskHolder@218 {
+    <name not found> = ArrayList@219[1] { ResolutionCandidate@220 }
+}
+
+ResolutionTaskHolder@221 {
+    <name not found> = ArrayList@222[4] { ResolutionCandidate@223, ResolutionCandidate@224, ResolutionCandidate@225, ... }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+}
+
+null {
+    <name not found> = ArrayList@226[1] { ResolutionCandidate@211 }
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@214 }
+    <name not found> = ArrayList@228[1] { ResolutionCandidate@220 }
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@217 }
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@208 }
+    <name not found> = ArrayList@231[5] { ResolutionCandidate@223, ResolutionCandidate@224, ResolutionCandidate@225, ... }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/functionLiteralWithoutArgumentList.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/functionLiteralWithoutArgumentList.lazy.log
index d1679e8c510..b92aec831bc 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/functionLiteralWithoutArgumentList.lazy.log
+++ b/compiler/testData/diagnostics/tests/functionLiterals/functionLiteralWithoutArgumentList.lazy.log
@@ -61,38 +61,41 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@47 {
     <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
+}
+
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
 }
 
 ResolutionTaskHolder@59 {
     <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
 }
 
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
+null {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@58 }
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/kt2906.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/kt2906.lazy.log
index 33a79025b91..4264ad196fe 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/kt2906.lazy.log
+++ b/compiler/testData/diagnostics/tests/functionLiterals/kt2906.lazy.log
@@ -54,93 +54,96 @@ LazyJavaPackageFragment@17['lang'] {
 
 ResolutionTaskHolder@43 {
     <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
 ResolutionTaskHolder@55 {
     <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
     <name not found> = EmptyList@33[empty]
+}
+
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
     <name not found> = EmptyList@33[empty]
 }
 
 ResolutionTaskHolder@67 {
     <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
 }
 
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
+}
+
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
 }
 
 ResolutionTaskHolder@79 {
     <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
 }
 
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
+null {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@69 }
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/kt4529.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/kt4529.lazy.log
index 7da27235a12..3d20f8f2f46 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/kt4529.lazy.log
+++ b/compiler/testData/diagnostics/tests/functionLiterals/kt4529.lazy.log
@@ -56,109 +56,112 @@ LazyJavaPackageFragment@14['lang'] {
 
 ResolutionTaskHolder@42 {
     <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
+}
+
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
 
 ResolutionTaskHolder@54 {
     <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
+}
+
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
 }
 
 ResolutionTaskHolder@66 {
     <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
+}
+
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
 }
 
 ResolutionTaskHolder@78 {
     <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
 }
 
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
 }
 
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[8] { ResolutionCandidate@86, ResolutionCandidate@87, ResolutionCandidate@88, ... }
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[8] { ResolutionCandidate@91, ResolutionCandidate@92, ResolutionCandidate@93, ... }
 }
 
 ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@95[8] { ResolutionCandidate@96, ResolutionCandidate@97, ResolutionCandidate@98, ... }
 }
 
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[8] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102, ... }
-    <name not found> = ArrayList@103[8] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102, ... }
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[8] { ResolutionCandidate@106, ResolutionCandidate@107, ResolutionCandidate@108, ... }
-    <name not found> = ArrayList@109[8] { ResolutionCandidate@106, ResolutionCandidate@107, ResolutionCandidate@108, ... }
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[8] { ResolutionCandidate@112, ResolutionCandidate@113, ResolutionCandidate@114, ... }
-    <name not found> = ArrayList@115[8] { ResolutionCandidate@112, ResolutionCandidate@113, ResolutionCandidate@114, ... }
+null {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@113[8] { ResolutionCandidate@96, ResolutionCandidate@97, ResolutionCandidate@98, ... }
+    <name not found> = ArrayList@114[8] { ResolutionCandidate@91, ResolutionCandidate@92, ResolutionCandidate@93, ... }
+    <name not found> = ArrayList@115[8] { ResolutionCandidate@86, ResolutionCandidate@87, ResolutionCandidate@88, ... }
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/AutoLabels.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/return/AutoLabels.lazy.log
index 7c95505b9dc..136af10a7bc 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/AutoLabels.lazy.log
+++ b/compiler/testData/diagnostics/tests/functionLiterals/return/AutoLabels.lazy.log
@@ -38,43 +38,46 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@29 {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
+}
+
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
 ResolutionTaskHolder@41 {
     <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+null {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@40 }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/AutoLabelsNonLocal.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/return/AutoLabelsNonLocal.lazy.log
index 8b9c13a45ca..72dc18903eb 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/AutoLabelsNonLocal.lazy.log
+++ b/compiler/testData/diagnostics/tests/functionLiterals/return/AutoLabelsNonLocal.lazy.log
@@ -42,16 +42,19 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@30 {
     <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+}
+
+null {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@32 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/ForbiddenNonLocalReturnNoType.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/return/ForbiddenNonLocalReturnNoType.lazy.log
index 328f7fd5708..5710e1fcf70 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/ForbiddenNonLocalReturnNoType.lazy.log
+++ b/compiler/testData/diagnostics/tests/functionLiterals/return/ForbiddenNonLocalReturnNoType.lazy.log
@@ -37,66 +37,69 @@ LazyJavaPackageFragment@7['lang'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
+}
+
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
 }
 
 ResolutionTaskHolder@37 {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+null {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@27 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@48 }
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalAndNonLocalReturnInLambda.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalAndNonLocalReturnInLambda.lazy.log
index 19b87045dbe..cd20ccf2e7f 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalAndNonLocalReturnInLambda.lazy.log
+++ b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalAndNonLocalReturnInLambda.lazy.log
@@ -41,36 +41,39 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@29 {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+}
+
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
 }
 
 ResolutionTaskHolder@41 {
     <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[7] { ResolutionCandidate@46, ResolutionCandidate@47, ResolutionCandidate@48, ... }
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[7] { ResolutionCandidate@51, ResolutionCandidate@52, ResolutionCandidate@53, ... }
-    <name not found> = ArrayList@54[7] { ResolutionCandidate@51, ResolutionCandidate@52, ResolutionCandidate@53, ... }
+null {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@54[7] { ResolutionCandidate@46, ResolutionCandidate@47, ResolutionCandidate@48, ... }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnExplicitLabelNoParens.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnExplicitLabelNoParens.lazy.log
index 8084054d91b..a641ee9e36e 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnExplicitLabelNoParens.lazy.log
+++ b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnExplicitLabelNoParens.lazy.log
@@ -41,26 +41,29 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@29 {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
+}
+
+null {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@37 }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnExplicitLabelParens.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnExplicitLabelParens.lazy.log
index 2760a8a029f..33b8bf95190 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnExplicitLabelParens.lazy.log
+++ b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnExplicitLabelParens.lazy.log
@@ -41,40 +41,43 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@29 {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
     <name not found> = EmptyList@21[empty]
 }
 
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
+}
+
 ResolutionTaskHolder@41 {
     <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+null {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@40 }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnHasTypeNothing.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnHasTypeNothing.lazy.log
index 2505ae02a1f..d193bd57afe 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnHasTypeNothing.lazy.log
+++ b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnHasTypeNothing.lazy.log
@@ -45,21 +45,24 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@33 {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+}
+
+null {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@41 }
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnInNestedFunction.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnInNestedFunction.lazy.log
index 12c54e33238..5a6c1b67b46 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnInNestedFunction.lazy.log
+++ b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnInNestedFunction.lazy.log
@@ -45,36 +45,39 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@33 {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+}
+
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
 }
 
 ResolutionTaskHolder@45 {
     <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[7] { ResolutionCandidate@50, ResolutionCandidate@51, ResolutionCandidate@52, ... }
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[7] { ResolutionCandidate@55, ResolutionCandidate@56, ResolutionCandidate@57, ... }
-    <name not found> = ArrayList@58[7] { ResolutionCandidate@55, ResolutionCandidate@56, ResolutionCandidate@57, ... }
+null {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@58[7] { ResolutionCandidate@50, ResolutionCandidate@51, ResolutionCandidate@52, ... }
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnInNestedLambda.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnInNestedLambda.lazy.log
index 90d3ed00a10..690f216357b 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnInNestedLambda.lazy.log
+++ b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnInNestedLambda.lazy.log
@@ -41,35 +41,38 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@29 {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
     <name not found> = EmptyList@21[empty]
 }
 
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
+}
+
 ResolutionTaskHolder@41 {
     <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+null {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@43 }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnNoCoercionToUnit.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnNoCoercionToUnit.lazy.log
index 19b87045dbe..dfc2c7838fa 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnNoCoercionToUnit.lazy.log
+++ b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnNoCoercionToUnit.lazy.log
@@ -41,36 +41,39 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@29 {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+}
+
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
 }
 
 ResolutionTaskHolder@41 {
     <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[7] { ResolutionCandidate@46, ResolutionCandidate@47, ResolutionCandidate@48, ... }
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[7] { ResolutionCandidate@51, ResolutionCandidate@52, ResolutionCandidate@53, ... }
-    <name not found> = ArrayList@54[7] { ResolutionCandidate@51, ResolutionCandidate@52, ResolutionCandidate@53, ... }
+null {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@54[7] { ResolutionCandidate@46, ResolutionCandidate@47, ResolutionCandidate@48, ... }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnUnit.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnUnit.lazy.log
index 9219ea160de..6c770ff6d80 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnUnit.lazy.log
+++ b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnUnit.lazy.log
@@ -45,48 +45,51 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@33 {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
     <name not found> = EmptyList@25[empty]
 }
 
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
+}
+
 ResolutionTaskHolder@45 {
     <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[7] { ResolutionCandidate@56, ResolutionCandidate@57, ResolutionCandidate@58, ... }
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[7] { ResolutionCandidate@63, ResolutionCandidate@64, ResolutionCandidate@65, ... }
-    <name not found> = ArrayList@66[7] { ResolutionCandidate@63, ResolutionCandidate@64, ResolutionCandidate@65, ... }
+null {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@66[7] { ResolutionCandidate@56, ResolutionCandidate@57, ResolutionCandidate@58, ... }
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnsWithExplicitReturnType.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnsWithExplicitReturnType.lazy.log
index 94c5e4aa5f8..bd9d99ce66e 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnsWithExplicitReturnType.lazy.log
+++ b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnsWithExplicitReturnType.lazy.log
@@ -41,49 +41,52 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@29 {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
+}
+
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
     <name not found> = EmptyList@21[empty]
 }
 
 ResolutionTaskHolder@41 {
     <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+}
+
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+}
+
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[7] { ResolutionCandidate@49, ResolutionCandidate@50, ResolutionCandidate@51, ... }
+}
+
+null {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@58[7] { ResolutionCandidate@49, ResolutionCandidate@50, ResolutionCandidate@51, ... }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[7] { ResolutionCandidate@55, ResolutionCandidate@56, ResolutionCandidate@57, ... }
-    <name not found> = ArrayList@58[7] { ResolutionCandidate@55, ResolutionCandidate@56, ResolutionCandidate@57, ... }
-}
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/MixedReturnsFromLambda.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/return/MixedReturnsFromLambda.lazy.log
index fca81b3d31f..f12977bbb0e 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/MixedReturnsFromLambda.lazy.log
+++ b/compiler/testData/diagnostics/tests/functionLiterals/return/MixedReturnsFromLambda.lazy.log
@@ -46,51 +46,54 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@34 {
     <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@26[empty]
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+}
+
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
 }
 
 ResolutionTaskHolder@46 {
     <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
 }
 
 ResolutionTaskHolder@58 {
     <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+null {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@42 }
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/returnNull.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/returnNull.lazy.log
index 7e677640c08..2f5b0d8560a 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/returnNull.lazy.log
+++ b/compiler/testData/diagnostics/tests/functionLiterals/returnNull.lazy.log
@@ -33,21 +33,21 @@ LazyJavaClassifierType@19['String'] {
 
 LazyJavaClassifierType@22['String'] {
     arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@21['String']
+    classifier = JavaClassImpl@18['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
 
 LazyJavaClassifierType@25['String'] {
     arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@18['String']
+    classifier = JavaClassImpl@13['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@13['String']
+    classifier = JavaClassImpl@21['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
@@ -75,21 +75,21 @@ LazyJavaClassifierType@36['Throwable'] {
 
 LazyJavaClassifierType@39['Throwable'] {
     arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@31['Throwable']
+    classifier = JavaClassImpl@38['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@35['Throwable']
+    classifier = JavaClassImpl@31['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
 
 LazyJavaClassifierType@43['Throwable'] {
     arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@38['Throwable']
+    classifier = JavaClassImpl@35['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
@@ -153,37 +153,40 @@ LazyJavaPackageFragment@59['lang'] {
 
 ResolutionTaskHolder@93 {
     <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
 }
 
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
 }
 
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
+}
+
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
 }
 
 ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@106[4] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
 }
 
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[4] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113, ... }
-    <name not found> = ArrayList@114[5] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113, ... }
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
+null {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@114[5] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
     <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/unusedLiteralInsideUnitLiteral.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/unusedLiteralInsideUnitLiteral.lazy.log
index 3170d355f46..e23f7d33861 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/unusedLiteralInsideUnitLiteral.lazy.log
+++ b/compiler/testData/diagnostics/tests/functionLiterals/unusedLiteralInsideUnitLiteral.lazy.log
@@ -49,21 +49,24 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@37 {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+}
+
+null {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@45 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/generics/Projections.lazy.log b/compiler/testData/diagnostics/tests/generics/Projections.lazy.log
index 0037e80c7fe..b4e9d401174 100644
--- a/compiler/testData/diagnostics/tests/generics/Projections.lazy.log
+++ b/compiler/testData/diagnostics/tests/generics/Projections.lazy.log
@@ -84,14 +84,14 @@ LazyJavaClassifierType@42['Throwable'] {
 
 LazyJavaClassifierType@45['Throwable'] {
     arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@40['Throwable']
+    classifier = JavaClassImpl@44['Throwable']
     nullable = 'true': Boolean@35
     typeConstructor = DeserializedClassTypeConstructor@41
 }
 
 LazyJavaClassifierType@47['Throwable'] {
     arguments = ArrayList@48[empty]
-    classifier = JavaClassImpl@44['Throwable']
+    classifier = JavaClassImpl@40['Throwable']
     nullable = 'true': Boolean@35
     typeConstructor = DeserializedClassTypeConstructor@41
 }
@@ -185,12 +185,6 @@ LazyJavaPackageFragment@64['lang'] {
 
 ResolutionTaskHolder@103 {
     <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
@@ -216,14 +210,8 @@ ResolutionTaskHolder@103 {
     <name not found> = EmptyList@95[empty]
 }
 
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
@@ -249,186 +237,190 @@ ResolutionTaskHolder@107 {
     <name not found> = EmptyList@95[empty]
 }
 
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@113 }
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
+}
+
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
 }
 
 ResolutionTaskHolder@115 {
     <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@117 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
 }
 
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@121 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
+ResolutionTaskHolder@118 {
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
 }
 
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@125 }
+ResolutionTaskHolder@121 {
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
+}
+
+ResolutionTaskHolder@124 {
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
 }
 
 ResolutionTaskHolder@127 {
     <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@129 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
 }
 
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@133 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
+ResolutionTaskHolder@130 {
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
 }
 
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@137 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
+ResolutionTaskHolder@133 {
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
+}
+
+ResolutionTaskHolder@136 {
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
 }
 
 ResolutionTaskHolder@139 {
     <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@141 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
 }
 
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@145 }
+ResolutionTaskHolder@142 {
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
 }
 
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@149 }
+ResolutionTaskHolder@145 {
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
+}
+
+ResolutionTaskHolder@148 {
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
 }
 
 ResolutionTaskHolder@151 {
     <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@153 }
 }
 
-ResolutionTaskHolder@155 {
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@157 }
+ResolutionTaskHolder@154 {
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
 }
 
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@161 }
+ResolutionTaskHolder@157 {
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
+}
+
+ResolutionTaskHolder@160 {
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
 }
 
 ResolutionTaskHolder@163 {
     <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@165 }
 }
 
-ResolutionTaskHolder@167 {
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@169 }
+ResolutionTaskHolder@166 {
+    <name not found> = ArrayList@167[2] { ResolutionCandidate@168, ResolutionCandidate@169 }
 }
 
-ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@173 }
+ResolutionTaskHolder@170 {
+    <name not found> = ArrayList@171[2] { ResolutionCandidate@172, ResolutionCandidate@173 }
 }
 
-ResolutionTaskHolder@175 {
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@177 }
+ResolutionTaskHolder@174 {
+    <name not found> = ArrayList@175[2] { ResolutionCandidate@176, ResolutionCandidate@177 }
 }
 
-ResolutionTaskHolder@179 {
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@181 }
+ResolutionTaskHolder@178 {
+    <name not found> = ArrayList@179[2] { ResolutionCandidate@180, ResolutionCandidate@181 }
 }
 
-ResolutionTaskHolder@183 {
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@185 }
+ResolutionTaskHolder@182 {
+    <name not found> = ArrayList@183[2] { ResolutionCandidate@184, ResolutionCandidate@185 }
 }
 
-ResolutionTaskHolder@187 {
-    <name not found> = ArrayList@188[2] { ResolutionCandidate@189, ResolutionCandidate@190 }
-    <name not found> = ArrayList@191[2] { ResolutionCandidate@189, ResolutionCandidate@190 }
+ResolutionTaskHolder@186 {
+    <name not found> = ArrayList@187[2] { ResolutionCandidate@188, ResolutionCandidate@189 }
 }
 
-ResolutionTaskHolder@192 {
-    <name not found> = ArrayList@193[2] { ResolutionCandidate@194, ResolutionCandidate@195 }
-    <name not found> = ArrayList@196[2] { ResolutionCandidate@194, ResolutionCandidate@195 }
+ResolutionTaskHolder@190 {
+    <name not found> = ArrayList@191[2] { ResolutionCandidate@192, ResolutionCandidate@193 }
 }
 
-ResolutionTaskHolder@197 {
-    <name not found> = ArrayList@198[2] { ResolutionCandidate@199, ResolutionCandidate@200 }
-    <name not found> = ArrayList@201[2] { ResolutionCandidate@199, ResolutionCandidate@200 }
+ResolutionTaskHolder@194 {
+    <name not found> = ArrayList@195[2] { ResolutionCandidate@196, ResolutionCandidate@197 }
+}
+
+ResolutionTaskHolder@198 {
+    <name not found> = ArrayList@199[2] { ResolutionCandidate@200, ResolutionCandidate@201 }
 }
 
 ResolutionTaskHolder@202 {
     <name not found> = ArrayList@203[2] { ResolutionCandidate@204, ResolutionCandidate@205 }
-    <name not found> = ArrayList@206[2] { ResolutionCandidate@204, ResolutionCandidate@205 }
 }
 
-ResolutionTaskHolder@207 {
-    <name not found> = ArrayList@208[2] { ResolutionCandidate@209, ResolutionCandidate@210 }
-    <name not found> = ArrayList@211[2] { ResolutionCandidate@209, ResolutionCandidate@210 }
+ResolutionTaskHolder@206 {
+    <name not found> = ArrayList@207[4] { ResolutionCandidate@208, ResolutionCandidate@209, ResolutionCandidate@210, ... }
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
 }
 
-ResolutionTaskHolder@212 {
-    <name not found> = ArrayList@213[2] { ResolutionCandidate@214, ResolutionCandidate@215 }
-    <name not found> = ArrayList@216[2] { ResolutionCandidate@214, ResolutionCandidate@215 }
+ResolutionTaskHolder@211 {
+    <name not found> = ArrayList@212[4] { ResolutionCandidate@213, ResolutionCandidate@214, ResolutionCandidate@215, ... }
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+}
+
+ResolutionTaskHolder@216 {
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
 }
 
 ResolutionTaskHolder@217 {
-    <name not found> = ArrayList@218[2] { ResolutionCandidate@219, ResolutionCandidate@220 }
-    <name not found> = ArrayList@221[2] { ResolutionCandidate@219, ResolutionCandidate@220 }
-}
-
-ResolutionTaskHolder@222 {
-    <name not found> = ArrayList@223[2] { ResolutionCandidate@224, ResolutionCandidate@225 }
-    <name not found> = ArrayList@226[2] { ResolutionCandidate@224, ResolutionCandidate@225 }
-}
-
-ResolutionTaskHolder@227 {
-    <name not found> = ArrayList@228[2] { ResolutionCandidate@229, ResolutionCandidate@230 }
-    <name not found> = ArrayList@231[2] { ResolutionCandidate@229, ResolutionCandidate@230 }
-}
-
-ResolutionTaskHolder@232 {
-    <name not found> = ArrayList@233[2] { ResolutionCandidate@234, ResolutionCandidate@235 }
-    <name not found> = ArrayList@236[2] { ResolutionCandidate@234, ResolutionCandidate@235 }
-}
-
-ResolutionTaskHolder@237 {
-    <name not found> = ArrayList@238[4] { ResolutionCandidate@239, ResolutionCandidate@240, ResolutionCandidate@241, ... }
-    <name not found> = ArrayList@242[4] { ResolutionCandidate@239, ResolutionCandidate@240, ResolutionCandidate@241, ... }
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
@@ -445,15 +437,101 @@ ResolutionTaskHolder@237 {
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+}
+
+ResolutionTaskHolder@218 {
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+}
+
+ResolutionTaskHolder@219 {
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+}
+
+ResolutionTaskHolder@220 {
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+}
+
+ResolutionTaskHolder@221 {
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
 }
 
-ResolutionTaskHolder@243 {
-    <name not found> = ArrayList@244[4] { ResolutionCandidate@245, ResolutionCandidate@246, ResolutionCandidate@247, ... }
-    <name not found> = ArrayList@248[4] { ResolutionCandidate@245, ResolutionCandidate@246, ResolutionCandidate@247, ... }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
+ResolutionTaskHolder@222 {
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
@@ -468,25 +546,7 @@ ResolutionTaskHolder@243 {
     <name not found> = EmptyList@95[empty]
 }
 
-ResolutionTaskHolder@249 {
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
+ResolutionTaskHolder@223 {
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
@@ -501,7 +561,88 @@ ResolutionTaskHolder@249 {
     <name not found> = EmptyList@95[empty]
 }
 
-ResolutionTaskHolder@250 {
+null {
+    <name not found> = ArrayList@224[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@225[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@226[1] { ResolutionCandidate@126 }
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@153 }
+    <name not found> = ArrayList@228[1] { ResolutionCandidate@129 }
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@132 }
+    <name not found> = ArrayList@231[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@232[1] { ResolutionCandidate@141 }
+    <name not found> = ArrayList@233[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@234[1] { ResolutionCandidate@159 }
+    <name not found> = ArrayList@235[1] { ResolutionCandidate@147 }
+    <name not found> = ArrayList@236[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@237[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@238[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@239[1] { ResolutionCandidate@135 }
+    <name not found> = ArrayList@240[1] { ResolutionCandidate@162 }
+    <name not found> = ArrayList@241[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@242[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@243[1] { ResolutionCandidate@165 }
+    <name not found> = ArrayList@244[1] { ResolutionCandidate@156 }
+    <name not found> = ArrayList@245[2] { ResolutionCandidate@168, ResolutionCandidate@169 }
+    <name not found> = ArrayList@246[2] { ResolutionCandidate@176, ResolutionCandidate@177 }
+    <name not found> = ArrayList@247[2] { ResolutionCandidate@200, ResolutionCandidate@201 }
+    <name not found> = ArrayList@248[2] { ResolutionCandidate@196, ResolutionCandidate@197 }
+    <name not found> = ArrayList@249[2] { ResolutionCandidate@172, ResolutionCandidate@173 }
+    <name not found> = ArrayList@250[2] { ResolutionCandidate@180, ResolutionCandidate@181 }
+    <name not found> = ArrayList@251[2] { ResolutionCandidate@188, ResolutionCandidate@189 }
+    <name not found> = ArrayList@252[2] { ResolutionCandidate@184, ResolutionCandidate@185 }
+    <name not found> = ArrayList@253[2] { ResolutionCandidate@204, ResolutionCandidate@205 }
+    <name not found> = ArrayList@254[2] { ResolutionCandidate@192, ResolutionCandidate@193 }
+    <name not found> = ArrayList@255[4] { ResolutionCandidate@208, ResolutionCandidate@209, ResolutionCandidate@210, ... }
+    <name not found> = ArrayList@256[4] { ResolutionCandidate@213, ResolutionCandidate@214, ResolutionCandidate@215, ... }
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
@@ -533,141 +674,3 @@ ResolutionTaskHolder@250 {
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
 }
-
-ResolutionTaskHolder@251 {
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@252 {
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@253 {
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@254 {
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@255 {
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@256 {
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/generics/PseudoRawTypes.lazy.log b/compiler/testData/diagnostics/tests/generics/PseudoRawTypes.lazy.log
index 14e88853386..b49573df5fa 100644
--- a/compiler/testData/diagnostics/tests/generics/PseudoRawTypes.lazy.log
+++ b/compiler/testData/diagnostics/tests/generics/PseudoRawTypes.lazy.log
@@ -61,10 +61,13 @@ LazyJavaPackageFragment@42['test'] {
 
 ResolutionTaskHolder@53 {
     <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+}
+
+null {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@55 }
 }
diff --git a/compiler/testData/diagnostics/tests/generics/RawTypeInIsExpression.lazy.log b/compiler/testData/diagnostics/tests/generics/RawTypeInIsExpression.lazy.log
index b407915123a..5c32873f52d 100644
--- a/compiler/testData/diagnostics/tests/generics/RawTypeInIsExpression.lazy.log
+++ b/compiler/testData/diagnostics/tests/generics/RawTypeInIsExpression.lazy.log
@@ -33,45 +33,48 @@ LazyJavaPackageFragment@8['java'] {
 
 ResolutionTaskHolder@33 {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+}
+
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
 }
 
 ResolutionTaskHolder@45 {
     <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
+}
+
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
 }
 
 ResolutionTaskHolder@57 {
     <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
+}
+
+null {
     <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@56 }
 }
diff --git a/compiler/testData/diagnostics/tests/generics/RawTypeInIsPattern.lazy.log b/compiler/testData/diagnostics/tests/generics/RawTypeInIsPattern.lazy.log
index a2e1f07d0a5..4b08f03c5ff 100644
--- a/compiler/testData/diagnostics/tests/generics/RawTypeInIsPattern.lazy.log
+++ b/compiler/testData/diagnostics/tests/generics/RawTypeInIsPattern.lazy.log
@@ -35,5 +35,8 @@ LazyJavaPackageFragment@8['java'] {
 
 ResolutionTaskHolder@33 {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
+}
+
+null {
     <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
 }
diff --git a/compiler/testData/diagnostics/tests/generics/RecursiveUpperBoundCheck.lazy.log b/compiler/testData/diagnostics/tests/generics/RecursiveUpperBoundCheck.lazy.log
index 11ab49cd587..eaf3664fd73 100644
--- a/compiler/testData/diagnostics/tests/generics/RecursiveUpperBoundCheck.lazy.log
+++ b/compiler/testData/diagnostics/tests/generics/RecursiveUpperBoundCheck.lazy.log
@@ -28,10 +28,13 @@ LazyJavaPackageFragment@8['java'] {
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
 }
 
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+}
+
+null {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@30 }
 }
diff --git a/compiler/testData/diagnostics/tests/generics/recursive.lazy.log b/compiler/testData/diagnostics/tests/generics/recursive.lazy.log
index beda9c23991..031fdbe6398 100644
--- a/compiler/testData/diagnostics/tests/generics/recursive.lazy.log
+++ b/compiler/testData/diagnostics/tests/generics/recursive.lazy.log
@@ -32,40 +32,43 @@ LazyJavaPackageFragment@8['java'] {
 
 ResolutionTaskHolder@30 {
     <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
 }
 
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+}
+
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
 }
 
 ResolutionTaskHolder@42 {
     <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
+null {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@47 }
 }
diff --git a/compiler/testData/diagnostics/tests/generics/tpAsReified/Conventions.lazy.log b/compiler/testData/diagnostics/tests/generics/tpAsReified/Conventions.lazy.log
index 2570ca3877c..85c76b0bad5 100644
--- a/compiler/testData/diagnostics/tests/generics/tpAsReified/Conventions.lazy.log
+++ b/compiler/testData/diagnostics/tests/generics/tpAsReified/Conventions.lazy.log
@@ -68,74 +68,77 @@ LazyJavaPackageFragment@17['lang'] {
 
 ResolutionTaskHolder@45 {
     <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
     <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
     <name not found> = EmptyList@37[empty]
 }
 
 ResolutionTaskHolder@57 {
     <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
+}
+
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
 }
 
 ResolutionTaskHolder@69 {
     <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[2] { ResolutionCandidate@87, ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[2] { ResolutionCandidate@87, ResolutionCandidate@88 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[2] { ResolutionCandidate@77, ResolutionCandidate@78 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[2] { ResolutionCandidate@92, ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[2] { ResolutionCandidate@92, ResolutionCandidate@93 }
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[2] { ResolutionCandidate@81, ResolutionCandidate@82 }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+}
+
+null {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@93[2] { ResolutionCandidate@77, ResolutionCandidate@78 }
+    <name not found> = ArrayList@94[2] { ResolutionCandidate@81, ResolutionCandidate@82 }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
diff --git a/compiler/testData/diagnostics/tests/generics/tpAsReified/InConstructor.lazy.log b/compiler/testData/diagnostics/tests/generics/tpAsReified/InConstructor.lazy.log
index 8a69708d6f3..a7a7d90a446 100644
--- a/compiler/testData/diagnostics/tests/generics/tpAsReified/InConstructor.lazy.log
+++ b/compiler/testData/diagnostics/tests/generics/tpAsReified/InConstructor.lazy.log
@@ -43,50 +43,53 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@34 {
     <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
+}
+
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
 ResolutionTaskHolder@46 {
     <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+null {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@48 }
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/generics/tpAsReified/InFunction.lazy.log b/compiler/testData/diagnostics/tests/generics/tpAsReified/InFunction.lazy.log
index 6e96d5e0293..7c2d9869b0d 100644
--- a/compiler/testData/diagnostics/tests/generics/tpAsReified/InFunction.lazy.log
+++ b/compiler/testData/diagnostics/tests/generics/tpAsReified/InFunction.lazy.log
@@ -62,14 +62,14 @@ LazyJavaClassifierType@34['String'] {
 
 LazyJavaClassifierType@37['String'] {
     arguments = ArrayList@38[empty]
-    classifier = JavaClassImpl@31['String']
+    classifier = JavaClassImpl@36['String']
     nullable = 'true': Boolean@39
     typeConstructor = DeserializedClassTypeConstructor@33
 }
 
 LazyJavaClassifierType@40['String'] {
     arguments = ArrayList@41[empty]
-    classifier = JavaClassImpl@36['String']
+    classifier = JavaClassImpl@31['String']
     nullable = 'true': Boolean@39
     typeConstructor = DeserializedClassTypeConstructor@33
 }
@@ -90,14 +90,14 @@ LazyJavaClassifierType@46['Throwable'] {
 
 LazyJavaClassifierType@49['Throwable'] {
     arguments = ArrayList@50[empty]
-    classifier = JavaClassImpl@48['Throwable']
+    classifier = JavaClassImpl@44['Throwable']
     nullable = 'true': Boolean@39
     typeConstructor = DeserializedClassTypeConstructor@45
 }
 
 LazyJavaClassifierType@51['Throwable'] {
     arguments = ArrayList@52[empty]
-    classifier = JavaClassImpl@44['Throwable']
+    classifier = JavaClassImpl@48['Throwable']
     nullable = 'true': Boolean@39
     typeConstructor = DeserializedClassTypeConstructor@45
 }
@@ -163,66 +163,87 @@ LazyJavaPackageFragment@65['lang'] {
     memberIndex = computeMemberIndex$1@92 // through LazyPackageFragmentScopeForJavaPackage@91
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
 }
 
 ResolutionTaskHolder@96 {
     <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
 }
 
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
+}
+
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
 }
 
 ResolutionTaskHolder@108 {
     <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
 }
 
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
+ResolutionTaskHolder@111 {
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
 }
 
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
+}
+
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
 }
 
 ResolutionTaskHolder@120 {
     <name not found> = ArrayList@121[4] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
-    <name not found> = ArrayList@125[4] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
+}
+
+null {
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@113 }
+    <name not found> = ArrayList@134[4] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/generics/tpAsReified/InProperty.lazy.log b/compiler/testData/diagnostics/tests/generics/tpAsReified/InProperty.lazy.log
index 508f348da5d..7a30902c132 100644
--- a/compiler/testData/diagnostics/tests/generics/tpAsReified/InProperty.lazy.log
+++ b/compiler/testData/diagnostics/tests/generics/tpAsReified/InProperty.lazy.log
@@ -84,14 +84,14 @@ LazyJavaClassifierType@42['Throwable'] {
 
 LazyJavaClassifierType@45['Throwable'] {
     arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@44['Throwable']
+    classifier = JavaClassImpl@40['Throwable']
     nullable = 'true': Boolean@35
     typeConstructor = DeserializedClassTypeConstructor@41
 }
 
 LazyJavaClassifierType@47['Throwable'] {
     arguments = ArrayList@48[empty]
-    classifier = JavaClassImpl@40['Throwable']
+    classifier = JavaClassImpl@44['Throwable']
     nullable = 'true': Boolean@35
     typeConstructor = DeserializedClassTypeConstructor@41
 }
@@ -150,33 +150,36 @@ LazyJavaPackageFragment@60['lang'] {
 
 ResolutionTaskHolder@85 {
     <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@77[empty]
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
     <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@77[empty]
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
     <name not found> = EmptyList@77[empty]
 }
 
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
+}
+
 ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@98[4] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[4] { ResolutionCandidate@103, ResolutionCandidate@104, ResolutionCandidate@105, ... }
-    <name not found> = ArrayList@106[4] { ResolutionCandidate@103, ResolutionCandidate@104, ResolutionCandidate@105, ... }
+null {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@106[4] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
+    <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
diff --git a/compiler/testData/diagnostics/tests/generics/tpAsReified/InlineableReified.lazy.log b/compiler/testData/diagnostics/tests/generics/tpAsReified/InlineableReified.lazy.log
index 10ddc73dc60..8888cf06595 100644
--- a/compiler/testData/diagnostics/tests/generics/tpAsReified/InlineableReified.lazy.log
+++ b/compiler/testData/diagnostics/tests/generics/tpAsReified/InlineableReified.lazy.log
@@ -59,38 +59,41 @@ LazyJavaPackageFragment@17['lang'] {
 
 ResolutionTaskHolder@42 {
     <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+}
+
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
 }
 
 ResolutionTaskHolder@54 {
     <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
+null {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@47 }
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/generics/tpAsReified/LocalFun.lazy.log b/compiler/testData/diagnostics/tests/generics/tpAsReified/LocalFun.lazy.log
index 3f9aeee6f3d..c034d483638 100644
--- a/compiler/testData/diagnostics/tests/generics/tpAsReified/LocalFun.lazy.log
+++ b/compiler/testData/diagnostics/tests/generics/tpAsReified/LocalFun.lazy.log
@@ -43,10 +43,13 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@32 {
     <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
 }
 
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+}
+
+null {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@37 }
 }
diff --git a/compiler/testData/diagnostics/tests/generics/tpAsReified/ReifiedClass.lazy.log b/compiler/testData/diagnostics/tests/generics/tpAsReified/ReifiedClass.lazy.log
index 64efec86200..58265010e12 100644
--- a/compiler/testData/diagnostics/tests/generics/tpAsReified/ReifiedClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/generics/tpAsReified/ReifiedClass.lazy.log
@@ -56,14 +56,14 @@ LazyJavaClassifierType@30['String'] {
 
 LazyJavaClassifierType@33['String'] {
     arguments = ArrayList@34[empty]
-    classifier = JavaClassImpl@32['String']
+    classifier = JavaClassImpl@27['String']
     nullable = 'true': Boolean@35
     typeConstructor = DeserializedClassTypeConstructor@29
 }
 
 LazyJavaClassifierType@36['String'] {
     arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@27['String']
+    classifier = JavaClassImpl@32['String']
     nullable = 'true': Boolean@35
     typeConstructor = DeserializedClassTypeConstructor@29
 }
@@ -84,14 +84,14 @@ LazyJavaClassifierType@42['Throwable'] {
 
 LazyJavaClassifierType@45['Throwable'] {
     arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@40['Throwable']
+    classifier = JavaClassImpl@44['Throwable']
     nullable = 'true': Boolean@35
     typeConstructor = DeserializedClassTypeConstructor@41
 }
 
 LazyJavaClassifierType@47['Throwable'] {
     arguments = ArrayList@48[empty]
-    classifier = JavaClassImpl@44['Throwable']
+    classifier = JavaClassImpl@40['Throwable']
     nullable = 'true': Boolean@35
     typeConstructor = DeserializedClassTypeConstructor@41
 }
@@ -141,15 +141,18 @@ LazyJavaPackageFragment@59['lang'] {
 
 ResolutionTaskHolder@77 {
     <name not found> = ArrayList@78[4] { ResolutionCandidate@79, ResolutionCandidate@80, ResolutionCandidate@81, ... }
-    <name not found> = ArrayList@82[4] { ResolutionCandidate@79, ResolutionCandidate@80, ResolutionCandidate@81, ... }
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+}
+
+null {
+    <name not found> = ArrayList@82[4] { ResolutionCandidate@79, ResolutionCandidate@80, ResolutionCandidate@81, ... }
     <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]
diff --git a/compiler/testData/diagnostics/tests/generics/varProjection/setterNotProjectedOutAssign.lazy.log b/compiler/testData/diagnostics/tests/generics/varProjection/setterNotProjectedOutAssign.lazy.log
index 4ba49ac0362..5fc39a67882 100644
--- a/compiler/testData/diagnostics/tests/generics/varProjection/setterNotProjectedOutAssign.lazy.log
+++ b/compiler/testData/diagnostics/tests/generics/varProjection/setterNotProjectedOutAssign.lazy.log
@@ -55,44 +55,47 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@44 {
     <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
+}
+
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
 }
 
 ResolutionTaskHolder@56 {
     <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+null {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@49 }
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutAssign.lazy.log b/compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutAssign.lazy.log
index 8a217ff0bbf..6b4dd2ab253 100644
--- a/compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutAssign.lazy.log
+++ b/compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutAssign.lazy.log
@@ -60,44 +60,47 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@49 {
     <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
+}
+
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
 }
 
 ResolutionTaskHolder@61 {
     <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
+null {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@63 }
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutNoPlusAssign.lazy.log b/compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutNoPlusAssign.lazy.log
index 5a178f89507..90680bab230 100644
--- a/compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutNoPlusAssign.lazy.log
+++ b/compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutNoPlusAssign.lazy.log
@@ -40,36 +40,25 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
 }
 
 ResolutionTaskHolder@43 {
     <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
+ResolutionTaskHolder@46 {
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
@@ -95,3 +84,17 @@ ResolutionTaskHolder@51 {
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
 }
+
+null {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@45 }
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutPlusAssignDefined.lazy.log b/compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutPlusAssignDefined.lazy.log
index 01a4059fe8d..7db54981e48 100644
--- a/compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutPlusAssignDefined.lazy.log
+++ b/compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutPlusAssignDefined.lazy.log
@@ -39,12 +39,6 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@30 {
     <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
@@ -70,27 +64,36 @@ ResolutionTaskHolder@30 {
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+}
+
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
 }
 
 ResolutionTaskHolder@42 {
     <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
+null {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@32 }
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/imports/ImportResolutionOrder.lazy.log b/compiler/testData/diagnostics/tests/imports/ImportResolutionOrder.lazy.log
index 99c385fa36b..e9e16518f02 100644
--- a/compiler/testData/diagnostics/tests/imports/ImportResolutionOrder.lazy.log
+++ b/compiler/testData/diagnostics/tests/imports/ImportResolutionOrder.lazy.log
@@ -36,16 +36,19 @@ LazyJavaPackageFragment@17['lang'] {
 
 ResolutionTaskHolder@32 {
     <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+}
+
+null {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@37 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
diff --git a/compiler/testData/diagnostics/tests/imports/RenameOnImport.lazy.log b/compiler/testData/diagnostics/tests/imports/RenameOnImport.lazy.log
index bb86fa81a22..3bd851c8e03 100644
--- a/compiler/testData/diagnostics/tests/imports/RenameOnImport.lazy.log
+++ b/compiler/testData/diagnostics/tests/imports/RenameOnImport.lazy.log
@@ -32,7 +32,10 @@ LazyJavaPackageFragment@14['lang'] {
 
 ResolutionTaskHolder@26 {
     <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+}
+
+null {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
     <name not found> = EmptyList@22[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/NoSenselessComparisonForErrorType.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/NoSenselessComparisonForErrorType.lazy.log
index ff87911fd3f..56e4491db92 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/NoSenselessComparisonForErrorType.lazy.log
+++ b/compiler/testData/diagnostics/tests/incompleteCode/NoSenselessComparisonForErrorType.lazy.log
@@ -28,19 +28,13 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@24 {
     <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
 }
 
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
+ResolutionTaskHolder@27 {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
 }
 
-ResolutionTaskHolder@32 {
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
+ResolutionTaskHolder@30 {
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
@@ -59,9 +53,7 @@ ResolutionTaskHolder@32 {
     <name not found> = EmptyList@19[empty]
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
+ResolutionTaskHolder@31 {
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
@@ -71,3 +63,14 @@ ResolutionTaskHolder@33 {
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
 }
+
+null {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@26 }
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@29 }
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/SupertypeOfErrorType.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/SupertypeOfErrorType.lazy.log
index 059afb3730b..e851bc3f070 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/SupertypeOfErrorType.lazy.log
+++ b/compiler/testData/diagnostics/tests/incompleteCode/SupertypeOfErrorType.lazy.log
@@ -175,28 +175,28 @@ LazyJavaClassifierType@113['T'] {
 
 LazyJavaClassifierType@116['T'] {
     arguments = ArrayList@117[empty]
-    classifier = JavaTypeParameterImpl@115['T']
+    classifier = JavaTypeParameterImpl@109['T']
     nullable = 'true': Boolean@83
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
 }
 
 LazyJavaClassifierType@118['T'] {
     arguments = ArrayList@119[empty]
-    classifier = JavaTypeParameterImpl@105['T']
+    classifier = JavaTypeParameterImpl@112['T']
     nullable = 'true': Boolean@83
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
 }
 
 LazyJavaClassifierType@120['T'] {
     arguments = ArrayList@121[empty]
-    classifier = JavaTypeParameterImpl@109['T']
+    classifier = JavaTypeParameterImpl@115['T']
     nullable = 'true': Boolean@83
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
 }
 
 LazyJavaClassifierType@122['T'] {
     arguments = ArrayList@123[empty]
-    classifier = JavaTypeParameterImpl@112['T']
+    classifier = JavaTypeParameterImpl@105['T']
     nullable = 'true': Boolean@83
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
 }
@@ -285,101 +285,104 @@ LazyJavaTypeParameterResolver@193 {
 }
 
 LazyJavaTypeParameterResolver@195 {
-    resolve(JavaTypeParameterImpl@112['T']) = null
+    resolve(JavaTypeParameterImpl@109['T']) = null
 }
 
 LazyJavaTypeParameterResolver@196 {
-    resolve(JavaTypeParameterImpl@115['T']) = null
+    resolve(JavaTypeParameterImpl@105['T']) = null
 }
 
 ResolutionTaskHolder@197 {
     <name not found> = ArrayList@198[1] { ResolutionCandidate@199 }
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@199 }
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@202 }
-    <name not found> = EmptyList@15[empty]
+    <name not found> = ArrayList@200[1] { ResolutionCandidate@201 }
     <name not found> = EmptyList@15[empty]
 }
 
-ResolutionTaskHolder@204 {
+ResolutionTaskHolder@202 {
+    <name not found> = ArrayList@203[1] { ResolutionCandidate@204 }
     <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@206 }
+    <name not found> = EmptyList@15[empty]
+}
+
+ResolutionTaskHolder@207 {
     <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@209 }
     <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
 }
 
-ResolutionTaskHolder@211 {
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@213 }
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@213 }
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
+ResolutionTaskHolder@210 {
+    <name not found> = ArrayList@211[1] { ResolutionCandidate@212 }
 }
 
-ResolutionTaskHolder@215 {
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@217 }
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@217 }
+ResolutionTaskHolder@213 {
+    <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
+}
+
+ResolutionTaskHolder@216 {
+    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
 }
 
 ResolutionTaskHolder@219 {
     <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@221 }
 }
 
-ResolutionTaskHolder@223 {
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@225 }
+ResolutionTaskHolder@222 {
+    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
 }
 
-ResolutionTaskHolder@227 {
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@229 }
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@229 }
+ResolutionTaskHolder@225 {
+    <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
+}
+
+ResolutionTaskHolder@228 {
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
 }
 
 ResolutionTaskHolder@231 {
     <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@233 }
 }
 
-ResolutionTaskHolder@235 {
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@237 }
+ResolutionTaskHolder@234 {
+    <name not found> = ArrayList@235[1] { ResolutionCandidate@236 }
 }
 
-ResolutionTaskHolder@239 {
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@241 }
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@241 }
+ResolutionTaskHolder@237 {
+    <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
 }
 
-ResolutionTaskHolder@243 {
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@245 }
+ResolutionTaskHolder@240 {
+    <name not found> = ArrayList@241[2] { ResolutionCandidate@242, ResolutionCandidate@243 }
 }
 
-ResolutionTaskHolder@247 {
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@249 }
+ResolutionTaskHolder@244 {
+    <name not found> = ArrayList@245[7] { ResolutionCandidate@246, ResolutionCandidate@247, ResolutionCandidate@248, ... }
 }
 
-ResolutionTaskHolder@251 {
-    <name not found> = ArrayList@252[1] { ResolutionCandidate@253 }
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@253 }
+ResolutionTaskHolder@249 {
+    <name not found> = ArrayList@250[8] { ResolutionCandidate@251, ResolutionCandidate@252, ResolutionCandidate@253, ... }
 }
 
-ResolutionTaskHolder@255 {
-    <name not found> = ArrayList@256[2] { ResolutionCandidate@257, ResolutionCandidate@258 }
-    <name not found> = ArrayList@259[2] { ResolutionCandidate@257, ResolutionCandidate@258 }
-}
-
-ResolutionTaskHolder@260 {
-    <name not found> = ArrayList@261[7] { ResolutionCandidate@262, ResolutionCandidate@263, ResolutionCandidate@264, ... }
-    <name not found> = ArrayList@265[7] { ResolutionCandidate@262, ResolutionCandidate@263, ResolutionCandidate@264, ... }
-}
-
-ResolutionTaskHolder@266 {
-    <name not found> = ArrayList@267[8] { ResolutionCandidate@268, ResolutionCandidate@269, ResolutionCandidate@270, ... }
-    <name not found> = ArrayList@271[8] { ResolutionCandidate@268, ResolutionCandidate@269, ResolutionCandidate@270, ... }
+null {
+    <name not found> = ArrayList@254[1] { ResolutionCandidate@239 }
+    <name not found> = ArrayList@255[1] { ResolutionCandidate@209 }
+    <name not found> = ArrayList@256[1] { ResolutionCandidate@218 }
+    <name not found> = ArrayList@257[1] { ResolutionCandidate@204 }
+    <name not found> = ArrayList@258[1] { ResolutionCandidate@206 }
+    <name not found> = ArrayList@259[1] { ResolutionCandidate@233 }
+    <name not found> = ArrayList@260[1] { ResolutionCandidate@199 }
+    <name not found> = ArrayList@261[1] { ResolutionCandidate@201 }
+    <name not found> = ArrayList@262[1] { ResolutionCandidate@227 }
+    <name not found> = ArrayList@263[1] { ResolutionCandidate@212 }
+    <name not found> = ArrayList@264[1] { ResolutionCandidate@224 }
+    <name not found> = ArrayList@265[1] { ResolutionCandidate@230 }
+    <name not found> = ArrayList@266[1] { ResolutionCandidate@221 }
+    <name not found> = ArrayList@267[1] { ResolutionCandidate@236 }
+    <name not found> = ArrayList@268[1] { ResolutionCandidate@215 }
+    <name not found> = ArrayList@269[2] { ResolutionCandidate@242, ResolutionCandidate@243 }
+    <name not found> = ArrayList@270[7] { ResolutionCandidate@246, ResolutionCandidate@247, ResolutionCandidate@248, ... }
+    <name not found> = ArrayList@271[8] { ResolutionCandidate@251, ResolutionCandidate@252, ResolutionCandidate@253, ... }
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/arrayBracketsRange.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/arrayBracketsRange.lazy.log
index e71b6dcdca7..8024dbc1a6b 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/arrayBracketsRange.lazy.log
+++ b/compiler/testData/diagnostics/tests/incompleteCode/arrayBracketsRange.lazy.log
@@ -36,84 +36,87 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@32 {
     <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
+}
+
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
 }
 
 ResolutionTaskHolder@44 {
     <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
+}
+
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
 }
 
 ResolutionTaskHolder@56 {
     <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
+}
+
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
 }
 
 ResolutionTaskHolder@68 {
     <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
 }
 
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[7] { ResolutionCandidate@79, ResolutionCandidate@80, ResolutionCandidate@81, ... }
 }
 
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[7] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
-    <name not found> = ArrayList@97[7] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
+null {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@97[7] { ResolutionCandidate@79, ResolutionCandidate@80, ResolutionCandidate@81, ... }
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/checkNothingIsSubtype.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/checkNothingIsSubtype.lazy.log
index 8e813df517f..6d1f67084bd 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/checkNothingIsSubtype.lazy.log
+++ b/compiler/testData/diagnostics/tests/incompleteCode/checkNothingIsSubtype.lazy.log
@@ -44,14 +44,17 @@ LazyJavaPackageFragment@17['lang'] {
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+}
+
+null {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@42 }
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/controlStructuresErrors.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/controlStructuresErrors.lazy.log
index d4034049571..cc05c21600e 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/controlStructuresErrors.lazy.log
+++ b/compiler/testData/diagnostics/tests/incompleteCode/controlStructuresErrors.lazy.log
@@ -74,47 +74,217 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@54 {
     <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
+}
+
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
 }
 
 ResolutionTaskHolder@66 {
     <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
+}
+
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
 }
 
 ResolutionTaskHolder@78 {
     <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
+}
+
+ResolutionTaskHolder@81 {
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
 }
 
 ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+}
+
+ResolutionTaskHolder@83 {
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+}
+
+ResolutionTaskHolder@84 {
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+}
+
+ResolutionTaskHolder@85 {
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
 }
 
 ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+}
+
+ResolutionTaskHolder@87 {
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+}
+
+ResolutionTaskHolder@88 {
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+}
+
+ResolutionTaskHolder@89 {
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
 }
 
 ResolutionTaskHolder@90 {
@@ -130,24 +300,6 @@ ResolutionTaskHolder@90 {
     <name not found> = EmptyList@42[empty]
     <name not found> = EmptyList@42[empty]
     <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
 }
 
 ResolutionTaskHolder@91 {
@@ -159,18 +311,6 @@ ResolutionTaskHolder@91 {
     <name not found> = EmptyList@42[empty]
     <name not found> = EmptyList@42[empty]
     <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
 }
 
 ResolutionTaskHolder@92 {
@@ -182,18 +322,6 @@ ResolutionTaskHolder@92 {
     <name not found> = EmptyList@42[empty]
     <name not found> = EmptyList@42[empty]
     <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
 }
 
 ResolutionTaskHolder@93 {
@@ -205,18 +333,6 @@ ResolutionTaskHolder@93 {
     <name not found> = EmptyList@42[empty]
     <name not found> = EmptyList@42[empty]
     <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
 }
 
 ResolutionTaskHolder@94 {
@@ -228,18 +344,6 @@ ResolutionTaskHolder@94 {
     <name not found> = EmptyList@42[empty]
     <name not found> = EmptyList@42[empty]
     <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
 }
 
 ResolutionTaskHolder@95 {
@@ -251,18 +355,6 @@ ResolutionTaskHolder@95 {
     <name not found> = EmptyList@42[empty]
     <name not found> = EmptyList@42[empty]
     <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
 }
 
 ResolutionTaskHolder@96 {
@@ -274,18 +366,6 @@ ResolutionTaskHolder@96 {
     <name not found> = EmptyList@42[empty]
     <name not found> = EmptyList@42[empty]
     <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
 }
 
 ResolutionTaskHolder@97 {
@@ -297,18 +377,6 @@ ResolutionTaskHolder@97 {
     <name not found> = EmptyList@42[empty]
     <name not found> = EmptyList@42[empty]
     <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
 }
 
 ResolutionTaskHolder@98 {
@@ -320,21 +388,60 @@ ResolutionTaskHolder@98 {
     <name not found> = EmptyList@42[empty]
     <name not found> = EmptyList@42[empty]
     <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
 }
 
-ResolutionTaskHolder@99 {
+null {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@77 }
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
     <name not found> = EmptyList@42[empty]
     <name not found> = EmptyList@42[empty]
     <name not found> = EmptyList@42[empty]
@@ -351,107 +458,3 @@ ResolutionTaskHolder@99 {
     <name not found> = EmptyList@42[empty]
     <name not found> = EmptyList@42[empty]
 }
-
-ResolutionTaskHolder@100 {
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/arrayExpression.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/arrayExpression.lazy.log
index 7489b54dd54..6178508d781 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/arrayExpression.lazy.log
+++ b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/arrayExpression.lazy.log
@@ -29,17 +29,13 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@26 {
     <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
 }
 
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
+ResolutionTaskHolder@29 {
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
 }
 
-ResolutionTaskHolder@34 {
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
+ResolutionTaskHolder@32 {
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
@@ -49,3 +45,10 @@ ResolutionTaskHolder@34 {
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
 }
+
+null {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@28 }
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@31 }
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/checkBackingFieldException.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/checkBackingFieldException.lazy.log
index bce2de3ec18..144b4203578 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/checkBackingFieldException.lazy.log
+++ b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/checkBackingFieldException.lazy.log
@@ -51,62 +51,38 @@ LazyJavaPackageFragment@16['lang'] {
 
 ResolutionTaskHolder@46 {
     <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@36[empty]
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
     <name not found> = EmptyList@36[empty]
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@36[empty]
 }
 
 ResolutionTaskHolder@58 {
     <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[7] { ResolutionCandidate@66, ResolutionCandidate@67, ResolutionCandidate@68, ... }
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[7] { ResolutionCandidate@72, ResolutionCandidate@73, ResolutionCandidate@74, ... }
-    <name not found> = ArrayList@75[7] { ResolutionCandidate@72, ResolutionCandidate@73, ResolutionCandidate@74, ... }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
+ResolutionTaskHolder@69 {
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
@@ -157,19 +133,7 @@ ResolutionTaskHolder@76 {
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
+ResolutionTaskHolder@70 {
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
@@ -220,13 +184,7 @@ ResolutionTaskHolder@77 {
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
+ResolutionTaskHolder@71 {
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
@@ -253,7 +211,52 @@ ResolutionTaskHolder@78 {
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@79 {
+ResolutionTaskHolder@72 {
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+}
+
+null {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@79[7] { ResolutionCandidate@66, ResolutionCandidate@67, ResolutionCandidate@68, ... }
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/completeFunctionArgumentsOfNestedCalls.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/completeFunctionArgumentsOfNestedCalls.lazy.log
index f667cebf7d0..8378ee26d06 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/completeFunctionArgumentsOfNestedCalls.lazy.log
+++ b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/completeFunctionArgumentsOfNestedCalls.lazy.log
@@ -26,13 +26,7 @@ LazyJavaPackageFragment@7['lang'] {
 
 ResolutionTaskHolder@21 {
     <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@23 }
-    <name not found> = ArrayList@25[8] { ResolutionCandidate@26, ResolutionCandidate@27, ResolutionCandidate@28, ... }
-    <name not found> = ArrayList@29[8] { ResolutionCandidate@26, ResolutionCandidate@27, ResolutionCandidate@28, ... }
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
+    <name not found> = ArrayList@24[8] { ResolutionCandidate@25, ResolutionCandidate@26, ResolutionCandidate@27, ... }
     <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
@@ -57,57 +51,66 @@ ResolutionTaskHolder@21 {
     <name not found> = EmptyList@15[empty]
 }
 
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
+}
+
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
 }
 
 ResolutionTaskHolder@34 {
     <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+}
+
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
 }
 
 ResolutionTaskHolder@46 {
     <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
 }
 
 ResolutionTaskHolder@58 {
     <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+null {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@23 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@73[8] { ResolutionCandidate@25, ResolutionCandidate@26, ResolutionCandidate@27, ... }
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteEnumReference.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteEnumReference.lazy.log
index 904c9b60444..d6f22af9060 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteEnumReference.lazy.log
+++ b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteEnumReference.lazy.log
@@ -34,6 +34,9 @@ ResolutionTaskHolder@21 {
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
+}
+
+null {
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteWhen.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteWhen.lazy.log
index 0eda65e4551..5b1456948f8 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteWhen.lazy.log
+++ b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteWhen.lazy.log
@@ -23,5 +23,8 @@ LazyJavaPackageFragment@5['java'] {
 
 ResolutionTaskHolder@21 {
     <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
+}
+
+null {
     <name not found> = ArrayList@24[1] { ResolutionCandidate@23 }
 }
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/noTypeParamsInReturnType.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/noTypeParamsInReturnType.lazy.log
index 20b6ed1de09..924c039f6ab 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/noTypeParamsInReturnType.lazy.log
+++ b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/noTypeParamsInReturnType.lazy.log
@@ -33,21 +33,21 @@ LazyJavaClassifierType@19['String'] {
 
 LazyJavaClassifierType@22['String'] {
     arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@21['String']
+    classifier = JavaClassImpl@18['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
 
 LazyJavaClassifierType@25['String'] {
     arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@13['String']
+    classifier = JavaClassImpl@21['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@18['String']
+    classifier = JavaClassImpl@13['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
@@ -82,14 +82,14 @@ LazyJavaClassifierType@39['Throwable'] {
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@31['Throwable']
+    classifier = JavaClassImpl@35['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
 
 LazyJavaClassifierType@43['Throwable'] {
     arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@35['Throwable']
+    classifier = JavaClassImpl@31['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
@@ -151,10 +151,6 @@ LazyJavaPackageFragment@64['lang'] {
 
 ResolutionTaskHolder@90 {
     <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
@@ -172,27 +168,34 @@ ResolutionTaskHolder@90 {
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[4] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102, ... }
-    <name not found> = ArrayList@103[5] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102, ... }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[4] { ResolutionCandidate@98, ResolutionCandidate@99, ResolutionCandidate@100, ... }
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[4] { ResolutionCandidate@106, ResolutionCandidate@107, ResolutionCandidate@108, ... }
-    <name not found> = ArrayList@109[5] { ResolutionCandidate@106, ResolutionCandidate@107, ResolutionCandidate@108, ... }
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[4] { ResolutionCandidate@103, ResolutionCandidate@104, ResolutionCandidate@105, ... }
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+}
+
+null {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@108[5] { ResolutionCandidate@103, ResolutionCandidate@104, ResolutionCandidate@105, ... }
+    <name not found> = ArrayList@109[5] { ResolutionCandidate@98, ResolutionCandidate@99, ResolutionCandidate@100, ... }
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/inExpr.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/inExpr.lazy.log
index 9a8ece7e218..4d6c60e4308 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/inExpr.lazy.log
+++ b/compiler/testData/diagnostics/tests/incompleteCode/inExpr.lazy.log
@@ -21,5 +21,8 @@ LazyJavaPackageFragment@5['java'] {
 
 ResolutionTaskHolder@21 {
     <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
+}
+
+null {
     <name not found> = ArrayList@24[1] { ResolutionCandidate@23 }
 }
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/incompleteAssignment.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/incompleteAssignment.lazy.log
index 8bcbb4f2409..720743b491a 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/incompleteAssignment.lazy.log
+++ b/compiler/testData/diagnostics/tests/incompleteCode/incompleteAssignment.lazy.log
@@ -158,77 +158,77 @@ LazyJavaClassifierType@83['String'] {
 
 LazyJavaClassifierType@86['String'] {
     arguments = ArrayList@87[empty]
-    classifier = JavaClassImpl@79['String']
+    classifier = JavaClassImpl@82['String']
     nullable = 'true': Boolean@47
     typeConstructor = DeserializedClassTypeConstructor@55
 }
 
 LazyJavaClassifierType@88['String'] {
     arguments = ArrayList@89[empty]
-    classifier = JavaClassImpl@73['String']
+    classifier = JavaClassImpl@67['String']
     nullable = 'true': Boolean@47
     typeConstructor = DeserializedClassTypeConstructor@55
 }
 
 LazyJavaClassifierType@90['String'] {
     arguments = ArrayList@91[empty]
-    classifier = JavaClassImpl@54['String']
+    classifier = JavaClassImpl@79['String']
     nullable = 'true': Boolean@47
     typeConstructor = DeserializedClassTypeConstructor@55
 }
 
 LazyJavaClassifierType@92['String'] {
     arguments = ArrayList@93[empty]
-    classifier = JavaClassImpl@76['String']
+    classifier = JavaClassImpl@54['String']
     nullable = 'true': Boolean@47
     typeConstructor = DeserializedClassTypeConstructor@55
 }
 
 LazyJavaClassifierType@94['String'] {
     arguments = ArrayList@95[empty]
-    classifier = JavaClassImpl@61['String']
+    classifier = JavaClassImpl@70['String']
     nullable = 'true': Boolean@47
     typeConstructor = DeserializedClassTypeConstructor@55
 }
 
 LazyJavaClassifierType@96['String'] {
     arguments = ArrayList@97[empty]
-    classifier = JavaClassImpl@70['String']
+    classifier = JavaClassImpl@85['String']
     nullable = 'true': Boolean@47
     typeConstructor = DeserializedClassTypeConstructor@55
 }
 
 LazyJavaClassifierType@98['String'] {
     arguments = ArrayList@99[empty]
-    classifier = JavaClassImpl@64['String']
+    classifier = JavaClassImpl@73['String']
     nullable = 'true': Boolean@47
     typeConstructor = DeserializedClassTypeConstructor@55
 }
 
 LazyJavaClassifierType@100['String'] {
     arguments = ArrayList@101[empty]
-    classifier = JavaClassImpl@85['String']
+    classifier = JavaClassImpl@58['String']
     nullable = 'true': Boolean@47
     typeConstructor = DeserializedClassTypeConstructor@55
 }
 
 LazyJavaClassifierType@102['String'] {
     arguments = ArrayList@103[empty]
-    classifier = JavaClassImpl@82['String']
+    classifier = JavaClassImpl@76['String']
     nullable = 'true': Boolean@47
     typeConstructor = DeserializedClassTypeConstructor@55
 }
 
 LazyJavaClassifierType@104['String'] {
     arguments = ArrayList@105[empty]
-    classifier = JavaClassImpl@58['String']
+    classifier = JavaClassImpl@61['String']
     nullable = 'true': Boolean@47
     typeConstructor = DeserializedClassTypeConstructor@55
 }
 
 LazyJavaClassifierType@106['String'] {
     arguments = ArrayList@107[empty]
-    classifier = JavaClassImpl@67['String']
+    classifier = JavaClassImpl@64['String']
     nullable = 'true': Boolean@47
     typeConstructor = DeserializedClassTypeConstructor@55
 }
@@ -357,204 +357,169 @@ LazyJavaPackageFragment@139['util'] {
 }
 
 ResolutionTaskHolder@195 {
-    <name not found> = ArrayList@196[10] { ResolutionCandidate@197, ResolutionCandidate@198, ResolutionCandidate@199, ... }
-    <name not found> = ArrayList@200[9] { ResolutionCandidate@197, ResolutionCandidate@199, ResolutionCandidate@201, ... }
+    <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
+    <name not found> = ArrayList@198[1] { ResolutionCandidate@199 }
     <name not found> = EmptyList@15[empty]
+}
+
+ResolutionTaskHolder@200 {
+    <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
+    <name not found> = ArrayList@203[1] { ResolutionCandidate@204 }
     <name not found> = EmptyList@15[empty]
+}
+
+ResolutionTaskHolder@205 {
+    <name not found> = ArrayList@206[1] { ResolutionCandidate@207 }
     <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
 }
 
-ResolutionTaskHolder@202 {
-    <name not found> = ArrayList@203[10] { ResolutionCandidate@204, ResolutionCandidate@205, ResolutionCandidate@206, ... }
-    <name not found> = ArrayList@207[9] { ResolutionCandidate@204, ResolutionCandidate@206, ResolutionCandidate@208, ... }
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
+ResolutionTaskHolder@208 {
+    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
     <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
 }
 
-ResolutionTaskHolder@209 {
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@211 }
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@211 }
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@214 }
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@214 }
+ResolutionTaskHolder@211 {
+    <name not found> = ArrayList@212[1] { ResolutionCandidate@213 }
     <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
 }
 
-ResolutionTaskHolder@216 {
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@218 }
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@221 }
+ResolutionTaskHolder@214 {
+    <name not found> = ArrayList@215[1] { ResolutionCandidate@216 }
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+}
+
+ResolutionTaskHolder@217 {
+    <name not found> = ArrayList@218[1] { ResolutionCandidate@219 }
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+}
+
+ResolutionTaskHolder@220 {
+    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
     <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
 }
 
 ResolutionTaskHolder@223 {
     <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@225 }
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
 }
 
-ResolutionTaskHolder@227 {
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@229 }
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@229 }
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
+ResolutionTaskHolder@226 {
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
 }
 
-ResolutionTaskHolder@231 {
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@233 }
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
+ResolutionTaskHolder@229 {
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
+}
+
+ResolutionTaskHolder@232 {
+    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
 }
 
 ResolutionTaskHolder@235 {
     <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@237 }
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
 }
 
-ResolutionTaskHolder@239 {
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@241 }
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@241 }
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
+ResolutionTaskHolder@238 {
+    <name not found> = ArrayList@239[1] { ResolutionCandidate@240 }
 }
 
-ResolutionTaskHolder@243 {
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@245 }
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
+ResolutionTaskHolder@241 {
+    <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
+}
+
+ResolutionTaskHolder@244 {
+    <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
 }
 
 ResolutionTaskHolder@247 {
     <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@249 }
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
 }
 
-ResolutionTaskHolder@251 {
-    <name not found> = ArrayList@252[1] { ResolutionCandidate@253 }
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@253 }
+ResolutionTaskHolder@250 {
+    <name not found> = ArrayList@251[1] { ResolutionCandidate@252 }
 }
 
-ResolutionTaskHolder@255 {
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
-    <name not found> = ArrayList@258[1] { ResolutionCandidate@257 }
+ResolutionTaskHolder@253 {
+    <name not found> = ArrayList@254[1] { ResolutionCandidate@255 }
+}
+
+ResolutionTaskHolder@256 {
+    <name not found> = ArrayList@257[1] { ResolutionCandidate@258 }
 }
 
 ResolutionTaskHolder@259 {
     <name not found> = ArrayList@260[1] { ResolutionCandidate@261 }
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@261 }
 }
 
-ResolutionTaskHolder@263 {
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@265 }
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@265 }
+ResolutionTaskHolder@262 {
+    <name not found> = ArrayList@263[1] { ResolutionCandidate@264 }
 }
 
-ResolutionTaskHolder@267 {
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
-    <name not found> = ArrayList@270[1] { ResolutionCandidate@269 }
+ResolutionTaskHolder@265 {
+    <name not found> = ArrayList@266[1] { ResolutionCandidate@267 }
+}
+
+ResolutionTaskHolder@268 {
+    <name not found> = ArrayList@269[1] { ResolutionCandidate@270 }
 }
 
 ResolutionTaskHolder@271 {
     <name not found> = ArrayList@272[1] { ResolutionCandidate@273 }
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@273 }
 }
 
-ResolutionTaskHolder@275 {
-    <name not found> = ArrayList@276[1] { ResolutionCandidate@277 }
-    <name not found> = ArrayList@278[1] { ResolutionCandidate@277 }
+ResolutionTaskHolder@274 {
+    <name not found> = ArrayList@275[8] { ResolutionCandidate@276, ResolutionCandidate@277, ResolutionCandidate@278, ... }
 }
 
 ResolutionTaskHolder@279 {
-    <name not found> = ArrayList@280[1] { ResolutionCandidate@281 }
-    <name not found> = ArrayList@282[1] { ResolutionCandidate@281 }
+    <name not found> = ArrayList@280[8] { ResolutionCandidate@281, ResolutionCandidate@282, ResolutionCandidate@283, ... }
 }
 
-ResolutionTaskHolder@283 {
-    <name not found> = ArrayList@284[1] { ResolutionCandidate@285 }
-    <name not found> = ArrayList@286[1] { ResolutionCandidate@285 }
+ResolutionTaskHolder@284 {
+    <name not found> = ArrayList@285[9] { ResolutionCandidate@286, ResolutionCandidate@287, ResolutionCandidate@288, ... }
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
 }
 
-ResolutionTaskHolder@287 {
-    <name not found> = ArrayList@288[1] { ResolutionCandidate@289 }
-    <name not found> = ArrayList@290[1] { ResolutionCandidate@289 }
+ResolutionTaskHolder@289 {
+    <name not found> = ArrayList@290[9] { ResolutionCandidate@291, ResolutionCandidate@292, ResolutionCandidate@293, ... }
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
 }
 
-ResolutionTaskHolder@291 {
-    <name not found> = ArrayList@292[1] { ResolutionCandidate@293 }
-    <name not found> = ArrayList@294[1] { ResolutionCandidate@293 }
-}
-
-ResolutionTaskHolder@295 {
-    <name not found> = ArrayList@296[1] { ResolutionCandidate@297 }
-    <name not found> = ArrayList@298[1] { ResolutionCandidate@297 }
+ResolutionTaskHolder@294 {
+    <name not found> = ArrayList@295[9] { ResolutionCandidate@296, ResolutionCandidate@297, ResolutionCandidate@298, ... }
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
 }
 
 ResolutionTaskHolder@299 {
-    <name not found> = ArrayList@300[1] { ResolutionCandidate@301 }
-    <name not found> = ArrayList@302[1] { ResolutionCandidate@301 }
-}
-
-ResolutionTaskHolder@303 {
-    <name not found> = ArrayList@304[1] { ResolutionCandidate@305 }
-    <name not found> = ArrayList@306[1] { ResolutionCandidate@305 }
-}
-
-ResolutionTaskHolder@307 {
-    <name not found> = ArrayList@308[1] { ResolutionCandidate@309 }
-    <name not found> = ArrayList@310[1] { ResolutionCandidate@309 }
-}
-
-ResolutionTaskHolder@311 {
-    <name not found> = ArrayList@312[1] { ResolutionCandidate@313 }
-    <name not found> = ArrayList@314[1] { ResolutionCandidate@313 }
-}
-
-ResolutionTaskHolder@315 {
-    <name not found> = ArrayList@316[8] { ResolutionCandidate@317, ResolutionCandidate@318, ResolutionCandidate@319, ... }
-    <name not found> = ArrayList@320[8] { ResolutionCandidate@317, ResolutionCandidate@318, ResolutionCandidate@319, ... }
-}
-
-ResolutionTaskHolder@321 {
-    <name not found> = ArrayList@322[8] { ResolutionCandidate@323, ResolutionCandidate@324, ResolutionCandidate@325, ... }
-    <name not found> = ArrayList@326[8] { ResolutionCandidate@323, ResolutionCandidate@324, ResolutionCandidate@325, ... }
-}
-
-ResolutionTaskHolder@327 {
-    <name not found> = ArrayList@328[9] { ResolutionCandidate@329, ResolutionCandidate@330, ResolutionCandidate@331, ... }
-    <name not found> = ArrayList@332[9] { ResolutionCandidate@329, ResolutionCandidate@330, ResolutionCandidate@331, ... }
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
 }
 
-ResolutionTaskHolder@333 {
+ResolutionTaskHolder@300 {
     <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
@@ -571,25 +536,31 @@ ResolutionTaskHolder@333 {
     <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
+}
+
+ResolutionTaskHolder@301 {
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+}
+
+ResolutionTaskHolder@302 {
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
 }
 
-ResolutionTaskHolder@334 {
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
+ResolutionTaskHolder@303 {
     <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
@@ -600,33 +571,65 @@ ResolutionTaskHolder@334 {
     <name not found> = EmptyList@15[empty]
 }
 
-ResolutionTaskHolder@335 {
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-}
-
-ResolutionTaskHolder@336 {
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-}
-
-ResolutionTaskHolder@337 {
+null {
+    <name not found> = ArrayList@304[10] { ResolutionCandidate@296, ResolutionCandidate@305, ResolutionCandidate@297, ... }
+    <name not found> = ArrayList@306[10] { ResolutionCandidate@291, ResolutionCandidate@307, ResolutionCandidate@292, ... }
+    <name not found> = ArrayList@308[1] { ResolutionCandidate@237 }
+    <name not found> = ArrayList@309[1] { ResolutionCandidate@243 }
+    <name not found> = ArrayList@310[1] { ResolutionCandidate@240 }
+    <name not found> = ArrayList@311[1] { ResolutionCandidate@258 }
+    <name not found> = ArrayList@312[1] { ResolutionCandidate@216 }
+    <name not found> = ArrayList@313[1] { ResolutionCandidate@210 }
+    <name not found> = ArrayList@314[1] { ResolutionCandidate@207 }
+    <name not found> = ArrayList@315[1] { ResolutionCandidate@213 }
+    <name not found> = ArrayList@316[1] { ResolutionCandidate@222 }
+    <name not found> = ArrayList@317[1] { ResolutionCandidate@267 }
+    <name not found> = ArrayList@318[1] { ResolutionCandidate@225 }
+    <name not found> = ArrayList@319[1] { ResolutionCandidate@264 }
+    <name not found> = ArrayList@320[1] { ResolutionCandidate@270 }
+    <name not found> = ArrayList@321[1] { ResolutionCandidate@231 }
+    <name not found> = ArrayList@322[1] { ResolutionCandidate@228 }
+    <name not found> = ArrayList@323[1] { ResolutionCandidate@234 }
+    <name not found> = ArrayList@324[1] { ResolutionCandidate@255 }
+    <name not found> = ArrayList@325[1] { ResolutionCandidate@219 }
+    <name not found> = ArrayList@326[1] { ResolutionCandidate@261 }
+    <name not found> = ArrayList@327[1] { ResolutionCandidate@246 }
+    <name not found> = ArrayList@328[1] { ResolutionCandidate@202 }
+    <name not found> = ArrayList@329[1] { ResolutionCandidate@204 }
+    <name not found> = ArrayList@330[1] { ResolutionCandidate@249 }
+    <name not found> = ArrayList@331[1] { ResolutionCandidate@197 }
+    <name not found> = ArrayList@332[1] { ResolutionCandidate@199 }
+    <name not found> = ArrayList@333[1] { ResolutionCandidate@252 }
+    <name not found> = ArrayList@334[1] { ResolutionCandidate@273 }
+    <name not found> = ArrayList@335[8] { ResolutionCandidate@276, ResolutionCandidate@277, ResolutionCandidate@278, ... }
+    <name not found> = ArrayList@336[8] { ResolutionCandidate@281, ResolutionCandidate@282, ResolutionCandidate@283, ... }
+    <name not found> = ArrayList@337[9] { ResolutionCandidate@286, ResolutionCandidate@287, ResolutionCandidate@288, ... }
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/incompleteEquals.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/incompleteEquals.lazy.log
index 5c87ac05c01..f4069da9b97 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/incompleteEquals.lazy.log
+++ b/compiler/testData/diagnostics/tests/incompleteCode/incompleteEquals.lazy.log
@@ -25,5 +25,8 @@ LazyJavaPackageFragment@9['java'] {
 
 ResolutionTaskHolder@23 {
     <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
+}
+
+null {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@25 }
 }
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/kt2014.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/kt2014.lazy.log
index ab48579d4f5..e927aafccda 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/kt2014.lazy.log
+++ b/compiler/testData/diagnostics/tests/incompleteCode/kt2014.lazy.log
@@ -46,12 +46,6 @@ LazyJavaPackageFragment@15['lang'] {
 
 ResolutionTaskHolder@36 {
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -77,14 +71,8 @@ ResolutionTaskHolder@36 {
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -110,11 +98,8 @@ ResolutionTaskHolder@40 {
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -130,55 +115,57 @@ ResolutionTaskHolder@44 {
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
+}
+
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
     <name not found> = EmptyList@27[empty]
 }
 
 ResolutionTaskHolder@48 {
     <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+}
+
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
 }
 
 ResolutionTaskHolder@60 {
     <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+ResolutionTaskHolder@66 {
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@67 {
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -193,10 +180,7 @@ ResolutionTaskHolder@76 {
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@68 {
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -211,14 +195,7 @@ ResolutionTaskHolder@77 {
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@69 {
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -229,9 +206,7 @@ ResolutionTaskHolder@78 {
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@79 {
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@70 {
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -242,9 +217,7 @@ ResolutionTaskHolder@79 {
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@71 {
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -255,7 +228,37 @@ ResolutionTaskHolder@80 {
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@81 {
+null {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@65 }
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/kt4866UnresolvedArrayAccess.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/kt4866UnresolvedArrayAccess.lazy.log
index 69a74e8a885..edc490d0d3d 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/kt4866UnresolvedArrayAccess.lazy.log
+++ b/compiler/testData/diagnostics/tests/incompleteCode/kt4866UnresolvedArrayAccess.lazy.log
@@ -37,24 +37,17 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@29 {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@38 {
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
@@ -73,9 +66,7 @@ ResolutionTaskHolder@41 {
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@39 {
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
@@ -85,3 +76,15 @@ ResolutionTaskHolder@42 {
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
+
+null {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@31 }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/plusOnTheRight.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/plusOnTheRight.lazy.log
index 13427eebe65..39fa387b83a 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/plusOnTheRight.lazy.log
+++ b/compiler/testData/diagnostics/tests/incompleteCode/plusOnTheRight.lazy.log
@@ -28,13 +28,7 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@24 {
     <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
+    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
@@ -59,7 +53,16 @@ ResolutionTaskHolder@24 {
     <name not found> = EmptyList@19[empty]
 }
 
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
+ResolutionTaskHolder@29 {
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
+}
+
+null {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@26 }
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@28 }
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/pseudocodeTraverseNextInstructions.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/pseudocodeTraverseNextInstructions.lazy.log
index 06e8d93486f..e1e94774de8 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/pseudocodeTraverseNextInstructions.lazy.log
+++ b/compiler/testData/diagnostics/tests/incompleteCode/pseudocodeTraverseNextInstructions.lazy.log
@@ -43,10 +43,6 @@ ResolutionTaskHolder@25 {
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
 }
 
 ResolutionTaskHolder@26 {
@@ -58,6 +54,13 @@ ResolutionTaskHolder@26 {
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
+}
+
+null {
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/senselessComparisonWithNull.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/senselessComparisonWithNull.lazy.log
index 702cc9a2a79..4a3f6399b97 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/senselessComparisonWithNull.lazy.log
+++ b/compiler/testData/diagnostics/tests/incompleteCode/senselessComparisonWithNull.lazy.log
@@ -32,10 +32,6 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@26 {
     <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
@@ -53,24 +49,31 @@ ResolutionTaskHolder@26 {
     <name not found> = EmptyList@19[empty]
 }
 
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
+ResolutionTaskHolder@29 {
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+}
+
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
+}
+
+ResolutionTaskHolder@35 {
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
 }
 
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
+null {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@28 }
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@31 }
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/typeParameterOnLhsOfDot.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/typeParameterOnLhsOfDot.lazy.log
index 0dc870c5a65..27708c2f13b 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/typeParameterOnLhsOfDot.lazy.log
+++ b/compiler/testData/diagnostics/tests/incompleteCode/typeParameterOnLhsOfDot.lazy.log
@@ -49,12 +49,6 @@ ResolutionTaskHolder@23 {
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
 }
 
 ResolutionTaskHolder@24 {
@@ -82,12 +76,6 @@ ResolutionTaskHolder@24 {
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
 }
 
 ResolutionTaskHolder@25 {
@@ -107,10 +95,6 @@ ResolutionTaskHolder@25 {
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
 }
 
 ResolutionTaskHolder@26 {
@@ -122,6 +106,25 @@ ResolutionTaskHolder@26 {
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
+}
+
+null {
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/unresolvedArguments.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/unresolvedArguments.lazy.log
index 37dab97696b..6e3abba5803 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/unresolvedArguments.lazy.log
+++ b/compiler/testData/diagnostics/tests/incompleteCode/unresolvedArguments.lazy.log
@@ -52,16 +52,48 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@38 {
     <name not found> = ArrayList@39[2] { ResolutionCandidate@40, ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[2] { ResolutionCandidate@40, ResolutionCandidate@41 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[2] { ResolutionCandidate@44, ResolutionCandidate@45 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@46 {
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[2] { ResolutionCandidate@45, ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[2] { ResolutionCandidate@45, ResolutionCandidate@46 }
+ResolutionTaskHolder@47 {
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -77,18 +109,6 @@ ResolutionTaskHolder@48 {
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
 }
 
 ResolutionTaskHolder@49 {
@@ -100,34 +120,17 @@ ResolutionTaskHolder@49 {
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@51 {
+null {
+    <name not found> = ArrayList@50[2] { ResolutionCandidate@40, ResolutionCandidate@41 }
+    <name not found> = ArrayList@51[2] { ResolutionCandidate@44, ResolutionCandidate@45 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/unresolvedOperation.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/unresolvedOperation.lazy.log
index 1eff0e46581..b7451f81cfb 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/unresolvedOperation.lazy.log
+++ b/compiler/testData/diagnostics/tests/incompleteCode/unresolvedOperation.lazy.log
@@ -37,17 +37,63 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@29 {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+}
+
+ResolutionTaskHolder@38 {
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+}
+
+ResolutionTaskHolder@39 {
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
 }
 
 ResolutionTaskHolder@41 {
@@ -59,29 +105,12 @@ ResolutionTaskHolder@41 {
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
+null {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@37 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
@@ -95,29 +124,3 @@ ResolutionTaskHolder@42 {
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
-
-ResolutionTaskHolder@43 {
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/variableDeclarationInSelector.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/variableDeclarationInSelector.lazy.log
index 7af3ed0f364..5b32e551049 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/variableDeclarationInSelector.lazy.log
+++ b/compiler/testData/diagnostics/tests/incompleteCode/variableDeclarationInSelector.lazy.log
@@ -23,5 +23,8 @@ LazyJavaPackageFragment@5['java'] {
 
 ResolutionTaskHolder@21 {
     <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
+}
+
+null {
     <name not found> = ArrayList@24[1] { ResolutionCandidate@23 }
 }
diff --git a/compiler/testData/diagnostics/tests/inference/NoInferenceFromDeclaredBounds.lazy.log b/compiler/testData/diagnostics/tests/inference/NoInferenceFromDeclaredBounds.lazy.log
index 17bd783ff01..dd47e242be2 100644
--- a/compiler/testData/diagnostics/tests/inference/NoInferenceFromDeclaredBounds.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/NoInferenceFromDeclaredBounds.lazy.log
@@ -46,23 +46,26 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@34 {
     <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+}
+
+null {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@42 }
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inference/arrayConstructor.lazy.log b/compiler/testData/diagnostics/tests/inference/arrayConstructor.lazy.log
index d4e1a450738..be7c8c0c7fd 100644
--- a/compiler/testData/diagnostics/tests/inference/arrayConstructor.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/arrayConstructor.lazy.log
@@ -36,57 +36,60 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@32 {
     <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
 
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
+}
+
 ResolutionTaskHolder@44 {
     <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
+}
+
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
 }
 
 ResolutionTaskHolder@56 {
     <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+null {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@49 }
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveAmbiguity.lazy.log b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveAmbiguity.lazy.log
index 15027949c96..5ac18ca6684 100644
--- a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveAmbiguity.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveAmbiguity.lazy.log
@@ -33,7 +33,7 @@ LazyJavaClassifierType@19['String'] {
 
 LazyJavaClassifierType@22['String'] {
     arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@13['String']
+    classifier = JavaClassImpl@18['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
@@ -47,7 +47,7 @@ LazyJavaClassifierType@25['String'] {
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@18['String']
+    classifier = JavaClassImpl@13['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
@@ -75,21 +75,21 @@ LazyJavaClassifierType@36['Throwable'] {
 
 LazyJavaClassifierType@39['Throwable'] {
     arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@35['Throwable']
+    classifier = JavaClassImpl@31['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@31['Throwable']
+    classifier = JavaClassImpl@38['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
 
 LazyJavaClassifierType@43['Throwable'] {
     arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@38['Throwable']
+    classifier = JavaClassImpl@35['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
@@ -149,25 +149,28 @@ LazyJavaPackageFragment@64['lang'] {
 
 ResolutionTaskHolder@89 {
     <name not found> = ArrayList@90[2] { ResolutionCandidate@91, ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[2] { ResolutionCandidate@91, ResolutionCandidate@92 }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[4] { ResolutionCandidate@96, ResolutionCandidate@97, ResolutionCandidate@98, ... }
-    <name not found> = ArrayList@99[5] { ResolutionCandidate@96, ResolutionCandidate@97, ResolutionCandidate@98, ... }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[4] { ResolutionCandidate@95, ResolutionCandidate@96, ResolutionCandidate@97, ... }
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[4] { ResolutionCandidate@102, ResolutionCandidate@103, ResolutionCandidate@104, ... }
-    <name not found> = ArrayList@105[5] { ResolutionCandidate@102, ResolutionCandidate@103, ResolutionCandidate@104, ... }
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[4] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102, ... }
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+}
+
+null {
+    <name not found> = ArrayList@103[2] { ResolutionCandidate@91, ResolutionCandidate@92 }
+    <name not found> = ArrayList@104[5] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102, ... }
+    <name not found> = ArrayList@105[5] { ResolutionCandidate@95, ResolutionCandidate@96, ResolutionCandidate@97, ... }
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
diff --git a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveFunctionLiteralsNoUse.lazy.log b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveFunctionLiteralsNoUse.lazy.log
index 3966a870261..42fc88f41aa 100644
--- a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveFunctionLiteralsNoUse.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveFunctionLiteralsNoUse.lazy.log
@@ -46,9 +46,12 @@ LazyJavaPackageFragment@18['lang'] {
 
 ResolutionTaskHolder@39 {
     <name not found> = ArrayList@40[2] { ResolutionCandidate@41, ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[2] { ResolutionCandidate@41, ResolutionCandidate@42 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+}
+
+null {
+    <name not found> = ArrayList@43[2] { ResolutionCandidate@41, ResolutionCandidate@42 }
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveNoInfoForParameter.lazy.log b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveNoInfoForParameter.lazy.log
index b14bc4ac23a..c0fb6391265 100644
--- a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveNoInfoForParameter.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveNoInfoForParameter.lazy.log
@@ -82,14 +82,14 @@ LazyJavaClassifierType@39['Throwable'] {
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@38['Throwable']
+    classifier = JavaClassImpl@35['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
 
 LazyJavaClassifierType@43['Throwable'] {
     arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@35['Throwable']
+    classifier = JavaClassImpl@38['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
@@ -151,43 +151,46 @@ LazyJavaPackageFragment@64['lang'] {
 
 ResolutionTaskHolder@90 {
     <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[2] { ResolutionCandidate@96, ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[2] { ResolutionCandidate@96, ResolutionCandidate@97 }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[2] { ResolutionCandidate@95, ResolutionCandidate@96 }
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[4] { ResolutionCandidate@101, ResolutionCandidate@102, ResolutionCandidate@103, ... }
-    <name not found> = ArrayList@104[5] { ResolutionCandidate@101, ResolutionCandidate@102, ResolutionCandidate@103, ... }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[4] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[4] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
-    <name not found> = ArrayList@110[5] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[4] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[4] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
-    <name not found> = ArrayList@116[5] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[4] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111, ... }
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+}
+
+null {
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@113[2] { ResolutionCandidate@95, ResolutionCandidate@96 }
+    <name not found> = ArrayList@114[5] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
+    <name not found> = ArrayList@115[5] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111, ... }
+    <name not found> = ArrayList@116[5] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
diff --git a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveNoneApplicable.lazy.log b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveNoneApplicable.lazy.log
index 704f53229fe..4b364199a4b 100644
--- a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveNoneApplicable.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveNoneApplicable.lazy.log
@@ -48,15 +48,10 @@ LazyJavaPackageFragment@19['lang'] {
 
 ResolutionTaskHolder@44 {
     <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[2] { ResolutionCandidate@50, ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[2] { ResolutionCandidate@50, ResolutionCandidate@51 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[2] { ResolutionCandidate@49, ResolutionCandidate@50 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
@@ -73,3 +68,11 @@ ResolutionTaskHolder@48 {
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
+
+null {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@52[2] { ResolutionCandidate@49, ResolutionCandidate@50 }
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveWithFunctionLiterals.lazy.log b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveWithFunctionLiterals.lazy.log
index 2dc425f5982..0c26cc103af 100644
--- a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveWithFunctionLiterals.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveWithFunctionLiterals.lazy.log
@@ -45,16 +45,19 @@ LazyJavaPackageFragment@16['lang'] {
 
 ResolutionTaskHolder@36 {
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[2] { ResolutionCandidate@42, ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[2] { ResolutionCandidate@42, ResolutionCandidate@43 }
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[2] { ResolutionCandidate@41, ResolutionCandidate@42 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+}
+
+null {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@44[2] { ResolutionCandidate@41, ResolutionCandidate@42 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
diff --git a/compiler/testData/diagnostics/tests/inference/completeInferenceIfManyFailed.lazy.log b/compiler/testData/diagnostics/tests/inference/completeInferenceIfManyFailed.lazy.log
index 80fc61b2058..c9ff7e8f19d 100644
--- a/compiler/testData/diagnostics/tests/inference/completeInferenceIfManyFailed.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/completeInferenceIfManyFailed.lazy.log
@@ -40,15 +40,10 @@ LazyJavaPackageFragment@15['lang'] {
 
 ResolutionTaskHolder@36 {
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[2] { ResolutionCandidate@42, ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[2] { ResolutionCandidate@42, ResolutionCandidate@43 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[2] { ResolutionCandidate@41, ResolutionCandidate@42 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
@@ -65,3 +60,11 @@ ResolutionTaskHolder@40 {
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
+
+null {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@44[2] { ResolutionCandidate@41, ResolutionCandidate@42 }
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/inference/conflictingSubstitutions.lazy.log b/compiler/testData/diagnostics/tests/inference/conflictingSubstitutions.lazy.log
index bcf07dd039f..60a8c040f2e 100644
--- a/compiler/testData/diagnostics/tests/inference/conflictingSubstitutions.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/conflictingSubstitutions.lazy.log
@@ -126,7 +126,7 @@ LazyJavaClassifierType@102['E'] {
     arguments = ArrayList@103[empty]
     classifier = JavaTypeParameterImpl@104['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@105['E'] {
@@ -140,28 +140,28 @@ LazyJavaClassifierType@108['E'] {
     arguments = ArrayList@109[empty]
     classifier = JavaTypeParameterImpl@110['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@111['E'] {
     arguments = ArrayList@112[empty]
     classifier = JavaTypeParameterImpl@113['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
-LazyJavaClassifierType@115['E'] {
-    arguments = ArrayList@116[empty]
-    classifier = JavaTypeParameterImpl@117['E']
+LazyJavaClassifierType@114['E'] {
+    arguments = ArrayList@115[empty]
+    classifier = JavaTypeParameterImpl@116['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@117
 }
 
 LazyJavaClassifierType@118['E'] {
     arguments = ArrayList@119[empty]
     classifier = JavaTypeParameterImpl@120['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@117
 }
 
 LazyJavaClassifierType@121['E'] {
@@ -175,105 +175,105 @@ LazyJavaClassifierType@124['E'] {
     arguments = ArrayList@125[empty]
     classifier = JavaTypeParameterImpl@126['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@117
 }
 
 LazyJavaClassifierType@127['E'] {
     arguments = ArrayList@128[empty]
     classifier = JavaTypeParameterImpl@129['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@130['E'] {
     arguments = ArrayList@131[empty]
     classifier = JavaTypeParameterImpl@132['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@117
 }
 
 LazyJavaClassifierType@133['E'] {
     arguments = ArrayList@134[empty]
-    classifier = JavaTypeParameterImpl@110['E']
+    classifier = JavaTypeParameterImpl@104['E']
     nullable = 'true': Boolean@88
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@135['E'] {
     arguments = ArrayList@136[empty]
-    classifier = JavaTypeParameterImpl@113['E']
+    classifier = JavaTypeParameterImpl@123['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@137['E'] {
     arguments = ArrayList@138[empty]
-    classifier = JavaTypeParameterImpl@120['E']
+    classifier = JavaTypeParameterImpl@113['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@139['E'] {
     arguments = ArrayList@140[empty]
-    classifier = JavaTypeParameterImpl@100['E']
+    classifier = JavaTypeParameterImpl@132['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@117
 }
 
 LazyJavaClassifierType@141['E'] {
     arguments = ArrayList@142[empty]
-    classifier = JavaTypeParameterImpl@107['E']
+    classifier = JavaTypeParameterImpl@96['E']
     nullable = 'true': Boolean@88
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@143['E'] {
     arguments = ArrayList@144[empty]
-    classifier = JavaTypeParameterImpl@132['E']
+    classifier = JavaTypeParameterImpl@126['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@117
 }
 
 LazyJavaClassifierType@145['E'] {
     arguments = ArrayList@146[empty]
-    classifier = JavaTypeParameterImpl@96['E']
+    classifier = JavaTypeParameterImpl@110['E']
     nullable = 'true': Boolean@88
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@147['E'] {
     arguments = ArrayList@148[empty]
-    classifier = JavaTypeParameterImpl@104['E']
+    classifier = JavaTypeParameterImpl@100['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@149['E'] {
     arguments = ArrayList@150[empty]
-    classifier = JavaTypeParameterImpl@129['E']
+    classifier = JavaTypeParameterImpl@120['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@117
 }
 
 LazyJavaClassifierType@151['E'] {
     arguments = ArrayList@152[empty]
-    classifier = JavaTypeParameterImpl@117['E']
+    classifier = JavaTypeParameterImpl@129['E']
     nullable = 'true': Boolean@88
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@153['E'] {
     arguments = ArrayList@154[empty]
-    classifier = JavaTypeParameterImpl@123['E']
+    classifier = JavaTypeParameterImpl@116['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@117
 }
 
 LazyJavaClassifierType@155['E'] {
     arguments = ArrayList@156[empty]
-    classifier = JavaTypeParameterImpl@126['E']
+    classifier = JavaTypeParameterImpl@107['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@52['List<E>'] {
@@ -393,67 +393,61 @@ LazyJavaPackageFragment@201['util'] {
     memberIndex = computeMemberIndex$1@230 // through LazyPackageFragmentScopeForJavaPackage@228
 }
 
-LazyJavaTypeParameterDescriptor@45['E'] {
+LazyJavaTypeParameterDescriptor@54['E'] {
     defaultType = JetTypeImpl@231['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
     upperBounds = LinkedHashSet@232[1] { NullableType@233 }
     upperBoundsAsType = NullableType@233
 }
 
-LazyJavaTypeParameterDescriptor@54['E'] {
+LazyJavaTypeParameterDescriptor@49['E'] {
     defaultType = JetTypeImpl@234['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@117
     upperBounds = LinkedHashSet@235[1] { NullableType@236 }
     upperBoundsAsType = NullableType@236
 }
 
-LazyJavaTypeParameterDescriptor@49['E'] {
+LazyJavaTypeParameterDescriptor@45['E'] {
     defaultType = JetTypeImpl@237['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
     upperBounds = LinkedHashSet@238[1] { NullableType@239 }
     upperBoundsAsType = NullableType@239
 }
 
 LazyJavaTypeParameterResolver@240 {
-    resolve(JavaTypeParameterImpl@241['E']) = LazyJavaTypeParameterDescriptor@45['E']
+    resolve(JavaTypeParameterImpl@241['E']) = LazyJavaTypeParameterDescriptor@54['E']
 }
 
 LazyJavaTypeParameterResolver@242 {
-    resolve(JavaTypeParameterImpl@243['E']) = LazyJavaTypeParameterDescriptor@49['E']
+    resolve(JavaTypeParameterImpl@243['E']) = LazyJavaTypeParameterDescriptor@45['E']
 }
 
 LazyJavaTypeParameterResolver@244 {
-    resolve(JavaTypeParameterImpl@245['E']) = LazyJavaTypeParameterDescriptor@54['E']
+    resolve(JavaTypeParameterImpl@245['E']) = LazyJavaTypeParameterDescriptor@49['E']
 }
 
 LazyJavaTypeParameterResolver@246 {
-    resolve(JavaTypeParameterImpl@123['E']) = null
+    resolve(JavaTypeParameterImpl@129['E']) = null
 }
 
 LazyJavaTypeParameterResolver@247 {
-    resolve(JavaTypeParameterImpl@110['E']) = null
+    resolve(JavaTypeParameterImpl@104['E']) = null
 }
 
 LazyJavaTypeParameterResolver@248 {
-    resolve(JavaTypeParameterImpl@113['E']) = null
-}
-
-LazyJavaTypeParameterResolver@249 {
     resolve(JavaTypeParameterImpl@120['E']) = null
 }
 
-LazyJavaTypeParameterResolver@250 {
+LazyJavaTypeParameterResolver@249 {
     resolve(JavaTypeParameterImpl@107['E']) = null
 }
 
+LazyJavaTypeParameterResolver@250 {
+    resolve(JavaTypeParameterImpl@116['E']) = null
+}
+
 ResolutionTaskHolder@251 {
     <name not found> = ArrayList@252[1] { ResolutionCandidate@253 }
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@253 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
@@ -479,12 +473,8 @@ ResolutionTaskHolder@251 {
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@255 {
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
-    <name not found> = ArrayList@258[1] { ResolutionCandidate@257 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
+ResolutionTaskHolder@254 {
+    <name not found> = ArrayList@255[1] { ResolutionCandidate@256 }
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
@@ -502,57 +492,70 @@ ResolutionTaskHolder@255 {
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@259 {
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@261 }
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@261 }
+ResolutionTaskHolder@257 {
+    <name not found> = ArrayList@258[1] { ResolutionCandidate@259 }
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
+}
+
+ResolutionTaskHolder@260 {
+    <name not found> = ArrayList@261[1] { ResolutionCandidate@262 }
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
 }
 
 ResolutionTaskHolder@263 {
     <name not found> = ArrayList@264[1] { ResolutionCandidate@265 }
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@265 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@267 {
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
-    <name not found> = ArrayList@270[1] { ResolutionCandidate@269 }
+ResolutionTaskHolder@266 {
+    <name not found> = ArrayList@267[1] { ResolutionCandidate@268 }
 }
 
-ResolutionTaskHolder@271 {
-    <name not found> = ArrayList@272[1] { ResolutionCandidate@273 }
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@273 }
+ResolutionTaskHolder@269 {
+    <name not found> = ArrayList@270[1] { ResolutionCandidate@271 }
+}
+
+ResolutionTaskHolder@272 {
+    <name not found> = ArrayList@273[1] { ResolutionCandidate@274 }
 }
 
 ResolutionTaskHolder@275 {
     <name not found> = ArrayList@276[1] { ResolutionCandidate@277 }
-    <name not found> = ArrayList@278[1] { ResolutionCandidate@277 }
 }
 
-ResolutionTaskHolder@279 {
-    <name not found> = ArrayList@280[1] { ResolutionCandidate@281 }
-    <name not found> = ArrayList@282[1] { ResolutionCandidate@281 }
+ResolutionTaskHolder@278 {
+    <name not found> = ArrayList@279[2] { ResolutionCandidate@280, ResolutionCandidate@281 }
 }
 
-ResolutionTaskHolder@283 {
-    <name not found> = ArrayList@284[1] { ResolutionCandidate@285 }
-    <name not found> = ArrayList@286[1] { ResolutionCandidate@285 }
+ResolutionTaskHolder@282 {
+    <name not found> = ArrayList@283[3] { ResolutionCandidate@284, ResolutionCandidate@285, ResolutionCandidate@286 }
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@287 {
-    <name not found> = ArrayList@288[2] { ResolutionCandidate@289, ResolutionCandidate@290 }
-    <name not found> = ArrayList@291[2] { ResolutionCandidate@289, ResolutionCandidate@290 }
-}
-
-ResolutionTaskHolder@292 {
-    <name not found> = ArrayList@293[3] { ResolutionCandidate@294, ResolutionCandidate@295, ResolutionCandidate@296 }
-    <name not found> = ArrayList@297[3] { ResolutionCandidate@294, ResolutionCandidate@295, ResolutionCandidate@296 }
+null {
+    <name not found> = ArrayList@287[1] { ResolutionCandidate@277 }
+    <name not found> = ArrayList@288[1] { ResolutionCandidate@265 }
+    <name not found> = ArrayList@289[1] { ResolutionCandidate@259 }
+    <name not found> = ArrayList@290[1] { ResolutionCandidate@256 }
+    <name not found> = ArrayList@291[1] { ResolutionCandidate@262 }
+    <name not found> = ArrayList@292[1] { ResolutionCandidate@253 }
+    <name not found> = ArrayList@293[1] { ResolutionCandidate@274 }
+    <name not found> = ArrayList@294[1] { ResolutionCandidate@271 }
+    <name not found> = ArrayList@295[1] { ResolutionCandidate@268 }
+    <name not found> = ArrayList@296[2] { ResolutionCandidate@280, ResolutionCandidate@281 }
+    <name not found> = ArrayList@297[3] { ResolutionCandidate@284, ResolutionCandidate@285, ResolutionCandidate@286 }
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
diff --git a/compiler/testData/diagnostics/tests/inference/constraints/constraintOnFunctionLiteral.lazy.log b/compiler/testData/diagnostics/tests/inference/constraints/constraintOnFunctionLiteral.lazy.log
index 3b1d9d65dfc..4f4fc345c05 100644
--- a/compiler/testData/diagnostics/tests/inference/constraints/constraintOnFunctionLiteral.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/constraints/constraintOnFunctionLiteral.lazy.log
@@ -115,14 +115,14 @@ LazyJavaClassifierType@79['E'] {
     arguments = ArrayList@80[empty]
     classifier = JavaTypeParameterImpl@81['E']
     nullable = 'false': Boolean@59
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@78
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
 }
 
 LazyJavaClassifierType@82['E'] {
     arguments = ArrayList@83[empty]
     classifier = JavaTypeParameterImpl@84['E']
     nullable = 'false': Boolean@59
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@78
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
 }
 
 LazyJavaClassifierType@85['E'] {
@@ -141,28 +141,28 @@ LazyJavaClassifierType@89['E'] {
 
 LazyJavaClassifierType@91['E'] {
     arguments = ArrayList@92[empty]
-    classifier = JavaTypeParameterImpl@84['E']
+    classifier = JavaTypeParameterImpl@73['E']
     nullable = 'true': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@78
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
 }
 
 LazyJavaClassifierType@93['E'] {
     arguments = ArrayList@94[empty]
-    classifier = JavaTypeParameterImpl@73['E']
+    classifier = JavaTypeParameterImpl@84['E']
     nullable = 'true': Boolean@65
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
 }
 
 LazyJavaClassifierType@95['E'] {
     arguments = ArrayList@96[empty]
-    classifier = JavaTypeParameterImpl@77['E']
+    classifier = JavaTypeParameterImpl@81['E']
     nullable = 'true': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@78
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
 }
 
 LazyJavaClassifierType@97['E'] {
     arguments = ArrayList@98[empty]
-    classifier = JavaTypeParameterImpl@81['E']
+    classifier = JavaTypeParameterImpl@77['E']
     nullable = 'true': Boolean@65
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@78
 }
@@ -225,7 +225,7 @@ LazyJavaClassifierType@119['String'] {
 
 LazyJavaClassifierType@122['String'] {
     arguments = ArrayList@123[empty]
-    classifier = JavaClassImpl@121['String']
+    classifier = JavaClassImpl@118['String']
     nullable = 'true': Boolean@65
     typeConstructor = DeserializedClassTypeConstructor@115
 }
@@ -239,7 +239,7 @@ LazyJavaClassifierType@124['String'] {
 
 LazyJavaClassifierType@126['String'] {
     arguments = ArrayList@127[empty]
-    classifier = JavaClassImpl@118['String']
+    classifier = JavaClassImpl@121['String']
     nullable = 'true': Boolean@65
     typeConstructor = DeserializedClassTypeConstructor@115
 }
@@ -267,21 +267,21 @@ LazyJavaClassifierType@135['Throwable'] {
 
 LazyJavaClassifierType@138['Throwable'] {
     arguments = ArrayList@139[empty]
-    classifier = JavaClassImpl@130['Throwable']
+    classifier = JavaClassImpl@134['Throwable']
     nullable = 'true': Boolean@65
     typeConstructor = DeserializedClassTypeConstructor@131
 }
 
 LazyJavaClassifierType@140['Throwable'] {
     arguments = ArrayList@141[empty]
-    classifier = JavaClassImpl@134['Throwable']
+    classifier = JavaClassImpl@137['Throwable']
     nullable = 'true': Boolean@65
     typeConstructor = DeserializedClassTypeConstructor@131
 }
 
 LazyJavaClassifierType@142['Throwable'] {
     arguments = ArrayList@143[empty]
-    classifier = JavaClassImpl@137['Throwable']
+    classifier = JavaClassImpl@130['Throwable']
     nullable = 'true': Boolean@65
     typeConstructor = DeserializedClassTypeConstructor@131
 }
@@ -376,40 +376,32 @@ LazyJavaPackageFragment@181['util'] {
 
 LazyJavaTypeParameterDescriptor@34['E'] {
     defaultType = JetTypeImpl@215['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@78
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
     upperBounds = LinkedHashSet@216[1] { NullableType@217 }
 }
 
 LazyJavaTypeParameterDescriptor@25['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@88
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@78
 }
 
 LazyJavaTypeParameterDescriptor@29['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@88
 }
 
 LazyJavaTypeParameterResolver@218 {
-    resolve(JavaTypeParameterImpl@219['E']) = LazyJavaTypeParameterDescriptor@34['E']
+    resolve(JavaTypeParameterImpl@87['E']) = LazyJavaTypeParameterDescriptor@29['E']
 }
 
-LazyJavaTypeParameterResolver@220 {
-    resolve(JavaTypeParameterImpl@221['E']) = LazyJavaTypeParameterDescriptor@25['E']
+LazyJavaTypeParameterResolver@219 {
+    resolve(JavaTypeParameterImpl@220['E']) = LazyJavaTypeParameterDescriptor@25['E']
 }
 
-LazyJavaTypeParameterResolver@222 {
-    resolve(JavaTypeParameterImpl@73['E']) = LazyJavaTypeParameterDescriptor@29['E']
+LazyJavaTypeParameterResolver@221 {
+    resolve(JavaTypeParameterImpl@222['E']) = LazyJavaTypeParameterDescriptor@34['E']
 }
 
 ResolutionTaskHolder@223 {
     <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@225 }
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
     <name not found> = EmptyList@201[empty]
     <name not found> = EmptyList@201[empty]
     <name not found> = EmptyList@201[empty]
@@ -443,17 +435,8 @@ ResolutionTaskHolder@223 {
     <name not found> = EmptyList@201[empty]
 }
 
-ResolutionTaskHolder@227 {
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@229 }
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@229 }
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
+ResolutionTaskHolder@226 {
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
     <name not found> = EmptyList@201[empty]
     <name not found> = EmptyList@201[empty]
     <name not found> = EmptyList@201[empty]
@@ -464,66 +447,43 @@ ResolutionTaskHolder@227 {
     <name not found> = EmptyList@201[empty]
 }
 
-ResolutionTaskHolder@231 {
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@233 }
-    <name not found> = EmptyList@201[empty]
+ResolutionTaskHolder@229 {
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
     <name not found> = EmptyList@201[empty]
     <name not found> = EmptyList@201[empty]
     <name not found> = EmptyList@201[empty]
+}
+
+ResolutionTaskHolder@232 {
+    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
     <name not found> = EmptyList@201[empty]
     <name not found> = EmptyList@201[empty]
 }
 
 ResolutionTaskHolder@235 {
     <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@237 }
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
     <name not found> = EmptyList@201[empty]
     <name not found> = EmptyList@201[empty]
 }
 
-ResolutionTaskHolder@239 {
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@241 }
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@241 }
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
+ResolutionTaskHolder@238 {
+    <name not found> = ArrayList@239[1] { ResolutionCandidate@240 }
 }
 
-ResolutionTaskHolder@243 {
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@245 }
+ResolutionTaskHolder@241 {
+    <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
+}
+
+ResolutionTaskHolder@244 {
+    <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
 }
 
 ResolutionTaskHolder@247 {
     <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@249 }
 }
 
-ResolutionTaskHolder@251 {
-    <name not found> = ArrayList@252[1] { ResolutionCandidate@253 }
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@253 }
-}
-
-ResolutionTaskHolder@255 {
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
-    <name not found> = ArrayList@258[1] { ResolutionCandidate@257 }
-}
-
-ResolutionTaskHolder@259 {
-    <name not found> = ArrayList@260[3] { ResolutionCandidate@261, ResolutionCandidate@262, ResolutionCandidate@263 }
-    <name not found> = ArrayList@264[3] { ResolutionCandidate@261, ResolutionCandidate@262, ResolutionCandidate@263 }
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
+ResolutionTaskHolder@250 {
+    <name not found> = ArrayList@251[3] { ResolutionCandidate@252, ResolutionCandidate@253, ResolutionCandidate@254 }
     <name not found> = EmptyList@201[empty]
     <name not found> = EmptyList@201[empty]
     <name not found> = EmptyList@201[empty]
@@ -534,9 +494,52 @@ ResolutionTaskHolder@259 {
     <name not found> = EmptyList@201[empty]
 }
 
-ResolutionTaskHolder@265 {
-    <name not found> = ArrayList@266[4] { ResolutionCandidate@267, ResolutionCandidate@268, ResolutionCandidate@269, ... }
-    <name not found> = ArrayList@270[5] { ResolutionCandidate@267, ResolutionCandidate@268, ResolutionCandidate@269, ... }
+ResolutionTaskHolder@255 {
+    <name not found> = ArrayList@256[4] { ResolutionCandidate@257, ResolutionCandidate@258, ResolutionCandidate@259, ... }
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
+}
+
+null {
+    <name not found> = ArrayList@260[1] { ResolutionCandidate@234 }
+    <name not found> = ArrayList@261[1] { ResolutionCandidate@228 }
+    <name not found> = ArrayList@262[1] { ResolutionCandidate@225 }
+    <name not found> = ArrayList@263[1] { ResolutionCandidate@243 }
+    <name not found> = ArrayList@264[1] { ResolutionCandidate@237 }
+    <name not found> = ArrayList@265[1] { ResolutionCandidate@231 }
+    <name not found> = ArrayList@266[1] { ResolutionCandidate@240 }
+    <name not found> = ArrayList@267[1] { ResolutionCandidate@249 }
+    <name not found> = ArrayList@268[1] { ResolutionCandidate@246 }
+    <name not found> = ArrayList@269[3] { ResolutionCandidate@252, ResolutionCandidate@253, ResolutionCandidate@254 }
+    <name not found> = ArrayList@270[5] { ResolutionCandidate@257, ResolutionCandidate@258, ResolutionCandidate@259, ... }
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
     <name not found> = EmptyList@201[empty]
     <name not found> = EmptyList@201[empty]
     <name not found> = EmptyList@201[empty]
diff --git a/compiler/testData/diagnostics/tests/inference/constraints/equalityConstraintOnNullableType.lazy.log b/compiler/testData/diagnostics/tests/inference/constraints/equalityConstraintOnNullableType.lazy.log
index 7c2d0b5eb4a..3fcf7029d36 100644
--- a/compiler/testData/diagnostics/tests/inference/constraints/equalityConstraintOnNullableType.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/constraints/equalityConstraintOnNullableType.lazy.log
@@ -47,14 +47,14 @@ LazyJavaClassifierType@24['String'] {
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@20['String']
+    classifier = JavaClassImpl@23['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@29['String'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@23['String']
+    classifier = JavaClassImpl@20['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -82,21 +82,21 @@ LazyJavaClassifierType@38['Throwable'] {
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@33['Throwable']
+    classifier = JavaClassImpl@40['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@43['Throwable'] {
     arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@37['Throwable']
+    classifier = JavaClassImpl@33['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@45['Throwable'] {
     arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@40['Throwable']
+    classifier = JavaClassImpl@37['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -178,145 +178,148 @@ LazyJavaPackageFragment@60['lang'] {
 
 ResolutionTaskHolder@100 {
     <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
     <name not found> = EmptyList@91[empty]
     <name not found> = EmptyList@91[empty]
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
     <name not found> = EmptyList@91[empty]
     <name not found> = EmptyList@91[empty]
 }
 
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
     <name not found> = EmptyList@91[empty]
     <name not found> = EmptyList@91[empty]
+}
+
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
     <name not found> = EmptyList@91[empty]
     <name not found> = EmptyList@91[empty]
 }
 
 ResolutionTaskHolder@112 {
     <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
     <name not found> = EmptyList@91[empty]
     <name not found> = EmptyList@91[empty]
 }
 
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
+ResolutionTaskHolder@115 {
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
     <name not found> = EmptyList@91[empty]
     <name not found> = EmptyList@91[empty]
 }
 
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
+ResolutionTaskHolder@118 {
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
+}
+
+ResolutionTaskHolder@121 {
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
 }
 
 ResolutionTaskHolder@124 {
     <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@126 }
 }
 
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
+ResolutionTaskHolder@127 {
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
 }
 
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
+ResolutionTaskHolder@130 {
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
+}
+
+ResolutionTaskHolder@133 {
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
 }
 
 ResolutionTaskHolder@136 {
     <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
 }
 
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
+ResolutionTaskHolder@139 {
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
 }
 
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
+ResolutionTaskHolder@142 {
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
+}
+
+ResolutionTaskHolder@145 {
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
 }
 
 ResolutionTaskHolder@148 {
     <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
 }
 
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
+ResolutionTaskHolder@151 {
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
 }
 
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
+ResolutionTaskHolder@154 {
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
+}
+
+ResolutionTaskHolder@157 {
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
 }
 
 ResolutionTaskHolder@160 {
     <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@162 }
 }
 
-ResolutionTaskHolder@164 {
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@166 }
-}
-
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@170 }
-}
-
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@174 }
-}
-
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@178 }
-}
-
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@182 }
-}
-
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[4] { ResolutionCandidate@186, ResolutionCandidate@187, ResolutionCandidate@188, ... }
-    <name not found> = ArrayList@189[5] { ResolutionCandidate@186, ResolutionCandidate@187, ResolutionCandidate@188, ... }
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
+ResolutionTaskHolder@163 {
+    <name not found> = ArrayList@164[4] { ResolutionCandidate@165, ResolutionCandidate@166, ResolutionCandidate@167, ... }
     <name not found> = EmptyList@91[empty]
     <name not found> = EmptyList@91[empty]
 }
 
-ResolutionTaskHolder@190 {
-    <name not found> = ArrayList@191[4] { ResolutionCandidate@192, ResolutionCandidate@193, ResolutionCandidate@194, ... }
-    <name not found> = ArrayList@195[5] { ResolutionCandidate@192, ResolutionCandidate@193, ResolutionCandidate@194, ... }
+ResolutionTaskHolder@168 {
+    <name not found> = ArrayList@169[4] { ResolutionCandidate@170, ResolutionCandidate@171, ResolutionCandidate@172, ... }
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+}
+
+null {
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@159 }
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@126 }
+    <name not found> = ArrayList@176[1] { ResolutionCandidate@129 }
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@132 }
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@156 }
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@135 }
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@147 }
+    <name not found> = ArrayList@189[1] { ResolutionCandidate@153 }
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@141 }
+    <name not found> = ArrayList@192[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@162 }
+    <name not found> = ArrayList@194[5] { ResolutionCandidate@165, ResolutionCandidate@166, ResolutionCandidate@167, ... }
+    <name not found> = ArrayList@195[5] { ResolutionCandidate@170, ResolutionCandidate@171, ResolutionCandidate@172, ... }
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
     <name not found> = EmptyList@91[empty]
     <name not found> = EmptyList@91[empty]
     <name not found> = EmptyList@91[empty]
diff --git a/compiler/testData/diagnostics/tests/inference/constraints/notNullConstraintOnNullableType.lazy.log b/compiler/testData/diagnostics/tests/inference/constraints/notNullConstraintOnNullableType.lazy.log
index 0f4a0fd0a6b..7c2e14a1ccc 100644
--- a/compiler/testData/diagnostics/tests/inference/constraints/notNullConstraintOnNullableType.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/constraints/notNullConstraintOnNullableType.lazy.log
@@ -38,21 +38,21 @@ LazyJavaClassifierType@21['String'] {
 
 LazyJavaClassifierType@24['String'] {
     arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@23['String']
+    classifier = JavaClassImpl@20['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@15['String']
+    classifier = JavaClassImpl@23['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@29['String'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@20['String']
+    classifier = JavaClassImpl@15['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -87,14 +87,14 @@ LazyJavaClassifierType@41['Throwable'] {
 
 LazyJavaClassifierType@43['Throwable'] {
     arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@33['Throwable']
+    classifier = JavaClassImpl@40['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@45['Throwable'] {
     arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@40['Throwable']
+    classifier = JavaClassImpl@33['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -197,129 +197,132 @@ LazyJavaPackageFragment@63['lang'] {
 
 ResolutionTaskHolder@115 {
     <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@117 }
-    <name not found> = EmptyList@106[empty]
-    <name not found> = EmptyList@106[empty]
     <name not found> = EmptyList@106[empty]
     <name not found> = EmptyList@106[empty]
 }
 
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@121 }
-    <name not found> = EmptyList@106[empty]
-    <name not found> = EmptyList@106[empty]
+ResolutionTaskHolder@118 {
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
     <name not found> = EmptyList@106[empty]
     <name not found> = EmptyList@106[empty]
 }
 
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@125 }
+ResolutionTaskHolder@121 {
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
     <name not found> = EmptyList@106[empty]
     <name not found> = EmptyList@106[empty]
+}
+
+ResolutionTaskHolder@124 {
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
     <name not found> = EmptyList@106[empty]
     <name not found> = EmptyList@106[empty]
 }
 
 ResolutionTaskHolder@127 {
     <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@129 }
-    <name not found> = EmptyList@106[empty]
-    <name not found> = EmptyList@106[empty]
     <name not found> = EmptyList@106[empty]
     <name not found> = EmptyList@106[empty]
 }
 
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@133 }
-    <name not found> = EmptyList@106[empty]
-    <name not found> = EmptyList@106[empty]
-    <name not found> = EmptyList@106[empty]
-    <name not found> = EmptyList@106[empty]
+ResolutionTaskHolder@130 {
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
 }
 
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@137 }
+ResolutionTaskHolder@133 {
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
+}
+
+ResolutionTaskHolder@136 {
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
 }
 
 ResolutionTaskHolder@139 {
     <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@141 }
 }
 
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@145 }
+ResolutionTaskHolder@142 {
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
 }
 
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@149 }
+ResolutionTaskHolder@145 {
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
+}
+
+ResolutionTaskHolder@148 {
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
 }
 
 ResolutionTaskHolder@151 {
     <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@153 }
 }
 
-ResolutionTaskHolder@155 {
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@157 }
+ResolutionTaskHolder@154 {
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
 }
 
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@161 }
+ResolutionTaskHolder@157 {
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
 }
 
-ResolutionTaskHolder@163 {
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@165 }
+ResolutionTaskHolder@160 {
+    <name not found> = ArrayList@161[4] { ResolutionCandidate@162, ResolutionCandidate@163, ResolutionCandidate@164, ... }
+    <name not found> = EmptyList@106[empty]
+    <name not found> = EmptyList@106[empty]
 }
 
-ResolutionTaskHolder@167 {
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@169 }
+ResolutionTaskHolder@165 {
+    <name not found> = ArrayList@166[4] { ResolutionCandidate@167, ResolutionCandidate@168, ResolutionCandidate@169, ... }
+    <name not found> = EmptyList@106[empty]
+    <name not found> = EmptyList@106[empty]
 }
 
-ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@173 }
+ResolutionTaskHolder@170 {
+    <name not found> = ArrayList@171[4] { ResolutionCandidate@172, ResolutionCandidate@173, ResolutionCandidate@174, ... }
+    <name not found> = EmptyList@106[empty]
+    <name not found> = EmptyList@106[empty]
 }
 
 ResolutionTaskHolder@175 {
     <name not found> = ArrayList@176[4] { ResolutionCandidate@177, ResolutionCandidate@178, ResolutionCandidate@179, ... }
-    <name not found> = ArrayList@180[5] { ResolutionCandidate@177, ResolutionCandidate@178, ResolutionCandidate@179, ... }
-    <name not found> = EmptyList@106[empty]
-    <name not found> = EmptyList@106[empty]
     <name not found> = EmptyList@106[empty]
     <name not found> = EmptyList@106[empty]
 }
 
-ResolutionTaskHolder@181 {
-    <name not found> = ArrayList@182[4] { ResolutionCandidate@183, ResolutionCandidate@184, ResolutionCandidate@185, ... }
-    <name not found> = ArrayList@186[5] { ResolutionCandidate@183, ResolutionCandidate@184, ResolutionCandidate@185, ... }
-    <name not found> = EmptyList@106[empty]
-    <name not found> = EmptyList@106[empty]
-    <name not found> = EmptyList@106[empty]
-    <name not found> = EmptyList@106[empty]
-}
-
-ResolutionTaskHolder@187 {
-    <name not found> = ArrayList@188[4] { ResolutionCandidate@189, ResolutionCandidate@190, ResolutionCandidate@191, ... }
-    <name not found> = ArrayList@192[5] { ResolutionCandidate@189, ResolutionCandidate@190, ResolutionCandidate@191, ... }
-    <name not found> = EmptyList@106[empty]
-    <name not found> = EmptyList@106[empty]
-    <name not found> = EmptyList@106[empty]
-    <name not found> = EmptyList@106[empty]
-}
-
-ResolutionTaskHolder@193 {
-    <name not found> = ArrayList@194[4] { ResolutionCandidate@195, ResolutionCandidate@196, ResolutionCandidate@197, ... }
-    <name not found> = ArrayList@198[5] { ResolutionCandidate@195, ResolutionCandidate@196, ResolutionCandidate@197, ... }
+null {
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@135 }
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@147 }
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@156 }
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@129 }
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@132 }
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@189[1] { ResolutionCandidate@153 }
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@159 }
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@141 }
+    <name not found> = ArrayList@192[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@194[1] { ResolutionCandidate@126 }
+    <name not found> = ArrayList@195[5] { ResolutionCandidate@172, ResolutionCandidate@173, ResolutionCandidate@174, ... }
+    <name not found> = ArrayList@196[5] { ResolutionCandidate@177, ResolutionCandidate@178, ResolutionCandidate@179, ... }
+    <name not found> = ArrayList@197[5] { ResolutionCandidate@162, ResolutionCandidate@163, ResolutionCandidate@164, ... }
+    <name not found> = ArrayList@198[5] { ResolutionCandidate@167, ResolutionCandidate@168, ResolutionCandidate@169, ... }
+    <name not found> = EmptyList@106[empty]
+    <name not found> = EmptyList@106[empty]
+    <name not found> = EmptyList@106[empty]
+    <name not found> = EmptyList@106[empty]
+    <name not found> = EmptyList@106[empty]
+    <name not found> = EmptyList@106[empty]
+    <name not found> = EmptyList@106[empty]
+    <name not found> = EmptyList@106[empty]
+    <name not found> = EmptyList@106[empty]
+    <name not found> = EmptyList@106[empty]
+    <name not found> = EmptyList@106[empty]
+    <name not found> = EmptyList@106[empty]
+    <name not found> = EmptyList@106[empty]
+    <name not found> = EmptyList@106[empty]
     <name not found> = EmptyList@106[empty]
     <name not found> = EmptyList@106[empty]
     <name not found> = EmptyList@106[empty]
diff --git a/compiler/testData/diagnostics/tests/inference/constraints/subtypeConstraintOnNullableType.lazy.log b/compiler/testData/diagnostics/tests/inference/constraints/subtypeConstraintOnNullableType.lazy.log
index e28c8f0c1ec..7c7fdb0bea2 100644
--- a/compiler/testData/diagnostics/tests/inference/constraints/subtypeConstraintOnNullableType.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/constraints/subtypeConstraintOnNullableType.lazy.log
@@ -40,21 +40,21 @@ LazyJavaClassifierType@21['String'] {
 
 LazyJavaClassifierType@24['String'] {
     arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@23['String']
+    classifier = JavaClassImpl@15['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@15['String']
+    classifier = JavaClassImpl@20['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@29['String'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@20['String']
+    classifier = JavaClassImpl@23['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -82,21 +82,21 @@ LazyJavaClassifierType@38['Throwable'] {
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@37['Throwable']
+    classifier = JavaClassImpl@40['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@43['Throwable'] {
     arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@33['Throwable']
+    classifier = JavaClassImpl@37['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@45['Throwable'] {
     arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@40['Throwable']
+    classifier = JavaClassImpl@33['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -182,145 +182,148 @@ LazyJavaPackageFragment@61['lang'] {
 
 ResolutionTaskHolder@104 {
     <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
 }
 
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
 }
 
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
+}
+
+ResolutionTaskHolder@113 {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
 }
 
 ResolutionTaskHolder@116 {
     <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
 }
 
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
+ResolutionTaskHolder@119 {
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
 }
 
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@126 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
+ResolutionTaskHolder@122 {
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
+}
+
+ResolutionTaskHolder@125 {
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
 }
 
 ResolutionTaskHolder@128 {
     <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
 }
 
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
+ResolutionTaskHolder@131 {
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
 }
 
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
+ResolutionTaskHolder@134 {
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
+}
+
+ResolutionTaskHolder@137 {
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
 }
 
 ResolutionTaskHolder@140 {
     <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
 }
 
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
+ResolutionTaskHolder@143 {
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
 }
 
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
+ResolutionTaskHolder@146 {
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
+}
+
+ResolutionTaskHolder@149 {
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
 }
 
 ResolutionTaskHolder@152 {
     <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
 }
 
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
+ResolutionTaskHolder@155 {
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
 }
 
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@162 }
+ResolutionTaskHolder@158 {
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
+}
+
+ResolutionTaskHolder@161 {
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
 }
 
 ResolutionTaskHolder@164 {
     <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@166 }
 }
 
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@170 }
-}
-
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@174 }
-}
-
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@178 }
-}
-
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@182 }
-}
-
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@186 }
-}
-
-ResolutionTaskHolder@188 {
-    <name not found> = ArrayList@189[4] { ResolutionCandidate@190, ResolutionCandidate@191, ResolutionCandidate@192, ... }
-    <name not found> = ArrayList@193[5] { ResolutionCandidate@190, ResolutionCandidate@191, ResolutionCandidate@192, ... }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
+ResolutionTaskHolder@167 {
+    <name not found> = ArrayList@168[4] { ResolutionCandidate@169, ResolutionCandidate@170, ResolutionCandidate@171, ... }
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
 }
 
-ResolutionTaskHolder@194 {
-    <name not found> = ArrayList@195[4] { ResolutionCandidate@196, ResolutionCandidate@197, ResolutionCandidate@198, ... }
-    <name not found> = ArrayList@199[5] { ResolutionCandidate@196, ResolutionCandidate@197, ResolutionCandidate@198, ... }
+ResolutionTaskHolder@172 {
+    <name not found> = ArrayList@173[4] { ResolutionCandidate@174, ResolutionCandidate@175, ResolutionCandidate@176, ... }
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+}
+
+null {
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@139 }
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@148 }
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@142 }
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@136 }
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@166 }
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@151 }
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@163 }
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@145 }
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@189[1] { ResolutionCandidate@127 }
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@160 }
+    <name not found> = ArrayList@192[1] { ResolutionCandidate@154 }
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@133 }
+    <name not found> = ArrayList@194[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@157 }
+    <name not found> = ArrayList@196[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@197[1] { ResolutionCandidate@124 }
+    <name not found> = ArrayList@198[5] { ResolutionCandidate@174, ResolutionCandidate@175, ResolutionCandidate@176, ... }
+    <name not found> = ArrayList@199[5] { ResolutionCandidate@169, ResolutionCandidate@170, ResolutionCandidate@171, ... }
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
diff --git a/compiler/testData/diagnostics/tests/inference/constraints/supertypeConstraintOnNullableType.lazy.log b/compiler/testData/diagnostics/tests/inference/constraints/supertypeConstraintOnNullableType.lazy.log
index 272497069c9..860b4a3f24b 100644
--- a/compiler/testData/diagnostics/tests/inference/constraints/supertypeConstraintOnNullableType.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/constraints/supertypeConstraintOnNullableType.lazy.log
@@ -40,7 +40,7 @@ LazyJavaClassifierType@21['String'] {
 
 LazyJavaClassifierType@24['String'] {
     arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@20['String']
+    classifier = JavaClassImpl@23['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -54,7 +54,7 @@ LazyJavaClassifierType@27['String'] {
 
 LazyJavaClassifierType@29['String'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@23['String']
+    classifier = JavaClassImpl@20['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -82,21 +82,21 @@ LazyJavaClassifierType@38['Throwable'] {
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@40['Throwable']
+    classifier = JavaClassImpl@33['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@43['Throwable'] {
     arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@33['Throwable']
+    classifier = JavaClassImpl@37['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@45['Throwable'] {
     arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@37['Throwable']
+    classifier = JavaClassImpl@40['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -182,145 +182,148 @@ LazyJavaPackageFragment@61['lang'] {
 
 ResolutionTaskHolder@104 {
     <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
 }
 
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
 }
 
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
+}
+
+ResolutionTaskHolder@113 {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
 }
 
 ResolutionTaskHolder@116 {
     <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
 }
 
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
+ResolutionTaskHolder@119 {
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
 }
 
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@126 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
+ResolutionTaskHolder@122 {
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
+}
+
+ResolutionTaskHolder@125 {
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
 }
 
 ResolutionTaskHolder@128 {
     <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
 }
 
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
+ResolutionTaskHolder@131 {
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
 }
 
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
+ResolutionTaskHolder@134 {
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
+}
+
+ResolutionTaskHolder@137 {
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
 }
 
 ResolutionTaskHolder@140 {
     <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
 }
 
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
+ResolutionTaskHolder@143 {
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
 }
 
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
+ResolutionTaskHolder@146 {
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
+}
+
+ResolutionTaskHolder@149 {
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
 }
 
 ResolutionTaskHolder@152 {
     <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
 }
 
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
+ResolutionTaskHolder@155 {
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
 }
 
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@162 }
+ResolutionTaskHolder@158 {
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
+}
+
+ResolutionTaskHolder@161 {
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
 }
 
 ResolutionTaskHolder@164 {
     <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@166 }
 }
 
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@170 }
-}
-
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@174 }
-}
-
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@178 }
-}
-
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@182 }
-}
-
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@186 }
-}
-
-ResolutionTaskHolder@188 {
-    <name not found> = ArrayList@189[4] { ResolutionCandidate@190, ResolutionCandidate@191, ResolutionCandidate@192, ... }
-    <name not found> = ArrayList@193[5] { ResolutionCandidate@190, ResolutionCandidate@191, ResolutionCandidate@192, ... }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
+ResolutionTaskHolder@167 {
+    <name not found> = ArrayList@168[4] { ResolutionCandidate@169, ResolutionCandidate@170, ResolutionCandidate@171, ... }
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
 }
 
-ResolutionTaskHolder@194 {
-    <name not found> = ArrayList@195[4] { ResolutionCandidate@196, ResolutionCandidate@197, ResolutionCandidate@198, ... }
-    <name not found> = ArrayList@199[5] { ResolutionCandidate@196, ResolutionCandidate@197, ResolutionCandidate@198, ... }
+ResolutionTaskHolder@172 {
+    <name not found> = ArrayList@173[4] { ResolutionCandidate@174, ResolutionCandidate@175, ResolutionCandidate@176, ... }
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+}
+
+null {
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@148 }
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@124 }
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@160 }
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@136 }
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@154 }
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@157 }
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@139 }
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@163 }
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@189[1] { ResolutionCandidate@145 }
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@166 }
+    <name not found> = ArrayList@192[1] { ResolutionCandidate@127 }
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@133 }
+    <name not found> = ArrayList@194[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@142 }
+    <name not found> = ArrayList@196[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@197[1] { ResolutionCandidate@151 }
+    <name not found> = ArrayList@198[5] { ResolutionCandidate@169, ResolutionCandidate@170, ResolutionCandidate@171, ... }
+    <name not found> = ArrayList@199[5] { ResolutionCandidate@174, ResolutionCandidate@175, ResolutionCandidate@176, ... }
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
diff --git a/compiler/testData/diagnostics/tests/inference/dependOnExpectedType.lazy.log b/compiler/testData/diagnostics/tests/inference/dependOnExpectedType.lazy.log
index 35ee1ad30df..faa37f92325 100644
--- a/compiler/testData/diagnostics/tests/inference/dependOnExpectedType.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/dependOnExpectedType.lazy.log
@@ -123,49 +123,49 @@ LazyJavaClassifierType@100['E'] {
     arguments = ArrayList@101[empty]
     classifier = JavaTypeParameterImpl@102['E']
     nullable = 'false': Boolean@84
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
 }
 
-LazyJavaClassifierType@104['E'] {
-    arguments = ArrayList@105[empty]
-    classifier = JavaTypeParameterImpl@106['E']
+LazyJavaClassifierType@103['E'] {
+    arguments = ArrayList@104[empty]
+    classifier = JavaTypeParameterImpl@105['E']
     nullable = 'false': Boolean@84
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
 }
 
 LazyJavaClassifierType@107['E'] {
     arguments = ArrayList@108[empty]
     classifier = JavaTypeParameterImpl@109['E']
     nullable = 'false': Boolean@84
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@110
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
 }
 
-LazyJavaClassifierType@111['E'] {
-    arguments = ArrayList@112[empty]
-    classifier = JavaTypeParameterImpl@113['E']
+LazyJavaClassifierType@110['E'] {
+    arguments = ArrayList@111[empty]
+    classifier = JavaTypeParameterImpl@112['E']
     nullable = 'false': Boolean@84
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@110
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@113
 }
 
 LazyJavaClassifierType@114['E'] {
     arguments = ArrayList@115[empty]
     classifier = JavaTypeParameterImpl@116['E']
     nullable = 'false': Boolean@84
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
 }
 
 LazyJavaClassifierType@117['E'] {
     arguments = ArrayList@118[empty]
     classifier = JavaTypeParameterImpl@119['E']
     nullable = 'false': Boolean@84
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@110
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
 }
 
 LazyJavaClassifierType@120['E'] {
     arguments = ArrayList@121[empty]
     classifier = JavaTypeParameterImpl@122['E']
     nullable = 'false': Boolean@84
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@110
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@113
 }
 
 LazyJavaClassifierType@123['E'] {
@@ -179,115 +179,115 @@ LazyJavaClassifierType@126['E'] {
     arguments = ArrayList@127[empty]
     classifier = JavaTypeParameterImpl@128['E']
     nullable = 'false': Boolean@84
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@110
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
 }
 
 LazyJavaClassifierType@129['E'] {
     arguments = ArrayList@130[empty]
     classifier = JavaTypeParameterImpl@131['E']
     nullable = 'false': Boolean@84
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@110
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
 }
 
 LazyJavaClassifierType@132['E'] {
     arguments = ArrayList@133[empty]
     classifier = JavaTypeParameterImpl@134['E']
     nullable = 'false': Boolean@84
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
 }
 
 LazyJavaClassifierType@135['E'] {
     arguments = ArrayList@136[empty]
-    classifier = JavaTypeParameterImpl@98['E']
+    classifier = JavaTypeParameterImpl@105['E']
     nullable = 'true': Boolean@90
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
 }
 
 LazyJavaClassifierType@137['E'] {
     arguments = ArrayList@138[empty]
-    classifier = JavaTypeParameterImpl@134['E']
+    classifier = JavaTypeParameterImpl@116['E']
     nullable = 'true': Boolean@90
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
 }
 
 LazyJavaClassifierType@139['E'] {
     arguments = ArrayList@140[empty]
-    classifier = JavaTypeParameterImpl@113['E']
+    classifier = JavaTypeParameterImpl@119['E']
     nullable = 'true': Boolean@90
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@110
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
 }
 
 LazyJavaClassifierType@141['E'] {
     arguments = ArrayList@142[empty]
-    classifier = JavaTypeParameterImpl@128['E']
+    classifier = JavaTypeParameterImpl@125['E']
     nullable = 'true': Boolean@90
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@110
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
 }
 
 LazyJavaClassifierType@143['E'] {
     arguments = ArrayList@144[empty]
-    classifier = JavaTypeParameterImpl@122['E']
+    classifier = JavaTypeParameterImpl@134['E']
     nullable = 'true': Boolean@90
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@110
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
 }
 
 LazyJavaClassifierType@145['E'] {
     arguments = ArrayList@146[empty]
-    classifier = JavaTypeParameterImpl@125['E']
+    classifier = JavaTypeParameterImpl@102['E']
     nullable = 'true': Boolean@90
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
 }
 
 LazyJavaClassifierType@147['E'] {
     arguments = ArrayList@148[empty]
-    classifier = JavaTypeParameterImpl@106['E']
+    classifier = JavaTypeParameterImpl@122['E']
     nullable = 'true': Boolean@90
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@113
 }
 
 LazyJavaClassifierType@149['E'] {
     arguments = ArrayList@150[empty]
-    classifier = JavaTypeParameterImpl@102['E']
+    classifier = JavaTypeParameterImpl@112['E']
     nullable = 'true': Boolean@90
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@113
 }
 
 LazyJavaClassifierType@151['E'] {
     arguments = ArrayList@152[empty]
-    classifier = JavaTypeParameterImpl@119['E']
+    classifier = JavaTypeParameterImpl@128['E']
     nullable = 'true': Boolean@90
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@110
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
 }
 
 LazyJavaClassifierType@153['E'] {
     arguments = ArrayList@154[empty]
-    classifier = JavaTypeParameterImpl@131['E']
+    classifier = JavaTypeParameterImpl@98['E']
     nullable = 'true': Boolean@90
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@110
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
 }
 
 LazyJavaClassifierType@155['E'] {
     arguments = ArrayList@156[empty]
-    classifier = JavaTypeParameterImpl@116['E']
+    classifier = JavaTypeParameterImpl@109['E']
     nullable = 'true': Boolean@90
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
 }
 
 LazyJavaClassifierType@157['E'] {
     arguments = ArrayList@158[empty]
-    classifier = JavaTypeParameterImpl@109['E']
+    classifier = JavaTypeParameterImpl@131['E']
     nullable = 'true': Boolean@90
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@110
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
 }
 
-LazyJavaClassifierType@54['List<E>'] {
+LazyJavaClassifierType@59['List<E>'] {
     arguments = ArrayList@159[1] { TypeProjectionImpl@160 }
     classifier = JavaClassImpl@161['List']
     memberScope = SubstitutingScope@162
     typeConstructor = DeserializedClassTypeConstructor@163
 }
 
-LazyJavaClassifierType@59['List<E>'] {
+LazyJavaClassifierType@54['List<E>'] {
     arguments = ArrayList@164[1] { TypeProjectionImpl@165 }
     classifier = JavaClassImpl@166['List']
     memberScope = SubstitutingScope@167
@@ -442,21 +442,21 @@ LazyJavaPackageFragment@218['util'] {
     memberIndex = computeMemberIndex$1@267 // through LazyPackageFragmentScopeForJavaPackage@261
 }
 
-LazyJavaTypeParameterDescriptor@56['E'] {
+LazyJavaTypeParameterDescriptor@51['E'] {
     defaultType = JetTypeImpl@268['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@110
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
     upperBounds = LinkedHashSet@269[1] { NullableType@270 }
     upperBoundsAsType = NullableType@270
 }
 
-LazyJavaTypeParameterDescriptor@51['E'] {
+LazyJavaTypeParameterDescriptor@47['E'] {
     defaultType = JetTypeImpl@271['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@113
     upperBounds = LinkedHashSet@272[1] { NullableType@273 }
     upperBoundsAsType = NullableType@273
 }
 
-LazyJavaTypeParameterDescriptor@47['E'] {
+LazyJavaTypeParameterDescriptor@56['E'] {
     defaultType = JetTypeImpl@274['E']
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
     upperBounds = LinkedHashSet@275[1] { NullableType@276 }
@@ -464,27 +464,27 @@ LazyJavaTypeParameterDescriptor@47['E'] {
 }
 
 LazyJavaTypeParameterResolver@277 {
-    resolve(JavaTypeParameterImpl@278['E']) = LazyJavaTypeParameterDescriptor@56['E']
+    resolve(JavaTypeParameterImpl@112['E']) = LazyJavaTypeParameterDescriptor@47['E']
+}
+
+LazyJavaTypeParameterResolver@278 {
+    resolve(JavaTypeParameterImpl@128['E']) = LazyJavaTypeParameterDescriptor@51['E']
 }
 
 LazyJavaTypeParameterResolver@279 {
-    resolve(JavaTypeParameterImpl@125['E']) = LazyJavaTypeParameterDescriptor@47['E']
-}
-
-LazyJavaTypeParameterResolver@280 {
-    resolve(JavaTypeParameterImpl@106['E']) = LazyJavaTypeParameterDescriptor@51['E']
+    resolve(JavaTypeParameterImpl@280['E']) = LazyJavaTypeParameterDescriptor@56['E']
 }
 
 LazyJavaTypeParameterResolver@281 {
-    resolve(JavaTypeParameterImpl@102['E']) = null
+    resolve(JavaTypeParameterImpl@131['E']) = null
 }
 
 LazyJavaTypeParameterResolver@282 {
-    resolve(JavaTypeParameterImpl@134['E']) = null
+    resolve(JavaTypeParameterImpl@98['E']) = null
 }
 
 LazyJavaTypeParameterResolver@283 {
-    resolve(JavaTypeParameterImpl@131['E']) = null
+    resolve(JavaTypeParameterImpl@105['E']) = null
 }
 
 LazyJavaTypeParameterResolver@284 {
@@ -492,360 +492,363 @@ LazyJavaTypeParameterResolver@284 {
 }
 
 LazyJavaTypeParameterResolver@285 {
-    resolve(JavaTypeParameterImpl@98['E']) = null
+    resolve(JavaTypeParameterImpl@122['E']) = null
 }
 
 ResolutionTaskHolder@286 {
     <name not found> = ArrayList@287[1] { ResolutionCandidate@288 }
-    <name not found> = ArrayList@289[1] { ResolutionCandidate@288 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@290 {
-    <name not found> = ArrayList@291[1] { ResolutionCandidate@292 }
-    <name not found> = ArrayList@293[1] { ResolutionCandidate@292 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
+ResolutionTaskHolder@289 {
+    <name not found> = ArrayList@290[1] { ResolutionCandidate@291 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@294 {
-    <name not found> = ArrayList@295[1] { ResolutionCandidate@296 }
-    <name not found> = ArrayList@297[1] { ResolutionCandidate@296 }
+ResolutionTaskHolder@292 {
+    <name not found> = ArrayList@293[1] { ResolutionCandidate@294 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
+}
+
+ResolutionTaskHolder@295 {
+    <name not found> = ArrayList@296[1] { ResolutionCandidate@297 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
 ResolutionTaskHolder@298 {
     <name not found> = ArrayList@299[1] { ResolutionCandidate@300 }
-    <name not found> = ArrayList@301[1] { ResolutionCandidate@300 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@302 {
-    <name not found> = ArrayList@303[1] { ResolutionCandidate@304 }
-    <name not found> = ArrayList@305[1] { ResolutionCandidate@304 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
+ResolutionTaskHolder@301 {
+    <name not found> = ArrayList@302[1] { ResolutionCandidate@303 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@306 {
-    <name not found> = ArrayList@307[1] { ResolutionCandidate@308 }
-    <name not found> = ArrayList@309[1] { ResolutionCandidate@308 }
+ResolutionTaskHolder@304 {
+    <name not found> = ArrayList@305[1] { ResolutionCandidate@306 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
+}
+
+ResolutionTaskHolder@307 {
+    <name not found> = ArrayList@308[1] { ResolutionCandidate@309 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
 ResolutionTaskHolder@310 {
     <name not found> = ArrayList@311[1] { ResolutionCandidate@312 }
-    <name not found> = ArrayList@313[1] { ResolutionCandidate@312 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@314 {
-    <name not found> = ArrayList@315[1] { ResolutionCandidate@316 }
-    <name not found> = ArrayList@317[1] { ResolutionCandidate@316 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
+ResolutionTaskHolder@313 {
+    <name not found> = ArrayList@314[1] { ResolutionCandidate@315 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@318 {
-    <name not found> = ArrayList@319[1] { ResolutionCandidate@320 }
-    <name not found> = ArrayList@321[1] { ResolutionCandidate@320 }
+ResolutionTaskHolder@316 {
+    <name not found> = ArrayList@317[1] { ResolutionCandidate@318 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
+}
+
+ResolutionTaskHolder@319 {
+    <name not found> = ArrayList@320[1] { ResolutionCandidate@321 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
 ResolutionTaskHolder@322 {
     <name not found> = ArrayList@323[1] { ResolutionCandidate@324 }
-    <name not found> = ArrayList@325[1] { ResolutionCandidate@324 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@326 {
-    <name not found> = ArrayList@327[1] { ResolutionCandidate@328 }
-    <name not found> = ArrayList@329[1] { ResolutionCandidate@328 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
+ResolutionTaskHolder@325 {
+    <name not found> = ArrayList@326[1] { ResolutionCandidate@327 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@330 {
-    <name not found> = ArrayList@331[1] { ResolutionCandidate@332 }
-    <name not found> = ArrayList@333[1] { ResolutionCandidate@332 }
+ResolutionTaskHolder@328 {
+    <name not found> = ArrayList@329[1] { ResolutionCandidate@330 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
+}
+
+ResolutionTaskHolder@331 {
+    <name not found> = ArrayList@332[1] { ResolutionCandidate@333 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
 ResolutionTaskHolder@334 {
     <name not found> = ArrayList@335[1] { ResolutionCandidate@336 }
-    <name not found> = ArrayList@337[1] { ResolutionCandidate@336 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@338 {
-    <name not found> = ArrayList@339[1] { ResolutionCandidate@340 }
-    <name not found> = ArrayList@341[1] { ResolutionCandidate@340 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
+ResolutionTaskHolder@337 {
+    <name not found> = ArrayList@338[1] { ResolutionCandidate@339 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@342 {
-    <name not found> = ArrayList@343[1] { ResolutionCandidate@344 }
-    <name not found> = ArrayList@345[1] { ResolutionCandidate@344 }
+ResolutionTaskHolder@340 {
+    <name not found> = ArrayList@341[1] { ResolutionCandidate@342 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
+}
+
+ResolutionTaskHolder@343 {
+    <name not found> = ArrayList@344[1] { ResolutionCandidate@345 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
 ResolutionTaskHolder@346 {
     <name not found> = ArrayList@347[1] { ResolutionCandidate@348 }
-    <name not found> = ArrayList@349[1] { ResolutionCandidate@348 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@350 {
-    <name not found> = ArrayList@351[1] { ResolutionCandidate@352 }
-    <name not found> = ArrayList@353[1] { ResolutionCandidate@352 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
+ResolutionTaskHolder@349 {
+    <name not found> = ArrayList@350[1] { ResolutionCandidate@351 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@354 {
-    <name not found> = ArrayList@355[1] { ResolutionCandidate@356 }
-    <name not found> = ArrayList@357[1] { ResolutionCandidate@356 }
+ResolutionTaskHolder@352 {
+    <name not found> = ArrayList@353[1] { ResolutionCandidate@354 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
+}
+
+ResolutionTaskHolder@355 {
+    <name not found> = ArrayList@356[1] { ResolutionCandidate@357 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
 ResolutionTaskHolder@358 {
     <name not found> = ArrayList@359[1] { ResolutionCandidate@360 }
-    <name not found> = ArrayList@361[1] { ResolutionCandidate@360 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@362 {
-    <name not found> = ArrayList@363[1] { ResolutionCandidate@364 }
-    <name not found> = ArrayList@365[1] { ResolutionCandidate@364 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
+ResolutionTaskHolder@361 {
+    <name not found> = ArrayList@362[1] { ResolutionCandidate@363 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@366 {
-    <name not found> = ArrayList@367[1] { ResolutionCandidate@368 }
-    <name not found> = ArrayList@369[1] { ResolutionCandidate@368 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
+ResolutionTaskHolder@364 {
+    <name not found> = ArrayList@365[1] { ResolutionCandidate@366 }
+}
+
+ResolutionTaskHolder@367 {
+    <name not found> = ArrayList@368[1] { ResolutionCandidate@369 }
 }
 
 ResolutionTaskHolder@370 {
     <name not found> = ArrayList@371[1] { ResolutionCandidate@372 }
-    <name not found> = ArrayList@373[1] { ResolutionCandidate@372 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@374 {
-    <name not found> = ArrayList@375[1] { ResolutionCandidate@376 }
-    <name not found> = ArrayList@377[1] { ResolutionCandidate@376 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
+ResolutionTaskHolder@373 {
+    <name not found> = ArrayList@374[1] { ResolutionCandidate@375 }
 }
 
-ResolutionTaskHolder@378 {
-    <name not found> = ArrayList@379[1] { ResolutionCandidate@380 }
-    <name not found> = ArrayList@381[1] { ResolutionCandidate@380 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
+ResolutionTaskHolder@376 {
+    <name not found> = ArrayList@377[1] { ResolutionCandidate@378 }
+}
+
+ResolutionTaskHolder@379 {
+    <name not found> = ArrayList@380[1] { ResolutionCandidate@381 }
 }
 
 ResolutionTaskHolder@382 {
     <name not found> = ArrayList@383[1] { ResolutionCandidate@384 }
-    <name not found> = ArrayList@385[1] { ResolutionCandidate@384 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@386 {
-    <name not found> = ArrayList@387[1] { ResolutionCandidate@388 }
-    <name not found> = ArrayList@389[1] { ResolutionCandidate@388 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
+ResolutionTaskHolder@385 {
+    <name not found> = ArrayList@386[1] { ResolutionCandidate@387 }
 }
 
-ResolutionTaskHolder@390 {
-    <name not found> = ArrayList@391[1] { ResolutionCandidate@392 }
-    <name not found> = ArrayList@393[1] { ResolutionCandidate@392 }
+ResolutionTaskHolder@388 {
+    <name not found> = ArrayList@389[1] { ResolutionCandidate@390 }
+}
+
+ResolutionTaskHolder@391 {
+    <name not found> = ArrayList@392[1] { ResolutionCandidate@393 }
 }
 
 ResolutionTaskHolder@394 {
     <name not found> = ArrayList@395[1] { ResolutionCandidate@396 }
-    <name not found> = ArrayList@397[1] { ResolutionCandidate@396 }
 }
 
-ResolutionTaskHolder@398 {
-    <name not found> = ArrayList@399[1] { ResolutionCandidate@400 }
-    <name not found> = ArrayList@401[1] { ResolutionCandidate@400 }
+ResolutionTaskHolder@397 {
+    <name not found> = ArrayList@398[1] { ResolutionCandidate@399 }
 }
 
-ResolutionTaskHolder@402 {
-    <name not found> = ArrayList@403[1] { ResolutionCandidate@404 }
-    <name not found> = ArrayList@405[1] { ResolutionCandidate@404 }
+ResolutionTaskHolder@400 {
+    <name not found> = ArrayList@401[1] { ResolutionCandidate@402 }
+}
+
+ResolutionTaskHolder@403 {
+    <name not found> = ArrayList@404[1] { ResolutionCandidate@405 }
 }
 
 ResolutionTaskHolder@406 {
     <name not found> = ArrayList@407[1] { ResolutionCandidate@408 }
-    <name not found> = ArrayList@409[1] { ResolutionCandidate@408 }
 }
 
-ResolutionTaskHolder@410 {
-    <name not found> = ArrayList@411[1] { ResolutionCandidate@412 }
-    <name not found> = ArrayList@413[1] { ResolutionCandidate@412 }
+ResolutionTaskHolder@409 {
+    <name not found> = ArrayList@410[1] { ResolutionCandidate@411 }
 }
 
-ResolutionTaskHolder@414 {
-    <name not found> = ArrayList@415[1] { ResolutionCandidate@416 }
-    <name not found> = ArrayList@417[1] { ResolutionCandidate@416 }
+ResolutionTaskHolder@412 {
+    <name not found> = ArrayList@413[1] { ResolutionCandidate@414 }
+}
+
+ResolutionTaskHolder@415 {
+    <name not found> = ArrayList@416[1] { ResolutionCandidate@417 }
 }
 
 ResolutionTaskHolder@418 {
     <name not found> = ArrayList@419[1] { ResolutionCandidate@420 }
-    <name not found> = ArrayList@421[1] { ResolutionCandidate@420 }
 }
 
-ResolutionTaskHolder@422 {
-    <name not found> = ArrayList@423[1] { ResolutionCandidate@424 }
-    <name not found> = ArrayList@425[1] { ResolutionCandidate@424 }
+ResolutionTaskHolder@421 {
+    <name not found> = ArrayList@422[1] { ResolutionCandidate@423 }
 }
 
-ResolutionTaskHolder@426 {
-    <name not found> = ArrayList@427[1] { ResolutionCandidate@428 }
-    <name not found> = ArrayList@429[1] { ResolutionCandidate@428 }
+ResolutionTaskHolder@424 {
+    <name not found> = ArrayList@425[2] { ResolutionCandidate@426, ResolutionCandidate@427 }
 }
 
-ResolutionTaskHolder@430 {
-    <name not found> = ArrayList@431[1] { ResolutionCandidate@432 }
-    <name not found> = ArrayList@433[1] { ResolutionCandidate@432 }
+ResolutionTaskHolder@428 {
+    <name not found> = ArrayList@429[3] { ResolutionCandidate@430, ResolutionCandidate@431, ResolutionCandidate@432 }
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@434 {
-    <name not found> = ArrayList@435[1] { ResolutionCandidate@436 }
-    <name not found> = ArrayList@437[1] { ResolutionCandidate@436 }
+ResolutionTaskHolder@433 {
+    <name not found> = ArrayList@434[3] { ResolutionCandidate@435, ResolutionCandidate@436, ResolutionCandidate@437 }
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@438 {
-    <name not found> = ArrayList@439[1] { ResolutionCandidate@440 }
-    <name not found> = ArrayList@441[1] { ResolutionCandidate@440 }
-}
-
-ResolutionTaskHolder@442 {
-    <name not found> = ArrayList@443[1] { ResolutionCandidate@444 }
-    <name not found> = ArrayList@445[1] { ResolutionCandidate@444 }
-}
-
-ResolutionTaskHolder@446 {
-    <name not found> = ArrayList@447[1] { ResolutionCandidate@448 }
-    <name not found> = ArrayList@449[1] { ResolutionCandidate@448 }
-}
-
-ResolutionTaskHolder@450 {
-    <name not found> = ArrayList@451[1] { ResolutionCandidate@452 }
-    <name not found> = ArrayList@453[1] { ResolutionCandidate@452 }
-}
-
-ResolutionTaskHolder@454 {
-    <name not found> = ArrayList@455[1] { ResolutionCandidate@456 }
-    <name not found> = ArrayList@457[1] { ResolutionCandidate@456 }
-}
-
-ResolutionTaskHolder@458 {
-    <name not found> = ArrayList@459[1] { ResolutionCandidate@460 }
-    <name not found> = ArrayList@461[1] { ResolutionCandidate@460 }
-}
-
-ResolutionTaskHolder@462 {
-    <name not found> = ArrayList@463[1] { ResolutionCandidate@464 }
-    <name not found> = ArrayList@465[1] { ResolutionCandidate@464 }
-}
-
-ResolutionTaskHolder@466 {
-    <name not found> = ArrayList@467[1] { ResolutionCandidate@468 }
-    <name not found> = ArrayList@469[1] { ResolutionCandidate@468 }
-}
-
-ResolutionTaskHolder@470 {
-    <name not found> = ArrayList@471[2] { ResolutionCandidate@472, ResolutionCandidate@473 }
-    <name not found> = ArrayList@474[2] { ResolutionCandidate@472, ResolutionCandidate@473 }
-}
-
-ResolutionTaskHolder@475 {
-    <name not found> = ArrayList@476[3] { ResolutionCandidate@477, ResolutionCandidate@478, ResolutionCandidate@479 }
-    <name not found> = ArrayList@480[3] { ResolutionCandidate@477, ResolutionCandidate@478, ResolutionCandidate@479 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@481 {
-    <name not found> = ArrayList@482[3] { ResolutionCandidate@483, ResolutionCandidate@484, ResolutionCandidate@485 }
-    <name not found> = ArrayList@486[3] { ResolutionCandidate@483, ResolutionCandidate@484, ResolutionCandidate@485 }
+null {
+    <name not found> = ArrayList@438[1] { ResolutionCandidate@366 }
+    <name not found> = ArrayList@439[1] { ResolutionCandidate@387 }
+    <name not found> = ArrayList@440[1] { ResolutionCandidate@405 }
+    <name not found> = ArrayList@441[1] { ResolutionCandidate@372 }
+    <name not found> = ArrayList@442[1] { ResolutionCandidate@423 }
+    <name not found> = ArrayList@443[1] { ResolutionCandidate@417 }
+    <name not found> = ArrayList@444[1] { ResolutionCandidate@402 }
+    <name not found> = ArrayList@445[1] { ResolutionCandidate@348 }
+    <name not found> = ArrayList@446[1] { ResolutionCandidate@339 }
+    <name not found> = ArrayList@447[1] { ResolutionCandidate@336 }
+    <name not found> = ArrayList@448[1] { ResolutionCandidate@321 }
+    <name not found> = ArrayList@449[1] { ResolutionCandidate@309 }
+    <name not found> = ArrayList@450[1] { ResolutionCandidate@294 }
+    <name not found> = ArrayList@451[1] { ResolutionCandidate@342 }
+    <name not found> = ArrayList@452[1] { ResolutionCandidate@351 }
+    <name not found> = ArrayList@453[1] { ResolutionCandidate@300 }
+    <name not found> = ArrayList@454[1] { ResolutionCandidate@306 }
+    <name not found> = ArrayList@455[1] { ResolutionCandidate@399 }
+    <name not found> = ArrayList@456[1] { ResolutionCandidate@375 }
+    <name not found> = ArrayList@457[1] { ResolutionCandidate@393 }
+    <name not found> = ArrayList@458[1] { ResolutionCandidate@315 }
+    <name not found> = ArrayList@459[1] { ResolutionCandidate@324 }
+    <name not found> = ArrayList@460[1] { ResolutionCandidate@360 }
+    <name not found> = ArrayList@461[1] { ResolutionCandidate@345 }
+    <name not found> = ArrayList@462[1] { ResolutionCandidate@354 }
+    <name not found> = ArrayList@463[1] { ResolutionCandidate@363 }
+    <name not found> = ArrayList@464[1] { ResolutionCandidate@327 }
+    <name not found> = ArrayList@465[1] { ResolutionCandidate@312 }
+    <name not found> = ArrayList@466[1] { ResolutionCandidate@381 }
+    <name not found> = ArrayList@467[1] { ResolutionCandidate@396 }
+    <name not found> = ArrayList@468[1] { ResolutionCandidate@420 }
+    <name not found> = ArrayList@469[1] { ResolutionCandidate@357 }
+    <name not found> = ArrayList@470[1] { ResolutionCandidate@288 }
+    <name not found> = ArrayList@471[1] { ResolutionCandidate@291 }
+    <name not found> = ArrayList@472[1] { ResolutionCandidate@318 }
+    <name not found> = ArrayList@473[1] { ResolutionCandidate@378 }
+    <name not found> = ArrayList@474[1] { ResolutionCandidate@414 }
+    <name not found> = ArrayList@475[1] { ResolutionCandidate@303 }
+    <name not found> = ArrayList@476[1] { ResolutionCandidate@297 }
+    <name not found> = ArrayList@477[1] { ResolutionCandidate@330 }
+    <name not found> = ArrayList@478[1] { ResolutionCandidate@333 }
+    <name not found> = ArrayList@479[1] { ResolutionCandidate@384 }
+    <name not found> = ArrayList@480[1] { ResolutionCandidate@390 }
+    <name not found> = ArrayList@481[1] { ResolutionCandidate@408 }
+    <name not found> = ArrayList@482[1] { ResolutionCandidate@369 }
+    <name not found> = ArrayList@483[1] { ResolutionCandidate@411 }
+    <name not found> = ArrayList@484[2] { ResolutionCandidate@426, ResolutionCandidate@427 }
+    <name not found> = ArrayList@485[3] { ResolutionCandidate@430, ResolutionCandidate@431, ResolutionCandidate@432 }
+    <name not found> = ArrayList@486[3] { ResolutionCandidate@435, ResolutionCandidate@436, ResolutionCandidate@437 }
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
diff --git a/compiler/testData/diagnostics/tests/inference/dependantOnVariance.lazy.log b/compiler/testData/diagnostics/tests/inference/dependantOnVariance.lazy.log
index f75a39773c3..21d5b0a8289 100644
--- a/compiler/testData/diagnostics/tests/inference/dependantOnVariance.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/dependantOnVariance.lazy.log
@@ -58,10 +58,6 @@ LazyJavaPackageFragment@17['lang'] {
 
 ResolutionTaskHolder@45 {
     <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
@@ -79,12 +75,8 @@ ResolutionTaskHolder@45 {
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
@@ -102,9 +94,8 @@ ResolutionTaskHolder@49 {
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
@@ -120,6 +111,22 @@ ResolutionTaskHolder@53 {
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
+}
+
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
@@ -127,10 +134,6 @@ ResolutionTaskHolder@53 {
 
 ResolutionTaskHolder@57 {
     <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
@@ -148,12 +151,8 @@ ResolutionTaskHolder@57 {
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
@@ -171,10 +170,8 @@ ResolutionTaskHolder@61 {
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
@@ -190,764 +187,770 @@ ResolutionTaskHolder@65 {
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
+}
+
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
 ResolutionTaskHolder@69 {
     <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
+}
+
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
 ResolutionTaskHolder@81 {
     <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
+}
+
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
 ResolutionTaskHolder@93 {
     <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
+}
+
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
 ResolutionTaskHolder@105 {
     <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
+ResolutionTaskHolder@111 {
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
+}
+
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
 ResolutionTaskHolder@117 {
     <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@120 {
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@127 }
+ResolutionTaskHolder@123 {
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
+}
+
+ResolutionTaskHolder@126 {
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
 ResolutionTaskHolder@129 {
     <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@131 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@135 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@132 {
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@139 }
+ResolutionTaskHolder@135 {
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
+}
+
+ResolutionTaskHolder@138 {
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
 ResolutionTaskHolder@141 {
     <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@143 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@147 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@144 {
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@149 {
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@151 }
+ResolutionTaskHolder@147 {
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
+}
+
+ResolutionTaskHolder@150 {
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
 ResolutionTaskHolder@153 {
     <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@155 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@159 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@156 {
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@161 {
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@163 }
+ResolutionTaskHolder@159 {
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
+}
+
+ResolutionTaskHolder@162 {
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
 ResolutionTaskHolder@165 {
     <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@167 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@169 {
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@171 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@168 {
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@173 {
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@175 }
+ResolutionTaskHolder@171 {
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
+}
+
+ResolutionTaskHolder@174 {
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
 ResolutionTaskHolder@177 {
     <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@179 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@181 {
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@183 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@180 {
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@185 {
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@187 }
+ResolutionTaskHolder@183 {
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
+}
+
+ResolutionTaskHolder@186 {
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
 ResolutionTaskHolder@189 {
     <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@191 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@193 {
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@195 }
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@195 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@192 {
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@197 {
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@199 }
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@199 }
+ResolutionTaskHolder@195 {
+    <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
+}
+
+ResolutionTaskHolder@198 {
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
 ResolutionTaskHolder@201 {
     <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@203 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@205 {
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@207 }
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@207 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@204 {
+    <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
 }
 
-ResolutionTaskHolder@209 {
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@211 }
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@211 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@207 {
+    <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
+}
+
+ResolutionTaskHolder@210 {
+    <name not found> = ArrayList@211[1] { ResolutionCandidate@212 }
 }
 
 ResolutionTaskHolder@213 {
     <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@215 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@217 {
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@219 }
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@219 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@216 {
+    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
 }
 
-ResolutionTaskHolder@221 {
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@223 }
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@223 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@219 {
+    <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
+}
+
+ResolutionTaskHolder@222 {
+    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
 }
 
 ResolutionTaskHolder@225 {
     <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@227 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@229 {
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@231 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@228 {
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
 }
 
-ResolutionTaskHolder@233 {
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@235 }
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@235 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@231 {
+    <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
+}
+
+ResolutionTaskHolder@234 {
+    <name not found> = ArrayList@235[1] { ResolutionCandidate@236 }
 }
 
 ResolutionTaskHolder@237 {
     <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@239 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@241 {
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@243 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@240 {
+    <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
 }
 
-ResolutionTaskHolder@245 {
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@247 }
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@247 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@243 {
+    <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
+}
+
+ResolutionTaskHolder@246 {
+    <name not found> = ArrayList@247[1] { ResolutionCandidate@248 }
 }
 
 ResolutionTaskHolder@249 {
     <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
-    <name not found> = ArrayList@252[1] { ResolutionCandidate@251 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@253 {
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@255 }
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@255 }
+ResolutionTaskHolder@252 {
+    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
 }
 
-ResolutionTaskHolder@257 {
-    <name not found> = ArrayList@258[1] { ResolutionCandidate@259 }
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@259 }
+ResolutionTaskHolder@255 {
+    <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
+}
+
+ResolutionTaskHolder@258 {
+    <name not found> = ArrayList@259[1] { ResolutionCandidate@260 }
 }
 
 ResolutionTaskHolder@261 {
     <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@263 }
 }
 
-ResolutionTaskHolder@265 {
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@267 }
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@267 }
+ResolutionTaskHolder@264 {
+    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
 }
 
-ResolutionTaskHolder@269 {
-    <name not found> = ArrayList@270[1] { ResolutionCandidate@271 }
-    <name not found> = ArrayList@272[1] { ResolutionCandidate@271 }
+ResolutionTaskHolder@267 {
+    <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
+}
+
+ResolutionTaskHolder@270 {
+    <name not found> = ArrayList@271[1] { ResolutionCandidate@272 }
 }
 
 ResolutionTaskHolder@273 {
     <name not found> = ArrayList@274[1] { ResolutionCandidate@275 }
-    <name not found> = ArrayList@276[1] { ResolutionCandidate@275 }
 }
 
-ResolutionTaskHolder@277 {
-    <name not found> = ArrayList@278[1] { ResolutionCandidate@279 }
-    <name not found> = ArrayList@280[1] { ResolutionCandidate@279 }
+ResolutionTaskHolder@276 {
+    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
 }
 
-ResolutionTaskHolder@281 {
-    <name not found> = ArrayList@282[1] { ResolutionCandidate@283 }
-    <name not found> = ArrayList@284[1] { ResolutionCandidate@283 }
+ResolutionTaskHolder@279 {
+    <name not found> = ArrayList@280[1] { ResolutionCandidate@281 }
+}
+
+ResolutionTaskHolder@282 {
+    <name not found> = ArrayList@283[1] { ResolutionCandidate@284 }
 }
 
 ResolutionTaskHolder@285 {
     <name not found> = ArrayList@286[1] { ResolutionCandidate@287 }
-    <name not found> = ArrayList@288[1] { ResolutionCandidate@287 }
 }
 
-ResolutionTaskHolder@289 {
-    <name not found> = ArrayList@290[1] { ResolutionCandidate@291 }
-    <name not found> = ArrayList@292[1] { ResolutionCandidate@291 }
+ResolutionTaskHolder@288 {
+    <name not found> = ArrayList@289[1] { ResolutionCandidate@290 }
 }
 
-ResolutionTaskHolder@293 {
-    <name not found> = ArrayList@294[1] { ResolutionCandidate@295 }
-    <name not found> = ArrayList@296[1] { ResolutionCandidate@295 }
+ResolutionTaskHolder@291 {
+    <name not found> = ArrayList@292[1] { ResolutionCandidate@293 }
+}
+
+ResolutionTaskHolder@294 {
+    <name not found> = ArrayList@295[1] { ResolutionCandidate@296 }
 }
 
 ResolutionTaskHolder@297 {
     <name not found> = ArrayList@298[1] { ResolutionCandidate@299 }
-    <name not found> = ArrayList@300[1] { ResolutionCandidate@299 }
 }
 
-ResolutionTaskHolder@301 {
-    <name not found> = ArrayList@302[1] { ResolutionCandidate@303 }
-    <name not found> = ArrayList@304[1] { ResolutionCandidate@303 }
+ResolutionTaskHolder@300 {
+    <name not found> = ArrayList@301[1] { ResolutionCandidate@302 }
 }
 
-ResolutionTaskHolder@305 {
-    <name not found> = ArrayList@306[1] { ResolutionCandidate@307 }
-    <name not found> = ArrayList@308[1] { ResolutionCandidate@307 }
+ResolutionTaskHolder@303 {
+    <name not found> = ArrayList@304[1] { ResolutionCandidate@305 }
+}
+
+ResolutionTaskHolder@306 {
+    <name not found> = ArrayList@307[1] { ResolutionCandidate@308 }
 }
 
 ResolutionTaskHolder@309 {
     <name not found> = ArrayList@310[1] { ResolutionCandidate@311 }
-    <name not found> = ArrayList@312[1] { ResolutionCandidate@311 }
 }
 
-ResolutionTaskHolder@313 {
-    <name not found> = ArrayList@314[1] { ResolutionCandidate@315 }
-    <name not found> = ArrayList@316[1] { ResolutionCandidate@315 }
+ResolutionTaskHolder@312 {
+    <name not found> = ArrayList@313[1] { ResolutionCandidate@314 }
 }
 
-ResolutionTaskHolder@317 {
-    <name not found> = ArrayList@318[1] { ResolutionCandidate@319 }
-    <name not found> = ArrayList@320[1] { ResolutionCandidate@319 }
+ResolutionTaskHolder@315 {
+    <name not found> = ArrayList@316[1] { ResolutionCandidate@317 }
+}
+
+ResolutionTaskHolder@318 {
+    <name not found> = ArrayList@319[1] { ResolutionCandidate@320 }
 }
 
 ResolutionTaskHolder@321 {
     <name not found> = ArrayList@322[1] { ResolutionCandidate@323 }
-    <name not found> = ArrayList@324[1] { ResolutionCandidate@323 }
 }
 
-ResolutionTaskHolder@325 {
-    <name not found> = ArrayList@326[1] { ResolutionCandidate@327 }
-    <name not found> = ArrayList@328[1] { ResolutionCandidate@327 }
+ResolutionTaskHolder@324 {
+    <name not found> = ArrayList@325[1] { ResolutionCandidate@326 }
 }
 
-ResolutionTaskHolder@329 {
-    <name not found> = ArrayList@330[1] { ResolutionCandidate@331 }
-    <name not found> = ArrayList@332[1] { ResolutionCandidate@331 }
+ResolutionTaskHolder@327 {
+    <name not found> = ArrayList@328[1] { ResolutionCandidate@329 }
+}
+
+ResolutionTaskHolder@330 {
+    <name not found> = ArrayList@331[1] { ResolutionCandidate@332 }
 }
 
 ResolutionTaskHolder@333 {
     <name not found> = ArrayList@334[1] { ResolutionCandidate@335 }
-    <name not found> = ArrayList@336[1] { ResolutionCandidate@335 }
 }
 
-ResolutionTaskHolder@337 {
-    <name not found> = ArrayList@338[1] { ResolutionCandidate@339 }
-    <name not found> = ArrayList@340[1] { ResolutionCandidate@339 }
+ResolutionTaskHolder@336 {
+    <name not found> = ArrayList@337[1] { ResolutionCandidate@338 }
 }
 
-ResolutionTaskHolder@341 {
-    <name not found> = ArrayList@342[1] { ResolutionCandidate@343 }
-    <name not found> = ArrayList@344[1] { ResolutionCandidate@343 }
+ResolutionTaskHolder@339 {
+    <name not found> = ArrayList@340[1] { ResolutionCandidate@341 }
+}
+
+ResolutionTaskHolder@342 {
+    <name not found> = ArrayList@343[1] { ResolutionCandidate@344 }
 }
 
 ResolutionTaskHolder@345 {
     <name not found> = ArrayList@346[1] { ResolutionCandidate@347 }
-    <name not found> = ArrayList@348[1] { ResolutionCandidate@347 }
 }
 
-ResolutionTaskHolder@349 {
-    <name not found> = ArrayList@350[1] { ResolutionCandidate@351 }
-    <name not found> = ArrayList@352[1] { ResolutionCandidate@351 }
+ResolutionTaskHolder@348 {
+    <name not found> = ArrayList@349[1] { ResolutionCandidate@350 }
 }
 
-ResolutionTaskHolder@353 {
-    <name not found> = ArrayList@354[1] { ResolutionCandidate@355 }
-    <name not found> = ArrayList@356[1] { ResolutionCandidate@355 }
+ResolutionTaskHolder@351 {
+    <name not found> = ArrayList@352[1] { ResolutionCandidate@353 }
+}
+
+ResolutionTaskHolder@354 {
+    <name not found> = ArrayList@355[1] { ResolutionCandidate@356 }
 }
 
 ResolutionTaskHolder@357 {
     <name not found> = ArrayList@358[1] { ResolutionCandidate@359 }
-    <name not found> = ArrayList@360[1] { ResolutionCandidate@359 }
 }
 
-ResolutionTaskHolder@361 {
-    <name not found> = ArrayList@362[1] { ResolutionCandidate@363 }
-    <name not found> = ArrayList@364[1] { ResolutionCandidate@363 }
+ResolutionTaskHolder@360 {
+    <name not found> = ArrayList@361[1] { ResolutionCandidate@362 }
 }
 
-ResolutionTaskHolder@365 {
-    <name not found> = ArrayList@366[1] { ResolutionCandidate@367 }
-    <name not found> = ArrayList@368[1] { ResolutionCandidate@367 }
+ResolutionTaskHolder@363 {
+    <name not found> = ArrayList@364[1] { ResolutionCandidate@365 }
+}
+
+ResolutionTaskHolder@366 {
+    <name not found> = ArrayList@367[1] { ResolutionCandidate@368 }
 }
 
 ResolutionTaskHolder@369 {
     <name not found> = ArrayList@370[1] { ResolutionCandidate@371 }
-    <name not found> = ArrayList@372[1] { ResolutionCandidate@371 }
 }
 
-ResolutionTaskHolder@373 {
-    <name not found> = ArrayList@374[1] { ResolutionCandidate@375 }
-    <name not found> = ArrayList@376[1] { ResolutionCandidate@375 }
+ResolutionTaskHolder@372 {
+    <name not found> = ArrayList@373[1] { ResolutionCandidate@374 }
 }
 
-ResolutionTaskHolder@377 {
-    <name not found> = ArrayList@378[1] { ResolutionCandidate@379 }
-    <name not found> = ArrayList@380[1] { ResolutionCandidate@379 }
+ResolutionTaskHolder@375 {
+    <name not found> = ArrayList@376[1] { ResolutionCandidate@377 }
+}
+
+ResolutionTaskHolder@378 {
+    <name not found> = ArrayList@379[1] { ResolutionCandidate@380 }
 }
 
 ResolutionTaskHolder@381 {
     <name not found> = ArrayList@382[1] { ResolutionCandidate@383 }
-    <name not found> = ArrayList@384[1] { ResolutionCandidate@383 }
 }
 
-ResolutionTaskHolder@385 {
-    <name not found> = ArrayList@386[1] { ResolutionCandidate@387 }
-    <name not found> = ArrayList@388[1] { ResolutionCandidate@387 }
+ResolutionTaskHolder@384 {
+    <name not found> = ArrayList@385[1] { ResolutionCandidate@386 }
 }
 
-ResolutionTaskHolder@389 {
-    <name not found> = ArrayList@390[1] { ResolutionCandidate@391 }
-    <name not found> = ArrayList@392[1] { ResolutionCandidate@391 }
+ResolutionTaskHolder@387 {
+    <name not found> = ArrayList@388[1] { ResolutionCandidate@389 }
+}
+
+ResolutionTaskHolder@390 {
+    <name not found> = ArrayList@391[1] { ResolutionCandidate@392 }
 }
 
 ResolutionTaskHolder@393 {
     <name not found> = ArrayList@394[1] { ResolutionCandidate@395 }
-    <name not found> = ArrayList@396[1] { ResolutionCandidate@395 }
 }
 
-ResolutionTaskHolder@397 {
-    <name not found> = ArrayList@398[1] { ResolutionCandidate@399 }
-    <name not found> = ArrayList@400[1] { ResolutionCandidate@399 }
+ResolutionTaskHolder@396 {
+    <name not found> = ArrayList@397[1] { ResolutionCandidate@398 }
 }
 
-ResolutionTaskHolder@401 {
-    <name not found> = ArrayList@402[1] { ResolutionCandidate@403 }
-    <name not found> = ArrayList@404[1] { ResolutionCandidate@403 }
-}
-
-ResolutionTaskHolder@405 {
-    <name not found> = ArrayList@406[1] { ResolutionCandidate@407 }
-    <name not found> = ArrayList@408[1] { ResolutionCandidate@407 }
-}
-
-ResolutionTaskHolder@409 {
-    <name not found> = ArrayList@410[1] { ResolutionCandidate@411 }
-    <name not found> = ArrayList@412[1] { ResolutionCandidate@411 }
-}
-
-ResolutionTaskHolder@413 {
-    <name not found> = ArrayList@414[1] { ResolutionCandidate@415 }
-    <name not found> = ArrayList@416[1] { ResolutionCandidate@415 }
-}
-
-ResolutionTaskHolder@417 {
-    <name not found> = ArrayList@418[1] { ResolutionCandidate@419 }
-    <name not found> = ArrayList@420[1] { ResolutionCandidate@419 }
-}
-
-ResolutionTaskHolder@421 {
-    <name not found> = ArrayList@422[1] { ResolutionCandidate@423 }
-    <name not found> = ArrayList@424[1] { ResolutionCandidate@423 }
-}
-
-ResolutionTaskHolder@425 {
-    <name not found> = ArrayList@426[1] { ResolutionCandidate@427 }
-    <name not found> = ArrayList@428[1] { ResolutionCandidate@427 }
-}
-
-ResolutionTaskHolder@429 {
-    <name not found> = ArrayList@430[1] { ResolutionCandidate@431 }
-    <name not found> = ArrayList@432[1] { ResolutionCandidate@431 }
-}
-
-ResolutionTaskHolder@433 {
-    <name not found> = ArrayList@434[1] { ResolutionCandidate@435 }
-    <name not found> = ArrayList@436[1] { ResolutionCandidate@435 }
-}
-
-ResolutionTaskHolder@437 {
-    <name not found> = ArrayList@438[1] { ResolutionCandidate@439 }
-    <name not found> = ArrayList@440[1] { ResolutionCandidate@439 }
-}
-
-ResolutionTaskHolder@441 {
-    <name not found> = ArrayList@442[1] { ResolutionCandidate@443 }
-    <name not found> = ArrayList@444[1] { ResolutionCandidate@443 }
-}
-
-ResolutionTaskHolder@445 {
-    <name not found> = ArrayList@446[1] { ResolutionCandidate@447 }
-    <name not found> = ArrayList@448[1] { ResolutionCandidate@447 }
-}
-
-ResolutionTaskHolder@449 {
-    <name not found> = ArrayList@450[1] { ResolutionCandidate@451 }
-    <name not found> = ArrayList@452[1] { ResolutionCandidate@451 }
-}
-
-ResolutionTaskHolder@453 {
-    <name not found> = ArrayList@454[1] { ResolutionCandidate@455 }
-    <name not found> = ArrayList@456[1] { ResolutionCandidate@455 }
-}
-
-ResolutionTaskHolder@457 {
-    <name not found> = ArrayList@458[1] { ResolutionCandidate@459 }
-    <name not found> = ArrayList@460[1] { ResolutionCandidate@459 }
-}
-
-ResolutionTaskHolder@461 {
-    <name not found> = ArrayList@462[1] { ResolutionCandidate@463 }
-    <name not found> = ArrayList@464[1] { ResolutionCandidate@463 }
-}
-
-ResolutionTaskHolder@465 {
-    <name not found> = ArrayList@466[1] { ResolutionCandidate@467 }
-    <name not found> = ArrayList@468[1] { ResolutionCandidate@467 }
-}
-
-ResolutionTaskHolder@469 {
-    <name not found> = ArrayList@470[1] { ResolutionCandidate@471 }
-    <name not found> = ArrayList@472[1] { ResolutionCandidate@471 }
-}
-
-ResolutionTaskHolder@473 {
-    <name not found> = ArrayList@474[1] { ResolutionCandidate@475 }
-    <name not found> = ArrayList@476[1] { ResolutionCandidate@475 }
-}
-
-ResolutionTaskHolder@477 {
-    <name not found> = ArrayList@478[1] { ResolutionCandidate@479 }
-    <name not found> = ArrayList@480[1] { ResolutionCandidate@479 }
-}
-
-ResolutionTaskHolder@481 {
-    <name not found> = ArrayList@482[1] { ResolutionCandidate@483 }
-    <name not found> = ArrayList@484[1] { ResolutionCandidate@483 }
-}
-
-ResolutionTaskHolder@485 {
-    <name not found> = ArrayList@486[1] { ResolutionCandidate@487 }
-    <name not found> = ArrayList@488[1] { ResolutionCandidate@487 }
-}
-
-ResolutionTaskHolder@489 {
-    <name not found> = ArrayList@490[1] { ResolutionCandidate@491 }
-    <name not found> = ArrayList@492[1] { ResolutionCandidate@491 }
-}
-
-ResolutionTaskHolder@493 {
-    <name not found> = ArrayList@494[1] { ResolutionCandidate@495 }
-    <name not found> = ArrayList@496[1] { ResolutionCandidate@495 }
-}
-
-ResolutionTaskHolder@497 {
-    <name not found> = ArrayList@498[1] { ResolutionCandidate@499 }
-    <name not found> = ArrayList@500[1] { ResolutionCandidate@499 }
-}
-
-ResolutionTaskHolder@501 {
-    <name not found> = ArrayList@502[1] { ResolutionCandidate@503 }
-    <name not found> = ArrayList@504[1] { ResolutionCandidate@503 }
-}
-
-ResolutionTaskHolder@505 {
-    <name not found> = ArrayList@506[1] { ResolutionCandidate@507 }
-    <name not found> = ArrayList@508[1] { ResolutionCandidate@507 }
-}
-
-ResolutionTaskHolder@509 {
-    <name not found> = ArrayList@510[1] { ResolutionCandidate@511 }
-    <name not found> = ArrayList@512[1] { ResolutionCandidate@511 }
-}
-
-ResolutionTaskHolder@513 {
-    <name not found> = ArrayList@514[1] { ResolutionCandidate@515 }
-    <name not found> = ArrayList@516[1] { ResolutionCandidate@515 }
+null {
+    <name not found> = ArrayList@399[1] { ResolutionCandidate@281 }
+    <name not found> = ArrayList@400[1] { ResolutionCandidate@191 }
+    <name not found> = ArrayList@401[1] { ResolutionCandidate@254 }
+    <name not found> = ArrayList@402[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@403[1] { ResolutionCandidate@347 }
+    <name not found> = ArrayList@404[1] { ResolutionCandidate@188 }
+    <name not found> = ArrayList@405[1] { ResolutionCandidate@371 }
+    <name not found> = ArrayList@406[1] { ResolutionCandidate@146 }
+    <name not found> = ArrayList@407[1] { ResolutionCandidate@227 }
+    <name not found> = ArrayList@408[1] { ResolutionCandidate@200 }
+    <name not found> = ArrayList@409[1] { ResolutionCandidate@320 }
+    <name not found> = ArrayList@410[1] { ResolutionCandidate@164 }
+    <name not found> = ArrayList@411[1] { ResolutionCandidate@248 }
+    <name not found> = ArrayList@412[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@413[1] { ResolutionCandidate@311 }
+    <name not found> = ArrayList@414[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@415[1] { ResolutionCandidate@260 }
+    <name not found> = ArrayList@416[1] { ResolutionCandidate@173 }
+    <name not found> = ArrayList@417[1] { ResolutionCandidate@356 }
+    <name not found> = ArrayList@418[1] { ResolutionCandidate@176 }
+    <name not found> = ArrayList@419[1] { ResolutionCandidate@263 }
+    <name not found> = ArrayList@420[1] { ResolutionCandidate@194 }
+    <name not found> = ArrayList@421[1] { ResolutionCandidate@344 }
+    <name not found> = ArrayList@422[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@423[1] { ResolutionCandidate@383 }
+    <name not found> = ArrayList@424[1] { ResolutionCandidate@182 }
+    <name not found> = ArrayList@425[1] { ResolutionCandidate@206 }
+    <name not found> = ArrayList@426[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@427[1] { ResolutionCandidate@293 }
+    <name not found> = ArrayList@428[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@429[1] { ResolutionCandidate@302 }
+    <name not found> = ArrayList@430[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@431[1] { ResolutionCandidate@203 }
+    <name not found> = ArrayList@432[1] { ResolutionCandidate@134 }
+    <name not found> = ArrayList@433[1] { ResolutionCandidate@242 }
+    <name not found> = ArrayList@434[1] { ResolutionCandidate@122 }
+    <name not found> = ArrayList@435[1] { ResolutionCandidate@245 }
+    <name not found> = ArrayList@436[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@437[1] { ResolutionCandidate@365 }
+    <name not found> = ArrayList@438[1] { ResolutionCandidate@140 }
+    <name not found> = ArrayList@439[1] { ResolutionCandidate@266 }
+    <name not found> = ArrayList@440[1] { ResolutionCandidate@179 }
+    <name not found> = ArrayList@441[1] { ResolutionCandidate@272 }
+    <name not found> = ArrayList@442[1] { ResolutionCandidate@128 }
+    <name not found> = ArrayList@443[1] { ResolutionCandidate@278 }
+    <name not found> = ArrayList@444[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@445[1] { ResolutionCandidate@296 }
+    <name not found> = ArrayList@446[1] { ResolutionCandidate@167 }
+    <name not found> = ArrayList@447[1] { ResolutionCandidate@221 }
+    <name not found> = ArrayList@448[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@449[1] { ResolutionCandidate@398 }
+    <name not found> = ArrayList@450[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@451[1] { ResolutionCandidate@230 }
+    <name not found> = ArrayList@452[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@453[1] { ResolutionCandidate@350 }
+    <name not found> = ArrayList@454[1] { ResolutionCandidate@152 }
+    <name not found> = ArrayList@455[1] { ResolutionCandidate@353 }
+    <name not found> = ArrayList@456[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@457[1] { ResolutionCandidate@326 }
+    <name not found> = ArrayList@458[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@459[1] { ResolutionCandidate@299 }
+    <name not found> = ArrayList@460[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@461[1] { ResolutionCandidate@224 }
+    <name not found> = ArrayList@462[1] { ResolutionCandidate@149 }
+    <name not found> = ArrayList@463[1] { ResolutionCandidate@338 }
+    <name not found> = ArrayList@464[1] { ResolutionCandidate@170 }
+    <name not found> = ArrayList@465[1] { ResolutionCandidate@323 }
+    <name not found> = ArrayList@466[1] { ResolutionCandidate@155 }
+    <name not found> = ArrayList@467[1] { ResolutionCandidate@359 }
+    <name not found> = ArrayList@468[1] { ResolutionCandidate@125 }
+    <name not found> = ArrayList@469[1] { ResolutionCandidate@389 }
+    <name not found> = ArrayList@470[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@471[1] { ResolutionCandidate@317 }
+    <name not found> = ArrayList@472[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@473[1] { ResolutionCandidate@368 }
+    <name not found> = ArrayList@474[1] { ResolutionCandidate@143 }
+    <name not found> = ArrayList@475[1] { ResolutionCandidate@236 }
+    <name not found> = ArrayList@476[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@477[1] { ResolutionCandidate@374 }
+    <name not found> = ArrayList@478[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@479[1] { ResolutionCandidate@275 }
+    <name not found> = ArrayList@480[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@481[1] { ResolutionCandidate@251 }
+    <name not found> = ArrayList@482[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@483[1] { ResolutionCandidate@386 }
+    <name not found> = ArrayList@484[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@485[1] { ResolutionCandidate@335 }
+    <name not found> = ArrayList@486[1] { ResolutionCandidate@185 }
+    <name not found> = ArrayList@487[1] { ResolutionCandidate@269 }
+    <name not found> = ArrayList@488[1] { ResolutionCandidate@137 }
+    <name not found> = ArrayList@489[1] { ResolutionCandidate@332 }
+    <name not found> = ArrayList@490[1] { ResolutionCandidate@113 }
+    <name not found> = ArrayList@491[1] { ResolutionCandidate@257 }
+    <name not found> = ArrayList@492[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@493[1] { ResolutionCandidate@284 }
+    <name not found> = ArrayList@494[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@495[1] { ResolutionCandidate@362 }
+    <name not found> = ArrayList@496[1] { ResolutionCandidate@131 }
+    <name not found> = ArrayList@497[1] { ResolutionCandidate@233 }
+    <name not found> = ArrayList@498[1] { ResolutionCandidate@197 }
+    <name not found> = ArrayList@499[1] { ResolutionCandidate@314 }
+    <name not found> = ArrayList@500[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@501[1] { ResolutionCandidate@290 }
+    <name not found> = ArrayList@502[1] { ResolutionCandidate@395 }
+    <name not found> = ArrayList@503[1] { ResolutionCandidate@209 }
+    <name not found> = ArrayList@504[1] { ResolutionCandidate@341 }
+    <name not found> = ArrayList@505[1] { ResolutionCandidate@218 }
+    <name not found> = ArrayList@506[1] { ResolutionCandidate@308 }
+    <name not found> = ArrayList@507[1] { ResolutionCandidate@380 }
+    <name not found> = ArrayList@508[1] { ResolutionCandidate@377 }
+    <name not found> = ArrayList@509[1] { ResolutionCandidate@305 }
+    <name not found> = ArrayList@510[1] { ResolutionCandidate@392 }
+    <name not found> = ArrayList@511[1] { ResolutionCandidate@239 }
+    <name not found> = ArrayList@512[1] { ResolutionCandidate@212 }
+    <name not found> = ArrayList@513[1] { ResolutionCandidate@215 }
+    <name not found> = ArrayList@514[1] { ResolutionCandidate@329 }
+    <name not found> = ArrayList@515[1] { ResolutionCandidate@161 }
+    <name not found> = ArrayList@516[1] { ResolutionCandidate@287 }
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inference/dependantOnVarianceNullable.lazy.log b/compiler/testData/diagnostics/tests/inference/dependantOnVarianceNullable.lazy.log
index 10c25b55740..4d645251853 100644
--- a/compiler/testData/diagnostics/tests/inference/dependantOnVarianceNullable.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/dependantOnVarianceNullable.lazy.log
@@ -151,7 +151,7 @@ LazyJavaClassifierType@91['T'] {
     arguments = ArrayList@92[empty]
     classifier = JavaTypeParameterImpl@93['T']
     nullable = 'false': Boolean@33
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
 LazyJavaClassifierType@94['T'] {
@@ -165,89 +165,89 @@ LazyJavaClassifierType@97['T'] {
     arguments = ArrayList@98[empty]
     classifier = JavaTypeParameterImpl@99['T']
     nullable = 'false': Boolean@33
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
-LazyJavaClassifierType@101['T'] {
-    arguments = ArrayList@102[empty]
-    classifier = JavaTypeParameterImpl@103['T']
+LazyJavaClassifierType@100['T'] {
+    arguments = ArrayList@101[empty]
+    classifier = JavaTypeParameterImpl@102['T']
     nullable = 'false': Boolean@33
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
 }
 
-LazyJavaClassifierType@104['T'] {
-    arguments = ArrayList@105[empty]
-    classifier = JavaTypeParameterImpl@106['T']
-    nullable = 'false': Boolean@33
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
-}
-
-LazyJavaClassifierType@107['T'] {
-    arguments = ArrayList@108[empty]
-    classifier = JavaTypeParameterImpl@109['T']
-    nullable = 'false': Boolean@33
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
-}
-
-LazyJavaClassifierType@110['T'] {
-    arguments = ArrayList@111[empty]
-    classifier = JavaTypeParameterImpl@112['T']
+LazyJavaClassifierType@103['T'] {
+    arguments = ArrayList@104[empty]
+    classifier = JavaTypeParameterImpl@105['T']
     nullable = 'false': Boolean@33
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
 }
 
+LazyJavaClassifierType@106['T'] {
+    arguments = ArrayList@107[empty]
+    classifier = JavaTypeParameterImpl@108['T']
+    nullable = 'false': Boolean@33
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
+}
+
+LazyJavaClassifierType@109['T'] {
+    arguments = ArrayList@110[empty]
+    classifier = JavaTypeParameterImpl@111['T']
+    nullable = 'false': Boolean@33
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
+}
+
 LazyJavaClassifierType@113['T'] {
     arguments = ArrayList@114[empty]
     classifier = JavaTypeParameterImpl@115['T']
     nullable = 'false': Boolean@33
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
 }
 
 LazyJavaClassifierType@116['T'] {
     arguments = ArrayList@117[empty]
     classifier = JavaTypeParameterImpl@118['T']
     nullable = 'false': Boolean@33
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
 LazyJavaClassifierType@119['T'] {
     arguments = ArrayList@120[empty]
-    classifier = JavaTypeParameterImpl@99['T']
+    classifier = JavaTypeParameterImpl@111['T']
     nullable = 'true': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
 }
 
 LazyJavaClassifierType@121['T'] {
     arguments = ArrayList@122[empty]
-    classifier = JavaTypeParameterImpl@106['T']
+    classifier = JavaTypeParameterImpl@102['T']
     nullable = 'true': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
 }
 
 LazyJavaClassifierType@123['T'] {
     arguments = ArrayList@124[empty]
-    classifier = JavaTypeParameterImpl@103['T']
+    classifier = JavaTypeParameterImpl@105['T']
     nullable = 'true': Boolean@44
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
 }
 
 LazyJavaClassifierType@125['T'] {
     arguments = ArrayList@126[empty]
-    classifier = JavaTypeParameterImpl@93['T']
+    classifier = JavaTypeParameterImpl@86['T']
     nullable = 'true': Boolean@44
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
 }
 
 LazyJavaClassifierType@127['T'] {
     arguments = ArrayList@128[empty]
-    classifier = JavaTypeParameterImpl@112['T']
+    classifier = JavaTypeParameterImpl@115['T']
     nullable = 'true': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
 }
 
 LazyJavaClassifierType@129['T'] {
     arguments = ArrayList@130[empty]
-    classifier = JavaTypeParameterImpl@115['T']
+    classifier = JavaTypeParameterImpl@99['T']
     nullable = 'true': Boolean@44
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
@@ -256,42 +256,42 @@ LazyJavaClassifierType@131['T'] {
     arguments = ArrayList@132[empty]
     classifier = JavaTypeParameterImpl@118['T']
     nullable = 'true': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
 LazyJavaClassifierType@133['T'] {
     arguments = ArrayList@134[empty]
-    classifier = JavaTypeParameterImpl@86['T']
+    classifier = JavaTypeParameterImpl@96['T']
     nullable = 'true': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
 LazyJavaClassifierType@135['T'] {
     arguments = ArrayList@136[empty]
-    classifier = JavaTypeParameterImpl@96['T']
+    classifier = JavaTypeParameterImpl@93['T']
     nullable = 'true': Boolean@44
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
 LazyJavaClassifierType@137['T'] {
     arguments = ArrayList@138[empty]
-    classifier = JavaTypeParameterImpl@89['T']
+    classifier = JavaTypeParameterImpl@108['T']
     nullable = 'true': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
 }
 
 LazyJavaClassifierType@139['T'] {
     arguments = ArrayList@140[empty]
-    classifier = JavaTypeParameterImpl@109['T']
+    classifier = JavaTypeParameterImpl@82['T']
     nullable = 'true': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
 }
 
 LazyJavaClassifierType@141['T'] {
     arguments = ArrayList@142[empty]
-    classifier = JavaTypeParameterImpl@82['T']
+    classifier = JavaTypeParameterImpl@89['T']
     nullable = 'true': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
 LazyJavaPackageFragmentProvider@143 {
@@ -368,7 +368,7 @@ LazyJavaPackageFragment@167['util'] {
 }
 
 LazyJavaTypeParameterDescriptor@26['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
     upperBounds = LinkedHashSet@199[1] { NullableType@200 }
     upperBoundsAsType = NullableType@200
 }
@@ -390,39 +390,42 @@ LazyJavaTypeParameterResolver@209 {
 }
 
 LazyJavaTypeParameterResolver@211 {
-    resolve(JavaTypeParameterImpl@212['T']) = LazyJavaTypeParameterDescriptor@204['T']
+    resolve(JavaTypeParameterImpl@212['T']) = LazyJavaTypeParameterDescriptor@201['T']
 }
 
 LazyJavaTypeParameterResolver@213 {
-    resolve(JavaTypeParameterImpl@214['T']) = LazyJavaTypeParameterDescriptor@201['T']
+    resolve(JavaTypeParameterImpl@214['T']) = LazyJavaTypeParameterDescriptor@204['T']
 }
 
 LazyJavaTypeParameterResolver@215 {
-    resolve(JavaTypeParameterImpl@99['T']) = null
+    resolve(JavaTypeParameterImpl@115['T']) = null
 }
 
 ResolutionTaskHolder@216 {
     <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@218 }
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
 }
 
-ResolutionTaskHolder@220 {
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@222 }
+ResolutionTaskHolder@219 {
+    <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
 }
 
-ResolutionTaskHolder@224 {
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@226 }
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@226 }
+ResolutionTaskHolder@222 {
+    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
 }
 
-ResolutionTaskHolder@228 {
-    <name not found> = ArrayList@229[2] { ResolutionCandidate@230, ResolutionCandidate@231 }
-    <name not found> = ArrayList@232[3] { ResolutionCandidate@230, ResolutionCandidate@231, ResolutionCandidate@233 }
+ResolutionTaskHolder@225 {
+    <name not found> = ArrayList@226[2] { ResolutionCandidate@227, ResolutionCandidate@228 }
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+}
+
+null {
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@224 }
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@218 }
+    <name not found> = ArrayList@231[1] { ResolutionCandidate@221 }
+    <name not found> = ArrayList@232[3] { ResolutionCandidate@227, ResolutionCandidate@228, ResolutionCandidate@233 }
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
diff --git a/compiler/testData/diagnostics/tests/inference/functionPlaceholderError.lazy.log b/compiler/testData/diagnostics/tests/inference/functionPlaceholderError.lazy.log
index 57c1a2abffe..7cc802b3b58 100644
--- a/compiler/testData/diagnostics/tests/inference/functionPlaceholderError.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/functionPlaceholderError.lazy.log
@@ -75,21 +75,21 @@ LazyJavaClassifierType@36['Throwable'] {
 
 LazyJavaClassifierType@39['Throwable'] {
     arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@35['Throwable']
+    classifier = JavaClassImpl@38['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@38['Throwable']
+    classifier = JavaClassImpl@31['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
 
 LazyJavaClassifierType@43['Throwable'] {
     arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@31['Throwable']
+    classifier = JavaClassImpl@35['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
@@ -147,67 +147,70 @@ LazyJavaPackageFragment@62['lang'] {
 
 ResolutionTaskHolder@86 {
     <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@79[empty]
-    <name not found> = EmptyList@79[empty]
     <name not found> = EmptyList@79[empty]
     <name not found> = EmptyList@79[empty]
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@79[empty]
-    <name not found> = EmptyList@79[empty]
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
     <name not found> = EmptyList@79[empty]
     <name not found> = EmptyList@79[empty]
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
     <name not found> = EmptyList@79[empty]
     <name not found> = EmptyList@79[empty]
+}
+
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
     <name not found> = EmptyList@79[empty]
     <name not found> = EmptyList@79[empty]
 }
 
 ResolutionTaskHolder@98 {
     <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
-    <name not found> = EmptyList@79[empty]
-    <name not found> = EmptyList@79[empty]
+}
+
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
+}
+
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
+}
+
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[4] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111, ... }
     <name not found> = EmptyList@79[empty]
     <name not found> = EmptyList@79[empty]
 }
 
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[4] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
-    <name not found> = ArrayList@119[5] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
-    <name not found> = EmptyList@79[empty]
-    <name not found> = EmptyList@79[empty]
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[4] { ResolutionCandidate@114, ResolutionCandidate@115, ResolutionCandidate@116, ... }
     <name not found> = EmptyList@79[empty]
     <name not found> = EmptyList@79[empty]
 }
 
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[4] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
-    <name not found> = ArrayList@125[5] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
+null {
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@124[5] { ResolutionCandidate@114, ResolutionCandidate@115, ResolutionCandidate@116, ... }
+    <name not found> = ArrayList@125[5] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111, ... }
+    <name not found> = EmptyList@79[empty]
+    <name not found> = EmptyList@79[empty]
+    <name not found> = EmptyList@79[empty]
+    <name not found> = EmptyList@79[empty]
+    <name not found> = EmptyList@79[empty]
+    <name not found> = EmptyList@79[empty]
+    <name not found> = EmptyList@79[empty]
+    <name not found> = EmptyList@79[empty]
     <name not found> = EmptyList@79[empty]
     <name not found> = EmptyList@79[empty]
     <name not found> = EmptyList@79[empty]
diff --git a/compiler/testData/diagnostics/tests/inference/hasErrorInConstrainingTypes.lazy.log b/compiler/testData/diagnostics/tests/inference/hasErrorInConstrainingTypes.lazy.log
index 5b49ac2e6b2..4de65608315 100644
--- a/compiler/testData/diagnostics/tests/inference/hasErrorInConstrainingTypes.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/hasErrorInConstrainingTypes.lazy.log
@@ -40,7 +40,23 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@36 {
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+}
+
+ResolutionTaskHolder@39 {
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -64,10 +80,6 @@ ResolutionTaskHolder@40 {
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
 }
 
 ResolutionTaskHolder@41 {
@@ -79,18 +91,6 @@ ResolutionTaskHolder@41 {
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
 }
 
 ResolutionTaskHolder@42 {
@@ -102,11 +102,14 @@ ResolutionTaskHolder@42 {
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@43 {
+null {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@38 }
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
diff --git a/compiler/testData/diagnostics/tests/inference/immutableArrayList.lazy.log b/compiler/testData/diagnostics/tests/inference/immutableArrayList.lazy.log
index d67eb5fceaf..96d4427fa76 100644
--- a/compiler/testData/diagnostics/tests/inference/immutableArrayList.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/immutableArrayList.lazy.log
@@ -172,15 +172,18 @@ LazyJavaTypeParameterResolver@124 {
 
 ResolutionTaskHolder@126 {
     <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
+}
+
+null {
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
     <name not found> = EmptyList@5[empty]
     <name not found> = EmptyList@5[empty]
     <name not found> = EmptyList@5[empty]
diff --git a/compiler/testData/diagnostics/tests/inference/inferInFunctionLiterals.lazy.log b/compiler/testData/diagnostics/tests/inference/inferInFunctionLiterals.lazy.log
index b37c4b3d5b8..b3e7c528523 100644
--- a/compiler/testData/diagnostics/tests/inference/inferInFunctionLiterals.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/inferInFunctionLiterals.lazy.log
@@ -93,59 +93,59 @@ LazyJavaClassifierType@57['E'] {
     arguments = ArrayList@58[empty]
     classifier = JavaTypeParameterImpl@59['E']
     nullable = 'false': Boolean@34
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@60
 }
 
-LazyJavaClassifierType@60['E'] {
-    arguments = ArrayList@61[empty]
-    classifier = JavaTypeParameterImpl@62['E']
+LazyJavaClassifierType@61['E'] {
+    arguments = ArrayList@62[empty]
+    classifier = JavaTypeParameterImpl@63['E']
     nullable = 'false': Boolean@34
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@52
 }
 
-LazyJavaClassifierType@63['E'] {
-    arguments = ArrayList@64[empty]
-    classifier = JavaTypeParameterImpl@65['E']
+LazyJavaClassifierType@64['E'] {
+    arguments = ArrayList@65[empty]
+    classifier = JavaTypeParameterImpl@66['E']
     nullable = 'false': Boolean@34
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
 }
 
 LazyJavaClassifierType@67['E'] {
     arguments = ArrayList@68[empty]
-    classifier = JavaTypeParameterImpl@59['E']
-    nullable = 'true': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
-}
-
-LazyJavaClassifierType@70['E'] {
-    arguments = ArrayList@71[empty]
-    classifier = JavaTypeParameterImpl@65['E']
-    nullable = 'true': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
-}
-
-LazyJavaClassifierType@72['E'] {
-    arguments = ArrayList@73[empty]
     classifier = JavaTypeParameterImpl@51['E']
     nullable = 'true': Boolean@69
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@52
 }
 
+LazyJavaClassifierType@70['E'] {
+    arguments = ArrayList@71[empty]
+    classifier = JavaTypeParameterImpl@63['E']
+    nullable = 'true': Boolean@69
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@52
+}
+
+LazyJavaClassifierType@72['E'] {
+    arguments = ArrayList@73[empty]
+    classifier = JavaTypeParameterImpl@66['E']
+    nullable = 'true': Boolean@69
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
+}
+
 LazyJavaClassifierType@74['E'] {
     arguments = ArrayList@75[empty]
+    classifier = JavaTypeParameterImpl@59['E']
+    nullable = 'true': Boolean@69
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@60
+}
+
+LazyJavaClassifierType@76['E'] {
+    arguments = ArrayList@77[empty]
     classifier = JavaTypeParameterImpl@55['E']
     nullable = 'true': Boolean@69
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
 }
 
-LazyJavaClassifierType@76['E'] {
-    arguments = ArrayList@77[empty]
-    classifier = JavaTypeParameterImpl@62['E']
-    nullable = 'true': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@52
-}
-
-LazyJavaClassifierType@23['List<E>'] {
+LazyJavaClassifierType@18['List<E>'] {
     arguments = ArrayList@78[1] { TypeProjectionImpl@79 }
     classifier = JavaClassImpl@80['List']
     memberScope = SubstitutingScope@81
@@ -153,7 +153,7 @@ LazyJavaClassifierType@23['List<E>'] {
     typeConstructor = DeserializedClassTypeConstructor@82
 }
 
-LazyJavaClassifierType@18['List<E>'] {
+LazyJavaClassifierType@23['List<E>'] {
     arguments = ArrayList@83[1] { TypeProjectionImpl@84 }
     classifier = JavaClassImpl@85['List']
     memberScope = SubstitutingScope@86
@@ -261,16 +261,16 @@ LazyJavaPackageFragment@119['util'] {
 }
 
 LazyJavaTypeParameterDescriptor@20['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@52
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
     upperBounds = LinkedHashSet@156[1] { NullableType@157 }
 }
 
-LazyJavaTypeParameterDescriptor@15['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
+LazyJavaTypeParameterDescriptor@11['E'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@60
 }
 
-LazyJavaTypeParameterDescriptor@11['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
+LazyJavaTypeParameterDescriptor@15['E'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@52
 }
 
 LazyJavaTypeParameterResolver@158 {
@@ -287,47 +287,50 @@ LazyJavaTypeParameterResolver@162 {
 
 ResolutionTaskHolder@164 {
     <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@166 }
-    <name not found> = EmptyList@144[empty]
-    <name not found> = EmptyList@144[empty]
     <name not found> = EmptyList@144[empty]
     <name not found> = EmptyList@144[empty]
 }
 
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@170 }
-    <name not found> = EmptyList@144[empty]
-    <name not found> = EmptyList@144[empty]
+ResolutionTaskHolder@167 {
+    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
     <name not found> = EmptyList@144[empty]
     <name not found> = EmptyList@144[empty]
 }
 
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@174 }
-    <name not found> = EmptyList@144[empty]
-    <name not found> = EmptyList@144[empty]
+ResolutionTaskHolder@170 {
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
     <name not found> = EmptyList@144[empty]
     <name not found> = EmptyList@144[empty]
 }
 
+ResolutionTaskHolder@173 {
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
+}
+
 ResolutionTaskHolder@176 {
     <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@178 }
 }
 
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@182 }
+ResolutionTaskHolder@179 {
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
 }
 
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@186 }
+ResolutionTaskHolder@182 {
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
 }
 
-ResolutionTaskHolder@188 {
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@190 }
+null {
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@178 }
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@181 }
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@172 }
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@175 }
+    <name not found> = ArrayList@189[1] { ResolutionCandidate@169 }
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@184 }
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@166 }
+    <name not found> = EmptyList@144[empty]
+    <name not found> = EmptyList@144[empty]
+    <name not found> = EmptyList@144[empty]
+    <name not found> = EmptyList@144[empty]
+    <name not found> = EmptyList@144[empty]
+    <name not found> = EmptyList@144[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inference/kt1293.lazy.log b/compiler/testData/diagnostics/tests/inference/kt1293.lazy.log
index 45982eda25d..6b78d6c33fe 100644
--- a/compiler/testData/diagnostics/tests/inference/kt1293.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/kt1293.lazy.log
@@ -38,10 +38,6 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@33 {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -59,31 +55,38 @@ ResolutionTaskHolder@33 {
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+}
+
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
 }
 
 ResolutionTaskHolder@45 {
     <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+null {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@35 }
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inference/kt3184.lazy.log b/compiler/testData/diagnostics/tests/inference/kt3184.lazy.log
index 380006c2199..b053b2b8f82 100644
--- a/compiler/testData/diagnostics/tests/inference/kt3184.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/kt3184.lazy.log
@@ -158,14 +158,14 @@ LazyJavaClassifierType@90['Cloneable'] {
     typeConstructor = DeserializedClassTypeConstructor@114
 }
 
-LazyJavaClassifierType@98['Closeable'] {
+LazyJavaClassifierType@93['Closeable'] {
     arguments = ArrayList@115[empty]
     classifier = JavaClassImpl@116['Closeable']
     memberScope = LazyJavaClassMemberScope@18
     typeConstructor = LazyJavaClassTypeConstructor@20['Closeable']
 }
 
-LazyJavaClassifierType@93['Closeable'] {
+LazyJavaClassifierType@98['Closeable'] {
     arguments = ArrayList@117[empty]
     classifier = JavaClassImpl@118['Closeable']
     memberScope = LazyJavaClassMemberScope@18
@@ -202,14 +202,14 @@ LazyJavaClassifierType@131['K'] {
     arguments = ArrayList@132[empty]
     classifier = JavaTypeParameterImpl@133['K']
     nullable = 'false': Boolean@126
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
 
-LazyJavaClassifierType@135['K'] {
-    arguments = ArrayList@136[empty]
-    classifier = JavaTypeParameterImpl@137['K']
+LazyJavaClassifierType@134['K'] {
+    arguments = ArrayList@135[empty]
+    classifier = JavaTypeParameterImpl@136['K']
     nullable = 'false': Boolean@126
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@137
 }
 
 LazyJavaClassifierType@138['K'] {
@@ -221,35 +221,35 @@ LazyJavaClassifierType@138['K'] {
 
 LazyJavaClassifierType@141['K'] {
     arguments = ArrayList@142[empty]
-    classifier = JavaTypeParameterImpl@130['K']
+    classifier = JavaTypeParameterImpl@133['K']
     nullable = 'true': Boolean@143
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
 
 LazyJavaClassifierType@144['K'] {
     arguments = ArrayList@145[empty]
-    classifier = JavaTypeParameterImpl@140['K']
+    classifier = JavaTypeParameterImpl@125['K']
     nullable = 'true': Boolean@143
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
 
 LazyJavaClassifierType@146['K'] {
     arguments = ArrayList@147[empty]
-    classifier = JavaTypeParameterImpl@137['K']
+    classifier = JavaTypeParameterImpl@130['K']
     nullable = 'true': Boolean@143
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
 
 LazyJavaClassifierType@148['K'] {
     arguments = ArrayList@149[empty]
-    classifier = JavaTypeParameterImpl@133['K']
+    classifier = JavaTypeParameterImpl@136['K']
     nullable = 'true': Boolean@143
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@137
 }
 
 LazyJavaClassifierType@150['K'] {
     arguments = ArrayList@151[empty]
-    classifier = JavaTypeParameterImpl@125['K']
+    classifier = JavaTypeParameterImpl@140['K']
     nullable = 'true': Boolean@143
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
@@ -409,14 +409,14 @@ LazyJavaClassifierType@223['V'] {
 
 LazyJavaClassifierType@226['V'] {
     arguments = ArrayList@227[empty]
-    classifier = JavaTypeParameterImpl@211['V']
+    classifier = JavaTypeParameterImpl@225['V']
     nullable = 'true': Boolean@143
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@212
 }
 
 LazyJavaClassifierType@228['V'] {
     arguments = ArrayList@229[empty]
-    classifier = JavaTypeParameterImpl@215['V']
+    classifier = JavaTypeParameterImpl@218['V']
     nullable = 'true': Boolean@143
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@212
 }
@@ -430,14 +430,14 @@ LazyJavaClassifierType@230['V'] {
 
 LazyJavaClassifierType@232['V'] {
     arguments = ArrayList@233[empty]
-    classifier = JavaTypeParameterImpl@225['V']
+    classifier = JavaTypeParameterImpl@211['V']
     nullable = 'true': Boolean@143
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@212
 }
 
 LazyJavaClassifierType@234['V'] {
     arguments = ArrayList@235[empty]
-    classifier = JavaTypeParameterImpl@218['V']
+    classifier = JavaTypeParameterImpl@215['V']
     nullable = 'true': Boolean@143
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@212
 }
@@ -492,7 +492,7 @@ LazyJavaPackageFragmentProvider@236 {
     topLevelClasses(JavaClassImpl@105['AbstractMap']) = LazyJavaClassDescriptor@2['AbstractMap']
     topLevelClasses(JavaClassImpl@108['Appendable']) = LazyJavaClassDescriptor@8['Appendable']
     topLevelClasses(JavaClassImpl@110['AutoCloseable']) = LazyJavaClassDescriptor@13['AutoCloseable']
-    topLevelClasses(JavaClassImpl@116['Closeable']) = LazyJavaClassDescriptor@17['Closeable']
+    topLevelClasses(JavaClassImpl@118['Closeable']) = LazyJavaClassDescriptor@17['Closeable']
     topLevelClasses(JavaClassImpl@120['FilterOutputStream']) = LazyJavaClassDescriptor@21['FilterOutputStream']
     topLevelClasses(JavaClassImpl@288['HashMap']) = LazyJavaClassDescriptor@25['HashMap']
     topLevelClasses(JavaClassImpl@194['OutputStream']) = LazyJavaClassDescriptor@36['OutputStream']
@@ -542,7 +542,7 @@ LazyJavaTypeParameterDescriptor@85['K'] {
 }
 
 LazyJavaTypeParameterDescriptor@69['K'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@137
 }
 
 LazyJavaTypeParameterDescriptor@86['V'] {
@@ -567,20 +567,10 @@ LazyJavaTypeParameterResolver@318 {
 
 ResolutionTaskHolder@321 {
     <name not found> = ArrayList@322[10] { ResolutionCandidate@323, ResolutionCandidate@324, ResolutionCandidate@325, ... }
-    <name not found> = ArrayList@326[10] { ResolutionCandidate@323, ResolutionCandidate@324, ResolutionCandidate@325, ... }
 }
 
-ResolutionTaskHolder@327 {
-    <name not found> = ArrayList@328[1] { ResolutionCandidate@329 }
-    <name not found> = ArrayList@330[1] { ResolutionCandidate@329 }
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
+ResolutionTaskHolder@326 {
+    <name not found> = ArrayList@327[1] { ResolutionCandidate@328 }
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
@@ -591,9 +581,8 @@ ResolutionTaskHolder@327 {
     <name not found> = EmptyList@4[empty]
 }
 
-ResolutionTaskHolder@331 {
-    <name not found> = ArrayList@332[1] { ResolutionCandidate@333 }
-    <name not found> = ArrayList@334[1] { ResolutionCandidate@333 }
+ResolutionTaskHolder@329 {
+    <name not found> = ArrayList@330[1] { ResolutionCandidate@331 }
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
@@ -601,193 +590,207 @@ ResolutionTaskHolder@331 {
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
+}
+
+ResolutionTaskHolder@332 {
+    <name not found> = ArrayList@333[1] { ResolutionCandidate@334 }
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
 }
 
 ResolutionTaskHolder@335 {
     <name not found> = ArrayList@336[1] { ResolutionCandidate@337 }
-    <name not found> = ArrayList@338[1] { ResolutionCandidate@337 }
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
 }
 
-ResolutionTaskHolder@339 {
-    <name not found> = ArrayList@340[1] { ResolutionCandidate@341 }
-    <name not found> = ArrayList@342[1] { ResolutionCandidate@341 }
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
+ResolutionTaskHolder@338 {
+    <name not found> = ArrayList@339[1] { ResolutionCandidate@340 }
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
 }
 
-ResolutionTaskHolder@343 {
-    <name not found> = ArrayList@344[1] { ResolutionCandidate@345 }
-    <name not found> = ArrayList@346[1] { ResolutionCandidate@345 }
+ResolutionTaskHolder@341 {
+    <name not found> = ArrayList@342[1] { ResolutionCandidate@343 }
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
+}
+
+ResolutionTaskHolder@344 {
+    <name not found> = ArrayList@345[1] { ResolutionCandidate@346 }
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
 }
 
 ResolutionTaskHolder@347 {
     <name not found> = ArrayList@348[1] { ResolutionCandidate@349 }
-    <name not found> = ArrayList@350[1] { ResolutionCandidate@349 }
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
 }
 
-ResolutionTaskHolder@351 {
-    <name not found> = ArrayList@352[1] { ResolutionCandidate@353 }
-    <name not found> = ArrayList@354[1] { ResolutionCandidate@353 }
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
+ResolutionTaskHolder@350 {
+    <name not found> = ArrayList@351[1] { ResolutionCandidate@352 }
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
 }
 
-ResolutionTaskHolder@355 {
-    <name not found> = ArrayList@356[1] { ResolutionCandidate@357 }
-    <name not found> = ArrayList@358[1] { ResolutionCandidate@357 }
+ResolutionTaskHolder@353 {
+    <name not found> = ArrayList@354[1] { ResolutionCandidate@355 }
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
+}
+
+ResolutionTaskHolder@356 {
+    <name not found> = ArrayList@357[1] { ResolutionCandidate@358 }
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
 }
 
 ResolutionTaskHolder@359 {
     <name not found> = ArrayList@360[1] { ResolutionCandidate@361 }
-    <name not found> = ArrayList@362[1] { ResolutionCandidate@361 }
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
 }
 
-ResolutionTaskHolder@363 {
-    <name not found> = ArrayList@364[1] { ResolutionCandidate@365 }
-    <name not found> = ArrayList@366[1] { ResolutionCandidate@365 }
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
+ResolutionTaskHolder@362 {
+    <name not found> = ArrayList@363[1] { ResolutionCandidate@364 }
     <name not found> = EmptyList@4[empty]
 }
 
-ResolutionTaskHolder@367 {
-    <name not found> = ArrayList@368[1] { ResolutionCandidate@369 }
-    <name not found> = ArrayList@370[1] { ResolutionCandidate@369 }
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
+ResolutionTaskHolder@365 {
+    <name not found> = ArrayList@366[1] { ResolutionCandidate@367 }
+}
+
+ResolutionTaskHolder@368 {
+    <name not found> = ArrayList@369[1] { ResolutionCandidate@370 }
 }
 
 ResolutionTaskHolder@371 {
     <name not found> = ArrayList@372[1] { ResolutionCandidate@373 }
-    <name not found> = ArrayList@374[1] { ResolutionCandidate@373 }
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
 }
 
-ResolutionTaskHolder@375 {
-    <name not found> = ArrayList@376[1] { ResolutionCandidate@377 }
-    <name not found> = ArrayList@378[1] { ResolutionCandidate@377 }
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
+ResolutionTaskHolder@374 {
+    <name not found> = ArrayList@375[1] { ResolutionCandidate@376 }
 }
 
-ResolutionTaskHolder@379 {
-    <name not found> = ArrayList@380[1] { ResolutionCandidate@381 }
-    <name not found> = ArrayList@382[1] { ResolutionCandidate@381 }
+ResolutionTaskHolder@377 {
+    <name not found> = ArrayList@378[1] { ResolutionCandidate@379 }
+}
+
+ResolutionTaskHolder@380 {
+    <name not found> = ArrayList@381[1] { ResolutionCandidate@382 }
 }
 
 ResolutionTaskHolder@383 {
     <name not found> = ArrayList@384[1] { ResolutionCandidate@385 }
-    <name not found> = ArrayList@386[1] { ResolutionCandidate@385 }
 }
 
-ResolutionTaskHolder@387 {
-    <name not found> = ArrayList@388[1] { ResolutionCandidate@389 }
-    <name not found> = ArrayList@390[1] { ResolutionCandidate@389 }
+ResolutionTaskHolder@386 {
+    <name not found> = ArrayList@387[1] { ResolutionCandidate@388 }
 }
 
-ResolutionTaskHolder@391 {
-    <name not found> = ArrayList@392[1] { ResolutionCandidate@393 }
-    <name not found> = ArrayList@394[1] { ResolutionCandidate@393 }
+ResolutionTaskHolder@389 {
+    <name not found> = ArrayList@390[1] { ResolutionCandidate@391 }
+}
+
+ResolutionTaskHolder@392 {
+    <name not found> = ArrayList@393[1] { ResolutionCandidate@394 }
 }
 
 ResolutionTaskHolder@395 {
     <name not found> = ArrayList@396[1] { ResolutionCandidate@397 }
-    <name not found> = ArrayList@398[1] { ResolutionCandidate@397 }
 }
 
-ResolutionTaskHolder@399 {
-    <name not found> = ArrayList@400[1] { ResolutionCandidate@401 }
-    <name not found> = ArrayList@402[1] { ResolutionCandidate@401 }
+ResolutionTaskHolder@398 {
+    <name not found> = ArrayList@399[1] { ResolutionCandidate@400 }
 }
 
-ResolutionTaskHolder@403 {
-    <name not found> = ArrayList@404[1] { ResolutionCandidate@405 }
-    <name not found> = ArrayList@406[1] { ResolutionCandidate@405 }
+ResolutionTaskHolder@401 {
+    <name not found> = ArrayList@402[1] { ResolutionCandidate@403 }
+}
+
+ResolutionTaskHolder@404 {
+    <name not found> = ArrayList@405[1] { ResolutionCandidate@406 }
 }
 
 ResolutionTaskHolder@407 {
     <name not found> = ArrayList@408[1] { ResolutionCandidate@409 }
-    <name not found> = ArrayList@410[1] { ResolutionCandidate@409 }
 }
 
-ResolutionTaskHolder@411 {
-    <name not found> = ArrayList@412[1] { ResolutionCandidate@413 }
-    <name not found> = ArrayList@414[1] { ResolutionCandidate@413 }
+ResolutionTaskHolder@410 {
+    <name not found> = ArrayList@411[4] { ResolutionCandidate@412, ResolutionCandidate@413, ResolutionCandidate@414, ... }
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
 }
 
 ResolutionTaskHolder@415 {
-    <name not found> = ArrayList@416[1] { ResolutionCandidate@417 }
-    <name not found> = ArrayList@418[1] { ResolutionCandidate@417 }
-}
-
-ResolutionTaskHolder@419 {
-    <name not found> = ArrayList@420[1] { ResolutionCandidate@421 }
-    <name not found> = ArrayList@422[1] { ResolutionCandidate@421 }
-}
-
-ResolutionTaskHolder@423 {
-    <name not found> = ArrayList@424[1] { ResolutionCandidate@425 }
-    <name not found> = ArrayList@426[1] { ResolutionCandidate@425 }
-}
-
-ResolutionTaskHolder@427 {
-    <name not found> = ArrayList@428[1] { ResolutionCandidate@429 }
-    <name not found> = ArrayList@430[1] { ResolutionCandidate@429 }
-}
-
-ResolutionTaskHolder@431 {
-    <name not found> = ArrayList@432[1] { ResolutionCandidate@433 }
-    <name not found> = ArrayList@434[1] { ResolutionCandidate@433 }
-}
-
-ResolutionTaskHolder@435 {
-    <name not found> = ArrayList@436[1] { ResolutionCandidate@437 }
-    <name not found> = ArrayList@438[1] { ResolutionCandidate@437 }
-}
-
-ResolutionTaskHolder@439 {
-    <name not found> = ArrayList@440[4] { ResolutionCandidate@441, ResolutionCandidate@442, ResolutionCandidate@443, ... }
-    <name not found> = ArrayList@444[4] { ResolutionCandidate@441, ResolutionCandidate@442, ResolutionCandidate@443, ... }
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
 }
 
-ResolutionTaskHolder@445 {
+null {
+    <name not found> = ArrayList@416[10] { ResolutionCandidate@323, ResolutionCandidate@324, ResolutionCandidate@325, ... }
+    <name not found> = ArrayList@417[1] { ResolutionCandidate@373 }
+    <name not found> = ArrayList@418[1] { ResolutionCandidate@334 }
+    <name not found> = ArrayList@419[1] { ResolutionCandidate@331 }
+    <name not found> = ArrayList@420[1] { ResolutionCandidate@382 }
+    <name not found> = ArrayList@421[1] { ResolutionCandidate@337 }
+    <name not found> = ArrayList@422[1] { ResolutionCandidate@391 }
+    <name not found> = ArrayList@423[1] { ResolutionCandidate@328 }
+    <name not found> = ArrayList@424[1] { ResolutionCandidate@364 }
+    <name not found> = ArrayList@425[1] { ResolutionCandidate@379 }
+    <name not found> = ArrayList@426[1] { ResolutionCandidate@385 }
+    <name not found> = ArrayList@427[1] { ResolutionCandidate@349 }
+    <name not found> = ArrayList@428[1] { ResolutionCandidate@400 }
+    <name not found> = ArrayList@429[1] { ResolutionCandidate@346 }
+    <name not found> = ArrayList@430[1] { ResolutionCandidate@406 }
+    <name not found> = ArrayList@431[1] { ResolutionCandidate@355 }
+    <name not found> = ArrayList@432[1] { ResolutionCandidate@370 }
+    <name not found> = ArrayList@433[1] { ResolutionCandidate@343 }
+    <name not found> = ArrayList@434[1] { ResolutionCandidate@376 }
+    <name not found> = ArrayList@435[1] { ResolutionCandidate@352 }
+    <name not found> = ArrayList@436[1] { ResolutionCandidate@409 }
+    <name not found> = ArrayList@437[1] { ResolutionCandidate@340 }
+    <name not found> = ArrayList@438[1] { ResolutionCandidate@394 }
+    <name not found> = ArrayList@439[1] { ResolutionCandidate@358 }
+    <name not found> = ArrayList@440[1] { ResolutionCandidate@388 }
+    <name not found> = ArrayList@441[1] { ResolutionCandidate@361 }
+    <name not found> = ArrayList@442[1] { ResolutionCandidate@367 }
+    <name not found> = ArrayList@443[1] { ResolutionCandidate@403 }
+    <name not found> = ArrayList@444[1] { ResolutionCandidate@397 }
+    <name not found> = ArrayList@445[4] { ResolutionCandidate@412, ResolutionCandidate@413, ResolutionCandidate@414, ... }
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
diff --git a/compiler/testData/diagnostics/tests/inference/kt6175.lazy.log b/compiler/testData/diagnostics/tests/inference/kt6175.lazy.log
index 421e7fe4edf..dd2a344d8df 100644
--- a/compiler/testData/diagnostics/tests/inference/kt6175.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/kt6175.lazy.log
@@ -37,21 +37,21 @@ LazyJavaClassifierType@21['String'] {
 
 LazyJavaClassifierType@24['String'] {
     arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@23['String']
+    classifier = JavaClassImpl@15['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@15['String']
+    classifier = JavaClassImpl@20['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@29['String'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@20['String']
+    classifier = JavaClassImpl@23['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -168,3 +168,123 @@ LazyJavaPackageFragment@59['lang'] {
     functions('foo': Name@80) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@88
     memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@88
 }
+
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+}
+
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+}
+
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+}
+
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+}
+
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+}
+
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+}
+
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+}
+
+ResolutionTaskHolder@111 {
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+}
+
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+}
+
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+}
+
+ResolutionTaskHolder@120 {
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+}
+
+ResolutionTaskHolder@123 {
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+}
+
+ResolutionTaskHolder@126 {
+    <name not found> = ArrayList@127[4] { ResolutionCandidate@128, ResolutionCandidate@129, ResolutionCandidate@130, ... }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+}
+
+null {
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@125 }
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@113 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@122 }
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@143[5] { ResolutionCandidate@128, ResolutionCandidate@129, ResolutionCandidate@130, ... }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/inference/kt619.lazy.log b/compiler/testData/diagnostics/tests/inference/kt619.lazy.log
index 965374d0491..98f1ee70954 100644
--- a/compiler/testData/diagnostics/tests/inference/kt619.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/kt619.lazy.log
@@ -35,25 +35,28 @@ LazyJavaPackageFragment@10['java'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
 }
 
 ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@44[8] { ResolutionCandidate@45, ResolutionCandidate@46, ResolutionCandidate@47, ... }
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[8] { ResolutionCandidate@49, ResolutionCandidate@50, ResolutionCandidate@51, ... }
-    <name not found> = ArrayList@52[8] { ResolutionCandidate@49, ResolutionCandidate@50, ResolutionCandidate@51, ... }
+null {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@52[8] { ResolutionCandidate@45, ResolutionCandidate@46, ResolutionCandidate@47, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/inference/listConstructor.lazy.log b/compiler/testData/diagnostics/tests/inference/listConstructor.lazy.log
index 0b3b9f4db23..e244ff97e9c 100644
--- a/compiler/testData/diagnostics/tests/inference/listConstructor.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/listConstructor.lazy.log
@@ -96,77 +96,77 @@ LazyJavaClassifierType@64['E'] {
     arguments = ArrayList@65[empty]
     classifier = JavaTypeParameterImpl@66['E']
     nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
 }
 
-LazyJavaClassifierType@67['E'] {
-    arguments = ArrayList@68[empty]
-    classifier = JavaTypeParameterImpl@69['E']
+LazyJavaClassifierType@68['E'] {
+    arguments = ArrayList@69[empty]
+    classifier = JavaTypeParameterImpl@70['E']
+    nullable = 'false': Boolean@48
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
+}
+
+LazyJavaClassifierType@71['E'] {
+    arguments = ArrayList@72[empty]
+    classifier = JavaTypeParameterImpl@73['E']
+    nullable = 'false': Boolean@48
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
+}
+
+LazyJavaClassifierType@75['E'] {
+    arguments = ArrayList@76[empty]
+    classifier = JavaTypeParameterImpl@77['E']
     nullable = 'false': Boolean@48
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
 }
 
-LazyJavaClassifierType@70['E'] {
-    arguments = ArrayList@71[empty]
-    classifier = JavaTypeParameterImpl@72['E']
-    nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
-}
-
-LazyJavaClassifierType@74['E'] {
-    arguments = ArrayList@75[empty]
-    classifier = JavaTypeParameterImpl@76['E']
-    nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
-}
-
 LazyJavaClassifierType@78['E'] {
     arguments = ArrayList@79[empty]
     classifier = JavaTypeParameterImpl@80['E']
     nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
 }
 
 LazyJavaClassifierType@81['E'] {
     arguments = ArrayList@82[empty]
+    classifier = JavaTypeParameterImpl@66['E']
+    nullable = 'true': Boolean@54
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
+}
+
+LazyJavaClassifierType@83['E'] {
+    arguments = ArrayList@84[empty]
+    classifier = JavaTypeParameterImpl@80['E']
+    nullable = 'true': Boolean@54
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
+}
+
+LazyJavaClassifierType@85['E'] {
+    arguments = ArrayList@86[empty]
     classifier = JavaTypeParameterImpl@62['E']
     nullable = 'true': Boolean@54
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
 }
 
-LazyJavaClassifierType@83['E'] {
-    arguments = ArrayList@84[empty]
-    classifier = JavaTypeParameterImpl@66['E']
-    nullable = 'true': Boolean@54
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
-}
-
-LazyJavaClassifierType@85['E'] {
-    arguments = ArrayList@86[empty]
-    classifier = JavaTypeParameterImpl@80['E']
-    nullable = 'true': Boolean@54
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
-}
-
 LazyJavaClassifierType@87['E'] {
     arguments = ArrayList@88[empty]
-    classifier = JavaTypeParameterImpl@69['E']
+    classifier = JavaTypeParameterImpl@77['E']
     nullable = 'true': Boolean@54
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
 }
 
 LazyJavaClassifierType@89['E'] {
     arguments = ArrayList@90[empty]
-    classifier = JavaTypeParameterImpl@76['E']
+    classifier = JavaTypeParameterImpl@70['E']
     nullable = 'true': Boolean@54
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
 }
 
 LazyJavaClassifierType@91['E'] {
     arguments = ArrayList@92[empty]
-    classifier = JavaTypeParameterImpl@72['E']
+    classifier = JavaTypeParameterImpl@73['E']
     nullable = 'true': Boolean@54
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
 }
 
 LazyJavaClassifierType@24['List<E>'] {
@@ -325,16 +325,16 @@ LazyJavaPackageFragment@152['util'] {
 
 LazyJavaTypeParameterDescriptor@26['E'] {
     defaultType = JetTypeImpl@205['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
     upperBounds = LinkedHashSet@206[1] { NullableType@207 }
 }
 
-LazyJavaTypeParameterDescriptor@17['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
+LazyJavaTypeParameterDescriptor@21['E'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
 }
 
-LazyJavaTypeParameterDescriptor@21['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
+LazyJavaTypeParameterDescriptor@17['E'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
 }
 
 LazyJavaTypeParameterResolver@208 {
@@ -342,158 +342,161 @@ LazyJavaTypeParameterResolver@208 {
 }
 
 LazyJavaTypeParameterResolver@210 {
-    resolve(JavaTypeParameterImpl@80['E']) = LazyJavaTypeParameterDescriptor@21['E']
+    resolve(JavaTypeParameterImpl@211['E']) = LazyJavaTypeParameterDescriptor@17['E']
 }
 
-LazyJavaTypeParameterResolver@211 {
-    resolve(JavaTypeParameterImpl@212['E']) = LazyJavaTypeParameterDescriptor@17['E']
+LazyJavaTypeParameterResolver@212 {
+    resolve(JavaTypeParameterImpl@62['E']) = LazyJavaTypeParameterDescriptor@21['E']
 }
 
 ResolutionTaskHolder@213 {
     <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@215 }
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
     <name not found> = EmptyList@186[empty]
     <name not found> = EmptyList@186[empty]
 }
 
-ResolutionTaskHolder@217 {
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@219 }
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@219 }
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
+ResolutionTaskHolder@216 {
+    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
     <name not found> = EmptyList@186[empty]
     <name not found> = EmptyList@186[empty]
 }
 
-ResolutionTaskHolder@221 {
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@223 }
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@223 }
+ResolutionTaskHolder@219 {
+    <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
     <name not found> = EmptyList@186[empty]
     <name not found> = EmptyList@186[empty]
+}
+
+ResolutionTaskHolder@222 {
+    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
     <name not found> = EmptyList@186[empty]
     <name not found> = EmptyList@186[empty]
 }
 
 ResolutionTaskHolder@225 {
     <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@227 }
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
     <name not found> = EmptyList@186[empty]
     <name not found> = EmptyList@186[empty]
 }
 
-ResolutionTaskHolder@229 {
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@231 }
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
+ResolutionTaskHolder@228 {
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
     <name not found> = EmptyList@186[empty]
     <name not found> = EmptyList@186[empty]
 }
 
-ResolutionTaskHolder@233 {
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@235 }
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@235 }
+ResolutionTaskHolder@231 {
+    <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
     <name not found> = EmptyList@186[empty]
     <name not found> = EmptyList@186[empty]
+}
+
+ResolutionTaskHolder@234 {
+    <name not found> = ArrayList@235[1] { ResolutionCandidate@236 }
     <name not found> = EmptyList@186[empty]
     <name not found> = EmptyList@186[empty]
 }
 
 ResolutionTaskHolder@237 {
     <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@239 }
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
 }
 
-ResolutionTaskHolder@241 {
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@243 }
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
+ResolutionTaskHolder@240 {
+    <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
 }
 
-ResolutionTaskHolder@245 {
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@247 }
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@247 }
+ResolutionTaskHolder@243 {
+    <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
+}
+
+ResolutionTaskHolder@246 {
+    <name not found> = ArrayList@247[1] { ResolutionCandidate@248 }
 }
 
 ResolutionTaskHolder@249 {
     <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
-    <name not found> = ArrayList@252[1] { ResolutionCandidate@251 }
 }
 
-ResolutionTaskHolder@253 {
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@255 }
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@255 }
+ResolutionTaskHolder@252 {
+    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
 }
 
-ResolutionTaskHolder@257 {
-    <name not found> = ArrayList@258[1] { ResolutionCandidate@259 }
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@259 }
+ResolutionTaskHolder@255 {
+    <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
+}
+
+ResolutionTaskHolder@258 {
+    <name not found> = ArrayList@259[1] { ResolutionCandidate@260 }
 }
 
 ResolutionTaskHolder@261 {
     <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@263 }
 }
 
-ResolutionTaskHolder@265 {
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@267 }
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@267 }
+ResolutionTaskHolder@264 {
+    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
 }
 
-ResolutionTaskHolder@269 {
-    <name not found> = ArrayList@270[1] { ResolutionCandidate@271 }
-    <name not found> = ArrayList@272[1] { ResolutionCandidate@271 }
+ResolutionTaskHolder@267 {
+    <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
+}
+
+ResolutionTaskHolder@270 {
+    <name not found> = ArrayList@271[1] { ResolutionCandidate@272 }
 }
 
 ResolutionTaskHolder@273 {
     <name not found> = ArrayList@274[1] { ResolutionCandidate@275 }
-    <name not found> = ArrayList@276[1] { ResolutionCandidate@275 }
 }
 
-ResolutionTaskHolder@277 {
-    <name not found> = ArrayList@278[1] { ResolutionCandidate@279 }
-    <name not found> = ArrayList@280[1] { ResolutionCandidate@279 }
+ResolutionTaskHolder@276 {
+    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
 }
 
-ResolutionTaskHolder@281 {
-    <name not found> = ArrayList@282[1] { ResolutionCandidate@283 }
-    <name not found> = ArrayList@284[1] { ResolutionCandidate@283 }
+ResolutionTaskHolder@279 {
+    <name not found> = ArrayList@280[3] { ResolutionCandidate@281, ResolutionCandidate@282, ResolutionCandidate@283 }
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
 }
 
-ResolutionTaskHolder@285 {
-    <name not found> = ArrayList@286[1] { ResolutionCandidate@287 }
-    <name not found> = ArrayList@288[1] { ResolutionCandidate@287 }
-}
-
-ResolutionTaskHolder@289 {
-    <name not found> = ArrayList@290[1] { ResolutionCandidate@291 }
-    <name not found> = ArrayList@292[1] { ResolutionCandidate@291 }
-}
-
-ResolutionTaskHolder@293 {
-    <name not found> = ArrayList@294[1] { ResolutionCandidate@295 }
-    <name not found> = ArrayList@296[1] { ResolutionCandidate@295 }
-}
-
-ResolutionTaskHolder@297 {
-    <name not found> = ArrayList@298[1] { ResolutionCandidate@299 }
-    <name not found> = ArrayList@300[1] { ResolutionCandidate@299 }
-}
-
-ResolutionTaskHolder@301 {
-    <name not found> = ArrayList@302[3] { ResolutionCandidate@303, ResolutionCandidate@304, ResolutionCandidate@305 }
-    <name not found> = ArrayList@306[3] { ResolutionCandidate@303, ResolutionCandidate@304, ResolutionCandidate@305 }
+null {
+    <name not found> = ArrayList@284[1] { ResolutionCandidate@263 }
+    <name not found> = ArrayList@285[1] { ResolutionCandidate@224 }
+    <name not found> = ArrayList@286[1] { ResolutionCandidate@233 }
+    <name not found> = ArrayList@287[1] { ResolutionCandidate@215 }
+    <name not found> = ArrayList@288[1] { ResolutionCandidate@230 }
+    <name not found> = ArrayList@289[1] { ResolutionCandidate@221 }
+    <name not found> = ArrayList@290[1] { ResolutionCandidate@236 }
+    <name not found> = ArrayList@291[1] { ResolutionCandidate@218 }
+    <name not found> = ArrayList@292[1] { ResolutionCandidate@269 }
+    <name not found> = ArrayList@293[1] { ResolutionCandidate@245 }
+    <name not found> = ArrayList@294[1] { ResolutionCandidate@254 }
+    <name not found> = ArrayList@295[1] { ResolutionCandidate@266 }
+    <name not found> = ArrayList@296[1] { ResolutionCandidate@272 }
+    <name not found> = ArrayList@297[1] { ResolutionCandidate@278 }
+    <name not found> = ArrayList@298[1] { ResolutionCandidate@227 }
+    <name not found> = ArrayList@299[1] { ResolutionCandidate@242 }
+    <name not found> = ArrayList@300[1] { ResolutionCandidate@251 }
+    <name not found> = ArrayList@301[1] { ResolutionCandidate@275 }
+    <name not found> = ArrayList@302[1] { ResolutionCandidate@248 }
+    <name not found> = ArrayList@303[1] { ResolutionCandidate@239 }
+    <name not found> = ArrayList@304[1] { ResolutionCandidate@257 }
+    <name not found> = ArrayList@305[1] { ResolutionCandidate@260 }
+    <name not found> = ArrayList@306[3] { ResolutionCandidate@281, ResolutionCandidate@282, ResolutionCandidate@283 }
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
     <name not found> = EmptyList@186[empty]
     <name not found> = EmptyList@186[empty]
     <name not found> = EmptyList@186[empty]
diff --git a/compiler/testData/diagnostics/tests/inference/mapFunction.lazy.log b/compiler/testData/diagnostics/tests/inference/mapFunction.lazy.log
index 59b0ffe1e89..463b9da927d 100644
--- a/compiler/testData/diagnostics/tests/inference/mapFunction.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/mapFunction.lazy.log
@@ -79,87 +79,90 @@ LazyJavaPackageFragment@30['util'] {
 
 ResolutionTaskHolder@69 {
     <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
+}
+
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
 }
 
 ResolutionTaskHolder@81 {
     <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
 }
 
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
+}
+
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
 }
 
 ResolutionTaskHolder@93 {
     <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
 }
 
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
 }
 
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[2] { ResolutionCandidate@101, ResolutionCandidate@102 }
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[2] { ResolutionCandidate@105, ResolutionCandidate@106 }
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[2] { ResolutionCandidate@111, ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[2] { ResolutionCandidate@111, ResolutionCandidate@112 }
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[7] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111, ... }
+}
+
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[7] { ResolutionCandidate@114, ResolutionCandidate@115, ResolutionCandidate@116, ... }
+}
+
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[7] { ResolutionCandidate@119, ResolutionCandidate@120, ResolutionCandidate@121, ... }
+}
+
+null {
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@132[2] { ResolutionCandidate@105, ResolutionCandidate@106 }
+    <name not found> = ArrayList@133[2] { ResolutionCandidate@101, ResolutionCandidate@102 }
+    <name not found> = ArrayList@134[7] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111, ... }
+    <name not found> = ArrayList@135[7] { ResolutionCandidate@119, ResolutionCandidate@120, ResolutionCandidate@121, ... }
+    <name not found> = ArrayList@136[7] { ResolutionCandidate@114, ResolutionCandidate@115, ResolutionCandidate@116, ... }
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[2] { ResolutionCandidate@116, ResolutionCandidate@117 }
-    <name not found> = ArrayList@118[2] { ResolutionCandidate@116, ResolutionCandidate@117 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[7] { ResolutionCandidate@121, ResolutionCandidate@122, ResolutionCandidate@123, ... }
-    <name not found> = ArrayList@124[7] { ResolutionCandidate@121, ResolutionCandidate@122, ResolutionCandidate@123, ... }
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[7] { ResolutionCandidate@127, ResolutionCandidate@128, ResolutionCandidate@129, ... }
-    <name not found> = ArrayList@130[7] { ResolutionCandidate@127, ResolutionCandidate@128, ResolutionCandidate@129, ... }
-}
-
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[7] { ResolutionCandidate@133, ResolutionCandidate@134, ResolutionCandidate@135, ... }
-    <name not found> = ArrayList@136[7] { ResolutionCandidate@133, ResolutionCandidate@134, ResolutionCandidate@135, ... }
-}
diff --git a/compiler/testData/diagnostics/tests/inference/mostSpecificAfterInference.lazy.log b/compiler/testData/diagnostics/tests/inference/mostSpecificAfterInference.lazy.log
index d1dba884cd4..ff82dc181c9 100644
--- a/compiler/testData/diagnostics/tests/inference/mostSpecificAfterInference.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/mostSpecificAfterInference.lazy.log
@@ -97,41 +97,44 @@ LazyJavaTypeParameterResolver@77 {
 
 ResolutionTaskHolder@79 {
     <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
 }
 
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
 }
 
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
+}
+
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
 }
 
 ResolutionTaskHolder@91 {
     <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
 }
 
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[2] { ResolutionCandidate@101, ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[2] { ResolutionCandidate@101, ResolutionCandidate@102 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[2] { ResolutionCandidate@96, ResolutionCandidate@97 }
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[2] { ResolutionCandidate@106, ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[2] { ResolutionCandidate@106, ResolutionCandidate@107 }
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[2] { ResolutionCandidate@100, ResolutionCandidate@101 }
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+}
+
+null {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@107[2] { ResolutionCandidate@96, ResolutionCandidate@97 }
+    <name not found> = ArrayList@108[2] { ResolutionCandidate@100, ResolutionCandidate@101 }
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
diff --git a/compiler/testData/diagnostics/tests/inference/nestedCalls/arrayAccess.lazy.log b/compiler/testData/diagnostics/tests/inference/nestedCalls/arrayAccess.lazy.log
index 084ddfba410..82fdc35f5b8 100644
--- a/compiler/testData/diagnostics/tests/inference/nestedCalls/arrayAccess.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/nestedCalls/arrayAccess.lazy.log
@@ -37,21 +37,21 @@ LazyJavaClassifierType@21['String'] {
 
 LazyJavaClassifierType@24['String'] {
     arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@20['String']
+    classifier = JavaClassImpl@23['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@15['String']
+    classifier = JavaClassImpl@20['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@29['String'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@23['String']
+    classifier = JavaClassImpl@15['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -79,14 +79,14 @@ LazyJavaClassifierType@38['Throwable'] {
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@37['Throwable']
+    classifier = JavaClassImpl@33['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@43['Throwable'] {
     arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@33['Throwable']
+    classifier = JavaClassImpl@37['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -149,42 +149,45 @@ LazyJavaPackageFragment@64['lang'] {
 
 ResolutionTaskHolder@87 {
     <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
     <name not found> = EmptyList@81[empty]
     <name not found> = EmptyList@81[empty]
 }
 
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
 }
 
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
+}
+
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
 }
 
 ResolutionTaskHolder@99 {
     <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
 }
 
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[4] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
 }
 
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[4] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111, ... }
-    <name not found> = ArrayList@112[5] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111, ... }
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
+null {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@112[5] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
     <name not found> = EmptyList@81[empty]
     <name not found> = EmptyList@81[empty]
     <name not found> = EmptyList@81[empty]
diff --git a/compiler/testData/diagnostics/tests/inference/nestedCalls/binaryExpressions.lazy.log b/compiler/testData/diagnostics/tests/inference/nestedCalls/binaryExpressions.lazy.log
index ccede36f778..0286e245911 100644
--- a/compiler/testData/diagnostics/tests/inference/nestedCalls/binaryExpressions.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/nestedCalls/binaryExpressions.lazy.log
@@ -37,14 +37,14 @@ LazyJavaClassifierType@21['String'] {
 
 LazyJavaClassifierType@24['String'] {
     arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@23['String']
+    classifier = JavaClassImpl@15['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@15['String']
+    classifier = JavaClassImpl@23['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -173,15 +173,6 @@ LazyJavaPackageFragment@70['lang'] {
 
 ResolutionTaskHolder@105 {
     <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
@@ -192,17 +183,8 @@ ResolutionTaskHolder@105 {
     <name not found> = EmptyList@93[empty]
 }
 
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
     <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
@@ -213,640 +195,661 @@ ResolutionTaskHolder@109 {
     <name not found> = EmptyList@93[empty]
 }
 
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
+ResolutionTaskHolder@111 {
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
     <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
+}
+
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
     <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
 }
 
 ResolutionTaskHolder@117 {
     <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
 }
 
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
+ResolutionTaskHolder@120 {
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
     <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
 }
 
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@127 }
+ResolutionTaskHolder@123 {
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
     <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
+}
+
+ResolutionTaskHolder@126 {
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
     <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
 }
 
 ResolutionTaskHolder@129 {
     <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@131 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
 }
 
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@135 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
+ResolutionTaskHolder@132 {
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
     <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
 }
 
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@139 }
+ResolutionTaskHolder@135 {
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
     <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
+}
+
+ResolutionTaskHolder@138 {
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
     <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
 }
 
 ResolutionTaskHolder@141 {
     <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@143 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
 }
 
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@147 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
+ResolutionTaskHolder@144 {
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
     <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
 }
 
-ResolutionTaskHolder@149 {
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@151 }
+ResolutionTaskHolder@147 {
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
     <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
+}
+
+ResolutionTaskHolder@150 {
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
     <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
 }
 
 ResolutionTaskHolder@153 {
     <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@155 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
 }
 
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@159 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
+ResolutionTaskHolder@156 {
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
     <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
 }
 
-ResolutionTaskHolder@161 {
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@163 }
+ResolutionTaskHolder@159 {
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
     <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
+}
+
+ResolutionTaskHolder@162 {
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
     <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
 }
 
 ResolutionTaskHolder@165 {
     <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@167 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
 }
 
-ResolutionTaskHolder@169 {
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@171 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
+ResolutionTaskHolder@168 {
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
     <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
 }
 
-ResolutionTaskHolder@173 {
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@175 }
+ResolutionTaskHolder@171 {
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
     <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
+}
+
+ResolutionTaskHolder@174 {
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
     <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
 }
 
 ResolutionTaskHolder@177 {
     <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@179 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
 }
 
-ResolutionTaskHolder@181 {
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@183 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
+ResolutionTaskHolder@180 {
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
     <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
 }
 
-ResolutionTaskHolder@185 {
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@187 }
+ResolutionTaskHolder@183 {
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
     <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
+}
+
+ResolutionTaskHolder@186 {
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
     <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
 }
 
 ResolutionTaskHolder@189 {
     <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@191 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
 }
 
-ResolutionTaskHolder@193 {
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@195 }
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@195 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
+ResolutionTaskHolder@192 {
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
     <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
 }
 
-ResolutionTaskHolder@197 {
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@199 }
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@199 }
+ResolutionTaskHolder@195 {
+    <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
     <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
+}
+
+ResolutionTaskHolder@198 {
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
     <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
 }
 
 ResolutionTaskHolder@201 {
     <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@203 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
 }
 
-ResolutionTaskHolder@205 {
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@207 }
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@207 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
+ResolutionTaskHolder@204 {
+    <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
     <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
 }
 
-ResolutionTaskHolder@209 {
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@211 }
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@211 }
+ResolutionTaskHolder@207 {
+    <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
     <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
+}
+
+ResolutionTaskHolder@210 {
+    <name not found> = ArrayList@211[1] { ResolutionCandidate@212 }
     <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
 }
 
 ResolutionTaskHolder@213 {
     <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@215 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
 }
 
-ResolutionTaskHolder@217 {
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@219 }
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@219 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
+ResolutionTaskHolder@216 {
+    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
     <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
 }
 
-ResolutionTaskHolder@221 {
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@223 }
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@223 }
+ResolutionTaskHolder@219 {
+    <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
     <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
+}
+
+ResolutionTaskHolder@222 {
+    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
     <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
 }
 
 ResolutionTaskHolder@225 {
     <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@227 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
 }
 
-ResolutionTaskHolder@229 {
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@231 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
+ResolutionTaskHolder@228 {
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
     <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
 }
 
-ResolutionTaskHolder@233 {
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@235 }
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@235 }
+ResolutionTaskHolder@231 {
+    <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
     <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
+}
+
+ResolutionTaskHolder@234 {
+    <name not found> = ArrayList@235[1] { ResolutionCandidate@236 }
     <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
 }
 
 ResolutionTaskHolder@237 {
     <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@239 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
 }
 
-ResolutionTaskHolder@241 {
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@243 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
+ResolutionTaskHolder@240 {
+    <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
 }
 
-ResolutionTaskHolder@245 {
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@247 }
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@247 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
+ResolutionTaskHolder@243 {
+    <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
+}
+
+ResolutionTaskHolder@246 {
+    <name not found> = ArrayList@247[1] { ResolutionCandidate@248 }
 }
 
 ResolutionTaskHolder@249 {
     <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
-    <name not found> = ArrayList@252[1] { ResolutionCandidate@251 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
 }
 
-ResolutionTaskHolder@253 {
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@255 }
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@255 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
+ResolutionTaskHolder@252 {
+    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
 }
 
-ResolutionTaskHolder@257 {
-    <name not found> = ArrayList@258[1] { ResolutionCandidate@259 }
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@259 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
+ResolutionTaskHolder@255 {
+    <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
+}
+
+ResolutionTaskHolder@258 {
+    <name not found> = ArrayList@259[1] { ResolutionCandidate@260 }
 }
 
 ResolutionTaskHolder@261 {
     <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@263 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
 }
 
-ResolutionTaskHolder@265 {
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@267 }
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@267 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
+ResolutionTaskHolder@264 {
+    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
 }
 
-ResolutionTaskHolder@269 {
-    <name not found> = ArrayList@270[1] { ResolutionCandidate@271 }
-    <name not found> = ArrayList@272[1] { ResolutionCandidate@271 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
+ResolutionTaskHolder@267 {
+    <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
+}
+
+ResolutionTaskHolder@270 {
+    <name not found> = ArrayList@271[1] { ResolutionCandidate@272 }
 }
 
 ResolutionTaskHolder@273 {
     <name not found> = ArrayList@274[1] { ResolutionCandidate@275 }
-    <name not found> = ArrayList@276[1] { ResolutionCandidate@275 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
 }
 
-ResolutionTaskHolder@277 {
-    <name not found> = ArrayList@278[1] { ResolutionCandidate@279 }
-    <name not found> = ArrayList@280[1] { ResolutionCandidate@279 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
+ResolutionTaskHolder@276 {
+    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
 }
 
-ResolutionTaskHolder@281 {
-    <name not found> = ArrayList@282[1] { ResolutionCandidate@283 }
-    <name not found> = ArrayList@284[1] { ResolutionCandidate@283 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
+ResolutionTaskHolder@279 {
+    <name not found> = ArrayList@280[1] { ResolutionCandidate@281 }
+}
+
+ResolutionTaskHolder@282 {
+    <name not found> = ArrayList@283[1] { ResolutionCandidate@284 }
 }
 
 ResolutionTaskHolder@285 {
     <name not found> = ArrayList@286[1] { ResolutionCandidate@287 }
-    <name not found> = ArrayList@288[1] { ResolutionCandidate@287 }
 }
 
-ResolutionTaskHolder@289 {
-    <name not found> = ArrayList@290[1] { ResolutionCandidate@291 }
-    <name not found> = ArrayList@292[1] { ResolutionCandidate@291 }
+ResolutionTaskHolder@288 {
+    <name not found> = ArrayList@289[1] { ResolutionCandidate@290 }
 }
 
-ResolutionTaskHolder@293 {
-    <name not found> = ArrayList@294[1] { ResolutionCandidate@295 }
-    <name not found> = ArrayList@296[1] { ResolutionCandidate@295 }
+ResolutionTaskHolder@291 {
+    <name not found> = ArrayList@292[1] { ResolutionCandidate@293 }
+}
+
+ResolutionTaskHolder@294 {
+    <name not found> = ArrayList@295[1] { ResolutionCandidate@296 }
 }
 
 ResolutionTaskHolder@297 {
     <name not found> = ArrayList@298[1] { ResolutionCandidate@299 }
-    <name not found> = ArrayList@300[1] { ResolutionCandidate@299 }
 }
 
-ResolutionTaskHolder@301 {
-    <name not found> = ArrayList@302[1] { ResolutionCandidate@303 }
-    <name not found> = ArrayList@304[1] { ResolutionCandidate@303 }
+ResolutionTaskHolder@300 {
+    <name not found> = ArrayList@301[1] { ResolutionCandidate@302 }
 }
 
-ResolutionTaskHolder@305 {
-    <name not found> = ArrayList@306[1] { ResolutionCandidate@307 }
-    <name not found> = ArrayList@308[1] { ResolutionCandidate@307 }
+ResolutionTaskHolder@303 {
+    <name not found> = ArrayList@304[1] { ResolutionCandidate@305 }
+}
+
+ResolutionTaskHolder@306 {
+    <name not found> = ArrayList@307[1] { ResolutionCandidate@308 }
 }
 
 ResolutionTaskHolder@309 {
     <name not found> = ArrayList@310[1] { ResolutionCandidate@311 }
-    <name not found> = ArrayList@312[1] { ResolutionCandidate@311 }
 }
 
-ResolutionTaskHolder@313 {
-    <name not found> = ArrayList@314[1] { ResolutionCandidate@315 }
-    <name not found> = ArrayList@316[1] { ResolutionCandidate@315 }
+ResolutionTaskHolder@312 {
+    <name not found> = ArrayList@313[1] { ResolutionCandidate@314 }
 }
 
-ResolutionTaskHolder@317 {
-    <name not found> = ArrayList@318[1] { ResolutionCandidate@319 }
-    <name not found> = ArrayList@320[1] { ResolutionCandidate@319 }
+ResolutionTaskHolder@315 {
+    <name not found> = ArrayList@316[1] { ResolutionCandidate@317 }
+}
+
+ResolutionTaskHolder@318 {
+    <name not found> = ArrayList@319[1] { ResolutionCandidate@320 }
 }
 
 ResolutionTaskHolder@321 {
     <name not found> = ArrayList@322[1] { ResolutionCandidate@323 }
-    <name not found> = ArrayList@324[1] { ResolutionCandidate@323 }
 }
 
-ResolutionTaskHolder@325 {
-    <name not found> = ArrayList@326[1] { ResolutionCandidate@327 }
-    <name not found> = ArrayList@328[1] { ResolutionCandidate@327 }
+ResolutionTaskHolder@324 {
+    <name not found> = ArrayList@325[1] { ResolutionCandidate@326 }
 }
 
-ResolutionTaskHolder@329 {
-    <name not found> = ArrayList@330[1] { ResolutionCandidate@331 }
-    <name not found> = ArrayList@332[1] { ResolutionCandidate@331 }
+ResolutionTaskHolder@327 {
+    <name not found> = ArrayList@328[1] { ResolutionCandidate@329 }
+}
+
+ResolutionTaskHolder@330 {
+    <name not found> = ArrayList@331[1] { ResolutionCandidate@332 }
 }
 
 ResolutionTaskHolder@333 {
     <name not found> = ArrayList@334[1] { ResolutionCandidate@335 }
-    <name not found> = ArrayList@336[1] { ResolutionCandidate@335 }
 }
 
-ResolutionTaskHolder@337 {
-    <name not found> = ArrayList@338[1] { ResolutionCandidate@339 }
-    <name not found> = ArrayList@340[1] { ResolutionCandidate@339 }
+ResolutionTaskHolder@336 {
+    <name not found> = ArrayList@337[1] { ResolutionCandidate@338 }
 }
 
-ResolutionTaskHolder@341 {
-    <name not found> = ArrayList@342[1] { ResolutionCandidate@343 }
-    <name not found> = ArrayList@344[1] { ResolutionCandidate@343 }
+ResolutionTaskHolder@339 {
+    <name not found> = ArrayList@340[1] { ResolutionCandidate@341 }
+}
+
+ResolutionTaskHolder@342 {
+    <name not found> = ArrayList@343[1] { ResolutionCandidate@344 }
 }
 
 ResolutionTaskHolder@345 {
     <name not found> = ArrayList@346[1] { ResolutionCandidate@347 }
-    <name not found> = ArrayList@348[1] { ResolutionCandidate@347 }
 }
 
-ResolutionTaskHolder@349 {
-    <name not found> = ArrayList@350[1] { ResolutionCandidate@351 }
-    <name not found> = ArrayList@352[1] { ResolutionCandidate@351 }
+ResolutionTaskHolder@348 {
+    <name not found> = ArrayList@349[1] { ResolutionCandidate@350 }
 }
 
-ResolutionTaskHolder@353 {
-    <name not found> = ArrayList@354[1] { ResolutionCandidate@355 }
-    <name not found> = ArrayList@356[1] { ResolutionCandidate@355 }
+ResolutionTaskHolder@351 {
+    <name not found> = ArrayList@352[1] { ResolutionCandidate@353 }
 }
 
-ResolutionTaskHolder@357 {
-    <name not found> = ArrayList@358[1] { ResolutionCandidate@359 }
-    <name not found> = ArrayList@360[1] { ResolutionCandidate@359 }
+ResolutionTaskHolder@354 {
+    <name not found> = ArrayList@355[2] { ResolutionCandidate@356, ResolutionCandidate@357 }
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
 }
 
-ResolutionTaskHolder@361 {
-    <name not found> = ArrayList@362[1] { ResolutionCandidate@363 }
-    <name not found> = ArrayList@364[1] { ResolutionCandidate@363 }
+ResolutionTaskHolder@358 {
+    <name not found> = ArrayList@359[2] { ResolutionCandidate@360, ResolutionCandidate@361 }
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
 }
 
-ResolutionTaskHolder@365 {
-    <name not found> = ArrayList@366[1] { ResolutionCandidate@367 }
-    <name not found> = ArrayList@368[1] { ResolutionCandidate@367 }
+ResolutionTaskHolder@362 {
+    <name not found> = ArrayList@363[2] { ResolutionCandidate@364, ResolutionCandidate@365 }
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
 }
 
-ResolutionTaskHolder@369 {
-    <name not found> = ArrayList@370[1] { ResolutionCandidate@371 }
-    <name not found> = ArrayList@372[1] { ResolutionCandidate@371 }
+ResolutionTaskHolder@366 {
+    <name not found> = ArrayList@367[2] { ResolutionCandidate@368, ResolutionCandidate@369 }
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
 }
 
-ResolutionTaskHolder@373 {
-    <name not found> = ArrayList@374[1] { ResolutionCandidate@375 }
-    <name not found> = ArrayList@376[1] { ResolutionCandidate@375 }
+ResolutionTaskHolder@370 {
+    <name not found> = ArrayList@371[2] { ResolutionCandidate@372, ResolutionCandidate@373 }
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
 }
 
-ResolutionTaskHolder@377 {
-    <name not found> = ArrayList@378[1] { ResolutionCandidate@379 }
-    <name not found> = ArrayList@380[1] { ResolutionCandidate@379 }
+ResolutionTaskHolder@374 {
+    <name not found> = ArrayList@375[4] { ResolutionCandidate@376, ResolutionCandidate@377, ResolutionCandidate@378, ... }
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
 }
 
-ResolutionTaskHolder@381 {
-    <name not found> = ArrayList@382[1] { ResolutionCandidate@383 }
-    <name not found> = ArrayList@384[1] { ResolutionCandidate@383 }
+ResolutionTaskHolder@379 {
+    <name not found> = ArrayList@380[4] { ResolutionCandidate@381, ResolutionCandidate@382, ResolutionCandidate@383, ... }
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
 }
 
-ResolutionTaskHolder@385 {
-    <name not found> = ArrayList@386[1] { ResolutionCandidate@387 }
-    <name not found> = ArrayList@388[1] { ResolutionCandidate@387 }
-}
-
-ResolutionTaskHolder@389 {
-    <name not found> = ArrayList@390[1] { ResolutionCandidate@391 }
-    <name not found> = ArrayList@392[1] { ResolutionCandidate@391 }
-}
-
-ResolutionTaskHolder@393 {
-    <name not found> = ArrayList@394[1] { ResolutionCandidate@395 }
-    <name not found> = ArrayList@396[1] { ResolutionCandidate@395 }
-}
-
-ResolutionTaskHolder@397 {
-    <name not found> = ArrayList@398[1] { ResolutionCandidate@399 }
-    <name not found> = ArrayList@400[1] { ResolutionCandidate@399 }
-}
-
-ResolutionTaskHolder@401 {
-    <name not found> = ArrayList@402[1] { ResolutionCandidate@403 }
-    <name not found> = ArrayList@404[1] { ResolutionCandidate@403 }
-}
-
-ResolutionTaskHolder@405 {
-    <name not found> = ArrayList@406[1] { ResolutionCandidate@407 }
-    <name not found> = ArrayList@408[1] { ResolutionCandidate@407 }
-}
-
-ResolutionTaskHolder@409 {
-    <name not found> = ArrayList@410[1] { ResolutionCandidate@411 }
-    <name not found> = ArrayList@412[1] { ResolutionCandidate@411 }
-}
-
-ResolutionTaskHolder@413 {
-    <name not found> = ArrayList@414[1] { ResolutionCandidate@415 }
-    <name not found> = ArrayList@416[1] { ResolutionCandidate@415 }
-}
-
-ResolutionTaskHolder@417 {
-    <name not found> = ArrayList@418[1] { ResolutionCandidate@419 }
-    <name not found> = ArrayList@420[1] { ResolutionCandidate@419 }
-}
-
-ResolutionTaskHolder@421 {
-    <name not found> = ArrayList@422[1] { ResolutionCandidate@423 }
-    <name not found> = ArrayList@424[1] { ResolutionCandidate@423 }
-}
-
-ResolutionTaskHolder@425 {
-    <name not found> = ArrayList@426[1] { ResolutionCandidate@427 }
-    <name not found> = ArrayList@428[1] { ResolutionCandidate@427 }
-}
-
-ResolutionTaskHolder@429 {
-    <name not found> = ArrayList@430[1] { ResolutionCandidate@431 }
-    <name not found> = ArrayList@432[1] { ResolutionCandidate@431 }
-}
-
-ResolutionTaskHolder@433 {
-    <name not found> = ArrayList@434[1] { ResolutionCandidate@435 }
-    <name not found> = ArrayList@436[1] { ResolutionCandidate@435 }
-}
-
-ResolutionTaskHolder@437 {
-    <name not found> = ArrayList@438[2] { ResolutionCandidate@439, ResolutionCandidate@440 }
-    <name not found> = ArrayList@441[2] { ResolutionCandidate@439, ResolutionCandidate@440 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@442 {
-    <name not found> = ArrayList@443[2] { ResolutionCandidate@444, ResolutionCandidate@445 }
-    <name not found> = ArrayList@446[2] { ResolutionCandidate@444, ResolutionCandidate@445 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@447 {
-    <name not found> = ArrayList@448[2] { ResolutionCandidate@449, ResolutionCandidate@450 }
-    <name not found> = ArrayList@451[2] { ResolutionCandidate@449, ResolutionCandidate@450 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@452 {
-    <name not found> = ArrayList@453[2] { ResolutionCandidate@454, ResolutionCandidate@455 }
-    <name not found> = ArrayList@456[2] { ResolutionCandidate@454, ResolutionCandidate@455 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@457 {
-    <name not found> = ArrayList@458[2] { ResolutionCandidate@459, ResolutionCandidate@460 }
-    <name not found> = ArrayList@461[2] { ResolutionCandidate@459, ResolutionCandidate@460 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@462 {
-    <name not found> = ArrayList@463[4] { ResolutionCandidate@464, ResolutionCandidate@465, ResolutionCandidate@466, ... }
-    <name not found> = ArrayList@467[5] { ResolutionCandidate@464, ResolutionCandidate@465, ResolutionCandidate@466, ... }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@468 {
-    <name not found> = ArrayList@469[4] { ResolutionCandidate@470, ResolutionCandidate@471, ResolutionCandidate@472, ... }
-    <name not found> = ArrayList@473[5] { ResolutionCandidate@470, ResolutionCandidate@471, ResolutionCandidate@472, ... }
+null {
+    <name not found> = ArrayList@384[1] { ResolutionCandidate@248 }
+    <name not found> = ArrayList@385[1] { ResolutionCandidate@335 }
+    <name not found> = ArrayList@386[1] { ResolutionCandidate@287 }
+    <name not found> = ArrayList@387[1] { ResolutionCandidate@227 }
+    <name not found> = ArrayList@388[1] { ResolutionCandidate@233 }
+    <name not found> = ArrayList@389[1] { ResolutionCandidate@314 }
+    <name not found> = ArrayList@390[1] { ResolutionCandidate@164 }
+    <name not found> = ArrayList@391[1] { ResolutionCandidate@155 }
+    <name not found> = ArrayList@392[1] { ResolutionCandidate@113 }
+    <name not found> = ArrayList@393[1] { ResolutionCandidate@350 }
+    <name not found> = ArrayList@394[1] { ResolutionCandidate@131 }
+    <name not found> = ArrayList@395[1] { ResolutionCandidate@149 }
+    <name not found> = ArrayList@396[1] { ResolutionCandidate@221 }
+    <name not found> = ArrayList@397[1] { ResolutionCandidate@332 }
+    <name not found> = ArrayList@398[1] { ResolutionCandidate@299 }
+    <name not found> = ArrayList@399[1] { ResolutionCandidate@230 }
+    <name not found> = ArrayList@400[1] { ResolutionCandidate@308 }
+    <name not found> = ArrayList@401[1] { ResolutionCandidate@269 }
+    <name not found> = ArrayList@402[1] { ResolutionCandidate@320 }
+    <name not found> = ArrayList@403[1] { ResolutionCandidate@200 }
+    <name not found> = ArrayList@404[1] { ResolutionCandidate@125 }
+    <name not found> = ArrayList@405[1] { ResolutionCandidate@275 }
+    <name not found> = ArrayList@406[1] { ResolutionCandidate@128 }
+    <name not found> = ArrayList@407[1] { ResolutionCandidate@326 }
+    <name not found> = ArrayList@408[1] { ResolutionCandidate@209 }
+    <name not found> = ArrayList@409[1] { ResolutionCandidate@311 }
+    <name not found> = ArrayList@410[1] { ResolutionCandidate@197 }
+    <name not found> = ArrayList@411[1] { ResolutionCandidate@137 }
+    <name not found> = ArrayList@412[1] { ResolutionCandidate@242 }
+    <name not found> = ArrayList@413[1] { ResolutionCandidate@161 }
+    <name not found> = ArrayList@414[1] { ResolutionCandidate@188 }
+    <name not found> = ArrayList@415[1] { ResolutionCandidate@245 }
+    <name not found> = ArrayList@416[1] { ResolutionCandidate@257 }
+    <name not found> = ArrayList@417[1] { ResolutionCandidate@305 }
+    <name not found> = ArrayList@418[1] { ResolutionCandidate@338 }
+    <name not found> = ArrayList@419[1] { ResolutionCandidate@212 }
+    <name not found> = ArrayList@420[1] { ResolutionCandidate@290 }
+    <name not found> = ArrayList@421[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@422[1] { ResolutionCandidate@302 }
+    <name not found> = ArrayList@423[1] { ResolutionCandidate@140 }
+    <name not found> = ArrayList@424[1] { ResolutionCandidate@143 }
+    <name not found> = ArrayList@425[1] { ResolutionCandidate@191 }
+    <name not found> = ArrayList@426[1] { ResolutionCandidate@347 }
+    <name not found> = ArrayList@427[1] { ResolutionCandidate@122 }
+    <name not found> = ArrayList@428[1] { ResolutionCandidate@218 }
+    <name not found> = ArrayList@429[1] { ResolutionCandidate@215 }
+    <name not found> = ArrayList@430[1] { ResolutionCandidate@266 }
+    <name not found> = ArrayList@431[1] { ResolutionCandidate@254 }
+    <name not found> = ArrayList@432[1] { ResolutionCandidate@182 }
+    <name not found> = ArrayList@433[1] { ResolutionCandidate@278 }
+    <name not found> = ArrayList@434[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@435[1] { ResolutionCandidate@353 }
+    <name not found> = ArrayList@436[1] { ResolutionCandidate@167 }
+    <name not found> = ArrayList@437[1] { ResolutionCandidate@281 }
+    <name not found> = ArrayList@438[1] { ResolutionCandidate@260 }
+    <name not found> = ArrayList@439[1] { ResolutionCandidate@176 }
+    <name not found> = ArrayList@440[1] { ResolutionCandidate@272 }
+    <name not found> = ArrayList@441[1] { ResolutionCandidate@323 }
+    <name not found> = ArrayList@442[1] { ResolutionCandidate@152 }
+    <name not found> = ArrayList@443[1] { ResolutionCandidate@341 }
+    <name not found> = ArrayList@444[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@445[1] { ResolutionCandidate@263 }
+    <name not found> = ArrayList@446[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@447[1] { ResolutionCandidate@293 }
+    <name not found> = ArrayList@448[1] { ResolutionCandidate@206 }
+    <name not found> = ArrayList@449[1] { ResolutionCandidate@344 }
+    <name not found> = ArrayList@450[1] { ResolutionCandidate@179 }
+    <name not found> = ArrayList@451[1] { ResolutionCandidate@236 }
+    <name not found> = ArrayList@452[1] { ResolutionCandidate@329 }
+    <name not found> = ArrayList@453[1] { ResolutionCandidate@194 }
+    <name not found> = ArrayList@454[1] { ResolutionCandidate@239 }
+    <name not found> = ArrayList@455[1] { ResolutionCandidate@296 }
+    <name not found> = ArrayList@456[1] { ResolutionCandidate@170 }
+    <name not found> = ArrayList@457[1] { ResolutionCandidate@317 }
+    <name not found> = ArrayList@458[1] { ResolutionCandidate@146 }
+    <name not found> = ArrayList@459[1] { ResolutionCandidate@284 }
+    <name not found> = ArrayList@460[1] { ResolutionCandidate@134 }
+    <name not found> = ArrayList@461[1] { ResolutionCandidate@251 }
+    <name not found> = ArrayList@462[1] { ResolutionCandidate@173 }
+    <name not found> = ArrayList@463[1] { ResolutionCandidate@203 }
+    <name not found> = ArrayList@464[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@465[1] { ResolutionCandidate@224 }
+    <name not found> = ArrayList@466[1] { ResolutionCandidate@185 }
+    <name not found> = ArrayList@467[2] { ResolutionCandidate@364, ResolutionCandidate@365 }
+    <name not found> = ArrayList@468[2] { ResolutionCandidate@360, ResolutionCandidate@361 }
+    <name not found> = ArrayList@469[2] { ResolutionCandidate@372, ResolutionCandidate@373 }
+    <name not found> = ArrayList@470[2] { ResolutionCandidate@356, ResolutionCandidate@357 }
+    <name not found> = ArrayList@471[2] { ResolutionCandidate@368, ResolutionCandidate@369 }
+    <name not found> = ArrayList@472[5] { ResolutionCandidate@381, ResolutionCandidate@382, ResolutionCandidate@383, ... }
+    <name not found> = ArrayList@473[5] { ResolutionCandidate@376, ResolutionCandidate@377, ResolutionCandidate@378, ... }
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
     <name not found> = EmptyList@93[empty]
diff --git a/compiler/testData/diagnostics/tests/inference/nestedCalls/checkTypesForQualifiedProperties.lazy.log b/compiler/testData/diagnostics/tests/inference/nestedCalls/checkTypesForQualifiedProperties.lazy.log
index 2cea47d3fae..21c9d60583b 100644
--- a/compiler/testData/diagnostics/tests/inference/nestedCalls/checkTypesForQualifiedProperties.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/nestedCalls/checkTypesForQualifiedProperties.lazy.log
@@ -40,10 +40,6 @@ LazyJavaPackageFragment@15['lang'] {
 
 ResolutionTaskHolder@34 {
     <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -61,17 +57,24 @@ ResolutionTaskHolder@34 {
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+}
+
+null {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@42 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedCallsForArraySetExpression.lazy.log b/compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedCallsForArraySetExpression.lazy.log
index 207e3256173..fd4af45666e 100644
--- a/compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedCallsForArraySetExpression.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedCallsForArraySetExpression.lazy.log
@@ -55,53 +55,56 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@41 {
     <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
+}
+
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
 }
 
 ResolutionTaskHolder@53 {
     <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
+}
+
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
 }
 
 ResolutionTaskHolder@65 {
     <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+null {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@55 }
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedCallsInference.lazy.log b/compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedCallsInference.lazy.log
index eccbc9d4706..696e8ff8205 100644
--- a/compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedCallsInference.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedCallsInference.lazy.log
@@ -133,56 +133,56 @@ LazyJavaClassifierType@105['E'] {
     arguments = ArrayList@106[empty]
     classifier = JavaTypeParameterImpl@107['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
-LazyJavaClassifierType@109['E'] {
-    arguments = ArrayList@110[empty]
-    classifier = JavaTypeParameterImpl@111['E']
+LazyJavaClassifierType@108['E'] {
+    arguments = ArrayList@109[empty]
+    classifier = JavaTypeParameterImpl@110['E']
     nullable = 'false': Boolean@82
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
-LazyJavaClassifierType@112['E'] {
-    arguments = ArrayList@113[empty]
-    classifier = JavaTypeParameterImpl@114['E']
-    nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
-}
-
-LazyJavaClassifierType@115['E'] {
-    arguments = ArrayList@116[empty]
-    classifier = JavaTypeParameterImpl@117['E']
+LazyJavaClassifierType@111['E'] {
+    arguments = ArrayList@112[empty]
+    classifier = JavaTypeParameterImpl@113['E']
     nullable = 'false': Boolean@82
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
-LazyJavaClassifierType@118['E'] {
-    arguments = ArrayList@119[empty]
-    classifier = JavaTypeParameterImpl@120['E']
+LazyJavaClassifierType@114['E'] {
+    arguments = ArrayList@115[empty]
+    classifier = JavaTypeParameterImpl@116['E']
+    nullable = 'false': Boolean@82
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+}
+
+LazyJavaClassifierType@117['E'] {
+    arguments = ArrayList@118[empty]
+    classifier = JavaTypeParameterImpl@119['E']
     nullable = 'false': Boolean@82
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
-LazyJavaClassifierType@121['E'] {
-    arguments = ArrayList@122[empty]
-    classifier = JavaTypeParameterImpl@123['E']
+LazyJavaClassifierType@120['E'] {
+    arguments = ArrayList@121[empty]
+    classifier = JavaTypeParameterImpl@122['E']
     nullable = 'false': Boolean@82
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
-LazyJavaClassifierType@124['E'] {
-    arguments = ArrayList@125[empty]
-    classifier = JavaTypeParameterImpl@126['E']
+LazyJavaClassifierType@123['E'] {
+    arguments = ArrayList@124[empty]
+    classifier = JavaTypeParameterImpl@125['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
 }
 
 LazyJavaClassifierType@127['E'] {
     arguments = ArrayList@128[empty]
     classifier = JavaTypeParameterImpl@129['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
 }
 
 LazyJavaClassifierType@130['E'] {
@@ -194,79 +194,79 @@ LazyJavaClassifierType@130['E'] {
 
 LazyJavaClassifierType@133['E'] {
     arguments = ArrayList@134[empty]
-    classifier = JavaTypeParameterImpl@120['E']
-    nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaClassifierType@135['E'] {
-    arguments = ArrayList@136[empty]
     classifier = JavaTypeParameterImpl@132['E']
     nullable = 'true': Boolean@88
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
-LazyJavaClassifierType@137['E'] {
-    arguments = ArrayList@138[empty]
-    classifier = JavaTypeParameterImpl@126['E']
-    nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-}
-
-LazyJavaClassifierType@139['E'] {
-    arguments = ArrayList@140[empty]
-    classifier = JavaTypeParameterImpl@107['E']
-    nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
-}
-
-LazyJavaClassifierType@141['E'] {
-    arguments = ArrayList@142[empty]
-    classifier = JavaTypeParameterImpl@111['E']
-    nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-}
-
-LazyJavaClassifierType@143['E'] {
-    arguments = ArrayList@144[empty]
-    classifier = JavaTypeParameterImpl@96['E']
+LazyJavaClassifierType@135['E'] {
+    arguments = ArrayList@136[empty]
+    classifier = JavaTypeParameterImpl@119['E']
     nullable = 'true': Boolean@88
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
-LazyJavaClassifierType@145['E'] {
-    arguments = ArrayList@146[empty]
+LazyJavaClassifierType@137['E'] {
+    arguments = ArrayList@138[empty]
+    classifier = JavaTypeParameterImpl@125['E']
+    nullable = 'true': Boolean@88
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
+}
+
+LazyJavaClassifierType@139['E'] {
+    arguments = ArrayList@140[empty]
     classifier = JavaTypeParameterImpl@100['E']
     nullable = 'true': Boolean@88
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
+LazyJavaClassifierType@141['E'] {
+    arguments = ArrayList@142[empty]
+    classifier = JavaTypeParameterImpl@96['E']
+    nullable = 'true': Boolean@88
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+}
+
+LazyJavaClassifierType@143['E'] {
+    arguments = ArrayList@144[empty]
+    classifier = JavaTypeParameterImpl@116['E']
+    nullable = 'true': Boolean@88
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+}
+
+LazyJavaClassifierType@145['E'] {
+    arguments = ArrayList@146[empty]
+    classifier = JavaTypeParameterImpl@129['E']
+    nullable = 'true': Boolean@88
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
+}
+
 LazyJavaClassifierType@147['E'] {
     arguments = ArrayList@148[empty]
-    classifier = JavaTypeParameterImpl@123['E']
+    classifier = JavaTypeParameterImpl@110['E']
     nullable = 'true': Boolean@88
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@149['E'] {
     arguments = ArrayList@150[empty]
-    classifier = JavaTypeParameterImpl@129['E']
+    classifier = JavaTypeParameterImpl@122['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@151['E'] {
     arguments = ArrayList@152[empty]
-    classifier = JavaTypeParameterImpl@114['E']
+    classifier = JavaTypeParameterImpl@113['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@153['E'] {
     arguments = ArrayList@154[empty]
-    classifier = JavaTypeParameterImpl@117['E']
+    classifier = JavaTypeParameterImpl@107['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@155['E'] {
@@ -390,9 +390,9 @@ LazyJavaPackageFragment@210['util'] {
     memberIndex = computeMemberIndex$1@237 // through LazyPackageFragmentScopeForJavaPackage@235
 }
 
-LazyJavaTypeParameterDescriptor@45['E'] {
+LazyJavaTypeParameterDescriptor@54['E'] {
     defaultType = JetTypeImpl@238['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
     upperBounds = LinkedHashSet@239[1] { NullableType@240 }
     upperBoundsAsType = NullableType@240
 }
@@ -404,9 +404,9 @@ LazyJavaTypeParameterDescriptor@49['E'] {
     upperBoundsAsType = NullableType@243
 }
 
-LazyJavaTypeParameterDescriptor@54['E'] {
+LazyJavaTypeParameterDescriptor@45['E'] {
     defaultType = JetTypeImpl@244['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
     upperBounds = LinkedHashSet@245[1] { NullableType@246 }
     upperBoundsAsType = NullableType@246
 }
@@ -416,44 +416,35 @@ LazyJavaTypeParameterResolver@247 {
 }
 
 LazyJavaTypeParameterResolver@249 {
-    resolve(JavaTypeParameterImpl@250['E']) = LazyJavaTypeParameterDescriptor@54['E']
+    resolve(JavaTypeParameterImpl@250['E']) = LazyJavaTypeParameterDescriptor@45['E']
 }
 
 LazyJavaTypeParameterResolver@251 {
-    resolve(JavaTypeParameterImpl@252['E']) = LazyJavaTypeParameterDescriptor@45['E']
+    resolve(JavaTypeParameterImpl@252['E']) = LazyJavaTypeParameterDescriptor@54['E']
 }
 
 LazyJavaTypeParameterResolver@253 {
-    resolve(JavaTypeParameterImpl@114['E']) = null
-}
-
-LazyJavaTypeParameterResolver@254 {
-    resolve(JavaTypeParameterImpl@132['E']) = null
-}
-
-LazyJavaTypeParameterResolver@255 {
     resolve(JavaTypeParameterImpl@129['E']) = null
 }
 
+LazyJavaTypeParameterResolver@254 {
+    resolve(JavaTypeParameterImpl@104['E']) = null
+}
+
+LazyJavaTypeParameterResolver@255 {
+    resolve(JavaTypeParameterImpl@113['E']) = null
+}
+
 LazyJavaTypeParameterResolver@256 {
-    resolve(JavaTypeParameterImpl@123['E']) = null
+    resolve(JavaTypeParameterImpl@132['E']) = null
 }
 
 LazyJavaTypeParameterResolver@257 {
-    resolve(JavaTypeParameterImpl@96['E']) = null
+    resolve(JavaTypeParameterImpl@119['E']) = null
 }
 
 ResolutionTaskHolder@258 {
     <name not found> = ArrayList@259[1] { ResolutionCandidate@260 }
-    <name not found> = ArrayList@261[1] { ResolutionCandidate@260 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
@@ -464,59 +455,71 @@ ResolutionTaskHolder@258 {
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@262 {
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@264 }
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@264 }
+ResolutionTaskHolder@261 {
+    <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
 }
 
-ResolutionTaskHolder@266 {
-    <name not found> = ArrayList@267[1] { ResolutionCandidate@268 }
-    <name not found> = ArrayList@269[1] { ResolutionCandidate@268 }
+ResolutionTaskHolder@264 {
+    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
+}
+
+ResolutionTaskHolder@267 {
+    <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
 }
 
 ResolutionTaskHolder@270 {
     <name not found> = ArrayList@271[1] { ResolutionCandidate@272 }
-    <name not found> = ArrayList@273[1] { ResolutionCandidate@272 }
 }
 
-ResolutionTaskHolder@274 {
-    <name not found> = ArrayList@275[1] { ResolutionCandidate@276 }
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@276 }
+ResolutionTaskHolder@273 {
+    <name not found> = ArrayList@274[1] { ResolutionCandidate@275 }
 }
 
-ResolutionTaskHolder@278 {
-    <name not found> = ArrayList@279[1] { ResolutionCandidate@280 }
-    <name not found> = ArrayList@281[1] { ResolutionCandidate@280 }
+ResolutionTaskHolder@276 {
+    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
+}
+
+ResolutionTaskHolder@279 {
+    <name not found> = ArrayList@280[1] { ResolutionCandidate@281 }
 }
 
 ResolutionTaskHolder@282 {
     <name not found> = ArrayList@283[1] { ResolutionCandidate@284 }
-    <name not found> = ArrayList@285[1] { ResolutionCandidate@284 }
 }
 
-ResolutionTaskHolder@286 {
-    <name not found> = ArrayList@287[1] { ResolutionCandidate@288 }
-    <name not found> = ArrayList@289[1] { ResolutionCandidate@288 }
+ResolutionTaskHolder@285 {
+    <name not found> = ArrayList@286[1] { ResolutionCandidate@287 }
 }
 
-ResolutionTaskHolder@290 {
-    <name not found> = ArrayList@291[1] { ResolutionCandidate@292 }
-    <name not found> = ArrayList@293[1] { ResolutionCandidate@292 }
+ResolutionTaskHolder@288 {
+    <name not found> = ArrayList@289[2] { ResolutionCandidate@290, ResolutionCandidate@291 }
 }
 
-ResolutionTaskHolder@294 {
-    <name not found> = ArrayList@295[1] { ResolutionCandidate@296 }
-    <name not found> = ArrayList@297[1] { ResolutionCandidate@296 }
+ResolutionTaskHolder@292 {
+    <name not found> = ArrayList@293[3] { ResolutionCandidate@294, ResolutionCandidate@295, ResolutionCandidate@296 }
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@298 {
-    <name not found> = ArrayList@299[2] { ResolutionCandidate@300, ResolutionCandidate@301 }
-    <name not found> = ArrayList@302[2] { ResolutionCandidate@300, ResolutionCandidate@301 }
-}
-
-ResolutionTaskHolder@303 {
-    <name not found> = ArrayList@304[3] { ResolutionCandidate@305, ResolutionCandidate@306, ResolutionCandidate@307 }
-    <name not found> = ArrayList@308[3] { ResolutionCandidate@305, ResolutionCandidate@306, ResolutionCandidate@307 }
+null {
+    <name not found> = ArrayList@297[1] { ResolutionCandidate@281 }
+    <name not found> = ArrayList@298[1] { ResolutionCandidate@284 }
+    <name not found> = ArrayList@299[1] { ResolutionCandidate@275 }
+    <name not found> = ArrayList@300[1] { ResolutionCandidate@272 }
+    <name not found> = ArrayList@301[1] { ResolutionCandidate@263 }
+    <name not found> = ArrayList@302[1] { ResolutionCandidate@278 }
+    <name not found> = ArrayList@303[1] { ResolutionCandidate@260 }
+    <name not found> = ArrayList@304[1] { ResolutionCandidate@287 }
+    <name not found> = ArrayList@305[1] { ResolutionCandidate@266 }
+    <name not found> = ArrayList@306[1] { ResolutionCandidate@269 }
+    <name not found> = ArrayList@307[2] { ResolutionCandidate@290, ResolutionCandidate@291 }
+    <name not found> = ArrayList@308[3] { ResolutionCandidate@294, ResolutionCandidate@295, ResolutionCandidate@296 }
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
diff --git a/compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedForVariableAsFunctionCall.lazy.log b/compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedForVariableAsFunctionCall.lazy.log
index 68647f35305..0fd8374accc 100644
--- a/compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedForVariableAsFunctionCall.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedForVariableAsFunctionCall.lazy.log
@@ -37,21 +37,21 @@ LazyJavaClassifierType@21['String'] {
 
 LazyJavaClassifierType@24['String'] {
     arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@15['String']
+    classifier = JavaClassImpl@20['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@23['String']
+    classifier = JavaClassImpl@15['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@29['String'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@20['String']
+    classifier = JavaClassImpl@23['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -157,51 +157,33 @@ LazyJavaPackageFragment@68['lang'] {
 
 ResolutionTaskHolder@95 {
     <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]
 }
 
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
-    <name not found> = EmptyList@89[empty]
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
     <name not found> = EmptyList@89[empty]
 }
 
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
+}
+
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
 }
 
 ResolutionTaskHolder@107 {
     <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
 }
 
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@113 }
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
 }
 
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@117 }
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[4] { ResolutionCandidate@121, ResolutionCandidate@122, ResolutionCandidate@123, ... }
-    <name not found> = ArrayList@124[5] { ResolutionCandidate@121, ResolutionCandidate@122, ResolutionCandidate@123, ... }
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
+ResolutionTaskHolder@113 {
+    <name not found> = ArrayList@114[4] { ResolutionCandidate@115, ResolutionCandidate@116, ResolutionCandidate@117, ... }
     <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]
@@ -212,7 +194,28 @@ ResolutionTaskHolder@119 {
     <name not found> = EmptyList@89[empty]
 }
 
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[8] { ResolutionCandidate@127, ResolutionCandidate@128, ResolutionCandidate@129, ... }
-    <name not found> = ArrayList@130[8] { ResolutionCandidate@127, ResolutionCandidate@128, ResolutionCandidate@129, ... }
+ResolutionTaskHolder@118 {
+    <name not found> = ArrayList@119[8] { ResolutionCandidate@120, ResolutionCandidate@121, ResolutionCandidate@122, ... }
+}
+
+null {
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@129[5] { ResolutionCandidate@115, ResolutionCandidate@116, ResolutionCandidate@117, ... }
+    <name not found> = ArrayList@130[8] { ResolutionCandidate@120, ResolutionCandidate@121, ResolutionCandidate@122, ... }
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inference/nestedCalls/inferenceForNestedBinaryCall.lazy.log b/compiler/testData/diagnostics/tests/inference/nestedCalls/inferenceForNestedBinaryCall.lazy.log
index c426e9b5b97..795c58ec125 100644
--- a/compiler/testData/diagnostics/tests/inference/nestedCalls/inferenceForNestedBinaryCall.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/nestedCalls/inferenceForNestedBinaryCall.lazy.log
@@ -39,33 +39,36 @@ LazyJavaPackageFragment@14['lang'] {
 
 ResolutionTaskHolder@32 {
     <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
+}
+
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
 }
 
 ResolutionTaskHolder@44 {
     <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+null {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@40 }
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inference/nestedCalls/kt3395.lazy.log b/compiler/testData/diagnostics/tests/inference/nestedCalls/kt3395.lazy.log
index d6970d0bbca..e1c1d58f2ef 100644
--- a/compiler/testData/diagnostics/tests/inference/nestedCalls/kt3395.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/nestedCalls/kt3395.lazy.log
@@ -100,14 +100,14 @@ LazyJavaClassifierType@68['E'] {
     arguments = ArrayList@69[empty]
     classifier = JavaTypeParameterImpl@70['E']
     nullable = 'false': Boolean@55
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@71
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
 }
 
-LazyJavaClassifierType@72['E'] {
-    arguments = ArrayList@73[empty]
-    classifier = JavaTypeParameterImpl@74['E']
+LazyJavaClassifierType@71['E'] {
+    arguments = ArrayList@72[empty]
+    classifier = JavaTypeParameterImpl@73['E']
     nullable = 'false': Boolean@55
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
 }
 
 LazyJavaClassifierType@75['E'] {
@@ -119,14 +119,14 @@ LazyJavaClassifierType@75['E'] {
 
 LazyJavaClassifierType@78['E'] {
     arguments = ArrayList@79[empty]
-    classifier = JavaTypeParameterImpl@70['E']
+    classifier = JavaTypeParameterImpl@73['E']
     nullable = 'true': Boolean@61
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@71
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
 }
 
 LazyJavaClassifierType@80['E'] {
     arguments = ArrayList@81[empty]
-    classifier = JavaTypeParameterImpl@66['E']
+    classifier = JavaTypeParameterImpl@70['E']
     nullable = 'true': Boolean@61
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
 }
@@ -140,7 +140,7 @@ LazyJavaClassifierType@82['E'] {
 
 LazyJavaClassifierType@84['E'] {
     arguments = ArrayList@85[empty]
-    classifier = JavaTypeParameterImpl@74['E']
+    classifier = JavaTypeParameterImpl@66['E']
     nullable = 'true': Boolean@61
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
 }
@@ -194,7 +194,7 @@ LazyJavaClassifierType@104['String'] {
 
 LazyJavaClassifierType@107['String'] {
     arguments = ArrayList@108[empty]
-    classifier = JavaClassImpl@106['String']
+    classifier = JavaClassImpl@103['String']
     nullable = 'true': Boolean@61
     typeConstructor = DeserializedClassTypeConstructor@100
 }
@@ -208,7 +208,7 @@ LazyJavaClassifierType@109['String'] {
 
 LazyJavaClassifierType@111['String'] {
     arguments = ArrayList@112[empty]
-    classifier = JavaClassImpl@103['String']
+    classifier = JavaClassImpl@106['String']
     nullable = 'true': Boolean@61
     typeConstructor = DeserializedClassTypeConstructor@100
 }
@@ -236,14 +236,14 @@ LazyJavaClassifierType@120['Throwable'] {
 
 LazyJavaClassifierType@123['Throwable'] {
     arguments = ArrayList@124[empty]
-    classifier = JavaClassImpl@122['Throwable']
+    classifier = JavaClassImpl@119['Throwable']
     nullable = 'true': Boolean@61
     typeConstructor = DeserializedClassTypeConstructor@116
 }
 
 LazyJavaClassifierType@125['Throwable'] {
     arguments = ArrayList@126[empty]
-    classifier = JavaClassImpl@119['Throwable']
+    classifier = JavaClassImpl@122['Throwable']
     nullable = 'true': Boolean@61
     typeConstructor = DeserializedClassTypeConstructor@116
 }
@@ -366,7 +366,7 @@ LazyJavaTypeParameterDescriptor@35['E'] {
 }
 
 LazyJavaTypeParameterDescriptor@30['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@71
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
 }
 
 LazyJavaTypeParameterResolver@217 {
@@ -374,145 +374,99 @@ LazyJavaTypeParameterResolver@217 {
 }
 
 LazyJavaTypeParameterResolver@219 {
-    resolve(JavaTypeParameterImpl@70['E']) = LazyJavaTypeParameterDescriptor@30['E']
+    resolve(JavaTypeParameterImpl@73['E']) = LazyJavaTypeParameterDescriptor@30['E']
 }
 
 ResolutionTaskHolder@220 {
     <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@222 }
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
     <name not found> = EmptyList@198[empty]
     <name not found> = EmptyList@198[empty]
 }
 
-ResolutionTaskHolder@224 {
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@226 }
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@226 }
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
+ResolutionTaskHolder@223 {
+    <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
     <name not found> = EmptyList@198[empty]
     <name not found> = EmptyList@198[empty]
 }
 
-ResolutionTaskHolder@228 {
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@230 }
+ResolutionTaskHolder@226 {
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
     <name not found> = EmptyList@198[empty]
     <name not found> = EmptyList@198[empty]
+}
+
+ResolutionTaskHolder@229 {
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
     <name not found> = EmptyList@198[empty]
     <name not found> = EmptyList@198[empty]
 }
 
 ResolutionTaskHolder@232 {
     <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@234 }
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
     <name not found> = EmptyList@198[empty]
     <name not found> = EmptyList@198[empty]
 }
 
-ResolutionTaskHolder@236 {
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@238 }
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@238 }
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
+ResolutionTaskHolder@235 {
+    <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
     <name not found> = EmptyList@198[empty]
     <name not found> = EmptyList@198[empty]
 }
 
-ResolutionTaskHolder@240 {
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
-    <name not found> = ArrayList@243[1] { ResolutionCandidate@242 }
+ResolutionTaskHolder@238 {
+    <name not found> = ArrayList@239[1] { ResolutionCandidate@240 }
     <name not found> = EmptyList@198[empty]
     <name not found> = EmptyList@198[empty]
+}
+
+ResolutionTaskHolder@241 {
+    <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
     <name not found> = EmptyList@198[empty]
     <name not found> = EmptyList@198[empty]
 }
 
 ResolutionTaskHolder@244 {
     <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@246 }
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
     <name not found> = EmptyList@198[empty]
     <name not found> = EmptyList@198[empty]
 }
 
-ResolutionTaskHolder@248 {
-    <name not found> = ArrayList@249[1] { ResolutionCandidate@250 }
-    <name not found> = ArrayList@251[1] { ResolutionCandidate@250 }
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
+ResolutionTaskHolder@247 {
+    <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
 }
 
-ResolutionTaskHolder@252 {
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
-    <name not found> = ArrayList@255[1] { ResolutionCandidate@254 }
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
+ResolutionTaskHolder@250 {
+    <name not found> = ArrayList@251[1] { ResolutionCandidate@252 }
+}
+
+ResolutionTaskHolder@253 {
+    <name not found> = ArrayList@254[1] { ResolutionCandidate@255 }
 }
 
 ResolutionTaskHolder@256 {
     <name not found> = ArrayList@257[1] { ResolutionCandidate@258 }
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@258 }
 }
 
-ResolutionTaskHolder@260 {
-    <name not found> = ArrayList@261[1] { ResolutionCandidate@262 }
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@262 }
+ResolutionTaskHolder@259 {
+    <name not found> = ArrayList@260[1] { ResolutionCandidate@261 }
 }
 
-ResolutionTaskHolder@264 {
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
-    <name not found> = ArrayList@267[1] { ResolutionCandidate@266 }
+ResolutionTaskHolder@262 {
+    <name not found> = ArrayList@263[1] { ResolutionCandidate@264 }
+}
+
+ResolutionTaskHolder@265 {
+    <name not found> = ArrayList@266[1] { ResolutionCandidate@267 }
 }
 
 ResolutionTaskHolder@268 {
-    <name not found> = ArrayList@269[1] { ResolutionCandidate@270 }
-    <name not found> = ArrayList@271[1] { ResolutionCandidate@270 }
-}
-
-ResolutionTaskHolder@272 {
-    <name not found> = ArrayList@273[1] { ResolutionCandidate@274 }
-    <name not found> = ArrayList@275[1] { ResolutionCandidate@274 }
-}
-
-ResolutionTaskHolder@276 {
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
-    <name not found> = ArrayList@279[1] { ResolutionCandidate@278 }
-}
-
-ResolutionTaskHolder@280 {
-    <name not found> = ArrayList@281[1] { ResolutionCandidate@282 }
-    <name not found> = ArrayList@283[1] { ResolutionCandidate@282 }
-}
-
-ResolutionTaskHolder@284 {
-    <name not found> = ArrayList@285[3] { ResolutionCandidate@286, ResolutionCandidate@287, ResolutionCandidate@288 }
-    <name not found> = ArrayList@289[3] { ResolutionCandidate@286, ResolutionCandidate@287, ResolutionCandidate@288 }
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
+    <name not found> = ArrayList@269[3] { ResolutionCandidate@270, ResolutionCandidate@271, ResolutionCandidate@272 }
     <name not found> = EmptyList@198[empty]
     <name not found> = EmptyList@198[empty]
 }
 
-ResolutionTaskHolder@290 {
-    <name not found> = ArrayList@291[4] { ResolutionCandidate@292, ResolutionCandidate@293, ResolutionCandidate@294, ... }
-    <name not found> = ArrayList@295[5] { ResolutionCandidate@292, ResolutionCandidate@293, ResolutionCandidate@294, ... }
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
+ResolutionTaskHolder@273 {
+    <name not found> = ArrayList@274[4] { ResolutionCandidate@275, ResolutionCandidate@276, ResolutionCandidate@277, ... }
     <name not found> = EmptyList@198[empty]
     <name not found> = EmptyList@198[empty]
     <name not found> = EmptyList@198[empty]
@@ -523,18 +477,67 @@ ResolutionTaskHolder@290 {
     <name not found> = EmptyList@198[empty]
 }
 
-ResolutionTaskHolder@296 {
-    <name not found> = ArrayList@297[4] { ResolutionCandidate@298, ResolutionCandidate@299, ResolutionCandidate@300, ... }
-    <name not found> = ArrayList@301[5] { ResolutionCandidate@298, ResolutionCandidate@299, ResolutionCandidate@300, ... }
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
+ResolutionTaskHolder@278 {
+    <name not found> = ArrayList@279[4] { ResolutionCandidate@280, ResolutionCandidate@281, ResolutionCandidate@282, ... }
     <name not found> = EmptyList@198[empty]
     <name not found> = EmptyList@198[empty]
 }
 
-ResolutionTaskHolder@302 {
-    <name not found> = ArrayList@303[4] { ResolutionCandidate@304, ResolutionCandidate@305, ResolutionCandidate@306, ... }
-    <name not found> = ArrayList@307[5] { ResolutionCandidate@304, ResolutionCandidate@305, ResolutionCandidate@306, ... }
+ResolutionTaskHolder@283 {
+    <name not found> = ArrayList@284[4] { ResolutionCandidate@285, ResolutionCandidate@286, ResolutionCandidate@287, ... }
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
+}
+
+null {
+    <name not found> = ArrayList@288[1] { ResolutionCandidate@255 }
+    <name not found> = ArrayList@289[1] { ResolutionCandidate@222 }
+    <name not found> = ArrayList@290[1] { ResolutionCandidate@234 }
+    <name not found> = ArrayList@291[1] { ResolutionCandidate@240 }
+    <name not found> = ArrayList@292[1] { ResolutionCandidate@264 }
+    <name not found> = ArrayList@293[1] { ResolutionCandidate@243 }
+    <name not found> = ArrayList@294[1] { ResolutionCandidate@249 }
+    <name not found> = ArrayList@295[1] { ResolutionCandidate@228 }
+    <name not found> = ArrayList@296[1] { ResolutionCandidate@231 }
+    <name not found> = ArrayList@297[1] { ResolutionCandidate@258 }
+    <name not found> = ArrayList@298[1] { ResolutionCandidate@246 }
+    <name not found> = ArrayList@299[1] { ResolutionCandidate@252 }
+    <name not found> = ArrayList@300[1] { ResolutionCandidate@261 }
+    <name not found> = ArrayList@301[1] { ResolutionCandidate@225 }
+    <name not found> = ArrayList@302[1] { ResolutionCandidate@267 }
+    <name not found> = ArrayList@303[1] { ResolutionCandidate@237 }
+    <name not found> = ArrayList@304[3] { ResolutionCandidate@270, ResolutionCandidate@271, ResolutionCandidate@272 }
+    <name not found> = ArrayList@305[5] { ResolutionCandidate@280, ResolutionCandidate@281, ResolutionCandidate@282, ... }
+    <name not found> = ArrayList@306[5] { ResolutionCandidate@275, ResolutionCandidate@276, ResolutionCandidate@277, ... }
+    <name not found> = ArrayList@307[5] { ResolutionCandidate@285, ResolutionCandidate@286, ResolutionCandidate@287, ... }
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
     <name not found> = EmptyList@198[empty]
     <name not found> = EmptyList@198[empty]
     <name not found> = EmptyList@198[empty]
diff --git a/compiler/testData/diagnostics/tests/inference/nestedCalls/kt3461checkTypes.lazy.log b/compiler/testData/diagnostics/tests/inference/nestedCalls/kt3461checkTypes.lazy.log
index 76c65e424bc..c0bc9aaa5a9 100644
--- a/compiler/testData/diagnostics/tests/inference/nestedCalls/kt3461checkTypes.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/nestedCalls/kt3461checkTypes.lazy.log
@@ -37,10 +37,6 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -58,12 +54,8 @@ ResolutionTaskHolder@31 {
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -81,25 +73,36 @@ ResolutionTaskHolder@35 {
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
 }
 
 ResolutionTaskHolder@43 {
     <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+null {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@36 }
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inference/nestedCalls/makeNullableIfSafeCall.lazy.log b/compiler/testData/diagnostics/tests/inference/nestedCalls/makeNullableIfSafeCall.lazy.log
index 4f35502edc0..7a1269292f3 100644
--- a/compiler/testData/diagnostics/tests/inference/nestedCalls/makeNullableIfSafeCall.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/nestedCalls/makeNullableIfSafeCall.lazy.log
@@ -44,386 +44,389 @@ LazyJavaPackageFragment@15['lang'] {
 
 ResolutionTaskHolder@36 {
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
 ResolutionTaskHolder@48 {
     <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+}
+
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
 }
 
 ResolutionTaskHolder@60 {
     <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
+}
+
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
 }
 
 ResolutionTaskHolder@72 {
     <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
 }
 
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
+}
+
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
 }
 
 ResolutionTaskHolder@84 {
     <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
 }
 
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
+}
+
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
 }
 
 ResolutionTaskHolder@96 {
     <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
 }
 
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
+}
+
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
 }
 
 ResolutionTaskHolder@108 {
     <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
 }
 
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
+ResolutionTaskHolder@111 {
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
 }
 
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
+}
+
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
 }
 
 ResolutionTaskHolder@120 {
     <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
 }
 
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@126 }
+ResolutionTaskHolder@123 {
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
 }
 
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
+ResolutionTaskHolder@126 {
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
+}
+
+ResolutionTaskHolder@129 {
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
 }
 
 ResolutionTaskHolder@132 {
     <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
 }
 
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
+ResolutionTaskHolder@135 {
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
 }
 
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
+ResolutionTaskHolder@138 {
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
+}
+
+ResolutionTaskHolder@141 {
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
 }
 
 ResolutionTaskHolder@144 {
     <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
 }
 
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
+ResolutionTaskHolder@147 {
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
 }
 
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
+ResolutionTaskHolder@150 {
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
+}
+
+ResolutionTaskHolder@153 {
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
 }
 
 ResolutionTaskHolder@156 {
     <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
 }
 
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@162 }
+ResolutionTaskHolder@159 {
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
 }
 
-ResolutionTaskHolder@164 {
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@166 }
+ResolutionTaskHolder@162 {
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
+}
+
+ResolutionTaskHolder@165 {
+    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
 }
 
 ResolutionTaskHolder@168 {
     <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@170 }
 }
 
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@174 }
+ResolutionTaskHolder@171 {
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
 }
 
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@178 }
+ResolutionTaskHolder@174 {
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
+}
+
+ResolutionTaskHolder@177 {
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
 }
 
 ResolutionTaskHolder@180 {
     <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@182 }
 }
 
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@186 }
+ResolutionTaskHolder@183 {
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
 }
 
-ResolutionTaskHolder@188 {
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@190 }
+ResolutionTaskHolder@186 {
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
+}
+
+ResolutionTaskHolder@189 {
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
 }
 
 ResolutionTaskHolder@192 {
     <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@194 }
 }
 
-ResolutionTaskHolder@196 {
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@198 }
+ResolutionTaskHolder@195 {
+    <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
 }
 
-ResolutionTaskHolder@200 {
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@202 }
+ResolutionTaskHolder@198 {
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
+}
+
+ResolutionTaskHolder@201 {
+    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
 }
 
 ResolutionTaskHolder@204 {
     <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@206 }
 }
 
-ResolutionTaskHolder@208 {
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@210 }
+ResolutionTaskHolder@207 {
+    <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
 }
 
-ResolutionTaskHolder@212 {
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@214 }
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@214 }
+ResolutionTaskHolder@210 {
+    <name not found> = ArrayList@211[1] { ResolutionCandidate@212 }
+}
+
+ResolutionTaskHolder@213 {
+    <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
 }
 
 ResolutionTaskHolder@216 {
     <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@218 }
 }
 
-ResolutionTaskHolder@220 {
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@222 }
+ResolutionTaskHolder@219 {
+    <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
 }
 
-ResolutionTaskHolder@224 {
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@226 }
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@226 }
+ResolutionTaskHolder@222 {
+    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
+}
+
+ResolutionTaskHolder@225 {
+    <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
 }
 
 ResolutionTaskHolder@228 {
     <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@230 }
 }
 
-ResolutionTaskHolder@232 {
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@234 }
+ResolutionTaskHolder@231 {
+    <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
 }
 
-ResolutionTaskHolder@236 {
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@238 }
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@238 }
+ResolutionTaskHolder@234 {
+    <name not found> = ArrayList@235[1] { ResolutionCandidate@236 }
+}
+
+ResolutionTaskHolder@237 {
+    <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
 }
 
 ResolutionTaskHolder@240 {
     <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
-    <name not found> = ArrayList@243[1] { ResolutionCandidate@242 }
 }
 
-ResolutionTaskHolder@244 {
-    <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@246 }
+ResolutionTaskHolder@243 {
+    <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
 }
 
-ResolutionTaskHolder@248 {
-    <name not found> = ArrayList@249[1] { ResolutionCandidate@250 }
-    <name not found> = ArrayList@251[1] { ResolutionCandidate@250 }
+ResolutionTaskHolder@246 {
+    <name not found> = ArrayList@247[1] { ResolutionCandidate@248 }
+}
+
+ResolutionTaskHolder@249 {
+    <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
 }
 
 ResolutionTaskHolder@252 {
     <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
-    <name not found> = ArrayList@255[1] { ResolutionCandidate@254 }
 }
 
-ResolutionTaskHolder@256 {
-    <name not found> = ArrayList@257[1] { ResolutionCandidate@258 }
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@258 }
+ResolutionTaskHolder@255 {
+    <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
 }
 
-ResolutionTaskHolder@260 {
-    <name not found> = ArrayList@261[1] { ResolutionCandidate@262 }
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@262 }
-}
-
-ResolutionTaskHolder@264 {
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
-    <name not found> = ArrayList@267[1] { ResolutionCandidate@266 }
-}
-
-ResolutionTaskHolder@268 {
-    <name not found> = ArrayList@269[1] { ResolutionCandidate@270 }
-    <name not found> = ArrayList@271[1] { ResolutionCandidate@270 }
-}
-
-ResolutionTaskHolder@272 {
-    <name not found> = ArrayList@273[1] { ResolutionCandidate@274 }
-    <name not found> = ArrayList@275[1] { ResolutionCandidate@274 }
-}
-
-ResolutionTaskHolder@276 {
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
-    <name not found> = ArrayList@279[1] { ResolutionCandidate@278 }
-}
-
-ResolutionTaskHolder@280 {
-    <name not found> = ArrayList@281[1] { ResolutionCandidate@282 }
-    <name not found> = ArrayList@283[1] { ResolutionCandidate@282 }
-}
-
-ResolutionTaskHolder@284 {
-    <name not found> = ArrayList@285[1] { ResolutionCandidate@286 }
-    <name not found> = ArrayList@287[1] { ResolutionCandidate@286 }
-}
-
-ResolutionTaskHolder@288 {
-    <name not found> = ArrayList@289[1] { ResolutionCandidate@290 }
-    <name not found> = ArrayList@291[1] { ResolutionCandidate@290 }
-}
-
-ResolutionTaskHolder@292 {
-    <name not found> = ArrayList@293[1] { ResolutionCandidate@294 }
-    <name not found> = ArrayList@295[1] { ResolutionCandidate@294 }
-}
-
-ResolutionTaskHolder@296 {
-    <name not found> = ArrayList@297[1] { ResolutionCandidate@298 }
-    <name not found> = ArrayList@299[1] { ResolutionCandidate@298 }
-}
-
-ResolutionTaskHolder@300 {
-    <name not found> = ArrayList@301[1] { ResolutionCandidate@302 }
-    <name not found> = ArrayList@303[1] { ResolutionCandidate@302 }
-}
-
-ResolutionTaskHolder@304 {
-    <name not found> = ArrayList@305[1] { ResolutionCandidate@306 }
-    <name not found> = ArrayList@307[1] { ResolutionCandidate@306 }
-}
-
-ResolutionTaskHolder@308 {
-    <name not found> = ArrayList@309[1] { ResolutionCandidate@310 }
-    <name not found> = ArrayList@311[1] { ResolutionCandidate@310 }
-}
-
-ResolutionTaskHolder@312 {
-    <name not found> = ArrayList@313[1] { ResolutionCandidate@314 }
-    <name not found> = ArrayList@315[1] { ResolutionCandidate@314 }
-}
-
-ResolutionTaskHolder@316 {
-    <name not found> = ArrayList@317[1] { ResolutionCandidate@318 }
-    <name not found> = ArrayList@319[1] { ResolutionCandidate@318 }
-}
-
-ResolutionTaskHolder@320 {
-    <name not found> = ArrayList@321[1] { ResolutionCandidate@322 }
-    <name not found> = ArrayList@323[1] { ResolutionCandidate@322 }
-}
-
-ResolutionTaskHolder@324 {
-    <name not found> = ArrayList@325[1] { ResolutionCandidate@326 }
-    <name not found> = ArrayList@327[1] { ResolutionCandidate@326 }
-}
-
-ResolutionTaskHolder@328 {
-    <name not found> = ArrayList@329[1] { ResolutionCandidate@330 }
-    <name not found> = ArrayList@331[1] { ResolutionCandidate@330 }
+null {
+    <name not found> = ArrayList@258[1] { ResolutionCandidate@170 }
+    <name not found> = ArrayList@259[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@260[1] { ResolutionCandidate@209 }
+    <name not found> = ArrayList@261[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@262[1] { ResolutionCandidate@257 }
+    <name not found> = ArrayList@263[1] { ResolutionCandidate@230 }
+    <name not found> = ArrayList@264[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@265[1] { ResolutionCandidate@146 }
+    <name not found> = ArrayList@266[1] { ResolutionCandidate@215 }
+    <name not found> = ArrayList@267[1] { ResolutionCandidate@191 }
+    <name not found> = ArrayList@268[1] { ResolutionCandidate@233 }
+    <name not found> = ArrayList@269[1] { ResolutionCandidate@122 }
+    <name not found> = ArrayList@270[1] { ResolutionCandidate@125 }
+    <name not found> = ArrayList@271[1] { ResolutionCandidate@152 }
+    <name not found> = ArrayList@272[1] { ResolutionCandidate@206 }
+    <name not found> = ArrayList@273[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@274[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@275[1] { ResolutionCandidate@254 }
+    <name not found> = ArrayList@276[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@277[1] { ResolutionCandidate@179 }
+    <name not found> = ArrayList@278[1] { ResolutionCandidate@173 }
+    <name not found> = ArrayList@279[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@280[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@281[1] { ResolutionCandidate@149 }
+    <name not found> = ArrayList@282[1] { ResolutionCandidate@227 }
+    <name not found> = ArrayList@283[1] { ResolutionCandidate@200 }
+    <name not found> = ArrayList@284[1] { ResolutionCandidate@137 }
+    <name not found> = ArrayList@285[1] { ResolutionCandidate@155 }
+    <name not found> = ArrayList@286[1] { ResolutionCandidate@245 }
+    <name not found> = ArrayList@287[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@288[1] { ResolutionCandidate@242 }
+    <name not found> = ArrayList@289[1] { ResolutionCandidate@236 }
+    <name not found> = ArrayList@290[1] { ResolutionCandidate@248 }
+    <name not found> = ArrayList@291[1] { ResolutionCandidate@221 }
+    <name not found> = ArrayList@292[1] { ResolutionCandidate@182 }
+    <name not found> = ArrayList@293[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@294[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@295[1] { ResolutionCandidate@185 }
+    <name not found> = ArrayList@296[1] { ResolutionCandidate@239 }
+    <name not found> = ArrayList@297[1] { ResolutionCandidate@194 }
+    <name not found> = ArrayList@298[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@299[1] { ResolutionCandidate@224 }
+    <name not found> = ArrayList@300[1] { ResolutionCandidate@131 }
+    <name not found> = ArrayList@301[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@302[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@303[1] { ResolutionCandidate@203 }
+    <name not found> = ArrayList@304[1] { ResolutionCandidate@167 }
+    <name not found> = ArrayList@305[1] { ResolutionCandidate@251 }
+    <name not found> = ArrayList@306[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@307[1] { ResolutionCandidate@176 }
+    <name not found> = ArrayList@308[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@309[1] { ResolutionCandidate@218 }
+    <name not found> = ArrayList@310[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@311[1] { ResolutionCandidate@128 }
+    <name not found> = ArrayList@312[1] { ResolutionCandidate@161 }
+    <name not found> = ArrayList@313[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@314[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@315[1] { ResolutionCandidate@197 }
+    <name not found> = ArrayList@316[1] { ResolutionCandidate@188 }
+    <name not found> = ArrayList@317[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@318[1] { ResolutionCandidate@113 }
+    <name not found> = ArrayList@319[1] { ResolutionCandidate@140 }
+    <name not found> = ArrayList@320[1] { ResolutionCandidate@134 }
+    <name not found> = ArrayList@321[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@322[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@323[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@324[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@325[1] { ResolutionCandidate@212 }
+    <name not found> = ArrayList@326[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@327[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@328[1] { ResolutionCandidate@164 }
+    <name not found> = ArrayList@329[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@330[1] { ResolutionCandidate@143 }
+    <name not found> = ArrayList@331[1] { ResolutionCandidate@41 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inference/nestedCalls/nontrivialCallExpression.lazy.log b/compiler/testData/diagnostics/tests/inference/nestedCalls/nontrivialCallExpression.lazy.log
index dc29c5e7c77..5f2b024aece 100644
--- a/compiler/testData/diagnostics/tests/inference/nestedCalls/nontrivialCallExpression.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/nestedCalls/nontrivialCallExpression.lazy.log
@@ -38,14 +38,14 @@ LazyJavaClassifierType@22['String'] {
 
 LazyJavaClassifierType@25['String'] {
     arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@21['String']
+    classifier = JavaClassImpl@16['String']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@18
 }
 
 LazyJavaClassifierType@28['String'] {
     arguments = ArrayList@29[empty]
-    classifier = JavaClassImpl@16['String']
+    classifier = JavaClassImpl@21['String']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@18
 }
@@ -87,14 +87,14 @@ LazyJavaClassifierType@42['Throwable'] {
 
 LazyJavaClassifierType@44['Throwable'] {
     arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@34['Throwable']
+    classifier = JavaClassImpl@41['Throwable']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@35
 }
 
 LazyJavaClassifierType@46['Throwable'] {
     arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@41['Throwable']
+    classifier = JavaClassImpl@34['Throwable']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@35
 }
@@ -162,162 +162,165 @@ LazyJavaPackageFragment@68['lang'] {
 
 ResolutionTaskHolder@97 {
     <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
 }
 
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
     <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
 }
 
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
     <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
+}
+
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
     <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
 }
 
 ResolutionTaskHolder@109 {
     <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
 }
 
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
     <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
 }
 
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
+ResolutionTaskHolder@115 {
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
     <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
+}
+
+ResolutionTaskHolder@118 {
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
     <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
 }
 
 ResolutionTaskHolder@121 {
     <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
 }
 
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@127 }
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
+ResolutionTaskHolder@124 {
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
 }
 
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@131 }
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
+ResolutionTaskHolder@127 {
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
+}
+
+ResolutionTaskHolder@130 {
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
 }
 
 ResolutionTaskHolder@133 {
     <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@135 }
 }
 
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@139 }
+ResolutionTaskHolder@136 {
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
 }
 
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@143 }
+ResolutionTaskHolder@139 {
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
+}
+
+ResolutionTaskHolder@142 {
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
 }
 
 ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@147 }
+    <name not found> = ArrayList@146[2] { ResolutionCandidate@147, ResolutionCandidate@148 }
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
 }
 
 ResolutionTaskHolder@149 {
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@151 }
+    <name not found> = ArrayList@150[2] { ResolutionCandidate@151, ResolutionCandidate@152 }
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
 }
 
 ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@155 }
+    <name not found> = ArrayList@154[2] { ResolutionCandidate@155, ResolutionCandidate@156 }
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
 }
 
 ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@159 }
+    <name not found> = ArrayList@158[4] { ResolutionCandidate@159, ResolutionCandidate@160, ResolutionCandidate@161, ... }
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
 }
 
-ResolutionTaskHolder@161 {
-    <name not found> = ArrayList@162[2] { ResolutionCandidate@163, ResolutionCandidate@164 }
-    <name not found> = ArrayList@165[2] { ResolutionCandidate@163, ResolutionCandidate@164 }
+ResolutionTaskHolder@162 {
+    <name not found> = ArrayList@163[8] { ResolutionCandidate@164, ResolutionCandidate@165, ResolutionCandidate@166, ... }
+}
+
+ResolutionTaskHolder@167 {
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
 }
 
-ResolutionTaskHolder@166 {
-    <name not found> = ArrayList@167[2] { ResolutionCandidate@168, ResolutionCandidate@169 }
-    <name not found> = ArrayList@170[2] { ResolutionCandidate@168, ResolutionCandidate@169 }
+null {
+    <name not found> = ArrayList@168[1] { ResolutionCandidate@126 }
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@132 }
+    <name not found> = ArrayList@170[1] { ResolutionCandidate@135 }
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@129 }
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@176[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@141 }
+    <name not found> = ArrayList@184[2] { ResolutionCandidate@155, ResolutionCandidate@156 }
+    <name not found> = ArrayList@185[2] { ResolutionCandidate@147, ResolutionCandidate@148 }
+    <name not found> = ArrayList@186[2] { ResolutionCandidate@151, ResolutionCandidate@152 }
+    <name not found> = ArrayList@187[5] { ResolutionCandidate@159, ResolutionCandidate@160, ResolutionCandidate@161, ... }
+    <name not found> = ArrayList@188[8] { ResolutionCandidate@164, ResolutionCandidate@165, ResolutionCandidate@166, ... }
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
-}
-
-ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[2] { ResolutionCandidate@173, ResolutionCandidate@174 }
-    <name not found> = ArrayList@175[2] { ResolutionCandidate@173, ResolutionCandidate@174 }
     <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
-}
-
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[4] { ResolutionCandidate@178, ResolutionCandidate@179, ResolutionCandidate@180, ... }
-    <name not found> = ArrayList@181[5] { ResolutionCandidate@178, ResolutionCandidate@179, ResolutionCandidate@180, ... }
     <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
-}
-
-ResolutionTaskHolder@182 {
-    <name not found> = ArrayList@183[8] { ResolutionCandidate@184, ResolutionCandidate@185, ResolutionCandidate@186, ... }
-    <name not found> = ArrayList@187[8] { ResolutionCandidate@184, ResolutionCandidate@185, ResolutionCandidate@186, ... }
-}
-
-ResolutionTaskHolder@188 {
     <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
diff --git a/compiler/testData/diagnostics/tests/inference/noInformationForParameter.lazy.log b/compiler/testData/diagnostics/tests/inference/noInformationForParameter.lazy.log
index 3b34f558786..73610f755f6 100644
--- a/compiler/testData/diagnostics/tests/inference/noInformationForParameter.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/noInformationForParameter.lazy.log
@@ -91,49 +91,49 @@ LazyJavaClassifierType@57['E'] {
     arguments = ArrayList@58[empty]
     classifier = JavaTypeParameterImpl@59['E']
     nullable = 'false': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@60
 }
 
-LazyJavaClassifierType@60['E'] {
-    arguments = ArrayList@61[empty]
-    classifier = JavaTypeParameterImpl@62['E']
+LazyJavaClassifierType@61['E'] {
+    arguments = ArrayList@62[empty]
+    classifier = JavaTypeParameterImpl@63['E']
     nullable = 'false': Boolean@44
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
 }
 
-LazyJavaClassifierType@63['E'] {
-    arguments = ArrayList@64[empty]
-    classifier = JavaTypeParameterImpl@65['E']
+LazyJavaClassifierType@64['E'] {
+    arguments = ArrayList@65[empty]
+    classifier = JavaTypeParameterImpl@66['E']
     nullable = 'false': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
 }
 
 LazyJavaClassifierType@67['E'] {
     arguments = ArrayList@68[empty]
-    classifier = JavaTypeParameterImpl@62['E']
+    classifier = JavaTypeParameterImpl@66['E']
     nullable = 'true': Boolean@50
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
 }
 
 LazyJavaClassifierType@69['E'] {
     arguments = ArrayList@70[empty]
-    classifier = JavaTypeParameterImpl@55['E']
+    classifier = JavaTypeParameterImpl@63['E']
     nullable = 'true': Boolean@50
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
 }
 
 LazyJavaClassifierType@71['E'] {
     arguments = ArrayList@72[empty]
-    classifier = JavaTypeParameterImpl@59['E']
+    classifier = JavaTypeParameterImpl@55['E']
     nullable = 'true': Boolean@50
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
 }
 
 LazyJavaClassifierType@73['E'] {
     arguments = ArrayList@74[empty]
-    classifier = JavaTypeParameterImpl@65['E']
+    classifier = JavaTypeParameterImpl@59['E']
     nullable = 'true': Boolean@50
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@60
 }
 
 LazyJavaClassifierType@22['List<E>'] {
@@ -246,7 +246,7 @@ LazyJavaTypeParameterDescriptor@24['E'] {
 }
 
 LazyJavaTypeParameterDescriptor@19['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@60
 }
 
 LazyJavaTypeParameterResolver@148 {
@@ -254,30 +254,33 @@ LazyJavaTypeParameterResolver@148 {
 }
 
 LazyJavaTypeParameterResolver@150 {
-    resolve(JavaTypeParameterImpl@65['E']) = LazyJavaTypeParameterDescriptor@19['E']
+    resolve(JavaTypeParameterImpl@59['E']) = LazyJavaTypeParameterDescriptor@19['E']
 }
 
 ResolutionTaskHolder@151 {
     <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@153 }
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
     <name not found> = EmptyList@133[empty]
     <name not found> = EmptyList@133[empty]
 }
 
-ResolutionTaskHolder@155 {
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@157 }
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
+ResolutionTaskHolder@154 {
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
     <name not found> = EmptyList@133[empty]
     <name not found> = EmptyList@133[empty]
 }
 
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[3] { ResolutionCandidate@161, ResolutionCandidate@162, ResolutionCandidate@163 }
-    <name not found> = ArrayList@164[3] { ResolutionCandidate@161, ResolutionCandidate@162, ResolutionCandidate@163 }
+ResolutionTaskHolder@157 {
+    <name not found> = ArrayList@158[3] { ResolutionCandidate@159, ResolutionCandidate@160, ResolutionCandidate@161 }
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+}
+
+null {
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@153 }
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@156 }
+    <name not found> = ArrayList@164[3] { ResolutionCandidate@159, ResolutionCandidate@160, ResolutionCandidate@161 }
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
     <name not found> = EmptyList@133[empty]
     <name not found> = EmptyList@133[empty]
     <name not found> = EmptyList@133[empty]
diff --git a/compiler/testData/diagnostics/tests/inference/nullableUpperBound.lazy.log b/compiler/testData/diagnostics/tests/inference/nullableUpperBound.lazy.log
index 279304e2a9c..363423d29ba 100644
--- a/compiler/testData/diagnostics/tests/inference/nullableUpperBound.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/nullableUpperBound.lazy.log
@@ -46,16 +46,19 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@41 {
     <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+}
+
+null {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@46 }
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
diff --git a/compiler/testData/diagnostics/tests/inference/opposite.lazy.log b/compiler/testData/diagnostics/tests/inference/opposite.lazy.log
index 1fa682cb8d5..6f79736dd71 100644
--- a/compiler/testData/diagnostics/tests/inference/opposite.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/opposite.lazy.log
@@ -47,15 +47,6 @@ LazyJavaPackageFragment@18['lang'] {
 
 ResolutionTaskHolder@41 {
     <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
@@ -66,16 +57,28 @@ ResolutionTaskHolder@41 {
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@34[empty]
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
+    <name not found> = EmptyList@34[empty]
+}
+
+null {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@43 }
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inference/possibleCycleOnConstraints.lazy.log b/compiler/testData/diagnostics/tests/inference/possibleCycleOnConstraints.lazy.log
index 86a49b063f3..df38cd9e411 100644
--- a/compiler/testData/diagnostics/tests/inference/possibleCycleOnConstraints.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/possibleCycleOnConstraints.lazy.log
@@ -135,43 +135,56 @@ LazyJavaTypeParameterResolver@95 {
 
 ResolutionTaskHolder@97 {
     <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
 }
 
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
 }
 
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
+}
+
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
 }
 
 ResolutionTaskHolder@109 {
     <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+}
+
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+}
+
+ResolutionTaskHolder@115 {
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
 }
 
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
+ResolutionTaskHolder@116 {
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
@@ -179,17 +192,6 @@ ResolutionTaskHolder@113 {
 }
 
 ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
@@ -200,20 +202,21 @@ ResolutionTaskHolder@121 {
     <name not found> = EmptyList@7[empty]
 }
 
-ResolutionTaskHolder@122 {
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
-
-ResolutionTaskHolder@123 {
+null {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@105 }
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/compareBy.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/compareBy.lazy.log
index e475e470d79..cbbd470531b 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/compareBy.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/compareBy.lazy.log
@@ -75,14 +75,14 @@ LazyJavaClassifierType@36['Throwable'] {
 
 LazyJavaClassifierType@39['Throwable'] {
     arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@35['Throwable']
+    classifier = JavaClassImpl@31['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@31['Throwable']
+    classifier = JavaClassImpl@35['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
@@ -163,15 +163,6 @@ LazyJavaPackageFragment@59['lang'] {
 
 ResolutionTaskHolder@94 {
     <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
     <name not found> = EmptyList@86[empty]
     <name not found> = EmptyList@86[empty]
     <name not found> = EmptyList@86[empty]
@@ -182,28 +173,40 @@ ResolutionTaskHolder@94 {
     <name not found> = EmptyList@86[empty]
 }
 
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
-    <name not found> = EmptyList@86[empty]
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
     <name not found> = EmptyList@86[empty]
 }
 
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
-    <name not found> = EmptyList@86[empty]
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
     <name not found> = EmptyList@86[empty]
 }
 
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
+}
+
 ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@107[4] { ResolutionCandidate@108, ResolutionCandidate@109, ResolutionCandidate@110, ... }
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
 }
 
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[4] { ResolutionCandidate@112, ResolutionCandidate@113, ResolutionCandidate@114, ... }
-    <name not found> = ArrayList@115[5] { ResolutionCandidate@112, ResolutionCandidate@113, ResolutionCandidate@114, ... }
+null {
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@115[5] { ResolutionCandidate@108, ResolutionCandidate@109, ResolutionCandidate@110, ... }
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
     <name not found> = EmptyList@86[empty]
     <name not found> = EmptyList@86[empty]
     <name not found> = EmptyList@86[empty]
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1029.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt1029.lazy.log
index f7c6411712f..52d8fa78dd4 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1029.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt1029.lazy.log
@@ -42,48 +42,51 @@ LazyJavaPackageFragment@15['lang'] {
 
 ResolutionTaskHolder@37 {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+}
+
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
 }
 
 ResolutionTaskHolder@49 {
     <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[7] { ResolutionCandidate@57, ResolutionCandidate@58, ResolutionCandidate@59, ... }
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[7] { ResolutionCandidate@63, ResolutionCandidate@64, ResolutionCandidate@65, ... }
-    <name not found> = ArrayList@66[7] { ResolutionCandidate@63, ResolutionCandidate@64, ResolutionCandidate@65, ... }
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[7] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64, ... }
 }
 
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[7] { ResolutionCandidate@69, ResolutionCandidate@70, ResolutionCandidate@71, ... }
-    <name not found> = ArrayList@72[7] { ResolutionCandidate@69, ResolutionCandidate@70, ResolutionCandidate@71, ... }
+null {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@71[7] { ResolutionCandidate@57, ResolutionCandidate@58, ResolutionCandidate@59, ... }
+    <name not found> = ArrayList@72[7] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64, ... }
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1031.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt1031.lazy.log
index faca7061b69..069a7cfa9e7 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1031.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt1031.lazy.log
@@ -66,92 +66,95 @@ LazyJavaPackageFragment@28['util'] {
 
 ResolutionTaskHolder@56 {
     <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
     <name not found> = EmptyList@45[empty]
     <name not found> = EmptyList@45[empty]
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
     <name not found> = EmptyList@45[empty]
     <name not found> = EmptyList@45[empty]
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
     <name not found> = EmptyList@45[empty]
     <name not found> = EmptyList@45[empty]
 }
 
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
+}
+
 ResolutionTaskHolder@68 {
     <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
 }
 
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
+}
+
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
 }
 
 ResolutionTaskHolder@80 {
     <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
 }
 
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
 }
 
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
+}
+
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
 }
 
 ResolutionTaskHolder@92 {
     <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
 }
 
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[7] { ResolutionCandidate@97, ResolutionCandidate@98, ResolutionCandidate@99, ... }
 }
 
 ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@101[7] { ResolutionCandidate@102, ResolutionCandidate@103, ResolutionCandidate@104, ... }
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[7] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
 }
 
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[7] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
-    <name not found> = ArrayList@113[7] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[7] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
-    <name not found> = ArrayList@119[7] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[7] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
-    <name not found> = ArrayList@125[7] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
+null {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@123[7] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
+    <name not found> = ArrayList@124[7] { ResolutionCandidate@102, ResolutionCandidate@103, ResolutionCandidate@104, ... }
+    <name not found> = ArrayList@125[7] { ResolutionCandidate@97, ResolutionCandidate@98, ResolutionCandidate@99, ... }
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1127.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt1127.lazy.log
index 2bc4f8c3f85..7107d6d4e3a 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1127.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt1127.lazy.log
@@ -40,9 +40,12 @@ LazyJavaPackageFragment@15['lang'] {
 
 ResolutionTaskHolder@36 {
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+}
+
+null {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1145.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt1145.lazy.log
index bfcc6ec6bf3..b74e78b4669 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1145.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt1145.lazy.log
@@ -46,53 +46,56 @@ LazyJavaPackageFragment@17['lang'] {
 
 ResolutionTaskHolder@41 {
     <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
+}
+
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
 }
 
 ResolutionTaskHolder@53 {
     <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
+}
+
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
 }
 
 ResolutionTaskHolder@65 {
     <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+null {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@58 }
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1358.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt1358.lazy.log
index 48bfed3b8e7..484fa5c198e 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1358.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt1358.lazy.log
@@ -36,47 +36,50 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@30 {
     <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
+    <name not found> = EmptyList@23[empty]
+}
+
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
 }
 
 ResolutionTaskHolder@41 {
     <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+}
+
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+}
+
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
+}
+
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
+}
+
+null {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@49 }
+    <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
 }
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
-}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1410.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt1410.lazy.log
index 459e84e7a7a..faac680b00e 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1410.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt1410.lazy.log
@@ -52,128 +52,131 @@ LazyJavaPackageFragment@19['lang'] {
 
 ResolutionTaskHolder@46 {
     <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
 ResolutionTaskHolder@58 {
     <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
+}
+
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
 }
 
 ResolutionTaskHolder@70 {
     <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
+}
+
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
 }
 
 ResolutionTaskHolder@82 {
     <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
 }
 
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
+}
+
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
 }
 
 ResolutionTaskHolder@94 {
     <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
 }
 
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
 }
 
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
+}
+
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
 }
 
 ResolutionTaskHolder@106 {
     <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
 }
 
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[2] { ResolutionCandidate@111, ResolutionCandidate@112 }
 }
 
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[2] { ResolutionCandidate@132, ResolutionCandidate@133 }
-    <name not found> = ArrayList@134[2] { ResolutionCandidate@132, ResolutionCandidate@133 }
+null {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@134[2] { ResolutionCandidate@111, ResolutionCandidate@112 }
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1558.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt1558.lazy.log
index 290c44216d6..4867d9a6953 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1558.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt1558.lazy.log
@@ -52,10 +52,6 @@ LazyJavaPackageFragment@19['lang'] {
 
 ResolutionTaskHolder@46 {
     <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
@@ -73,12 +69,8 @@ ResolutionTaskHolder@46 {
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
@@ -96,9 +88,8 @@ ResolutionTaskHolder@50 {
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
@@ -114,6 +105,22 @@ ResolutionTaskHolder@54 {
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
@@ -121,10 +128,6 @@ ResolutionTaskHolder@54 {
 
 ResolutionTaskHolder@58 {
     <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
@@ -142,125 +145,125 @@ ResolutionTaskHolder@58 {
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
+}
+
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
 ResolutionTaskHolder@70 {
     <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
+}
+
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
 }
 
 ResolutionTaskHolder@82 {
     <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
+}
+
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
 }
 
 ResolutionTaskHolder@94 {
     <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
 }
 
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
 }
 
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
+}
+
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
 }
 
 ResolutionTaskHolder@106 {
     <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
 }
 
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
+null {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@84 }
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1718.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt1718.lazy.log
index c20592bc41a..b63392e8fac 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1718.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt1718.lazy.log
@@ -108,56 +108,56 @@ LazyJavaClassifierType@71['E'] {
     arguments = ArrayList@72[empty]
     classifier = JavaTypeParameterImpl@73['E']
     nullable = 'false': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@70
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
 }
 
 LazyJavaClassifierType@74['E'] {
     arguments = ArrayList@75[empty]
     classifier = JavaTypeParameterImpl@76['E']
     nullable = 'false': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@70
 }
 
-LazyJavaClassifierType@78['E'] {
-    arguments = ArrayList@79[empty]
-    classifier = JavaTypeParameterImpl@80['E']
+LazyJavaClassifierType@77['E'] {
+    arguments = ArrayList@78[empty]
+    classifier = JavaTypeParameterImpl@79['E']
     nullable = 'false': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
 }
 
 LazyJavaClassifierType@81['E'] {
     arguments = ArrayList@82[empty]
-    classifier = JavaTypeParameterImpl@64['E']
+    classifier = JavaTypeParameterImpl@73['E']
     nullable = 'true': Boolean@83
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
 }
 
 LazyJavaClassifierType@84['E'] {
     arguments = ArrayList@85[empty]
-    classifier = JavaTypeParameterImpl@80['E']
+    classifier = JavaTypeParameterImpl@79['E']
     nullable = 'true': Boolean@83
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
 }
 
 LazyJavaClassifierType@86['E'] {
     arguments = ArrayList@87[empty]
-    classifier = JavaTypeParameterImpl@69['E']
+    classifier = JavaTypeParameterImpl@76['E']
     nullable = 'true': Boolean@83
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@70
 }
 
 LazyJavaClassifierType@88['E'] {
     arguments = ArrayList@89[empty]
-    classifier = JavaTypeParameterImpl@73['E']
+    classifier = JavaTypeParameterImpl@69['E']
     nullable = 'true': Boolean@83
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@70
 }
 
 LazyJavaClassifierType@90['E'] {
     arguments = ArrayList@91[empty]
-    classifier = JavaTypeParameterImpl@76['E']
+    classifier = JavaTypeParameterImpl@64['E']
     nullable = 'true': Boolean@83
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
 }
 
 LazyJavaClassifierType@37['List<E>'] {
@@ -276,7 +276,7 @@ LazyJavaTypeParameterDescriptor@34['E'] {
 }
 
 LazyJavaTypeParameterDescriptor@25['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
 }
 
 LazyJavaTypeParameterDescriptor@29['E'] {
@@ -284,48 +284,51 @@ LazyJavaTypeParameterDescriptor@29['E'] {
 }
 
 LazyJavaTypeParameterResolver@170 {
-    resolve(JavaTypeParameterImpl@171['E']) = LazyJavaTypeParameterDescriptor@34['E']
+    resolve(JavaTypeParameterImpl@171['E']) = LazyJavaTypeParameterDescriptor@29['E']
 }
 
 LazyJavaTypeParameterResolver@172 {
-    resolve(JavaTypeParameterImpl@173['E']) = LazyJavaTypeParameterDescriptor@29['E']
+    resolve(JavaTypeParameterImpl@173['E']) = LazyJavaTypeParameterDescriptor@25['E']
 }
 
 LazyJavaTypeParameterResolver@174 {
-    resolve(JavaTypeParameterImpl@175['E']) = LazyJavaTypeParameterDescriptor@25['E']
+    resolve(JavaTypeParameterImpl@175['E']) = LazyJavaTypeParameterDescriptor@34['E']
 }
 
 ResolutionTaskHolder@176 {
     <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@178 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
 }
 
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@182 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
+ResolutionTaskHolder@179 {
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
 }
 
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@186 }
+ResolutionTaskHolder@182 {
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
+}
+
+ResolutionTaskHolder@185 {
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
 }
 
 ResolutionTaskHolder@188 {
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@190 }
+    <name not found> = ArrayList@189[2] { ResolutionCandidate@190, ResolutionCandidate@191 }
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
 }
 
-ResolutionTaskHolder@192 {
-    <name not found> = ArrayList@193[2] { ResolutionCandidate@194, ResolutionCandidate@195 }
-    <name not found> = ArrayList@196[2] { ResolutionCandidate@194, ResolutionCandidate@195 }
+null {
+    <name not found> = ArrayList@192[1] { ResolutionCandidate@181 }
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@178 }
+    <name not found> = ArrayList@194[1] { ResolutionCandidate@187 }
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@184 }
+    <name not found> = ArrayList@196[2] { ResolutionCandidate@190, ResolutionCandidate@191 }
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1944.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt1944.lazy.log
index 39c026a9a24..5396f05e8d1 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1944.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt1944.lazy.log
@@ -40,15 +40,6 @@ LazyJavaPackageFragment@14['lang'] {
 
 ResolutionTaskHolder@35 {
     <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
@@ -59,26 +50,38 @@ ResolutionTaskHolder@35 {
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@28[empty]
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@28[empty]
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
     <name not found> = EmptyList@28[empty]
 }
 
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+}
+
 ResolutionTaskHolder@47 {
     <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+null {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@49 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2179.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt2179.lazy.log
index 3f68c5461ea..1546a2f612a 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2179.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2179.lazy.log
@@ -110,23 +110,23 @@ LazyJavaClassifierType@71['E'] {
     arguments = ArrayList@72[empty]
     classifier = JavaTypeParameterImpl@73['E']
     nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
 }
 
-LazyJavaClassifierType@75['E'] {
-    arguments = ArrayList@76[empty]
-    classifier = JavaTypeParameterImpl@77['E']
-    nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
-}
-
-LazyJavaClassifierType@78['E'] {
-    arguments = ArrayList@79[empty]
-    classifier = JavaTypeParameterImpl@80['E']
+LazyJavaClassifierType@74['E'] {
+    arguments = ArrayList@75[empty]
+    classifier = JavaTypeParameterImpl@76['E']
     nullable = 'false': Boolean@48
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
 }
 
+LazyJavaClassifierType@77['E'] {
+    arguments = ArrayList@78[empty]
+    classifier = JavaTypeParameterImpl@79['E']
+    nullable = 'false': Boolean@48
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
+}
+
 LazyJavaClassifierType@81['E'] {
     arguments = ArrayList@82[empty]
     classifier = JavaTypeParameterImpl@70['E']
@@ -136,37 +136,37 @@ LazyJavaClassifierType@81['E'] {
 
 LazyJavaClassifierType@83['E'] {
     arguments = ArrayList@84[empty]
-    classifier = JavaTypeParameterImpl@80['E']
+    classifier = JavaTypeParameterImpl@79['E']
     nullable = 'true': Boolean@54
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
 }
 
 LazyJavaClassifierType@85['E'] {
     arguments = ArrayList@86[empty]
-    classifier = JavaTypeParameterImpl@73['E']
+    classifier = JavaTypeParameterImpl@66['E']
     nullable = 'true': Boolean@54
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
 }
 
 LazyJavaClassifierType@87['E'] {
     arguments = ArrayList@88[empty]
-    classifier = JavaTypeParameterImpl@62['E']
+    classifier = JavaTypeParameterImpl@73['E']
     nullable = 'true': Boolean@54
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
 }
 
 LazyJavaClassifierType@89['E'] {
     arguments = ArrayList@90[empty]
-    classifier = JavaTypeParameterImpl@66['E']
+    classifier = JavaTypeParameterImpl@62['E']
     nullable = 'true': Boolean@54
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
 }
 
 LazyJavaClassifierType@91['E'] {
     arguments = ArrayList@92[empty]
-    classifier = JavaTypeParameterImpl@77['E']
+    classifier = JavaTypeParameterImpl@76['E']
     nullable = 'true': Boolean@54
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
 }
 
 LazyJavaClassifierType@24['List<E>'] {
@@ -331,34 +331,28 @@ LazyJavaTypeParameterDescriptor@26['E'] {
     upperBounds = LinkedHashSet@202[1] { NullableType@203 }
 }
 
-LazyJavaTypeParameterDescriptor@17['E'] {
+LazyJavaTypeParameterDescriptor@21['E'] {
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
 }
 
-LazyJavaTypeParameterDescriptor@21['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
+LazyJavaTypeParameterDescriptor@17['E'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
 }
 
 LazyJavaTypeParameterResolver@204 {
-    resolve(JavaTypeParameterImpl@205['E']) = LazyJavaTypeParameterDescriptor@26['E']
+    resolve(JavaTypeParameterImpl@73['E']) = LazyJavaTypeParameterDescriptor@21['E']
+}
+
+LazyJavaTypeParameterResolver@205 {
+    resolve(JavaTypeParameterImpl@79['E']) = LazyJavaTypeParameterDescriptor@17['E']
 }
 
 LazyJavaTypeParameterResolver@206 {
-    resolve(JavaTypeParameterImpl@62['E']) = LazyJavaTypeParameterDescriptor@17['E']
-}
-
-LazyJavaTypeParameterResolver@207 {
-    resolve(JavaTypeParameterImpl@73['E']) = LazyJavaTypeParameterDescriptor@21['E']
+    resolve(JavaTypeParameterImpl@207['E']) = LazyJavaTypeParameterDescriptor@26['E']
 }
 
 ResolutionTaskHolder@208 {
     <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@210 }
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
     <name not found> = EmptyList@180[empty]
     <name not found> = EmptyList@180[empty]
     <name not found> = EmptyList@180[empty]
@@ -366,297 +360,218 @@ ResolutionTaskHolder@208 {
     <name not found> = EmptyList@180[empty]
 }
 
-ResolutionTaskHolder@212 {
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@214 }
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@214 }
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
+ResolutionTaskHolder@211 {
+    <name not found> = ArrayList@212[1] { ResolutionCandidate@213 }
     <name not found> = EmptyList@180[empty]
     <name not found> = EmptyList@180[empty]
 }
 
-ResolutionTaskHolder@216 {
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@218 }
+ResolutionTaskHolder@214 {
+    <name not found> = ArrayList@215[1] { ResolutionCandidate@216 }
     <name not found> = EmptyList@180[empty]
     <name not found> = EmptyList@180[empty]
+}
+
+ResolutionTaskHolder@217 {
+    <name not found> = ArrayList@218[1] { ResolutionCandidate@219 }
     <name not found> = EmptyList@180[empty]
     <name not found> = EmptyList@180[empty]
 }
 
 ResolutionTaskHolder@220 {
     <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@222 }
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
     <name not found> = EmptyList@180[empty]
     <name not found> = EmptyList@180[empty]
 }
 
-ResolutionTaskHolder@224 {
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@226 }
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@226 }
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
+ResolutionTaskHolder@223 {
+    <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
     <name not found> = EmptyList@180[empty]
     <name not found> = EmptyList@180[empty]
 }
 
-ResolutionTaskHolder@228 {
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@230 }
+ResolutionTaskHolder@226 {
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
     <name not found> = EmptyList@180[empty]
     <name not found> = EmptyList@180[empty]
+}
+
+ResolutionTaskHolder@229 {
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
     <name not found> = EmptyList@180[empty]
     <name not found> = EmptyList@180[empty]
 }
 
 ResolutionTaskHolder@232 {
     <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@234 }
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
     <name not found> = EmptyList@180[empty]
     <name not found> = EmptyList@180[empty]
 }
 
-ResolutionTaskHolder@236 {
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@238 }
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@238 }
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
+ResolutionTaskHolder@235 {
+    <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
     <name not found> = EmptyList@180[empty]
     <name not found> = EmptyList@180[empty]
 }
 
-ResolutionTaskHolder@240 {
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
-    <name not found> = ArrayList@243[1] { ResolutionCandidate@242 }
+ResolutionTaskHolder@238 {
+    <name not found> = ArrayList@239[1] { ResolutionCandidate@240 }
     <name not found> = EmptyList@180[empty]
     <name not found> = EmptyList@180[empty]
+}
+
+ResolutionTaskHolder@241 {
+    <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
     <name not found> = EmptyList@180[empty]
     <name not found> = EmptyList@180[empty]
 }
 
 ResolutionTaskHolder@244 {
     <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@246 }
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
     <name not found> = EmptyList@180[empty]
 }
 
-ResolutionTaskHolder@248 {
-    <name not found> = ArrayList@249[1] { ResolutionCandidate@250 }
-    <name not found> = ArrayList@251[1] { ResolutionCandidate@250 }
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
+ResolutionTaskHolder@247 {
+    <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
 }
 
-ResolutionTaskHolder@252 {
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
-    <name not found> = ArrayList@255[1] { ResolutionCandidate@254 }
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
+ResolutionTaskHolder@250 {
+    <name not found> = ArrayList@251[1] { ResolutionCandidate@252 }
+}
+
+ResolutionTaskHolder@253 {
+    <name not found> = ArrayList@254[1] { ResolutionCandidate@255 }
 }
 
 ResolutionTaskHolder@256 {
     <name not found> = ArrayList@257[1] { ResolutionCandidate@258 }
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@258 }
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
 }
 
-ResolutionTaskHolder@260 {
-    <name not found> = ArrayList@261[1] { ResolutionCandidate@262 }
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@262 }
+ResolutionTaskHolder@259 {
+    <name not found> = ArrayList@260[1] { ResolutionCandidate@261 }
 }
 
-ResolutionTaskHolder@264 {
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
-    <name not found> = ArrayList@267[1] { ResolutionCandidate@266 }
+ResolutionTaskHolder@262 {
+    <name not found> = ArrayList@263[1] { ResolutionCandidate@264 }
+}
+
+ResolutionTaskHolder@265 {
+    <name not found> = ArrayList@266[1] { ResolutionCandidate@267 }
 }
 
 ResolutionTaskHolder@268 {
     <name not found> = ArrayList@269[1] { ResolutionCandidate@270 }
-    <name not found> = ArrayList@271[1] { ResolutionCandidate@270 }
 }
 
-ResolutionTaskHolder@272 {
-    <name not found> = ArrayList@273[1] { ResolutionCandidate@274 }
-    <name not found> = ArrayList@275[1] { ResolutionCandidate@274 }
+ResolutionTaskHolder@271 {
+    <name not found> = ArrayList@272[1] { ResolutionCandidate@273 }
 }
 
-ResolutionTaskHolder@276 {
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
-    <name not found> = ArrayList@279[1] { ResolutionCandidate@278 }
+ResolutionTaskHolder@274 {
+    <name not found> = ArrayList@275[1] { ResolutionCandidate@276 }
+}
+
+ResolutionTaskHolder@277 {
+    <name not found> = ArrayList@278[1] { ResolutionCandidate@279 }
 }
 
 ResolutionTaskHolder@280 {
     <name not found> = ArrayList@281[1] { ResolutionCandidate@282 }
-    <name not found> = ArrayList@283[1] { ResolutionCandidate@282 }
 }
 
-ResolutionTaskHolder@284 {
-    <name not found> = ArrayList@285[1] { ResolutionCandidate@286 }
-    <name not found> = ArrayList@287[1] { ResolutionCandidate@286 }
+ResolutionTaskHolder@283 {
+    <name not found> = ArrayList@284[1] { ResolutionCandidate@285 }
 }
 
-ResolutionTaskHolder@288 {
-    <name not found> = ArrayList@289[1] { ResolutionCandidate@290 }
-    <name not found> = ArrayList@291[1] { ResolutionCandidate@290 }
+ResolutionTaskHolder@286 {
+    <name not found> = ArrayList@287[1] { ResolutionCandidate@288 }
+}
+
+ResolutionTaskHolder@289 {
+    <name not found> = ArrayList@290[1] { ResolutionCandidate@291 }
 }
 
 ResolutionTaskHolder@292 {
     <name not found> = ArrayList@293[1] { ResolutionCandidate@294 }
-    <name not found> = ArrayList@295[1] { ResolutionCandidate@294 }
 }
 
-ResolutionTaskHolder@296 {
-    <name not found> = ArrayList@297[1] { ResolutionCandidate@298 }
-    <name not found> = ArrayList@299[1] { ResolutionCandidate@298 }
+ResolutionTaskHolder@295 {
+    <name not found> = ArrayList@296[1] { ResolutionCandidate@297 }
 }
 
-ResolutionTaskHolder@300 {
-    <name not found> = ArrayList@301[1] { ResolutionCandidate@302 }
-    <name not found> = ArrayList@303[1] { ResolutionCandidate@302 }
+ResolutionTaskHolder@298 {
+    <name not found> = ArrayList@299[1] { ResolutionCandidate@300 }
+}
+
+ResolutionTaskHolder@301 {
+    <name not found> = ArrayList@302[1] { ResolutionCandidate@303 }
 }
 
 ResolutionTaskHolder@304 {
     <name not found> = ArrayList@305[1] { ResolutionCandidate@306 }
-    <name not found> = ArrayList@307[1] { ResolutionCandidate@306 }
 }
 
-ResolutionTaskHolder@308 {
-    <name not found> = ArrayList@309[1] { ResolutionCandidate@310 }
-    <name not found> = ArrayList@311[1] { ResolutionCandidate@310 }
+ResolutionTaskHolder@307 {
+    <name not found> = ArrayList@308[1] { ResolutionCandidate@309 }
 }
 
-ResolutionTaskHolder@312 {
-    <name not found> = ArrayList@313[1] { ResolutionCandidate@314 }
-    <name not found> = ArrayList@315[1] { ResolutionCandidate@314 }
+ResolutionTaskHolder@310 {
+    <name not found> = ArrayList@311[1] { ResolutionCandidate@312 }
+}
+
+ResolutionTaskHolder@313 {
+    <name not found> = ArrayList@314[1] { ResolutionCandidate@315 }
 }
 
 ResolutionTaskHolder@316 {
     <name not found> = ArrayList@317[1] { ResolutionCandidate@318 }
-    <name not found> = ArrayList@319[1] { ResolutionCandidate@318 }
 }
 
-ResolutionTaskHolder@320 {
-    <name not found> = ArrayList@321[1] { ResolutionCandidate@322 }
-    <name not found> = ArrayList@323[1] { ResolutionCandidate@322 }
+ResolutionTaskHolder@319 {
+    <name not found> = ArrayList@320[1] { ResolutionCandidate@321 }
 }
 
-ResolutionTaskHolder@324 {
-    <name not found> = ArrayList@325[1] { ResolutionCandidate@326 }
-    <name not found> = ArrayList@327[1] { ResolutionCandidate@326 }
+ResolutionTaskHolder@322 {
+    <name not found> = ArrayList@323[1] { ResolutionCandidate@324 }
+}
+
+ResolutionTaskHolder@325 {
+    <name not found> = ArrayList@326[1] { ResolutionCandidate@327 }
 }
 
 ResolutionTaskHolder@328 {
     <name not found> = ArrayList@329[1] { ResolutionCandidate@330 }
-    <name not found> = ArrayList@331[1] { ResolutionCandidate@330 }
 }
 
-ResolutionTaskHolder@332 {
-    <name not found> = ArrayList@333[1] { ResolutionCandidate@334 }
-    <name not found> = ArrayList@335[1] { ResolutionCandidate@334 }
+ResolutionTaskHolder@331 {
+    <name not found> = ArrayList@332[1] { ResolutionCandidate@333 }
 }
 
-ResolutionTaskHolder@336 {
-    <name not found> = ArrayList@337[1] { ResolutionCandidate@338 }
-    <name not found> = ArrayList@339[1] { ResolutionCandidate@338 }
+ResolutionTaskHolder@334 {
+    <name not found> = ArrayList@335[1] { ResolutionCandidate@336 }
+}
+
+ResolutionTaskHolder@337 {
+    <name not found> = ArrayList@338[1] { ResolutionCandidate@339 }
 }
 
 ResolutionTaskHolder@340 {
     <name not found> = ArrayList@341[1] { ResolutionCandidate@342 }
-    <name not found> = ArrayList@343[1] { ResolutionCandidate@342 }
 }
 
-ResolutionTaskHolder@344 {
-    <name not found> = ArrayList@345[1] { ResolutionCandidate@346 }
-    <name not found> = ArrayList@347[1] { ResolutionCandidate@346 }
+ResolutionTaskHolder@343 {
+    <name not found> = ArrayList@344[3] { ResolutionCandidate@345, ResolutionCandidate@346, ResolutionCandidate@347 }
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
 }
 
 ResolutionTaskHolder@348 {
-    <name not found> = ArrayList@349[1] { ResolutionCandidate@350 }
-    <name not found> = ArrayList@351[1] { ResolutionCandidate@350 }
-}
-
-ResolutionTaskHolder@352 {
-    <name not found> = ArrayList@353[1] { ResolutionCandidate@354 }
-    <name not found> = ArrayList@355[1] { ResolutionCandidate@354 }
-}
-
-ResolutionTaskHolder@356 {
-    <name not found> = ArrayList@357[1] { ResolutionCandidate@358 }
-    <name not found> = ArrayList@359[1] { ResolutionCandidate@358 }
-}
-
-ResolutionTaskHolder@360 {
-    <name not found> = ArrayList@361[1] { ResolutionCandidate@362 }
-    <name not found> = ArrayList@363[1] { ResolutionCandidate@362 }
-}
-
-ResolutionTaskHolder@364 {
-    <name not found> = ArrayList@365[1] { ResolutionCandidate@366 }
-    <name not found> = ArrayList@367[1] { ResolutionCandidate@366 }
-}
-
-ResolutionTaskHolder@368 {
-    <name not found> = ArrayList@369[1] { ResolutionCandidate@370 }
-    <name not found> = ArrayList@371[1] { ResolutionCandidate@370 }
-}
-
-ResolutionTaskHolder@372 {
-    <name not found> = ArrayList@373[1] { ResolutionCandidate@374 }
-    <name not found> = ArrayList@375[1] { ResolutionCandidate@374 }
-}
-
-ResolutionTaskHolder@376 {
-    <name not found> = ArrayList@377[1] { ResolutionCandidate@378 }
-    <name not found> = ArrayList@379[1] { ResolutionCandidate@378 }
-}
-
-ResolutionTaskHolder@380 {
-    <name not found> = ArrayList@381[1] { ResolutionCandidate@382 }
-    <name not found> = ArrayList@383[1] { ResolutionCandidate@382 }
-}
-
-ResolutionTaskHolder@384 {
-    <name not found> = ArrayList@385[1] { ResolutionCandidate@386 }
-    <name not found> = ArrayList@387[1] { ResolutionCandidate@386 }
-}
-
-ResolutionTaskHolder@388 {
-    <name not found> = ArrayList@389[3] { ResolutionCandidate@390, ResolutionCandidate@391, ResolutionCandidate@392 }
-    <name not found> = ArrayList@393[3] { ResolutionCandidate@390, ResolutionCandidate@391, ResolutionCandidate@392 }
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
+    <name not found> = ArrayList@349[3] { ResolutionCandidate@350, ResolutionCandidate@351, ResolutionCandidate@352 }
     <name not found> = EmptyList@180[empty]
     <name not found> = EmptyList@180[empty]
 }
 
-ResolutionTaskHolder@394 {
-    <name not found> = ArrayList@395[3] { ResolutionCandidate@396, ResolutionCandidate@397, ResolutionCandidate@398 }
-    <name not found> = ArrayList@399[3] { ResolutionCandidate@396, ResolutionCandidate@397, ResolutionCandidate@398 }
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-}
-
-ResolutionTaskHolder@400 {
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
+ResolutionTaskHolder@353 {
     <name not found> = EmptyList@180[empty]
     <name not found> = EmptyList@180[empty]
     <name not found> = EmptyList@180[empty]
@@ -683,7 +598,95 @@ ResolutionTaskHolder@400 {
     <name not found> = EmptyList@180[empty]
 }
 
-ResolutionTaskHolder@401 {
+ResolutionTaskHolder@354 {
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+}
+
+null {
+    <name not found> = ArrayList@355[1] { ResolutionCandidate@243 }
+    <name not found> = ArrayList@356[1] { ResolutionCandidate@231 }
+    <name not found> = ArrayList@357[1] { ResolutionCandidate@234 }
+    <name not found> = ArrayList@358[1] { ResolutionCandidate@300 }
+    <name not found> = ArrayList@359[1] { ResolutionCandidate@237 }
+    <name not found> = ArrayList@360[1] { ResolutionCandidate@282 }
+    <name not found> = ArrayList@361[1] { ResolutionCandidate@225 }
+    <name not found> = ArrayList@362[1] { ResolutionCandidate@339 }
+    <name not found> = ArrayList@363[1] { ResolutionCandidate@279 }
+    <name not found> = ArrayList@364[1] { ResolutionCandidate@324 }
+    <name not found> = ArrayList@365[1] { ResolutionCandidate@222 }
+    <name not found> = ArrayList@366[1] { ResolutionCandidate@333 }
+    <name not found> = ArrayList@367[1] { ResolutionCandidate@228 }
+    <name not found> = ArrayList@368[1] { ResolutionCandidate@285 }
+    <name not found> = ArrayList@369[1] { ResolutionCandidate@336 }
+    <name not found> = ArrayList@370[1] { ResolutionCandidate@267 }
+    <name not found> = ArrayList@371[1] { ResolutionCandidate@273 }
+    <name not found> = ArrayList@372[1] { ResolutionCandidate@219 }
+    <name not found> = ArrayList@373[1] { ResolutionCandidate@249 }
+    <name not found> = ArrayList@374[1] { ResolutionCandidate@306 }
+    <name not found> = ArrayList@375[1] { ResolutionCandidate@240 }
+    <name not found> = ArrayList@376[1] { ResolutionCandidate@318 }
+    <name not found> = ArrayList@377[1] { ResolutionCandidate@342 }
+    <name not found> = ArrayList@378[1] { ResolutionCandidate@321 }
+    <name not found> = ArrayList@379[1] { ResolutionCandidate@270 }
+    <name not found> = ArrayList@380[1] { ResolutionCandidate@213 }
+    <name not found> = ArrayList@381[1] { ResolutionCandidate@216 }
+    <name not found> = ArrayList@382[1] { ResolutionCandidate@255 }
+    <name not found> = ArrayList@383[1] { ResolutionCandidate@210 }
+    <name not found> = ArrayList@384[1] { ResolutionCandidate@330 }
+    <name not found> = ArrayList@385[1] { ResolutionCandidate@315 }
+    <name not found> = ArrayList@386[1] { ResolutionCandidate@291 }
+    <name not found> = ArrayList@387[1] { ResolutionCandidate@258 }
+    <name not found> = ArrayList@388[1] { ResolutionCandidate@309 }
+    <name not found> = ArrayList@389[1] { ResolutionCandidate@246 }
+    <name not found> = ArrayList@390[1] { ResolutionCandidate@261 }
+    <name not found> = ArrayList@391[1] { ResolutionCandidate@297 }
+    <name not found> = ArrayList@392[1] { ResolutionCandidate@264 }
+    <name not found> = ArrayList@393[1] { ResolutionCandidate@276 }
+    <name not found> = ArrayList@394[1] { ResolutionCandidate@252 }
+    <name not found> = ArrayList@395[1] { ResolutionCandidate@294 }
+    <name not found> = ArrayList@396[1] { ResolutionCandidate@288 }
+    <name not found> = ArrayList@397[1] { ResolutionCandidate@303 }
+    <name not found> = ArrayList@398[1] { ResolutionCandidate@312 }
+    <name not found> = ArrayList@399[1] { ResolutionCandidate@327 }
+    <name not found> = ArrayList@400[3] { ResolutionCandidate@350, ResolutionCandidate@351, ResolutionCandidate@352 }
+    <name not found> = ArrayList@401[3] { ResolutionCandidate@345, ResolutionCandidate@346, ResolutionCandidate@347 }
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
     <name not found> = EmptyList@180[empty]
     <name not found> = EmptyList@180[empty]
     <name not found> = EmptyList@180[empty]
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2200.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt2200.lazy.log
index b5e05b601cc..7bfb0add424 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2200.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2200.lazy.log
@@ -40,87 +40,90 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@36 {
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
+}
+
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
 ResolutionTaskHolder@48 {
     <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
+}
+
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
 ResolutionTaskHolder@60 {
     <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+null {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@62 }
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2283.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt2283.lazy.log
index 3031cc37898..437864c252c 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2283.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2283.lazy.log
@@ -48,14 +48,17 @@ LazyJavaPackageFragment@19['lang'] {
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+}
+
+null {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@42 }
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2286.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt2286.lazy.log
index ee2bbc5590d..5340f4258e3 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2286.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2286.lazy.log
@@ -50,32 +50,27 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@46 {
     <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
@@ -83,79 +78,87 @@ ResolutionTaskHolder@54 {
 
 ResolutionTaskHolder@58 {
     <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@40[empty]
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
     <name not found> = EmptyList@40[empty]
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
     <name not found> = EmptyList@40[empty]
+}
+
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
     <name not found> = EmptyList@40[empty]
 }
 
 ResolutionTaskHolder@70 {
     <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
+}
+
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
 }
 
 ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@83[7] { ResolutionCandidate@84, ResolutionCandidate@85, ResolutionCandidate@86, ... }
 }
 
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[7] { ResolutionCandidate@89, ResolutionCandidate@90, ResolutionCandidate@91, ... }
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[7] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[7] { ResolutionCandidate@96, ResolutionCandidate@97, ResolutionCandidate@98, ... }
-    <name not found> = ArrayList@99[7] { ResolutionCandidate@96, ResolutionCandidate@97, ResolutionCandidate@98, ... }
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[7] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
 }
 
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[7] { ResolutionCandidate@102, ResolutionCandidate@103, ResolutionCandidate@104, ... }
-    <name not found> = ArrayList@105[7] { ResolutionCandidate@102, ResolutionCandidate@103, ResolutionCandidate@104, ... }
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[7] { ResolutionCandidate@108, ResolutionCandidate@109, ResolutionCandidate@110, ... }
-    <name not found> = ArrayList@111[7] { ResolutionCandidate@108, ResolutionCandidate@109, ResolutionCandidate@110, ... }
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[7] { ResolutionCandidate@114, ResolutionCandidate@115, ResolutionCandidate@116, ... }
-    <name not found> = ArrayList@117[7] { ResolutionCandidate@114, ResolutionCandidate@115, ResolutionCandidate@116, ... }
+null {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@114[7] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
+    <name not found> = ArrayList@115[7] { ResolutionCandidate@89, ResolutionCandidate@90, ResolutionCandidate@91, ... }
+    <name not found> = ArrayList@116[7] { ResolutionCandidate@84, ResolutionCandidate@85, ResolutionCandidate@86, ... }
+    <name not found> = ArrayList@117[7] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2294.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt2294.lazy.log
index 407c7d04018..0ccba270020 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2294.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2294.lazy.log
@@ -42,33 +42,36 @@ LazyJavaPackageFragment@15['lang'] {
 
 ResolutionTaskHolder@37 {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+}
+
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
 }
 
 ResolutionTaskHolder@49 {
     <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+null {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@45 }
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2320.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt2320.lazy.log
index 5d6d448e556..68005456802 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2320.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2320.lazy.log
@@ -159,12 +159,6 @@ LazyJavaPackageFragment@68['lang'] {
 
 ResolutionTaskHolder@96 {
     <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]
@@ -172,33 +166,42 @@ ResolutionTaskHolder@96 {
     <name not found> = EmptyList@89[empty]
 }
 
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
-    <name not found> = EmptyList@89[empty]
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
     <name not found> = EmptyList@89[empty]
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
+}
+
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
 }
 
 ResolutionTaskHolder@108 {
     <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
 }
 
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
+ResolutionTaskHolder@111 {
+    <name not found> = ArrayList@112[4] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
 }
 
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[4] { ResolutionCandidate@118, ResolutionCandidate@119, ResolutionCandidate@120, ... }
-    <name not found> = ArrayList@121[5] { ResolutionCandidate@118, ResolutionCandidate@119, ResolutionCandidate@120, ... }
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
+null {
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@121[5] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
     <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2324.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt2324.lazy.log
index 280c50e2099..eeaff06d067 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2324.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2324.lazy.log
@@ -127,42 +127,42 @@ LazyJavaClassifierType@102['E'] {
     arguments = ArrayList@103[empty]
     classifier = JavaTypeParameterImpl@104['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@105['E'] {
     arguments = ArrayList@106[empty]
     classifier = JavaTypeParameterImpl@107['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
-LazyJavaClassifierType@109['E'] {
-    arguments = ArrayList@110[empty]
-    classifier = JavaTypeParameterImpl@111['E']
+LazyJavaClassifierType@108['E'] {
+    arguments = ArrayList@109[empty]
+    classifier = JavaTypeParameterImpl@110['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
-LazyJavaClassifierType@112['E'] {
-    arguments = ArrayList@113[empty]
-    classifier = JavaTypeParameterImpl@114['E']
+LazyJavaClassifierType@111['E'] {
+    arguments = ArrayList@112[empty]
+    classifier = JavaTypeParameterImpl@113['E']
     nullable = 'false': Boolean@82
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
-LazyJavaClassifierType@115['E'] {
-    arguments = ArrayList@116[empty]
-    classifier = JavaTypeParameterImpl@117['E']
+LazyJavaClassifierType@114['E'] {
+    arguments = ArrayList@115[empty]
+    classifier = JavaTypeParameterImpl@116['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
-LazyJavaClassifierType@118['E'] {
-    arguments = ArrayList@119[empty]
-    classifier = JavaTypeParameterImpl@120['E']
+LazyJavaClassifierType@117['E'] {
+    arguments = ArrayList@118[empty]
+    classifier = JavaTypeParameterImpl@119['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@120
 }
 
 LazyJavaClassifierType@121['E'] {
@@ -176,7 +176,7 @@ LazyJavaClassifierType@124['E'] {
     arguments = ArrayList@125[empty]
     classifier = JavaTypeParameterImpl@126['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@120
 }
 
 LazyJavaClassifierType@127['E'] {
@@ -190,91 +190,91 @@ LazyJavaClassifierType@130['E'] {
     arguments = ArrayList@131[empty]
     classifier = JavaTypeParameterImpl@132['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@133['E'] {
     arguments = ArrayList@134[empty]
+    classifier = JavaTypeParameterImpl@107['E']
+    nullable = 'true': Boolean@88
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+}
+
+LazyJavaClassifierType@135['E'] {
+    arguments = ArrayList@136[empty]
+    classifier = JavaTypeParameterImpl@119['E']
+    nullable = 'true': Boolean@88
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@120
+}
+
+LazyJavaClassifierType@137['E'] {
+    arguments = ArrayList@138[empty]
+    classifier = JavaTypeParameterImpl@100['E']
+    nullable = 'true': Boolean@88
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+}
+
+LazyJavaClassifierType@139['E'] {
+    arguments = ArrayList@140[empty]
     classifier = JavaTypeParameterImpl@96['E']
     nullable = 'true': Boolean@88
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
-LazyJavaClassifierType@135['E'] {
-    arguments = ArrayList@136[empty]
-    classifier = JavaTypeParameterImpl@114['E']
-    nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaClassifierType@137['E'] {
-    arguments = ArrayList@138[empty]
-    classifier = JavaTypeParameterImpl@123['E']
-    nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaClassifierType@139['E'] {
-    arguments = ArrayList@140[empty]
-    classifier = JavaTypeParameterImpl@120['E']
-    nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
-}
-
 LazyJavaClassifierType@141['E'] {
     arguments = ArrayList@142[empty]
-    classifier = JavaTypeParameterImpl@129['E']
+    classifier = JavaTypeParameterImpl@132['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@143['E'] {
     arguments = ArrayList@144[empty]
-    classifier = JavaTypeParameterImpl@100['E']
+    classifier = JavaTypeParameterImpl@110['E']
     nullable = 'true': Boolean@88
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@145['E'] {
     arguments = ArrayList@146[empty]
-    classifier = JavaTypeParameterImpl@117['E']
+    classifier = JavaTypeParameterImpl@116['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@147['E'] {
     arguments = ArrayList@148[empty]
-    classifier = JavaTypeParameterImpl@107['E']
+    classifier = JavaTypeParameterImpl@126['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@120
 }
 
 LazyJavaClassifierType@149['E'] {
     arguments = ArrayList@150[empty]
-    classifier = JavaTypeParameterImpl@104['E']
+    classifier = JavaTypeParameterImpl@113['E']
     nullable = 'true': Boolean@88
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@151['E'] {
     arguments = ArrayList@152[empty]
-    classifier = JavaTypeParameterImpl@126['E']
+    classifier = JavaTypeParameterImpl@129['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@153['E'] {
     arguments = ArrayList@154[empty]
-    classifier = JavaTypeParameterImpl@111['E']
+    classifier = JavaTypeParameterImpl@104['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@155['E'] {
     arguments = ArrayList@156[empty]
-    classifier = JavaTypeParameterImpl@132['E']
+    classifier = JavaTypeParameterImpl@123['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@52['List<E>'] {
@@ -439,27 +439,27 @@ LazyJavaPackageFragment@219['util'] {
 
 LazyJavaTypeParameterDescriptor@54['E'] {
     defaultType = JetTypeImpl@270['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
     upperBounds = LinkedHashSet@271[1] { NullableType@272 }
     upperBoundsAsType = NullableType@272
 }
 
-LazyJavaTypeParameterDescriptor@49['E'] {
+LazyJavaTypeParameterDescriptor@45['E'] {
     defaultType = JetTypeImpl@273['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@120
     upperBounds = LinkedHashSet@274[1] { NullableType@275 }
     upperBoundsAsType = NullableType@275
 }
 
-LazyJavaTypeParameterDescriptor@45['E'] {
+LazyJavaTypeParameterDescriptor@49['E'] {
     defaultType = JetTypeImpl@276['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
     upperBounds = LinkedHashSet@277[1] { NullableType@278 }
     upperBoundsAsType = NullableType@278
 }
 
 LazyJavaTypeParameterResolver@279 {
-    resolve(JavaTypeParameterImpl@280['E']) = LazyJavaTypeParameterDescriptor@54['E']
+    resolve(JavaTypeParameterImpl@280['E']) = LazyJavaTypeParameterDescriptor@45['E']
 }
 
 LazyJavaTypeParameterResolver@281 {
@@ -467,241 +467,244 @@ LazyJavaTypeParameterResolver@281 {
 }
 
 LazyJavaTypeParameterResolver@283 {
-    resolve(JavaTypeParameterImpl@284['E']) = LazyJavaTypeParameterDescriptor@45['E']
+    resolve(JavaTypeParameterImpl@284['E']) = LazyJavaTypeParameterDescriptor@54['E']
 }
 
 LazyJavaTypeParameterResolver@285 {
-    resolve(JavaTypeParameterImpl@120['E']) = null
+    resolve(JavaTypeParameterImpl@129['E']) = null
 }
 
 LazyJavaTypeParameterResolver@286 {
-    resolve(JavaTypeParameterImpl@100['E']) = null
+    resolve(JavaTypeParameterImpl@116['E']) = null
 }
 
 LazyJavaTypeParameterResolver@287 {
-    resolve(JavaTypeParameterImpl@123['E']) = null
+    resolve(JavaTypeParameterImpl@119['E']) = null
 }
 
 LazyJavaTypeParameterResolver@288 {
-    resolve(JavaTypeParameterImpl@107['E']) = null
+    resolve(JavaTypeParameterImpl@113['E']) = null
 }
 
 LazyJavaTypeParameterResolver@289 {
-    resolve(JavaTypeParameterImpl@117['E']) = null
+    resolve(JavaTypeParameterImpl@107['E']) = null
 }
 
 ResolutionTaskHolder@290 {
     <name not found> = ArrayList@291[1] { ResolutionCandidate@292 }
-    <name not found> = ArrayList@293[1] { ResolutionCandidate@292 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@294 {
-    <name not found> = ArrayList@295[1] { ResolutionCandidate@296 }
-    <name not found> = ArrayList@297[1] { ResolutionCandidate@296 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
+ResolutionTaskHolder@293 {
+    <name not found> = ArrayList@294[1] { ResolutionCandidate@295 }
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@298 {
-    <name not found> = ArrayList@299[1] { ResolutionCandidate@300 }
-    <name not found> = ArrayList@301[1] { ResolutionCandidate@300 }
+ResolutionTaskHolder@296 {
+    <name not found> = ArrayList@297[1] { ResolutionCandidate@298 }
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
+}
+
+ResolutionTaskHolder@299 {
+    <name not found> = ArrayList@300[1] { ResolutionCandidate@301 }
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
 }
 
 ResolutionTaskHolder@302 {
     <name not found> = ArrayList@303[1] { ResolutionCandidate@304 }
-    <name not found> = ArrayList@305[1] { ResolutionCandidate@304 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@306 {
-    <name not found> = ArrayList@307[1] { ResolutionCandidate@308 }
-    <name not found> = ArrayList@309[1] { ResolutionCandidate@308 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
+ResolutionTaskHolder@305 {
+    <name not found> = ArrayList@306[1] { ResolutionCandidate@307 }
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@310 {
-    <name not found> = ArrayList@311[1] { ResolutionCandidate@312 }
-    <name not found> = ArrayList@313[1] { ResolutionCandidate@312 }
+ResolutionTaskHolder@308 {
+    <name not found> = ArrayList@309[1] { ResolutionCandidate@310 }
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
+}
+
+ResolutionTaskHolder@311 {
+    <name not found> = ArrayList@312[1] { ResolutionCandidate@313 }
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
 }
 
 ResolutionTaskHolder@314 {
     <name not found> = ArrayList@315[1] { ResolutionCandidate@316 }
-    <name not found> = ArrayList@317[1] { ResolutionCandidate@316 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@318 {
-    <name not found> = ArrayList@319[1] { ResolutionCandidate@320 }
-    <name not found> = ArrayList@321[1] { ResolutionCandidate@320 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
+ResolutionTaskHolder@317 {
+    <name not found> = ArrayList@318[1] { ResolutionCandidate@319 }
 }
 
-ResolutionTaskHolder@322 {
-    <name not found> = ArrayList@323[1] { ResolutionCandidate@324 }
-    <name not found> = ArrayList@325[1] { ResolutionCandidate@324 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
+ResolutionTaskHolder@320 {
+    <name not found> = ArrayList@321[1] { ResolutionCandidate@322 }
+}
+
+ResolutionTaskHolder@323 {
+    <name not found> = ArrayList@324[1] { ResolutionCandidate@325 }
 }
 
 ResolutionTaskHolder@326 {
     <name not found> = ArrayList@327[1] { ResolutionCandidate@328 }
-    <name not found> = ArrayList@329[1] { ResolutionCandidate@328 }
 }
 
-ResolutionTaskHolder@330 {
-    <name not found> = ArrayList@331[1] { ResolutionCandidate@332 }
-    <name not found> = ArrayList@333[1] { ResolutionCandidate@332 }
+ResolutionTaskHolder@329 {
+    <name not found> = ArrayList@330[1] { ResolutionCandidate@331 }
 }
 
-ResolutionTaskHolder@334 {
-    <name not found> = ArrayList@335[1] { ResolutionCandidate@336 }
-    <name not found> = ArrayList@337[1] { ResolutionCandidate@336 }
+ResolutionTaskHolder@332 {
+    <name not found> = ArrayList@333[1] { ResolutionCandidate@334 }
+}
+
+ResolutionTaskHolder@335 {
+    <name not found> = ArrayList@336[1] { ResolutionCandidate@337 }
 }
 
 ResolutionTaskHolder@338 {
     <name not found> = ArrayList@339[1] { ResolutionCandidate@340 }
-    <name not found> = ArrayList@341[1] { ResolutionCandidate@340 }
 }
 
-ResolutionTaskHolder@342 {
-    <name not found> = ArrayList@343[1] { ResolutionCandidate@344 }
-    <name not found> = ArrayList@345[1] { ResolutionCandidate@344 }
+ResolutionTaskHolder@341 {
+    <name not found> = ArrayList@342[1] { ResolutionCandidate@343 }
 }
 
-ResolutionTaskHolder@346 {
-    <name not found> = ArrayList@347[1] { ResolutionCandidate@348 }
-    <name not found> = ArrayList@349[1] { ResolutionCandidate@348 }
+ResolutionTaskHolder@344 {
+    <name not found> = ArrayList@345[1] { ResolutionCandidate@346 }
+}
+
+ResolutionTaskHolder@347 {
+    <name not found> = ArrayList@348[1] { ResolutionCandidate@349 }
 }
 
 ResolutionTaskHolder@350 {
     <name not found> = ArrayList@351[1] { ResolutionCandidate@352 }
-    <name not found> = ArrayList@353[1] { ResolutionCandidate@352 }
 }
 
-ResolutionTaskHolder@354 {
-    <name not found> = ArrayList@355[1] { ResolutionCandidate@356 }
-    <name not found> = ArrayList@357[1] { ResolutionCandidate@356 }
+ResolutionTaskHolder@353 {
+    <name not found> = ArrayList@354[1] { ResolutionCandidate@355 }
 }
 
-ResolutionTaskHolder@358 {
-    <name not found> = ArrayList@359[1] { ResolutionCandidate@360 }
-    <name not found> = ArrayList@361[1] { ResolutionCandidate@360 }
+ResolutionTaskHolder@356 {
+    <name not found> = ArrayList@357[1] { ResolutionCandidate@358 }
+}
+
+ResolutionTaskHolder@359 {
+    <name not found> = ArrayList@360[1] { ResolutionCandidate@361 }
 }
 
 ResolutionTaskHolder@362 {
     <name not found> = ArrayList@363[1] { ResolutionCandidate@364 }
-    <name not found> = ArrayList@365[1] { ResolutionCandidate@364 }
 }
 
-ResolutionTaskHolder@366 {
-    <name not found> = ArrayList@367[1] { ResolutionCandidate@368 }
-    <name not found> = ArrayList@369[1] { ResolutionCandidate@368 }
+ResolutionTaskHolder@365 {
+    <name not found> = ArrayList@366[1] { ResolutionCandidate@367 }
 }
 
-ResolutionTaskHolder@370 {
-    <name not found> = ArrayList@371[1] { ResolutionCandidate@372 }
-    <name not found> = ArrayList@373[1] { ResolutionCandidate@372 }
+ResolutionTaskHolder@368 {
+    <name not found> = ArrayList@369[1] { ResolutionCandidate@370 }
+}
+
+ResolutionTaskHolder@371 {
+    <name not found> = ArrayList@372[1] { ResolutionCandidate@373 }
 }
 
 ResolutionTaskHolder@374 {
     <name not found> = ArrayList@375[1] { ResolutionCandidate@376 }
-    <name not found> = ArrayList@377[1] { ResolutionCandidate@376 }
 }
 
-ResolutionTaskHolder@378 {
-    <name not found> = ArrayList@379[1] { ResolutionCandidate@380 }
-    <name not found> = ArrayList@381[1] { ResolutionCandidate@380 }
+ResolutionTaskHolder@377 {
+    <name not found> = ArrayList@378[1] { ResolutionCandidate@379 }
 }
 
-ResolutionTaskHolder@382 {
-    <name not found> = ArrayList@383[1] { ResolutionCandidate@384 }
-    <name not found> = ArrayList@385[1] { ResolutionCandidate@384 }
+ResolutionTaskHolder@380 {
+    <name not found> = ArrayList@381[1] { ResolutionCandidate@382 }
+}
+
+ResolutionTaskHolder@383 {
+    <name not found> = ArrayList@384[1] { ResolutionCandidate@385 }
 }
 
 ResolutionTaskHolder@386 {
     <name not found> = ArrayList@387[1] { ResolutionCandidate@388 }
-    <name not found> = ArrayList@389[1] { ResolutionCandidate@388 }
 }
 
-ResolutionTaskHolder@390 {
-    <name not found> = ArrayList@391[1] { ResolutionCandidate@392 }
-    <name not found> = ArrayList@393[1] { ResolutionCandidate@392 }
+ResolutionTaskHolder@389 {
+    <name not found> = ArrayList@390[1] { ResolutionCandidate@391 }
 }
 
-ResolutionTaskHolder@394 {
-    <name not found> = ArrayList@395[1] { ResolutionCandidate@396 }
-    <name not found> = ArrayList@397[1] { ResolutionCandidate@396 }
+ResolutionTaskHolder@392 {
+    <name not found> = ArrayList@393[2] { ResolutionCandidate@394, ResolutionCandidate@395 }
 }
 
-ResolutionTaskHolder@398 {
-    <name not found> = ArrayList@399[1] { ResolutionCandidate@400 }
-    <name not found> = ArrayList@401[1] { ResolutionCandidate@400 }
+ResolutionTaskHolder@396 {
+    <name not found> = ArrayList@397[3] { ResolutionCandidate@398, ResolutionCandidate@399, ResolutionCandidate@400 }
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@402 {
-    <name not found> = ArrayList@403[1] { ResolutionCandidate@404 }
-    <name not found> = ArrayList@405[1] { ResolutionCandidate@404 }
-}
-
-ResolutionTaskHolder@406 {
-    <name not found> = ArrayList@407[1] { ResolutionCandidate@408 }
-    <name not found> = ArrayList@409[1] { ResolutionCandidate@408 }
-}
-
-ResolutionTaskHolder@410 {
-    <name not found> = ArrayList@411[1] { ResolutionCandidate@412 }
-    <name not found> = ArrayList@413[1] { ResolutionCandidate@412 }
-}
-
-ResolutionTaskHolder@414 {
-    <name not found> = ArrayList@415[1] { ResolutionCandidate@416 }
-    <name not found> = ArrayList@417[1] { ResolutionCandidate@416 }
-}
-
-ResolutionTaskHolder@418 {
-    <name not found> = ArrayList@419[1] { ResolutionCandidate@420 }
-    <name not found> = ArrayList@421[1] { ResolutionCandidate@420 }
-}
-
-ResolutionTaskHolder@422 {
-    <name not found> = ArrayList@423[1] { ResolutionCandidate@424 }
-    <name not found> = ArrayList@425[1] { ResolutionCandidate@424 }
-}
-
-ResolutionTaskHolder@426 {
-    <name not found> = ArrayList@427[2] { ResolutionCandidate@428, ResolutionCandidate@429 }
-    <name not found> = ArrayList@430[2] { ResolutionCandidate@428, ResolutionCandidate@429 }
-}
-
-ResolutionTaskHolder@431 {
-    <name not found> = ArrayList@432[3] { ResolutionCandidate@433, ResolutionCandidate@434, ResolutionCandidate@435 }
-    <name not found> = ArrayList@436[3] { ResolutionCandidate@433, ResolutionCandidate@434, ResolutionCandidate@435 }
+null {
+    <name not found> = ArrayList@401[1] { ResolutionCandidate@307 }
+    <name not found> = ArrayList@402[1] { ResolutionCandidate@340 }
+    <name not found> = ArrayList@403[1] { ResolutionCandidate@328 }
+    <name not found> = ArrayList@404[1] { ResolutionCandidate@391 }
+    <name not found> = ArrayList@405[1] { ResolutionCandidate@382 }
+    <name not found> = ArrayList@406[1] { ResolutionCandidate@358 }
+    <name not found> = ArrayList@407[1] { ResolutionCandidate@337 }
+    <name not found> = ArrayList@408[1] { ResolutionCandidate@316 }
+    <name not found> = ArrayList@409[1] { ResolutionCandidate@325 }
+    <name not found> = ArrayList@410[1] { ResolutionCandidate@367 }
+    <name not found> = ArrayList@411[1] { ResolutionCandidate@304 }
+    <name not found> = ArrayList@412[1] { ResolutionCandidate@292 }
+    <name not found> = ArrayList@413[1] { ResolutionCandidate@331 }
+    <name not found> = ArrayList@414[1] { ResolutionCandidate@319 }
+    <name not found> = ArrayList@415[1] { ResolutionCandidate@361 }
+    <name not found> = ArrayList@416[1] { ResolutionCandidate@295 }
+    <name not found> = ArrayList@417[1] { ResolutionCandidate@313 }
+    <name not found> = ArrayList@418[1] { ResolutionCandidate@298 }
+    <name not found> = ArrayList@419[1] { ResolutionCandidate@364 }
+    <name not found> = ArrayList@420[1] { ResolutionCandidate@373 }
+    <name not found> = ArrayList@421[1] { ResolutionCandidate@370 }
+    <name not found> = ArrayList@422[1] { ResolutionCandidate@334 }
+    <name not found> = ArrayList@423[1] { ResolutionCandidate@310 }
+    <name not found> = ArrayList@424[1] { ResolutionCandidate@343 }
+    <name not found> = ArrayList@425[1] { ResolutionCandidate@385 }
+    <name not found> = ArrayList@426[1] { ResolutionCandidate@322 }
+    <name not found> = ArrayList@427[1] { ResolutionCandidate@301 }
+    <name not found> = ArrayList@428[1] { ResolutionCandidate@349 }
+    <name not found> = ArrayList@429[1] { ResolutionCandidate@352 }
+    <name not found> = ArrayList@430[1] { ResolutionCandidate@388 }
+    <name not found> = ArrayList@431[1] { ResolutionCandidate@376 }
+    <name not found> = ArrayList@432[1] { ResolutionCandidate@355 }
+    <name not found> = ArrayList@433[1] { ResolutionCandidate@346 }
+    <name not found> = ArrayList@434[1] { ResolutionCandidate@379 }
+    <name not found> = ArrayList@435[2] { ResolutionCandidate@394, ResolutionCandidate@395 }
+    <name not found> = ArrayList@436[3] { ResolutionCandidate@398, ResolutionCandidate@399, ResolutionCandidate@400 }
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2407.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt2407.lazy.log
index aa52b93801f..638cd4ecc29 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2407.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2407.lazy.log
@@ -117,14 +117,14 @@ LazyJavaClassifierType@81['E'] {
     arguments = ArrayList@82[empty]
     classifier = JavaTypeParameterImpl@83['E']
     nullable = 'false': Boolean@79
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
 }
 
-LazyJavaClassifierType@84['E'] {
-    arguments = ArrayList@85[empty]
-    classifier = JavaTypeParameterImpl@86['E']
+LazyJavaClassifierType@85['E'] {
+    arguments = ArrayList@86[empty]
+    classifier = JavaTypeParameterImpl@87['E']
     nullable = 'false': Boolean@79
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@87
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
 }
 
 LazyJavaClassifierType@88['E'] {
@@ -143,14 +143,14 @@ LazyJavaClassifierType@92['E'] {
 
 LazyJavaClassifierType@95['E'] {
     arguments = ArrayList@96[empty]
-    classifier = JavaTypeParameterImpl@86['E']
+    classifier = JavaTypeParameterImpl@94['E']
     nullable = 'true': Boolean@97
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@87
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@91
 }
 
 LazyJavaClassifierType@98['E'] {
     arguments = ArrayList@99[empty]
-    classifier = JavaTypeParameterImpl@83['E']
+    classifier = JavaTypeParameterImpl@87['E']
     nullable = 'true': Boolean@97
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
 }
@@ -164,9 +164,9 @@ LazyJavaClassifierType@100['E'] {
 
 LazyJavaClassifierType@102['E'] {
     arguments = ArrayList@103[empty]
-    classifier = JavaTypeParameterImpl@94['E']
+    classifier = JavaTypeParameterImpl@83['E']
     nullable = 'true': Boolean@97
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@91
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
 }
 
 LazyJavaClassifierType@104['E'] {
@@ -333,12 +333,12 @@ LazyJavaTypeParameterDescriptor@47['E'] {
     upperBounds = LinkedHashSet@215[1] { NullableType@216 }
 }
 
-LazyJavaTypeParameterDescriptor@42['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
+LazyJavaTypeParameterDescriptor@38['E'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
 }
 
-LazyJavaTypeParameterDescriptor@38['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@87
+LazyJavaTypeParameterDescriptor@42['E'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
 }
 
 LazyJavaTypeParameterResolver@217 {
@@ -355,71 +355,74 @@ LazyJavaTypeParameterResolver@221 {
 
 ResolutionTaskHolder@223 {
     <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@225 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
 }
 
-ResolutionTaskHolder@227 {
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@229 }
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@229 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
+ResolutionTaskHolder@226 {
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
 }
 
-ResolutionTaskHolder@231 {
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@233 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
+ResolutionTaskHolder@229 {
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
 }
 
+ResolutionTaskHolder@232 {
+    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
+}
+
 ResolutionTaskHolder@235 {
     <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@237 }
 }
 
-ResolutionTaskHolder@239 {
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@241 }
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@241 }
+ResolutionTaskHolder@238 {
+    <name not found> = ArrayList@239[1] { ResolutionCandidate@240 }
 }
 
-ResolutionTaskHolder@243 {
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@245 }
+ResolutionTaskHolder@241 {
+    <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
+}
+
+ResolutionTaskHolder@244 {
+    <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
 }
 
 ResolutionTaskHolder@247 {
     <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@249 }
 }
 
-ResolutionTaskHolder@251 {
-    <name not found> = ArrayList@252[1] { ResolutionCandidate@253 }
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@253 }
+ResolutionTaskHolder@250 {
+    <name not found> = ArrayList@251[4] { ResolutionCandidate@252, ResolutionCandidate@253, ResolutionCandidate@254, ... }
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
 }
 
 ResolutionTaskHolder@255 {
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
-    <name not found> = ArrayList@258[1] { ResolutionCandidate@257 }
-}
-
-ResolutionTaskHolder@259 {
-    <name not found> = ArrayList@260[4] { ResolutionCandidate@261, ResolutionCandidate@262, ResolutionCandidate@263, ... }
-    <name not found> = ArrayList@264[4] { ResolutionCandidate@261, ResolutionCandidate@262, ResolutionCandidate@263, ... }
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
 }
 
-ResolutionTaskHolder@265 {
+null {
+    <name not found> = ArrayList@256[1] { ResolutionCandidate@228 }
+    <name not found> = ArrayList@257[1] { ResolutionCandidate@225 }
+    <name not found> = ArrayList@258[1] { ResolutionCandidate@234 }
+    <name not found> = ArrayList@259[1] { ResolutionCandidate@249 }
+    <name not found> = ArrayList@260[1] { ResolutionCandidate@231 }
+    <name not found> = ArrayList@261[1] { ResolutionCandidate@246 }
+    <name not found> = ArrayList@262[1] { ResolutionCandidate@240 }
+    <name not found> = ArrayList@263[1] { ResolutionCandidate@237 }
+    <name not found> = ArrayList@264[1] { ResolutionCandidate@243 }
+    <name not found> = ArrayList@265[4] { ResolutionCandidate@252, ResolutionCandidate@253, ResolutionCandidate@254, ... }
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2445.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt2445.lazy.log
index 1c8417a5746..d90443d2f41 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2445.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2445.lazy.log
@@ -42,26 +42,29 @@ LazyJavaPackageFragment@15['lang'] {
 
 ResolutionTaskHolder@37 {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@31[empty]
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+}
+
+null {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@48 }
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2459.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt2459.lazy.log
index 770d28dc6d6..3b0b568cf1f 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2459.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2459.lazy.log
@@ -193,12 +193,12 @@ LazyJavaPackageFragment@87['util'] {
 }
 
 LazyJavaTypeParameterDescriptor@18['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@39
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@43
     upperBounds = LinkedHashSet@118[1] { NullableType@119 }
 }
 
 LazyJavaTypeParameterDescriptor@13['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@43
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@39
 }
 
 LazyJavaTypeParameterResolver@120 {
@@ -206,28 +206,31 @@ LazyJavaTypeParameterResolver@120 {
 }
 
 LazyJavaTypeParameterResolver@122 {
-    resolve(JavaTypeParameterImpl@42['E']) = LazyJavaTypeParameterDescriptor@13['E']
+    resolve(JavaTypeParameterImpl@37['E']) = LazyJavaTypeParameterDescriptor@13['E']
 }
 
 ResolutionTaskHolder@123 {
     <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@125 }
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
     <name not found> = EmptyList@107[empty]
     <name not found> = EmptyList@107[empty]
 }
 
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@129 }
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
+ResolutionTaskHolder@126 {
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
     <name not found> = EmptyList@107[empty]
     <name not found> = EmptyList@107[empty]
 }
 
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@133 }
+ResolutionTaskHolder@129 {
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
+}
+
+null {
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@131 }
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@128 }
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@125 }
+    <name not found> = EmptyList@107[empty]
+    <name not found> = EmptyList@107[empty]
+    <name not found> = EmptyList@107[empty]
+    <name not found> = EmptyList@107[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2484.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt2484.lazy.log
index 18c5bd78b5c..cb2a8674ec3 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2484.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2484.lazy.log
@@ -48,259 +48,262 @@ LazyJavaPackageFragment@17['lang'] {
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
 ResolutionTaskHolder@52 {
     <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
+}
+
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
 ResolutionTaskHolder@64 {
     <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
     <name not found> = EmptyList@33[empty]
+}
+
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
     <name not found> = EmptyList@33[empty]
 }
 
 ResolutionTaskHolder@76 {
     <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
 }
 
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
+}
+
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
 }
 
 ResolutionTaskHolder@88 {
     <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
 }
 
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
+}
+
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
 }
 
 ResolutionTaskHolder@100 {
     <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
 }
 
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
+}
+
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
 }
 
 ResolutionTaskHolder@112 {
     <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
 }
 
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
+ResolutionTaskHolder@115 {
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
 }
 
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
+ResolutionTaskHolder@118 {
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
+}
+
+ResolutionTaskHolder@121 {
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
 }
 
 ResolutionTaskHolder@124 {
     <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@126 }
 }
 
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
+ResolutionTaskHolder@127 {
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
 }
 
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
+ResolutionTaskHolder@130 {
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
+}
+
+ResolutionTaskHolder@133 {
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
 }
 
 ResolutionTaskHolder@136 {
     <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
 }
 
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
+ResolutionTaskHolder@139 {
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
 }
 
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
+ResolutionTaskHolder@142 {
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
+}
+
+ResolutionTaskHolder@145 {
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
 }
 
 ResolutionTaskHolder@148 {
     <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
 }
 
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
+ResolutionTaskHolder@151 {
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
 }
 
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
+ResolutionTaskHolder@154 {
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
+}
+
+ResolutionTaskHolder@157 {
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
 }
 
 ResolutionTaskHolder@160 {
     <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@162 }
 }
 
-ResolutionTaskHolder@164 {
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@166 }
+ResolutionTaskHolder@163 {
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
 }
 
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@170 }
+ResolutionTaskHolder@166 {
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
 }
 
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@174 }
-}
-
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@178 }
-}
-
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@182 }
-}
-
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@186 }
-}
-
-ResolutionTaskHolder@188 {
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@190 }
-}
-
-ResolutionTaskHolder@192 {
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@194 }
-}
-
-ResolutionTaskHolder@196 {
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@198 }
-}
-
-ResolutionTaskHolder@200 {
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@202 }
-}
-
-ResolutionTaskHolder@204 {
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@206 }
-}
-
-ResolutionTaskHolder@208 {
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@210 }
+null {
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@170[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@165 }
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@135 }
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@176[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@126 }
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@141 }
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@168 }
+    <name not found> = ArrayList@189[1] { ResolutionCandidate@159 }
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@192[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@194[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@156 }
+    <name not found> = ArrayList@196[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@197[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@198[1] { ResolutionCandidate@162 }
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@200[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@201[1] { ResolutionCandidate@147 }
+    <name not found> = ArrayList@202[1] { ResolutionCandidate@153 }
+    <name not found> = ArrayList@203[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@204[1] { ResolutionCandidate@132 }
+    <name not found> = ArrayList@205[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@206[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@207[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@208[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@209[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@210[1] { ResolutionCandidate@129 }
+    <name not found> = ArrayList@211[1] { ResolutionCandidate@99 }
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2505.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt2505.lazy.log
index c2d351dcffa..5173fd8aef2 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2505.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2505.lazy.log
@@ -40,14 +40,14 @@ LazyJavaClassifierType@22['String'] {
 
 LazyJavaClassifierType@25['String'] {
     arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@13['String']
+    classifier = JavaClassImpl@21['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@21['String']
+    classifier = JavaClassImpl@13['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
@@ -151,35 +151,38 @@ LazyJavaPackageFragment@66['lang'] {
 
 ResolutionTaskHolder@92 {
     <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
 }
 
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
 }
 
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[2] { ResolutionCandidate@106, ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[2] { ResolutionCandidate@106, ResolutionCandidate@107 }
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[2] { ResolutionCandidate@103, ResolutionCandidate@104 }
 }
 
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[4] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113, ... }
-    <name not found> = ArrayList@114[5] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113, ... }
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[4] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+}
+
+null {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@113[2] { ResolutionCandidate@103, ResolutionCandidate@104 }
+    <name not found> = ArrayList@114[5] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
     <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2514.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt2514.lazy.log
index b8427a198ab..783eb5a31cf 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2514.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2514.lazy.log
@@ -147,7 +147,7 @@ LazyJavaClassifierType@99['Runnable'] {
 
 LazyJavaClassifierType@102['Runnable'] {
     arguments = ArrayList@103[empty]
-    classifier = JavaClassImpl@101['Runnable']
+    classifier = JavaClassImpl@95['Runnable']
     nullable = 'true': Boolean@104
     typeConstructor = LazyJavaClassTypeConstructor@52['Runnable']
 }
@@ -161,14 +161,14 @@ LazyJavaClassifierType@105['Runnable'] {
 
 LazyJavaClassifierType@107['Runnable'] {
     arguments = ArrayList@108[empty]
-    classifier = JavaClassImpl@95['Runnable']
+    classifier = JavaClassImpl@88['Runnable']
     nullable = 'true': Boolean@104
     typeConstructor = LazyJavaClassTypeConstructor@52['Runnable']
 }
 
 LazyJavaClassifierType@109['Runnable'] {
     arguments = ArrayList@110[empty]
-    classifier = JavaClassImpl@88['Runnable']
+    classifier = JavaClassImpl@101['Runnable']
     nullable = 'true': Boolean@104
     typeConstructor = LazyJavaClassTypeConstructor@52['Runnable']
 }
@@ -217,35 +217,35 @@ LazyJavaClassifierType@126['String'] {
 
 LazyJavaClassifierType@129['String'] {
     arguments = ArrayList@130[empty]
-    classifier = JavaClassImpl@122['String']
+    classifier = JavaClassImpl@128['String']
     nullable = 'true': Boolean@104
     typeConstructor = DeserializedClassTypeConstructor@116
 }
 
 LazyJavaClassifierType@131['String'] {
     arguments = ArrayList@132[empty]
-    classifier = JavaClassImpl@128['String']
+    classifier = JavaClassImpl@115['String']
     nullable = 'true': Boolean@104
     typeConstructor = DeserializedClassTypeConstructor@116
 }
 
 LazyJavaClassifierType@133['String'] {
     arguments = ArrayList@134[empty]
-    classifier = JavaClassImpl@115['String']
+    classifier = JavaClassImpl@125['String']
     nullable = 'true': Boolean@104
     typeConstructor = DeserializedClassTypeConstructor@116
 }
 
 LazyJavaClassifierType@135['String'] {
     arguments = ArrayList@136[empty]
-    classifier = JavaClassImpl@119['String']
+    classifier = JavaClassImpl@122['String']
     nullable = 'true': Boolean@104
     typeConstructor = DeserializedClassTypeConstructor@116
 }
 
 LazyJavaClassifierType@137['String'] {
     arguments = ArrayList@138[empty]
-    classifier = JavaClassImpl@125['String']
+    classifier = JavaClassImpl@119['String']
     nullable = 'true': Boolean@104
     typeConstructor = DeserializedClassTypeConstructor@116
 }
@@ -368,113 +368,116 @@ LazyJavaPackageFragment@168['lang'] {
 }
 
 ResolutionTaskHolder@217 {
-    <name not found> = ArrayList@218[13] { ResolutionCandidate@219, ResolutionCandidate@220, ResolutionCandidate@221, ... }
-    <name not found> = ArrayList@222[8] { ResolutionCandidate@219, ResolutionCandidate@220, ResolutionCandidate@223, ... }
-    <name not found> = EmptyList@3[empty]
-    <name not found> = EmptyList@3[empty]
+    <name not found> = ArrayList@218[1] { ResolutionCandidate@219 }
+    <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
     <name not found> = EmptyList@3[empty]
     <name not found> = EmptyList@3[empty]
 }
 
-ResolutionTaskHolder@224 {
-    <name not found> = ArrayList@225[13] { ResolutionCandidate@226, ResolutionCandidate@227, ResolutionCandidate@228, ... }
-    <name not found> = ArrayList@229[8] { ResolutionCandidate@226, ResolutionCandidate@227, ResolutionCandidate@230, ... }
-    <name not found> = EmptyList@3[empty]
-    <name not found> = EmptyList@3[empty]
+ResolutionTaskHolder@222 {
+    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
     <name not found> = EmptyList@3[empty]
+}
+
+ResolutionTaskHolder@225 {
+    <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
     <name not found> = EmptyList@3[empty]
 }
 
+ResolutionTaskHolder@228 {
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
+}
+
 ResolutionTaskHolder@231 {
-    <name not found> = ArrayList@232[13] { ResolutionCandidate@233, ResolutionCandidate@234, ResolutionCandidate@235, ... }
-    <name not found> = ArrayList@236[8] { ResolutionCandidate@233, ResolutionCandidate@234, ResolutionCandidate@237, ... }
-    <name not found> = EmptyList@3[empty]
-    <name not found> = EmptyList@3[empty]
+    <name not found> = ArrayList@232[2] { ResolutionCandidate@233, ResolutionCandidate@234 }
     <name not found> = EmptyList@3[empty]
     <name not found> = EmptyList@3[empty]
 }
 
-ResolutionTaskHolder@238 {
-    <name not found> = ArrayList@239[13] { ResolutionCandidate@240, ResolutionCandidate@241, ResolutionCandidate@242, ... }
-    <name not found> = ArrayList@243[8] { ResolutionCandidate@240, ResolutionCandidate@241, ResolutionCandidate@244, ... }
-    <name not found> = EmptyList@3[empty]
-    <name not found> = EmptyList@3[empty]
+ResolutionTaskHolder@235 {
+    <name not found> = ArrayList@236[2] { ResolutionCandidate@237, ResolutionCandidate@238 }
     <name not found> = EmptyList@3[empty]
     <name not found> = EmptyList@3[empty]
 }
 
-ResolutionTaskHolder@245 {
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@247 }
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@247 }
-    <name not found> = ArrayList@249[1] { ResolutionCandidate@250 }
-    <name not found> = ArrayList@251[1] { ResolutionCandidate@250 }
+ResolutionTaskHolder@239 {
+    <name not found> = ArrayList@240[2] { ResolutionCandidate@241, ResolutionCandidate@242 }
     <name not found> = EmptyList@3[empty]
     <name not found> = EmptyList@3[empty]
+}
+
+ResolutionTaskHolder@243 {
+    <name not found> = ArrayList@244[2] { ResolutionCandidate@245, ResolutionCandidate@246 }
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+}
+
+ResolutionTaskHolder@247 {
+    <name not found> = ArrayList@248[8] { ResolutionCandidate@249, ResolutionCandidate@250, ResolutionCandidate@251, ... }
     <name not found> = EmptyList@3[empty]
     <name not found> = EmptyList@3[empty]
 }
 
 ResolutionTaskHolder@252 {
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
-    <name not found> = ArrayList@255[1] { ResolutionCandidate@254 }
+    <name not found> = ArrayList@253[8] { ResolutionCandidate@254, ResolutionCandidate@255, ResolutionCandidate@256, ... }
     <name not found> = EmptyList@3[empty]
     <name not found> = EmptyList@3[empty]
 }
 
-ResolutionTaskHolder@256 {
-    <name not found> = ArrayList@257[1] { ResolutionCandidate@258 }
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@258 }
+ResolutionTaskHolder@257 {
+    <name not found> = ArrayList@258[8] { ResolutionCandidate@259, ResolutionCandidate@260, ResolutionCandidate@261, ... }
     <name not found> = EmptyList@3[empty]
     <name not found> = EmptyList@3[empty]
 }
 
-ResolutionTaskHolder@260 {
-    <name not found> = ArrayList@261[1] { ResolutionCandidate@262 }
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@262 }
-}
-
-ResolutionTaskHolder@264 {
-    <name not found> = ArrayList@265[2] { ResolutionCandidate@266, ResolutionCandidate@267 }
-    <name not found> = ArrayList@268[2] { ResolutionCandidate@266, ResolutionCandidate@267 }
-    <name not found> = EmptyList@3[empty]
-    <name not found> = EmptyList@3[empty]
+ResolutionTaskHolder@262 {
+    <name not found> = ArrayList@263[8] { ResolutionCandidate@264, ResolutionCandidate@265, ResolutionCandidate@266, ... }
     <name not found> = EmptyList@3[empty]
     <name not found> = EmptyList@3[empty]
 }
 
-ResolutionTaskHolder@269 {
-    <name not found> = ArrayList@270[2] { ResolutionCandidate@271, ResolutionCandidate@272 }
-    <name not found> = ArrayList@273[2] { ResolutionCandidate@271, ResolutionCandidate@272 }
-    <name not found> = EmptyList@3[empty]
-    <name not found> = EmptyList@3[empty]
-    <name not found> = EmptyList@3[empty]
-    <name not found> = EmptyList@3[empty]
+ResolutionTaskHolder@267 {
+    <name not found> = ArrayList@268[8] { ResolutionCandidate@269, ResolutionCandidate@270, ResolutionCandidate@271, ... }
 }
 
-ResolutionTaskHolder@274 {
-    <name not found> = ArrayList@275[2] { ResolutionCandidate@276, ResolutionCandidate@277 }
-    <name not found> = ArrayList@278[2] { ResolutionCandidate@276, ResolutionCandidate@277 }
-    <name not found> = EmptyList@3[empty]
-    <name not found> = EmptyList@3[empty]
-    <name not found> = EmptyList@3[empty]
-    <name not found> = EmptyList@3[empty]
+ResolutionTaskHolder@272 {
+    <name not found> = ArrayList@273[8] { ResolutionCandidate@274, ResolutionCandidate@275, ResolutionCandidate@276, ... }
 }
 
-ResolutionTaskHolder@279 {
-    <name not found> = ArrayList@280[2] { ResolutionCandidate@281, ResolutionCandidate@282 }
-    <name not found> = ArrayList@283[2] { ResolutionCandidate@281, ResolutionCandidate@282 }
+null {
+    <name not found> = ArrayList@277[13] { ResolutionCandidate@254, ResolutionCandidate@255, ResolutionCandidate@278, ... }
+    <name not found> = ArrayList@279[13] { ResolutionCandidate@259, ResolutionCandidate@260, ResolutionCandidate@280, ... }
+    <name not found> = ArrayList@281[13] { ResolutionCandidate@264, ResolutionCandidate@265, ResolutionCandidate@282, ... }
+    <name not found> = ArrayList@283[13] { ResolutionCandidate@249, ResolutionCandidate@250, ResolutionCandidate@284, ... }
+    <name not found> = ArrayList@285[1] { ResolutionCandidate@224 }
+    <name not found> = ArrayList@286[1] { ResolutionCandidate@219 }
+    <name not found> = ArrayList@287[1] { ResolutionCandidate@221 }
+    <name not found> = ArrayList@288[1] { ResolutionCandidate@227 }
+    <name not found> = ArrayList@289[1] { ResolutionCandidate@230 }
+    <name not found> = ArrayList@290[2] { ResolutionCandidate@245, ResolutionCandidate@246 }
+    <name not found> = ArrayList@291[2] { ResolutionCandidate@241, ResolutionCandidate@242 }
+    <name not found> = ArrayList@292[2] { ResolutionCandidate@237, ResolutionCandidate@238 }
+    <name not found> = ArrayList@293[2] { ResolutionCandidate@233, ResolutionCandidate@234 }
+    <name not found> = ArrayList@294[8] { ResolutionCandidate@274, ResolutionCandidate@275, ResolutionCandidate@276, ... }
+    <name not found> = ArrayList@295[8] { ResolutionCandidate@269, ResolutionCandidate@270, ResolutionCandidate@271, ... }
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
     <name not found> = EmptyList@3[empty]
     <name not found> = EmptyList@3[empty]
     <name not found> = EmptyList@3[empty]
     <name not found> = EmptyList@3[empty]
 }
-
-ResolutionTaskHolder@284 {
-    <name not found> = ArrayList@285[8] { ResolutionCandidate@286, ResolutionCandidate@287, ResolutionCandidate@288, ... }
-    <name not found> = ArrayList@289[8] { ResolutionCandidate@286, ResolutionCandidate@287, ResolutionCandidate@288, ... }
-}
-
-ResolutionTaskHolder@290 {
-    <name not found> = ArrayList@291[8] { ResolutionCandidate@292, ResolutionCandidate@293, ResolutionCandidate@294, ... }
-    <name not found> = ArrayList@295[8] { ResolutionCandidate@292, ResolutionCandidate@293, ResolutionCandidate@294, ... }
-}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2741.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt2741.lazy.log
index 115da9b9586..a236f86ff6e 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2741.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2741.lazy.log
@@ -33,14 +33,14 @@ LazyJavaClassifierType@19['String'] {
 
 LazyJavaClassifierType@22['String'] {
     arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@13['String']
+    classifier = JavaClassImpl@18['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
 
 LazyJavaClassifierType@25['String'] {
     arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@18['String']
+    classifier = JavaClassImpl@13['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
@@ -75,21 +75,21 @@ LazyJavaClassifierType@36['Throwable'] {
 
 LazyJavaClassifierType@39['Throwable'] {
     arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@35['Throwable']
+    classifier = JavaClassImpl@31['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@31['Throwable']
+    classifier = JavaClassImpl@38['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
 
 LazyJavaClassifierType@43['Throwable'] {
     arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@38['Throwable']
+    classifier = JavaClassImpl@35['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
@@ -164,34 +164,41 @@ LazyJavaPackageFragment@68['lang'] {
 
 ResolutionTaskHolder@102 {
     <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+}
+
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+}
+
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+}
+
+ResolutionTaskHolder@111 {
+    <name not found> = ArrayList@112[4] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
     <name not found> = EmptyList@92[empty]
     <name not found> = EmptyList@92[empty]
     <name not found> = EmptyList@92[empty]
     <name not found> = EmptyList@92[empty]
 }
 
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[4] { ResolutionCandidate@118, ResolutionCandidate@119, ResolutionCandidate@120, ... }
     <name not found> = EmptyList@92[empty]
     <name not found> = EmptyList@92[empty]
 }
 
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[4] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
-    <name not found> = ArrayList@119[5] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
+ResolutionTaskHolder@121 {
     <name not found> = EmptyList@92[empty]
     <name not found> = EmptyList@92[empty]
     <name not found> = EmptyList@92[empty]
@@ -210,28 +217,7 @@ ResolutionTaskHolder@114 {
     <name not found> = EmptyList@92[empty]
 }
 
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[4] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
-    <name not found> = ArrayList@125[5] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
+ResolutionTaskHolder@122 {
     <name not found> = EmptyList@92[empty]
     <name not found> = EmptyList@92[empty]
     <name not found> = EmptyList@92[empty]
@@ -242,7 +228,24 @@ ResolutionTaskHolder@126 {
     <name not found> = EmptyList@92[empty]
 }
 
-ResolutionTaskHolder@127 {
+null {
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@126[5] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
+    <name not found> = ArrayList@127[5] { ResolutionCandidate@118, ResolutionCandidate@119, ResolutionCandidate@120, ... }
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
     <name not found> = EmptyList@92[empty]
     <name not found> = EmptyList@92[empty]
     <name not found> = EmptyList@92[empty]
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2838.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt2838.lazy.log
index 2a16aef5d9c..dec600dc932 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2838.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2838.lazy.log
@@ -38,21 +38,21 @@ LazyJavaClassifierType@22['String'] {
 
 LazyJavaClassifierType@25['String'] {
     arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@21['String']
+    classifier = JavaClassImpl@16['String']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@18
 }
 
 LazyJavaClassifierType@28['String'] {
     arguments = ArrayList@29[empty]
-    classifier = JavaClassImpl@24['String']
+    classifier = JavaClassImpl@21['String']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@18
 }
 
 LazyJavaClassifierType@30['String'] {
     arguments = ArrayList@31[empty]
-    classifier = JavaClassImpl@16['String']
+    classifier = JavaClassImpl@24['String']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@18
 }
@@ -80,21 +80,21 @@ LazyJavaClassifierType@39['Throwable'] {
 
 LazyJavaClassifierType@42['Throwable'] {
     arguments = ArrayList@43[empty]
-    classifier = JavaClassImpl@38['Throwable']
+    classifier = JavaClassImpl@34['Throwable']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@35
 }
 
 LazyJavaClassifierType@44['Throwable'] {
     arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@34['Throwable']
+    classifier = JavaClassImpl@41['Throwable']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@35
 }
 
 LazyJavaClassifierType@46['Throwable'] {
     arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@41['Throwable']
+    classifier = JavaClassImpl@38['Throwable']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@35
 }
@@ -152,102 +152,105 @@ LazyJavaPackageFragment@65['lang'] {
 
 ResolutionTaskHolder@89 {
     <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
 }
 
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
+}
+
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
 }
 
 ResolutionTaskHolder@101 {
     <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
 }
 
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
 }
 
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
+}
+
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
 }
 
 ResolutionTaskHolder@113 {
     <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
 }
 
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
 }
 
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
+ResolutionTaskHolder@119 {
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
+}
+
+ResolutionTaskHolder@122 {
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
 }
 
 ResolutionTaskHolder@125 {
     <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@127 }
 }
 
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@131 }
+ResolutionTaskHolder@128 {
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
 }
 
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@135 }
-}
-
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@139 }
-}
-
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@143 }
-}
-
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[4] { ResolutionCandidate@147, ResolutionCandidate@148, ResolutionCandidate@149, ... }
-    <name not found> = ArrayList@150[5] { ResolutionCandidate@147, ResolutionCandidate@148, ResolutionCandidate@149, ... }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
+ResolutionTaskHolder@131 {
+    <name not found> = ArrayList@132[4] { ResolutionCandidate@133, ResolutionCandidate@134, ResolutionCandidate@135, ... }
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
 }
 
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[4] { ResolutionCandidate@153, ResolutionCandidate@154, ResolutionCandidate@155, ... }
-    <name not found> = ArrayList@156[5] { ResolutionCandidate@153, ResolutionCandidate@154, ResolutionCandidate@155, ... }
+ResolutionTaskHolder@136 {
+    <name not found> = ArrayList@137[4] { ResolutionCandidate@138, ResolutionCandidate@139, ResolutionCandidate@140, ... }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+}
+
+null {
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@124 }
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@127 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@155[5] { ResolutionCandidate@133, ResolutionCandidate@134, ResolutionCandidate@135, ... }
+    <name not found> = ArrayList@156[5] { ResolutionCandidate@138, ResolutionCandidate@139, ResolutionCandidate@140, ... }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2841.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt2841.lazy.log
index 5884df874a6..7bc7d36b614 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2841.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2841.lazy.log
@@ -65,44 +65,30 @@ LazyJavaPackageFragment@25['lang'] {
 
 ResolutionTaskHolder@57 {
     <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@48[empty]
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
     <name not found> = EmptyList@48[empty]
 }
 
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
+}
+
 ResolutionTaskHolder@69 {
     <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
+ResolutionTaskHolder@72 {
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
@@ -121,7 +107,24 @@ ResolutionTaskHolder@77 {
     <name not found> = EmptyList@48[empty]
 }
 
-ResolutionTaskHolder@78 {
+ResolutionTaskHolder@73 {
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+}
+
+null {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@62 }
+    <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2841_it.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt2841_it.lazy.log
index 1ccce7fc2e1..480f93157fe 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2841_it.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2841_it.lazy.log
@@ -57,54 +57,38 @@ LazyJavaPackageFragment@21['lang'] {
 
 ResolutionTaskHolder@49 {
     <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@40[empty]
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@40[empty]
 }
 
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
+}
+
 ResolutionTaskHolder@61 {
     <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
+ResolutionTaskHolder@70 {
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
@@ -123,7 +107,26 @@ ResolutionTaskHolder@77 {
     <name not found> = EmptyList@40[empty]
 }
 
-ResolutionTaskHolder@78 {
+ResolutionTaskHolder@71 {
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+}
+
+null {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@66 }
+    <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2841_it_this.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt2841_it_this.lazy.log
index cfa16c9b7b9..f859a3b509c 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2841_it_this.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2841_it_this.lazy.log
@@ -59,8 +59,6 @@ LazyJavaPackageFragment@21['lang'] {
 
 ResolutionTaskHolder@50 {
     <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
@@ -70,83 +68,54 @@ ResolutionTaskHolder@50 {
     <name not found> = EmptyList@40[empty]
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
+}
+
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
 }
 
 ResolutionTaskHolder@62 {
     <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
+}
+
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
 }
 
 ResolutionTaskHolder@74 {
     <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
 }
 
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
 }
 
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
+ResolutionTaskHolder@83 {
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
@@ -197,7 +166,7 @@ ResolutionTaskHolder@94 {
     <name not found> = EmptyList@40[empty]
 }
 
-ResolutionTaskHolder@95 {
+ResolutionTaskHolder@84 {
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
@@ -222,6 +191,40 @@ ResolutionTaskHolder@95 {
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
+}
+
+null {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@79 }
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2841_this.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt2841_this.lazy.log
index 004ed87a3ba..b21a3c98d41 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2841_this.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2841_this.lazy.log
@@ -59,76 +59,45 @@ LazyJavaPackageFragment@21['lang'] {
 
 ResolutionTaskHolder@50 {
     <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
+    <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
 }
 
 ResolutionTaskHolder@61 {
     <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
+}
+
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
 }
 
 ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
@@ -179,7 +148,7 @@ ResolutionTaskHolder@81 {
     <name not found> = EmptyList@40[empty]
 }
 
-ResolutionTaskHolder@82 {
+ResolutionTaskHolder@74 {
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
@@ -204,6 +173,40 @@ ResolutionTaskHolder@82 {
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
+}
+
+null {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@69 }
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2842.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt2842.lazy.log
index 928937c9d7d..28093993591 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2842.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2842.lazy.log
@@ -74,12 +74,6 @@ LazyJavaPackageFragment@29['lang'] {
 
 ResolutionTaskHolder@67 {
     <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
@@ -105,44 +99,53 @@ ResolutionTaskHolder@67 {
     <name not found> = EmptyList@59[empty]
 }
 
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
 }
 
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
+}
+
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
 }
 
 ResolutionTaskHolder@79 {
     <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
 }
 
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
 }
 
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
 }
 
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
+null {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@69 }
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2883.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt2883.lazy.log
index ee538f62ff6..667ba4ca010 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2883.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2883.lazy.log
@@ -56,96 +56,99 @@ LazyJavaPackageFragment@21['lang'] {
 
 ResolutionTaskHolder@50 {
     <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
+}
+
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
 }
 
 ResolutionTaskHolder@62 {
     <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
+}
+
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
 }
 
 ResolutionTaskHolder@74 {
     <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
 }
 
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
 }
 
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[2] { ResolutionCandidate@96, ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[2] { ResolutionCandidate@96, ResolutionCandidate@97 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[2] { ResolutionCandidate@85, ResolutionCandidate@86 }
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
 }
 
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[2] { ResolutionCandidate@101, ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[2] { ResolutionCandidate@101, ResolutionCandidate@102 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[2] { ResolutionCandidate@89, ResolutionCandidate@90 }
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[2] { ResolutionCandidate@106, ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[2] { ResolutionCandidate@106, ResolutionCandidate@107 }
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[2] { ResolutionCandidate@93, ResolutionCandidate@94 }
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+}
+
+null {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@106[2] { ResolutionCandidate@89, ResolutionCandidate@90 }
+    <name not found> = ArrayList@107[2] { ResolutionCandidate@93, ResolutionCandidate@94 }
+    <name not found> = ArrayList@108[2] { ResolutionCandidate@85, ResolutionCandidate@86 }
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt3007.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt3007.lazy.log
index 51286a2fb2b..05987ca0860 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt3007.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt3007.lazy.log
@@ -46,15 +46,6 @@ LazyJavaPackageFragment@17['lang'] {
 
 ResolutionTaskHolder@41 {
     <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
@@ -65,23 +56,22 @@ ResolutionTaskHolder@41 {
     <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
+}
+
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
@@ -89,119 +79,238 @@ ResolutionTaskHolder@49 {
 
 ResolutionTaskHolder@53 {
     <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
     <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
     <name not found> = EmptyList@35[empty]
+}
+
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
     <name not found> = EmptyList@35[empty]
 }
 
 ResolutionTaskHolder@65 {
     <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@35[empty]
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
     <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
     <name not found> = EmptyList@35[empty]
+}
+
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
     <name not found> = EmptyList@35[empty]
 }
 
 ResolutionTaskHolder@77 {
     <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
 }
 
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
+}
+
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
 }
 
 ResolutionTaskHolder@89 {
     <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
+}
+
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
+}
+
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
+}
+
+ResolutionTaskHolder@98 {
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
+ResolutionTaskHolder@99 {
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
+ResolutionTaskHolder@100 {
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
 }
 
 ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
+ResolutionTaskHolder@102 {
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
+ResolutionTaskHolder@103 {
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
+ResolutionTaskHolder@104 {
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
@@ -228,29 +337,7 @@ ResolutionTaskHolder@117 {
     <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@118 {
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
+ResolutionTaskHolder@105 {
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
@@ -261,7 +348,68 @@ ResolutionTaskHolder@118 {
     <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@119 {
+null {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@85 }
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
@@ -293,148 +441,3 @@ ResolutionTaskHolder@119 {
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
 }
-
-ResolutionTaskHolder@120 {
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@123 {
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt3038.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt3038.lazy.log
index ea84f4b3f9d..48610a4557f 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt3038.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt3038.lazy.log
@@ -42,92 +42,67 @@ LazyJavaPackageFragment@15['lang'] {
 
 ResolutionTaskHolder@35 {
     <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
     <name not found> = EmptyList@29[empty]
 }
 
 ResolutionTaskHolder@47 {
     <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
     <name not found> = EmptyList@29[empty]
 }
 
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+}
+
 ResolutionTaskHolder@59 {
     <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
 }
 
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
+}
+
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
 }
 
 ResolutionTaskHolder@71 {
     <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
 }
 
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@74 {
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -138,9 +113,7 @@ ResolutionTaskHolder@87 {
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@88 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@75 {
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -151,9 +124,7 @@ ResolutionTaskHolder@88 {
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@76 {
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -164,7 +135,39 @@ ResolutionTaskHolder@89 {
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@90 {
+ResolutionTaskHolder@77 {
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+}
+
+null {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@61 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt3150.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt3150.lazy.log
index 956d4fd0311..0773329c014 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt3150.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt3150.lazy.log
@@ -163,84 +163,87 @@ LazyJavaTypeParameterResolver@98 {
 
 ResolutionTaskHolder@100 {
     <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
-    <name not found> = EmptyList@87[empty]
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
     <name not found> = EmptyList@87[empty]
 }
 
-ResolutionTaskHolder@107 {
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
     <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
+    <name not found> = EmptyList@87[empty]
+}
+
+ResolutionTaskHolder@110 {
     <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@113[2] { ResolutionCandidate@114, ResolutionCandidate@115 }
+    <name not found> = EmptyList@87[empty]
+}
+
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
     <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
 }
 
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@118[2] { ResolutionCandidate@119, ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[2] { ResolutionCandidate@119, ResolutionCandidate@120 }
+ResolutionTaskHolder@119 {
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
     <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
 }
 
 ResolutionTaskHolder@122 {
     <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
 }
 
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
+ResolutionTaskHolder@125 {
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
 }
 
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@132 }
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
+ResolutionTaskHolder@128 {
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
+}
+
+ResolutionTaskHolder@131 {
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
 }
 
 ResolutionTaskHolder@134 {
     <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@136 }
 }
 
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@140 }
+ResolutionTaskHolder@137 {
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
 }
 
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@144 }
+ResolutionTaskHolder@140 {
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
 }
 
-ResolutionTaskHolder@146 {
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@148 }
-}
-
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@152 }
-}
-
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@156 }
+null {
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@136 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@142 }
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@127 }
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@133 }
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@124 }
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@139 }
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@157[2] { ResolutionCandidate@114, ResolutionCandidate@115 }
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt3174.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt3174.lazy.log
index 81f45986576..e53a185c447 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt3174.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt3174.lazy.log
@@ -47,43 +47,46 @@ LazyJavaPackageFragment@18['lang'] {
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
 }
 
 ResolutionTaskHolder@52 {
     <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[2] { ResolutionCandidate@60, ResolutionCandidate@61 }
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[2] { ResolutionCandidate@66, ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[2] { ResolutionCandidate@66, ResolutionCandidate@67 }
+null {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@68[2] { ResolutionCandidate@60, ResolutionCandidate@61 }
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt3301.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt3301.lazy.log
index 8da374cda12..bc699690a3c 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt3301.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt3301.lazy.log
@@ -44,10 +44,6 @@ LazyJavaPackageFragment@17['lang'] {
 
 ResolutionTaskHolder@39 {
     <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
@@ -65,25 +61,32 @@ ResolutionTaskHolder@39 {
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+    <name not found> = EmptyList@33[empty]
+}
+
+null {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@41 }
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt3344.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt3344.lazy.log
index 39c15aa8222..830e36f004b 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt3344.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt3344.lazy.log
@@ -162,28 +162,28 @@ LazyJavaClassifierType@131['E'] {
     arguments = ArrayList@132[empty]
     classifier = JavaTypeParameterImpl@133['E']
     nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
 }
 
 LazyJavaClassifierType@134['E'] {
     arguments = ArrayList@135[empty]
     classifier = JavaTypeParameterImpl@136['E']
     nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
 }
 
 LazyJavaClassifierType@137['E'] {
     arguments = ArrayList@138[empty]
     classifier = JavaTypeParameterImpl@139['E']
     nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@140
 }
 
-LazyJavaClassifierType@140['E'] {
-    arguments = ArrayList@141[empty]
-    classifier = JavaTypeParameterImpl@142['E']
+LazyJavaClassifierType@141['E'] {
+    arguments = ArrayList@142[empty]
+    classifier = JavaTypeParameterImpl@143['E']
     nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@143
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
 }
 
 LazyJavaClassifierType@144['E'] {
@@ -197,14 +197,14 @@ LazyJavaClassifierType@147['E'] {
     arguments = ArrayList@148[empty]
     classifier = JavaTypeParameterImpl@149['E']
     nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@143
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
 }
 
 LazyJavaClassifierType@150['E'] {
     arguments = ArrayList@151[empty]
     classifier = JavaTypeParameterImpl@152['E']
     nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
 }
 
 LazyJavaClassifierType@153['E'] {
@@ -225,91 +225,91 @@ LazyJavaClassifierType@159['E'] {
     arguments = ArrayList@160[empty]
     classifier = JavaTypeParameterImpl@161['E']
     nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@140
 }
 
 LazyJavaClassifierType@162['E'] {
     arguments = ArrayList@163[empty]
-    classifier = JavaTypeParameterImpl@142['E']
+    classifier = JavaTypeParameterImpl@161['E']
     nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@143
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@140
 }
 
 LazyJavaClassifierType@164['E'] {
     arguments = ArrayList@165[empty]
-    classifier = JavaTypeParameterImpl@152['E']
+    classifier = JavaTypeParameterImpl@158['E']
     nullable = 'true': Boolean@117
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
 }
 
 LazyJavaClassifierType@166['E'] {
     arguments = ArrayList@167[empty]
-    classifier = JavaTypeParameterImpl@139['E']
+    classifier = JavaTypeParameterImpl@129['E']
     nullable = 'true': Boolean@117
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
 }
 
 LazyJavaClassifierType@168['E'] {
     arguments = ArrayList@169[empty]
-    classifier = JavaTypeParameterImpl@158['E']
+    classifier = JavaTypeParameterImpl@136['E']
     nullable = 'true': Boolean@117
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
 }
 
 LazyJavaClassifierType@170['E'] {
     arguments = ArrayList@171[empty]
-    classifier = JavaTypeParameterImpl@129['E']
-    nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
-}
-
-LazyJavaClassifierType@172['E'] {
-    arguments = ArrayList@173[empty]
-    classifier = JavaTypeParameterImpl@146['E']
-    nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
-}
-
-LazyJavaClassifierType@174['E'] {
-    arguments = ArrayList@175[empty]
-    classifier = JavaTypeParameterImpl@133['E']
+    classifier = JavaTypeParameterImpl@152['E']
     nullable = 'true': Boolean@117
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
 }
 
+LazyJavaClassifierType@172['E'] {
+    arguments = ArrayList@173[empty]
+    classifier = JavaTypeParameterImpl@125['E']
+    nullable = 'true': Boolean@117
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
+}
+
+LazyJavaClassifierType@174['E'] {
+    arguments = ArrayList@175[empty]
+    classifier = JavaTypeParameterImpl@139['E']
+    nullable = 'true': Boolean@117
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@140
+}
+
 LazyJavaClassifierType@176['E'] {
     arguments = ArrayList@177[empty]
-    classifier = JavaTypeParameterImpl@155['E']
+    classifier = JavaTypeParameterImpl@133['E']
     nullable = 'true': Boolean@117
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
 }
 
 LazyJavaClassifierType@178['E'] {
     arguments = ArrayList@179[empty]
-    classifier = JavaTypeParameterImpl@161['E']
+    classifier = JavaTypeParameterImpl@143['E']
     nullable = 'true': Boolean@117
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
 }
 
 LazyJavaClassifierType@180['E'] {
     arguments = ArrayList@181[empty]
-    classifier = JavaTypeParameterImpl@136['E']
+    classifier = JavaTypeParameterImpl@146['E']
     nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
 }
 
 LazyJavaClassifierType@182['E'] {
     arguments = ArrayList@183[empty]
-    classifier = JavaTypeParameterImpl@125['E']
+    classifier = JavaTypeParameterImpl@149['E']
     nullable = 'true': Boolean@117
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
 }
 
 LazyJavaClassifierType@184['E'] {
     arguments = ArrayList@185[empty]
-    classifier = JavaTypeParameterImpl@149['E']
+    classifier = JavaTypeParameterImpl@155['E']
     nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@143
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
 }
 
 LazyJavaClassifierType@186['K'] {
@@ -323,33 +323,33 @@ LazyJavaClassifierType@190['K'] {
     arguments = ArrayList@191[empty]
     classifier = JavaTypeParameterImpl@192['K']
     nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@193
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@189
 }
 
-LazyJavaClassifierType@194['K'] {
-    arguments = ArrayList@195[empty]
-    classifier = JavaTypeParameterImpl@196['K']
+LazyJavaClassifierType@193['K'] {
+    arguments = ArrayList@194[empty]
+    classifier = JavaTypeParameterImpl@195['K']
     nullable = 'false': Boolean@111
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@189
 }
 
-LazyJavaClassifierType@197['K'] {
-    arguments = ArrayList@198[empty]
-    classifier = JavaTypeParameterImpl@199['K']
+LazyJavaClassifierType@196['K'] {
+    arguments = ArrayList@197[empty]
+    classifier = JavaTypeParameterImpl@198['K']
     nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@189
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@199
 }
 
 LazyJavaClassifierType@200['K'] {
     arguments = ArrayList@201[empty]
-    classifier = JavaTypeParameterImpl@199['K']
+    classifier = JavaTypeParameterImpl@188['K']
     nullable = 'true': Boolean@117
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@189
 }
 
 LazyJavaClassifierType@202['K'] {
     arguments = ArrayList@203[empty]
-    classifier = JavaTypeParameterImpl@196['K']
+    classifier = JavaTypeParameterImpl@195['K']
     nullable = 'true': Boolean@117
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@189
 }
@@ -358,24 +358,24 @@ LazyJavaClassifierType@204['K'] {
     arguments = ArrayList@205[empty]
     classifier = JavaTypeParameterImpl@192['K']
     nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@193
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@189
 }
 
 LazyJavaClassifierType@206['K'] {
     arguments = ArrayList@207[empty]
-    classifier = JavaTypeParameterImpl@188['K']
+    classifier = JavaTypeParameterImpl@198['K']
     nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@189
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@199
 }
 
-LazyJavaClassifierType@64['List<E>'] {
+LazyJavaClassifierType@74['List<E>'] {
     arguments = ArrayList@208[1] { TypeProjectionImpl@209 }
     classifier = JavaClassImpl@210['List']
     memberScope = SubstitutingScope@211
     typeConstructor = DeserializedClassTypeConstructor@212
 }
 
-LazyJavaClassifierType@74['List<E>'] {
+LazyJavaClassifierType@64['List<E>'] {
     arguments = ArrayList@213[1] { TypeProjectionImpl@214 }
     classifier = JavaClassImpl@215['List']
     memberScope = SubstitutingScope@216
@@ -478,16 +478,16 @@ LazyJavaClassifierType@261['V'] {
 
 LazyJavaClassifierType@265['V'] {
     arguments = ArrayList@266[empty]
-    classifier = JavaTypeParameterImpl@253['V']
+    classifier = JavaTypeParameterImpl@263['V']
     nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@254
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@264
 }
 
 LazyJavaClassifierType@267['V'] {
     arguments = ArrayList@268[empty]
-    classifier = JavaTypeParameterImpl@263['V']
+    classifier = JavaTypeParameterImpl@260['V']
     nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@264
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@254
 }
 
 LazyJavaClassifierType@269['V'] {
@@ -499,7 +499,7 @@ LazyJavaClassifierType@269['V'] {
 
 LazyJavaClassifierType@271['V'] {
     arguments = ArrayList@272[empty]
-    classifier = JavaTypeParameterImpl@260['V']
+    classifier = JavaTypeParameterImpl@253['V']
     nullable = 'true': Boolean@117
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@254
 }
@@ -568,16 +568,16 @@ LazyJavaPackageFragment@294['util'] {
     memberIndex = computeMemberIndex$1@323 // through LazyPackageFragmentScopeForJavaPackage@319
 }
 
-LazyJavaTypeParameterDescriptor@57['E'] {
+LazyJavaTypeParameterDescriptor@61['E'] {
     defaultType = JetTypeImpl@324['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@143
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
     upperBounds = LinkedHashSet@325[1] { NullableType@326 }
     upperBoundsAsType = NullableType@326
 }
 
-LazyJavaTypeParameterDescriptor@61['E'] {
+LazyJavaTypeParameterDescriptor@57['E'] {
     defaultType = JetTypeImpl@327['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@140
     upperBounds = LinkedHashSet@328[1] { NullableType@329 }
     upperBoundsAsType = NullableType@329
 }
@@ -596,7 +596,7 @@ LazyJavaTypeParameterDescriptor@77['K'] {
 }
 
 LazyJavaTypeParameterDescriptor@66['K'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@193
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@199
 }
 
 LazyJavaTypeParameterDescriptor@78['V'] {
@@ -610,11 +610,11 @@ LazyJavaTypeParameterDescriptor@67['V'] {
 }
 
 LazyJavaTypeParameterResolver@339 {
-    resolve(JavaTypeParameterImpl@340['E']) = LazyJavaTypeParameterDescriptor@61['E']
+    resolve(JavaTypeParameterImpl@340['E']) = LazyJavaTypeParameterDescriptor@57['E']
 }
 
 LazyJavaTypeParameterResolver@341 {
-    resolve(JavaTypeParameterImpl@342['E']) = LazyJavaTypeParameterDescriptor@57['E']
+    resolve(JavaTypeParameterImpl@342['E']) = LazyJavaTypeParameterDescriptor@61['E']
 }
 
 LazyJavaTypeParameterResolver@343 {
@@ -622,46 +622,37 @@ LazyJavaTypeParameterResolver@343 {
 }
 
 LazyJavaTypeParameterResolver@345 {
-    resolve(JavaTypeParameterImpl@149['E']) = null
-}
-
-LazyJavaTypeParameterResolver@346 {
-    resolve(JavaTypeParameterImpl@129['E']) = null
-}
-
-LazyJavaTypeParameterResolver@347 {
-    resolve(JavaTypeParameterImpl@125['E']) = null
-}
-
-LazyJavaTypeParameterResolver@348 {
     resolve(JavaTypeParameterImpl@152['E']) = null
 }
 
-LazyJavaTypeParameterResolver@349 {
+LazyJavaTypeParameterResolver@346 {
     resolve(JavaTypeParameterImpl@161['E']) = null
 }
 
-LazyJavaTypeParameterResolver@350 {
-    resolve(JavaTypeParameterImpl@351['K']) = LazyJavaTypeParameterDescriptor@77['K']
-    resolve(JavaTypeParameterImpl@352['V']) = LazyJavaTypeParameterDescriptor@78['V']
+LazyJavaTypeParameterResolver@347 {
+    resolve(JavaTypeParameterImpl@155['E']) = null
 }
 
-LazyJavaTypeParameterResolver@353 {
-    resolve(JavaTypeParameterImpl@192['K']) = LazyJavaTypeParameterDescriptor@66['K']
+LazyJavaTypeParameterResolver@348 {
+    resolve(JavaTypeParameterImpl@149['E']) = null
+}
+
+LazyJavaTypeParameterResolver@349 {
+    resolve(JavaTypeParameterImpl@158['E']) = null
+}
+
+LazyJavaTypeParameterResolver@350 {
+    resolve(JavaTypeParameterImpl@198['K']) = LazyJavaTypeParameterDescriptor@66['K']
     resolve(JavaTypeParameterImpl@263['V']) = LazyJavaTypeParameterDescriptor@67['V']
 }
 
+LazyJavaTypeParameterResolver@351 {
+    resolve(JavaTypeParameterImpl@352['K']) = LazyJavaTypeParameterDescriptor@77['K']
+    resolve(JavaTypeParameterImpl@353['V']) = LazyJavaTypeParameterDescriptor@78['V']
+}
+
 ResolutionTaskHolder@354 {
     <name not found> = ArrayList@355[1] { ResolutionCandidate@356 }
-    <name not found> = ArrayList@357[1] { ResolutionCandidate@356 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
@@ -672,39 +663,37 @@ ResolutionTaskHolder@354 {
     <name not found> = EmptyList@48[empty]
 }
 
-ResolutionTaskHolder@358 {
-    <name not found> = ArrayList@359[1] { ResolutionCandidate@360 }
-    <name not found> = ArrayList@361[1] { ResolutionCandidate@360 }
-    <name not found> = EmptyList@48[empty]
+ResolutionTaskHolder@357 {
+    <name not found> = ArrayList@358[1] { ResolutionCandidate@359 }
     <name not found> = EmptyList@48[empty]
 }
 
-ResolutionTaskHolder@362 {
-    <name not found> = ArrayList@363[1] { ResolutionCandidate@364 }
-    <name not found> = ArrayList@365[1] { ResolutionCandidate@364 }
+ResolutionTaskHolder@360 {
+    <name not found> = ArrayList@361[1] { ResolutionCandidate@362 }
+}
+
+ResolutionTaskHolder@363 {
+    <name not found> = ArrayList@364[1] { ResolutionCandidate@365 }
 }
 
 ResolutionTaskHolder@366 {
-    <name not found> = ArrayList@367[1] { ResolutionCandidate@368 }
-    <name not found> = ArrayList@369[1] { ResolutionCandidate@368 }
+    <name not found> = ArrayList@367[2] { ResolutionCandidate@368, ResolutionCandidate@369 }
 }
 
 ResolutionTaskHolder@370 {
-    <name not found> = ArrayList@371[2] { ResolutionCandidate@372, ResolutionCandidate@373 }
-    <name not found> = ArrayList@374[2] { ResolutionCandidate@372, ResolutionCandidate@373 }
+    <name not found> = ArrayList@371[3] { ResolutionCandidate@372, ResolutionCandidate@373, ResolutionCandidate@374 }
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
 }
 
 ResolutionTaskHolder@375 {
-    <name not found> = ArrayList@376[3] { ResolutionCandidate@377, ResolutionCandidate@378, ResolutionCandidate@379 }
-    <name not found> = ArrayList@380[3] { ResolutionCandidate@377, ResolutionCandidate@378, ResolutionCandidate@379 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
+    <name not found> = ArrayList@376[4] { ResolutionCandidate@377, ResolutionCandidate@378, ResolutionCandidate@379, ... }
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
@@ -715,9 +704,23 @@ ResolutionTaskHolder@375 {
     <name not found> = EmptyList@48[empty]
 }
 
-ResolutionTaskHolder@381 {
-    <name not found> = ArrayList@382[4] { ResolutionCandidate@383, ResolutionCandidate@384, ResolutionCandidate@385, ... }
-    <name not found> = ArrayList@386[4] { ResolutionCandidate@383, ResolutionCandidate@384, ResolutionCandidate@385, ... }
+null {
+    <name not found> = ArrayList@380[1] { ResolutionCandidate@359 }
+    <name not found> = ArrayList@381[1] { ResolutionCandidate@365 }
+    <name not found> = ArrayList@382[1] { ResolutionCandidate@362 }
+    <name not found> = ArrayList@383[1] { ResolutionCandidate@356 }
+    <name not found> = ArrayList@384[2] { ResolutionCandidate@368, ResolutionCandidate@369 }
+    <name not found> = ArrayList@385[3] { ResolutionCandidate@372, ResolutionCandidate@373, ResolutionCandidate@374 }
+    <name not found> = ArrayList@386[4] { ResolutionCandidate@377, ResolutionCandidate@378, ResolutionCandidate@379, ... }
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt702.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt702.lazy.log
index b44cbd61003..200b68421f0 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt702.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt702.lazy.log
@@ -129,7 +129,7 @@ LazyJavaClassifierType@76['Object'] {
 
 LazyJavaClassifierType@79['Object'] {
     arguments = ArrayList@80[empty]
-    classifier = JavaClassImpl@78['Object']
+    classifier = JavaClassImpl@72['Object']
     memberScope = DeserializedClassMemberScope@73
     nullable = 'true': Boolean@81
     typeConstructor = DeserializedClassTypeConstructor@75
@@ -137,7 +137,7 @@ LazyJavaClassifierType@79['Object'] {
 
 LazyJavaClassifierType@82['Object'] {
     arguments = ArrayList@83[empty]
-    classifier = JavaClassImpl@72['Object']
+    classifier = JavaClassImpl@78['Object']
     memberScope = DeserializedClassMemberScope@73
     nullable = 'true': Boolean@81
     typeConstructor = DeserializedClassTypeConstructor@75
@@ -189,13 +189,13 @@ LazyJavaClassifierType@100['T'] {
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
 }
 
-LazyJavaClassifierType@53['Throwable'] {
+LazyJavaClassifierType@50['Throwable'] {
     arguments = ArrayList@102[empty]
     classifier = JavaClassImpl@103['Throwable']
     typeConstructor = DeserializedClassTypeConstructor@104
 }
 
-LazyJavaClassifierType@50['Throwable'] {
+LazyJavaClassifierType@53['Throwable'] {
     arguments = ArrayList@105[empty]
     classifier = JavaClassImpl@106['Throwable']
     typeConstructor = DeserializedClassTypeConstructor@104
@@ -296,9 +296,26 @@ LazyJavaTypeParameterResolver@176 {
 
 ResolutionTaskHolder@177 {
     <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@179 }
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@182 }
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+}
+
+ResolutionTaskHolder@182 {
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
@@ -307,27 +324,8 @@ ResolutionTaskHolder@177 {
     <name not found> = EmptyList@2[empty]
 }
 
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@186 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
+ResolutionTaskHolder@185 {
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
@@ -350,114 +348,119 @@ ResolutionTaskHolder@184 {
 
 ResolutionTaskHolder@188 {
     <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@190 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
 }
 
-ResolutionTaskHolder@192 {
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@194 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
+ResolutionTaskHolder@191 {
+    <name not found> = ArrayList@192[1] { ResolutionCandidate@193 }
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
 }
 
-ResolutionTaskHolder@196 {
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@198 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
+ResolutionTaskHolder@194 {
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@196 }
+}
+
+ResolutionTaskHolder@197 {
+    <name not found> = ArrayList@198[1] { ResolutionCandidate@199 }
 }
 
 ResolutionTaskHolder@200 {
     <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@202 }
 }
 
-ResolutionTaskHolder@204 {
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@206 }
+ResolutionTaskHolder@203 {
+    <name not found> = ArrayList@204[1] { ResolutionCandidate@205 }
 }
 
-ResolutionTaskHolder@208 {
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@210 }
+ResolutionTaskHolder@206 {
+    <name not found> = ArrayList@207[1] { ResolutionCandidate@208 }
+}
+
+ResolutionTaskHolder@209 {
+    <name not found> = ArrayList@210[1] { ResolutionCandidate@211 }
 }
 
 ResolutionTaskHolder@212 {
     <name not found> = ArrayList@213[1] { ResolutionCandidate@214 }
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@214 }
 }
 
-ResolutionTaskHolder@216 {
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@218 }
+ResolutionTaskHolder@215 {
+    <name not found> = ArrayList@216[1] { ResolutionCandidate@217 }
 }
 
-ResolutionTaskHolder@220 {
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@222 }
+ResolutionTaskHolder@218 {
+    <name not found> = ArrayList@219[1] { ResolutionCandidate@220 }
+}
+
+ResolutionTaskHolder@221 {
+    <name not found> = ArrayList@222[1] { ResolutionCandidate@223 }
 }
 
 ResolutionTaskHolder@224 {
     <name not found> = ArrayList@225[1] { ResolutionCandidate@226 }
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@226 }
 }
 
-ResolutionTaskHolder@228 {
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@230 }
-}
-
-ResolutionTaskHolder@232 {
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@234 }
-}
-
-ResolutionTaskHolder@236 {
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@238 }
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@238 }
-}
-
-ResolutionTaskHolder@240 {
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
-    <name not found> = ArrayList@243[1] { ResolutionCandidate@242 }
+null {
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@220 }
+    <name not found> = ArrayList@228[1] { ResolutionCandidate@179 }
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@181 }
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@202 }
+    <name not found> = ArrayList@231[1] { ResolutionCandidate@199 }
+    <name not found> = ArrayList@232[1] { ResolutionCandidate@223 }
+    <name not found> = ArrayList@233[1] { ResolutionCandidate@211 }
+    <name not found> = ArrayList@234[1] { ResolutionCandidate@196 }
+    <name not found> = ArrayList@235[1] { ResolutionCandidate@208 }
+    <name not found> = ArrayList@236[1] { ResolutionCandidate@214 }
+    <name not found> = ArrayList@237[1] { ResolutionCandidate@217 }
+    <name not found> = ArrayList@238[1] { ResolutionCandidate@226 }
+    <name not found> = ArrayList@239[1] { ResolutionCandidate@187 }
+    <name not found> = ArrayList@240[1] { ResolutionCandidate@190 }
+    <name not found> = ArrayList@241[1] { ResolutionCandidate@205 }
+    <name not found> = ArrayList@242[1] { ResolutionCandidate@184 }
+    <name not found> = ArrayList@243[1] { ResolutionCandidate@193 }
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt731.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt731.lazy.log
index ae95a875255..6b32de734d6 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt731.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt731.lazy.log
@@ -52,55 +52,58 @@ LazyJavaPackageFragment@19['lang'] {
 
 ResolutionTaskHolder@44 {
     <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
     <name not found> = EmptyList@37[empty]
 }
 
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
+}
+
 ResolutionTaskHolder@56 {
     <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
+}
+
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
 }
 
 ResolutionTaskHolder@68 {
     <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
+}
+
+null {
     <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@67 }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt742.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt742.lazy.log
index a5049f8ca83..daad897f102 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt742.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt742.lazy.log
@@ -47,14 +47,6 @@ LazyJavaPackageFragment@15['lang'] {
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
@@ -88,16 +80,8 @@ ResolutionTaskHolder@40 {
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
@@ -131,12 +115,15 @@ ResolutionTaskHolder@44 {
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
@@ -144,68 +131,84 @@ ResolutionTaskHolder@48 {
 
 ResolutionTaskHolder@52 {
     <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
     <name not found> = EmptyList@31[empty]
+}
+
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
     <name not found> = EmptyList@31[empty]
 }
 
 ResolutionTaskHolder@64 {
     <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
+}
+
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
 }
 
 ResolutionTaskHolder@76 {
     <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+null {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@42 }
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt832.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt832.lazy.log
index c9f19a09487..8eba6115555 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt832.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt832.lazy.log
@@ -28,19 +28,22 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@24 {
     <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
 }
 
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
+ResolutionTaskHolder@27 {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
 }
 
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
+}
+
+null {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@26 }
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@29 }
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt943.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt943.lazy.log
index 5f12455e28e..c900ee36f4b 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt943.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt943.lazy.log
@@ -68,7 +68,7 @@ LazyJavaClassifierType@42['Collection<? extends T>'] {
 
 LazyJavaClassifierType@47['Collection<? extends T>'] {
     arguments = ArrayList@48[1] { TypeProjectionImpl@49 }
-    classifier = JavaClassImpl@38['Collection']
+    classifier = JavaClassImpl@45['Collection']
     memberScope = SubstitutingScope@50
     nullable = 'true': Boolean@51
     typeConstructor = DeserializedClassTypeConstructor@52
@@ -76,7 +76,7 @@ LazyJavaClassifierType@47['Collection<? extends T>'] {
 
 LazyJavaClassifierType@53['Collection<? extends T>'] {
     arguments = ArrayList@54[1] { TypeProjectionImpl@55 }
-    classifier = JavaClassImpl@45['Collection']
+    classifier = JavaClassImpl@38['Collection']
     memberScope = SubstitutingScope@56
     nullable = 'true': Boolean@51
     typeConstructor = DeserializedClassTypeConstructor@52
@@ -165,56 +165,56 @@ LazyJavaClassifierType@98['T'] {
     arguments = ArrayList@99[empty]
     classifier = JavaTypeParameterImpl@100['T']
     nullable = 'false': Boolean@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+}
+
+LazyJavaClassifierType@102['T'] {
+    arguments = ArrayList@103[empty]
+    classifier = JavaTypeParameterImpl@104['T']
+    nullable = 'false': Boolean@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+}
+
+LazyJavaClassifierType@105['T'] {
+    arguments = ArrayList@106[empty]
+    classifier = JavaTypeParameterImpl@107['T']
+    nullable = 'false': Boolean@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+}
+
+LazyJavaClassifierType@108['T'] {
+    arguments = ArrayList@109[empty]
+    classifier = JavaTypeParameterImpl@110['T']
+    nullable = 'false': Boolean@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+}
+
+LazyJavaClassifierType@111['T'] {
+    arguments = ArrayList@112[empty]
+    classifier = JavaTypeParameterImpl@113['T']
+    nullable = 'false': Boolean@40
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
-LazyJavaClassifierType@101['T'] {
-    arguments = ArrayList@102[empty]
-    classifier = JavaTypeParameterImpl@103['T']
-    nullable = 'false': Boolean@40
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaClassifierType@104['T'] {
-    arguments = ArrayList@105[empty]
-    classifier = JavaTypeParameterImpl@106['T']
-    nullable = 'false': Boolean@40
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaClassifierType@107['T'] {
-    arguments = ArrayList@108[empty]
-    classifier = JavaTypeParameterImpl@109['T']
-    nullable = 'false': Boolean@40
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaClassifierType@110['T'] {
-    arguments = ArrayList@111[empty]
-    classifier = JavaTypeParameterImpl@112['T']
-    nullable = 'false': Boolean@40
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@113
-}
-
 LazyJavaClassifierType@114['T'] {
     arguments = ArrayList@115[empty]
     classifier = JavaTypeParameterImpl@116['T']
     nullable = 'false': Boolean@40
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@117['T'] {
     arguments = ArrayList@118[empty]
     classifier = JavaTypeParameterImpl@119['T']
     nullable = 'false': Boolean@40
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@113
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
 LazyJavaClassifierType@120['T'] {
     arguments = ArrayList@121[empty]
     classifier = JavaTypeParameterImpl@122['T']
     nullable = 'false': Boolean@40
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@123['T'] {
@@ -226,72 +226,72 @@ LazyJavaClassifierType@123['T'] {
 
 LazyJavaClassifierType@126['T'] {
     arguments = ArrayList@127[empty]
-    classifier = JavaTypeParameterImpl@116['T']
+    classifier = JavaTypeParameterImpl@110['T']
     nullable = 'true': Boolean@51
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@128['T'] {
     arguments = ArrayList@129[empty]
-    classifier = JavaTypeParameterImpl@93['T']
+    classifier = JavaTypeParameterImpl@119['T']
     nullable = 'true': Boolean@51
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
 LazyJavaClassifierType@130['T'] {
     arguments = ArrayList@131[empty]
-    classifier = JavaTypeParameterImpl@125['T']
+    classifier = JavaTypeParameterImpl@113['T']
     nullable = 'true': Boolean@51
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
 LazyJavaClassifierType@132['T'] {
     arguments = ArrayList@133[empty]
-    classifier = JavaTypeParameterImpl@119['T']
+    classifier = JavaTypeParameterImpl@116['T']
     nullable = 'true': Boolean@51
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@113
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@134['T'] {
     arguments = ArrayList@135[empty]
-    classifier = JavaTypeParameterImpl@100['T']
+    classifier = JavaTypeParameterImpl@89['T']
     nullable = 'true': Boolean@51
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
 LazyJavaClassifierType@136['T'] {
     arguments = ArrayList@137[empty]
-    classifier = JavaTypeParameterImpl@109['T']
-    nullable = 'true': Boolean@51
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaClassifierType@138['T'] {
-    arguments = ArrayList@139[empty]
-    classifier = JavaTypeParameterImpl@89['T']
+    classifier = JavaTypeParameterImpl@125['T']
     nullable = 'true': Boolean@51
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
+LazyJavaClassifierType@138['T'] {
+    arguments = ArrayList@139[empty]
+    classifier = JavaTypeParameterImpl@100['T']
+    nullable = 'true': Boolean@51
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+}
+
 LazyJavaClassifierType@140['T'] {
     arguments = ArrayList@141[empty]
-    classifier = JavaTypeParameterImpl@106['T']
+    classifier = JavaTypeParameterImpl@122['T']
     nullable = 'true': Boolean@51
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@142['T'] {
     arguments = ArrayList@143[empty]
-    classifier = JavaTypeParameterImpl@112['T']
+    classifier = JavaTypeParameterImpl@107['T']
     nullable = 'true': Boolean@51
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@113
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@144['T'] {
     arguments = ArrayList@145[empty]
-    classifier = JavaTypeParameterImpl@103['T']
+    classifier = JavaTypeParameterImpl@104['T']
     nullable = 'true': Boolean@51
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@146['T'] {
@@ -303,7 +303,7 @@ LazyJavaClassifierType@146['T'] {
 
 LazyJavaClassifierType@148['T'] {
     arguments = ArrayList@149[empty]
-    classifier = JavaTypeParameterImpl@122['T']
+    classifier = JavaTypeParameterImpl@93['T']
     nullable = 'true': Boolean@51
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
@@ -398,19 +398,19 @@ LazyJavaPackageFragment@172['util'] {
 }
 
 LazyJavaTypeParameterDescriptor@33['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@113
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
     upperBounds = LinkedHashSet@217[1] { NullableType@218 }
     upperBoundsAsType = NullableType@218
 }
 
 LazyJavaTypeParameterDescriptor@219['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
     upperBounds = LinkedHashSet@220[1] { NullableType@221 }
     upperBoundsAsType = NullableType@221
 }
 
 LazyJavaTypeParameterDescriptor@222['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
     upperBounds = LinkedHashSet@223[2] { DelegatingFlexibleType@224, DelegatingFlexibleType@225 }
     upperBoundsAsType = NotNullType@226
 }
@@ -428,87 +428,90 @@ LazyJavaTypeParameterResolver@231 {
 }
 
 LazyJavaTypeParameterResolver@233 {
-    resolve(JavaTypeParameterImpl@112['T']) = null
+    resolve(JavaTypeParameterImpl@96['T']) = null
 }
 
 ResolutionTaskHolder@234 {
     <name not found> = ArrayList@235[1] { ResolutionCandidate@236 }
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@236 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@238 {
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@240 }
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@240 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
+ResolutionTaskHolder@237 {
+    <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@242 {
-    <name not found> = ArrayList@243[1] { ResolutionCandidate@244 }
-    <name not found> = ArrayList@245[1] { ResolutionCandidate@244 }
+ResolutionTaskHolder@240 {
+    <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
+}
+
+ResolutionTaskHolder@243 {
+    <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
 }
 
 ResolutionTaskHolder@246 {
     <name not found> = ArrayList@247[1] { ResolutionCandidate@248 }
-    <name not found> = ArrayList@249[1] { ResolutionCandidate@248 }
 }
 
-ResolutionTaskHolder@250 {
-    <name not found> = ArrayList@251[1] { ResolutionCandidate@252 }
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@252 }
+ResolutionTaskHolder@249 {
+    <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
 }
 
-ResolutionTaskHolder@254 {
-    <name not found> = ArrayList@255[1] { ResolutionCandidate@256 }
-    <name not found> = ArrayList@257[1] { ResolutionCandidate@256 }
+ResolutionTaskHolder@252 {
+    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
+}
+
+ResolutionTaskHolder@255 {
+    <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
 }
 
 ResolutionTaskHolder@258 {
     <name not found> = ArrayList@259[1] { ResolutionCandidate@260 }
-    <name not found> = ArrayList@261[1] { ResolutionCandidate@260 }
 }
 
-ResolutionTaskHolder@262 {
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@264 }
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@264 }
+ResolutionTaskHolder@261 {
+    <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
 }
 
-ResolutionTaskHolder@266 {
-    <name not found> = ArrayList@267[1] { ResolutionCandidate@268 }
-    <name not found> = ArrayList@269[1] { ResolutionCandidate@268 }
+ResolutionTaskHolder@264 {
+    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
+}
+
+ResolutionTaskHolder@267 {
+    <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
 }
 
 ResolutionTaskHolder@270 {
-    <name not found> = ArrayList@271[1] { ResolutionCandidate@272 }
-    <name not found> = ArrayList@273[1] { ResolutionCandidate@272 }
+    <name not found> = ArrayList@271[2] { ResolutionCandidate@272, ResolutionCandidate@273 }
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
 }
 
 ResolutionTaskHolder@274 {
-    <name not found> = ArrayList@275[1] { ResolutionCandidate@276 }
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@276 }
+    <name not found> = ArrayList@275[8] { ResolutionCandidate@276, ResolutionCandidate@277, ResolutionCandidate@278, ... }
 }
 
-ResolutionTaskHolder@278 {
-    <name not found> = ArrayList@279[1] { ResolutionCandidate@280 }
-    <name not found> = ArrayList@281[1] { ResolutionCandidate@280 }
-}
-
-ResolutionTaskHolder@282 {
-    <name not found> = ArrayList@283[2] { ResolutionCandidate@284, ResolutionCandidate@285 }
-    <name not found> = ArrayList@286[3] { ResolutionCandidate@284, ResolutionCandidate@285, ResolutionCandidate@287 }
+null {
+    <name not found> = ArrayList@279[1] { ResolutionCandidate@248 }
+    <name not found> = ArrayList@280[1] { ResolutionCandidate@251 }
+    <name not found> = ArrayList@281[1] { ResolutionCandidate@239 }
+    <name not found> = ArrayList@282[1] { ResolutionCandidate@263 }
+    <name not found> = ArrayList@283[1] { ResolutionCandidate@257 }
+    <name not found> = ArrayList@284[1] { ResolutionCandidate@260 }
+    <name not found> = ArrayList@285[1] { ResolutionCandidate@242 }
+    <name not found> = ArrayList@286[1] { ResolutionCandidate@254 }
+    <name not found> = ArrayList@287[1] { ResolutionCandidate@269 }
+    <name not found> = ArrayList@288[1] { ResolutionCandidate@236 }
+    <name not found> = ArrayList@289[1] { ResolutionCandidate@245 }
+    <name not found> = ArrayList@290[1] { ResolutionCandidate@266 }
+    <name not found> = ArrayList@291[3] { ResolutionCandidate@272, ResolutionCandidate@273, ResolutionCandidate@292 }
+    <name not found> = ArrayList@293[8] { ResolutionCandidate@276, ResolutionCandidate@277, ResolutionCandidate@278, ... }
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
 }
-
-ResolutionTaskHolder@288 {
-    <name not found> = ArrayList@289[8] { ResolutionCandidate@290, ResolutionCandidate@291, ResolutionCandidate@292, ... }
-    <name not found> = ArrayList@293[8] { ResolutionCandidate@290, ResolutionCandidate@291, ResolutionCandidate@292, ... }
-}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt948.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt948.lazy.log
index 553a9081ada..1c9654df0ba 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt948.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt948.lazy.log
@@ -87,49 +87,49 @@ LazyJavaClassifierType@56['E'] {
     arguments = ArrayList@57[empty]
     classifier = JavaTypeParameterImpl@58['E']
     nullable = 'false': Boolean@43
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@55
 }
 
-LazyJavaClassifierType@60['E'] {
-    arguments = ArrayList@61[empty]
-    classifier = JavaTypeParameterImpl@62['E']
+LazyJavaClassifierType@59['E'] {
+    arguments = ArrayList@60[empty]
+    classifier = JavaTypeParameterImpl@61['E']
     nullable = 'false': Boolean@43
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@62
 }
 
 LazyJavaClassifierType@63['E'] {
     arguments = ArrayList@64[empty]
     classifier = JavaTypeParameterImpl@65['E']
     nullable = 'false': Boolean@43
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@55
 }
 
 LazyJavaClassifierType@66['E'] {
     arguments = ArrayList@67[empty]
-    classifier = JavaTypeParameterImpl@65['E']
-    nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
-}
-
-LazyJavaClassifierType@68['E'] {
-    arguments = ArrayList@69[empty]
-    classifier = JavaTypeParameterImpl@62['E']
-    nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
-}
-
-LazyJavaClassifierType@70['E'] {
-    arguments = ArrayList@71[empty]
     classifier = JavaTypeParameterImpl@54['E']
     nullable = 'true': Boolean@49
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@55
 }
 
-LazyJavaClassifierType@72['E'] {
-    arguments = ArrayList@73[empty]
+LazyJavaClassifierType@68['E'] {
+    arguments = ArrayList@69[empty]
     classifier = JavaTypeParameterImpl@58['E']
     nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@55
+}
+
+LazyJavaClassifierType@70['E'] {
+    arguments = ArrayList@71[empty]
+    classifier = JavaTypeParameterImpl@61['E']
+    nullable = 'true': Boolean@49
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@62
+}
+
+LazyJavaClassifierType@72['E'] {
+    arguments = ArrayList@73[empty]
+    classifier = JavaTypeParameterImpl@65['E']
+    nullable = 'true': Boolean@49
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@55
 }
 
 LazyJavaClassifierType@24['List<E>'] {
@@ -226,104 +226,107 @@ LazyJavaPackageFragment@105['util'] {
 
 LazyJavaTypeParameterDescriptor@26['E'] {
     defaultType = JetTypeImpl@135['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@55
     upperBounds = LinkedHashSet@136[1] { NullableType@137 }
 }
 
 LazyJavaTypeParameterDescriptor@21['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@55
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@62
 }
 
 LazyJavaTypeParameterResolver@138 {
-    resolve(JavaTypeParameterImpl@139['E']) = LazyJavaTypeParameterDescriptor@26['E']
+    resolve(JavaTypeParameterImpl@61['E']) = LazyJavaTypeParameterDescriptor@21['E']
 }
 
-LazyJavaTypeParameterResolver@140 {
-    resolve(JavaTypeParameterImpl@54['E']) = LazyJavaTypeParameterDescriptor@21['E']
+LazyJavaTypeParameterResolver@139 {
+    resolve(JavaTypeParameterImpl@140['E']) = LazyJavaTypeParameterDescriptor@26['E']
 }
 
 ResolutionTaskHolder@141 {
     <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@143 }
-    <name not found> = EmptyList@123[empty]
-    <name not found> = EmptyList@123[empty]
     <name not found> = EmptyList@123[empty]
     <name not found> = EmptyList@123[empty]
 }
 
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@147 }
-    <name not found> = EmptyList@123[empty]
-    <name not found> = EmptyList@123[empty]
+ResolutionTaskHolder@144 {
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
     <name not found> = EmptyList@123[empty]
     <name not found> = EmptyList@123[empty]
 }
 
-ResolutionTaskHolder@149 {
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@151 }
+ResolutionTaskHolder@147 {
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
     <name not found> = EmptyList@123[empty]
     <name not found> = EmptyList@123[empty]
+}
+
+ResolutionTaskHolder@150 {
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
     <name not found> = EmptyList@123[empty]
     <name not found> = EmptyList@123[empty]
 }
 
 ResolutionTaskHolder@153 {
     <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@155 }
-    <name not found> = EmptyList@123[empty]
-    <name not found> = EmptyList@123[empty]
     <name not found> = EmptyList@123[empty]
     <name not found> = EmptyList@123[empty]
 }
 
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@159 }
-    <name not found> = EmptyList@123[empty]
-    <name not found> = EmptyList@123[empty]
+ResolutionTaskHolder@156 {
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
     <name not found> = EmptyList@123[empty]
     <name not found> = EmptyList@123[empty]
 }
 
-ResolutionTaskHolder@161 {
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@163 }
-    <name not found> = EmptyList@123[empty]
-    <name not found> = EmptyList@123[empty]
-    <name not found> = EmptyList@123[empty]
-    <name not found> = EmptyList@123[empty]
+ResolutionTaskHolder@159 {
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
+}
+
+ResolutionTaskHolder@162 {
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
 }
 
 ResolutionTaskHolder@165 {
     <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@167 }
 }
 
-ResolutionTaskHolder@169 {
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@171 }
+ResolutionTaskHolder@168 {
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
 }
 
-ResolutionTaskHolder@173 {
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@175 }
+ResolutionTaskHolder@171 {
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
 }
 
-ResolutionTaskHolder@177 {
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@179 }
+ResolutionTaskHolder@174 {
+    <name not found> = ArrayList@175[3] { ResolutionCandidate@176, ResolutionCandidate@177, ResolutionCandidate@178 }
+    <name not found> = EmptyList@123[empty]
+    <name not found> = EmptyList@123[empty]
 }
 
-ResolutionTaskHolder@181 {
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@183 }
-}
-
-ResolutionTaskHolder@185 {
-    <name not found> = ArrayList@186[3] { ResolutionCandidate@187, ResolutionCandidate@188, ResolutionCandidate@189 }
-    <name not found> = ArrayList@190[3] { ResolutionCandidate@187, ResolutionCandidate@188, ResolutionCandidate@189 }
+null {
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@149 }
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@161 }
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@155 }
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@164 }
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@152 }
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@173 }
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@146 }
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@167 }
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@143 }
+    <name not found> = ArrayList@189[1] { ResolutionCandidate@170 }
+    <name not found> = ArrayList@190[3] { ResolutionCandidate@176, ResolutionCandidate@177, ResolutionCandidate@178 }
+    <name not found> = EmptyList@123[empty]
+    <name not found> = EmptyList@123[empty]
+    <name not found> = EmptyList@123[empty]
+    <name not found> = EmptyList@123[empty]
+    <name not found> = EmptyList@123[empty]
+    <name not found> = EmptyList@123[empty]
+    <name not found> = EmptyList@123[empty]
+    <name not found> = EmptyList@123[empty]
+    <name not found> = EmptyList@123[empty]
+    <name not found> = EmptyList@123[empty]
     <name not found> = EmptyList@123[empty]
     <name not found> = EmptyList@123[empty]
     <name not found> = EmptyList@123[empty]
diff --git a/compiler/testData/diagnostics/tests/inference/reportingImprovements/ErrorTypeAsGenericParameter.lazy.log b/compiler/testData/diagnostics/tests/inference/reportingImprovements/ErrorTypeAsGenericParameter.lazy.log
index f749ec7d6a9..0469a7f0753 100644
--- a/compiler/testData/diagnostics/tests/inference/reportingImprovements/ErrorTypeAsGenericParameter.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/reportingImprovements/ErrorTypeAsGenericParameter.lazy.log
@@ -58,38 +58,27 @@ LazyJavaPackageFragment@23['lang'] {
 
 ResolutionTaskHolder@52 {
     <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
     <name not found> = EmptyList@45[empty]
     <name not found> = EmptyList@45[empty]
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
+}
+
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
 }
 
 ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@65[8] { ResolutionCandidate@66, ResolutionCandidate@67, ResolutionCandidate@68, ... }
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[8] { ResolutionCandidate@70, ResolutionCandidate@71, ResolutionCandidate@72, ... }
-    <name not found> = ArrayList@73[8] { ResolutionCandidate@70, ResolutionCandidate@71, ResolutionCandidate@72, ... }
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
+ResolutionTaskHolder@69 {
     <name not found> = EmptyList@45[empty]
     <name not found> = EmptyList@45[empty]
     <name not found> = EmptyList@45[empty]
@@ -108,9 +97,23 @@ ResolutionTaskHolder@74 {
     <name not found> = EmptyList@45[empty]
 }
 
-ResolutionTaskHolder@75 {
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
+ResolutionTaskHolder@70 {
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+}
+
+null {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@75[8] { ResolutionCandidate@66, ResolutionCandidate@67, ResolutionCandidate@68, ... }
     <name not found> = EmptyList@45[empty]
     <name not found> = EmptyList@45[empty]
     <name not found> = EmptyList@45[empty]
diff --git a/compiler/testData/diagnostics/tests/inference/reportingImprovements/FunctionPlaceholder.lazy.log b/compiler/testData/diagnostics/tests/inference/reportingImprovements/FunctionPlaceholder.lazy.log
index 78a6a5837c6..cd5464ad6cd 100644
--- a/compiler/testData/diagnostics/tests/inference/reportingImprovements/FunctionPlaceholder.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/reportingImprovements/FunctionPlaceholder.lazy.log
@@ -53,10 +53,6 @@ LazyJavaPackageFragment@20['lang'] {
 
 ResolutionTaskHolder@46 {
     <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
@@ -74,12 +70,8 @@ ResolutionTaskHolder@46 {
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
@@ -97,10 +89,8 @@ ResolutionTaskHolder@50 {
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@38[empty]
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
@@ -116,92 +106,67 @@ ResolutionTaskHolder@54 {
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
 ResolutionTaskHolder@58 {
     <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
+}
+
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
 }
 
 ResolutionTaskHolder@70 {
     <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
+}
+
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
 }
 
 ResolutionTaskHolder@82 {
     <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
 }
 
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[8] { ResolutionCandidate@93, ResolutionCandidate@94, ResolutionCandidate@95, ... }
 }
 
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[8] { ResolutionCandidate@108, ResolutionCandidate@109, ResolutionCandidate@110, ... }
-    <name not found> = ArrayList@111[8] { ResolutionCandidate@108, ResolutionCandidate@109, ResolutionCandidate@110, ... }
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
+ResolutionTaskHolder@96 {
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
@@ -220,7 +185,45 @@ ResolutionTaskHolder@112 {
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@113 {
+ResolutionTaskHolder@97 {
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+}
+
+null {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@113[8] { ResolutionCandidate@93, ResolutionCandidate@94, ResolutionCandidate@95, ... }
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
diff --git a/compiler/testData/diagnostics/tests/inference/reportingImprovements/NoAmbiguityForDifferentFunctionTypes.lazy.log b/compiler/testData/diagnostics/tests/inference/reportingImprovements/NoAmbiguityForDifferentFunctionTypes.lazy.log
index 5f598919a7f..1942ab71883 100644
--- a/compiler/testData/diagnostics/tests/inference/reportingImprovements/NoAmbiguityForDifferentFunctionTypes.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/reportingImprovements/NoAmbiguityForDifferentFunctionTypes.lazy.log
@@ -58,37 +58,25 @@ LazyJavaPackageFragment@22['lang'] {
 
 ResolutionTaskHolder@51 {
     <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[2] { ResolutionCandidate@65, ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[2] { ResolutionCandidate@65, ResolutionCandidate@66 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[2] { ResolutionCandidate@62, ResolutionCandidate@63 }
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
+ResolutionTaskHolder@64 {
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
@@ -107,7 +95,22 @@ ResolutionTaskHolder@68 {
     <name not found> = EmptyList@43[empty]
 }
 
-ResolutionTaskHolder@69 {
+ResolutionTaskHolder@65 {
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+}
+
+null {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@69[2] { ResolutionCandidate@62, ResolutionCandidate@63 }
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
diff --git a/compiler/testData/diagnostics/tests/inference/reportingImprovements/cannotInferParameterTypeWithInference.lazy.log b/compiler/testData/diagnostics/tests/inference/reportingImprovements/cannotInferParameterTypeWithInference.lazy.log
index 9878048eee4..0a0aac41d30 100644
--- a/compiler/testData/diagnostics/tests/inference/reportingImprovements/cannotInferParameterTypeWithInference.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/reportingImprovements/cannotInferParameterTypeWithInference.lazy.log
@@ -47,23 +47,26 @@ LazyJavaPackageFragment@17['lang'] {
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+}
+
+null {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@45 }
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inference/reportingImprovements/subtypeForInvariantWithErrorGenerics.lazy.log b/compiler/testData/diagnostics/tests/inference/reportingImprovements/subtypeForInvariantWithErrorGenerics.lazy.log
index 12988908007..f1ce47f1edb 100644
--- a/compiler/testData/diagnostics/tests/inference/reportingImprovements/subtypeForInvariantWithErrorGenerics.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/reportingImprovements/subtypeForInvariantWithErrorGenerics.lazy.log
@@ -47,80 +47,83 @@ LazyJavaPackageFragment@16['lang'] {
 
 ResolutionTaskHolder@38 {
     <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
 ResolutionTaskHolder@50 {
     <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+}
+
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
 }
 
 ResolutionTaskHolder@62 {
     <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[2] { ResolutionCandidate@70, ResolutionCandidate@71 }
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[2] { ResolutionCandidate@74, ResolutionCandidate@75 }
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[2] { ResolutionCandidate@80, ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[2] { ResolutionCandidate@80, ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[2] { ResolutionCandidate@85, ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[2] { ResolutionCandidate@85, ResolutionCandidate@86 }
+null {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@86[2] { ResolutionCandidate@74, ResolutionCandidate@75 }
+    <name not found> = ArrayList@87[2] { ResolutionCandidate@70, ResolutionCandidate@71 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inference/tryNumberLowerBoundsBeforeUpperBounds.lazy.log b/compiler/testData/diagnostics/tests/inference/tryNumberLowerBoundsBeforeUpperBounds.lazy.log
index b1c2253199c..f5abaf2669e 100644
--- a/compiler/testData/diagnostics/tests/inference/tryNumberLowerBoundsBeforeUpperBounds.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/tryNumberLowerBoundsBeforeUpperBounds.lazy.log
@@ -33,21 +33,21 @@ LazyJavaClassifierType@19['String'] {
 
 LazyJavaClassifierType@22['String'] {
     arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@13['String']
+    classifier = JavaClassImpl@21['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
 
 LazyJavaClassifierType@25['String'] {
     arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@18['String']
+    classifier = JavaClassImpl@13['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@21['String']
+    classifier = JavaClassImpl@18['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
@@ -148,53 +148,56 @@ LazyJavaPackageFragment@56['lang'] {
 
 ResolutionTaskHolder@81 {
     <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
 }
 
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
+}
+
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
 }
 
 ResolutionTaskHolder@93 {
     <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
 }
 
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
 }
 
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[4] { ResolutionCandidate@101, ResolutionCandidate@102, ResolutionCandidate@103, ... }
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
 }
 
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[4] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
-    <name not found> = ArrayList@110[5] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[7] { ResolutionCandidate@106, ResolutionCandidate@107, ResolutionCandidate@108, ... }
+}
+
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[8] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113, ... }
+}
+
+null {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@120[5] { ResolutionCandidate@101, ResolutionCandidate@102, ResolutionCandidate@103, ... }
+    <name not found> = ArrayList@121[7] { ResolutionCandidate@106, ResolutionCandidate@107, ResolutionCandidate@108, ... }
+    <name not found> = ArrayList@122[8] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113, ... }
     <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
 }
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[7] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
-    <name not found> = ArrayList@116[7] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[8] { ResolutionCandidate@119, ResolutionCandidate@120, ResolutionCandidate@121, ... }
-    <name not found> = ArrayList@122[8] { ResolutionCandidate@119, ResolutionCandidate@120, ResolutionCandidate@121, ... }
-}
diff --git a/compiler/testData/diagnostics/tests/inference/typeConstructorMismatch.lazy.log b/compiler/testData/diagnostics/tests/inference/typeConstructorMismatch.lazy.log
index 052b7b0acf1..4e236534352 100644
--- a/compiler/testData/diagnostics/tests/inference/typeConstructorMismatch.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/typeConstructorMismatch.lazy.log
@@ -63,12 +63,6 @@ LazyJavaPackageFragment@16['util'] {
 
 ResolutionTaskHolder@54 {
     <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
     <name not found> = EmptyList@42[empty]
     <name not found> = EmptyList@42[empty]
     <name not found> = EmptyList@42[empty]
@@ -94,12 +88,8 @@ ResolutionTaskHolder@54 {
     <name not found> = EmptyList@42[empty]
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
     <name not found> = EmptyList@42[empty]
     <name not found> = EmptyList@42[empty]
     <name not found> = EmptyList@42[empty]
@@ -117,22 +107,35 @@ ResolutionTaskHolder@58 {
     <name not found> = EmptyList@42[empty]
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
+}
+
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
 }
 
 ResolutionTaskHolder@66 {
     <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
+null {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@62 }
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inference/typeInferenceExpectedTypeMismatch.lazy.log b/compiler/testData/diagnostics/tests/inference/typeInferenceExpectedTypeMismatch.lazy.log
index 5cbe3ab825a..22a848b3494 100644
--- a/compiler/testData/diagnostics/tests/inference/typeInferenceExpectedTypeMismatch.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/typeInferenceExpectedTypeMismatch.lazy.log
@@ -110,14 +110,14 @@ LazyJavaClassifierType@66['E'] {
 
 LazyJavaClassifierType@69['E'] {
     arguments = ArrayList@70[empty]
-    classifier = JavaTypeParameterImpl@64['E']
+    classifier = JavaTypeParameterImpl@68['E']
     nullable = 'true': Boolean@59
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@65
 }
 
 LazyJavaClassifierType@71['E'] {
     arguments = ArrayList@72[empty]
-    classifier = JavaTypeParameterImpl@68['E']
+    classifier = JavaTypeParameterImpl@64['E']
     nullable = 'true': Boolean@59
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@65
 }
@@ -187,14 +187,14 @@ LazyJavaClassifierType@96['String'] {
 
 LazyJavaClassifierType@98['String'] {
     arguments = ArrayList@99[empty]
-    classifier = JavaClassImpl@95['String']
+    classifier = JavaClassImpl@92['String']
     nullable = 'true': Boolean@59
     typeConstructor = DeserializedClassTypeConstructor@89
 }
 
 LazyJavaClassifierType@100['String'] {
     arguments = ArrayList@101[empty]
-    classifier = JavaClassImpl@92['String']
+    classifier = JavaClassImpl@95['String']
     nullable = 'true': Boolean@59
     typeConstructor = DeserializedClassTypeConstructor@89
 }
@@ -222,7 +222,7 @@ LazyJavaClassifierType@109['Throwable'] {
 
 LazyJavaClassifierType@112['Throwable'] {
     arguments = ArrayList@113[empty]
-    classifier = JavaClassImpl@108['Throwable']
+    classifier = JavaClassImpl@104['Throwable']
     nullable = 'true': Boolean@59
     typeConstructor = DeserializedClassTypeConstructor@105
 }
@@ -236,7 +236,7 @@ LazyJavaClassifierType@114['Throwable'] {
 
 LazyJavaClassifierType@116['Throwable'] {
     arguments = ArrayList@117[empty]
-    classifier = JavaClassImpl@104['Throwable']
+    classifier = JavaClassImpl@108['Throwable']
     nullable = 'true': Boolean@59
     typeConstructor = DeserializedClassTypeConstructor@105
 }
@@ -389,10 +389,6 @@ LazyJavaTypeParameterResolver@229 {
 
 ResolutionTaskHolder@231 {
     <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@233 }
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
     <name not found> = EmptyList@209[empty]
     <name not found> = EmptyList@209[empty]
     <name not found> = EmptyList@209[empty]
@@ -410,12 +406,8 @@ ResolutionTaskHolder@231 {
     <name not found> = EmptyList@209[empty]
 }
 
-ResolutionTaskHolder@235 {
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@237 }
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
+ResolutionTaskHolder@234 {
+    <name not found> = ArrayList@235[1] { ResolutionCandidate@236 }
     <name not found> = EmptyList@209[empty]
     <name not found> = EmptyList@209[empty]
     <name not found> = EmptyList@209[empty]
@@ -433,161 +425,172 @@ ResolutionTaskHolder@235 {
     <name not found> = EmptyList@209[empty]
 }
 
-ResolutionTaskHolder@239 {
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@241 }
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@241 }
+ResolutionTaskHolder@237 {
+    <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
     <name not found> = EmptyList@209[empty]
     <name not found> = EmptyList@209[empty]
+}
+
+ResolutionTaskHolder@240 {
+    <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
     <name not found> = EmptyList@209[empty]
     <name not found> = EmptyList@209[empty]
 }
 
 ResolutionTaskHolder@243 {
     <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@245 }
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
     <name not found> = EmptyList@209[empty]
     <name not found> = EmptyList@209[empty]
 }
 
-ResolutionTaskHolder@247 {
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@249 }
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
+ResolutionTaskHolder@246 {
+    <name not found> = ArrayList@247[1] { ResolutionCandidate@248 }
     <name not found> = EmptyList@209[empty]
     <name not found> = EmptyList@209[empty]
 }
 
-ResolutionTaskHolder@251 {
-    <name not found> = ArrayList@252[1] { ResolutionCandidate@253 }
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@253 }
+ResolutionTaskHolder@249 {
+    <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
     <name not found> = EmptyList@209[empty]
     <name not found> = EmptyList@209[empty]
+}
+
+ResolutionTaskHolder@252 {
+    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
     <name not found> = EmptyList@209[empty]
     <name not found> = EmptyList@209[empty]
 }
 
 ResolutionTaskHolder@255 {
     <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
-    <name not found> = ArrayList@258[1] { ResolutionCandidate@257 }
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
 }
 
-ResolutionTaskHolder@259 {
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@261 }
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@261 }
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
+ResolutionTaskHolder@258 {
+    <name not found> = ArrayList@259[1] { ResolutionCandidate@260 }
 }
 
-ResolutionTaskHolder@263 {
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@265 }
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@265 }
+ResolutionTaskHolder@261 {
+    <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
+}
+
+ResolutionTaskHolder@264 {
+    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
 }
 
 ResolutionTaskHolder@267 {
     <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
-    <name not found> = ArrayList@270[1] { ResolutionCandidate@269 }
 }
 
-ResolutionTaskHolder@271 {
-    <name not found> = ArrayList@272[1] { ResolutionCandidate@273 }
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@273 }
+ResolutionTaskHolder@270 {
+    <name not found> = ArrayList@271[1] { ResolutionCandidate@272 }
 }
 
-ResolutionTaskHolder@275 {
-    <name not found> = ArrayList@276[1] { ResolutionCandidate@277 }
-    <name not found> = ArrayList@278[1] { ResolutionCandidate@277 }
+ResolutionTaskHolder@273 {
+    <name not found> = ArrayList@274[1] { ResolutionCandidate@275 }
+}
+
+ResolutionTaskHolder@276 {
+    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
 }
 
 ResolutionTaskHolder@279 {
     <name not found> = ArrayList@280[1] { ResolutionCandidate@281 }
-    <name not found> = ArrayList@282[1] { ResolutionCandidate@281 }
 }
 
-ResolutionTaskHolder@283 {
-    <name not found> = ArrayList@284[1] { ResolutionCandidate@285 }
-    <name not found> = ArrayList@286[1] { ResolutionCandidate@285 }
+ResolutionTaskHolder@282 {
+    <name not found> = ArrayList@283[1] { ResolutionCandidate@284 }
 }
 
-ResolutionTaskHolder@287 {
-    <name not found> = ArrayList@288[1] { ResolutionCandidate@289 }
-    <name not found> = ArrayList@290[1] { ResolutionCandidate@289 }
+ResolutionTaskHolder@285 {
+    <name not found> = ArrayList@286[1] { ResolutionCandidate@287 }
+}
+
+ResolutionTaskHolder@288 {
+    <name not found> = ArrayList@289[1] { ResolutionCandidate@290 }
 }
 
 ResolutionTaskHolder@291 {
     <name not found> = ArrayList@292[1] { ResolutionCandidate@293 }
-    <name not found> = ArrayList@294[1] { ResolutionCandidate@293 }
 }
 
-ResolutionTaskHolder@295 {
-    <name not found> = ArrayList@296[1] { ResolutionCandidate@297 }
-    <name not found> = ArrayList@298[1] { ResolutionCandidate@297 }
+ResolutionTaskHolder@294 {
+    <name not found> = ArrayList@295[1] { ResolutionCandidate@296 }
 }
 
-ResolutionTaskHolder@299 {
-    <name not found> = ArrayList@300[1] { ResolutionCandidate@301 }
-    <name not found> = ArrayList@302[1] { ResolutionCandidate@301 }
+ResolutionTaskHolder@297 {
+    <name not found> = ArrayList@298[1] { ResolutionCandidate@299 }
+}
+
+ResolutionTaskHolder@300 {
+    <name not found> = ArrayList@301[1] { ResolutionCandidate@302 }
 }
 
 ResolutionTaskHolder@303 {
-    <name not found> = ArrayList@304[1] { ResolutionCandidate@305 }
-    <name not found> = ArrayList@306[1] { ResolutionCandidate@305 }
-}
-
-ResolutionTaskHolder@307 {
-    <name not found> = ArrayList@308[1] { ResolutionCandidate@309 }
-    <name not found> = ArrayList@310[1] { ResolutionCandidate@309 }
-}
-
-ResolutionTaskHolder@311 {
-    <name not found> = ArrayList@312[1] { ResolutionCandidate@313 }
-    <name not found> = ArrayList@314[1] { ResolutionCandidate@313 }
-}
-
-ResolutionTaskHolder@315 {
-    <name not found> = ArrayList@316[1] { ResolutionCandidate@317 }
-    <name not found> = ArrayList@318[1] { ResolutionCandidate@317 }
-}
-
-ResolutionTaskHolder@319 {
-    <name not found> = ArrayList@320[1] { ResolutionCandidate@321 }
-    <name not found> = ArrayList@322[1] { ResolutionCandidate@321 }
-}
-
-ResolutionTaskHolder@323 {
-    <name not found> = ArrayList@324[1] { ResolutionCandidate@325 }
-    <name not found> = ArrayList@326[1] { ResolutionCandidate@325 }
-}
-
-ResolutionTaskHolder@327 {
-    <name not found> = ArrayList@328[3] { ResolutionCandidate@329, ResolutionCandidate@330, ResolutionCandidate@331 }
-    <name not found> = ArrayList@332[3] { ResolutionCandidate@329, ResolutionCandidate@330, ResolutionCandidate@331 }
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
+    <name not found> = ArrayList@304[3] { ResolutionCandidate@305, ResolutionCandidate@306, ResolutionCandidate@307 }
     <name not found> = EmptyList@209[empty]
     <name not found> = EmptyList@209[empty]
 }
 
-ResolutionTaskHolder@333 {
-    <name not found> = ArrayList@334[4] { ResolutionCandidate@335, ResolutionCandidate@336, ResolutionCandidate@337, ... }
-    <name not found> = ArrayList@338[5] { ResolutionCandidate@335, ResolutionCandidate@336, ResolutionCandidate@337, ... }
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
+ResolutionTaskHolder@308 {
+    <name not found> = ArrayList@309[4] { ResolutionCandidate@310, ResolutionCandidate@311, ResolutionCandidate@312, ... }
     <name not found> = EmptyList@209[empty]
     <name not found> = EmptyList@209[empty]
 }
 
-ResolutionTaskHolder@339 {
-    <name not found> = ArrayList@340[4] { ResolutionCandidate@341, ResolutionCandidate@342, ResolutionCandidate@343, ... }
-    <name not found> = ArrayList@344[5] { ResolutionCandidate@341, ResolutionCandidate@342, ResolutionCandidate@343, ... }
+ResolutionTaskHolder@313 {
+    <name not found> = ArrayList@314[4] { ResolutionCandidate@315, ResolutionCandidate@316, ResolutionCandidate@317, ... }
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
+}
+
+null {
+    <name not found> = ArrayList@318[1] { ResolutionCandidate@242 }
+    <name not found> = ArrayList@319[1] { ResolutionCandidate@287 }
+    <name not found> = ArrayList@320[1] { ResolutionCandidate@251 }
+    <name not found> = ArrayList@321[1] { ResolutionCandidate@257 }
+    <name not found> = ArrayList@322[1] { ResolutionCandidate@302 }
+    <name not found> = ArrayList@323[1] { ResolutionCandidate@293 }
+    <name not found> = ArrayList@324[1] { ResolutionCandidate@299 }
+    <name not found> = ArrayList@325[1] { ResolutionCandidate@263 }
+    <name not found> = ArrayList@326[1] { ResolutionCandidate@254 }
+    <name not found> = ArrayList@327[1] { ResolutionCandidate@272 }
+    <name not found> = ArrayList@328[1] { ResolutionCandidate@266 }
+    <name not found> = ArrayList@329[1] { ResolutionCandidate@245 }
+    <name not found> = ArrayList@330[1] { ResolutionCandidate@278 }
+    <name not found> = ArrayList@331[1] { ResolutionCandidate@239 }
+    <name not found> = ArrayList@332[1] { ResolutionCandidate@284 }
+    <name not found> = ArrayList@333[1] { ResolutionCandidate@269 }
+    <name not found> = ArrayList@334[1] { ResolutionCandidate@275 }
+    <name not found> = ArrayList@335[1] { ResolutionCandidate@281 }
+    <name not found> = ArrayList@336[1] { ResolutionCandidate@236 }
+    <name not found> = ArrayList@337[1] { ResolutionCandidate@290 }
+    <name not found> = ArrayList@338[1] { ResolutionCandidate@260 }
+    <name not found> = ArrayList@339[1] { ResolutionCandidate@233 }
+    <name not found> = ArrayList@340[1] { ResolutionCandidate@296 }
+    <name not found> = ArrayList@341[1] { ResolutionCandidate@248 }
+    <name not found> = ArrayList@342[3] { ResolutionCandidate@305, ResolutionCandidate@306, ResolutionCandidate@307 }
+    <name not found> = ArrayList@343[5] { ResolutionCandidate@310, ResolutionCandidate@311, ResolutionCandidate@312, ... }
+    <name not found> = ArrayList@344[5] { ResolutionCandidate@315, ResolutionCandidate@316, ResolutionCandidate@317, ... }
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
     <name not found> = EmptyList@209[empty]
     <name not found> = EmptyList@209[empty]
     <name not found> = EmptyList@209[empty]
diff --git a/compiler/testData/diagnostics/tests/inference/upperBounds/conflictingSubstitutionsFromUpperBound.lazy.log b/compiler/testData/diagnostics/tests/inference/upperBounds/conflictingSubstitutionsFromUpperBound.lazy.log
index 1309a6908f2..837e4c82df5 100644
--- a/compiler/testData/diagnostics/tests/inference/upperBounds/conflictingSubstitutionsFromUpperBound.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/upperBounds/conflictingSubstitutionsFromUpperBound.lazy.log
@@ -98,21 +98,21 @@ LazyJavaClassifierType@70['E'] {
     arguments = ArrayList@71[empty]
     classifier = JavaTypeParameterImpl@72['E']
     nullable = 'false': Boolean@55
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
 }
 
-LazyJavaClassifierType@74['E'] {
-    arguments = ArrayList@75[empty]
-    classifier = JavaTypeParameterImpl@76['E']
+LazyJavaClassifierType@73['E'] {
+    arguments = ArrayList@74[empty]
+    classifier = JavaTypeParameterImpl@75['E']
     nullable = 'false': Boolean@55
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@76
 }
 
 LazyJavaClassifierType@77['E'] {
     arguments = ArrayList@78[empty]
     classifier = JavaTypeParameterImpl@79['E']
     nullable = 'false': Boolean@55
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
 }
 
 LazyJavaClassifierType@80['E'] {
@@ -126,35 +126,35 @@ LazyJavaClassifierType@84['E'] {
     arguments = ArrayList@85[empty]
     classifier = JavaTypeParameterImpl@79['E']
     nullable = 'true': Boolean@61
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
 }
 
 LazyJavaClassifierType@86['E'] {
     arguments = ArrayList@87[empty]
+    classifier = JavaTypeParameterImpl@72['E']
+    nullable = 'true': Boolean@61
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
+}
+
+LazyJavaClassifierType@88['E'] {
+    arguments = ArrayList@89[empty]
     classifier = JavaTypeParameterImpl@82['E']
     nullable = 'true': Boolean@61
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
 }
 
-LazyJavaClassifierType@88['E'] {
-    arguments = ArrayList@89[empty]
-    classifier = JavaTypeParameterImpl@72['E']
-    nullable = 'true': Boolean@61
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
-}
-
 LazyJavaClassifierType@90['E'] {
     arguments = ArrayList@91[empty]
-    classifier = JavaTypeParameterImpl@76['E']
+    classifier = JavaTypeParameterImpl@68['E']
     nullable = 'true': Boolean@61
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
 }
 
 LazyJavaClassifierType@92['E'] {
     arguments = ArrayList@93[empty]
-    classifier = JavaTypeParameterImpl@68['E']
+    classifier = JavaTypeParameterImpl@75['E']
     nullable = 'true': Boolean@61
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@76
 }
 
 LazyJavaClassifierType@94['Object'] {
@@ -172,12 +172,12 @@ LazyJavaClassifierType@99['Serializable'] {
     typeConstructor = LazyJavaClassTypeConstructor@21['Serializable']
 }
 
-LazyJavaClassifierType@38['Set<E>'] {
+LazyJavaClassifierType@30['Set<E>'] {
     classifier = JavaClassImpl@101['Set']
     typeConstructor = DeserializedClassTypeConstructor@102
 }
 
-LazyJavaClassifierType@30['Set<E>'] {
+LazyJavaClassifierType@38['Set<E>'] {
     classifier = JavaClassImpl@103['Set']
     typeConstructor = DeserializedClassTypeConstructor@102
 }
@@ -205,7 +205,7 @@ LazyJavaClassifierType@111['String'] {
 
 LazyJavaClassifierType@114['String'] {
     arguments = ArrayList@115[empty]
-    classifier = JavaClassImpl@106['String']
+    classifier = JavaClassImpl@113['String']
     nullable = 'true': Boolean@61
     typeConstructor = DeserializedClassTypeConstructor@107
 }
@@ -219,7 +219,7 @@ LazyJavaClassifierType@116['String'] {
 
 LazyJavaClassifierType@118['String'] {
     arguments = ArrayList@119[empty]
-    classifier = JavaClassImpl@113['String']
+    classifier = JavaClassImpl@106['String']
     nullable = 'true': Boolean@61
     typeConstructor = DeserializedClassTypeConstructor@107
 }
@@ -247,7 +247,7 @@ LazyJavaClassifierType@127['Throwable'] {
 
 LazyJavaClassifierType@130['Throwable'] {
     arguments = ArrayList@131[empty]
-    classifier = JavaClassImpl@122['Throwable']
+    classifier = JavaClassImpl@129['Throwable']
     nullable = 'true': Boolean@61
     typeConstructor = DeserializedClassTypeConstructor@123
 }
@@ -261,7 +261,7 @@ LazyJavaClassifierType@132['Throwable'] {
 
 LazyJavaClassifierType@134['Throwable'] {
     arguments = ArrayList@135[empty]
-    classifier = JavaClassImpl@129['Throwable']
+    classifier = JavaClassImpl@122['Throwable']
     nullable = 'true': Boolean@61
     typeConstructor = DeserializedClassTypeConstructor@123
 }
@@ -339,36 +339,32 @@ LazyJavaPackageFragment@164['util'] {
 
 LazyJavaTypeParameterDescriptor@35['E'] {
     defaultType = JetTypeImpl@193['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
     upperBounds = LinkedHashSet@194[1] { NullableType@195 }
 }
 
 LazyJavaTypeParameterDescriptor@23['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
-}
-
-LazyJavaTypeParameterDescriptor@27['E'] {
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
 }
 
+LazyJavaTypeParameterDescriptor@27['E'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@76
+}
+
 LazyJavaTypeParameterResolver@196 {
-    resolve(JavaTypeParameterImpl@68['E']) = LazyJavaTypeParameterDescriptor@23['E']
+    resolve(JavaTypeParameterImpl@82['E']) = LazyJavaTypeParameterDescriptor@23['E']
 }
 
 LazyJavaTypeParameterResolver@197 {
-    resolve(JavaTypeParameterImpl@82['E']) = LazyJavaTypeParameterDescriptor@27['E']
+    resolve(JavaTypeParameterImpl@198['E']) = LazyJavaTypeParameterDescriptor@35['E']
 }
 
-LazyJavaTypeParameterResolver@198 {
-    resolve(JavaTypeParameterImpl@199['E']) = LazyJavaTypeParameterDescriptor@35['E']
+LazyJavaTypeParameterResolver@199 {
+    resolve(JavaTypeParameterImpl@75['E']) = LazyJavaTypeParameterDescriptor@27['E']
 }
 
 ResolutionTaskHolder@200 {
     <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@202 }
-    <name not found> = EmptyList@181[empty]
-    <name not found> = EmptyList@181[empty]
-    <name not found> = EmptyList@181[empty]
     <name not found> = EmptyList@181[empty]
     <name not found> = EmptyList@181[empty]
     <name not found> = EmptyList@181[empty]
@@ -386,38 +382,45 @@ ResolutionTaskHolder@200 {
     <name not found> = EmptyList@181[empty]
 }
 
-ResolutionTaskHolder@204 {
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@206 }
+ResolutionTaskHolder@203 {
+    <name not found> = ArrayList@204[1] { ResolutionCandidate@205 }
 }
 
-ResolutionTaskHolder@208 {
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@210 }
+ResolutionTaskHolder@206 {
+    <name not found> = ArrayList@207[1] { ResolutionCandidate@208 }
+}
+
+ResolutionTaskHolder@209 {
+    <name not found> = ArrayList@210[1] { ResolutionCandidate@211 }
 }
 
 ResolutionTaskHolder@212 {
     <name not found> = ArrayList@213[1] { ResolutionCandidate@214 }
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@214 }
 }
 
-ResolutionTaskHolder@216 {
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@218 }
+ResolutionTaskHolder@215 {
+    <name not found> = ArrayList@216[4] { ResolutionCandidate@217, ResolutionCandidate@218, ResolutionCandidate@219, ... }
+    <name not found> = EmptyList@181[empty]
+    <name not found> = EmptyList@181[empty]
 }
 
 ResolutionTaskHolder@220 {
     <name not found> = ArrayList@221[4] { ResolutionCandidate@222, ResolutionCandidate@223, ResolutionCandidate@224, ... }
-    <name not found> = ArrayList@225[5] { ResolutionCandidate@222, ResolutionCandidate@223, ResolutionCandidate@224, ... }
-    <name not found> = EmptyList@181[empty]
-    <name not found> = EmptyList@181[empty]
     <name not found> = EmptyList@181[empty]
     <name not found> = EmptyList@181[empty]
 }
 
-ResolutionTaskHolder@226 {
-    <name not found> = ArrayList@227[4] { ResolutionCandidate@228, ResolutionCandidate@229, ResolutionCandidate@230, ... }
-    <name not found> = ArrayList@231[5] { ResolutionCandidate@228, ResolutionCandidate@229, ResolutionCandidate@230, ... }
+null {
+    <name not found> = ArrayList@225[1] { ResolutionCandidate@208 }
+    <name not found> = ArrayList@226[1] { ResolutionCandidate@205 }
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@214 }
+    <name not found> = ArrayList@228[1] { ResolutionCandidate@202 }
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@211 }
+    <name not found> = ArrayList@230[5] { ResolutionCandidate@217, ResolutionCandidate@218, ResolutionCandidate@219, ... }
+    <name not found> = ArrayList@231[5] { ResolutionCandidate@222, ResolutionCandidate@223, ResolutionCandidate@224, ... }
+    <name not found> = EmptyList@181[empty]
+    <name not found> = EmptyList@181[empty]
+    <name not found> = EmptyList@181[empty]
     <name not found> = EmptyList@181[empty]
     <name not found> = EmptyList@181[empty]
     <name not found> = EmptyList@181[empty]
diff --git a/compiler/testData/diagnostics/tests/inference/upperBounds/doNotInferFromBoundsOnly.lazy.log b/compiler/testData/diagnostics/tests/inference/upperBounds/doNotInferFromBoundsOnly.lazy.log
index b17926a4196..9f99f143ca3 100644
--- a/compiler/testData/diagnostics/tests/inference/upperBounds/doNotInferFromBoundsOnly.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/upperBounds/doNotInferFromBoundsOnly.lazy.log
@@ -40,14 +40,14 @@ LazyJavaClassifierType@22['String'] {
 
 LazyJavaClassifierType@25['String'] {
     arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@13['String']
+    classifier = JavaClassImpl@18['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@18['String']
+    classifier = JavaClassImpl@13['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
@@ -175,186 +175,189 @@ LazyJavaPackageFragment@70['lang'] {
 
 ResolutionTaskHolder@108 {
     <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
 }
 
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
+ResolutionTaskHolder@111 {
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
 }
 
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
+}
+
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
 }
 
 ResolutionTaskHolder@120 {
     <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
 }
 
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@126 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
+ResolutionTaskHolder@123 {
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
 }
 
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
+ResolutionTaskHolder@126 {
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
+}
+
+ResolutionTaskHolder@129 {
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
 }
 
 ResolutionTaskHolder@132 {
     <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
 }
 
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
+ResolutionTaskHolder@135 {
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
 }
 
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
+ResolutionTaskHolder@138 {
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
+}
+
+ResolutionTaskHolder@141 {
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
 }
 
 ResolutionTaskHolder@144 {
     <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
 }
 
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
+ResolutionTaskHolder@147 {
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
 }
 
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
+ResolutionTaskHolder@150 {
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
+}
+
+ResolutionTaskHolder@153 {
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
 }
 
 ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
-}
-
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@162 }
-}
-
-ResolutionTaskHolder@164 {
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@166 }
-}
-
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@170 }
-}
-
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[4] { ResolutionCandidate@174, ResolutionCandidate@175, ResolutionCandidate@176, ... }
-    <name not found> = ArrayList@177[5] { ResolutionCandidate@174, ResolutionCandidate@175, ResolutionCandidate@176, ... }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
+    <name not found> = ArrayList@157[4] { ResolutionCandidate@158, ResolutionCandidate@159, ResolutionCandidate@160, ... }
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
 }
 
-ResolutionTaskHolder@178 {
-    <name not found> = ArrayList@179[4] { ResolutionCandidate@180, ResolutionCandidate@181, ResolutionCandidate@182, ... }
-    <name not found> = ArrayList@183[5] { ResolutionCandidate@180, ResolutionCandidate@181, ResolutionCandidate@182, ... }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
+ResolutionTaskHolder@161 {
+    <name not found> = ArrayList@162[4] { ResolutionCandidate@163, ResolutionCandidate@164, ResolutionCandidate@165, ... }
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
 }
 
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[4] { ResolutionCandidate@186, ResolutionCandidate@187, ResolutionCandidate@188, ... }
-    <name not found> = ArrayList@189[5] { ResolutionCandidate@186, ResolutionCandidate@187, ResolutionCandidate@188, ... }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
+ResolutionTaskHolder@166 {
+    <name not found> = ArrayList@167[4] { ResolutionCandidate@168, ResolutionCandidate@169, ResolutionCandidate@170, ... }
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
 }
 
-ResolutionTaskHolder@190 {
-    <name not found> = ArrayList@191[4] { ResolutionCandidate@192, ResolutionCandidate@193, ResolutionCandidate@194, ... }
-    <name not found> = ArrayList@195[5] { ResolutionCandidate@192, ResolutionCandidate@193, ResolutionCandidate@194, ... }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
+ResolutionTaskHolder@171 {
+    <name not found> = ArrayList@172[4] { ResolutionCandidate@173, ResolutionCandidate@174, ResolutionCandidate@175, ... }
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
 }
 
-ResolutionTaskHolder@196 {
-    <name not found> = ArrayList@197[4] { ResolutionCandidate@198, ResolutionCandidate@199, ResolutionCandidate@200, ... }
-    <name not found> = ArrayList@201[5] { ResolutionCandidate@198, ResolutionCandidate@199, ResolutionCandidate@200, ... }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
+ResolutionTaskHolder@176 {
+    <name not found> = ArrayList@177[4] { ResolutionCandidate@178, ResolutionCandidate@179, ResolutionCandidate@180, ... }
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
 }
 
-ResolutionTaskHolder@202 {
-    <name not found> = ArrayList@203[4] { ResolutionCandidate@204, ResolutionCandidate@205, ResolutionCandidate@206, ... }
-    <name not found> = ArrayList@207[5] { ResolutionCandidate@204, ResolutionCandidate@205, ResolutionCandidate@206, ... }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
+ResolutionTaskHolder@181 {
+    <name not found> = ArrayList@182[4] { ResolutionCandidate@183, ResolutionCandidate@184, ResolutionCandidate@185, ... }
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
 }
 
-ResolutionTaskHolder@208 {
-    <name not found> = ArrayList@209[4] { ResolutionCandidate@210, ResolutionCandidate@211, ResolutionCandidate@212, ... }
-    <name not found> = ArrayList@213[5] { ResolutionCandidate@210, ResolutionCandidate@211, ResolutionCandidate@212, ... }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
+ResolutionTaskHolder@186 {
+    <name not found> = ArrayList@187[4] { ResolutionCandidate@188, ResolutionCandidate@189, ResolutionCandidate@190, ... }
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
 }
 
-ResolutionTaskHolder@214 {
-    <name not found> = ArrayList@215[4] { ResolutionCandidate@216, ResolutionCandidate@217, ResolutionCandidate@218, ... }
-    <name not found> = ArrayList@219[5] { ResolutionCandidate@216, ResolutionCandidate@217, ResolutionCandidate@218, ... }
+ResolutionTaskHolder@191 {
+    <name not found> = ArrayList@192[4] { ResolutionCandidate@193, ResolutionCandidate@194, ResolutionCandidate@195, ... }
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+}
+
+null {
+    <name not found> = ArrayList@196[1] { ResolutionCandidate@113 }
+    <name not found> = ArrayList@197[1] { ResolutionCandidate@134 }
+    <name not found> = ArrayList@198[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@146 }
+    <name not found> = ArrayList@200[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@201[1] { ResolutionCandidate@149 }
+    <name not found> = ArrayList@202[1] { ResolutionCandidate@155 }
+    <name not found> = ArrayList@203[1] { ResolutionCandidate@122 }
+    <name not found> = ArrayList@204[1] { ResolutionCandidate@143 }
+    <name not found> = ArrayList@205[1] { ResolutionCandidate@137 }
+    <name not found> = ArrayList@206[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@207[1] { ResolutionCandidate@140 }
+    <name not found> = ArrayList@208[1] { ResolutionCandidate@152 }
+    <name not found> = ArrayList@209[1] { ResolutionCandidate@125 }
+    <name not found> = ArrayList@210[1] { ResolutionCandidate@131 }
+    <name not found> = ArrayList@211[1] { ResolutionCandidate@128 }
+    <name not found> = ArrayList@212[5] { ResolutionCandidate@178, ResolutionCandidate@179, ResolutionCandidate@180, ... }
+    <name not found> = ArrayList@213[5] { ResolutionCandidate@163, ResolutionCandidate@164, ResolutionCandidate@165, ... }
+    <name not found> = ArrayList@214[5] { ResolutionCandidate@183, ResolutionCandidate@184, ResolutionCandidate@185, ... }
+    <name not found> = ArrayList@215[5] { ResolutionCandidate@188, ResolutionCandidate@189, ResolutionCandidate@190, ... }
+    <name not found> = ArrayList@216[5] { ResolutionCandidate@168, ResolutionCandidate@169, ResolutionCandidate@170, ... }
+    <name not found> = ArrayList@217[5] { ResolutionCandidate@193, ResolutionCandidate@194, ResolutionCandidate@195, ... }
+    <name not found> = ArrayList@218[5] { ResolutionCandidate@173, ResolutionCandidate@174, ResolutionCandidate@175, ... }
+    <name not found> = ArrayList@219[5] { ResolutionCandidate@158, ResolutionCandidate@159, ResolutionCandidate@160, ... }
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
diff --git a/compiler/testData/diagnostics/tests/inference/upperBounds/intersectUpperBounds.lazy.log b/compiler/testData/diagnostics/tests/inference/upperBounds/intersectUpperBounds.lazy.log
index 2e1a0cacf9a..3480165d5d2 100644
--- a/compiler/testData/diagnostics/tests/inference/upperBounds/intersectUpperBounds.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/upperBounds/intersectUpperBounds.lazy.log
@@ -37,7 +37,7 @@ LazyJavaClassifierType@21['String'] {
 
 LazyJavaClassifierType@24['String'] {
     arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@15['String']
+    classifier = JavaClassImpl@20['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -51,7 +51,7 @@ LazyJavaClassifierType@27['String'] {
 
 LazyJavaClassifierType@29['String'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@20['String']
+    classifier = JavaClassImpl@15['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -79,7 +79,7 @@ LazyJavaClassifierType@38['Throwable'] {
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@37['Throwable']
+    classifier = JavaClassImpl@33['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -93,7 +93,7 @@ LazyJavaClassifierType@43['Throwable'] {
 
 LazyJavaClassifierType@45['Throwable'] {
     arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@33['Throwable']
+    classifier = JavaClassImpl@37['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -161,10 +161,6 @@ LazyJavaPackageFragment@61['lang'] {
 
 ResolutionTaskHolder@97 {
     <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]
@@ -182,12 +178,8 @@ ResolutionTaskHolder@97 {
     <name not found> = EmptyList@89[empty]
 }
 
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
     <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]
@@ -205,115 +197,126 @@ ResolutionTaskHolder@101 {
     <name not found> = EmptyList@89[empty]
 }
 
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
     <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]
+}
+
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
     <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]
 }
 
 ResolutionTaskHolder@109 {
     <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]
 }
 
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
 }
 
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
+ResolutionTaskHolder@115 {
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
+}
+
+ResolutionTaskHolder@118 {
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
 }
 
 ResolutionTaskHolder@121 {
     <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
 }
 
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@127 }
+ResolutionTaskHolder@124 {
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
 }
 
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@131 }
+ResolutionTaskHolder@127 {
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
+}
+
+ResolutionTaskHolder@130 {
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
 }
 
 ResolutionTaskHolder@133 {
     <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@135 }
 }
 
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@139 }
+ResolutionTaskHolder@136 {
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
 }
 
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@143 }
+ResolutionTaskHolder@139 {
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
+}
+
+ResolutionTaskHolder@142 {
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
 }
 
 ResolutionTaskHolder@145 {
     <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@147 }
 }
 
-ResolutionTaskHolder@149 {
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@151 }
+ResolutionTaskHolder@148 {
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
 }
 
-ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@155 }
+ResolutionTaskHolder@151 {
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
 }
 
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@159 }
+ResolutionTaskHolder@154 {
+    <name not found> = ArrayList@155[4] { ResolutionCandidate@156, ResolutionCandidate@157, ResolutionCandidate@158, ... }
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
 }
 
-ResolutionTaskHolder@161 {
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@163 }
+ResolutionTaskHolder@159 {
+    <name not found> = ArrayList@160[4] { ResolutionCandidate@161, ResolutionCandidate@162, ResolutionCandidate@163, ... }
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
 }
 
-ResolutionTaskHolder@165 {
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@167 }
-}
-
-ResolutionTaskHolder@169 {
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@171 }
-}
-
-ResolutionTaskHolder@173 {
-    <name not found> = ArrayList@174[4] { ResolutionCandidate@175, ResolutionCandidate@176, ResolutionCandidate@177, ... }
-    <name not found> = ArrayList@178[5] { ResolutionCandidate@175, ResolutionCandidate@176, ResolutionCandidate@177, ... }
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-}
-
-ResolutionTaskHolder@179 {
-    <name not found> = ArrayList@180[4] { ResolutionCandidate@181, ResolutionCandidate@182, ResolutionCandidate@183, ... }
-    <name not found> = ArrayList@184[5] { ResolutionCandidate@181, ResolutionCandidate@182, ResolutionCandidate@183, ... }
+null {
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@147 }
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@135 }
+    <name not found> = ArrayList@166[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@168[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@170[1] { ResolutionCandidate@126 }
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@132 }
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@176[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@153 }
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@141 }
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@129 }
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@183[5] { ResolutionCandidate@156, ResolutionCandidate@157, ResolutionCandidate@158, ... }
+    <name not found> = ArrayList@184[5] { ResolutionCandidate@161, ResolutionCandidate@162, ResolutionCandidate@163, ... }
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]
diff --git a/compiler/testData/diagnostics/tests/inference/upperBounds/kt2856.lazy.log b/compiler/testData/diagnostics/tests/inference/upperBounds/kt2856.lazy.log
index e9a65b85531..9a796d9a7d9 100644
--- a/compiler/testData/diagnostics/tests/inference/upperBounds/kt2856.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/upperBounds/kt2856.lazy.log
@@ -71,63 +71,63 @@ LazyJavaClassifierType@54['K'] {
     arguments = ArrayList@55[empty]
     classifier = JavaTypeParameterImpl@56['K']
     nullable = 'false': Boolean@52
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
 }
 
-LazyJavaClassifierType@58['K'] {
-    arguments = ArrayList@59[empty]
-    classifier = JavaTypeParameterImpl@60['K']
+LazyJavaClassifierType@57['K'] {
+    arguments = ArrayList@58[empty]
+    classifier = JavaTypeParameterImpl@59['K']
     nullable = 'false': Boolean@52
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
 }
 
-LazyJavaClassifierType@61['K'] {
-    arguments = ArrayList@62[empty]
-    classifier = JavaTypeParameterImpl@63['K']
+LazyJavaClassifierType@60['K'] {
+    arguments = ArrayList@61[empty]
+    classifier = JavaTypeParameterImpl@62['K']
     nullable = 'false': Boolean@52
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
 }
 
-LazyJavaClassifierType@64['K'] {
-    arguments = ArrayList@65[empty]
-    classifier = JavaTypeParameterImpl@66['K']
+LazyJavaClassifierType@63['K'] {
+    arguments = ArrayList@64[empty]
+    classifier = JavaTypeParameterImpl@65['K']
     nullable = 'false': Boolean@52
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
 }
 
 LazyJavaClassifierType@67['K'] {
     arguments = ArrayList@68[empty]
-    classifier = JavaTypeParameterImpl@56['K']
+    classifier = JavaTypeParameterImpl@62['K']
     nullable = 'true': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
 }
 
 LazyJavaClassifierType@70['K'] {
     arguments = ArrayList@71[empty]
-    classifier = JavaTypeParameterImpl@51['K']
+    classifier = JavaTypeParameterImpl@59['K']
     nullable = 'true': Boolean@69
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
 }
 
 LazyJavaClassifierType@72['K'] {
     arguments = ArrayList@73[empty]
-    classifier = JavaTypeParameterImpl@60['K']
+    classifier = JavaTypeParameterImpl@65['K']
     nullable = 'true': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
 }
 
 LazyJavaClassifierType@74['K'] {
     arguments = ArrayList@75[empty]
-    classifier = JavaTypeParameterImpl@63['K']
+    classifier = JavaTypeParameterImpl@56['K']
     nullable = 'true': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
 }
 
 LazyJavaClassifierType@76['K'] {
     arguments = ArrayList@77[empty]
-    classifier = JavaTypeParameterImpl@66['K']
+    classifier = JavaTypeParameterImpl@51['K']
     nullable = 'true': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
 }
 
 LazyJavaClassifierType@78['Map<? extends K, ? extends V>'] {
@@ -188,14 +188,14 @@ LazyJavaClassifierType@113['V'] {
     arguments = ArrayList@114[empty]
     classifier = JavaTypeParameterImpl@115['V']
     nullable = 'false': Boolean@52
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
 }
 
-LazyJavaClassifierType@117['V'] {
-    arguments = ArrayList@118[empty]
-    classifier = JavaTypeParameterImpl@119['V']
+LazyJavaClassifierType@116['V'] {
+    arguments = ArrayList@117[empty]
+    classifier = JavaTypeParameterImpl@118['V']
     nullable = 'false': Boolean@52
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@119
 }
 
 LazyJavaClassifierType@120['V'] {
@@ -214,35 +214,35 @@ LazyJavaClassifierType@123['V'] {
 
 LazyJavaClassifierType@126['V'] {
     arguments = ArrayList@127[empty]
-    classifier = JavaTypeParameterImpl@122['V']
+    classifier = JavaTypeParameterImpl@125['V']
     nullable = 'true': Boolean@69
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
 }
 
 LazyJavaClassifierType@128['V'] {
     arguments = ArrayList@129[empty]
-    classifier = JavaTypeParameterImpl@115['V']
+    classifier = JavaTypeParameterImpl@122['V']
     nullable = 'true': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
 }
 
 LazyJavaClassifierType@130['V'] {
     arguments = ArrayList@131[empty]
-    classifier = JavaTypeParameterImpl@119['V']
+    classifier = JavaTypeParameterImpl@111['V']
     nullable = 'true': Boolean@69
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
 }
 
 LazyJavaClassifierType@132['V'] {
     arguments = ArrayList@133[empty]
-    classifier = JavaTypeParameterImpl@125['V']
+    classifier = JavaTypeParameterImpl@118['V']
     nullable = 'true': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@119
 }
 
 LazyJavaClassifierType@134['V'] {
     arguments = ArrayList@135[empty]
-    classifier = JavaTypeParameterImpl@111['V']
+    classifier = JavaTypeParameterImpl@115['V']
     nullable = 'true': Boolean@69
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
 }
@@ -330,12 +330,12 @@ LazyJavaPackageFragment@174['util'] {
 
 LazyJavaTypeParameterDescriptor@31['K'] {
     defaultType = JetTypeImpl@205['K']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
     upperBounds = LinkedHashSet@206[1] { NullableType@207 }
 }
 
 LazyJavaTypeParameterDescriptor@26['K'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
 }
 
 LazyJavaTypeParameterDescriptor@32['V'] {
@@ -345,7 +345,7 @@ LazyJavaTypeParameterDescriptor@32['V'] {
 }
 
 LazyJavaTypeParameterDescriptor@27['V'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@119
 }
 
 LazyJavaTypeParameterResolver@211 {
@@ -360,72 +360,75 @@ LazyJavaTypeParameterResolver@214 {
 
 ResolutionTaskHolder@217 {
     <name not found> = ArrayList@218[1] { ResolutionCandidate@219 }
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@219 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
 }
 
-ResolutionTaskHolder@221 {
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@223 }
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@223 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
+ResolutionTaskHolder@220 {
+    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
 }
 
-ResolutionTaskHolder@225 {
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@227 }
-    <name not found> = EmptyList@6[empty]
+ResolutionTaskHolder@223 {
+    <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
     <name not found> = EmptyList@6[empty]
 }
 
+ResolutionTaskHolder@226 {
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
+}
+
 ResolutionTaskHolder@229 {
     <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@231 }
 }
 
-ResolutionTaskHolder@233 {
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@235 }
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@235 }
+ResolutionTaskHolder@232 {
+    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
 }
 
-ResolutionTaskHolder@237 {
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@239 }
+ResolutionTaskHolder@235 {
+    <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
+}
+
+ResolutionTaskHolder@238 {
+    <name not found> = ArrayList@239[1] { ResolutionCandidate@240 }
 }
 
 ResolutionTaskHolder@241 {
     <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@243 }
 }
 
-ResolutionTaskHolder@245 {
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@247 }
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@247 }
+ResolutionTaskHolder@244 {
+    <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
 }
 
-ResolutionTaskHolder@249 {
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
-    <name not found> = ArrayList@252[1] { ResolutionCandidate@251 }
+ResolutionTaskHolder@247 {
+    <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
 }
 
-ResolutionTaskHolder@253 {
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@255 }
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@255 }
+ResolutionTaskHolder@250 {
+    <name not found> = ArrayList@251[4] { ResolutionCandidate@252, ResolutionCandidate@253, ResolutionCandidate@254, ... }
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
 }
 
-ResolutionTaskHolder@257 {
-    <name not found> = ArrayList@258[1] { ResolutionCandidate@259 }
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@259 }
-}
-
-ResolutionTaskHolder@261 {
-    <name not found> = ArrayList@262[4] { ResolutionCandidate@263, ResolutionCandidate@264, ResolutionCandidate@265, ... }
-    <name not found> = ArrayList@266[4] { ResolutionCandidate@263, ResolutionCandidate@264, ResolutionCandidate@265, ... }
+null {
+    <name not found> = ArrayList@255[1] { ResolutionCandidate@240 }
+    <name not found> = ArrayList@256[1] { ResolutionCandidate@234 }
+    <name not found> = ArrayList@257[1] { ResolutionCandidate@237 }
+    <name not found> = ArrayList@258[1] { ResolutionCandidate@228 }
+    <name not found> = ArrayList@259[1] { ResolutionCandidate@246 }
+    <name not found> = ArrayList@260[1] { ResolutionCandidate@225 }
+    <name not found> = ArrayList@261[1] { ResolutionCandidate@243 }
+    <name not found> = ArrayList@262[1] { ResolutionCandidate@231 }
+    <name not found> = ArrayList@263[1] { ResolutionCandidate@249 }
+    <name not found> = ArrayList@264[1] { ResolutionCandidate@222 }
+    <name not found> = ArrayList@265[1] { ResolutionCandidate@219 }
+    <name not found> = ArrayList@266[4] { ResolutionCandidate@252, ResolutionCandidate@253, ResolutionCandidate@254, ... }
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
diff --git a/compiler/testData/diagnostics/tests/inference/upperBounds/nonNullUpperBound.lazy.log b/compiler/testData/diagnostics/tests/inference/upperBounds/nonNullUpperBound.lazy.log
index 34b89e5989e..40d98d8ef2d 100644
--- a/compiler/testData/diagnostics/tests/inference/upperBounds/nonNullUpperBound.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/upperBounds/nonNullUpperBound.lazy.log
@@ -33,14 +33,14 @@ LazyJavaClassifierType@19['String'] {
 
 LazyJavaClassifierType@22['String'] {
     arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@21['String']
+    classifier = JavaClassImpl@18['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
 
 LazyJavaClassifierType@25['String'] {
     arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@18['String']
+    classifier = JavaClassImpl@21['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
@@ -154,54 +154,57 @@ LazyJavaPackageFragment@57['lang'] {
 
 ResolutionTaskHolder@84 {
     <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
-    <name not found> = EmptyList@76[empty]
-    <name not found> = EmptyList@76[empty]
     <name not found> = EmptyList@76[empty]
     <name not found> = EmptyList@76[empty]
 }
 
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
-    <name not found> = EmptyList@76[empty]
-    <name not found> = EmptyList@76[empty]
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
     <name not found> = EmptyList@76[empty]
     <name not found> = EmptyList@76[empty]
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
+}
+
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
 }
 
 ResolutionTaskHolder@96 {
     <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
 }
 
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[4] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
-    <name not found> = ArrayList@113[5] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
-    <name not found> = EmptyList@76[empty]
-    <name not found> = EmptyList@76[empty]
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[4] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
     <name not found> = EmptyList@76[empty]
     <name not found> = EmptyList@76[empty]
 }
 
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[4] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
-    <name not found> = ArrayList@119[5] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[4] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111, ... }
+    <name not found> = EmptyList@76[empty]
+    <name not found> = EmptyList@76[empty]
+}
+
+null {
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@118[5] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111, ... }
+    <name not found> = ArrayList@119[5] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
+    <name not found> = EmptyList@76[empty]
+    <name not found> = EmptyList@76[empty]
+    <name not found> = EmptyList@76[empty]
+    <name not found> = EmptyList@76[empty]
     <name not found> = EmptyList@76[empty]
     <name not found> = EmptyList@76[empty]
     <name not found> = EmptyList@76[empty]
diff --git a/compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsIfUnknownParameters.lazy.log b/compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsIfUnknownParameters.lazy.log
index 4b7fb69fb3a..5b688e1da97 100644
--- a/compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsIfUnknownParameters.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsIfUnknownParameters.lazy.log
@@ -48,28 +48,31 @@ LazyJavaPackageFragment@19['lang'] {
 
 ResolutionTaskHolder@43 {
     <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+}
+
+null {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@54 }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsToInferTypeParamsSimple.lazy.log b/compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsToInferTypeParamsSimple.lazy.log
index a311d136f32..c901ed71fdc 100644
--- a/compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsToInferTypeParamsSimple.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsToInferTypeParamsSimple.lazy.log
@@ -66,128 +66,131 @@ LazyJavaPackageFragment@25['lang'] {
 
 ResolutionTaskHolder@56 {
     <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
     <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
     <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
+}
+
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
     <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
 }
 
 ResolutionTaskHolder@68 {
     <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
     <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
 }
 
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
     <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
 }
 
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
+}
+
 ResolutionTaskHolder@80 {
     <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
 }
 
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
 }
 
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
+}
+
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
 }
 
 ResolutionTaskHolder@92 {
     <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
 }
 
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
 }
 
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
+}
+
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
 }
 
 ResolutionTaskHolder@104 {
     <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
 }
 
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
 }
 
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
 }
 
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
+ResolutionTaskHolder@113 {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
 }
 
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@126 }
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
-}
-
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
+null {
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@70 }
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inference/useFunctionLiteralsToInferType.lazy.log b/compiler/testData/diagnostics/tests/inference/useFunctionLiteralsToInferType.lazy.log
index 0c4c1c5c3b0..664774839f6 100644
--- a/compiler/testData/diagnostics/tests/inference/useFunctionLiteralsToInferType.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/useFunctionLiteralsToInferType.lazy.log
@@ -117,28 +117,28 @@ LazyJavaClassifierType@80['E'] {
     arguments = ArrayList@81[empty]
     classifier = JavaTypeParameterImpl@82['E']
     nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
 }
 
-LazyJavaClassifierType@84['E'] {
-    arguments = ArrayList@85[empty]
-    classifier = JavaTypeParameterImpl@86['E']
+LazyJavaClassifierType@83['E'] {
+    arguments = ArrayList@84[empty]
+    classifier = JavaTypeParameterImpl@85['E']
     nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@76
 }
 
-LazyJavaClassifierType@87['E'] {
-    arguments = ArrayList@88[empty]
-    classifier = JavaTypeParameterImpl@89['E']
+LazyJavaClassifierType@86['E'] {
+    arguments = ArrayList@87[empty]
+    classifier = JavaTypeParameterImpl@88['E']
     nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@89
 }
 
 LazyJavaClassifierType@90['E'] {
     arguments = ArrayList@91[empty]
-    classifier = JavaTypeParameterImpl@86['E']
+    classifier = JavaTypeParameterImpl@79['E']
     nullable = 'true': Boolean@64
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
 }
 
 LazyJavaClassifierType@92['E'] {
@@ -150,23 +150,23 @@ LazyJavaClassifierType@92['E'] {
 
 LazyJavaClassifierType@94['E'] {
     arguments = ArrayList@95[empty]
-    classifier = JavaTypeParameterImpl@89['E']
+    classifier = JavaTypeParameterImpl@85['E']
     nullable = 'true': Boolean@64
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@76
 }
 
 LazyJavaClassifierType@96['E'] {
     arguments = ArrayList@97[empty]
-    classifier = JavaTypeParameterImpl@79['E']
+    classifier = JavaTypeParameterImpl@82['E']
     nullable = 'true': Boolean@64
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
 }
 
 LazyJavaClassifierType@98['E'] {
     arguments = ArrayList@99[empty]
-    classifier = JavaTypeParameterImpl@82['E']
+    classifier = JavaTypeParameterImpl@88['E']
     nullable = 'true': Boolean@64
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@89
 }
 
 LazyJavaClassifierType@100['E'] {
@@ -225,21 +225,21 @@ LazyJavaClassifierType@121['String'] {
 
 LazyJavaClassifierType@124['String'] {
     arguments = ArrayList@125[empty]
-    classifier = JavaClassImpl@116['String']
+    classifier = JavaClassImpl@123['String']
     nullable = 'true': Boolean@64
     typeConstructor = DeserializedClassTypeConstructor@117
 }
 
 LazyJavaClassifierType@126['String'] {
     arguments = ArrayList@127[empty]
-    classifier = JavaClassImpl@120['String']
+    classifier = JavaClassImpl@116['String']
     nullable = 'true': Boolean@64
     typeConstructor = DeserializedClassTypeConstructor@117
 }
 
 LazyJavaClassifierType@128['String'] {
     arguments = ArrayList@129[empty]
-    classifier = JavaClassImpl@123['String']
+    classifier = JavaClassImpl@120['String']
     nullable = 'true': Boolean@64
     typeConstructor = DeserializedClassTypeConstructor@117
 }
@@ -267,21 +267,21 @@ LazyJavaClassifierType@137['Throwable'] {
 
 LazyJavaClassifierType@140['Throwable'] {
     arguments = ArrayList@141[empty]
-    classifier = JavaClassImpl@136['Throwable']
+    classifier = JavaClassImpl@132['Throwable']
     nullable = 'true': Boolean@64
     typeConstructor = DeserializedClassTypeConstructor@133
 }
 
 LazyJavaClassifierType@142['Throwable'] {
     arguments = ArrayList@143[empty]
-    classifier = JavaClassImpl@139['Throwable']
+    classifier = JavaClassImpl@136['Throwable']
     nullable = 'true': Boolean@64
     typeConstructor = DeserializedClassTypeConstructor@133
 }
 
 LazyJavaClassifierType@144['Throwable'] {
     arguments = ArrayList@145[empty]
-    classifier = JavaClassImpl@132['Throwable']
+    classifier = JavaClassImpl@139['Throwable']
     nullable = 'true': Boolean@64
     typeConstructor = DeserializedClassTypeConstructor@133
 }
@@ -370,93 +370,70 @@ LazyJavaPackageFragment@172['util'] {
 
 LazyJavaTypeParameterDescriptor@38['E'] {
     defaultType = JetTypeImpl@213['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
     upperBounds = LinkedHashSet@214[1] { NullableType@215 }
 }
 
 LazyJavaTypeParameterDescriptor@30['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
-}
-
-LazyJavaTypeParameterDescriptor@26['E'] {
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@76
 }
 
-LazyJavaTypeParameterResolver@216 {
-    resolve(JavaTypeParameterImpl@75['E']) = LazyJavaTypeParameterDescriptor@26['E']
+LazyJavaTypeParameterDescriptor@26['E'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@89
 }
 
-LazyJavaTypeParameterResolver@217 {
-    resolve(JavaTypeParameterImpl@71['E']) = LazyJavaTypeParameterDescriptor@30['E']
+LazyJavaTypeParameterResolver@216 {
+    resolve(JavaTypeParameterImpl@217['E']) = LazyJavaTypeParameterDescriptor@38['E']
 }
 
 LazyJavaTypeParameterResolver@218 {
-    resolve(JavaTypeParameterImpl@219['E']) = LazyJavaTypeParameterDescriptor@38['E']
+    resolve(JavaTypeParameterImpl@85['E']) = LazyJavaTypeParameterDescriptor@30['E']
+}
+
+LazyJavaTypeParameterResolver@219 {
+    resolve(JavaTypeParameterImpl@88['E']) = LazyJavaTypeParameterDescriptor@26['E']
 }
 
 ResolutionTaskHolder@220 {
     <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@222 }
-    <name not found> = EmptyList@200[empty]
-    <name not found> = EmptyList@200[empty]
     <name not found> = EmptyList@200[empty]
     <name not found> = EmptyList@200[empty]
 }
 
-ResolutionTaskHolder@224 {
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@226 }
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@226 }
-    <name not found> = EmptyList@200[empty]
-    <name not found> = EmptyList@200[empty]
+ResolutionTaskHolder@223 {
+    <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
     <name not found> = EmptyList@200[empty]
     <name not found> = EmptyList@200[empty]
 }
 
-ResolutionTaskHolder@228 {
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@230 }
-    <name not found> = EmptyList@200[empty]
-    <name not found> = EmptyList@200[empty]
+ResolutionTaskHolder@226 {
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
     <name not found> = EmptyList@200[empty]
     <name not found> = EmptyList@200[empty]
 }
 
+ResolutionTaskHolder@229 {
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
+}
+
 ResolutionTaskHolder@232 {
     <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@234 }
 }
 
-ResolutionTaskHolder@236 {
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@238 }
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@238 }
+ResolutionTaskHolder@235 {
+    <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
 }
 
-ResolutionTaskHolder@240 {
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
-    <name not found> = ArrayList@243[1] { ResolutionCandidate@242 }
+ResolutionTaskHolder@238 {
+    <name not found> = ArrayList@239[1] { ResolutionCandidate@240 }
+}
+
+ResolutionTaskHolder@241 {
+    <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
 }
 
 ResolutionTaskHolder@244 {
-    <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@246 }
-}
-
-ResolutionTaskHolder@248 {
-    <name not found> = ArrayList@249[1] { ResolutionCandidate@250 }
-    <name not found> = ArrayList@251[1] { ResolutionCandidate@250 }
-}
-
-ResolutionTaskHolder@252 {
-    <name not found> = ArrayList@253[4] { ResolutionCandidate@254, ResolutionCandidate@255, ResolutionCandidate@256, ... }
-    <name not found> = ArrayList@257[5] { ResolutionCandidate@254, ResolutionCandidate@255, ResolutionCandidate@256, ... }
-    <name not found> = EmptyList@200[empty]
-    <name not found> = EmptyList@200[empty]
-    <name not found> = EmptyList@200[empty]
-    <name not found> = EmptyList@200[empty]
-    <name not found> = EmptyList@200[empty]
-    <name not found> = EmptyList@200[empty]
-    <name not found> = EmptyList@200[empty]
-    <name not found> = EmptyList@200[empty]
+    <name not found> = ArrayList@245[4] { ResolutionCandidate@246, ResolutionCandidate@247, ResolutionCandidate@248, ... }
     <name not found> = EmptyList@200[empty]
     <name not found> = EmptyList@200[empty]
     <name not found> = EmptyList@200[empty]
@@ -467,16 +444,42 @@ ResolutionTaskHolder@252 {
     <name not found> = EmptyList@200[empty]
 }
 
-ResolutionTaskHolder@258 {
-    <name not found> = ArrayList@259[4] { ResolutionCandidate@260, ResolutionCandidate@261, ResolutionCandidate@262, ... }
-    <name not found> = ArrayList@263[5] { ResolutionCandidate@260, ResolutionCandidate@261, ResolutionCandidate@262, ... }
-    <name not found> = EmptyList@200[empty]
-    <name not found> = EmptyList@200[empty]
+ResolutionTaskHolder@249 {
+    <name not found> = ArrayList@250[4] { ResolutionCandidate@251, ResolutionCandidate@252, ResolutionCandidate@253, ... }
     <name not found> = EmptyList@200[empty]
     <name not found> = EmptyList@200[empty]
 }
 
-ResolutionTaskHolder@264 {
-    <name not found> = ArrayList@265[8] { ResolutionCandidate@266, ResolutionCandidate@267, ResolutionCandidate@268, ... }
-    <name not found> = ArrayList@269[8] { ResolutionCandidate@266, ResolutionCandidate@267, ResolutionCandidate@268, ... }
+ResolutionTaskHolder@254 {
+    <name not found> = ArrayList@255[8] { ResolutionCandidate@256, ResolutionCandidate@257, ResolutionCandidate@258, ... }
+}
+
+null {
+    <name not found> = ArrayList@259[1] { ResolutionCandidate@243 }
+    <name not found> = ArrayList@260[1] { ResolutionCandidate@240 }
+    <name not found> = ArrayList@261[1] { ResolutionCandidate@225 }
+    <name not found> = ArrayList@262[1] { ResolutionCandidate@231 }
+    <name not found> = ArrayList@263[1] { ResolutionCandidate@234 }
+    <name not found> = ArrayList@264[1] { ResolutionCandidate@228 }
+    <name not found> = ArrayList@265[1] { ResolutionCandidate@237 }
+    <name not found> = ArrayList@266[1] { ResolutionCandidate@222 }
+    <name not found> = ArrayList@267[5] { ResolutionCandidate@251, ResolutionCandidate@252, ResolutionCandidate@253, ... }
+    <name not found> = ArrayList@268[5] { ResolutionCandidate@246, ResolutionCandidate@247, ResolutionCandidate@248, ... }
+    <name not found> = ArrayList@269[8] { ResolutionCandidate@256, ResolutionCandidate@257, ResolutionCandidate@258, ... }
+    <name not found> = EmptyList@200[empty]
+    <name not found> = EmptyList@200[empty]
+    <name not found> = EmptyList@200[empty]
+    <name not found> = EmptyList@200[empty]
+    <name not found> = EmptyList@200[empty]
+    <name not found> = EmptyList@200[empty]
+    <name not found> = EmptyList@200[empty]
+    <name not found> = EmptyList@200[empty]
+    <name not found> = EmptyList@200[empty]
+    <name not found> = EmptyList@200[empty]
+    <name not found> = EmptyList@200[empty]
+    <name not found> = EmptyList@200[empty]
+    <name not found> = EmptyList@200[empty]
+    <name not found> = EmptyList@200[empty]
+    <name not found> = EmptyList@200[empty]
+    <name not found> = EmptyList@200[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inference/varargs/varargsAndPair.lazy.log b/compiler/testData/diagnostics/tests/inference/varargs/varargsAndPair.lazy.log
index e9c41a67906..95585198ac8 100644
--- a/compiler/testData/diagnostics/tests/inference/varargs/varargsAndPair.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/varargs/varargsAndPair.lazy.log
@@ -49,23 +49,26 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@37 {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+}
+
+null {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@45 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/infos/PropertiesWithBackingFields.lazy.log b/compiler/testData/diagnostics/tests/infos/PropertiesWithBackingFields.lazy.log
index 6a80d022810..a7c944b7e45 100644
--- a/compiler/testData/diagnostics/tests/infos/PropertiesWithBackingFields.lazy.log
+++ b/compiler/testData/diagnostics/tests/infos/PropertiesWithBackingFields.lazy.log
@@ -58,78 +58,52 @@ LazyJavaPackageFragment@16['lang'] {
 
 ResolutionTaskHolder@43 {
     <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@35[empty]
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
     <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@35[empty]
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
     <name not found> = EmptyList@35[empty]
 }
 
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+}
+
 ResolutionTaskHolder@55 {
     <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
+}
+
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
 }
 
 ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@68[8] { ResolutionCandidate@69, ResolutionCandidate@70, ResolutionCandidate@71, ... }
 }
 
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[8] { ResolutionCandidate@74, ResolutionCandidate@75, ResolutionCandidate@76, ... }
 }
 
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[8] { ResolutionCandidate@77, ResolutionCandidate@78, ResolutionCandidate@79, ... }
-    <name not found> = ArrayList@80[8] { ResolutionCandidate@77, ResolutionCandidate@78, ResolutionCandidate@79, ... }
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[8] { ResolutionCandidate@79, ResolutionCandidate@80, ResolutionCandidate@81, ... }
 }
 
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[8] { ResolutionCandidate@83, ResolutionCandidate@84, ResolutionCandidate@85, ... }
-    <name not found> = ArrayList@86[8] { ResolutionCandidate@83, ResolutionCandidate@84, ResolutionCandidate@85, ... }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[8] { ResolutionCandidate@89, ResolutionCandidate@90, ResolutionCandidate@91, ... }
-    <name not found> = ArrayList@92[8] { ResolutionCandidate@89, ResolutionCandidate@90, ResolutionCandidate@91, ... }
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
+ResolutionTaskHolder@82 {
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
@@ -180,13 +154,7 @@ ResolutionTaskHolder@93 {
     <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
+ResolutionTaskHolder@83 {
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
@@ -212,3 +180,38 @@ ResolutionTaskHolder@94 {
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
 }
+
+null {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@92[8] { ResolutionCandidate@79, ResolutionCandidate@80, ResolutionCandidate@81, ... }
+    <name not found> = ArrayList@93[8] { ResolutionCandidate@69, ResolutionCandidate@70, ResolutionCandidate@71, ... }
+    <name not found> = ArrayList@94[8] { ResolutionCandidate@74, ResolutionCandidate@75, ResolutionCandidate@76, ... }
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/infos/SmartCasts.lazy.log b/compiler/testData/diagnostics/tests/infos/SmartCasts.lazy.log
index 44f16fa8594..56080c91cea 100644
--- a/compiler/testData/diagnostics/tests/infos/SmartCasts.lazy.log
+++ b/compiler/testData/diagnostics/tests/infos/SmartCasts.lazy.log
@@ -75,1472 +75,1310 @@ LazyJavaPackageFragment@15['lang'] {
 
 ResolutionTaskHolder@58 {
     <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@49[empty]
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
     <name not found> = EmptyList@49[empty]
 }
 
-ResolutionTaskHolder@65 {
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
     <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@76[2] { ResolutionCandidate@77, ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[2] { ResolutionCandidate@77, ResolutionCandidate@78 }
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@71[2] { ResolutionCandidate@72, ResolutionCandidate@73 }
     <name not found> = EmptyList@49[empty]
+}
+
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
+    <name not found> = EmptyList@49[empty]
+}
+
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
     <name not found> = EmptyList@49[empty]
 }
 
 ResolutionTaskHolder@80 {
     <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
 }
 
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
 }
 
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
+}
+
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
 }
 
 ResolutionTaskHolder@92 {
     <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
 }
 
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
 }
 
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
+}
+
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
 }
 
 ResolutionTaskHolder@104 {
     <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
 }
 
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
 }
 
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
+}
+
+ResolutionTaskHolder@113 {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
 }
 
 ResolutionTaskHolder@116 {
     <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
 }
 
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
+ResolutionTaskHolder@119 {
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
 }
 
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@126 }
+ResolutionTaskHolder@122 {
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
+}
+
+ResolutionTaskHolder@125 {
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
 }
 
 ResolutionTaskHolder@128 {
     <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
 }
 
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
+ResolutionTaskHolder@131 {
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
 }
 
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
+ResolutionTaskHolder@134 {
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
+}
+
+ResolutionTaskHolder@137 {
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
 }
 
 ResolutionTaskHolder@140 {
     <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
 }
 
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
+ResolutionTaskHolder@143 {
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
 }
 
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
+ResolutionTaskHolder@146 {
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
+}
+
+ResolutionTaskHolder@149 {
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
 }
 
 ResolutionTaskHolder@152 {
     <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
 }
 
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
+ResolutionTaskHolder@155 {
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
 }
 
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@162 }
+ResolutionTaskHolder@158 {
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
+}
+
+ResolutionTaskHolder@161 {
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
 }
 
 ResolutionTaskHolder@164 {
     <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@166 }
 }
 
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@170 }
+ResolutionTaskHolder@167 {
+    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
 }
 
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@174 }
+ResolutionTaskHolder@170 {
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
+}
+
+ResolutionTaskHolder@173 {
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
 }
 
 ResolutionTaskHolder@176 {
     <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@178 }
 }
 
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@182 }
+ResolutionTaskHolder@179 {
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
 }
 
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@186 }
+ResolutionTaskHolder@182 {
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
+}
+
+ResolutionTaskHolder@185 {
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
 }
 
 ResolutionTaskHolder@188 {
     <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@190 }
 }
 
-ResolutionTaskHolder@192 {
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@194 }
+ResolutionTaskHolder@191 {
+    <name not found> = ArrayList@192[1] { ResolutionCandidate@193 }
 }
 
-ResolutionTaskHolder@196 {
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@198 }
+ResolutionTaskHolder@194 {
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@196 }
+}
+
+ResolutionTaskHolder@197 {
+    <name not found> = ArrayList@198[1] { ResolutionCandidate@199 }
 }
 
 ResolutionTaskHolder@200 {
     <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@202 }
 }
 
-ResolutionTaskHolder@204 {
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@206 }
+ResolutionTaskHolder@203 {
+    <name not found> = ArrayList@204[1] { ResolutionCandidate@205 }
 }
 
-ResolutionTaskHolder@208 {
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@210 }
+ResolutionTaskHolder@206 {
+    <name not found> = ArrayList@207[1] { ResolutionCandidate@208 }
+}
+
+ResolutionTaskHolder@209 {
+    <name not found> = ArrayList@210[1] { ResolutionCandidate@211 }
 }
 
 ResolutionTaskHolder@212 {
     <name not found> = ArrayList@213[1] { ResolutionCandidate@214 }
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@214 }
 }
 
-ResolutionTaskHolder@216 {
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@218 }
+ResolutionTaskHolder@215 {
+    <name not found> = ArrayList@216[1] { ResolutionCandidate@217 }
 }
 
-ResolutionTaskHolder@220 {
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@222 }
+ResolutionTaskHolder@218 {
+    <name not found> = ArrayList@219[1] { ResolutionCandidate@220 }
+}
+
+ResolutionTaskHolder@221 {
+    <name not found> = ArrayList@222[1] { ResolutionCandidate@223 }
 }
 
 ResolutionTaskHolder@224 {
     <name not found> = ArrayList@225[1] { ResolutionCandidate@226 }
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@226 }
 }
 
-ResolutionTaskHolder@228 {
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@230 }
+ResolutionTaskHolder@227 {
+    <name not found> = ArrayList@228[1] { ResolutionCandidate@229 }
 }
 
-ResolutionTaskHolder@232 {
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@234 }
+ResolutionTaskHolder@230 {
+    <name not found> = ArrayList@231[1] { ResolutionCandidate@232 }
+}
+
+ResolutionTaskHolder@233 {
+    <name not found> = ArrayList@234[1] { ResolutionCandidate@235 }
 }
 
 ResolutionTaskHolder@236 {
     <name not found> = ArrayList@237[1] { ResolutionCandidate@238 }
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@238 }
 }
 
-ResolutionTaskHolder@240 {
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
-    <name not found> = ArrayList@243[1] { ResolutionCandidate@242 }
+ResolutionTaskHolder@239 {
+    <name not found> = ArrayList@240[1] { ResolutionCandidate@241 }
 }
 
-ResolutionTaskHolder@244 {
-    <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@246 }
+ResolutionTaskHolder@242 {
+    <name not found> = ArrayList@243[1] { ResolutionCandidate@244 }
+}
+
+ResolutionTaskHolder@245 {
+    <name not found> = ArrayList@246[1] { ResolutionCandidate@247 }
 }
 
 ResolutionTaskHolder@248 {
     <name not found> = ArrayList@249[1] { ResolutionCandidate@250 }
-    <name not found> = ArrayList@251[1] { ResolutionCandidate@250 }
 }
 
-ResolutionTaskHolder@252 {
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
-    <name not found> = ArrayList@255[1] { ResolutionCandidate@254 }
+ResolutionTaskHolder@251 {
+    <name not found> = ArrayList@252[1] { ResolutionCandidate@253 }
 }
 
-ResolutionTaskHolder@256 {
-    <name not found> = ArrayList@257[1] { ResolutionCandidate@258 }
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@258 }
+ResolutionTaskHolder@254 {
+    <name not found> = ArrayList@255[1] { ResolutionCandidate@256 }
+}
+
+ResolutionTaskHolder@257 {
+    <name not found> = ArrayList@258[1] { ResolutionCandidate@259 }
 }
 
 ResolutionTaskHolder@260 {
     <name not found> = ArrayList@261[1] { ResolutionCandidate@262 }
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@262 }
 }
 
-ResolutionTaskHolder@264 {
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
-    <name not found> = ArrayList@267[1] { ResolutionCandidate@266 }
+ResolutionTaskHolder@263 {
+    <name not found> = ArrayList@264[1] { ResolutionCandidate@265 }
 }
 
-ResolutionTaskHolder@268 {
-    <name not found> = ArrayList@269[1] { ResolutionCandidate@270 }
-    <name not found> = ArrayList@271[1] { ResolutionCandidate@270 }
+ResolutionTaskHolder@266 {
+    <name not found> = ArrayList@267[1] { ResolutionCandidate@268 }
+}
+
+ResolutionTaskHolder@269 {
+    <name not found> = ArrayList@270[1] { ResolutionCandidate@271 }
 }
 
 ResolutionTaskHolder@272 {
     <name not found> = ArrayList@273[1] { ResolutionCandidate@274 }
-    <name not found> = ArrayList@275[1] { ResolutionCandidate@274 }
 }
 
-ResolutionTaskHolder@276 {
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
-    <name not found> = ArrayList@279[1] { ResolutionCandidate@278 }
+ResolutionTaskHolder@275 {
+    <name not found> = ArrayList@276[1] { ResolutionCandidate@277 }
 }
 
-ResolutionTaskHolder@280 {
-    <name not found> = ArrayList@281[1] { ResolutionCandidate@282 }
-    <name not found> = ArrayList@283[1] { ResolutionCandidate@282 }
+ResolutionTaskHolder@278 {
+    <name not found> = ArrayList@279[1] { ResolutionCandidate@280 }
+}
+
+ResolutionTaskHolder@281 {
+    <name not found> = ArrayList@282[1] { ResolutionCandidate@283 }
 }
 
 ResolutionTaskHolder@284 {
     <name not found> = ArrayList@285[1] { ResolutionCandidate@286 }
-    <name not found> = ArrayList@287[1] { ResolutionCandidate@286 }
 }
 
-ResolutionTaskHolder@288 {
-    <name not found> = ArrayList@289[1] { ResolutionCandidate@290 }
-    <name not found> = ArrayList@291[1] { ResolutionCandidate@290 }
+ResolutionTaskHolder@287 {
+    <name not found> = ArrayList@288[1] { ResolutionCandidate@289 }
 }
 
-ResolutionTaskHolder@292 {
-    <name not found> = ArrayList@293[1] { ResolutionCandidate@294 }
-    <name not found> = ArrayList@295[1] { ResolutionCandidate@294 }
+ResolutionTaskHolder@290 {
+    <name not found> = ArrayList@291[1] { ResolutionCandidate@292 }
+}
+
+ResolutionTaskHolder@293 {
+    <name not found> = ArrayList@294[1] { ResolutionCandidate@295 }
 }
 
 ResolutionTaskHolder@296 {
     <name not found> = ArrayList@297[1] { ResolutionCandidate@298 }
-    <name not found> = ArrayList@299[1] { ResolutionCandidate@298 }
 }
 
-ResolutionTaskHolder@300 {
-    <name not found> = ArrayList@301[1] { ResolutionCandidate@302 }
-    <name not found> = ArrayList@303[1] { ResolutionCandidate@302 }
+ResolutionTaskHolder@299 {
+    <name not found> = ArrayList@300[1] { ResolutionCandidate@301 }
 }
 
-ResolutionTaskHolder@304 {
-    <name not found> = ArrayList@305[1] { ResolutionCandidate@306 }
-    <name not found> = ArrayList@307[1] { ResolutionCandidate@306 }
+ResolutionTaskHolder@302 {
+    <name not found> = ArrayList@303[1] { ResolutionCandidate@304 }
+}
+
+ResolutionTaskHolder@305 {
+    <name not found> = ArrayList@306[1] { ResolutionCandidate@307 }
 }
 
 ResolutionTaskHolder@308 {
     <name not found> = ArrayList@309[1] { ResolutionCandidate@310 }
-    <name not found> = ArrayList@311[1] { ResolutionCandidate@310 }
 }
 
-ResolutionTaskHolder@312 {
-    <name not found> = ArrayList@313[1] { ResolutionCandidate@314 }
-    <name not found> = ArrayList@315[1] { ResolutionCandidate@314 }
+ResolutionTaskHolder@311 {
+    <name not found> = ArrayList@312[1] { ResolutionCandidate@313 }
 }
 
-ResolutionTaskHolder@316 {
-    <name not found> = ArrayList@317[1] { ResolutionCandidate@318 }
-    <name not found> = ArrayList@319[1] { ResolutionCandidate@318 }
+ResolutionTaskHolder@314 {
+    <name not found> = ArrayList@315[1] { ResolutionCandidate@316 }
+}
+
+ResolutionTaskHolder@317 {
+    <name not found> = ArrayList@318[1] { ResolutionCandidate@319 }
 }
 
 ResolutionTaskHolder@320 {
     <name not found> = ArrayList@321[1] { ResolutionCandidate@322 }
-    <name not found> = ArrayList@323[1] { ResolutionCandidate@322 }
 }
 
-ResolutionTaskHolder@324 {
-    <name not found> = ArrayList@325[1] { ResolutionCandidate@326 }
-    <name not found> = ArrayList@327[1] { ResolutionCandidate@326 }
+ResolutionTaskHolder@323 {
+    <name not found> = ArrayList@324[1] { ResolutionCandidate@325 }
 }
 
-ResolutionTaskHolder@328 {
-    <name not found> = ArrayList@329[1] { ResolutionCandidate@330 }
-    <name not found> = ArrayList@331[1] { ResolutionCandidate@330 }
+ResolutionTaskHolder@326 {
+    <name not found> = ArrayList@327[1] { ResolutionCandidate@328 }
+}
+
+ResolutionTaskHolder@329 {
+    <name not found> = ArrayList@330[1] { ResolutionCandidate@331 }
 }
 
 ResolutionTaskHolder@332 {
     <name not found> = ArrayList@333[1] { ResolutionCandidate@334 }
-    <name not found> = ArrayList@335[1] { ResolutionCandidate@334 }
 }
 
-ResolutionTaskHolder@336 {
-    <name not found> = ArrayList@337[1] { ResolutionCandidate@338 }
-    <name not found> = ArrayList@339[1] { ResolutionCandidate@338 }
+ResolutionTaskHolder@335 {
+    <name not found> = ArrayList@336[1] { ResolutionCandidate@337 }
 }
 
-ResolutionTaskHolder@340 {
-    <name not found> = ArrayList@341[1] { ResolutionCandidate@342 }
-    <name not found> = ArrayList@343[1] { ResolutionCandidate@342 }
+ResolutionTaskHolder@338 {
+    <name not found> = ArrayList@339[1] { ResolutionCandidate@340 }
+}
+
+ResolutionTaskHolder@341 {
+    <name not found> = ArrayList@342[1] { ResolutionCandidate@343 }
 }
 
 ResolutionTaskHolder@344 {
     <name not found> = ArrayList@345[1] { ResolutionCandidate@346 }
-    <name not found> = ArrayList@347[1] { ResolutionCandidate@346 }
 }
 
-ResolutionTaskHolder@348 {
-    <name not found> = ArrayList@349[1] { ResolutionCandidate@350 }
-    <name not found> = ArrayList@351[1] { ResolutionCandidate@350 }
+ResolutionTaskHolder@347 {
+    <name not found> = ArrayList@348[1] { ResolutionCandidate@349 }
 }
 
-ResolutionTaskHolder@352 {
-    <name not found> = ArrayList@353[1] { ResolutionCandidate@354 }
-    <name not found> = ArrayList@355[1] { ResolutionCandidate@354 }
+ResolutionTaskHolder@350 {
+    <name not found> = ArrayList@351[1] { ResolutionCandidate@352 }
+}
+
+ResolutionTaskHolder@353 {
+    <name not found> = ArrayList@354[1] { ResolutionCandidate@355 }
 }
 
 ResolutionTaskHolder@356 {
     <name not found> = ArrayList@357[1] { ResolutionCandidate@358 }
-    <name not found> = ArrayList@359[1] { ResolutionCandidate@358 }
 }
 
-ResolutionTaskHolder@360 {
-    <name not found> = ArrayList@361[1] { ResolutionCandidate@362 }
-    <name not found> = ArrayList@363[1] { ResolutionCandidate@362 }
+ResolutionTaskHolder@359 {
+    <name not found> = ArrayList@360[1] { ResolutionCandidate@361 }
 }
 
-ResolutionTaskHolder@364 {
-    <name not found> = ArrayList@365[1] { ResolutionCandidate@366 }
-    <name not found> = ArrayList@367[1] { ResolutionCandidate@366 }
+ResolutionTaskHolder@362 {
+    <name not found> = ArrayList@363[1] { ResolutionCandidate@364 }
+}
+
+ResolutionTaskHolder@365 {
+    <name not found> = ArrayList@366[1] { ResolutionCandidate@367 }
 }
 
 ResolutionTaskHolder@368 {
     <name not found> = ArrayList@369[1] { ResolutionCandidate@370 }
-    <name not found> = ArrayList@371[1] { ResolutionCandidate@370 }
 }
 
-ResolutionTaskHolder@372 {
-    <name not found> = ArrayList@373[1] { ResolutionCandidate@374 }
-    <name not found> = ArrayList@375[1] { ResolutionCandidate@374 }
+ResolutionTaskHolder@371 {
+    <name not found> = ArrayList@372[1] { ResolutionCandidate@373 }
 }
 
-ResolutionTaskHolder@376 {
-    <name not found> = ArrayList@377[1] { ResolutionCandidate@378 }
-    <name not found> = ArrayList@379[1] { ResolutionCandidate@378 }
+ResolutionTaskHolder@374 {
+    <name not found> = ArrayList@375[1] { ResolutionCandidate@376 }
+}
+
+ResolutionTaskHolder@377 {
+    <name not found> = ArrayList@378[1] { ResolutionCandidate@379 }
 }
 
 ResolutionTaskHolder@380 {
     <name not found> = ArrayList@381[1] { ResolutionCandidate@382 }
-    <name not found> = ArrayList@383[1] { ResolutionCandidate@382 }
 }
 
-ResolutionTaskHolder@384 {
-    <name not found> = ArrayList@385[1] { ResolutionCandidate@386 }
-    <name not found> = ArrayList@387[1] { ResolutionCandidate@386 }
+ResolutionTaskHolder@383 {
+    <name not found> = ArrayList@384[1] { ResolutionCandidate@385 }
 }
 
-ResolutionTaskHolder@388 {
-    <name not found> = ArrayList@389[1] { ResolutionCandidate@390 }
-    <name not found> = ArrayList@391[1] { ResolutionCandidate@390 }
+ResolutionTaskHolder@386 {
+    <name not found> = ArrayList@387[1] { ResolutionCandidate@388 }
+}
+
+ResolutionTaskHolder@389 {
+    <name not found> = ArrayList@390[1] { ResolutionCandidate@391 }
 }
 
 ResolutionTaskHolder@392 {
     <name not found> = ArrayList@393[1] { ResolutionCandidate@394 }
-    <name not found> = ArrayList@395[1] { ResolutionCandidate@394 }
 }
 
-ResolutionTaskHolder@396 {
-    <name not found> = ArrayList@397[1] { ResolutionCandidate@398 }
-    <name not found> = ArrayList@399[1] { ResolutionCandidate@398 }
+ResolutionTaskHolder@395 {
+    <name not found> = ArrayList@396[1] { ResolutionCandidate@397 }
 }
 
-ResolutionTaskHolder@400 {
-    <name not found> = ArrayList@401[1] { ResolutionCandidate@402 }
-    <name not found> = ArrayList@403[1] { ResolutionCandidate@402 }
+ResolutionTaskHolder@398 {
+    <name not found> = ArrayList@399[1] { ResolutionCandidate@400 }
+}
+
+ResolutionTaskHolder@401 {
+    <name not found> = ArrayList@402[1] { ResolutionCandidate@403 }
 }
 
 ResolutionTaskHolder@404 {
     <name not found> = ArrayList@405[1] { ResolutionCandidate@406 }
-    <name not found> = ArrayList@407[1] { ResolutionCandidate@406 }
 }
 
-ResolutionTaskHolder@408 {
-    <name not found> = ArrayList@409[1] { ResolutionCandidate@410 }
-    <name not found> = ArrayList@411[1] { ResolutionCandidate@410 }
+ResolutionTaskHolder@407 {
+    <name not found> = ArrayList@408[1] { ResolutionCandidate@409 }
 }
 
-ResolutionTaskHolder@412 {
-    <name not found> = ArrayList@413[1] { ResolutionCandidate@414 }
-    <name not found> = ArrayList@415[1] { ResolutionCandidate@414 }
+ResolutionTaskHolder@410 {
+    <name not found> = ArrayList@411[1] { ResolutionCandidate@412 }
+}
+
+ResolutionTaskHolder@413 {
+    <name not found> = ArrayList@414[1] { ResolutionCandidate@415 }
 }
 
 ResolutionTaskHolder@416 {
     <name not found> = ArrayList@417[1] { ResolutionCandidate@418 }
-    <name not found> = ArrayList@419[1] { ResolutionCandidate@418 }
 }
 
-ResolutionTaskHolder@420 {
-    <name not found> = ArrayList@421[1] { ResolutionCandidate@422 }
-    <name not found> = ArrayList@423[1] { ResolutionCandidate@422 }
+ResolutionTaskHolder@419 {
+    <name not found> = ArrayList@420[1] { ResolutionCandidate@421 }
 }
 
-ResolutionTaskHolder@424 {
-    <name not found> = ArrayList@425[1] { ResolutionCandidate@426 }
-    <name not found> = ArrayList@427[1] { ResolutionCandidate@426 }
+ResolutionTaskHolder@422 {
+    <name not found> = ArrayList@423[1] { ResolutionCandidate@424 }
+}
+
+ResolutionTaskHolder@425 {
+    <name not found> = ArrayList@426[1] { ResolutionCandidate@427 }
 }
 
 ResolutionTaskHolder@428 {
     <name not found> = ArrayList@429[1] { ResolutionCandidate@430 }
-    <name not found> = ArrayList@431[1] { ResolutionCandidate@430 }
 }
 
-ResolutionTaskHolder@432 {
-    <name not found> = ArrayList@433[1] { ResolutionCandidate@434 }
-    <name not found> = ArrayList@435[1] { ResolutionCandidate@434 }
+ResolutionTaskHolder@431 {
+    <name not found> = ArrayList@432[1] { ResolutionCandidate@433 }
 }
 
-ResolutionTaskHolder@436 {
-    <name not found> = ArrayList@437[1] { ResolutionCandidate@438 }
-    <name not found> = ArrayList@439[1] { ResolutionCandidate@438 }
+ResolutionTaskHolder@434 {
+    <name not found> = ArrayList@435[1] { ResolutionCandidate@436 }
+}
+
+ResolutionTaskHolder@437 {
+    <name not found> = ArrayList@438[1] { ResolutionCandidate@439 }
 }
 
 ResolutionTaskHolder@440 {
     <name not found> = ArrayList@441[1] { ResolutionCandidate@442 }
-    <name not found> = ArrayList@443[1] { ResolutionCandidate@442 }
 }
 
-ResolutionTaskHolder@444 {
-    <name not found> = ArrayList@445[1] { ResolutionCandidate@446 }
-    <name not found> = ArrayList@447[1] { ResolutionCandidate@446 }
+ResolutionTaskHolder@443 {
+    <name not found> = ArrayList@444[1] { ResolutionCandidate@445 }
 }
 
-ResolutionTaskHolder@448 {
-    <name not found> = ArrayList@449[1] { ResolutionCandidate@450 }
-    <name not found> = ArrayList@451[1] { ResolutionCandidate@450 }
+ResolutionTaskHolder@446 {
+    <name not found> = ArrayList@447[1] { ResolutionCandidate@448 }
+}
+
+ResolutionTaskHolder@449 {
+    <name not found> = ArrayList@450[1] { ResolutionCandidate@451 }
 }
 
 ResolutionTaskHolder@452 {
     <name not found> = ArrayList@453[1] { ResolutionCandidate@454 }
-    <name not found> = ArrayList@455[1] { ResolutionCandidate@454 }
 }
 
-ResolutionTaskHolder@456 {
-    <name not found> = ArrayList@457[1] { ResolutionCandidate@458 }
-    <name not found> = ArrayList@459[1] { ResolutionCandidate@458 }
+ResolutionTaskHolder@455 {
+    <name not found> = ArrayList@456[1] { ResolutionCandidate@457 }
 }
 
-ResolutionTaskHolder@460 {
-    <name not found> = ArrayList@461[1] { ResolutionCandidate@462 }
-    <name not found> = ArrayList@463[1] { ResolutionCandidate@462 }
+ResolutionTaskHolder@458 {
+    <name not found> = ArrayList@459[1] { ResolutionCandidate@460 }
+}
+
+ResolutionTaskHolder@461 {
+    <name not found> = ArrayList@462[1] { ResolutionCandidate@463 }
 }
 
 ResolutionTaskHolder@464 {
     <name not found> = ArrayList@465[1] { ResolutionCandidate@466 }
-    <name not found> = ArrayList@467[1] { ResolutionCandidate@466 }
 }
 
-ResolutionTaskHolder@468 {
-    <name not found> = ArrayList@469[1] { ResolutionCandidate@470 }
-    <name not found> = ArrayList@471[1] { ResolutionCandidate@470 }
+ResolutionTaskHolder@467 {
+    <name not found> = ArrayList@468[1] { ResolutionCandidate@469 }
 }
 
-ResolutionTaskHolder@472 {
-    <name not found> = ArrayList@473[1] { ResolutionCandidate@474 }
-    <name not found> = ArrayList@475[1] { ResolutionCandidate@474 }
+ResolutionTaskHolder@470 {
+    <name not found> = ArrayList@471[1] { ResolutionCandidate@472 }
+}
+
+ResolutionTaskHolder@473 {
+    <name not found> = ArrayList@474[1] { ResolutionCandidate@475 }
 }
 
 ResolutionTaskHolder@476 {
     <name not found> = ArrayList@477[1] { ResolutionCandidate@478 }
-    <name not found> = ArrayList@479[1] { ResolutionCandidate@478 }
 }
 
-ResolutionTaskHolder@480 {
-    <name not found> = ArrayList@481[1] { ResolutionCandidate@482 }
-    <name not found> = ArrayList@483[1] { ResolutionCandidate@482 }
+ResolutionTaskHolder@479 {
+    <name not found> = ArrayList@480[1] { ResolutionCandidate@481 }
 }
 
-ResolutionTaskHolder@484 {
-    <name not found> = ArrayList@485[1] { ResolutionCandidate@486 }
-    <name not found> = ArrayList@487[1] { ResolutionCandidate@486 }
+ResolutionTaskHolder@482 {
+    <name not found> = ArrayList@483[1] { ResolutionCandidate@484 }
+}
+
+ResolutionTaskHolder@485 {
+    <name not found> = ArrayList@486[1] { ResolutionCandidate@487 }
 }
 
 ResolutionTaskHolder@488 {
     <name not found> = ArrayList@489[1] { ResolutionCandidate@490 }
-    <name not found> = ArrayList@491[1] { ResolutionCandidate@490 }
 }
 
-ResolutionTaskHolder@492 {
-    <name not found> = ArrayList@493[1] { ResolutionCandidate@494 }
-    <name not found> = ArrayList@495[1] { ResolutionCandidate@494 }
+ResolutionTaskHolder@491 {
+    <name not found> = ArrayList@492[1] { ResolutionCandidate@493 }
 }
 
-ResolutionTaskHolder@496 {
-    <name not found> = ArrayList@497[1] { ResolutionCandidate@498 }
-    <name not found> = ArrayList@499[1] { ResolutionCandidate@498 }
+ResolutionTaskHolder@494 {
+    <name not found> = ArrayList@495[1] { ResolutionCandidate@496 }
+}
+
+ResolutionTaskHolder@497 {
+    <name not found> = ArrayList@498[1] { ResolutionCandidate@499 }
 }
 
 ResolutionTaskHolder@500 {
     <name not found> = ArrayList@501[1] { ResolutionCandidate@502 }
-    <name not found> = ArrayList@503[1] { ResolutionCandidate@502 }
 }
 
-ResolutionTaskHolder@504 {
-    <name not found> = ArrayList@505[1] { ResolutionCandidate@506 }
-    <name not found> = ArrayList@507[1] { ResolutionCandidate@506 }
+ResolutionTaskHolder@503 {
+    <name not found> = ArrayList@504[1] { ResolutionCandidate@505 }
 }
 
-ResolutionTaskHolder@508 {
-    <name not found> = ArrayList@509[1] { ResolutionCandidate@510 }
-    <name not found> = ArrayList@511[1] { ResolutionCandidate@510 }
+ResolutionTaskHolder@506 {
+    <name not found> = ArrayList@507[1] { ResolutionCandidate@508 }
+}
+
+ResolutionTaskHolder@509 {
+    <name not found> = ArrayList@510[1] { ResolutionCandidate@511 }
 }
 
 ResolutionTaskHolder@512 {
     <name not found> = ArrayList@513[1] { ResolutionCandidate@514 }
-    <name not found> = ArrayList@515[1] { ResolutionCandidate@514 }
 }
 
-ResolutionTaskHolder@516 {
-    <name not found> = ArrayList@517[1] { ResolutionCandidate@518 }
-    <name not found> = ArrayList@519[1] { ResolutionCandidate@518 }
+ResolutionTaskHolder@515 {
+    <name not found> = ArrayList@516[1] { ResolutionCandidate@517 }
 }
 
-ResolutionTaskHolder@520 {
-    <name not found> = ArrayList@521[1] { ResolutionCandidate@522 }
-    <name not found> = ArrayList@523[1] { ResolutionCandidate@522 }
+ResolutionTaskHolder@518 {
+    <name not found> = ArrayList@519[1] { ResolutionCandidate@520 }
+}
+
+ResolutionTaskHolder@521 {
+    <name not found> = ArrayList@522[1] { ResolutionCandidate@523 }
 }
 
 ResolutionTaskHolder@524 {
     <name not found> = ArrayList@525[1] { ResolutionCandidate@526 }
-    <name not found> = ArrayList@527[1] { ResolutionCandidate@526 }
 }
 
-ResolutionTaskHolder@528 {
-    <name not found> = ArrayList@529[1] { ResolutionCandidate@530 }
-    <name not found> = ArrayList@531[1] { ResolutionCandidate@530 }
+ResolutionTaskHolder@527 {
+    <name not found> = ArrayList@528[1] { ResolutionCandidate@529 }
 }
 
-ResolutionTaskHolder@532 {
-    <name not found> = ArrayList@533[1] { ResolutionCandidate@534 }
-    <name not found> = ArrayList@535[1] { ResolutionCandidate@534 }
+ResolutionTaskHolder@530 {
+    <name not found> = ArrayList@531[1] { ResolutionCandidate@532 }
+}
+
+ResolutionTaskHolder@533 {
+    <name not found> = ArrayList@534[1] { ResolutionCandidate@535 }
 }
 
 ResolutionTaskHolder@536 {
     <name not found> = ArrayList@537[1] { ResolutionCandidate@538 }
-    <name not found> = ArrayList@539[1] { ResolutionCandidate@538 }
 }
 
-ResolutionTaskHolder@540 {
-    <name not found> = ArrayList@541[1] { ResolutionCandidate@542 }
-    <name not found> = ArrayList@543[1] { ResolutionCandidate@542 }
+ResolutionTaskHolder@539 {
+    <name not found> = ArrayList@540[1] { ResolutionCandidate@541 }
 }
 
-ResolutionTaskHolder@544 {
-    <name not found> = ArrayList@545[1] { ResolutionCandidate@546 }
-    <name not found> = ArrayList@547[1] { ResolutionCandidate@546 }
+ResolutionTaskHolder@542 {
+    <name not found> = ArrayList@543[1] { ResolutionCandidate@544 }
+}
+
+ResolutionTaskHolder@545 {
+    <name not found> = ArrayList@546[1] { ResolutionCandidate@547 }
 }
 
 ResolutionTaskHolder@548 {
     <name not found> = ArrayList@549[1] { ResolutionCandidate@550 }
-    <name not found> = ArrayList@551[1] { ResolutionCandidate@550 }
 }
 
-ResolutionTaskHolder@552 {
-    <name not found> = ArrayList@553[1] { ResolutionCandidate@554 }
-    <name not found> = ArrayList@555[1] { ResolutionCandidate@554 }
+ResolutionTaskHolder@551 {
+    <name not found> = ArrayList@552[1] { ResolutionCandidate@553 }
 }
 
-ResolutionTaskHolder@556 {
-    <name not found> = ArrayList@557[1] { ResolutionCandidate@558 }
-    <name not found> = ArrayList@559[1] { ResolutionCandidate@558 }
+ResolutionTaskHolder@554 {
+    <name not found> = ArrayList@555[1] { ResolutionCandidate@556 }
+}
+
+ResolutionTaskHolder@557 {
+    <name not found> = ArrayList@558[1] { ResolutionCandidate@559 }
 }
 
 ResolutionTaskHolder@560 {
     <name not found> = ArrayList@561[1] { ResolutionCandidate@562 }
-    <name not found> = ArrayList@563[1] { ResolutionCandidate@562 }
 }
 
-ResolutionTaskHolder@564 {
-    <name not found> = ArrayList@565[1] { ResolutionCandidate@566 }
-    <name not found> = ArrayList@567[1] { ResolutionCandidate@566 }
+ResolutionTaskHolder@563 {
+    <name not found> = ArrayList@564[1] { ResolutionCandidate@565 }
 }
 
-ResolutionTaskHolder@568 {
-    <name not found> = ArrayList@569[1] { ResolutionCandidate@570 }
-    <name not found> = ArrayList@571[1] { ResolutionCandidate@570 }
+ResolutionTaskHolder@566 {
+    <name not found> = ArrayList@567[1] { ResolutionCandidate@568 }
+}
+
+ResolutionTaskHolder@569 {
+    <name not found> = ArrayList@570[1] { ResolutionCandidate@571 }
 }
 
 ResolutionTaskHolder@572 {
     <name not found> = ArrayList@573[1] { ResolutionCandidate@574 }
-    <name not found> = ArrayList@575[1] { ResolutionCandidate@574 }
 }
 
-ResolutionTaskHolder@576 {
-    <name not found> = ArrayList@577[1] { ResolutionCandidate@578 }
-    <name not found> = ArrayList@579[1] { ResolutionCandidate@578 }
+ResolutionTaskHolder@575 {
+    <name not found> = ArrayList@576[1] { ResolutionCandidate@577 }
 }
 
-ResolutionTaskHolder@580 {
-    <name not found> = ArrayList@581[1] { ResolutionCandidate@582 }
-    <name not found> = ArrayList@583[1] { ResolutionCandidate@582 }
+ResolutionTaskHolder@578 {
+    <name not found> = ArrayList@579[1] { ResolutionCandidate@580 }
+}
+
+ResolutionTaskHolder@581 {
+    <name not found> = ArrayList@582[1] { ResolutionCandidate@583 }
 }
 
 ResolutionTaskHolder@584 {
     <name not found> = ArrayList@585[1] { ResolutionCandidate@586 }
-    <name not found> = ArrayList@587[1] { ResolutionCandidate@586 }
 }
 
-ResolutionTaskHolder@588 {
-    <name not found> = ArrayList@589[1] { ResolutionCandidate@590 }
-    <name not found> = ArrayList@591[1] { ResolutionCandidate@590 }
+ResolutionTaskHolder@587 {
+    <name not found> = ArrayList@588[1] { ResolutionCandidate@589 }
 }
 
-ResolutionTaskHolder@592 {
-    <name not found> = ArrayList@593[1] { ResolutionCandidate@594 }
-    <name not found> = ArrayList@595[1] { ResolutionCandidate@594 }
+ResolutionTaskHolder@590 {
+    <name not found> = ArrayList@591[2] { ResolutionCandidate@592, ResolutionCandidate@593 }
 }
 
-ResolutionTaskHolder@596 {
-    <name not found> = ArrayList@597[1] { ResolutionCandidate@598 }
-    <name not found> = ArrayList@599[1] { ResolutionCandidate@598 }
+ResolutionTaskHolder@594 {
+    <name not found> = ArrayList@595[2] { ResolutionCandidate@596, ResolutionCandidate@597 }
 }
 
-ResolutionTaskHolder@600 {
-    <name not found> = ArrayList@601[1] { ResolutionCandidate@602 }
-    <name not found> = ArrayList@603[1] { ResolutionCandidate@602 }
+ResolutionTaskHolder@598 {
+    <name not found> = ArrayList@599[2] { ResolutionCandidate@600, ResolutionCandidate@601 }
 }
 
-ResolutionTaskHolder@604 {
-    <name not found> = ArrayList@605[1] { ResolutionCandidate@606 }
-    <name not found> = ArrayList@607[1] { ResolutionCandidate@606 }
+ResolutionTaskHolder@602 {
+    <name not found> = ArrayList@603[2] { ResolutionCandidate@604, ResolutionCandidate@605 }
 }
 
-ResolutionTaskHolder@608 {
-    <name not found> = ArrayList@609[1] { ResolutionCandidate@610 }
-    <name not found> = ArrayList@611[1] { ResolutionCandidate@610 }
+ResolutionTaskHolder@606 {
+    <name not found> = ArrayList@607[2] { ResolutionCandidate@608, ResolutionCandidate@609 }
 }
 
-ResolutionTaskHolder@612 {
-    <name not found> = ArrayList@613[1] { ResolutionCandidate@614 }
-    <name not found> = ArrayList@615[1] { ResolutionCandidate@614 }
+ResolutionTaskHolder@610 {
+    <name not found> = ArrayList@611[3] { ResolutionCandidate@612, ResolutionCandidate@613, ResolutionCandidate@614 }
 }
 
-ResolutionTaskHolder@616 {
-    <name not found> = ArrayList@617[1] { ResolutionCandidate@618 }
-    <name not found> = ArrayList@619[1] { ResolutionCandidate@618 }
+ResolutionTaskHolder@615 {
+    <name not found> = ArrayList@616[3] { ResolutionCandidate@617, ResolutionCandidate@618, ResolutionCandidate@619 }
 }
 
 ResolutionTaskHolder@620 {
-    <name not found> = ArrayList@621[1] { ResolutionCandidate@622 }
-    <name not found> = ArrayList@623[1] { ResolutionCandidate@622 }
+    <name not found> = ArrayList@621[3] { ResolutionCandidate@622, ResolutionCandidate@623, ResolutionCandidate@624 }
 }
 
-ResolutionTaskHolder@624 {
-    <name not found> = ArrayList@625[1] { ResolutionCandidate@626 }
-    <name not found> = ArrayList@627[1] { ResolutionCandidate@626 }
+ResolutionTaskHolder@625 {
+    <name not found> = ArrayList@626[3] { ResolutionCandidate@627, ResolutionCandidate@628, ResolutionCandidate@629 }
 }
 
-ResolutionTaskHolder@628 {
-    <name not found> = ArrayList@629[1] { ResolutionCandidate@630 }
-    <name not found> = ArrayList@631[1] { ResolutionCandidate@630 }
+ResolutionTaskHolder@630 {
+    <name not found> = ArrayList@631[3] { ResolutionCandidate@632, ResolutionCandidate@633, ResolutionCandidate@634 }
 }
 
-ResolutionTaskHolder@632 {
-    <name not found> = ArrayList@633[1] { ResolutionCandidate@634 }
-    <name not found> = ArrayList@635[1] { ResolutionCandidate@634 }
-}
-
-ResolutionTaskHolder@636 {
-    <name not found> = ArrayList@637[1] { ResolutionCandidate@638 }
-    <name not found> = ArrayList@639[1] { ResolutionCandidate@638 }
+ResolutionTaskHolder@635 {
+    <name not found> = ArrayList@636[3] { ResolutionCandidate@637, ResolutionCandidate@638, ResolutionCandidate@639 }
 }
 
 ResolutionTaskHolder@640 {
-    <name not found> = ArrayList@641[1] { ResolutionCandidate@642 }
-    <name not found> = ArrayList@643[1] { ResolutionCandidate@642 }
+    <name not found> = ArrayList@641[3] { ResolutionCandidate@642, ResolutionCandidate@643, ResolutionCandidate@644 }
 }
 
-ResolutionTaskHolder@644 {
-    <name not found> = ArrayList@645[1] { ResolutionCandidate@646 }
-    <name not found> = ArrayList@647[1] { ResolutionCandidate@646 }
+ResolutionTaskHolder@645 {
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+}
+
+ResolutionTaskHolder@646 {
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+}
+
+ResolutionTaskHolder@647 {
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
 }
 
 ResolutionTaskHolder@648 {
-    <name not found> = ArrayList@649[1] { ResolutionCandidate@650 }
-    <name not found> = ArrayList@651[1] { ResolutionCandidate@650 }
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+}
+
+ResolutionTaskHolder@649 {
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+}
+
+ResolutionTaskHolder@650 {
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+}
+
+ResolutionTaskHolder@651 {
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
 }
 
 ResolutionTaskHolder@652 {
-    <name not found> = ArrayList@653[1] { ResolutionCandidate@654 }
-    <name not found> = ArrayList@655[1] { ResolutionCandidate@654 }
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+}
+
+ResolutionTaskHolder@653 {
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+}
+
+ResolutionTaskHolder@654 {
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+}
+
+ResolutionTaskHolder@655 {
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
 }
 
 ResolutionTaskHolder@656 {
-    <name not found> = ArrayList@657[1] { ResolutionCandidate@658 }
-    <name not found> = ArrayList@659[1] { ResolutionCandidate@658 }
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+}
+
+ResolutionTaskHolder@657 {
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+}
+
+ResolutionTaskHolder@658 {
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+}
+
+ResolutionTaskHolder@659 {
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
 }
 
 ResolutionTaskHolder@660 {
-    <name not found> = ArrayList@661[1] { ResolutionCandidate@662 }
-    <name not found> = ArrayList@663[1] { ResolutionCandidate@662 }
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+}
+
+ResolutionTaskHolder@661 {
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+}
+
+ResolutionTaskHolder@662 {
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+}
+
+ResolutionTaskHolder@663 {
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
 }
 
 ResolutionTaskHolder@664 {
-    <name not found> = ArrayList@665[1] { ResolutionCandidate@666 }
-    <name not found> = ArrayList@667[1] { ResolutionCandidate@666 }
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+}
+
+ResolutionTaskHolder@665 {
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+}
+
+ResolutionTaskHolder@666 {
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+}
+
+ResolutionTaskHolder@667 {
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
 }
 
 ResolutionTaskHolder@668 {
-    <name not found> = ArrayList@669[1] { ResolutionCandidate@670 }
-    <name not found> = ArrayList@671[1] { ResolutionCandidate@670 }
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+}
+
+ResolutionTaskHolder@669 {
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+}
+
+ResolutionTaskHolder@670 {
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+}
+
+ResolutionTaskHolder@671 {
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
 }
 
 ResolutionTaskHolder@672 {
-    <name not found> = ArrayList@673[1] { ResolutionCandidate@674 }
-    <name not found> = ArrayList@675[1] { ResolutionCandidate@674 }
-}
-
-ResolutionTaskHolder@676 {
-    <name not found> = ArrayList@677[1] { ResolutionCandidate@678 }
-    <name not found> = ArrayList@679[1] { ResolutionCandidate@678 }
-}
-
-ResolutionTaskHolder@680 {
-    <name not found> = ArrayList@681[1] { ResolutionCandidate@682 }
-    <name not found> = ArrayList@683[1] { ResolutionCandidate@682 }
-}
-
-ResolutionTaskHolder@684 {
-    <name not found> = ArrayList@685[1] { ResolutionCandidate@686 }
-    <name not found> = ArrayList@687[1] { ResolutionCandidate@686 }
-}
-
-ResolutionTaskHolder@688 {
-    <name not found> = ArrayList@689[1] { ResolutionCandidate@690 }
-    <name not found> = ArrayList@691[1] { ResolutionCandidate@690 }
-}
-
-ResolutionTaskHolder@692 {
-    <name not found> = ArrayList@693[1] { ResolutionCandidate@694 }
-    <name not found> = ArrayList@695[1] { ResolutionCandidate@694 }
-}
-
-ResolutionTaskHolder@696 {
-    <name not found> = ArrayList@697[1] { ResolutionCandidate@698 }
-    <name not found> = ArrayList@699[1] { ResolutionCandidate@698 }
-}
-
-ResolutionTaskHolder@700 {
-    <name not found> = ArrayList@701[1] { ResolutionCandidate@702 }
-    <name not found> = ArrayList@703[1] { ResolutionCandidate@702 }
-}
-
-ResolutionTaskHolder@704 {
-    <name not found> = ArrayList@705[1] { ResolutionCandidate@706 }
-    <name not found> = ArrayList@707[1] { ResolutionCandidate@706 }
-}
-
-ResolutionTaskHolder@708 {
-    <name not found> = ArrayList@709[1] { ResolutionCandidate@710 }
-    <name not found> = ArrayList@711[1] { ResolutionCandidate@710 }
-}
-
-ResolutionTaskHolder@712 {
-    <name not found> = ArrayList@713[1] { ResolutionCandidate@714 }
-    <name not found> = ArrayList@715[1] { ResolutionCandidate@714 }
-}
-
-ResolutionTaskHolder@716 {
-    <name not found> = ArrayList@717[1] { ResolutionCandidate@718 }
-    <name not found> = ArrayList@719[1] { ResolutionCandidate@718 }
-}
-
-ResolutionTaskHolder@720 {
-    <name not found> = ArrayList@721[1] { ResolutionCandidate@722 }
-    <name not found> = ArrayList@723[1] { ResolutionCandidate@722 }
-}
-
-ResolutionTaskHolder@724 {
-    <name not found> = ArrayList@725[1] { ResolutionCandidate@726 }
-    <name not found> = ArrayList@727[1] { ResolutionCandidate@726 }
-}
-
-ResolutionTaskHolder@728 {
-    <name not found> = ArrayList@729[1] { ResolutionCandidate@730 }
-    <name not found> = ArrayList@731[1] { ResolutionCandidate@730 }
-}
-
-ResolutionTaskHolder@732 {
-    <name not found> = ArrayList@733[1] { ResolutionCandidate@734 }
-    <name not found> = ArrayList@735[1] { ResolutionCandidate@734 }
-}
-
-ResolutionTaskHolder@736 {
-    <name not found> = ArrayList@737[1] { ResolutionCandidate@738 }
-    <name not found> = ArrayList@739[1] { ResolutionCandidate@738 }
-}
-
-ResolutionTaskHolder@740 {
-    <name not found> = ArrayList@741[1] { ResolutionCandidate@742 }
-    <name not found> = ArrayList@743[1] { ResolutionCandidate@742 }
-}
-
-ResolutionTaskHolder@744 {
-    <name not found> = ArrayList@745[1] { ResolutionCandidate@746 }
-    <name not found> = ArrayList@747[1] { ResolutionCandidate@746 }
-}
-
-ResolutionTaskHolder@748 {
-    <name not found> = ArrayList@749[1] { ResolutionCandidate@750 }
-    <name not found> = ArrayList@751[1] { ResolutionCandidate@750 }
-}
-
-ResolutionTaskHolder@752 {
-    <name not found> = ArrayList@753[1] { ResolutionCandidate@754 }
-    <name not found> = ArrayList@755[1] { ResolutionCandidate@754 }
-}
-
-ResolutionTaskHolder@756 {
-    <name not found> = ArrayList@757[1] { ResolutionCandidate@758 }
-    <name not found> = ArrayList@759[1] { ResolutionCandidate@758 }
-}
-
-ResolutionTaskHolder@760 {
-    <name not found> = ArrayList@761[1] { ResolutionCandidate@762 }
-    <name not found> = ArrayList@763[1] { ResolutionCandidate@762 }
-}
-
-ResolutionTaskHolder@764 {
-    <name not found> = ArrayList@765[1] { ResolutionCandidate@766 }
-    <name not found> = ArrayList@767[1] { ResolutionCandidate@766 }
-}
-
-ResolutionTaskHolder@768 {
-    <name not found> = ArrayList@769[2] { ResolutionCandidate@770, ResolutionCandidate@771 }
-    <name not found> = ArrayList@772[2] { ResolutionCandidate@770, ResolutionCandidate@771 }
-}
-
-ResolutionTaskHolder@773 {
-    <name not found> = ArrayList@774[2] { ResolutionCandidate@775, ResolutionCandidate@776 }
-    <name not found> = ArrayList@777[2] { ResolutionCandidate@775, ResolutionCandidate@776 }
-}
-
-ResolutionTaskHolder@778 {
-    <name not found> = ArrayList@779[2] { ResolutionCandidate@780, ResolutionCandidate@781 }
-    <name not found> = ArrayList@782[2] { ResolutionCandidate@780, ResolutionCandidate@781 }
-}
-
-ResolutionTaskHolder@783 {
-    <name not found> = ArrayList@784[2] { ResolutionCandidate@785, ResolutionCandidate@786 }
-    <name not found> = ArrayList@787[2] { ResolutionCandidate@785, ResolutionCandidate@786 }
-}
-
-ResolutionTaskHolder@788 {
-    <name not found> = ArrayList@789[2] { ResolutionCandidate@790, ResolutionCandidate@791 }
-    <name not found> = ArrayList@792[2] { ResolutionCandidate@790, ResolutionCandidate@791 }
-}
-
-ResolutionTaskHolder@793 {
-    <name not found> = ArrayList@794[3] { ResolutionCandidate@795, ResolutionCandidate@796, ResolutionCandidate@797 }
-    <name not found> = ArrayList@798[3] { ResolutionCandidate@795, ResolutionCandidate@796, ResolutionCandidate@797 }
-}
-
-ResolutionTaskHolder@799 {
-    <name not found> = ArrayList@800[3] { ResolutionCandidate@801, ResolutionCandidate@802, ResolutionCandidate@803 }
-    <name not found> = ArrayList@804[3] { ResolutionCandidate@801, ResolutionCandidate@802, ResolutionCandidate@803 }
-}
-
-ResolutionTaskHolder@805 {
-    <name not found> = ArrayList@806[3] { ResolutionCandidate@807, ResolutionCandidate@808, ResolutionCandidate@809 }
-    <name not found> = ArrayList@810[3] { ResolutionCandidate@807, ResolutionCandidate@808, ResolutionCandidate@809 }
-}
-
-ResolutionTaskHolder@811 {
-    <name not found> = ArrayList@812[3] { ResolutionCandidate@813, ResolutionCandidate@814, ResolutionCandidate@815 }
-    <name not found> = ArrayList@816[3] { ResolutionCandidate@813, ResolutionCandidate@814, ResolutionCandidate@815 }
-}
-
-ResolutionTaskHolder@817 {
-    <name not found> = ArrayList@818[3] { ResolutionCandidate@819, ResolutionCandidate@820, ResolutionCandidate@821 }
-    <name not found> = ArrayList@822[3] { ResolutionCandidate@819, ResolutionCandidate@820, ResolutionCandidate@821 }
-}
-
-ResolutionTaskHolder@823 {
-    <name not found> = ArrayList@824[3] { ResolutionCandidate@825, ResolutionCandidate@826, ResolutionCandidate@827 }
-    <name not found> = ArrayList@828[3] { ResolutionCandidate@825, ResolutionCandidate@826, ResolutionCandidate@827 }
-}
-
-ResolutionTaskHolder@829 {
-    <name not found> = ArrayList@830[3] { ResolutionCandidate@831, ResolutionCandidate@832, ResolutionCandidate@833 }
-    <name not found> = ArrayList@834[3] { ResolutionCandidate@831, ResolutionCandidate@832, ResolutionCandidate@833 }
-}
-
-ResolutionTaskHolder@835 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@836 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@837 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@838 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@839 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@840 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@841 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@842 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@843 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@844 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@845 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@846 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@847 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@848 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@849 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@850 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@851 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@852 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@853 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
@@ -1551,14 +1389,7 @@ ResolutionTaskHolder@853 {
     <name not found> = EmptyList@49[empty]
 }
 
-ResolutionTaskHolder@854 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
+ResolutionTaskHolder@673 {
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
@@ -1569,8 +1400,7 @@ ResolutionTaskHolder@854 {
     <name not found> = EmptyList@49[empty]
 }
 
-ResolutionTaskHolder@855 {
-    <name not found> = EmptyList@49[empty]
+ResolutionTaskHolder@674 {
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
@@ -1579,15 +1409,212 @@ ResolutionTaskHolder@855 {
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
+}
+
+null {
+    <name not found> = ArrayList@675[1] { ResolutionCandidate@334 }
+    <name not found> = ArrayList@676[1] { ResolutionCandidate@469 }
+    <name not found> = ArrayList@677[1] { ResolutionCandidate@355 }
+    <name not found> = ArrayList@678[1] { ResolutionCandidate@313 }
+    <name not found> = ArrayList@679[1] { ResolutionCandidate@397 }
+    <name not found> = ArrayList@680[1] { ResolutionCandidate@484 }
+    <name not found> = ArrayList@681[1] { ResolutionCandidate@250 }
+    <name not found> = ArrayList@682[1] { ResolutionCandidate@478 }
+    <name not found> = ArrayList@683[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@684[1] { ResolutionCandidate@277 }
+    <name not found> = ArrayList@685[1] { ResolutionCandidate@433 }
+    <name not found> = ArrayList@686[1] { ResolutionCandidate@517 }
+    <name not found> = ArrayList@687[1] { ResolutionCandidate@349 }
+    <name not found> = ArrayList@688[1] { ResolutionCandidate@169 }
+    <name not found> = ArrayList@689[1] { ResolutionCandidate@274 }
+    <name not found> = ArrayList@690[1] { ResolutionCandidate@133 }
+    <name not found> = ArrayList@691[1] { ResolutionCandidate@340 }
+    <name not found> = ArrayList@692[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@693[1] { ResolutionCandidate@244 }
+    <name not found> = ArrayList@694[1] { ResolutionCandidate@232 }
+    <name not found> = ArrayList@695[1] { ResolutionCandidate@556 }
+    <name not found> = ArrayList@696[1] { ResolutionCandidate@445 }
+    <name not found> = ArrayList@697[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@698[1] { ResolutionCandidate@154 }
+    <name not found> = ArrayList@699[1] { ResolutionCandidate@247 }
+    <name not found> = ArrayList@700[1] { ResolutionCandidate@223 }
+    <name not found> = ArrayList@701[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@702[1] { ResolutionCandidate@280 }
+    <name not found> = ArrayList@703[1] { ResolutionCandidate@178 }
+    <name not found> = ArrayList@704[1] { ResolutionCandidate@346 }
+    <name not found> = ArrayList@705[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@706[1] { ResolutionCandidate@364 }
+    <name not found> = ArrayList@707[1] { ResolutionCandidate@367 }
+    <name not found> = ArrayList@708[1] { ResolutionCandidate@508 }
+    <name not found> = ArrayList@709[1] { ResolutionCandidate@580 }
+    <name not found> = ArrayList@710[1] { ResolutionCandidate@523 }
+    <name not found> = ArrayList@711[1] { ResolutionCandidate@325 }
+    <name not found> = ArrayList@712[1] { ResolutionCandidate@511 }
+    <name not found> = ArrayList@713[1] { ResolutionCandidate@328 }
+    <name not found> = ArrayList@714[1] { ResolutionCandidate@298 }
+    <name not found> = ArrayList@715[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@716[1] { ResolutionCandidate@415 }
+    <name not found> = ArrayList@717[1] { ResolutionCandidate@283 }
+    <name not found> = ArrayList@718[1] { ResolutionCandidate@514 }
+    <name not found> = ArrayList@719[1] { ResolutionCandidate@190 }
+    <name not found> = ArrayList@720[1] { ResolutionCandidate@370 }
+    <name not found> = ArrayList@721[1] { ResolutionCandidate@352 }
+    <name not found> = ArrayList@722[1] { ResolutionCandidate@226 }
+    <name not found> = ArrayList@723[1] { ResolutionCandidate@268 }
+    <name not found> = ArrayList@724[1] { ResolutionCandidate@136 }
+    <name not found> = ArrayList@725[1] { ResolutionCandidate@157 }
+    <name not found> = ArrayList@726[1] { ResolutionCandidate@442 }
+    <name not found> = ArrayList@727[1] { ResolutionCandidate@187 }
+    <name not found> = ArrayList@728[1] { ResolutionCandidate@373 }
+    <name not found> = ArrayList@729[1] { ResolutionCandidate@457 }
+    <name not found> = ArrayList@730[1] { ResolutionCandidate@550 }
+    <name not found> = ArrayList@731[1] { ResolutionCandidate@301 }
+    <name not found> = ArrayList@732[1] { ResolutionCandidate@376 }
+    <name not found> = ArrayList@733[1] { ResolutionCandidate@211 }
+    <name not found> = ArrayList@734[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@735[1] { ResolutionCandidate@493 }
+    <name not found> = ArrayList@736[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@737[1] { ResolutionCandidate@163 }
+    <name not found> = ArrayList@738[1] { ResolutionCandidate@319 }
+    <name not found> = ArrayList@739[1] { ResolutionCandidate@424 }
+    <name not found> = ArrayList@740[1] { ResolutionCandidate@466 }
+    <name not found> = ArrayList@741[1] { ResolutionCandidate@583 }
+    <name not found> = ArrayList@742[1] { ResolutionCandidate@361 }
+    <name not found> = ArrayList@743[1] { ResolutionCandidate@472 }
+    <name not found> = ArrayList@744[1] { ResolutionCandidate@358 }
+    <name not found> = ArrayList@745[1] { ResolutionCandidate@295 }
+    <name not found> = ArrayList@746[1] { ResolutionCandidate@559 }
+    <name not found> = ArrayList@747[1] { ResolutionCandidate@553 }
+    <name not found> = ArrayList@748[1] { ResolutionCandidate@331 }
+    <name not found> = ArrayList@749[1] { ResolutionCandidate@229 }
+    <name not found> = ArrayList@750[1] { ResolutionCandidate@217 }
+    <name not found> = ArrayList@751[1] { ResolutionCandidate@544 }
+    <name not found> = ArrayList@752[1] { ResolutionCandidate@490 }
+    <name not found> = ArrayList@753[1] { ResolutionCandidate@343 }
+    <name not found> = ArrayList@754[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@755[1] { ResolutionCandidate@205 }
+    <name not found> = ArrayList@756[1] { ResolutionCandidate@388 }
+    <name not found> = ArrayList@757[1] { ResolutionCandidate@337 }
+    <name not found> = ArrayList@758[1] { ResolutionCandidate@289 }
+    <name not found> = ArrayList@759[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@760[1] { ResolutionCandidate@430 }
+    <name not found> = ArrayList@761[1] { ResolutionCandidate@160 }
+    <name not found> = ArrayList@762[1] { ResolutionCandidate@463 }
+    <name not found> = ArrayList@763[1] { ResolutionCandidate@166 }
+    <name not found> = ArrayList@764[1] { ResolutionCandidate@139 }
+    <name not found> = ArrayList@765[1] { ResolutionCandidate@577 }
+    <name not found> = ArrayList@766[1] { ResolutionCandidate@214 }
+    <name not found> = ArrayList@767[1] { ResolutionCandidate@145 }
+    <name not found> = ArrayList@768[1] { ResolutionCandidate@526 }
+    <name not found> = ArrayList@769[1] { ResolutionCandidate@316 }
+    <name not found> = ArrayList@770[1] { ResolutionCandidate@253 }
+    <name not found> = ArrayList@771[1] { ResolutionCandidate@409 }
+    <name not found> = ArrayList@772[1] { ResolutionCandidate@181 }
+    <name not found> = ArrayList@773[1] { ResolutionCandidate@562 }
+    <name not found> = ArrayList@774[1] { ResolutionCandidate@418 }
+    <name not found> = ArrayList@775[1] { ResolutionCandidate@322 }
+    <name not found> = ArrayList@776[1] { ResolutionCandidate@400 }
+    <name not found> = ArrayList@777[1] { ResolutionCandidate@142 }
+    <name not found> = ArrayList@778[1] { ResolutionCandidate@310 }
+    <name not found> = ArrayList@779[1] { ResolutionCandidate@565 }
+    <name not found> = ArrayList@780[1] { ResolutionCandidate@385 }
+    <name not found> = ArrayList@781[1] { ResolutionCandidate@568 }
+    <name not found> = ArrayList@782[1] { ResolutionCandidate@259 }
+    <name not found> = ArrayList@783[1] { ResolutionCandidate@502 }
+    <name not found> = ArrayList@784[1] { ResolutionCandidate@175 }
+    <name not found> = ArrayList@785[1] { ResolutionCandidate@448 }
+    <name not found> = ArrayList@786[1] { ResolutionCandidate@574 }
+    <name not found> = ArrayList@787[1] { ResolutionCandidate@496 }
+    <name not found> = ArrayList@788[1] { ResolutionCandidate@529 }
+    <name not found> = ArrayList@789[1] { ResolutionCandidate@532 }
+    <name not found> = ArrayList@790[1] { ResolutionCandidate@148 }
+    <name not found> = ArrayList@791[1] { ResolutionCandidate@193 }
+    <name not found> = ArrayList@792[1] { ResolutionCandidate@427 }
+    <name not found> = ArrayList@793[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@794[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@795[1] { ResolutionCandidate@238 }
+    <name not found> = ArrayList@796[1] { ResolutionCandidate@262 }
+    <name not found> = ArrayList@797[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@798[1] { ResolutionCandidate@475 }
+    <name not found> = ArrayList@799[1] { ResolutionCandidate@196 }
+    <name not found> = ArrayList@800[1] { ResolutionCandidate@436 }
+    <name not found> = ArrayList@801[1] { ResolutionCandidate@235 }
+    <name not found> = ArrayList@802[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@803[1] { ResolutionCandidate@307 }
+    <name not found> = ArrayList@804[1] { ResolutionCandidate@379 }
+    <name not found> = ArrayList@805[1] { ResolutionCandidate@586 }
+    <name not found> = ArrayList@806[1] { ResolutionCandidate@520 }
+    <name not found> = ArrayList@807[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@808[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@809[1] { ResolutionCandidate@199 }
+    <name not found> = ArrayList@810[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@811[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@812[1] { ResolutionCandidate@265 }
+    <name not found> = ArrayList@813[1] { ResolutionCandidate@505 }
+    <name not found> = ArrayList@814[1] { ResolutionCandidate@292 }
+    <name not found> = ArrayList@815[1] { ResolutionCandidate@460 }
+    <name not found> = ArrayList@816[1] { ResolutionCandidate@271 }
+    <name not found> = ArrayList@817[1] { ResolutionCandidate@454 }
+    <name not found> = ArrayList@818[1] { ResolutionCandidate@412 }
+    <name not found> = ArrayList@819[1] { ResolutionCandidate@172 }
+    <name not found> = ArrayList@820[1] { ResolutionCandidate@481 }
+    <name not found> = ArrayList@821[1] { ResolutionCandidate@151 }
+    <name not found> = ArrayList@822[1] { ResolutionCandidate@487 }
+    <name not found> = ArrayList@823[1] { ResolutionCandidate@547 }
+    <name not found> = ArrayList@824[1] { ResolutionCandidate@499 }
+    <name not found> = ArrayList@825[1] { ResolutionCandidate@571 }
+    <name not found> = ArrayList@826[1] { ResolutionCandidate@451 }
+    <name not found> = ArrayList@827[1] { ResolutionCandidate@124 }
+    <name not found> = ArrayList@828[1] { ResolutionCandidate@403 }
+    <name not found> = ArrayList@829[1] { ResolutionCandidate@382 }
+    <name not found> = ArrayList@830[1] { ResolutionCandidate@304 }
+    <name not found> = ArrayList@831[1] { ResolutionCandidate@538 }
+    <name not found> = ArrayList@832[1] { ResolutionCandidate@394 }
+    <name not found> = ArrayList@833[1] { ResolutionCandidate@184 }
+    <name not found> = ArrayList@834[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@835[1] { ResolutionCandidate@202 }
+    <name not found> = ArrayList@836[1] { ResolutionCandidate@406 }
+    <name not found> = ArrayList@837[1] { ResolutionCandidate@286 }
+    <name not found> = ArrayList@838[1] { ResolutionCandidate@241 }
+    <name not found> = ArrayList@839[1] { ResolutionCandidate@439 }
+    <name not found> = ArrayList@840[1] { ResolutionCandidate@589 }
+    <name not found> = ArrayList@841[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@842[1] { ResolutionCandidate@535 }
+    <name not found> = ArrayList@843[1] { ResolutionCandidate@541 }
+    <name not found> = ArrayList@844[1] { ResolutionCandidate@391 }
+    <name not found> = ArrayList@845[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@846[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@847[1] { ResolutionCandidate@256 }
+    <name not found> = ArrayList@848[1] { ResolutionCandidate@127 }
+    <name not found> = ArrayList@849[1] { ResolutionCandidate@421 }
+    <name not found> = ArrayList@850[1] { ResolutionCandidate@208 }
+    <name not found> = ArrayList@851[1] { ResolutionCandidate@220 }
+    <name not found> = ArrayList@852[2] { ResolutionCandidate@600, ResolutionCandidate@601 }
+    <name not found> = ArrayList@853[2] { ResolutionCandidate@604, ResolutionCandidate@605 }
+    <name not found> = ArrayList@854[2] { ResolutionCandidate@596, ResolutionCandidate@597 }
+    <name not found> = ArrayList@855[2] { ResolutionCandidate@592, ResolutionCandidate@593 }
+    <name not found> = ArrayList@856[2] { ResolutionCandidate@72, ResolutionCandidate@73 }
+    <name not found> = ArrayList@857[2] { ResolutionCandidate@608, ResolutionCandidate@609 }
+    <name not found> = ArrayList@858[3] { ResolutionCandidate@612, ResolutionCandidate@613, ResolutionCandidate@614 }
+    <name not found> = ArrayList@859[3] { ResolutionCandidate@622, ResolutionCandidate@623, ResolutionCandidate@624 }
+    <name not found> = ArrayList@860[3] { ResolutionCandidate@642, ResolutionCandidate@643, ResolutionCandidate@644 }
+    <name not found> = ArrayList@861[3] { ResolutionCandidate@632, ResolutionCandidate@633, ResolutionCandidate@634 }
+    <name not found> = ArrayList@862[3] { ResolutionCandidate@637, ResolutionCandidate@638, ResolutionCandidate@639 }
+    <name not found> = ArrayList@863[3] { ResolutionCandidate@617, ResolutionCandidate@618, ResolutionCandidate@619 }
+    <name not found> = ArrayList@864[3] { ResolutionCandidate@627, ResolutionCandidate@628, ResolutionCandidate@629 }
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@856 {
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
@@ -1603,9 +1630,6 @@ ResolutionTaskHolder@856 {
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@857 {
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
@@ -1621,9 +1645,6 @@ ResolutionTaskHolder@857 {
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@858 {
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
@@ -1639,9 +1660,6 @@ ResolutionTaskHolder@858 {
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@859 {
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
@@ -1657,9 +1675,6 @@ ResolutionTaskHolder@859 {
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@860 {
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
@@ -1675,9 +1690,6 @@ ResolutionTaskHolder@860 {
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@861 {
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
@@ -1688,9 +1700,6 @@ ResolutionTaskHolder@861 {
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@862 {
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
@@ -1701,9 +1710,6 @@ ResolutionTaskHolder@862 {
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@863 {
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
@@ -1714,9 +1720,6 @@ ResolutionTaskHolder@863 {
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@864 {
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
diff --git a/compiler/testData/diagnostics/tests/inline/anonymousObjects.lazy.log b/compiler/testData/diagnostics/tests/inline/anonymousObjects.lazy.log
index f10e44ce860..bd461d84229 100644
--- a/compiler/testData/diagnostics/tests/inline/anonymousObjects.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/anonymousObjects.lazy.log
@@ -51,29 +51,32 @@ LazyJavaPackageFragment@16['lang'] {
 
 ResolutionTaskHolder@36 {
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@28[empty]
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
+}
+
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
 }
 
 ResolutionTaskHolder@48 {
     <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+null {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@47 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inline/assignment.lazy.log b/compiler/testData/diagnostics/tests/inline/assignment.lazy.log
index e116eef7bff..7458c6d5e99 100644
--- a/compiler/testData/diagnostics/tests/inline/assignment.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/assignment.lazy.log
@@ -47,45 +47,48 @@ LazyJavaPackageFragment@15['java'] {
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
 }
 
 ResolutionTaskHolder@52 {
     <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
+}
+
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
 }
 
 ResolutionTaskHolder@64 {
     <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+null {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@42 }
 }
diff --git a/compiler/testData/diagnostics/tests/inline/binaryExpressions/andOr.lazy.log b/compiler/testData/diagnostics/tests/inline/binaryExpressions/andOr.lazy.log
index da9b0e5a86f..6738bf6d91c 100644
--- a/compiler/testData/diagnostics/tests/inline/binaryExpressions/andOr.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/binaryExpressions/andOr.lazy.log
@@ -73,69 +73,72 @@ LazyJavaPackageFragment@23['lang'] {
 
 ResolutionTaskHolder@54 {
     <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
+}
+
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
 }
 
 ResolutionTaskHolder@66 {
     <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
+}
+
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
 }
 
 ResolutionTaskHolder@78 {
     <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
 }
 
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
 }
 
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
+}
+
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
 }
 
 ResolutionTaskHolder@90 {
     <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
+}
+
+null {
     <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@56 }
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inline/binaryExpressions/arrayAccess.lazy.log b/compiler/testData/diagnostics/tests/inline/binaryExpressions/arrayAccess.lazy.log
index de4be529514..09178f9453a 100644
--- a/compiler/testData/diagnostics/tests/inline/binaryExpressions/arrayAccess.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/binaryExpressions/arrayAccess.lazy.log
@@ -90,74 +90,77 @@ LazyJavaPackageFragment@29['lang'] {
 
 ResolutionTaskHolder@70 {
     <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
+}
+
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
 }
 
 ResolutionTaskHolder@82 {
     <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
 }
 
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
+}
+
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
 }
 
 ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[4] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
-    <name not found> = ArrayList@107[4] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
+    <name not found> = ArrayList@95[4] { ResolutionCandidate@96, ResolutionCandidate@97, ResolutionCandidate@98, ... }
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
 }
 
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[4] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
-    <name not found> = ArrayList@113[4] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[4] { ResolutionCandidate@101, ResolutionCandidate@102, ResolutionCandidate@103, ... }
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
 }
 
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[4] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
-    <name not found> = ArrayList@119[4] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[4] { ResolutionCandidate@106, ResolutionCandidate@107, ResolutionCandidate@108, ... }
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
 }
 
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[4] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
-    <name not found> = ArrayList@125[4] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[4] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113, ... }
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+}
+
+null {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@122[4] { ResolutionCandidate@106, ResolutionCandidate@107, ResolutionCandidate@108, ... }
+    <name not found> = ArrayList@123[4] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113, ... }
+    <name not found> = ArrayList@124[4] { ResolutionCandidate@101, ResolutionCandidate@102, ResolutionCandidate@103, ... }
+    <name not found> = ArrayList@125[4] { ResolutionCandidate@96, ResolutionCandidate@97, ResolutionCandidate@98, ... }
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
diff --git a/compiler/testData/diagnostics/tests/inline/binaryExpressions/assignment.lazy.log b/compiler/testData/diagnostics/tests/inline/binaryExpressions/assignment.lazy.log
index f68753e1967..accaba5f8ec 100644
--- a/compiler/testData/diagnostics/tests/inline/binaryExpressions/assignment.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/binaryExpressions/assignment.lazy.log
@@ -98,14 +98,6 @@ LazyJavaPackageFragment@31['lang'] {
 
 ResolutionTaskHolder@64 {
     <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
     <name not found> = EmptyList@56[empty]
     <name not found> = EmptyList@56[empty]
     <name not found> = EmptyList@56[empty]
@@ -139,16 +131,8 @@ ResolutionTaskHolder@64 {
     <name not found> = EmptyList@56[empty]
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
     <name not found> = EmptyList@56[empty]
     <name not found> = EmptyList@56[empty]
     <name not found> = EmptyList@56[empty]
@@ -182,9 +166,8 @@ ResolutionTaskHolder@68 {
     <name not found> = EmptyList@56[empty]
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
     <name not found> = EmptyList@56[empty]
     <name not found> = EmptyList@56[empty]
     <name not found> = EmptyList@56[empty]
@@ -216,6 +199,34 @@ ResolutionTaskHolder@72 {
     <name not found> = EmptyList@56[empty]
     <name not found> = EmptyList@56[empty]
     <name not found> = EmptyList@56[empty]
+}
+
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
     <name not found> = EmptyList@56[empty]
     <name not found> = EmptyList@56[empty]
     <name not found> = EmptyList@56[empty]
@@ -227,22 +238,6 @@ ResolutionTaskHolder@72 {
 
 ResolutionTaskHolder@76 {
     <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
     <name not found> = EmptyList@56[empty]
     <name not found> = EmptyList@56[empty]
     <name not found> = EmptyList@56[empty]
@@ -268,14 +263,8 @@ ResolutionTaskHolder@76 {
     <name not found> = EmptyList@56[empty]
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
     <name not found> = EmptyList@56[empty]
     <name not found> = EmptyList@56[empty]
     <name not found> = EmptyList@56[empty]
@@ -301,269 +290,167 @@ ResolutionTaskHolder@80 {
     <name not found> = EmptyList@56[empty]
 }
 
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
+}
+
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
 }
 
 ResolutionTaskHolder@88 {
     <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
 }
 
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
+}
+
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
 }
 
 ResolutionTaskHolder@100 {
     <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
 }
 
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
+}
+
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
 }
 
 ResolutionTaskHolder@112 {
     <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
 }
 
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
+ResolutionTaskHolder@115 {
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
 }
 
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
+ResolutionTaskHolder@118 {
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
+}
+
+ResolutionTaskHolder@121 {
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
 }
 
 ResolutionTaskHolder@124 {
     <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@126 }
 }
 
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
+ResolutionTaskHolder@127 {
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
 }
 
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
+ResolutionTaskHolder@130 {
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
+}
+
+ResolutionTaskHolder@133 {
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
 }
 
 ResolutionTaskHolder@136 {
     <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
 }
 
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
+ResolutionTaskHolder@139 {
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
 }
 
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
+ResolutionTaskHolder@142 {
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
+}
+
+ResolutionTaskHolder@145 {
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
 }
 
 ResolutionTaskHolder@148 {
     <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
 }
 
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
-}
-
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
-}
-
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@162 }
-}
-
-ResolutionTaskHolder@164 {
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@166 }
-}
-
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@170 }
-}
-
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@174 }
-}
-
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@178 }
-}
-
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[2] { ResolutionCandidate@182, ResolutionCandidate@183 }
-    <name not found> = ArrayList@184[2] { ResolutionCandidate@182, ResolutionCandidate@183 }
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
+ResolutionTaskHolder@151 {
+    <name not found> = ArrayList@152[2] { ResolutionCandidate@153, ResolutionCandidate@154 }
     <name not found> = EmptyList@56[empty]
     <name not found> = EmptyList@56[empty]
     <name not found> = EmptyList@56[empty]
 }
 
-ResolutionTaskHolder@185 {
-    <name not found> = ArrayList@186[2] { ResolutionCandidate@187, ResolutionCandidate@188 }
-    <name not found> = ArrayList@189[2] { ResolutionCandidate@187, ResolutionCandidate@188 }
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
+ResolutionTaskHolder@155 {
+    <name not found> = ArrayList@156[2] { ResolutionCandidate@157, ResolutionCandidate@158 }
     <name not found> = EmptyList@56[empty]
     <name not found> = EmptyList@56[empty]
     <name not found> = EmptyList@56[empty]
 }
 
-ResolutionTaskHolder@190 {
-    <name not found> = ArrayList@191[2] { ResolutionCandidate@192, ResolutionCandidate@193 }
-    <name not found> = ArrayList@194[2] { ResolutionCandidate@192, ResolutionCandidate@193 }
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
+ResolutionTaskHolder@159 {
+    <name not found> = ArrayList@160[2] { ResolutionCandidate@161, ResolutionCandidate@162 }
     <name not found> = EmptyList@56[empty]
     <name not found> = EmptyList@56[empty]
     <name not found> = EmptyList@56[empty]
 }
 
-ResolutionTaskHolder@195 {
-    <name not found> = ArrayList@196[2] { ResolutionCandidate@197, ResolutionCandidate@198 }
-    <name not found> = ArrayList@199[2] { ResolutionCandidate@197, ResolutionCandidate@198 }
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
+ResolutionTaskHolder@163 {
+    <name not found> = ArrayList@164[2] { ResolutionCandidate@165, ResolutionCandidate@166 }
     <name not found> = EmptyList@56[empty]
     <name not found> = EmptyList@56[empty]
     <name not found> = EmptyList@56[empty]
 }
 
-ResolutionTaskHolder@200 {
-    <name not found> = ArrayList@201[2] { ResolutionCandidate@202, ResolutionCandidate@203 }
-    <name not found> = ArrayList@204[2] { ResolutionCandidate@202, ResolutionCandidate@203 }
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
+ResolutionTaskHolder@167 {
+    <name not found> = ArrayList@168[2] { ResolutionCandidate@169, ResolutionCandidate@170 }
     <name not found> = EmptyList@56[empty]
     <name not found> = EmptyList@56[empty]
     <name not found> = EmptyList@56[empty]
 }
 
-ResolutionTaskHolder@205 {
-    <name not found> = ArrayList@206[2] { ResolutionCandidate@207, ResolutionCandidate@208 }
-    <name not found> = ArrayList@209[2] { ResolutionCandidate@207, ResolutionCandidate@208 }
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
+ResolutionTaskHolder@171 {
+    <name not found> = ArrayList@172[2] { ResolutionCandidate@173, ResolutionCandidate@174 }
     <name not found> = EmptyList@56[empty]
     <name not found> = EmptyList@56[empty]
     <name not found> = EmptyList@56[empty]
 }
 
-ResolutionTaskHolder@210 {
-    <name not found> = ArrayList@211[2] { ResolutionCandidate@212, ResolutionCandidate@213 }
-    <name not found> = ArrayList@214[2] { ResolutionCandidate@212, ResolutionCandidate@213 }
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
+ResolutionTaskHolder@175 {
+    <name not found> = ArrayList@176[2] { ResolutionCandidate@177, ResolutionCandidate@178 }
     <name not found> = EmptyList@56[empty]
     <name not found> = EmptyList@56[empty]
     <name not found> = EmptyList@56[empty]
 }
 
-ResolutionTaskHolder@215 {
-    <name not found> = ArrayList@216[2] { ResolutionCandidate@217, ResolutionCandidate@218 }
-    <name not found> = ArrayList@219[2] { ResolutionCandidate@217, ResolutionCandidate@218 }
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
+ResolutionTaskHolder@179 {
+    <name not found> = ArrayList@180[2] { ResolutionCandidate@181, ResolutionCandidate@182 }
     <name not found> = EmptyList@56[empty]
     <name not found> = EmptyList@56[empty]
     <name not found> = EmptyList@56[empty]
 }
 
-ResolutionTaskHolder@220 {
-    <name not found> = ArrayList@221[2] { ResolutionCandidate@222, ResolutionCandidate@223 }
-    <name not found> = ArrayList@224[2] { ResolutionCandidate@222, ResolutionCandidate@223 }
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
+ResolutionTaskHolder@183 {
+    <name not found> = ArrayList@184[2] { ResolutionCandidate@185, ResolutionCandidate@186 }
     <name not found> = EmptyList@56[empty]
     <name not found> = EmptyList@56[empty]
 }
 
-ResolutionTaskHolder@225 {
-    <name not found> = ArrayList@226[2] { ResolutionCandidate@227, ResolutionCandidate@228 }
-    <name not found> = ArrayList@229[2] { ResolutionCandidate@227, ResolutionCandidate@228 }
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
+ResolutionTaskHolder@187 {
+    <name not found> = ArrayList@188[2] { ResolutionCandidate@189, ResolutionCandidate@190 }
     <name not found> = EmptyList@56[empty]
     <name not found> = EmptyList@56[empty]
 }
 
-ResolutionTaskHolder@230 {
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
+ResolutionTaskHolder@191 {
     <name not found> = EmptyList@56[empty]
     <name not found> = EmptyList@56[empty]
     <name not found> = EmptyList@56[empty]
@@ -598,15 +485,7 @@ ResolutionTaskHolder@230 {
     <name not found> = EmptyList@56[empty]
 }
 
-ResolutionTaskHolder@231 {
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
+ResolutionTaskHolder@192 {
     <name not found> = EmptyList@56[empty]
     <name not found> = EmptyList@56[empty]
     <name not found> = EmptyList@56[empty]
@@ -641,15 +520,7 @@ ResolutionTaskHolder@231 {
     <name not found> = EmptyList@56[empty]
 }
 
-ResolutionTaskHolder@232 {
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
+ResolutionTaskHolder@193 {
     <name not found> = EmptyList@56[empty]
     <name not found> = EmptyList@56[empty]
     <name not found> = EmptyList@56[empty]
@@ -684,7 +555,139 @@ ResolutionTaskHolder@232 {
     <name not found> = EmptyList@56[empty]
 }
 
-ResolutionTaskHolder@233 {
+ResolutionTaskHolder@194 {
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+}
+
+null {
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@196[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@197[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@198[1] { ResolutionCandidate@147 }
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@200[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@201[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@202[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@203[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@204[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@205[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@206[1] { ResolutionCandidate@135 }
+    <name not found> = ArrayList@207[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@208[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@209[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@210[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@211[1] { ResolutionCandidate@141 }
+    <name not found> = ArrayList@212[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@213[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@214[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@215[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@216[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@217[1] { ResolutionCandidate@126 }
+    <name not found> = ArrayList@218[1] { ResolutionCandidate@132 }
+    <name not found> = ArrayList@219[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@220[1] { ResolutionCandidate@129 }
+    <name not found> = ArrayList@221[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@222[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@223[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@224[2] { ResolutionCandidate@173, ResolutionCandidate@174 }
+    <name not found> = ArrayList@225[2] { ResolutionCandidate@153, ResolutionCandidate@154 }
+    <name not found> = ArrayList@226[2] { ResolutionCandidate@169, ResolutionCandidate@170 }
+    <name not found> = ArrayList@227[2] { ResolutionCandidate@177, ResolutionCandidate@178 }
+    <name not found> = ArrayList@228[2] { ResolutionCandidate@165, ResolutionCandidate@166 }
+    <name not found> = ArrayList@229[2] { ResolutionCandidate@157, ResolutionCandidate@158 }
+    <name not found> = ArrayList@230[2] { ResolutionCandidate@181, ResolutionCandidate@182 }
+    <name not found> = ArrayList@231[2] { ResolutionCandidate@161, ResolutionCandidate@162 }
+    <name not found> = ArrayList@232[2] { ResolutionCandidate@185, ResolutionCandidate@186 }
+    <name not found> = ArrayList@233[2] { ResolutionCandidate@189, ResolutionCandidate@190 }
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
     <name not found> = EmptyList@56[empty]
     <name not found> = EmptyList@56[empty]
     <name not found> = EmptyList@56[empty]
diff --git a/compiler/testData/diagnostics/tests/inline/binaryExpressions/comparison.lazy.log b/compiler/testData/diagnostics/tests/inline/binaryExpressions/comparison.lazy.log
index aa4f8d1acf0..71eda21b54e 100644
--- a/compiler/testData/diagnostics/tests/inline/binaryExpressions/comparison.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/binaryExpressions/comparison.lazy.log
@@ -93,322 +93,325 @@ LazyJavaPackageFragment@30['lang'] {
 
 ResolutionTaskHolder@68 {
     <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
 }
 
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
+}
+
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
 }
 
 ResolutionTaskHolder@80 {
     <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
 }
 
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
 }
 
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
+}
+
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
 }
 
 ResolutionTaskHolder@92 {
     <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
 }
 
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
 }
 
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
+}
+
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
 }
 
 ResolutionTaskHolder@104 {
     <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
 }
 
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
 }
 
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
+}
+
+ResolutionTaskHolder@113 {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
 }
 
 ResolutionTaskHolder@116 {
     <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
 }
 
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
+ResolutionTaskHolder@119 {
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
 }
 
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@126 }
+ResolutionTaskHolder@122 {
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
+}
+
+ResolutionTaskHolder@125 {
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
 }
 
 ResolutionTaskHolder@128 {
     <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
 }
 
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
+ResolutionTaskHolder@131 {
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
 }
 
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
+ResolutionTaskHolder@134 {
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
+}
+
+ResolutionTaskHolder@137 {
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
 }
 
 ResolutionTaskHolder@140 {
     <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
 }
 
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
+ResolutionTaskHolder@143 {
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
 }
 
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
+ResolutionTaskHolder@146 {
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
+}
+
+ResolutionTaskHolder@149 {
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
 }
 
 ResolutionTaskHolder@152 {
     <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
 }
 
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
+ResolutionTaskHolder@155 {
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
 }
 
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@162 }
+ResolutionTaskHolder@158 {
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
+}
+
+ResolutionTaskHolder@161 {
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
 }
 
 ResolutionTaskHolder@164 {
     <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@166 }
 }
 
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@170 }
+ResolutionTaskHolder@167 {
+    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
 }
 
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@174 }
+ResolutionTaskHolder@170 {
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
+}
+
+ResolutionTaskHolder@173 {
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
 }
 
 ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@178 }
-}
-
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@182 }
-}
-
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@186 }
-}
-
-ResolutionTaskHolder@188 {
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@190 }
-}
-
-ResolutionTaskHolder@192 {
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@194 }
-}
-
-ResolutionTaskHolder@196 {
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@198 }
-}
-
-ResolutionTaskHolder@200 {
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@202 }
-}
-
-ResolutionTaskHolder@204 {
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@206 }
-}
-
-ResolutionTaskHolder@208 {
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@210 }
-}
-
-ResolutionTaskHolder@212 {
-    <name not found> = ArrayList@213[4] { ResolutionCandidate@214, ResolutionCandidate@215, ResolutionCandidate@216, ... }
-    <name not found> = ArrayList@217[4] { ResolutionCandidate@214, ResolutionCandidate@215, ResolutionCandidate@216, ... }
+    <name not found> = ArrayList@177[4] { ResolutionCandidate@178, ResolutionCandidate@179, ResolutionCandidate@180, ... }
     <name not found> = EmptyList@60[empty]
     <name not found> = EmptyList@60[empty]
+}
+
+ResolutionTaskHolder@181 {
+    <name not found> = ArrayList@182[4] { ResolutionCandidate@183, ResolutionCandidate@184, ResolutionCandidate@185, ... }
+    <name not found> = EmptyList@60[empty]
+    <name not found> = EmptyList@60[empty]
+}
+
+ResolutionTaskHolder@186 {
+    <name not found> = ArrayList@187[4] { ResolutionCandidate@188, ResolutionCandidate@189, ResolutionCandidate@190, ... }
+    <name not found> = EmptyList@60[empty]
+    <name not found> = EmptyList@60[empty]
+}
+
+ResolutionTaskHolder@191 {
+    <name not found> = ArrayList@192[4] { ResolutionCandidate@193, ResolutionCandidate@194, ResolutionCandidate@195, ... }
     <name not found> = EmptyList@60[empty]
     <name not found> = EmptyList@60[empty]
 }
 
-ResolutionTaskHolder@218 {
-    <name not found> = ArrayList@219[4] { ResolutionCandidate@220, ResolutionCandidate@221, ResolutionCandidate@222, ... }
-    <name not found> = ArrayList@223[4] { ResolutionCandidate@220, ResolutionCandidate@221, ResolutionCandidate@222, ... }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
+ResolutionTaskHolder@196 {
+    <name not found> = ArrayList@197[4] { ResolutionCandidate@198, ResolutionCandidate@199, ResolutionCandidate@200, ... }
     <name not found> = EmptyList@60[empty]
     <name not found> = EmptyList@60[empty]
 }
 
-ResolutionTaskHolder@224 {
-    <name not found> = ArrayList@225[4] { ResolutionCandidate@226, ResolutionCandidate@227, ResolutionCandidate@228, ... }
-    <name not found> = ArrayList@229[4] { ResolutionCandidate@226, ResolutionCandidate@227, ResolutionCandidate@228, ... }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
+ResolutionTaskHolder@201 {
+    <name not found> = ArrayList@202[4] { ResolutionCandidate@203, ResolutionCandidate@204, ResolutionCandidate@205, ... }
     <name not found> = EmptyList@60[empty]
     <name not found> = EmptyList@60[empty]
 }
 
-ResolutionTaskHolder@230 {
-    <name not found> = ArrayList@231[4] { ResolutionCandidate@232, ResolutionCandidate@233, ResolutionCandidate@234, ... }
-    <name not found> = ArrayList@235[4] { ResolutionCandidate@232, ResolutionCandidate@233, ResolutionCandidate@234, ... }
+ResolutionTaskHolder@206 {
+    <name not found> = ArrayList@207[4] { ResolutionCandidate@208, ResolutionCandidate@209, ResolutionCandidate@210, ... }
     <name not found> = EmptyList@60[empty]
     <name not found> = EmptyList@60[empty]
+}
+
+ResolutionTaskHolder@211 {
+    <name not found> = ArrayList@212[4] { ResolutionCandidate@213, ResolutionCandidate@214, ResolutionCandidate@215, ... }
+    <name not found> = EmptyList@60[empty]
+    <name not found> = EmptyList@60[empty]
+}
+
+ResolutionTaskHolder@216 {
+    <name not found> = ArrayList@217[4] { ResolutionCandidate@218, ResolutionCandidate@219, ResolutionCandidate@220, ... }
+    <name not found> = EmptyList@60[empty]
+    <name not found> = EmptyList@60[empty]
+}
+
+ResolutionTaskHolder@221 {
+    <name not found> = ArrayList@222[4] { ResolutionCandidate@223, ResolutionCandidate@224, ResolutionCandidate@225, ... }
+    <name not found> = EmptyList@60[empty]
+    <name not found> = EmptyList@60[empty]
+}
+
+ResolutionTaskHolder@226 {
+    <name not found> = ArrayList@227[4] { ResolutionCandidate@228, ResolutionCandidate@229, ResolutionCandidate@230, ... }
+    <name not found> = EmptyList@60[empty]
+    <name not found> = EmptyList@60[empty]
+}
+
+ResolutionTaskHolder@231 {
+    <name not found> = ArrayList@232[4] { ResolutionCandidate@233, ResolutionCandidate@234, ResolutionCandidate@235, ... }
     <name not found> = EmptyList@60[empty]
     <name not found> = EmptyList@60[empty]
 }
 
 ResolutionTaskHolder@236 {
     <name not found> = ArrayList@237[4] { ResolutionCandidate@238, ResolutionCandidate@239, ResolutionCandidate@240, ... }
-    <name not found> = ArrayList@241[4] { ResolutionCandidate@238, ResolutionCandidate@239, ResolutionCandidate@240, ... }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
     <name not found> = EmptyList@60[empty]
     <name not found> = EmptyList@60[empty]
 }
 
-ResolutionTaskHolder@242 {
-    <name not found> = ArrayList@243[4] { ResolutionCandidate@244, ResolutionCandidate@245, ResolutionCandidate@246, ... }
-    <name not found> = ArrayList@247[4] { ResolutionCandidate@244, ResolutionCandidate@245, ResolutionCandidate@246, ... }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
+ResolutionTaskHolder@241 {
+    <name not found> = ArrayList@242[4] { ResolutionCandidate@243, ResolutionCandidate@244, ResolutionCandidate@245, ... }
     <name not found> = EmptyList@60[empty]
     <name not found> = EmptyList@60[empty]
 }
 
-ResolutionTaskHolder@248 {
-    <name not found> = ArrayList@249[4] { ResolutionCandidate@250, ResolutionCandidate@251, ResolutionCandidate@252, ... }
-    <name not found> = ArrayList@253[4] { ResolutionCandidate@250, ResolutionCandidate@251, ResolutionCandidate@252, ... }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
+ResolutionTaskHolder@246 {
+    <name not found> = ArrayList@247[4] { ResolutionCandidate@248, ResolutionCandidate@249, ResolutionCandidate@250, ... }
     <name not found> = EmptyList@60[empty]
     <name not found> = EmptyList@60[empty]
 }
 
-ResolutionTaskHolder@254 {
-    <name not found> = ArrayList@255[4] { ResolutionCandidate@256, ResolutionCandidate@257, ResolutionCandidate@258, ... }
-    <name not found> = ArrayList@259[4] { ResolutionCandidate@256, ResolutionCandidate@257, ResolutionCandidate@258, ... }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
+ResolutionTaskHolder@251 {
+    <name not found> = ArrayList@252[4] { ResolutionCandidate@253, ResolutionCandidate@254, ResolutionCandidate@255, ... }
     <name not found> = EmptyList@60[empty]
     <name not found> = EmptyList@60[empty]
 }
 
-ResolutionTaskHolder@260 {
-    <name not found> = ArrayList@261[4] { ResolutionCandidate@262, ResolutionCandidate@263, ResolutionCandidate@264, ... }
-    <name not found> = ArrayList@265[4] { ResolutionCandidate@262, ResolutionCandidate@263, ResolutionCandidate@264, ... }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-}
-
-ResolutionTaskHolder@266 {
-    <name not found> = ArrayList@267[4] { ResolutionCandidate@268, ResolutionCandidate@269, ResolutionCandidate@270, ... }
-    <name not found> = ArrayList@271[4] { ResolutionCandidate@268, ResolutionCandidate@269, ResolutionCandidate@270, ... }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-}
-
-ResolutionTaskHolder@272 {
-    <name not found> = ArrayList@273[4] { ResolutionCandidate@274, ResolutionCandidate@275, ResolutionCandidate@276, ... }
-    <name not found> = ArrayList@277[4] { ResolutionCandidate@274, ResolutionCandidate@275, ResolutionCandidate@276, ... }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-}
-
-ResolutionTaskHolder@278 {
-    <name not found> = ArrayList@279[4] { ResolutionCandidate@280, ResolutionCandidate@281, ResolutionCandidate@282, ... }
-    <name not found> = ArrayList@283[4] { ResolutionCandidate@280, ResolutionCandidate@281, ResolutionCandidate@282, ... }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-}
-
-ResolutionTaskHolder@284 {
-    <name not found> = ArrayList@285[4] { ResolutionCandidate@286, ResolutionCandidate@287, ResolutionCandidate@288, ... }
-    <name not found> = ArrayList@289[4] { ResolutionCandidate@286, ResolutionCandidate@287, ResolutionCandidate@288, ... }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-}
-
-ResolutionTaskHolder@290 {
-    <name not found> = ArrayList@291[4] { ResolutionCandidate@292, ResolutionCandidate@293, ResolutionCandidate@294, ... }
-    <name not found> = ArrayList@295[4] { ResolutionCandidate@292, ResolutionCandidate@293, ResolutionCandidate@294, ... }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-}
-
-ResolutionTaskHolder@296 {
-    <name not found> = ArrayList@297[4] { ResolutionCandidate@298, ResolutionCandidate@299, ResolutionCandidate@300, ... }
-    <name not found> = ArrayList@301[4] { ResolutionCandidate@298, ResolutionCandidate@299, ResolutionCandidate@300, ... }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-}
-
-ResolutionTaskHolder@302 {
-    <name not found> = ArrayList@303[4] { ResolutionCandidate@304, ResolutionCandidate@305, ResolutionCandidate@306, ... }
-    <name not found> = ArrayList@307[4] { ResolutionCandidate@304, ResolutionCandidate@305, ResolutionCandidate@306, ... }
+null {
+    <name not found> = ArrayList@256[1] { ResolutionCandidate@151 }
+    <name not found> = ArrayList@257[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@258[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@259[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@260[1] { ResolutionCandidate@133 }
+    <name not found> = ArrayList@261[1] { ResolutionCandidate@124 }
+    <name not found> = ArrayList@262[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@263[1] { ResolutionCandidate@163 }
+    <name not found> = ArrayList@264[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@265[1] { ResolutionCandidate@166 }
+    <name not found> = ArrayList@266[1] { ResolutionCandidate@172 }
+    <name not found> = ArrayList@267[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@268[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@269[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@270[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@271[1] { ResolutionCandidate@139 }
+    <name not found> = ArrayList@272[1] { ResolutionCandidate@142 }
+    <name not found> = ArrayList@273[1] { ResolutionCandidate@169 }
+    <name not found> = ArrayList@274[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@275[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@276[1] { ResolutionCandidate@154 }
+    <name not found> = ArrayList@277[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@278[1] { ResolutionCandidate@136 }
+    <name not found> = ArrayList@279[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@280[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@281[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@282[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@283[1] { ResolutionCandidate@148 }
+    <name not found> = ArrayList@284[1] { ResolutionCandidate@157 }
+    <name not found> = ArrayList@285[1] { ResolutionCandidate@175 }
+    <name not found> = ArrayList@286[1] { ResolutionCandidate@127 }
+    <name not found> = ArrayList@287[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@288[1] { ResolutionCandidate@145 }
+    <name not found> = ArrayList@289[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@290[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@291[1] { ResolutionCandidate@160 }
+    <name not found> = ArrayList@292[4] { ResolutionCandidate@218, ResolutionCandidate@219, ResolutionCandidate@220, ... }
+    <name not found> = ArrayList@293[4] { ResolutionCandidate@243, ResolutionCandidate@244, ResolutionCandidate@245, ... }
+    <name not found> = ArrayList@294[4] { ResolutionCandidate@223, ResolutionCandidate@224, ResolutionCandidate@225, ... }
+    <name not found> = ArrayList@295[4] { ResolutionCandidate@183, ResolutionCandidate@184, ResolutionCandidate@185, ... }
+    <name not found> = ArrayList@296[4] { ResolutionCandidate@198, ResolutionCandidate@199, ResolutionCandidate@200, ... }
+    <name not found> = ArrayList@297[4] { ResolutionCandidate@178, ResolutionCandidate@179, ResolutionCandidate@180, ... }
+    <name not found> = ArrayList@298[4] { ResolutionCandidate@188, ResolutionCandidate@189, ResolutionCandidate@190, ... }
+    <name not found> = ArrayList@299[4] { ResolutionCandidate@233, ResolutionCandidate@234, ResolutionCandidate@235, ... }
+    <name not found> = ArrayList@300[4] { ResolutionCandidate@213, ResolutionCandidate@214, ResolutionCandidate@215, ... }
+    <name not found> = ArrayList@301[4] { ResolutionCandidate@203, ResolutionCandidate@204, ResolutionCandidate@205, ... }
+    <name not found> = ArrayList@302[4] { ResolutionCandidate@248, ResolutionCandidate@249, ResolutionCandidate@250, ... }
+    <name not found> = ArrayList@303[4] { ResolutionCandidate@253, ResolutionCandidate@254, ResolutionCandidate@255, ... }
+    <name not found> = ArrayList@304[4] { ResolutionCandidate@193, ResolutionCandidate@194, ResolutionCandidate@195, ... }
+    <name not found> = ArrayList@305[4] { ResolutionCandidate@208, ResolutionCandidate@209, ResolutionCandidate@210, ... }
+    <name not found> = ArrayList@306[4] { ResolutionCandidate@238, ResolutionCandidate@239, ResolutionCandidate@240, ... }
+    <name not found> = ArrayList@307[4] { ResolutionCandidate@228, ResolutionCandidate@229, ResolutionCandidate@230, ... }
+    <name not found> = EmptyList@60[empty]
+    <name not found> = EmptyList@60[empty]
+    <name not found> = EmptyList@60[empty]
+    <name not found> = EmptyList@60[empty]
+    <name not found> = EmptyList@60[empty]
+    <name not found> = EmptyList@60[empty]
+    <name not found> = EmptyList@60[empty]
+    <name not found> = EmptyList@60[empty]
+    <name not found> = EmptyList@60[empty]
+    <name not found> = EmptyList@60[empty]
+    <name not found> = EmptyList@60[empty]
+    <name not found> = EmptyList@60[empty]
+    <name not found> = EmptyList@60[empty]
+    <name not found> = EmptyList@60[empty]
+    <name not found> = EmptyList@60[empty]
+    <name not found> = EmptyList@60[empty]
+    <name not found> = EmptyList@60[empty]
+    <name not found> = EmptyList@60[empty]
+    <name not found> = EmptyList@60[empty]
+    <name not found> = EmptyList@60[empty]
+    <name not found> = EmptyList@60[empty]
+    <name not found> = EmptyList@60[empty]
+    <name not found> = EmptyList@60[empty]
+    <name not found> = EmptyList@60[empty]
+    <name not found> = EmptyList@60[empty]
+    <name not found> = EmptyList@60[empty]
+    <name not found> = EmptyList@60[empty]
+    <name not found> = EmptyList@60[empty]
     <name not found> = EmptyList@60[empty]
     <name not found> = EmptyList@60[empty]
     <name not found> = EmptyList@60[empty]
diff --git a/compiler/testData/diagnostics/tests/inline/binaryExpressions/componentAccess.lazy.log b/compiler/testData/diagnostics/tests/inline/binaryExpressions/componentAccess.lazy.log
index ad17df5eb0f..db1e21ccd2e 100644
--- a/compiler/testData/diagnostics/tests/inline/binaryExpressions/componentAccess.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/binaryExpressions/componentAccess.lazy.log
@@ -113,120 +113,123 @@ LazyJavaPackageFragment@36['lang'] {
 
 ResolutionTaskHolder@75 {
     <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
 }
 
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
 }
 
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
+}
+
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
 }
 
 ResolutionTaskHolder@87 {
     <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
 }
 
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
 }
 
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
+}
+
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
 }
 
 ResolutionTaskHolder@99 {
     <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
 }
 
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
 }
 
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[4] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
 }
 
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@113 }
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[4] { ResolutionCandidate@112, ResolutionCandidate@113, ResolutionCandidate@114, ... }
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
 }
 
 ResolutionTaskHolder@115 {
     <name not found> = ArrayList@116[4] { ResolutionCandidate@117, ResolutionCandidate@118, ResolutionCandidate@119, ... }
-    <name not found> = ArrayList@120[4] { ResolutionCandidate@117, ResolutionCandidate@118, ResolutionCandidate@119, ... }
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
 }
 
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[4] { ResolutionCandidate@123, ResolutionCandidate@124, ResolutionCandidate@125, ... }
-    <name not found> = ArrayList@126[4] { ResolutionCandidate@123, ResolutionCandidate@124, ResolutionCandidate@125, ... }
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
+ResolutionTaskHolder@120 {
+    <name not found> = ArrayList@121[4] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
 }
 
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[4] { ResolutionCandidate@129, ResolutionCandidate@130, ResolutionCandidate@131, ... }
-    <name not found> = ArrayList@132[4] { ResolutionCandidate@129, ResolutionCandidate@130, ResolutionCandidate@131, ... }
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
+ResolutionTaskHolder@125 {
+    <name not found> = ArrayList@126[4] { ResolutionCandidate@127, ResolutionCandidate@128, ResolutionCandidate@129, ... }
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
 }
 
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[4] { ResolutionCandidate@135, ResolutionCandidate@136, ResolutionCandidate@137, ... }
-    <name not found> = ArrayList@138[4] { ResolutionCandidate@135, ResolutionCandidate@136, ResolutionCandidate@137, ... }
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
+ResolutionTaskHolder@130 {
+    <name not found> = ArrayList@131[4] { ResolutionCandidate@132, ResolutionCandidate@133, ResolutionCandidate@134, ... }
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
 }
 
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[4] { ResolutionCandidate@141, ResolutionCandidate@142, ResolutionCandidate@143, ... }
-    <name not found> = ArrayList@144[4] { ResolutionCandidate@141, ResolutionCandidate@142, ResolutionCandidate@143, ... }
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
+ResolutionTaskHolder@135 {
+    <name not found> = ArrayList@136[4] { ResolutionCandidate@137, ResolutionCandidate@138, ResolutionCandidate@139, ... }
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
 }
 
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[4] { ResolutionCandidate@147, ResolutionCandidate@148, ResolutionCandidate@149, ... }
-    <name not found> = ArrayList@150[4] { ResolutionCandidate@147, ResolutionCandidate@148, ResolutionCandidate@149, ... }
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
+ResolutionTaskHolder@140 {
+    <name not found> = ArrayList@141[4] { ResolutionCandidate@142, ResolutionCandidate@143, ResolutionCandidate@144, ... }
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
 }
 
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[4] { ResolutionCandidate@153, ResolutionCandidate@154, ResolutionCandidate@155, ... }
-    <name not found> = ArrayList@156[4] { ResolutionCandidate@153, ResolutionCandidate@154, ResolutionCandidate@155, ... }
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[4] { ResolutionCandidate@159, ResolutionCandidate@160, ResolutionCandidate@161, ... }
-    <name not found> = ArrayList@162[4] { ResolutionCandidate@159, ResolutionCandidate@160, ResolutionCandidate@161, ... }
+null {
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@155[4] { ResolutionCandidate@142, ResolutionCandidate@143, ResolutionCandidate@144, ... }
+    <name not found> = ArrayList@156[4] { ResolutionCandidate@137, ResolutionCandidate@138, ResolutionCandidate@139, ... }
+    <name not found> = ArrayList@157[4] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
+    <name not found> = ArrayList@158[4] { ResolutionCandidate@127, ResolutionCandidate@128, ResolutionCandidate@129, ... }
+    <name not found> = ArrayList@159[4] { ResolutionCandidate@132, ResolutionCandidate@133, ResolutionCandidate@134, ... }
+    <name not found> = ArrayList@160[4] { ResolutionCandidate@117, ResolutionCandidate@118, ResolutionCandidate@119, ... }
+    <name not found> = ArrayList@161[4] { ResolutionCandidate@112, ResolutionCandidate@113, ResolutionCandidate@114, ... }
+    <name not found> = ArrayList@162[4] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
diff --git a/compiler/testData/diagnostics/tests/inline/binaryExpressions/contains.lazy.log b/compiler/testData/diagnostics/tests/inline/binaryExpressions/contains.lazy.log
index 5a3b65d1ef3..d3a08464524 100644
--- a/compiler/testData/diagnostics/tests/inline/binaryExpressions/contains.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/binaryExpressions/contains.lazy.log
@@ -90,234 +90,237 @@ LazyJavaPackageFragment@29['lang'] {
 
 ResolutionTaskHolder@70 {
     <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
+}
+
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
 }
 
 ResolutionTaskHolder@82 {
     <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
 }
 
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
+}
+
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
 }
 
 ResolutionTaskHolder@94 {
     <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
 }
 
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
 }
 
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
+}
+
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
 }
 
 ResolutionTaskHolder@106 {
     <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
 }
 
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
 }
 
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
+}
+
+ResolutionTaskHolder@115 {
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
 }
 
 ResolutionTaskHolder@118 {
     <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
 }
 
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
+ResolutionTaskHolder@121 {
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
 }
 
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
+ResolutionTaskHolder@124 {
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
+}
+
+ResolutionTaskHolder@127 {
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
 }
 
 ResolutionTaskHolder@130 {
     <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@132 }
 }
 
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@136 }
+ResolutionTaskHolder@133 {
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
 }
 
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@140 }
+ResolutionTaskHolder@136 {
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
+}
+
+ResolutionTaskHolder@139 {
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
 }
 
 ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@143[4] { ResolutionCandidate@144, ResolutionCandidate@145, ResolutionCandidate@146, ... }
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
 }
 
-ResolutionTaskHolder@146 {
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@148 }
+ResolutionTaskHolder@147 {
+    <name not found> = ArrayList@148[4] { ResolutionCandidate@149, ResolutionCandidate@150, ResolutionCandidate@151, ... }
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
 }
 
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@152 }
+ResolutionTaskHolder@152 {
+    <name not found> = ArrayList@153[4] { ResolutionCandidate@154, ResolutionCandidate@155, ResolutionCandidate@156, ... }
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
 }
 
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@156 }
-}
-
-ResolutionTaskHolder@158 {
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@160 }
+ResolutionTaskHolder@157 {
+    <name not found> = ArrayList@158[4] { ResolutionCandidate@159, ResolutionCandidate@160, ResolutionCandidate@161, ... }
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
 }
 
 ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@164 }
+    <name not found> = ArrayList@163[4] { ResolutionCandidate@164, ResolutionCandidate@165, ResolutionCandidate@166, ... }
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
 }
 
-ResolutionTaskHolder@166 {
-    <name not found> = ArrayList@167[4] { ResolutionCandidate@168, ResolutionCandidate@169, ResolutionCandidate@170, ... }
-    <name not found> = ArrayList@171[4] { ResolutionCandidate@168, ResolutionCandidate@169, ResolutionCandidate@170, ... }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
+ResolutionTaskHolder@167 {
+    <name not found> = ArrayList@168[4] { ResolutionCandidate@169, ResolutionCandidate@170, ResolutionCandidate@171, ... }
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
 }
 
 ResolutionTaskHolder@172 {
     <name not found> = ArrayList@173[4] { ResolutionCandidate@174, ResolutionCandidate@175, ResolutionCandidate@176, ... }
-    <name not found> = ArrayList@177[4] { ResolutionCandidate@174, ResolutionCandidate@175, ResolutionCandidate@176, ... }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
 }
 
-ResolutionTaskHolder@178 {
-    <name not found> = ArrayList@179[4] { ResolutionCandidate@180, ResolutionCandidate@181, ResolutionCandidate@182, ... }
-    <name not found> = ArrayList@183[4] { ResolutionCandidate@180, ResolutionCandidate@181, ResolutionCandidate@182, ... }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
+ResolutionTaskHolder@177 {
+    <name not found> = ArrayList@178[4] { ResolutionCandidate@179, ResolutionCandidate@180, ResolutionCandidate@181, ... }
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
 }
 
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[4] { ResolutionCandidate@186, ResolutionCandidate@187, ResolutionCandidate@188, ... }
-    <name not found> = ArrayList@189[4] { ResolutionCandidate@186, ResolutionCandidate@187, ResolutionCandidate@188, ... }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
+ResolutionTaskHolder@182 {
+    <name not found> = ArrayList@183[4] { ResolutionCandidate@184, ResolutionCandidate@185, ResolutionCandidate@186, ... }
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
 }
 
-ResolutionTaskHolder@190 {
-    <name not found> = ArrayList@191[4] { ResolutionCandidate@192, ResolutionCandidate@193, ResolutionCandidate@194, ... }
-    <name not found> = ArrayList@195[4] { ResolutionCandidate@192, ResolutionCandidate@193, ResolutionCandidate@194, ... }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
+ResolutionTaskHolder@187 {
+    <name not found> = ArrayList@188[4] { ResolutionCandidate@189, ResolutionCandidate@190, ResolutionCandidate@191, ... }
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
 }
 
-ResolutionTaskHolder@196 {
-    <name not found> = ArrayList@197[4] { ResolutionCandidate@198, ResolutionCandidate@199, ResolutionCandidate@200, ... }
-    <name not found> = ArrayList@201[4] { ResolutionCandidate@198, ResolutionCandidate@199, ResolutionCandidate@200, ... }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
+ResolutionTaskHolder@192 {
+    <name not found> = ArrayList@193[4] { ResolutionCandidate@194, ResolutionCandidate@195, ResolutionCandidate@196, ... }
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
 }
 
-ResolutionTaskHolder@202 {
-    <name not found> = ArrayList@203[4] { ResolutionCandidate@204, ResolutionCandidate@205, ResolutionCandidate@206, ... }
-    <name not found> = ArrayList@207[4] { ResolutionCandidate@204, ResolutionCandidate@205, ResolutionCandidate@206, ... }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
+ResolutionTaskHolder@197 {
+    <name not found> = ArrayList@198[4] { ResolutionCandidate@199, ResolutionCandidate@200, ResolutionCandidate@201, ... }
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
 }
 
-ResolutionTaskHolder@208 {
-    <name not found> = ArrayList@209[4] { ResolutionCandidate@210, ResolutionCandidate@211, ResolutionCandidate@212, ... }
-    <name not found> = ArrayList@213[4] { ResolutionCandidate@210, ResolutionCandidate@211, ResolutionCandidate@212, ... }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-}
-
-ResolutionTaskHolder@214 {
-    <name not found> = ArrayList@215[4] { ResolutionCandidate@216, ResolutionCandidate@217, ResolutionCandidate@218, ... }
-    <name not found> = ArrayList@219[4] { ResolutionCandidate@216, ResolutionCandidate@217, ResolutionCandidate@218, ... }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-}
-
-ResolutionTaskHolder@220 {
-    <name not found> = ArrayList@221[4] { ResolutionCandidate@222, ResolutionCandidate@223, ResolutionCandidate@224, ... }
-    <name not found> = ArrayList@225[4] { ResolutionCandidate@222, ResolutionCandidate@223, ResolutionCandidate@224, ... }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-}
-
-ResolutionTaskHolder@226 {
-    <name not found> = ArrayList@227[4] { ResolutionCandidate@228, ResolutionCandidate@229, ResolutionCandidate@230, ... }
-    <name not found> = ArrayList@231[4] { ResolutionCandidate@228, ResolutionCandidate@229, ResolutionCandidate@230, ... }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-}
-
-ResolutionTaskHolder@232 {
-    <name not found> = ArrayList@233[4] { ResolutionCandidate@234, ResolutionCandidate@235, ResolutionCandidate@236, ... }
-    <name not found> = ArrayList@237[4] { ResolutionCandidate@234, ResolutionCandidate@235, ResolutionCandidate@236, ... }
+null {
+    <name not found> = ArrayList@202[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@203[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@204[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@205[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@206[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@207[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@208[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@209[1] { ResolutionCandidate@126 }
+    <name not found> = ArrayList@210[1] { ResolutionCandidate@129 }
+    <name not found> = ArrayList@211[1] { ResolutionCandidate@135 }
+    <name not found> = ArrayList@212[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@213[1] { ResolutionCandidate@141 }
+    <name not found> = ArrayList@214[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@215[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@216[1] { ResolutionCandidate@132 }
+    <name not found> = ArrayList@217[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@218[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@219[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@220[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@221[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@222[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@223[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@224[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@225[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@226[4] { ResolutionCandidate@144, ResolutionCandidate@145, ResolutionCandidate@146, ... }
+    <name not found> = ArrayList@227[4] { ResolutionCandidate@159, ResolutionCandidate@160, ResolutionCandidate@161, ... }
+    <name not found> = ArrayList@228[4] { ResolutionCandidate@149, ResolutionCandidate@150, ResolutionCandidate@151, ... }
+    <name not found> = ArrayList@229[4] { ResolutionCandidate@154, ResolutionCandidate@155, ResolutionCandidate@156, ... }
+    <name not found> = ArrayList@230[4] { ResolutionCandidate@194, ResolutionCandidate@195, ResolutionCandidate@196, ... }
+    <name not found> = ArrayList@231[4] { ResolutionCandidate@174, ResolutionCandidate@175, ResolutionCandidate@176, ... }
+    <name not found> = ArrayList@232[4] { ResolutionCandidate@169, ResolutionCandidate@170, ResolutionCandidate@171, ... }
+    <name not found> = ArrayList@233[4] { ResolutionCandidate@199, ResolutionCandidate@200, ResolutionCandidate@201, ... }
+    <name not found> = ArrayList@234[4] { ResolutionCandidate@189, ResolutionCandidate@190, ResolutionCandidate@191, ... }
+    <name not found> = ArrayList@235[4] { ResolutionCandidate@184, ResolutionCandidate@185, ResolutionCandidate@186, ... }
+    <name not found> = ArrayList@236[4] { ResolutionCandidate@179, ResolutionCandidate@180, ResolutionCandidate@181, ... }
+    <name not found> = ArrayList@237[4] { ResolutionCandidate@164, ResolutionCandidate@165, ResolutionCandidate@166, ... }
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
diff --git a/compiler/testData/diagnostics/tests/inline/binaryExpressions/mathOperations.lazy.log b/compiler/testData/diagnostics/tests/inline/binaryExpressions/mathOperations.lazy.log
index cb23b7262be..ecdb93ba3ac 100644
--- a/compiler/testData/diagnostics/tests/inline/binaryExpressions/mathOperations.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/binaryExpressions/mathOperations.lazy.log
@@ -91,158 +91,161 @@ LazyJavaPackageFragment@31['lang'] {
 
 ResolutionTaskHolder@62 {
     <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
+}
+
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
 }
 
 ResolutionTaskHolder@74 {
     <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
 }
 
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
+}
+
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
 }
 
 ResolutionTaskHolder@86 {
     <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
+}
+
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
 }
 
 ResolutionTaskHolder@98 {
     <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
 }
 
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
 }
 
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
+}
+
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
 }
 
 ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@111[2] { ResolutionCandidate@112, ResolutionCandidate@113 }
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
 }
 
 ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@115[2] { ResolutionCandidate@116, ResolutionCandidate@117 }
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
 }
 
 ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[2] { ResolutionCandidate@128, ResolutionCandidate@129 }
-    <name not found> = ArrayList@130[2] { ResolutionCandidate@128, ResolutionCandidate@129 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
+    <name not found> = ArrayList@119[3] { ResolutionCandidate@120, ResolutionCandidate@121, ResolutionCandidate@122 }
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
 }
 
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[2] { ResolutionCandidate@133, ResolutionCandidate@134 }
-    <name not found> = ArrayList@135[2] { ResolutionCandidate@133, ResolutionCandidate@134 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
+ResolutionTaskHolder@123 {
+    <name not found> = ArrayList@124[3] { ResolutionCandidate@125, ResolutionCandidate@126, ResolutionCandidate@127 }
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
 }
 
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[3] { ResolutionCandidate@138, ResolutionCandidate@139, ResolutionCandidate@140 }
-    <name not found> = ArrayList@141[3] { ResolutionCandidate@138, ResolutionCandidate@139, ResolutionCandidate@140 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
+ResolutionTaskHolder@128 {
+    <name not found> = ArrayList@129[3] { ResolutionCandidate@130, ResolutionCandidate@131, ResolutionCandidate@132 }
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
 }
 
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[3] { ResolutionCandidate@144, ResolutionCandidate@145, ResolutionCandidate@146 }
-    <name not found> = ArrayList@147[3] { ResolutionCandidate@144, ResolutionCandidate@145, ResolutionCandidate@146 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
+ResolutionTaskHolder@133 {
+    <name not found> = ArrayList@134[3] { ResolutionCandidate@135, ResolutionCandidate@136, ResolutionCandidate@137 }
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
 }
 
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[3] { ResolutionCandidate@150, ResolutionCandidate@151, ResolutionCandidate@152 }
-    <name not found> = ArrayList@153[3] { ResolutionCandidate@150, ResolutionCandidate@151, ResolutionCandidate@152 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
+ResolutionTaskHolder@138 {
+    <name not found> = ArrayList@139[3] { ResolutionCandidate@140, ResolutionCandidate@141, ResolutionCandidate@142 }
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
 }
 
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[3] { ResolutionCandidate@156, ResolutionCandidate@157, ResolutionCandidate@158 }
-    <name not found> = ArrayList@159[3] { ResolutionCandidate@156, ResolutionCandidate@157, ResolutionCandidate@158 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
+ResolutionTaskHolder@143 {
+    <name not found> = ArrayList@144[3] { ResolutionCandidate@145, ResolutionCandidate@146, ResolutionCandidate@147 }
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
 }
 
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[3] { ResolutionCandidate@162, ResolutionCandidate@163, ResolutionCandidate@164 }
-    <name not found> = ArrayList@165[3] { ResolutionCandidate@162, ResolutionCandidate@163, ResolutionCandidate@164 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@166 {
-    <name not found> = ArrayList@167[3] { ResolutionCandidate@168, ResolutionCandidate@169, ResolutionCandidate@170 }
-    <name not found> = ArrayList@171[3] { ResolutionCandidate@168, ResolutionCandidate@169, ResolutionCandidate@170 }
+null {
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@164[2] { ResolutionCandidate@116, ResolutionCandidate@117 }
+    <name not found> = ArrayList@165[2] { ResolutionCandidate@112, ResolutionCandidate@113 }
+    <name not found> = ArrayList@166[3] { ResolutionCandidate@135, ResolutionCandidate@136, ResolutionCandidate@137 }
+    <name not found> = ArrayList@167[3] { ResolutionCandidate@140, ResolutionCandidate@141, ResolutionCandidate@142 }
+    <name not found> = ArrayList@168[3] { ResolutionCandidate@145, ResolutionCandidate@146, ResolutionCandidate@147 }
+    <name not found> = ArrayList@169[3] { ResolutionCandidate@130, ResolutionCandidate@131, ResolutionCandidate@132 }
+    <name not found> = ArrayList@170[3] { ResolutionCandidate@125, ResolutionCandidate@126, ResolutionCandidate@127 }
+    <name not found> = ArrayList@171[3] { ResolutionCandidate@120, ResolutionCandidate@121, ResolutionCandidate@122 }
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
diff --git a/compiler/testData/diagnostics/tests/inline/binaryExpressions/rangeTo.lazy.log b/compiler/testData/diagnostics/tests/inline/binaryExpressions/rangeTo.lazy.log
index 8485999a98f..2901844f8be 100644
--- a/compiler/testData/diagnostics/tests/inline/binaryExpressions/rangeTo.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/binaryExpressions/rangeTo.lazy.log
@@ -94,256 +94,259 @@ LazyJavaPackageFragment@30['lang'] {
 
 ResolutionTaskHolder@74 {
     <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
 }
 
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
+}
+
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
 }
 
 ResolutionTaskHolder@86 {
     <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
+}
+
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
 }
 
 ResolutionTaskHolder@98 {
     <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
 }
 
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
 }
 
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
+}
+
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
 }
 
 ResolutionTaskHolder@110 {
     <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
 }
 
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
+ResolutionTaskHolder@113 {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
 }
 
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
+}
+
+ResolutionTaskHolder@119 {
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
 }
 
 ResolutionTaskHolder@122 {
     <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
 }
 
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
+ResolutionTaskHolder@125 {
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
 }
 
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@132 }
+ResolutionTaskHolder@128 {
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
+}
+
+ResolutionTaskHolder@131 {
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
 }
 
 ResolutionTaskHolder@134 {
     <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@136 }
 }
 
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@140 }
+ResolutionTaskHolder@137 {
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
 }
 
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@144 }
+ResolutionTaskHolder@140 {
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
+}
+
+ResolutionTaskHolder@143 {
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
 }
 
 ResolutionTaskHolder@146 {
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@148 }
+    <name not found> = ArrayList@147[4] { ResolutionCandidate@148, ResolutionCandidate@149, ResolutionCandidate@150, ... }
+    <name not found> = EmptyList@66[empty]
+    <name not found> = EmptyList@66[empty]
+    <name not found> = EmptyList@66[empty]
 }
 
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@152 }
+ResolutionTaskHolder@151 {
+    <name not found> = ArrayList@152[4] { ResolutionCandidate@153, ResolutionCandidate@154, ResolutionCandidate@155, ... }
+    <name not found> = EmptyList@66[empty]
+    <name not found> = EmptyList@66[empty]
+    <name not found> = EmptyList@66[empty]
 }
 
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@156 }
+ResolutionTaskHolder@156 {
+    <name not found> = ArrayList@157[4] { ResolutionCandidate@158, ResolutionCandidate@159, ResolutionCandidate@160, ... }
+    <name not found> = EmptyList@66[empty]
+    <name not found> = EmptyList@66[empty]
+    <name not found> = EmptyList@66[empty]
 }
 
-ResolutionTaskHolder@158 {
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@160 }
-}
-
-ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@164 }
+ResolutionTaskHolder@161 {
+    <name not found> = ArrayList@162[4] { ResolutionCandidate@163, ResolutionCandidate@164, ResolutionCandidate@165, ... }
+    <name not found> = EmptyList@66[empty]
+    <name not found> = EmptyList@66[empty]
+    <name not found> = EmptyList@66[empty]
 }
 
 ResolutionTaskHolder@166 {
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@168 }
+    <name not found> = ArrayList@167[4] { ResolutionCandidate@168, ResolutionCandidate@169, ResolutionCandidate@170, ... }
+    <name not found> = EmptyList@66[empty]
+    <name not found> = EmptyList@66[empty]
 }
 
-ResolutionTaskHolder@170 {
-    <name not found> = ArrayList@171[4] { ResolutionCandidate@172, ResolutionCandidate@173, ResolutionCandidate@174, ... }
-    <name not found> = ArrayList@175[4] { ResolutionCandidate@172, ResolutionCandidate@173, ResolutionCandidate@174, ... }
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
+ResolutionTaskHolder@171 {
+    <name not found> = ArrayList@172[4] { ResolutionCandidate@173, ResolutionCandidate@174, ResolutionCandidate@175, ... }
     <name not found> = EmptyList@66[empty]
     <name not found> = EmptyList@66[empty]
 }
 
 ResolutionTaskHolder@176 {
     <name not found> = ArrayList@177[4] { ResolutionCandidate@178, ResolutionCandidate@179, ResolutionCandidate@180, ... }
-    <name not found> = ArrayList@181[4] { ResolutionCandidate@178, ResolutionCandidate@179, ResolutionCandidate@180, ... }
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
     <name not found> = EmptyList@66[empty]
     <name not found> = EmptyList@66[empty]
 }
 
-ResolutionTaskHolder@182 {
-    <name not found> = ArrayList@183[4] { ResolutionCandidate@184, ResolutionCandidate@185, ResolutionCandidate@186, ... }
-    <name not found> = ArrayList@187[4] { ResolutionCandidate@184, ResolutionCandidate@185, ResolutionCandidate@186, ... }
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
+ResolutionTaskHolder@181 {
+    <name not found> = ArrayList@182[4] { ResolutionCandidate@183, ResolutionCandidate@184, ResolutionCandidate@185, ... }
     <name not found> = EmptyList@66[empty]
     <name not found> = EmptyList@66[empty]
 }
 
-ResolutionTaskHolder@188 {
-    <name not found> = ArrayList@189[4] { ResolutionCandidate@190, ResolutionCandidate@191, ResolutionCandidate@192, ... }
-    <name not found> = ArrayList@193[4] { ResolutionCandidate@190, ResolutionCandidate@191, ResolutionCandidate@192, ... }
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
+ResolutionTaskHolder@186 {
+    <name not found> = ArrayList@187[4] { ResolutionCandidate@188, ResolutionCandidate@189, ResolutionCandidate@190, ... }
     <name not found> = EmptyList@66[empty]
     <name not found> = EmptyList@66[empty]
 }
 
-ResolutionTaskHolder@194 {
-    <name not found> = ArrayList@195[4] { ResolutionCandidate@196, ResolutionCandidate@197, ResolutionCandidate@198, ... }
-    <name not found> = ArrayList@199[4] { ResolutionCandidate@196, ResolutionCandidate@197, ResolutionCandidate@198, ... }
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
+ResolutionTaskHolder@191 {
+    <name not found> = ArrayList@192[4] { ResolutionCandidate@193, ResolutionCandidate@194, ResolutionCandidate@195, ... }
     <name not found> = EmptyList@66[empty]
     <name not found> = EmptyList@66[empty]
 }
 
-ResolutionTaskHolder@200 {
-    <name not found> = ArrayList@201[4] { ResolutionCandidate@202, ResolutionCandidate@203, ResolutionCandidate@204, ... }
-    <name not found> = ArrayList@205[4] { ResolutionCandidate@202, ResolutionCandidate@203, ResolutionCandidate@204, ... }
+ResolutionTaskHolder@196 {
+    <name not found> = ArrayList@197[4] { ResolutionCandidate@198, ResolutionCandidate@199, ResolutionCandidate@200, ... }
     <name not found> = EmptyList@66[empty]
     <name not found> = EmptyList@66[empty]
+}
+
+ResolutionTaskHolder@201 {
+    <name not found> = ArrayList@202[4] { ResolutionCandidate@203, ResolutionCandidate@204, ResolutionCandidate@205, ... }
     <name not found> = EmptyList@66[empty]
     <name not found> = EmptyList@66[empty]
 }
 
 ResolutionTaskHolder@206 {
-    <name not found> = ArrayList@207[4] { ResolutionCandidate@208, ResolutionCandidate@209, ResolutionCandidate@210, ... }
-    <name not found> = ArrayList@211[4] { ResolutionCandidate@208, ResolutionCandidate@209, ResolutionCandidate@210, ... }
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
+    <name not found> = ArrayList@207[7] { ResolutionCandidate@208, ResolutionCandidate@209, ResolutionCandidate@210, ... }
 }
 
-ResolutionTaskHolder@212 {
-    <name not found> = ArrayList@213[4] { ResolutionCandidate@214, ResolutionCandidate@215, ResolutionCandidate@216, ... }
-    <name not found> = ArrayList@217[4] { ResolutionCandidate@214, ResolutionCandidate@215, ResolutionCandidate@216, ... }
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
+ResolutionTaskHolder@211 {
+    <name not found> = ArrayList@212[7] { ResolutionCandidate@213, ResolutionCandidate@214, ResolutionCandidate@215, ... }
 }
 
-ResolutionTaskHolder@218 {
-    <name not found> = ArrayList@219[4] { ResolutionCandidate@220, ResolutionCandidate@221, ResolutionCandidate@222, ... }
-    <name not found> = ArrayList@223[4] { ResolutionCandidate@220, ResolutionCandidate@221, ResolutionCandidate@222, ... }
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
+ResolutionTaskHolder@216 {
+    <name not found> = ArrayList@217[7] { ResolutionCandidate@218, ResolutionCandidate@219, ResolutionCandidate@220, ... }
 }
 
-ResolutionTaskHolder@224 {
-    <name not found> = ArrayList@225[4] { ResolutionCandidate@226, ResolutionCandidate@227, ResolutionCandidate@228, ... }
-    <name not found> = ArrayList@229[4] { ResolutionCandidate@226, ResolutionCandidate@227, ResolutionCandidate@228, ... }
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
+ResolutionTaskHolder@221 {
+    <name not found> = ArrayList@222[7] { ResolutionCandidate@223, ResolutionCandidate@224, ResolutionCandidate@225, ... }
 }
 
-ResolutionTaskHolder@230 {
-    <name not found> = ArrayList@231[4] { ResolutionCandidate@232, ResolutionCandidate@233, ResolutionCandidate@234, ... }
-    <name not found> = ArrayList@235[4] { ResolutionCandidate@232, ResolutionCandidate@233, ResolutionCandidate@234, ... }
+null {
+    <name not found> = ArrayList@226[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@127 }
+    <name not found> = ArrayList@228[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@133 }
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@231[1] { ResolutionCandidate@145 }
+    <name not found> = ArrayList@232[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@233[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@234[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@235[1] { ResolutionCandidate@124 }
+    <name not found> = ArrayList@236[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@237[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@238[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@239[1] { ResolutionCandidate@142 }
+    <name not found> = ArrayList@240[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@241[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@242[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@243[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@244[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@245[1] { ResolutionCandidate@139 }
+    <name not found> = ArrayList@246[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@247[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@248[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@249[1] { ResolutionCandidate@136 }
+    <name not found> = ArrayList@250[4] { ResolutionCandidate@158, ResolutionCandidate@159, ResolutionCandidate@160, ... }
+    <name not found> = ArrayList@251[4] { ResolutionCandidate@163, ResolutionCandidate@164, ResolutionCandidate@165, ... }
+    <name not found> = ArrayList@252[4] { ResolutionCandidate@148, ResolutionCandidate@149, ResolutionCandidate@150, ... }
+    <name not found> = ArrayList@253[4] { ResolutionCandidate@153, ResolutionCandidate@154, ResolutionCandidate@155, ... }
+    <name not found> = ArrayList@254[4] { ResolutionCandidate@173, ResolutionCandidate@174, ResolutionCandidate@175, ... }
+    <name not found> = ArrayList@255[4] { ResolutionCandidate@188, ResolutionCandidate@189, ResolutionCandidate@190, ... }
+    <name not found> = ArrayList@256[4] { ResolutionCandidate@198, ResolutionCandidate@199, ResolutionCandidate@200, ... }
+    <name not found> = ArrayList@257[4] { ResolutionCandidate@193, ResolutionCandidate@194, ResolutionCandidate@195, ... }
+    <name not found> = ArrayList@258[4] { ResolutionCandidate@203, ResolutionCandidate@204, ResolutionCandidate@205, ... }
+    <name not found> = ArrayList@259[4] { ResolutionCandidate@178, ResolutionCandidate@179, ResolutionCandidate@180, ... }
+    <name not found> = ArrayList@260[4] { ResolutionCandidate@168, ResolutionCandidate@169, ResolutionCandidate@170, ... }
+    <name not found> = ArrayList@261[4] { ResolutionCandidate@183, ResolutionCandidate@184, ResolutionCandidate@185, ... }
+    <name not found> = ArrayList@262[7] { ResolutionCandidate@223, ResolutionCandidate@224, ResolutionCandidate@225, ... }
+    <name not found> = ArrayList@263[7] { ResolutionCandidate@218, ResolutionCandidate@219, ResolutionCandidate@220, ... }
+    <name not found> = ArrayList@264[7] { ResolutionCandidate@208, ResolutionCandidate@209, ResolutionCandidate@210, ... }
+    <name not found> = ArrayList@265[7] { ResolutionCandidate@213, ResolutionCandidate@214, ResolutionCandidate@215, ... }
+    <name not found> = EmptyList@66[empty]
+    <name not found> = EmptyList@66[empty]
+    <name not found> = EmptyList@66[empty]
+    <name not found> = EmptyList@66[empty]
+    <name not found> = EmptyList@66[empty]
+    <name not found> = EmptyList@66[empty]
+    <name not found> = EmptyList@66[empty]
+    <name not found> = EmptyList@66[empty]
+    <name not found> = EmptyList@66[empty]
+    <name not found> = EmptyList@66[empty]
+    <name not found> = EmptyList@66[empty]
+    <name not found> = EmptyList@66[empty]
+    <name not found> = EmptyList@66[empty]
+    <name not found> = EmptyList@66[empty]
+    <name not found> = EmptyList@66[empty]
+    <name not found> = EmptyList@66[empty]
+    <name not found> = EmptyList@66[empty]
+    <name not found> = EmptyList@66[empty]
+    <name not found> = EmptyList@66[empty]
+    <name not found> = EmptyList@66[empty]
+    <name not found> = EmptyList@66[empty]
+    <name not found> = EmptyList@66[empty]
+    <name not found> = EmptyList@66[empty]
+    <name not found> = EmptyList@66[empty]
     <name not found> = EmptyList@66[empty]
     <name not found> = EmptyList@66[empty]
     <name not found> = EmptyList@66[empty]
     <name not found> = EmptyList@66[empty]
 }
-
-ResolutionTaskHolder@236 {
-    <name not found> = ArrayList@237[4] { ResolutionCandidate@238, ResolutionCandidate@239, ResolutionCandidate@240, ... }
-    <name not found> = ArrayList@241[4] { ResolutionCandidate@238, ResolutionCandidate@239, ResolutionCandidate@240, ... }
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-}
-
-ResolutionTaskHolder@242 {
-    <name not found> = ArrayList@243[7] { ResolutionCandidate@244, ResolutionCandidate@245, ResolutionCandidate@246, ... }
-    <name not found> = ArrayList@247[7] { ResolutionCandidate@244, ResolutionCandidate@245, ResolutionCandidate@246, ... }
-}
-
-ResolutionTaskHolder@248 {
-    <name not found> = ArrayList@249[7] { ResolutionCandidate@250, ResolutionCandidate@251, ResolutionCandidate@252, ... }
-    <name not found> = ArrayList@253[7] { ResolutionCandidate@250, ResolutionCandidate@251, ResolutionCandidate@252, ... }
-}
-
-ResolutionTaskHolder@254 {
-    <name not found> = ArrayList@255[7] { ResolutionCandidate@256, ResolutionCandidate@257, ResolutionCandidate@258, ... }
-    <name not found> = ArrayList@259[7] { ResolutionCandidate@256, ResolutionCandidate@257, ResolutionCandidate@258, ... }
-}
-
-ResolutionTaskHolder@260 {
-    <name not found> = ArrayList@261[7] { ResolutionCandidate@262, ResolutionCandidate@263, ResolutionCandidate@264, ... }
-    <name not found> = ArrayList@265[7] { ResolutionCandidate@262, ResolutionCandidate@263, ResolutionCandidate@264, ... }
-}
diff --git a/compiler/testData/diagnostics/tests/inline/capture.lazy.log b/compiler/testData/diagnostics/tests/inline/capture.lazy.log
index 2f0cd80e71c..84eab68cfb9 100644
--- a/compiler/testData/diagnostics/tests/inline/capture.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/capture.lazy.log
@@ -103,12 +103,6 @@ LazyJavaPackageFragment@32['lang'] {
 
 ResolutionTaskHolder@66 {
     <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
     <name not found> = EmptyList@58[empty]
     <name not found> = EmptyList@58[empty]
     <name not found> = EmptyList@58[empty]
@@ -116,14 +110,8 @@ ResolutionTaskHolder@66 {
     <name not found> = EmptyList@58[empty]
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
     <name not found> = EmptyList@58[empty]
     <name not found> = EmptyList@58[empty]
     <name not found> = EmptyList@58[empty]
@@ -131,12 +119,15 @@ ResolutionTaskHolder@70 {
     <name not found> = EmptyList@58[empty]
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
     <name not found> = EmptyList@58[empty]
     <name not found> = EmptyList@58[empty]
     <name not found> = EmptyList@58[empty]
+}
+
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
     <name not found> = EmptyList@58[empty]
     <name not found> = EmptyList@58[empty]
     <name not found> = EmptyList@58[empty]
@@ -144,195 +135,207 @@ ResolutionTaskHolder@74 {
 
 ResolutionTaskHolder@78 {
     <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
     <name not found> = EmptyList@58[empty]
     <name not found> = EmptyList@58[empty]
     <name not found> = EmptyList@58[empty]
 }
 
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
     <name not found> = EmptyList@58[empty]
     <name not found> = EmptyList@58[empty]
     <name not found> = EmptyList@58[empty]
 }
 
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
     <name not found> = EmptyList@58[empty]
     <name not found> = EmptyList@58[empty]
+}
+
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
     <name not found> = EmptyList@58[empty]
     <name not found> = EmptyList@58[empty]
 }
 
 ResolutionTaskHolder@90 {
     <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
     <name not found> = EmptyList@58[empty]
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
     <name not found> = EmptyList@58[empty]
 }
 
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
+}
+
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
 }
 
 ResolutionTaskHolder@102 {
     <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
 }
 
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
 }
 
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
+}
+
+ResolutionTaskHolder@111 {
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
 }
 
 ResolutionTaskHolder@114 {
     <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
 }
 
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
 }
 
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
+ResolutionTaskHolder@120 {
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
+}
+
+ResolutionTaskHolder@123 {
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
 }
 
 ResolutionTaskHolder@126 {
     <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
 }
 
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@132 }
+ResolutionTaskHolder@129 {
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
 }
 
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@136 }
+ResolutionTaskHolder@132 {
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
+}
+
+ResolutionTaskHolder@135 {
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
 }
 
 ResolutionTaskHolder@138 {
     <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@140 }
 }
 
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@144 }
+ResolutionTaskHolder@141 {
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
 }
 
-ResolutionTaskHolder@146 {
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@148 }
+ResolutionTaskHolder@144 {
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
+}
+
+ResolutionTaskHolder@147 {
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
 }
 
 ResolutionTaskHolder@150 {
     <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@152 }
 }
 
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@156 }
+ResolutionTaskHolder@153 {
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
 }
 
-ResolutionTaskHolder@158 {
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@160 }
+ResolutionTaskHolder@156 {
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
+}
+
+ResolutionTaskHolder@159 {
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
 }
 
 ResolutionTaskHolder@162 {
     <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@164 }
 }
 
-ResolutionTaskHolder@166 {
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@168 }
+ResolutionTaskHolder@165 {
+    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
 }
 
-ResolutionTaskHolder@170 {
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@172 }
+ResolutionTaskHolder@168 {
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
 }
 
-ResolutionTaskHolder@174 {
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@176 }
+ResolutionTaskHolder@171 {
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
 }
 
-ResolutionTaskHolder@178 {
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@180 }
-}
-
-ResolutionTaskHolder@182 {
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@184 }
-}
-
-ResolutionTaskHolder@186 {
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@188 }
-}
-
-ResolutionTaskHolder@190 {
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@192 }
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@192 }
-}
-
-ResolutionTaskHolder@194 {
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@196 }
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@196 }
-}
-
-ResolutionTaskHolder@198 {
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@200 }
-}
-
-ResolutionTaskHolder@202 {
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@204 }
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@204 }
-}
-
-ResolutionTaskHolder@206 {
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@208 }
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@208 }
+null {
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@125 }
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@167 }
+    <name not found> = ArrayList@176[1] { ResolutionCandidate@140 }
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@143 }
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@146 }
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@189[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@173 }
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@122 }
+    <name not found> = ArrayList@192[1] { ResolutionCandidate@137 }
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@194[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@196[1] { ResolutionCandidate@170 }
+    <name not found> = ArrayList@197[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@198[1] { ResolutionCandidate@113 }
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@128 }
+    <name not found> = ArrayList@200[1] { ResolutionCandidate@131 }
+    <name not found> = ArrayList@201[1] { ResolutionCandidate@149 }
+    <name not found> = ArrayList@202[1] { ResolutionCandidate@161 }
+    <name not found> = ArrayList@203[1] { ResolutionCandidate@152 }
+    <name not found> = ArrayList@204[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@205[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@206[1] { ResolutionCandidate@155 }
+    <name not found> = ArrayList@207[1] { ResolutionCandidate@134 }
+    <name not found> = ArrayList@208[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@209[1] { ResolutionCandidate@164 }
+    <name not found> = EmptyList@58[empty]
+    <name not found> = EmptyList@58[empty]
+    <name not found> = EmptyList@58[empty]
+    <name not found> = EmptyList@58[empty]
+    <name not found> = EmptyList@58[empty]
+    <name not found> = EmptyList@58[empty]
+    <name not found> = EmptyList@58[empty]
+    <name not found> = EmptyList@58[empty]
+    <name not found> = EmptyList@58[empty]
+    <name not found> = EmptyList@58[empty]
+    <name not found> = EmptyList@58[empty]
+    <name not found> = EmptyList@58[empty]
+    <name not found> = EmptyList@58[empty]
+    <name not found> = EmptyList@58[empty]
+    <name not found> = EmptyList@58[empty]
+    <name not found> = EmptyList@58[empty]
+    <name not found> = EmptyList@58[empty]
+    <name not found> = EmptyList@58[empty]
+    <name not found> = EmptyList@58[empty]
+    <name not found> = EmptyList@58[empty]
+    <name not found> = EmptyList@58[empty]
+    <name not found> = EmptyList@58[empty]
+    <name not found> = EmptyList@58[empty]
+    <name not found> = EmptyList@58[empty]
+    <name not found> = EmptyList@58[empty]
+    <name not found> = EmptyList@58[empty]
+    <name not found> = EmptyList@58[empty]
+    <name not found> = EmptyList@58[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inline/constructor.lazy.log b/compiler/testData/diagnostics/tests/inline/constructor.lazy.log
index b861ce225a4..dbffe6620eb 100644
--- a/compiler/testData/diagnostics/tests/inline/constructor.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/constructor.lazy.log
@@ -45,19 +45,22 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@34 {
     <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+}
+
+null {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@36 }
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inline/default.lazy.log b/compiler/testData/diagnostics/tests/inline/default.lazy.log
index 74b15eec3cf..b2f15f01d7b 100644
--- a/compiler/testData/diagnostics/tests/inline/default.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/default.lazy.log
@@ -56,20 +56,23 @@ LazyJavaPackageFragment@21['java'] {
 
 ResolutionTaskHolder@43 {
     <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+}
+
+null {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@48 }
 }
diff --git a/compiler/testData/diagnostics/tests/inline/extensionOnFunction.lazy.log b/compiler/testData/diagnostics/tests/inline/extensionOnFunction.lazy.log
index 1ea845d7f96..d78cc363f54 100644
--- a/compiler/testData/diagnostics/tests/inline/extensionOnFunction.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/extensionOnFunction.lazy.log
@@ -93,12 +93,6 @@ LazyJavaPackageFragment@29['lang'] {
 
 ResolutionTaskHolder@62 {
     <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
@@ -106,14 +100,8 @@ ResolutionTaskHolder@62 {
     <name not found> = EmptyList@54[empty]
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
@@ -121,12 +109,15 @@ ResolutionTaskHolder@66 {
     <name not found> = EmptyList@54[empty]
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
+}
+
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
@@ -134,105 +125,117 @@ ResolutionTaskHolder@70 {
 
 ResolutionTaskHolder@74 {
     <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
 }
 
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
+}
+
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
 }
 
 ResolutionTaskHolder@86 {
     <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
+}
+
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
 }
 
 ResolutionTaskHolder@98 {
     <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
 }
 
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
 }
 
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
+}
+
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
 }
 
 ResolutionTaskHolder@110 {
     <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
 }
 
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
+ResolutionTaskHolder@113 {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
 }
 
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@132 }
+null {
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@82 }
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inline/fromInlineToNoInline.lazy.log b/compiler/testData/diagnostics/tests/inline/fromInlineToNoInline.lazy.log
index da550f497b7..e9d936cc489 100644
--- a/compiler/testData/diagnostics/tests/inline/fromInlineToNoInline.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/fromInlineToNoInline.lazy.log
@@ -62,41 +62,44 @@ LazyJavaPackageFragment@18['lang'] {
 
 ResolutionTaskHolder@43 {
     <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@35[empty]
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
     <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
 }
 
 ResolutionTaskHolder@55 {
     <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
 }
 
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
+null {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@63 }
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inline/functions.lazy.log b/compiler/testData/diagnostics/tests/inline/functions.lazy.log
index 9c3bcbcc33c..c20c126de5a 100644
--- a/compiler/testData/diagnostics/tests/inline/functions.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/functions.lazy.log
@@ -62,91 +62,94 @@ LazyJavaPackageFragment@17['lang'] {
 
 ResolutionTaskHolder@45 {
     <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
 ResolutionTaskHolder@57 {
     <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
+}
+
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
 }
 
 ResolutionTaskHolder@69 {
     <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
+}
+
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
 }
 
 ResolutionTaskHolder@81 {
     <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
 }
 
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
+null {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@65 }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inline/invoke.lazy.log b/compiler/testData/diagnostics/tests/inline/invoke.lazy.log
index 0dfa46e41ef..285bc300f7b 100644
--- a/compiler/testData/diagnostics/tests/inline/invoke.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/invoke.lazy.log
@@ -81,8 +81,6 @@ LazyJavaPackageFragment@23['lang'] {
 
 ResolutionTaskHolder@56 {
     <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
@@ -92,10 +90,8 @@ ResolutionTaskHolder@56 {
     <name not found> = EmptyList@48[empty]
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@48[empty]
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
@@ -105,9 +101,8 @@ ResolutionTaskHolder@60 {
     <name not found> = EmptyList@48[empty]
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
@@ -115,39 +110,42 @@ ResolutionTaskHolder@64 {
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
+}
+
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
 }
 
 ResolutionTaskHolder@68 {
     <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
 }
 
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
+}
+
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+}
+
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
@@ -155,150 +153,155 @@ ResolutionTaskHolder@76 {
 
 ResolutionTaskHolder@80 {
     <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
 }
 
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
     <name not found> = EmptyList@48[empty]
 }
 
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
     <name not found> = EmptyList@48[empty]
 }
 
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
+}
+
 ResolutionTaskHolder@92 {
     <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
 }
 
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
 }
 
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
+}
+
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
 }
 
 ResolutionTaskHolder@104 {
     <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
 }
 
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
 }
 
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
+}
+
+ResolutionTaskHolder@113 {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
 }
 
 ResolutionTaskHolder@116 {
     <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
 }
 
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
+ResolutionTaskHolder@119 {
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
 }
 
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@126 }
+ResolutionTaskHolder@122 {
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
+}
+
+ResolutionTaskHolder@125 {
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
 }
 
 ResolutionTaskHolder@128 {
     <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
 }
 
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
+ResolutionTaskHolder@131 {
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
 }
 
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
+ResolutionTaskHolder@134 {
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
+}
+
+ResolutionTaskHolder@137 {
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
 }
 
 ResolutionTaskHolder@140 {
     <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
 }
 
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
+ResolutionTaskHolder@143 {
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
 }
 
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
+ResolutionTaskHolder@146 {
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
 }
 
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
+ResolutionTaskHolder@149 {
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
 }
 
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
-}
-
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@162 }
-}
-
-ResolutionTaskHolder@164 {
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@166 }
-}
-
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@170 }
-}
-
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@174 }
-}
-
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@178 }
-}
-
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@182 }
+null {
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@136 }
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@133 }
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@142 }
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@127 }
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@166[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@168[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@170[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@124 }
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@148 }
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@176[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@139 }
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@151 }
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@145 }
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inline/labeled.lazy.log b/compiler/testData/diagnostics/tests/inline/labeled.lazy.log
index 41e88d409d3..61e7ef5aee1 100644
--- a/compiler/testData/diagnostics/tests/inline/labeled.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/labeled.lazy.log
@@ -58,105 +58,108 @@ LazyJavaPackageFragment@16['lang'] {
 
 ResolutionTaskHolder@41 {
     <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
     <name not found> = EmptyList@33[empty]
+}
+
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
     <name not found> = EmptyList@33[empty]
 }
 
 ResolutionTaskHolder@53 {
     <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
+}
+
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
 }
 
 ResolutionTaskHolder@65 {
     <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
+}
+
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
 }
 
 ResolutionTaskHolder@77 {
     <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
 }
 
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
 }
 
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
+}
+
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
 }
 
 ResolutionTaskHolder@89 {
     <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
 }
 
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
 }
 
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
+null {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@73 }
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inline/localFun.lazy.log b/compiler/testData/diagnostics/tests/inline/localFun.lazy.log
index 3fc52e92aad..0402970bbf9 100644
--- a/compiler/testData/diagnostics/tests/inline/localFun.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/localFun.lazy.log
@@ -37,5 +37,8 @@ LazyJavaPackageFragment@11['java'] {
 
 ResolutionTaskHolder@33 {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
+}
+
+null {
     <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
 }
diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/anonymousObjects.lazy.log b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/anonymousObjects.lazy.log
index a92ad92ec2c..0404c055fa1 100644
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/anonymousObjects.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/anonymousObjects.lazy.log
@@ -79,70 +79,73 @@ LazyJavaPackageFragment@29['lang'] {
 
 ResolutionTaskHolder@56 {
     <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@48[empty]
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
     <name not found> = EmptyList@48[empty]
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
     <name not found> = EmptyList@48[empty]
+}
+
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
     <name not found> = EmptyList@48[empty]
 }
 
 ResolutionTaskHolder@68 {
     <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
 }
 
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
+}
+
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
 }
 
 ResolutionTaskHolder@80 {
     <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
 }
 
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
 }
 
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
 }
 
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
+null {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@85 }
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/anonymousObjectsNested.lazy.log b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/anonymousObjectsNested.lazy.log
index 23e20c3233d..54b169ea148 100644
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/anonymousObjectsNested.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/anonymousObjectsNested.lazy.log
@@ -89,15 +89,6 @@ LazyJavaPackageFragment@32['lang'] {
 
 ResolutionTaskHolder@60 {
     <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
@@ -108,17 +99,8 @@ ResolutionTaskHolder@60 {
     <name not found> = EmptyList@51[empty]
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
@@ -129,9 +111,8 @@ ResolutionTaskHolder@64 {
     <name not found> = EmptyList@51[empty]
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
@@ -140,6 +121,10 @@ ResolutionTaskHolder@68 {
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
+}
+
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
@@ -152,156 +137,174 @@ ResolutionTaskHolder@68 {
 
 ResolutionTaskHolder@72 {
     <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
 }
 
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
-    <name not found> = EmptyList@51[empty]
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
     <name not found> = EmptyList@51[empty]
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
     <name not found> = EmptyList@51[empty]
+}
+
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
     <name not found> = EmptyList@51[empty]
 }
 
 ResolutionTaskHolder@84 {
     <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
-    <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
 }
 
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
-    <name not found> = EmptyList@51[empty]
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
     <name not found> = EmptyList@51[empty]
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
     <name not found> = EmptyList@51[empty]
+}
+
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
     <name not found> = EmptyList@51[empty]
 }
 
 ResolutionTaskHolder@96 {
     <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
-    <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
 }
 
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
-    <name not found> = EmptyList@51[empty]
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
     <name not found> = EmptyList@51[empty]
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
+}
+
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
 }
 
 ResolutionTaskHolder@108 {
     <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
 }
 
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
+ResolutionTaskHolder@111 {
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
 }
 
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
+}
+
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
 }
 
 ResolutionTaskHolder@120 {
     <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
 }
 
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@126 }
+ResolutionTaskHolder@123 {
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
 }
 
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
+ResolutionTaskHolder@126 {
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
+}
+
+ResolutionTaskHolder@129 {
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
 }
 
 ResolutionTaskHolder@132 {
     <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
 }
 
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
+ResolutionTaskHolder@135 {
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
 }
 
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
+ResolutionTaskHolder@138 {
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
 }
 
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
-}
-
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
-}
-
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
-}
-
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
-}
-
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@162 }
-}
-
-ResolutionTaskHolder@164 {
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@166 }
+null {
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@134 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@113 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@131 }
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@128 }
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@122 }
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@137 }
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@140 }
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@125 }
+    <name not found> = ArrayList@166[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@110 }
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/explicitReturnType.lazy.log b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/explicitReturnType.lazy.log
index 6b617652a6a..21799c3ab9e 100644
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/explicitReturnType.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/explicitReturnType.lazy.log
@@ -56,56 +56,59 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@39 {
     <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@31[empty]
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
     <name not found> = EmptyList@31[empty]
 }
 
 ResolutionTaskHolder@51 {
     <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+}
+
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
+}
+
+null {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@56 }
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
-}
diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/fromOnlyLocal.lazy.log b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/fromOnlyLocal.lazy.log
index cdad5d69fbd..ce000ee1b80 100644
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/fromOnlyLocal.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/fromOnlyLocal.lazy.log
@@ -67,48 +67,51 @@ LazyJavaPackageFragment@21['lang'] {
 
 ResolutionTaskHolder@49 {
     <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@40[empty]
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
     <name not found> = EmptyList@40[empty]
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@40[empty]
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@40[empty]
 }
 
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
+}
+
 ResolutionTaskHolder@61 {
     <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
+null {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@72 }
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/inlineLambda.lazy.log b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/inlineLambda.lazy.log
index bc3f05caf63..f5bd1421ce2 100644
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/inlineLambda.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/inlineLambda.lazy.log
@@ -73,81 +73,84 @@ LazyJavaPackageFragment@24['lang'] {
 
 ResolutionTaskHolder@52 {
     <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
     <name not found> = EmptyList@43[empty]
+}
+
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
     <name not found> = EmptyList@43[empty]
 }
 
 ResolutionTaskHolder@64 {
     <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@43[empty]
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
     <name not found> = EmptyList@43[empty]
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
+}
+
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
 }
 
 ResolutionTaskHolder@76 {
     <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
 }
 
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
+}
+
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
 }
 
 ResolutionTaskHolder@88 {
     <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
+null {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@75 }
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/labeledReturn.lazy.log b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/labeledReturn.lazy.log
index 60a86a3f17b..6bb39f0158f 100644
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/labeledReturn.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/labeledReturn.lazy.log
@@ -56,47 +56,50 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@39 {
     <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
     <name not found> = EmptyList@31[empty]
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
     <name not found> = EmptyList@31[empty]
 }
 
 ResolutionTaskHolder@51 {
     <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+}
+
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+}
+
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
+}
+
+null {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@53 }
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
-}
diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/lambdaWithGlobalReturnsInsideOnlyLocalOne.lazy.log b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/lambdaWithGlobalReturnsInsideOnlyLocalOne.lazy.log
index bc492f5a8eb..4401c349333 100644
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/lambdaWithGlobalReturnsInsideOnlyLocalOne.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/lambdaWithGlobalReturnsInsideOnlyLocalOne.lazy.log
@@ -79,55 +79,58 @@ LazyJavaPackageFragment@23['lang'] {
 
 ResolutionTaskHolder@58 {
     <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@49[empty]
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
     <name not found> = EmptyList@49[empty]
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
     <name not found> = EmptyList@49[empty]
+}
+
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
     <name not found> = EmptyList@49[empty]
 }
 
 ResolutionTaskHolder@70 {
     <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
+}
+
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
 }
 
 ResolutionTaskHolder@82 {
     <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
+}
+
+null {
     <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@78 }
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/localFun.lazy.log b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/localFun.lazy.log
index f0d3b82d65e..92fd942be35 100644
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/localFun.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/localFun.lazy.log
@@ -67,56 +67,59 @@ LazyJavaPackageFragment@21['lang'] {
 
 ResolutionTaskHolder@49 {
     <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@40[empty]
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
     <name not found> = EmptyList@40[empty]
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@40[empty]
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@40[empty]
 }
 
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
+}
+
 ResolutionTaskHolder@61 {
     <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
+}
+
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
 }
 
 ResolutionTaskHolder@73 {
     <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
 }
 
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
+null {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@60 }
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/nestedNonLocals.lazy.log b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/nestedNonLocals.lazy.log
index b87667d978a..1bf0184a8d1 100644
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/nestedNonLocals.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/nestedNonLocals.lazy.log
@@ -79,197 +79,200 @@ LazyJavaPackageFragment@17['lang'] {
 
 ResolutionTaskHolder@55 {
     <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
     <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
     <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
+}
+
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
     <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
 }
 
 ResolutionTaskHolder@67 {
     <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
 }
 
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
     <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
 }
 
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
     <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
+}
+
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
     <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
 }
 
 ResolutionTaskHolder@79 {
     <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
 }
 
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
     <name not found> = EmptyList@47[empty]
 }
 
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
     <name not found> = EmptyList@47[empty]
+}
+
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
     <name not found> = EmptyList@47[empty]
 }
 
 ResolutionTaskHolder@91 {
     <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
 }
 
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
 }
 
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
+}
+
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
 }
 
 ResolutionTaskHolder@103 {
     <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
 }
 
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
 }
 
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@113 }
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
+}
+
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
 }
 
 ResolutionTaskHolder@115 {
     <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@117 }
 }
 
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@121 }
+ResolutionTaskHolder@118 {
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
 }
 
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@125 }
+ResolutionTaskHolder@121 {
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
+}
+
+ResolutionTaskHolder@124 {
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
 }
 
 ResolutionTaskHolder@127 {
     <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@129 }
 }
 
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@133 }
+ResolutionTaskHolder@130 {
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
 }
 
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@137 }
+ResolutionTaskHolder@133 {
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
+}
+
+ResolutionTaskHolder@136 {
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
 }
 
 ResolutionTaskHolder@139 {
     <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@141 }
 }
 
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@145 }
+ResolutionTaskHolder@142 {
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
 }
 
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@149 }
+ResolutionTaskHolder@145 {
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
 }
 
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@153 }
-}
-
-ResolutionTaskHolder@155 {
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@157 }
-}
-
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@161 }
-}
-
-ResolutionTaskHolder@163 {
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@165 }
-}
-
-ResolutionTaskHolder@167 {
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@169 }
-}
-
-ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@173 }
-}
-
-ResolutionTaskHolder@175 {
+null {
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@141 }
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@132 }
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@126 }
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@166[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@168[1] { ResolutionCandidate@129 }
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@170[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@135 }
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@138 }
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
     <name not found> = EmptyList@47[empty]
diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/noInlineAnnotation.lazy.log b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/noInlineAnnotation.lazy.log
index 516f139a43f..1ca9c3d18e2 100644
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/noInlineAnnotation.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/noInlineAnnotation.lazy.log
@@ -65,31 +65,34 @@ LazyJavaPackageFragment@17['lang'] {
 
 ResolutionTaskHolder@49 {
     <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@41[empty]
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
+}
+
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
 }
 
 ResolutionTaskHolder@61 {
     <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+null {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@63 }
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/noInlineLambda.lazy.log b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/noInlineLambda.lazy.log
index 18f19f5a6c6..e39b7806547 100644
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/noInlineLambda.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/noInlineLambda.lazy.log
@@ -63,56 +63,59 @@ LazyJavaPackageFragment@21['lang'] {
 
 ResolutionTaskHolder@48 {
     <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@40[empty]
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
     <name not found> = EmptyList@40[empty]
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@40[empty]
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
     <name not found> = EmptyList@40[empty]
 }
 
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
+}
+
 ResolutionTaskHolder@60 {
     <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
+}
+
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
 }
 
 ResolutionTaskHolder@72 {
     <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
 }
 
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+null {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@71 }
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/nonInlinedClass.lazy.log b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/nonInlinedClass.lazy.log
index 2a940e90a2a..0320e156cd9 100644
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/nonInlinedClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/nonInlinedClass.lazy.log
@@ -71,70 +71,73 @@ LazyJavaPackageFragment@25['lang'] {
 
 ResolutionTaskHolder@52 {
     <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@44[empty]
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@44[empty]
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
     <name not found> = EmptyList@44[empty]
+}
+
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
     <name not found> = EmptyList@44[empty]
 }
 
 ResolutionTaskHolder@64 {
     <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
+}
+
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
 }
 
 ResolutionTaskHolder@76 {
     <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
 }
 
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
 }
 
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
+null {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@72 }
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/onlyLocalReturnLambda.lazy.log b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/onlyLocalReturnLambda.lazy.log
index bba4db2b0d1..27e7742a091 100644
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/onlyLocalReturnLambda.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/onlyLocalReturnLambda.lazy.log
@@ -61,131 +61,134 @@ LazyJavaPackageFragment@18['lang'] {
 
 ResolutionTaskHolder@46 {
     <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
 ResolutionTaskHolder@58 {
     <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
     <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
     <name not found> = EmptyList@37[empty]
 }
 
 ResolutionTaskHolder@70 {
     <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
     <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
     <name not found> = EmptyList@37[empty]
 }
 
 ResolutionTaskHolder@82 {
     <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
+}
+
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
 }
 
 ResolutionTaskHolder@94 {
     <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
 }
 
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
 }
 
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
 }
 
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
+null {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@93 }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/onlyLocalReturnLambdaBinaryExpr.lazy.log b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/onlyLocalReturnLambdaBinaryExpr.lazy.log
index 41e5d9494f7..6383213650d 100644
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/onlyLocalReturnLambdaBinaryExpr.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/onlyLocalReturnLambdaBinaryExpr.lazy.log
@@ -62,101 +62,104 @@ LazyJavaPackageFragment@19['lang'] {
 
 ResolutionTaskHolder@47 {
     <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
+}
+
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
 ResolutionTaskHolder@59 {
     <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@38[empty]
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@38[empty]
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
     <name not found> = EmptyList@38[empty]
 }
 
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
+}
+
 ResolutionTaskHolder@71 {
     <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
 }
 
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
+}
+
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
 }
 
 ResolutionTaskHolder@83 {
     <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
 }
 
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
 }
 
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
 }
 
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
+null {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@76 }
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/propertyAccessorsAndConstructor.lazy.log b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/propertyAccessorsAndConstructor.lazy.log
index 25decc841bc..62c2d296461 100644
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/propertyAccessorsAndConstructor.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/propertyAccessorsAndConstructor.lazy.log
@@ -64,15 +64,6 @@ LazyJavaPackageFragment@17['lang'] {
 
 ResolutionTaskHolder@43 {
     <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
@@ -83,17 +74,8 @@ ResolutionTaskHolder@43 {
     <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
@@ -104,16 +86,8 @@ ResolutionTaskHolder@47 {
     <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
@@ -122,68 +96,97 @@ ResolutionTaskHolder@51 {
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
     <name not found> = EmptyList@35[empty]
 }
 
 ResolutionTaskHolder@55 {
     <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@35[empty]
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
     <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@35[empty]
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
     <name not found> = EmptyList@35[empty]
 }
 
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
+}
+
 ResolutionTaskHolder@67 {
     <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
 }
 
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
+}
+
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
 }
 
 ResolutionTaskHolder@79 {
     <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
 }
 
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[7] { ResolutionCandidate@84, ResolutionCandidate@85, ResolutionCandidate@86, ... }
 }
 
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[7] { ResolutionCandidate@97, ResolutionCandidate@98, ResolutionCandidate@99, ... }
-    <name not found> = ArrayList@100[7] { ResolutionCandidate@97, ResolutionCandidate@98, ResolutionCandidate@99, ... }
+null {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@100[7] { ResolutionCandidate@84, ResolutionCandidate@85, ResolutionCandidate@86, ... }
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/toOnlyLocal.lazy.log b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/toOnlyLocal.lazy.log
index 24a839e0976..e270d2b0950 100644
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/toOnlyLocal.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/toOnlyLocal.lazy.log
@@ -67,48 +67,51 @@ LazyJavaPackageFragment@21['lang'] {
 
 ResolutionTaskHolder@49 {
     <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@41[empty]
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@41[empty]
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@41[empty]
 }
 
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
+}
+
 ResolutionTaskHolder@61 {
     <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
+null {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@51 }
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inline/nonPublicMember/inNonPublicClass.lazy.log b/compiler/testData/diagnostics/tests/inline/nonPublicMember/inNonPublicClass.lazy.log
index 6f47dafaf46..27bd9eddf6a 100644
--- a/compiler/testData/diagnostics/tests/inline/nonPublicMember/inNonPublicClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/nonPublicMember/inNonPublicClass.lazy.log
@@ -87,15 +87,6 @@ LazyJavaPackageFragment@28['lang'] {
 
 ResolutionTaskHolder@54 {
     <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
@@ -106,17 +97,8 @@ ResolutionTaskHolder@54 {
     <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
@@ -127,9 +109,8 @@ ResolutionTaskHolder@58 {
     <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
@@ -138,6 +119,10 @@ ResolutionTaskHolder@62 {
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
+}
+
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
@@ -150,15 +135,6 @@ ResolutionTaskHolder@62 {
 
 ResolutionTaskHolder@66 {
     <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
@@ -169,17 +145,8 @@ ResolutionTaskHolder@66 {
     <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
@@ -190,9 +157,8 @@ ResolutionTaskHolder@70 {
     <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
@@ -201,6 +167,10 @@ ResolutionTaskHolder@74 {
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
+}
+
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
@@ -213,222 +183,255 @@ ResolutionTaskHolder@74 {
 
 ResolutionTaskHolder@78 {
     <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
+}
+
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
 }
 
 ResolutionTaskHolder@90 {
     <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
+}
+
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
 }
 
 ResolutionTaskHolder@102 {
     <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
     <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
     <name not found> = EmptyList@46[empty]
+}
+
+ResolutionTaskHolder@111 {
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
     <name not found> = EmptyList@46[empty]
 }
 
 ResolutionTaskHolder@114 {
     <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
 }
 
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
+ResolutionTaskHolder@120 {
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
+}
+
+ResolutionTaskHolder@123 {
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
 }
 
 ResolutionTaskHolder@126 {
     <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@132 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
+ResolutionTaskHolder@129 {
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
 }
 
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@136 }
+ResolutionTaskHolder@132 {
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
+}
+
+ResolutionTaskHolder@135 {
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
 }
 
 ResolutionTaskHolder@138 {
     <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@140 }
 }
 
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@144 }
+ResolutionTaskHolder@141 {
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
 }
 
-ResolutionTaskHolder@146 {
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@148 }
+ResolutionTaskHolder@144 {
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
+}
+
+ResolutionTaskHolder@147 {
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
 }
 
 ResolutionTaskHolder@150 {
     <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@152 }
 }
 
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@156 }
+ResolutionTaskHolder@153 {
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
 }
 
-ResolutionTaskHolder@158 {
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@160 }
+ResolutionTaskHolder@156 {
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
 }
 
-ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@164 }
+ResolutionTaskHolder@159 {
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
 }
 
-ResolutionTaskHolder@166 {
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@168 }
-}
-
-ResolutionTaskHolder@170 {
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@172 }
-}
-
-ResolutionTaskHolder@174 {
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@176 }
-}
-
-ResolutionTaskHolder@178 {
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@180 }
-}
-
-ResolutionTaskHolder@182 {
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@184 }
-}
-
-ResolutionTaskHolder@186 {
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@188 }
-}
-
-ResolutionTaskHolder@190 {
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@192 }
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@192 }
-}
-
-ResolutionTaskHolder@194 {
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@196 }
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@196 }
+null {
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@137 }
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@155 }
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@140 }
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@146 }
+    <name not found> = ArrayList@166[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@128 }
+    <name not found> = ArrayList@168[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@170[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@131 }
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@149 }
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@176[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@161 }
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@125 }
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@143 }
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@113 }
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@189[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@192[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@134 }
+    <name not found> = ArrayList@194[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@152 }
+    <name not found> = ArrayList@196[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@197[1] { ResolutionCandidate@122 }
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inline/nonPublicMember/inNonPublicInnerClass.lazy.log b/compiler/testData/diagnostics/tests/inline/nonPublicMember/inNonPublicInnerClass.lazy.log
index 4c241fbc235..e30d815eb40 100644
--- a/compiler/testData/diagnostics/tests/inline/nonPublicMember/inNonPublicInnerClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/nonPublicMember/inNonPublicInnerClass.lazy.log
@@ -69,41 +69,54 @@ LazyJavaPackageFragment@20['lang'] {
 
 ResolutionTaskHolder@45 {
     <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
     <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
     <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
@@ -112,13 +125,64 @@ ResolutionTaskHolder@65 {
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
@@ -129,25 +193,6 @@ ResolutionTaskHolder@75 {
 
 ResolutionTaskHolder@85 {
     <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
@@ -168,27 +213,8 @@ ResolutionTaskHolder@85 {
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
@@ -209,9 +235,8 @@ ResolutionTaskHolder@89 {
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
@@ -230,6 +255,10 @@ ResolutionTaskHolder@93 {
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
@@ -252,33 +281,6 @@ ResolutionTaskHolder@93 {
 
 ResolutionTaskHolder@97 {
     <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
@@ -291,35 +293,8 @@ ResolutionTaskHolder@97 {
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
@@ -332,25 +307,8 @@ ResolutionTaskHolder@101 {
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
@@ -361,6 +319,10 @@ ResolutionTaskHolder@105 {
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
@@ -375,232 +337,273 @@ ResolutionTaskHolder@105 {
 
 ResolutionTaskHolder@109 {
     <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
 }
 
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@115 {
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
+}
+
+ResolutionTaskHolder@118 {
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
 }
 
 ResolutionTaskHolder@121 {
     <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@127 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@124 {
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
 }
 
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@131 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@127 {
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
+}
+
+ResolutionTaskHolder@130 {
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
 }
 
 ResolutionTaskHolder@133 {
     <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@135 }
 }
 
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@139 }
+ResolutionTaskHolder@136 {
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
 }
 
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@143 }
-}
-
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@147 }
-}
-
-ResolutionTaskHolder@149 {
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@151 }
-}
-
-ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@155 }
-}
-
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@159 }
-}
-
-ResolutionTaskHolder@161 {
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@163 }
-}
-
-ResolutionTaskHolder@165 {
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@167 }
-}
-
-ResolutionTaskHolder@169 {
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@171 }
+null {
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@129 }
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@132 }
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@126 }
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@166[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@168[1] { ResolutionCandidate@135 }
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@170[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@114 }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inline/nonPublicMember/inPackage.lazy.log b/compiler/testData/diagnostics/tests/inline/nonPublicMember/inPackage.lazy.log
index a13bce2703c..6168bfb3783 100644
--- a/compiler/testData/diagnostics/tests/inline/nonPublicMember/inPackage.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/nonPublicMember/inPackage.lazy.log
@@ -75,84 +75,87 @@ LazyJavaPackageFragment@25['lang'] {
 
 ResolutionTaskHolder@47 {
     <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
+}
+
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
 ResolutionTaskHolder@59 {
     <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
     <name not found> = EmptyList@39[empty]
+}
+
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
     <name not found> = EmptyList@39[empty]
 }
 
 ResolutionTaskHolder@71 {
     <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
+}
+
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
+}
+
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
+}
+
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
+}
+
+null {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@61 }
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
-}
diff --git a/compiler/testData/diagnostics/tests/inline/nonPublicMember/inPublicClass.lazy.log b/compiler/testData/diagnostics/tests/inline/nonPublicMember/inPublicClass.lazy.log
index 94ab65f6e1d..59c88305a7e 100644
--- a/compiler/testData/diagnostics/tests/inline/nonPublicMember/inPublicClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/nonPublicMember/inPublicClass.lazy.log
@@ -73,108 +73,111 @@ LazyJavaPackageFragment@26['lang'] {
 
 ResolutionTaskHolder@46 {
     <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
 ResolutionTaskHolder@58 {
     <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
     <name not found> = EmptyList@38[empty]
+}
+
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
     <name not found> = EmptyList@38[empty]
 }
 
 ResolutionTaskHolder@70 {
     <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
+}
+
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
 }
 
 ResolutionTaskHolder@82 {
     <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
 }
 
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
 }
 
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
+null {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@63 }
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inline/nonPublicMember/localClass.lazy.log b/compiler/testData/diagnostics/tests/inline/nonPublicMember/localClass.lazy.log
index 21220a5cf4c..01bc3c2f984 100644
--- a/compiler/testData/diagnostics/tests/inline/nonPublicMember/localClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/nonPublicMember/localClass.lazy.log
@@ -42,20 +42,23 @@ LazyJavaPackageFragment@15['lang'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
+}
+
+null {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@37 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inline/nonPublicMember/localClass2.lazy.log b/compiler/testData/diagnostics/tests/inline/nonPublicMember/localClass2.lazy.log
index 85d32f27016..41741a3f9c9 100644
--- a/compiler/testData/diagnostics/tests/inline/nonPublicMember/localClass2.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/nonPublicMember/localClass2.lazy.log
@@ -40,19 +40,22 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@29 {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+}
+
+null {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@34 }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inline/nonPublicMember/localFun.lazy.log b/compiler/testData/diagnostics/tests/inline/nonPublicMember/localFun.lazy.log
index abfc4587462..64068ef8f73 100644
--- a/compiler/testData/diagnostics/tests/inline/nonPublicMember/localFun.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/nonPublicMember/localFun.lazy.log
@@ -40,10 +40,13 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@29 {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
+}
+
+null {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@34 }
 }
diff --git a/compiler/testData/diagnostics/tests/inline/nonVirtualMembersWithInline.lazy.log b/compiler/testData/diagnostics/tests/inline/nonVirtualMembersWithInline.lazy.log
index eef62e07a75..28823c7fee9 100644
--- a/compiler/testData/diagnostics/tests/inline/nonVirtualMembersWithInline.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/nonVirtualMembersWithInline.lazy.log
@@ -169,120 +169,123 @@ LazyJavaPackageFragment@80['java'] {
 
 ResolutionTaskHolder@96 {
     <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
 }
 
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
+}
+
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
 }
 
 ResolutionTaskHolder@108 {
     <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
 }
 
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
+ResolutionTaskHolder@111 {
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
 }
 
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
+}
+
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
 }
 
 ResolutionTaskHolder@120 {
     <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
 }
 
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@126 }
+ResolutionTaskHolder@123 {
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
 }
 
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
+ResolutionTaskHolder@126 {
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
+}
+
+ResolutionTaskHolder@129 {
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
 }
 
 ResolutionTaskHolder@132 {
     <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
 }
 
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
+ResolutionTaskHolder@135 {
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
 }
 
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
+ResolutionTaskHolder@138 {
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
+}
+
+ResolutionTaskHolder@141 {
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
 }
 
 ResolutionTaskHolder@144 {
     <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
 }
 
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
+ResolutionTaskHolder@147 {
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
 }
 
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
+ResolutionTaskHolder@150 {
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
+}
+
+ResolutionTaskHolder@153 {
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
 }
 
 ResolutionTaskHolder@156 {
     <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
 }
 
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@162 }
+ResolutionTaskHolder@159 {
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
 }
 
-ResolutionTaskHolder@164 {
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@166 }
+ResolutionTaskHolder@162 {
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
 }
 
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@170 }
+ResolutionTaskHolder@165 {
+    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
 }
 
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@174 }
-}
-
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@178 }
-}
-
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@182 }
-}
-
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@186 }
-}
-
-ResolutionTaskHolder@188 {
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@190 }
+null {
+    <name not found> = ArrayList@168[1] { ResolutionCandidate@122 }
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@164 }
+    <name not found> = ArrayList@170[1] { ResolutionCandidate@137 }
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@149 }
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@152 }
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@128 }
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@155 }
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@176[1] { ResolutionCandidate@143 }
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@140 }
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@131 }
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@146 }
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@167 }
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@125 }
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@134 }
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@113 }
+    <name not found> = ArrayList@189[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@161 }
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@101 }
 }
diff --git a/compiler/testData/diagnostics/tests/inline/nothingToInline.lazy.log b/compiler/testData/diagnostics/tests/inline/nothingToInline.lazy.log
index 62f4a5dcda7..5107326b4d7 100644
--- a/compiler/testData/diagnostics/tests/inline/nothingToInline.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/nothingToInline.lazy.log
@@ -87,45 +87,48 @@ LazyJavaPackageFragment@35['java'] {
 
 ResolutionTaskHolder@61 {
     <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
+}
+
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
 }
 
 ResolutionTaskHolder@73 {
     <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
 }
 
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
+}
+
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
 }
 
 ResolutionTaskHolder@85 {
     <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
+null {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@72 }
 }
diff --git a/compiler/testData/diagnostics/tests/inline/nullabilityOperations.lazy.log b/compiler/testData/diagnostics/tests/inline/nullabilityOperations.lazy.log
index d0638bc895e..19ae0c3e3fe 100644
--- a/compiler/testData/diagnostics/tests/inline/nullabilityOperations.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/nullabilityOperations.lazy.log
@@ -64,16 +64,7 @@ LazyJavaPackageFragment@20['lang'] {
 
 ResolutionTaskHolder@47 {
     <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@51[2] { ResolutionCandidate@52, ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[2] { ResolutionCandidate@52, ResolutionCandidate@53 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
+    <name not found> = ArrayList@50[2] { ResolutionCandidate@51, ResolutionCandidate@52 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
@@ -83,62 +74,74 @@ ResolutionTaskHolder@47 {
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
+}
+
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
 }
 
 ResolutionTaskHolder@59 {
     <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
 }
 
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
+}
+
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
 }
 
 ResolutionTaskHolder@71 {
     <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
 }
 
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
 }
 
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
+}
+
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
 }
 
 ResolutionTaskHolder@83 {
     <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
 }
 
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
 }
 
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
+null {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@102[2] { ResolutionCandidate@51, ResolutionCandidate@52 }
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inline/nullableFunction.lazy.log b/compiler/testData/diagnostics/tests/inline/nullableFunction.lazy.log
index 4983d345cf6..2df4d0d29f1 100644
--- a/compiler/testData/diagnostics/tests/inline/nullableFunction.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/nullableFunction.lazy.log
@@ -73,55 +73,58 @@ LazyJavaPackageFragment@27['java'] {
 
 ResolutionTaskHolder@55 {
     <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
+}
+
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
 }
 
 ResolutionTaskHolder@67 {
     <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
 }
 
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
 }
 
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
+}
+
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
 }
 
 ResolutionTaskHolder@79 {
     <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
 }
 
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
 }
 
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
 }
 
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
+null {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@87 }
 }
diff --git a/compiler/testData/diagnostics/tests/inline/parenthesized.lazy.log b/compiler/testData/diagnostics/tests/inline/parenthesized.lazy.log
index 619fc9a01a6..b350bfa613d 100644
--- a/compiler/testData/diagnostics/tests/inline/parenthesized.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/parenthesized.lazy.log
@@ -70,133 +70,136 @@ LazyJavaPackageFragment@23['lang'] {
 
 ResolutionTaskHolder@50 {
     <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
     <name not found> = EmptyList@42[empty]
     <name not found> = EmptyList@42[empty]
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
     <name not found> = EmptyList@42[empty]
     <name not found> = EmptyList@42[empty]
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+}
+
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
 }
 
 ResolutionTaskHolder@62 {
     <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
+}
+
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
 }
 
 ResolutionTaskHolder@74 {
     <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
 }
 
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
+}
+
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
 }
 
 ResolutionTaskHolder@86 {
     <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
+}
+
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
 }
 
 ResolutionTaskHolder@98 {
     <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
 }
 
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
 }
 
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
+}
+
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
 }
 
 ResolutionTaskHolder@110 {
     <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
 }
 
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
+ResolutionTaskHolder@113 {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
 }
 
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
+}
+
+ResolutionTaskHolder@119 {
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
 }
 
 ResolutionTaskHolder@122 {
     <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
 }
 
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@132 }
-}
-
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@136 }
-}
-
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@140 }
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@144 }
-}
-
-ResolutionTaskHolder@146 {
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@148 }
+null {
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@124 }
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@52 }
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inline/propagation.lazy.log b/compiler/testData/diagnostics/tests/inline/propagation.lazy.log
index f8ccda13820..3ac87393029 100644
--- a/compiler/testData/diagnostics/tests/inline/propagation.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/propagation.lazy.log
@@ -128,68 +128,90 @@ LazyJavaPackageFragment@44['lang'] {
 
 ResolutionTaskHolder@79 {
     <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@86 {
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
     <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+}
+
+ResolutionTaskHolder@89 {
     <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
     <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+}
+
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+}
+
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+}
+
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
+ResolutionTaskHolder@115 {
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
+ResolutionTaskHolder@118 {
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -198,16 +220,6 @@ ResolutionTaskHolder@114 {
 
 ResolutionTaskHolder@121 {
     <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -217,18 +229,8 @@ ResolutionTaskHolder@121 {
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@127 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
+ResolutionTaskHolder@124 {
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -238,20 +240,17 @@ ResolutionTaskHolder@125 {
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@131 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
+ResolutionTaskHolder@127 {
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
+}
+
+ResolutionTaskHolder@130 {
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -261,18 +260,6 @@ ResolutionTaskHolder@129 {
 
 ResolutionTaskHolder@133 {
     <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@135 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -280,18 +267,8 @@ ResolutionTaskHolder@133 {
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@139 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
+ResolutionTaskHolder@136 {
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
@@ -299,406 +276,432 @@ ResolutionTaskHolder@137 {
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@143 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
+ResolutionTaskHolder@139 {
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
+}
+
+ResolutionTaskHolder@142 {
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
 }
 
 ResolutionTaskHolder@145 {
     <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@147 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@149 {
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@151 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
+ResolutionTaskHolder@148 {
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@155 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
+ResolutionTaskHolder@151 {
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
+}
+
+ResolutionTaskHolder@154 {
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
 }
 
 ResolutionTaskHolder@157 {
     <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@159 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@161 {
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@163 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
+ResolutionTaskHolder@160 {
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@165 {
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@167 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
+ResolutionTaskHolder@163 {
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
     <name not found> = EmptyList@71[empty]
+}
+
+ResolutionTaskHolder@166 {
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
     <name not found> = EmptyList@71[empty]
 }
 
 ResolutionTaskHolder@169 {
     <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@171 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@173 {
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@175 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
+ResolutionTaskHolder@172 {
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@177 {
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@179 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
+ResolutionTaskHolder@175 {
+    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
+}
+
+ResolutionTaskHolder@178 {
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
 }
 
 ResolutionTaskHolder@181 {
     <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@183 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@185 {
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@187 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
+ResolutionTaskHolder@184 {
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
 }
 
-ResolutionTaskHolder@189 {
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@191 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
+ResolutionTaskHolder@187 {
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
+}
+
+ResolutionTaskHolder@190 {
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@192 }
 }
 
 ResolutionTaskHolder@193 {
     <name not found> = ArrayList@194[1] { ResolutionCandidate@195 }
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@195 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@197 {
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@199 }
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@199 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
+ResolutionTaskHolder@196 {
+    <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
 }
 
-ResolutionTaskHolder@201 {
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@203 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
+ResolutionTaskHolder@199 {
+    <name not found> = ArrayList@200[1] { ResolutionCandidate@201 }
+}
+
+ResolutionTaskHolder@202 {
+    <name not found> = ArrayList@203[1] { ResolutionCandidate@204 }
 }
 
 ResolutionTaskHolder@205 {
     <name not found> = ArrayList@206[1] { ResolutionCandidate@207 }
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@207 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@209 {
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@211 }
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@211 }
+ResolutionTaskHolder@208 {
+    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
 }
 
-ResolutionTaskHolder@213 {
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@215 }
+ResolutionTaskHolder@211 {
+    <name not found> = ArrayList@212[1] { ResolutionCandidate@213 }
+}
+
+ResolutionTaskHolder@214 {
+    <name not found> = ArrayList@215[1] { ResolutionCandidate@216 }
 }
 
 ResolutionTaskHolder@217 {
     <name not found> = ArrayList@218[1] { ResolutionCandidate@219 }
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@219 }
 }
 
-ResolutionTaskHolder@221 {
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@223 }
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@223 }
+ResolutionTaskHolder@220 {
+    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
 }
 
-ResolutionTaskHolder@225 {
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@227 }
+ResolutionTaskHolder@223 {
+    <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
+}
+
+ResolutionTaskHolder@226 {
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
 }
 
 ResolutionTaskHolder@229 {
     <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@231 }
 }
 
-ResolutionTaskHolder@233 {
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@235 }
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@235 }
+ResolutionTaskHolder@232 {
+    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
 }
 
-ResolutionTaskHolder@237 {
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@239 }
+ResolutionTaskHolder@235 {
+    <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
+}
+
+ResolutionTaskHolder@238 {
+    <name not found> = ArrayList@239[1] { ResolutionCandidate@240 }
 }
 
 ResolutionTaskHolder@241 {
     <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@243 }
 }
 
-ResolutionTaskHolder@245 {
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@247 }
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@247 }
+ResolutionTaskHolder@244 {
+    <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
 }
 
-ResolutionTaskHolder@249 {
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
-    <name not found> = ArrayList@252[1] { ResolutionCandidate@251 }
+ResolutionTaskHolder@247 {
+    <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
+}
+
+ResolutionTaskHolder@250 {
+    <name not found> = ArrayList@251[1] { ResolutionCandidate@252 }
 }
 
 ResolutionTaskHolder@253 {
     <name not found> = ArrayList@254[1] { ResolutionCandidate@255 }
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@255 }
 }
 
-ResolutionTaskHolder@257 {
-    <name not found> = ArrayList@258[1] { ResolutionCandidate@259 }
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@259 }
+ResolutionTaskHolder@256 {
+    <name not found> = ArrayList@257[1] { ResolutionCandidate@258 }
 }
 
-ResolutionTaskHolder@261 {
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@263 }
+ResolutionTaskHolder@259 {
+    <name not found> = ArrayList@260[1] { ResolutionCandidate@261 }
+}
+
+ResolutionTaskHolder@262 {
+    <name not found> = ArrayList@263[1] { ResolutionCandidate@264 }
 }
 
 ResolutionTaskHolder@265 {
     <name not found> = ArrayList@266[1] { ResolutionCandidate@267 }
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@267 }
 }
 
-ResolutionTaskHolder@269 {
-    <name not found> = ArrayList@270[1] { ResolutionCandidate@271 }
-    <name not found> = ArrayList@272[1] { ResolutionCandidate@271 }
+ResolutionTaskHolder@268 {
+    <name not found> = ArrayList@269[1] { ResolutionCandidate@270 }
 }
 
-ResolutionTaskHolder@273 {
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@275 }
-    <name not found> = ArrayList@276[1] { ResolutionCandidate@275 }
+ResolutionTaskHolder@271 {
+    <name not found> = ArrayList@272[1] { ResolutionCandidate@273 }
+}
+
+ResolutionTaskHolder@274 {
+    <name not found> = ArrayList@275[1] { ResolutionCandidate@276 }
 }
 
 ResolutionTaskHolder@277 {
     <name not found> = ArrayList@278[1] { ResolutionCandidate@279 }
-    <name not found> = ArrayList@280[1] { ResolutionCandidate@279 }
 }
 
-ResolutionTaskHolder@281 {
-    <name not found> = ArrayList@282[1] { ResolutionCandidate@283 }
-    <name not found> = ArrayList@284[1] { ResolutionCandidate@283 }
+ResolutionTaskHolder@280 {
+    <name not found> = ArrayList@281[1] { ResolutionCandidate@282 }
 }
 
-ResolutionTaskHolder@285 {
-    <name not found> = ArrayList@286[1] { ResolutionCandidate@287 }
-    <name not found> = ArrayList@288[1] { ResolutionCandidate@287 }
+ResolutionTaskHolder@283 {
+    <name not found> = ArrayList@284[1] { ResolutionCandidate@285 }
+}
+
+ResolutionTaskHolder@286 {
+    <name not found> = ArrayList@287[1] { ResolutionCandidate@288 }
 }
 
 ResolutionTaskHolder@289 {
     <name not found> = ArrayList@290[1] { ResolutionCandidate@291 }
-    <name not found> = ArrayList@292[1] { ResolutionCandidate@291 }
 }
 
-ResolutionTaskHolder@293 {
-    <name not found> = ArrayList@294[1] { ResolutionCandidate@295 }
-    <name not found> = ArrayList@296[1] { ResolutionCandidate@295 }
+ResolutionTaskHolder@292 {
+    <name not found> = ArrayList@293[1] { ResolutionCandidate@294 }
 }
 
-ResolutionTaskHolder@297 {
-    <name not found> = ArrayList@298[1] { ResolutionCandidate@299 }
-    <name not found> = ArrayList@300[1] { ResolutionCandidate@299 }
+ResolutionTaskHolder@295 {
+    <name not found> = ArrayList@296[1] { ResolutionCandidate@297 }
+}
+
+ResolutionTaskHolder@298 {
+    <name not found> = ArrayList@299[1] { ResolutionCandidate@300 }
 }
 
 ResolutionTaskHolder@301 {
     <name not found> = ArrayList@302[1] { ResolutionCandidate@303 }
-    <name not found> = ArrayList@304[1] { ResolutionCandidate@303 }
 }
 
-ResolutionTaskHolder@305 {
-    <name not found> = ArrayList@306[1] { ResolutionCandidate@307 }
-    <name not found> = ArrayList@308[1] { ResolutionCandidate@307 }
+ResolutionTaskHolder@304 {
+    <name not found> = ArrayList@305[1] { ResolutionCandidate@306 }
 }
 
-ResolutionTaskHolder@309 {
-    <name not found> = ArrayList@310[1] { ResolutionCandidate@311 }
-    <name not found> = ArrayList@312[1] { ResolutionCandidate@311 }
+ResolutionTaskHolder@307 {
+    <name not found> = ArrayList@308[1] { ResolutionCandidate@309 }
 }
 
-ResolutionTaskHolder@313 {
-    <name not found> = ArrayList@314[1] { ResolutionCandidate@315 }
-    <name not found> = ArrayList@316[1] { ResolutionCandidate@315 }
-}
-
-ResolutionTaskHolder@317 {
-    <name not found> = ArrayList@318[1] { ResolutionCandidate@319 }
-    <name not found> = ArrayList@320[1] { ResolutionCandidate@319 }
-}
-
-ResolutionTaskHolder@321 {
-    <name not found> = ArrayList@322[1] { ResolutionCandidate@323 }
-    <name not found> = ArrayList@324[1] { ResolutionCandidate@323 }
-}
-
-ResolutionTaskHolder@325 {
-    <name not found> = ArrayList@326[1] { ResolutionCandidate@327 }
-    <name not found> = ArrayList@328[1] { ResolutionCandidate@327 }
-}
-
-ResolutionTaskHolder@329 {
-    <name not found> = ArrayList@330[1] { ResolutionCandidate@331 }
-    <name not found> = ArrayList@332[1] { ResolutionCandidate@331 }
-}
-
-ResolutionTaskHolder@333 {
-    <name not found> = ArrayList@334[1] { ResolutionCandidate@335 }
-    <name not found> = ArrayList@336[1] { ResolutionCandidate@335 }
-}
-
-ResolutionTaskHolder@337 {
-    <name not found> = ArrayList@338[1] { ResolutionCandidate@339 }
-    <name not found> = ArrayList@340[1] { ResolutionCandidate@339 }
-}
-
-ResolutionTaskHolder@341 {
-    <name not found> = ArrayList@342[1] { ResolutionCandidate@343 }
-    <name not found> = ArrayList@344[1] { ResolutionCandidate@343 }
-}
-
-ResolutionTaskHolder@345 {
-    <name not found> = ArrayList@346[1] { ResolutionCandidate@347 }
-    <name not found> = ArrayList@348[1] { ResolutionCandidate@347 }
-}
-
-ResolutionTaskHolder@349 {
-    <name not found> = ArrayList@350[1] { ResolutionCandidate@351 }
-    <name not found> = ArrayList@352[1] { ResolutionCandidate@351 }
-}
-
-ResolutionTaskHolder@353 {
-    <name not found> = ArrayList@354[1] { ResolutionCandidate@355 }
-    <name not found> = ArrayList@356[1] { ResolutionCandidate@355 }
-}
-
-ResolutionTaskHolder@357 {
-    <name not found> = ArrayList@358[1] { ResolutionCandidate@359 }
-    <name not found> = ArrayList@360[1] { ResolutionCandidate@359 }
-}
-
-ResolutionTaskHolder@361 {
-    <name not found> = ArrayList@362[1] { ResolutionCandidate@363 }
-    <name not found> = ArrayList@364[1] { ResolutionCandidate@363 }
-}
-
-ResolutionTaskHolder@365 {
-    <name not found> = ArrayList@366[1] { ResolutionCandidate@367 }
-    <name not found> = ArrayList@368[1] { ResolutionCandidate@367 }
-}
-
-ResolutionTaskHolder@369 {
-    <name not found> = ArrayList@370[1] { ResolutionCandidate@371 }
-    <name not found> = ArrayList@372[1] { ResolutionCandidate@371 }
-}
-
-ResolutionTaskHolder@373 {
-    <name not found> = ArrayList@374[1] { ResolutionCandidate@375 }
-    <name not found> = ArrayList@376[1] { ResolutionCandidate@375 }
-}
-
-ResolutionTaskHolder@377 {
-    <name not found> = ArrayList@378[1] { ResolutionCandidate@379 }
-    <name not found> = ArrayList@380[1] { ResolutionCandidate@379 }
-}
-
-ResolutionTaskHolder@381 {
-    <name not found> = ArrayList@382[1] { ResolutionCandidate@383 }
-    <name not found> = ArrayList@384[1] { ResolutionCandidate@383 }
-}
-
-ResolutionTaskHolder@385 {
-    <name not found> = ArrayList@386[1] { ResolutionCandidate@387 }
-    <name not found> = ArrayList@388[1] { ResolutionCandidate@387 }
+null {
+    <name not found> = ArrayList@310[1] { ResolutionCandidate@183 }
+    <name not found> = ArrayList@311[1] { ResolutionCandidate@306 }
+    <name not found> = ArrayList@312[1] { ResolutionCandidate@285 }
+    <name not found> = ArrayList@313[1] { ResolutionCandidate@276 }
+    <name not found> = ArrayList@314[1] { ResolutionCandidate@237 }
+    <name not found> = ArrayList@315[1] { ResolutionCandidate@186 }
+    <name not found> = ArrayList@316[1] { ResolutionCandidate@291 }
+    <name not found> = ArrayList@317[1] { ResolutionCandidate@270 }
+    <name not found> = ArrayList@318[1] { ResolutionCandidate@279 }
+    <name not found> = ArrayList@319[1] { ResolutionCandidate@153 }
+    <name not found> = ArrayList@320[1] { ResolutionCandidate@249 }
+    <name not found> = ArrayList@321[1] { ResolutionCandidate@219 }
+    <name not found> = ArrayList@322[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@323[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@324[1] { ResolutionCandidate@192 }
+    <name not found> = ArrayList@325[1] { ResolutionCandidate@174 }
+    <name not found> = ArrayList@326[1] { ResolutionCandidate@195 }
+    <name not found> = ArrayList@327[1] { ResolutionCandidate@267 }
+    <name not found> = ArrayList@328[1] { ResolutionCandidate@135 }
+    <name not found> = ArrayList@329[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@330[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@331[1] { ResolutionCandidate@228 }
+    <name not found> = ArrayList@332[1] { ResolutionCandidate@162 }
+    <name not found> = ArrayList@333[1] { ResolutionCandidate@288 }
+    <name not found> = ArrayList@334[1] { ResolutionCandidate@168 }
+    <name not found> = ArrayList@335[1] { ResolutionCandidate@204 }
+    <name not found> = ArrayList@336[1] { ResolutionCandidate@210 }
+    <name not found> = ArrayList@337[1] { ResolutionCandidate@129 }
+    <name not found> = ArrayList@338[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@339[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@340[1] { ResolutionCandidate@207 }
+    <name not found> = ArrayList@341[1] { ResolutionCandidate@309 }
+    <name not found> = ArrayList@342[1] { ResolutionCandidate@252 }
+    <name not found> = ArrayList@343[1] { ResolutionCandidate@300 }
+    <name not found> = ArrayList@344[1] { ResolutionCandidate@258 }
+    <name not found> = ArrayList@345[1] { ResolutionCandidate@147 }
+    <name not found> = ArrayList@346[1] { ResolutionCandidate@213 }
+    <name not found> = ArrayList@347[1] { ResolutionCandidate@240 }
+    <name not found> = ArrayList@348[1] { ResolutionCandidate@159 }
+    <name not found> = ArrayList@349[1] { ResolutionCandidate@189 }
+    <name not found> = ArrayList@350[1] { ResolutionCandidate@225 }
+    <name not found> = ArrayList@351[1] { ResolutionCandidate@156 }
+    <name not found> = ArrayList@352[1] { ResolutionCandidate@234 }
+    <name not found> = ArrayList@353[1] { ResolutionCandidate@171 }
+    <name not found> = ArrayList@354[1] { ResolutionCandidate@294 }
+    <name not found> = ArrayList@355[1] { ResolutionCandidate@231 }
+    <name not found> = ArrayList@356[1] { ResolutionCandidate@132 }
+    <name not found> = ArrayList@357[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@358[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@359[1] { ResolutionCandidate@246 }
+    <name not found> = ArrayList@360[1] { ResolutionCandidate@141 }
+    <name not found> = ArrayList@361[1] { ResolutionCandidate@177 }
+    <name not found> = ArrayList@362[1] { ResolutionCandidate@165 }
+    <name not found> = ArrayList@363[1] { ResolutionCandidate@201 }
+    <name not found> = ArrayList@364[1] { ResolutionCandidate@198 }
+    <name not found> = ArrayList@365[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@366[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@367[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@368[1] { ResolutionCandidate@243 }
+    <name not found> = ArrayList@369[1] { ResolutionCandidate@303 }
+    <name not found> = ArrayList@370[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@371[1] { ResolutionCandidate@297 }
+    <name not found> = ArrayList@372[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@373[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@374[1] { ResolutionCandidate@180 }
+    <name not found> = ArrayList@375[1] { ResolutionCandidate@282 }
+    <name not found> = ArrayList@376[1] { ResolutionCandidate@264 }
+    <name not found> = ArrayList@377[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@378[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@379[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@380[1] { ResolutionCandidate@261 }
+    <name not found> = ArrayList@381[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@382[1] { ResolutionCandidate@216 }
+    <name not found> = ArrayList@383[1] { ResolutionCandidate@273 }
+    <name not found> = ArrayList@384[1] { ResolutionCandidate@255 }
+    <name not found> = ArrayList@385[1] { ResolutionCandidate@126 }
+    <name not found> = ArrayList@386[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@387[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@388[1] { ResolutionCandidate@222 }
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inline/recursion.lazy.log b/compiler/testData/diagnostics/tests/inline/recursion.lazy.log
index e68af97e0ad..3df0dde1d86 100644
--- a/compiler/testData/diagnostics/tests/inline/recursion.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/recursion.lazy.log
@@ -102,32 +102,27 @@ LazyJavaPackageFragment@30['lang'] {
 
 ResolutionTaskHolder@70 {
     <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
+}
+
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
@@ -135,57 +130,65 @@ ResolutionTaskHolder@78 {
 
 ResolutionTaskHolder@82 {
     <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
 }
 
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
+}
+
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
 }
 
 ResolutionTaskHolder@94 {
     <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
 }
 
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
 }
 
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[2] { ResolutionCandidate@112, ResolutionCandidate@113 }
-    <name not found> = ArrayList@114[2] { ResolutionCandidate@112, ResolutionCandidate@113 }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[2] { ResolutionCandidate@102, ResolutionCandidate@103 }
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
 }
 
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[2] { ResolutionCandidate@117, ResolutionCandidate@118 }
-    <name not found> = ArrayList@119[2] { ResolutionCandidate@117, ResolutionCandidate@118 }
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[2] { ResolutionCandidate@106, ResolutionCandidate@107 }
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+}
+
+null {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@118[2] { ResolutionCandidate@102, ResolutionCandidate@103 }
+    <name not found> = ArrayList@119[2] { ResolutionCandidate@106, ResolutionCandidate@107 }
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
diff --git a/compiler/testData/diagnostics/tests/inline/regressions/kt4341.lazy.log b/compiler/testData/diagnostics/tests/inline/regressions/kt4341.lazy.log
index dedb68dafa5..bc86d8d8b92 100644
--- a/compiler/testData/diagnostics/tests/inline/regressions/kt4341.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/regressions/kt4341.lazy.log
@@ -35,20 +35,23 @@ LazyJavaPackageFragment@15['java'] {
 
 ResolutionTaskHolder@33 {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
+}
+
+null {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@35 }
 }
diff --git a/compiler/testData/diagnostics/tests/inline/returns.lazy.log b/compiler/testData/diagnostics/tests/inline/returns.lazy.log
index 6bd10648258..1eaa9ea9f6a 100644
--- a/compiler/testData/diagnostics/tests/inline/returns.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/returns.lazy.log
@@ -71,50 +71,53 @@ LazyJavaPackageFragment@27['java'] {
 
 ResolutionTaskHolder@52 {
     <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
+}
+
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
 }
 
 ResolutionTaskHolder@64 {
     <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
+}
+
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
 }
 
 ResolutionTaskHolder@76 {
     <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
 }
 
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+null {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@69 }
 }
diff --git a/compiler/testData/diagnostics/tests/inline/sam.lazy.log b/compiler/testData/diagnostics/tests/inline/sam.lazy.log
index 3b826e9f359..2a88cfc59b1 100644
--- a/compiler/testData/diagnostics/tests/inline/sam.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/sam.lazy.log
@@ -146,14 +146,6 @@ LazyJavaPackageFragment@59['lang'] {
 ResolutionTaskHolder@93 {
     <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
     <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[2] { ResolutionCandidate@95, ResolutionCandidate@97 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -163,15 +155,9 @@ ResolutionTaskHolder@93 {
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[2] { ResolutionCandidate@101, ResolutionCandidate@103 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -179,15 +165,21 @@ ResolutionTaskHolder@99 {
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@105 {
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
     <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@110[2] { ResolutionCandidate@107, ResolutionCandidate@109 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -197,16 +189,6 @@ ResolutionTaskHolder@105 {
 
 ResolutionTaskHolder@111 {
     <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@113 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -216,10 +198,8 @@ ResolutionTaskHolder@111 {
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@117 }
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -229,9 +209,8 @@ ResolutionTaskHolder@115 {
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@121 }
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -239,41 +218,42 @@ ResolutionTaskHolder@119 {
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@120 {
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
 ResolutionTaskHolder@123 {
     <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@125 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@129 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@126 {
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@133 }
+ResolutionTaskHolder@129 {
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@132 {
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -281,199 +261,222 @@ ResolutionTaskHolder@131 {
 
 ResolutionTaskHolder@135 {
     <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@137 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@141 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@138 {
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@145 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@141 {
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@144 {
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
     <name not found> = EmptyList@29[empty]
 }
 
 ResolutionTaskHolder@147 {
     <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@149 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@153 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@150 {
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
 }
 
-ResolutionTaskHolder@155 {
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@157 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@153 {
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
+}
+
+ResolutionTaskHolder@156 {
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
 }
 
 ResolutionTaskHolder@159 {
     <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@161 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@163 {
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@165 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@162 {
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
 }
 
-ResolutionTaskHolder@167 {
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@169 }
+ResolutionTaskHolder@165 {
+    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
+}
+
+ResolutionTaskHolder@168 {
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
 }
 
 ResolutionTaskHolder@171 {
     <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@173 }
 }
 
-ResolutionTaskHolder@175 {
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@177 }
+ResolutionTaskHolder@174 {
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
 }
 
-ResolutionTaskHolder@179 {
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@181 }
+ResolutionTaskHolder@177 {
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
+}
+
+ResolutionTaskHolder@180 {
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
 }
 
 ResolutionTaskHolder@183 {
     <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@185 }
 }
 
-ResolutionTaskHolder@187 {
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@189 }
+ResolutionTaskHolder@186 {
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
 }
 
-ResolutionTaskHolder@191 {
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@193 }
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@193 }
+ResolutionTaskHolder@189 {
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
+}
+
+ResolutionTaskHolder@192 {
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
 }
 
 ResolutionTaskHolder@195 {
     <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@197 }
 }
 
-ResolutionTaskHolder@199 {
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@201 }
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@201 }
+ResolutionTaskHolder@198 {
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
 }
 
-ResolutionTaskHolder@203 {
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@205 }
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@205 }
+ResolutionTaskHolder@201 {
+    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
+}
+
+ResolutionTaskHolder@204 {
+    <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
 }
 
 ResolutionTaskHolder@207 {
     <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@209 }
 }
 
-ResolutionTaskHolder@211 {
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@213 }
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@213 }
+ResolutionTaskHolder@210 {
+    <name not found> = ArrayList@211[1] { ResolutionCandidate@212 }
 }
 
-ResolutionTaskHolder@215 {
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@217 }
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@217 }
+ResolutionTaskHolder@213 {
+    <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
+}
+
+ResolutionTaskHolder@216 {
+    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
 }
 
 ResolutionTaskHolder@219 {
     <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@221 }
 }
 
-ResolutionTaskHolder@223 {
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@225 }
+ResolutionTaskHolder@222 {
+    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
 }
 
-ResolutionTaskHolder@227 {
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@229 }
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@229 }
-}
-
-ResolutionTaskHolder@231 {
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@233 }
-}
-
-ResolutionTaskHolder@235 {
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@237 }
-}
-
-ResolutionTaskHolder@239 {
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@241 }
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@241 }
-}
-
-ResolutionTaskHolder@243 {
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@245 }
-}
-
-ResolutionTaskHolder@247 {
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@249 }
-}
-
-ResolutionTaskHolder@251 {
-    <name not found> = ArrayList@252[1] { ResolutionCandidate@253 }
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@253 }
-}
-
-ResolutionTaskHolder@255 {
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
-    <name not found> = ArrayList@258[1] { ResolutionCandidate@257 }
-}
-
-ResolutionTaskHolder@259 {
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@261 }
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@261 }
-}
-
-ResolutionTaskHolder@263 {
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@265 }
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@265 }
+null {
+    <name not found> = ArrayList@225[1] { ResolutionCandidate@155 }
+    <name not found> = ArrayList@226[1] { ResolutionCandidate@224 }
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@164 }
+    <name not found> = ArrayList@228[1] { ResolutionCandidate@137 }
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@146 }
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@185 }
+    <name not found> = ArrayList@231[1] { ResolutionCandidate@191 }
+    <name not found> = ArrayList@232[1] { ResolutionCandidate@215 }
+    <name not found> = ArrayList@233[1] { ResolutionCandidate@197 }
+    <name not found> = ArrayList@234[1] { ResolutionCandidate@188 }
+    <name not found> = ArrayList@235[1] { ResolutionCandidate@131 }
+    <name not found> = ArrayList@236[1] { ResolutionCandidate@122 }
+    <name not found> = ArrayList@237[1] { ResolutionCandidate@200 }
+    <name not found> = ArrayList@238[1] { ResolutionCandidate@125 }
+    <name not found> = ArrayList@239[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@240[1] { ResolutionCandidate@161 }
+    <name not found> = ArrayList@241[1] { ResolutionCandidate@203 }
+    <name not found> = ArrayList@242[1] { ResolutionCandidate@152 }
+    <name not found> = ArrayList@243[1] { ResolutionCandidate@182 }
+    <name not found> = ArrayList@244[1] { ResolutionCandidate@143 }
+    <name not found> = ArrayList@245[1] { ResolutionCandidate@149 }
+    <name not found> = ArrayList@246[1] { ResolutionCandidate@206 }
+    <name not found> = ArrayList@247[1] { ResolutionCandidate@218 }
+    <name not found> = ArrayList@248[1] { ResolutionCandidate@173 }
+    <name not found> = ArrayList@249[1] { ResolutionCandidate@209 }
+    <name not found> = ArrayList@250[1] { ResolutionCandidate@176 }
+    <name not found> = ArrayList@251[1] { ResolutionCandidate@134 }
+    <name not found> = ArrayList@252[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@253[1] { ResolutionCandidate@167 }
+    <name not found> = ArrayList@254[1] { ResolutionCandidate@128 }
+    <name not found> = ArrayList@255[1] { ResolutionCandidate@113 }
+    <name not found> = ArrayList@256[1] { ResolutionCandidate@179 }
+    <name not found> = ArrayList@257[1] { ResolutionCandidate@221 }
+    <name not found> = ArrayList@258[1] { ResolutionCandidate@212 }
+    <name not found> = ArrayList@259[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@260[1] { ResolutionCandidate@140 }
+    <name not found> = ArrayList@261[1] { ResolutionCandidate@194 }
+    <name not found> = ArrayList@262[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@263[1] { ResolutionCandidate@170 }
+    <name not found> = ArrayList@264[2] { ResolutionCandidate@100, ResolutionCandidate@102 }
+    <name not found> = ArrayList@265[2] { ResolutionCandidate@105, ResolutionCandidate@107 }
+    <name not found> = ArrayList@266[2] { ResolutionCandidate@95, ResolutionCandidate@97 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inline/typed.lazy.log b/compiler/testData/diagnostics/tests/inline/typed.lazy.log
index 34f7f08a03d..e28b4b37435 100644
--- a/compiler/testData/diagnostics/tests/inline/typed.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/typed.lazy.log
@@ -53,110 +53,113 @@ LazyJavaPackageFragment@18['java'] {
 
 ResolutionTaskHolder@43 {
     <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
 }
 
 ResolutionTaskHolder@55 {
     <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
+}
+
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
 }
 
 ResolutionTaskHolder@67 {
     <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
 }
 
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
 }
 
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
+}
+
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
 }
 
 ResolutionTaskHolder@79 {
     <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
 }
 
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
 }
 
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
+}
+
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
 }
 
 ResolutionTaskHolder@91 {
     <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
 }
 
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
 }
 
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
+}
+
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
 }
 
 ResolutionTaskHolder@103 {
     <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
 }
 
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
 }
 
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@113 }
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@117 }
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@121 }
-}
-
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@125 }
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@129 }
+null {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@96 }
 }
diff --git a/compiler/testData/diagnostics/tests/inline/unaryExpressions/mathOperation.lazy.log b/compiler/testData/diagnostics/tests/inline/unaryExpressions/mathOperation.lazy.log
index 39be54a8563..9239cfe0d01 100644
--- a/compiler/testData/diagnostics/tests/inline/unaryExpressions/mathOperation.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/unaryExpressions/mathOperation.lazy.log
@@ -105,242 +105,263 @@ LazyJavaPackageFragment@37['lang'] {
 
 ResolutionTaskHolder@68 {
     <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
 }
 
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
+}
+
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
 }
 
 ResolutionTaskHolder@80 {
     <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
 }
 
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
 }
 
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
+}
+
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
 }
 
 ResolutionTaskHolder@92 {
     <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
 }
 
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
 }
 
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
+}
+
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
 }
 
 ResolutionTaskHolder@104 {
     <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
 }
 
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
 }
 
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
+}
+
+ResolutionTaskHolder@113 {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
 }
 
 ResolutionTaskHolder@116 {
     <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
 }
 
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
+ResolutionTaskHolder@119 {
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
 }
 
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@126 }
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
-}
-
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
-}
-
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[2] { ResolutionCandidate@142, ResolutionCandidate@143 }
-    <name not found> = ArrayList@144[2] { ResolutionCandidate@142, ResolutionCandidate@143 }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
+ResolutionTaskHolder@122 {
+    <name not found> = ArrayList@123[2] { ResolutionCandidate@124, ResolutionCandidate@125 }
     <name not found> = EmptyList@60[empty]
     <name not found> = EmptyList@60[empty]
     <name not found> = EmptyList@60[empty]
 }
 
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[2] { ResolutionCandidate@147, ResolutionCandidate@148 }
-    <name not found> = ArrayList@149[2] { ResolutionCandidate@147, ResolutionCandidate@148 }
+ResolutionTaskHolder@126 {
+    <name not found> = ArrayList@127[2] { ResolutionCandidate@128, ResolutionCandidate@129 }
     <name not found> = EmptyList@60[empty]
     <name not found> = EmptyList@60[empty]
     <name not found> = EmptyList@60[empty]
+}
+
+ResolutionTaskHolder@130 {
+    <name not found> = ArrayList@131[2] { ResolutionCandidate@132, ResolutionCandidate@133 }
     <name not found> = EmptyList@60[empty]
     <name not found> = EmptyList@60[empty]
     <name not found> = EmptyList@60[empty]
 }
 
+ResolutionTaskHolder@134 {
+    <name not found> = ArrayList@135[2] { ResolutionCandidate@136, ResolutionCandidate@137 }
+    <name not found> = EmptyList@60[empty]
+    <name not found> = EmptyList@60[empty]
+    <name not found> = EmptyList@60[empty]
+}
+
+ResolutionTaskHolder@138 {
+    <name not found> = ArrayList@139[2] { ResolutionCandidate@140, ResolutionCandidate@141 }
+    <name not found> = EmptyList@60[empty]
+    <name not found> = EmptyList@60[empty]
+    <name not found> = EmptyList@60[empty]
+}
+
+ResolutionTaskHolder@142 {
+    <name not found> = ArrayList@143[2] { ResolutionCandidate@144, ResolutionCandidate@145 }
+    <name not found> = EmptyList@60[empty]
+    <name not found> = EmptyList@60[empty]
+}
+
+ResolutionTaskHolder@146 {
+    <name not found> = ArrayList@147[2] { ResolutionCandidate@148, ResolutionCandidate@149 }
+    <name not found> = EmptyList@60[empty]
+    <name not found> = EmptyList@60[empty]
+}
+
 ResolutionTaskHolder@150 {
     <name not found> = ArrayList@151[2] { ResolutionCandidate@152, ResolutionCandidate@153 }
-    <name not found> = ArrayList@154[2] { ResolutionCandidate@152, ResolutionCandidate@153 }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
     <name not found> = EmptyList@60[empty]
     <name not found> = EmptyList@60[empty]
 }
 
-ResolutionTaskHolder@155 {
-    <name not found> = ArrayList@156[2] { ResolutionCandidate@157, ResolutionCandidate@158 }
-    <name not found> = ArrayList@159[2] { ResolutionCandidate@157, ResolutionCandidate@158 }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
+ResolutionTaskHolder@154 {
+    <name not found> = ArrayList@155[2] { ResolutionCandidate@156, ResolutionCandidate@157 }
     <name not found> = EmptyList@60[empty]
     <name not found> = EmptyList@60[empty]
 }
 
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[2] { ResolutionCandidate@162, ResolutionCandidate@163 }
-    <name not found> = ArrayList@164[2] { ResolutionCandidate@162, ResolutionCandidate@163 }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
+ResolutionTaskHolder@158 {
+    <name not found> = ArrayList@159[2] { ResolutionCandidate@160, ResolutionCandidate@161 }
     <name not found> = EmptyList@60[empty]
     <name not found> = EmptyList@60[empty]
 }
 
-ResolutionTaskHolder@165 {
-    <name not found> = ArrayList@166[2] { ResolutionCandidate@167, ResolutionCandidate@168 }
-    <name not found> = ArrayList@169[2] { ResolutionCandidate@167, ResolutionCandidate@168 }
+ResolutionTaskHolder@162 {
+    <name not found> = ArrayList@163[2] { ResolutionCandidate@164, ResolutionCandidate@165 }
     <name not found> = EmptyList@60[empty]
     <name not found> = EmptyList@60[empty]
+}
+
+ResolutionTaskHolder@166 {
+    <name not found> = ArrayList@167[2] { ResolutionCandidate@168, ResolutionCandidate@169 }
     <name not found> = EmptyList@60[empty]
     <name not found> = EmptyList@60[empty]
 }
 
 ResolutionTaskHolder@170 {
     <name not found> = ArrayList@171[2] { ResolutionCandidate@172, ResolutionCandidate@173 }
-    <name not found> = ArrayList@174[2] { ResolutionCandidate@172, ResolutionCandidate@173 }
     <name not found> = EmptyList@60[empty]
     <name not found> = EmptyList@60[empty]
+}
+
+ResolutionTaskHolder@174 {
+    <name not found> = ArrayList@175[2] { ResolutionCandidate@176, ResolutionCandidate@177 }
+    <name not found> = EmptyList@60[empty]
+    <name not found> = EmptyList@60[empty]
+}
+
+ResolutionTaskHolder@178 {
+    <name not found> = ArrayList@179[2] { ResolutionCandidate@180, ResolutionCandidate@181 }
+    <name not found> = EmptyList@60[empty]
+    <name not found> = EmptyList@60[empty]
+}
+
+ResolutionTaskHolder@182 {
+    <name not found> = ArrayList@183[3] { ResolutionCandidate@184, ResolutionCandidate@185, ResolutionCandidate@186 }
+    <name not found> = EmptyList@60[empty]
     <name not found> = EmptyList@60[empty]
     <name not found> = EmptyList@60[empty]
 }
 
-ResolutionTaskHolder@175 {
-    <name not found> = ArrayList@176[2] { ResolutionCandidate@177, ResolutionCandidate@178 }
-    <name not found> = ArrayList@179[2] { ResolutionCandidate@177, ResolutionCandidate@178 }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
+ResolutionTaskHolder@187 {
+    <name not found> = ArrayList@188[3] { ResolutionCandidate@189, ResolutionCandidate@190, ResolutionCandidate@191 }
     <name not found> = EmptyList@60[empty]
     <name not found> = EmptyList@60[empty]
 }
 
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[2] { ResolutionCandidate@182, ResolutionCandidate@183 }
-    <name not found> = ArrayList@184[2] { ResolutionCandidate@182, ResolutionCandidate@183 }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
+ResolutionTaskHolder@192 {
+    <name not found> = ArrayList@193[3] { ResolutionCandidate@194, ResolutionCandidate@195, ResolutionCandidate@196 }
     <name not found> = EmptyList@60[empty]
     <name not found> = EmptyList@60[empty]
 }
 
-ResolutionTaskHolder@185 {
-    <name not found> = ArrayList@186[2] { ResolutionCandidate@187, ResolutionCandidate@188 }
-    <name not found> = ArrayList@189[2] { ResolutionCandidate@187, ResolutionCandidate@188 }
+null {
+    <name not found> = ArrayList@197[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@198[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@200[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@201[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@202[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@203[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@204[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@205[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@206[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@207[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@208[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@209[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@210[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@211[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@212[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@213[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@214[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@215[2] { ResolutionCandidate@164, ResolutionCandidate@165 }
+    <name not found> = ArrayList@216[2] { ResolutionCandidate@180, ResolutionCandidate@181 }
+    <name not found> = ArrayList@217[2] { ResolutionCandidate@172, ResolutionCandidate@173 }
+    <name not found> = ArrayList@218[2] { ResolutionCandidate@176, ResolutionCandidate@177 }
+    <name not found> = ArrayList@219[2] { ResolutionCandidate@144, ResolutionCandidate@145 }
+    <name not found> = ArrayList@220[2] { ResolutionCandidate@168, ResolutionCandidate@169 }
+    <name not found> = ArrayList@221[2] { ResolutionCandidate@156, ResolutionCandidate@157 }
+    <name not found> = ArrayList@222[2] { ResolutionCandidate@160, ResolutionCandidate@161 }
+    <name not found> = ArrayList@223[2] { ResolutionCandidate@148, ResolutionCandidate@149 }
+    <name not found> = ArrayList@224[2] { ResolutionCandidate@152, ResolutionCandidate@153 }
+    <name not found> = ArrayList@225[2] { ResolutionCandidate@132, ResolutionCandidate@133 }
+    <name not found> = ArrayList@226[2] { ResolutionCandidate@124, ResolutionCandidate@125 }
+    <name not found> = ArrayList@227[2] { ResolutionCandidate@140, ResolutionCandidate@141 }
+    <name not found> = ArrayList@228[2] { ResolutionCandidate@128, ResolutionCandidate@129 }
+    <name not found> = ArrayList@229[2] { ResolutionCandidate@136, ResolutionCandidate@137 }
+    <name not found> = ArrayList@230[3] { ResolutionCandidate@189, ResolutionCandidate@190, ResolutionCandidate@191 }
+    <name not found> = ArrayList@231[3] { ResolutionCandidate@194, ResolutionCandidate@195, ResolutionCandidate@196 }
+    <name not found> = ArrayList@232[3] { ResolutionCandidate@184, ResolutionCandidate@185, ResolutionCandidate@186 }
+    <name not found> = EmptyList@60[empty]
+    <name not found> = EmptyList@60[empty]
+    <name not found> = EmptyList@60[empty]
+    <name not found> = EmptyList@60[empty]
+    <name not found> = EmptyList@60[empty]
+    <name not found> = EmptyList@60[empty]
+    <name not found> = EmptyList@60[empty]
+    <name not found> = EmptyList@60[empty]
+    <name not found> = EmptyList@60[empty]
+    <name not found> = EmptyList@60[empty]
+    <name not found> = EmptyList@60[empty]
+    <name not found> = EmptyList@60[empty]
     <name not found> = EmptyList@60[empty]
     <name not found> = EmptyList@60[empty]
     <name not found> = EmptyList@60[empty]
     <name not found> = EmptyList@60[empty]
-}
-
-ResolutionTaskHolder@190 {
-    <name not found> = ArrayList@191[2] { ResolutionCandidate@192, ResolutionCandidate@193 }
-    <name not found> = ArrayList@194[2] { ResolutionCandidate@192, ResolutionCandidate@193 }
     <name not found> = EmptyList@60[empty]
     <name not found> = EmptyList@60[empty]
     <name not found> = EmptyList@60[empty]
     <name not found> = EmptyList@60[empty]
-}
-
-ResolutionTaskHolder@195 {
-    <name not found> = ArrayList@196[2] { ResolutionCandidate@197, ResolutionCandidate@198 }
-    <name not found> = ArrayList@199[2] { ResolutionCandidate@197, ResolutionCandidate@198 }
     <name not found> = EmptyList@60[empty]
     <name not found> = EmptyList@60[empty]
     <name not found> = EmptyList@60[empty]
     <name not found> = EmptyList@60[empty]
-}
-
-ResolutionTaskHolder@200 {
-    <name not found> = ArrayList@201[2] { ResolutionCandidate@202, ResolutionCandidate@203 }
-    <name not found> = ArrayList@204[2] { ResolutionCandidate@202, ResolutionCandidate@203 }
     <name not found> = EmptyList@60[empty]
     <name not found> = EmptyList@60[empty]
     <name not found> = EmptyList@60[empty]
     <name not found> = EmptyList@60[empty]
-}
-
-ResolutionTaskHolder@205 {
-    <name not found> = ArrayList@206[2] { ResolutionCandidate@207, ResolutionCandidate@208 }
-    <name not found> = ArrayList@209[2] { ResolutionCandidate@207, ResolutionCandidate@208 }
     <name not found> = EmptyList@60[empty]
     <name not found> = EmptyList@60[empty]
     <name not found> = EmptyList@60[empty]
     <name not found> = EmptyList@60[empty]
-}
-
-ResolutionTaskHolder@210 {
-    <name not found> = ArrayList@211[2] { ResolutionCandidate@212, ResolutionCandidate@213 }
-    <name not found> = ArrayList@214[2] { ResolutionCandidate@212, ResolutionCandidate@213 }
     <name not found> = EmptyList@60[empty]
     <name not found> = EmptyList@60[empty]
     <name not found> = EmptyList@60[empty]
     <name not found> = EmptyList@60[empty]
-}
-
-ResolutionTaskHolder@215 {
-    <name not found> = ArrayList@216[3] { ResolutionCandidate@217, ResolutionCandidate@218, ResolutionCandidate@219 }
-    <name not found> = ArrayList@220[3] { ResolutionCandidate@217, ResolutionCandidate@218, ResolutionCandidate@219 }
     <name not found> = EmptyList@60[empty]
     <name not found> = EmptyList@60[empty]
     <name not found> = EmptyList@60[empty]
@@ -348,21 +369,3 @@ ResolutionTaskHolder@215 {
     <name not found> = EmptyList@60[empty]
     <name not found> = EmptyList@60[empty]
 }
-
-ResolutionTaskHolder@221 {
-    <name not found> = ArrayList@222[3] { ResolutionCandidate@223, ResolutionCandidate@224, ResolutionCandidate@225 }
-    <name not found> = ArrayList@226[3] { ResolutionCandidate@223, ResolutionCandidate@224, ResolutionCandidate@225 }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-}
-
-ResolutionTaskHolder@227 {
-    <name not found> = ArrayList@228[3] { ResolutionCandidate@229, ResolutionCandidate@230, ResolutionCandidate@231 }
-    <name not found> = ArrayList@232[3] { ResolutionCandidate@229, ResolutionCandidate@230, ResolutionCandidate@231 }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inline/unaryExpressions/notOnCall.lazy.log b/compiler/testData/diagnostics/tests/inline/unaryExpressions/notOnCall.lazy.log
index 42ba573c055..25919c571c9 100644
--- a/compiler/testData/diagnostics/tests/inline/unaryExpressions/notOnCall.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/unaryExpressions/notOnCall.lazy.log
@@ -48,22 +48,25 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@37 {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+}
+
+null {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@48 }
+    <name not found> = EmptyList@29[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inline/unaryExpressions/notOperation.lazy.log b/compiler/testData/diagnostics/tests/inline/unaryExpressions/notOperation.lazy.log
index c0ff43b1e8c..07c9ee8cfe8 100644
--- a/compiler/testData/diagnostics/tests/inline/unaryExpressions/notOperation.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/unaryExpressions/notOperation.lazy.log
@@ -90,61 +90,59 @@ LazyJavaPackageFragment@29['lang'] {
 
 ResolutionTaskHolder@70 {
     <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
+}
+
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
 }
 
 ResolutionTaskHolder@82 {
     <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
 }
 
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
+}
+
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
 }
 
 ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[4] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
-    <name not found> = ArrayList@107[4] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
+    <name not found> = ArrayList@95[4] { ResolutionCandidate@96, ResolutionCandidate@97, ResolutionCandidate@98, ... }
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
 }
 
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[4] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
-    <name not found> = ArrayList@113[4] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[4] { ResolutionCandidate@101, ResolutionCandidate@102, ResolutionCandidate@103, ... }
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
+}
+
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[4] { ResolutionCandidate@106, ResolutionCandidate@107, ResolutionCandidate@108, ... }
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+}
+
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[4] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113, ... }
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
@@ -152,56 +150,61 @@ ResolutionTaskHolder@108 {
 
 ResolutionTaskHolder@114 {
     <name not found> = ArrayList@115[4] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
-    <name not found> = ArrayList@119[4] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
 }
 
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[4] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
-    <name not found> = ArrayList@125[4] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
+ResolutionTaskHolder@119 {
+    <name not found> = ArrayList@120[4] { ResolutionCandidate@121, ResolutionCandidate@122, ResolutionCandidate@123, ... }
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
 }
 
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[4] { ResolutionCandidate@128, ResolutionCandidate@129, ResolutionCandidate@130, ... }
-    <name not found> = ArrayList@131[4] { ResolutionCandidate@128, ResolutionCandidate@129, ResolutionCandidate@130, ... }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
+ResolutionTaskHolder@124 {
+    <name not found> = ArrayList@125[4] { ResolutionCandidate@126, ResolutionCandidate@127, ResolutionCandidate@128, ... }
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
 }
 
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[4] { ResolutionCandidate@134, ResolutionCandidate@135, ResolutionCandidate@136, ... }
-    <name not found> = ArrayList@137[4] { ResolutionCandidate@134, ResolutionCandidate@135, ResolutionCandidate@136, ... }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
+ResolutionTaskHolder@129 {
+    <name not found> = ArrayList@130[4] { ResolutionCandidate@131, ResolutionCandidate@132, ResolutionCandidate@133, ... }
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
 }
 
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[4] { ResolutionCandidate@140, ResolutionCandidate@141, ResolutionCandidate@142, ... }
-    <name not found> = ArrayList@143[4] { ResolutionCandidate@140, ResolutionCandidate@141, ResolutionCandidate@142, ... }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-}
-
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[4] { ResolutionCandidate@146, ResolutionCandidate@147, ResolutionCandidate@148, ... }
-    <name not found> = ArrayList@149[4] { ResolutionCandidate@146, ResolutionCandidate@147, ResolutionCandidate@148, ... }
+null {
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@142[4] { ResolutionCandidate@106, ResolutionCandidate@107, ResolutionCandidate@108, ... }
+    <name not found> = ArrayList@143[4] { ResolutionCandidate@101, ResolutionCandidate@102, ResolutionCandidate@103, ... }
+    <name not found> = ArrayList@144[4] { ResolutionCandidate@126, ResolutionCandidate@127, ResolutionCandidate@128, ... }
+    <name not found> = ArrayList@145[4] { ResolutionCandidate@121, ResolutionCandidate@122, ResolutionCandidate@123, ... }
+    <name not found> = ArrayList@146[4] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113, ... }
+    <name not found> = ArrayList@147[4] { ResolutionCandidate@96, ResolutionCandidate@97, ResolutionCandidate@98, ... }
+    <name not found> = ArrayList@148[4] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
+    <name not found> = ArrayList@149[4] { ResolutionCandidate@131, ResolutionCandidate@132, ResolutionCandidate@133, ... }
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
diff --git a/compiler/testData/diagnostics/tests/inline/unsupportedConstruction.lazy.log b/compiler/testData/diagnostics/tests/inline/unsupportedConstruction.lazy.log
index 4f778ee8fd7..76fcf4f5d4f 100644
--- a/compiler/testData/diagnostics/tests/inline/unsupportedConstruction.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/unsupportedConstruction.lazy.log
@@ -53,20 +53,23 @@ LazyJavaPackageFragment@19['java'] {
 
 ResolutionTaskHolder@43 {
     <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+}
+
+null {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@48 }
 }
diff --git a/compiler/testData/diagnostics/tests/inline/vararg.lazy.log b/compiler/testData/diagnostics/tests/inline/vararg.lazy.log
index cefd91e6c10..cd6186a720d 100644
--- a/compiler/testData/diagnostics/tests/inline/vararg.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/vararg.lazy.log
@@ -82,15 +82,6 @@ LazyJavaPackageFragment@26['lang'] {
 
 ResolutionTaskHolder@58 {
     <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
     <name not found> = EmptyList@50[empty]
     <name not found> = EmptyList@50[empty]
     <name not found> = EmptyList@50[empty]
@@ -101,17 +92,8 @@ ResolutionTaskHolder@58 {
     <name not found> = EmptyList@50[empty]
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
     <name not found> = EmptyList@50[empty]
     <name not found> = EmptyList@50[empty]
     <name not found> = EmptyList@50[empty]
@@ -122,85 +104,106 @@ ResolutionTaskHolder@62 {
     <name not found> = EmptyList@50[empty]
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
     <name not found> = EmptyList@50[empty]
     <name not found> = EmptyList@50[empty]
+}
+
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
     <name not found> = EmptyList@50[empty]
     <name not found> = EmptyList@50[empty]
 }
 
 ResolutionTaskHolder@70 {
     <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
+}
+
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
 }
 
 ResolutionTaskHolder@82 {
     <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
 }
 
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
+}
+
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
 }
 
 ResolutionTaskHolder@94 {
     <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
 }
 
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
 }
 
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
+}
+
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
 }
 
 ResolutionTaskHolder@106 {
     <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
 }
 
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
+null {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@60 }
+    <name not found> = EmptyList@50[empty]
+    <name not found> = EmptyList@50[empty]
+    <name not found> = EmptyList@50[empty]
+    <name not found> = EmptyList@50[empty]
+    <name not found> = EmptyList@50[empty]
+    <name not found> = EmptyList@50[empty]
+    <name not found> = EmptyList@50[empty]
+    <name not found> = EmptyList@50[empty]
+    <name not found> = EmptyList@50[empty]
+    <name not found> = EmptyList@50[empty]
+    <name not found> = EmptyList@50[empty]
+    <name not found> = EmptyList@50[empty]
+    <name not found> = EmptyList@50[empty]
+    <name not found> = EmptyList@50[empty]
+    <name not found> = EmptyList@50[empty]
+    <name not found> = EmptyList@50[empty]
+    <name not found> = EmptyList@50[empty]
+    <name not found> = EmptyList@50[empty]
+    <name not found> = EmptyList@50[empty]
+    <name not found> = EmptyList@50[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inline/wrongUsage.lazy.log b/compiler/testData/diagnostics/tests/inline/wrongUsage.lazy.log
index f89b7f55f19..19e5aed999e 100644
--- a/compiler/testData/diagnostics/tests/inline/wrongUsage.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/wrongUsage.lazy.log
@@ -81,230 +81,233 @@ LazyJavaPackageFragment@32['java'] {
 
 ResolutionTaskHolder@58 {
     <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
+}
+
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
 }
 
 ResolutionTaskHolder@70 {
     <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
+}
+
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
 }
 
 ResolutionTaskHolder@82 {
     <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
 }
 
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
+}
+
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
 }
 
 ResolutionTaskHolder@94 {
     <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
 }
 
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
 }
 
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
+}
+
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
 }
 
 ResolutionTaskHolder@106 {
     <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
 }
 
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
 }
 
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
+}
+
+ResolutionTaskHolder@115 {
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
 }
 
 ResolutionTaskHolder@118 {
     <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
 }
 
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
+ResolutionTaskHolder@121 {
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
 }
 
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
+ResolutionTaskHolder@124 {
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
+}
+
+ResolutionTaskHolder@127 {
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
 }
 
 ResolutionTaskHolder@130 {
     <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@132 }
 }
 
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@136 }
+ResolutionTaskHolder@133 {
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
 }
 
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@140 }
+ResolutionTaskHolder@136 {
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
+}
+
+ResolutionTaskHolder@139 {
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
 }
 
 ResolutionTaskHolder@142 {
     <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@144 }
 }
 
-ResolutionTaskHolder@146 {
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@148 }
+ResolutionTaskHolder@145 {
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
 }
 
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@152 }
+ResolutionTaskHolder@148 {
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
+}
+
+ResolutionTaskHolder@151 {
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
 }
 
 ResolutionTaskHolder@154 {
     <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@156 }
 }
 
-ResolutionTaskHolder@158 {
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@160 }
+ResolutionTaskHolder@157 {
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
 }
 
-ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@164 }
+ResolutionTaskHolder@160 {
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
+}
+
+ResolutionTaskHolder@163 {
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
 }
 
 ResolutionTaskHolder@166 {
     <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@168 }
 }
 
-ResolutionTaskHolder@170 {
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@172 }
+ResolutionTaskHolder@169 {
+    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
 }
 
-ResolutionTaskHolder@174 {
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@176 }
+ResolutionTaskHolder@172 {
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
+}
+
+ResolutionTaskHolder@175 {
+    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
 }
 
 ResolutionTaskHolder@178 {
     <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@180 }
 }
 
-ResolutionTaskHolder@182 {
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@184 }
+ResolutionTaskHolder@181 {
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
 }
 
-ResolutionTaskHolder@186 {
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@188 }
+ResolutionTaskHolder@184 {
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
+}
+
+ResolutionTaskHolder@187 {
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
 }
 
 ResolutionTaskHolder@190 {
     <name not found> = ArrayList@191[1] { ResolutionCandidate@192 }
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@192 }
 }
 
-ResolutionTaskHolder@194 {
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@196 }
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@196 }
+ResolutionTaskHolder@193 {
+    <name not found> = ArrayList@194[1] { ResolutionCandidate@195 }
 }
 
-ResolutionTaskHolder@198 {
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@200 }
-}
-
-ResolutionTaskHolder@202 {
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@204 }
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@204 }
-}
-
-ResolutionTaskHolder@206 {
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@208 }
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@208 }
-}
-
-ResolutionTaskHolder@210 {
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@212 }
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@212 }
-}
-
-ResolutionTaskHolder@214 {
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@216 }
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@216 }
-}
-
-ResolutionTaskHolder@218 {
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@220 }
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@220 }
-}
-
-ResolutionTaskHolder@222 {
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@224 }
-}
-
-ResolutionTaskHolder@226 {
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@228 }
-}
-
-ResolutionTaskHolder@230 {
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@232 }
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@232 }
-}
-
-ResolutionTaskHolder@234 {
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@236 }
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@236 }
-}
-
-ResolutionTaskHolder@238 {
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@240 }
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@240 }
+null {
+    <name not found> = ArrayList@196[1] { ResolutionCandidate@147 }
+    <name not found> = ArrayList@197[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@198[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@171 }
+    <name not found> = ArrayList@200[1] { ResolutionCandidate@186 }
+    <name not found> = ArrayList@201[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@202[1] { ResolutionCandidate@126 }
+    <name not found> = ArrayList@203[1] { ResolutionCandidate@180 }
+    <name not found> = ArrayList@204[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@205[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@206[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@207[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@208[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@209[1] { ResolutionCandidate@159 }
+    <name not found> = ArrayList@210[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@211[1] { ResolutionCandidate@135 }
+    <name not found> = ArrayList@212[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@213[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@214[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@215[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@216[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@217[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@218[1] { ResolutionCandidate@162 }
+    <name not found> = ArrayList@219[1] { ResolutionCandidate@165 }
+    <name not found> = ArrayList@220[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@221[1] { ResolutionCandidate@129 }
+    <name not found> = ArrayList@222[1] { ResolutionCandidate@132 }
+    <name not found> = ArrayList@223[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@224[1] { ResolutionCandidate@168 }
+    <name not found> = ArrayList@225[1] { ResolutionCandidate@192 }
+    <name not found> = ArrayList@226[1] { ResolutionCandidate@189 }
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@228[1] { ResolutionCandidate@141 }
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@153 }
+    <name not found> = ArrayList@231[1] { ResolutionCandidate@183 }
+    <name not found> = ArrayList@232[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@233[1] { ResolutionCandidate@156 }
+    <name not found> = ArrayList@234[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@235[1] { ResolutionCandidate@177 }
+    <name not found> = ArrayList@236[1] { ResolutionCandidate@195 }
+    <name not found> = ArrayList@237[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@238[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@239[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@240[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@241[1] { ResolutionCandidate@174 }
 }
diff --git a/compiler/testData/diagnostics/tests/inner/classesInClassObjectHeader.lazy.log b/compiler/testData/diagnostics/tests/inner/classesInClassObjectHeader.lazy.log
index 568eff96ac6..f87b7409ff8 100644
--- a/compiler/testData/diagnostics/tests/inner/classesInClassObjectHeader.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/classesInClassObjectHeader.lazy.log
@@ -36,23 +36,26 @@ LazyJavaPackageFragment@14['java'] {
 
 ResolutionTaskHolder@32 {
     <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
+}
+
+null {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@37 }
 }
diff --git a/compiler/testData/diagnostics/tests/inner/constructorAccess.lazy.log b/compiler/testData/diagnostics/tests/inner/constructorAccess.lazy.log
index d3b4dd586ce..4823c189626 100644
--- a/compiler/testData/diagnostics/tests/inner/constructorAccess.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/constructorAccess.lazy.log
@@ -55,31 +55,7 @@ LazyJavaPackageFragment@15['lang'] {
 
 ResolutionTaskHolder@35 {
     <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -176,33 +152,9 @@ ResolutionTaskHolder@35 {
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@42 {
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -299,11 +251,9 @@ ResolutionTaskHolder@42 {
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -350,6 +300,40 @@ ResolutionTaskHolder@49 {
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
+}
+
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+}
+
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -364,25 +348,6 @@ ResolutionTaskHolder@49 {
 
 ResolutionTaskHolder@56 {
     <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -403,27 +368,8 @@ ResolutionTaskHolder@56 {
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -444,17 +390,8 @@ ResolutionTaskHolder@60 {
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -473,6 +410,10 @@ ResolutionTaskHolder@64 {
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
+}
+
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -487,35 +428,6 @@ ResolutionTaskHolder@64 {
 
 ResolutionTaskHolder@68 {
     <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -526,37 +438,8 @@ ResolutionTaskHolder@68 {
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -567,19 +450,8 @@ ResolutionTaskHolder@72 {
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -588,34 +460,204 @@ ResolutionTaskHolder@76 {
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
+}
+
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
 
 ResolutionTaskHolder@80 {
     <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+null {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@58 }
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -633,42 +675,3 @@ ResolutionTaskHolder@84 {
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inner/enumEntries.lazy.log b/compiler/testData/diagnostics/tests/inner/enumEntries.lazy.log
index a2f172bed28..2a468d999da 100644
--- a/compiler/testData/diagnostics/tests/inner/enumEntries.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/enumEntries.lazy.log
@@ -44,24 +44,7 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@33 {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
@@ -79,34 +62,54 @@ ResolutionTaskHolder@33 {
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
+}
+
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
 
 ResolutionTaskHolder@44 {
     <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[8] { ResolutionCandidate@49, ResolutionCandidate@50, ResolutionCandidate@51, ... }
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[8] { ResolutionCandidate@54, ResolutionCandidate@55, ResolutionCandidate@56, ... }
-    <name not found> = ArrayList@57[8] { ResolutionCandidate@54, ResolutionCandidate@55, ResolutionCandidate@56, ... }
+null {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@57[8] { ResolutionCandidate@49, ResolutionCandidate@50, ResolutionCandidate@51, ... }
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inner/extensionFun.lazy.log b/compiler/testData/diagnostics/tests/inner/extensionFun.lazy.log
index c6ee78ae7e3..6041d46246d 100644
--- a/compiler/testData/diagnostics/tests/inner/extensionFun.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/extensionFun.lazy.log
@@ -47,18 +47,6 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@32 {
     <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -108,27 +96,8 @@ ResolutionTaskHolder@32 {
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -149,9 +118,8 @@ ResolutionTaskHolder@36 {
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -170,6 +138,10 @@ ResolutionTaskHolder@40 {
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
+}
+
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -192,25 +164,6 @@ ResolutionTaskHolder@40 {
 
 ResolutionTaskHolder@44 {
     <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -231,27 +184,8 @@ ResolutionTaskHolder@44 {
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -272,17 +206,8 @@ ResolutionTaskHolder@48 {
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -301,6 +226,10 @@ ResolutionTaskHolder@52 {
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
+}
+
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -315,33 +244,6 @@ ResolutionTaskHolder@52 {
 
 ResolutionTaskHolder@56 {
     <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -354,67 +256,8 @@ ResolutionTaskHolder@56 {
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -425,18 +268,178 @@ ResolutionTaskHolder@68 {
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+}
+
+null {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@64 }
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
diff --git a/compiler/testData/diagnostics/tests/inner/extensionLambdaInsideNestedClass.lazy.log b/compiler/testData/diagnostics/tests/inner/extensionLambdaInsideNestedClass.lazy.log
index bd005bf501a..a161f4d1aed 100644
--- a/compiler/testData/diagnostics/tests/inner/extensionLambdaInsideNestedClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/extensionLambdaInsideNestedClass.lazy.log
@@ -44,51 +44,54 @@ LazyJavaPackageFragment@19['lang'] {
 
 ResolutionTaskHolder@41 {
     <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
     <name not found> = EmptyList@37[empty]
 }
 
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
+}
+
 ResolutionTaskHolder@53 {
     <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
+}
+
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
 }
 
 ResolutionTaskHolder@65 {
     <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+null {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@61 }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inner/innerErrorForClassObjects.lazy.log b/compiler/testData/diagnostics/tests/inner/innerErrorForClassObjects.lazy.log
index 98cc3cdf9be..f55d25d017c 100644
--- a/compiler/testData/diagnostics/tests/inner/innerErrorForClassObjects.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/innerErrorForClassObjects.lazy.log
@@ -58,17 +58,104 @@ LazyJavaPackageFragment@17['lang'] {
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
     <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
     <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -119,30 +206,9 @@ ResolutionTaskHolder@40 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -237,6 +303,10 @@ ResolutionTaskHolder@59 {
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -244,149 +314,82 @@ ResolutionTaskHolder@59 {
 
 ResolutionTaskHolder@66 {
     <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@69 {
     <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
+null {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@74 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
-}
diff --git a/compiler/testData/diagnostics/tests/inner/innerErrorForObjects.lazy.log b/compiler/testData/diagnostics/tests/inner/innerErrorForObjects.lazy.log
index 799d9b3a627..0ab254b15d0 100644
--- a/compiler/testData/diagnostics/tests/inner/innerErrorForObjects.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/innerErrorForObjects.lazy.log
@@ -58,33 +58,13 @@ LazyJavaPackageFragment@17['lang'] {
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
     <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
     <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -159,49 +139,9 @@ ResolutionTaskHolder@40 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -362,49 +302,9 @@ ResolutionTaskHolder@65 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -565,28 +465,131 @@ ResolutionTaskHolder@72 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
 }
 
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
+}
+
+null {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@78 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inner/innerThisSuper.lazy.log b/compiler/testData/diagnostics/tests/inner/innerThisSuper.lazy.log
index 914718150e7..0f6c33b73b8 100644
--- a/compiler/testData/diagnostics/tests/inner/innerThisSuper.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/innerThisSuper.lazy.log
@@ -32,30 +32,33 @@ LazyJavaPackageFragment@12['java'] {
 
 ResolutionTaskHolder@26 {
     <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
 }
 
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
+ResolutionTaskHolder@29 {
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
 }
 
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
+}
+
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
 }
 
 ResolutionTaskHolder@38 {
     <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+null {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@28 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@34 }
 }
diff --git a/compiler/testData/diagnostics/tests/inner/kt5854.lazy.log b/compiler/testData/diagnostics/tests/inner/kt5854.lazy.log
index 97cc27d3d9f..5b4d357189d 100644
--- a/compiler/testData/diagnostics/tests/inner/kt5854.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/kt5854.lazy.log
@@ -31,19 +31,7 @@ LazyJavaPackageFragment@7['lang'] {
 
 ResolutionTaskHolder@22 {
     <name not found> = ArrayList@23[1] { ResolutionCandidate@24 }
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@24 }
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
+    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
     <name not found> = EmptyList@14[empty]
     <name not found> = EmptyList@14[empty]
     <name not found> = EmptyList@14[empty]
@@ -91,3 +79,18 @@ ResolutionTaskHolder@22 {
     <name not found> = EmptyList@14[empty]
     <name not found> = EmptyList@14[empty]
 }
+
+null {
+    <name not found> = ArrayList@27[1] { ResolutionCandidate@24 }
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@26 }
+    <name not found> = EmptyList@14[empty]
+    <name not found> = EmptyList@14[empty]
+    <name not found> = EmptyList@14[empty]
+    <name not found> = EmptyList@14[empty]
+    <name not found> = EmptyList@14[empty]
+    <name not found> = EmptyList@14[empty]
+    <name not found> = EmptyList@14[empty]
+    <name not found> = EmptyList@14[empty]
+    <name not found> = EmptyList@14[empty]
+    <name not found> = EmptyList@14[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/inner/kt6026.lazy.log b/compiler/testData/diagnostics/tests/inner/kt6026.lazy.log
index 489c3a019a1..693b358494a 100644
--- a/compiler/testData/diagnostics/tests/inner/kt6026.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/kt6026.lazy.log
@@ -44,19 +44,7 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
@@ -104,3 +92,18 @@ ResolutionTaskHolder@28 {
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
+
+null {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@32 }
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/inner/localClass.lazy.log b/compiler/testData/diagnostics/tests/inner/localClass.lazy.log
index c53e0e05b45..7d3ba178c02 100644
--- a/compiler/testData/diagnostics/tests/inner/localClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/localClass.lazy.log
@@ -53,22 +53,10 @@ LazyJavaPackageFragment@15['lang'] {
 
 ResolutionTaskHolder@35 {
     <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
     <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -78,13 +66,27 @@ ResolutionTaskHolder@35 {
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+}
+
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -95,62 +97,63 @@ ResolutionTaskHolder@51 {
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
 }
 
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[7] { ResolutionCandidate@74, ResolutionCandidate@75, ResolutionCandidate@76, ... }
+}
+
+null {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@92[7] { ResolutionCandidate@74, ResolutionCandidate@75, ResolutionCandidate@76, ... }
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[7] { ResolutionCandidate@89, ResolutionCandidate@90, ResolutionCandidate@91, ... }
-    <name not found> = ArrayList@92[7] { ResolutionCandidate@89, ResolutionCandidate@90, ResolutionCandidate@91, ... }
-}
diff --git a/compiler/testData/diagnostics/tests/inner/localClassInsideNested.lazy.log b/compiler/testData/diagnostics/tests/inner/localClassInsideNested.lazy.log
index 5b4729789eb..637067b57ef 100644
--- a/compiler/testData/diagnostics/tests/inner/localClassInsideNested.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/localClassInsideNested.lazy.log
@@ -37,33 +37,13 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
@@ -137,3 +117,26 @@ ResolutionTaskHolder@25 {
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
+
+null {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@27 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@41 }
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/inner/localThisSuper.lazy.log b/compiler/testData/diagnostics/tests/inner/localThisSuper.lazy.log
index 06f8b759ef3..c2924897386 100644
--- a/compiler/testData/diagnostics/tests/inner/localThisSuper.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/localThisSuper.lazy.log
@@ -36,20 +36,23 @@ LazyJavaPackageFragment@11['java'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
+}
+
+null {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@27 }
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@36 }
 }
diff --git a/compiler/testData/diagnostics/tests/inner/modality.lazy.log b/compiler/testData/diagnostics/tests/inner/modality.lazy.log
index 9c7c5e1ffb4..3b5b3aa959d 100644
--- a/compiler/testData/diagnostics/tests/inner/modality.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/modality.lazy.log
@@ -29,43 +29,46 @@ LazyJavaPackageFragment@9['java'] {
 
 ResolutionTaskHolder@29 {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+}
+
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
 }
 
 ResolutionTaskHolder@41 {
     <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+null {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@37 }
 }
diff --git a/compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.lazy.log b/compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.lazy.log
index 7b419d27627..13fcd641168 100644
--- a/compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.lazy.log
@@ -61,13 +61,7 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@38 {
     <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -92,11 +86,36 @@ ResolutionTaskHolder@38 {
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@45 {
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@48 {
     <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -119,20 +138,37 @@ ResolutionTaskHolder@45 {
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -160,12 +196,6 @@ ResolutionTaskHolder@52 {
 
 ResolutionTaskHolder@59 {
     <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -191,14 +221,8 @@ ResolutionTaskHolder@59 {
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -224,9 +248,8 @@ ResolutionTaskHolder@63 {
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -250,6 +273,28 @@ ResolutionTaskHolder@67 {
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -259,24 +304,6 @@ ResolutionTaskHolder@67 {
 
 ResolutionTaskHolder@71 {
     <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -290,26 +317,8 @@ ResolutionTaskHolder@71 {
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -323,15 +332,8 @@ ResolutionTaskHolder@75 {
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -343,6 +345,10 @@ ResolutionTaskHolder@79 {
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -358,9 +364,6 @@ ResolutionTaskHolder@79 {
 
 ResolutionTaskHolder@83 {
     <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -374,11 +377,8 @@ ResolutionTaskHolder@83 {
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -392,9 +392,8 @@ ResolutionTaskHolder@87 {
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -406,15 +405,25 @@ ResolutionTaskHolder@91 {
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
 ResolutionTaskHolder@95 {
     <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -428,11 +437,8 @@ ResolutionTaskHolder@95 {
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -446,9 +452,8 @@ ResolutionTaskHolder@99 {
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -460,58 +465,49 @@ ResolutionTaskHolder@103 {
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
 ResolutionTaskHolder@107 {
     <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@113 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@117 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@113 {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -520,293 +516,144 @@ ResolutionTaskHolder@115 {
 
 ResolutionTaskHolder@119 {
     <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@121 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@125 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@122 {
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@129 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@125 {
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
     <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@128 {
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
     <name not found> = EmptyList@30[empty]
 }
 
 ResolutionTaskHolder@131 {
     <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@133 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@137 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@134 {
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
 }
 
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@141 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@137 {
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
+}
+
+ResolutionTaskHolder@140 {
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
 }
 
 ResolutionTaskHolder@143 {
     <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@145 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@149 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@146 {
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
 }
 
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@153 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@149 {
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
+}
+
+ResolutionTaskHolder@152 {
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
 }
 
 ResolutionTaskHolder@155 {
     <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@157 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@161 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@158 {
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
 }
 
-ResolutionTaskHolder@163 {
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@165 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@161 {
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
+}
+
+ResolutionTaskHolder@164 {
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
 }
 
 ResolutionTaskHolder@167 {
     <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@169 }
 }
 
-ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@173 }
+ResolutionTaskHolder@170 {
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
 }
 
-ResolutionTaskHolder@175 {
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@177 }
+ResolutionTaskHolder@173 {
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
+}
+
+ResolutionTaskHolder@176 {
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
 }
 
 ResolutionTaskHolder@179 {
     <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@181 }
 }
 
-ResolutionTaskHolder@183 {
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@185 }
+ResolutionTaskHolder@182 {
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
 }
 
-ResolutionTaskHolder@187 {
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@189 }
+ResolutionTaskHolder@185 {
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
+}
+
+ResolutionTaskHolder@188 {
+    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
 }
 
 ResolutionTaskHolder@191 {
     <name not found> = ArrayList@192[1] { ResolutionCandidate@193 }
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@193 }
 }
 
-ResolutionTaskHolder@195 {
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@197 }
+ResolutionTaskHolder@194 {
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@196 }
 }
 
-ResolutionTaskHolder@199 {
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@201 }
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@201 }
+ResolutionTaskHolder@197 {
+    <name not found> = ArrayList@198[1] { ResolutionCandidate@199 }
+}
+
+ResolutionTaskHolder@200 {
+    <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
 }
 
 ResolutionTaskHolder@203 {
     <name not found> = ArrayList@204[1] { ResolutionCandidate@205 }
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@205 }
 }
 
-ResolutionTaskHolder@207 {
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@209 }
+ResolutionTaskHolder@206 {
+    <name not found> = ArrayList@207[1] { ResolutionCandidate@208 }
 }
 
-ResolutionTaskHolder@211 {
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@213 }
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@213 }
+ResolutionTaskHolder@209 {
+    <name not found> = ArrayList@210[1] { ResolutionCandidate@211 }
+}
+
+ResolutionTaskHolder@212 {
+    <name not found> = ArrayList@213[1] { ResolutionCandidate@214 }
 }
 
 ResolutionTaskHolder@215 {
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@217 }
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@217 }
-}
-
-ResolutionTaskHolder@219 {
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@221 }
-}
-
-ResolutionTaskHolder@223 {
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@225 }
-}
-
-ResolutionTaskHolder@227 {
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@229 }
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@229 }
-}
-
-ResolutionTaskHolder@231 {
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@233 }
-}
-
-ResolutionTaskHolder@235 {
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@237 }
-}
-
-ResolutionTaskHolder@239 {
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@241 }
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@241 }
-}
-
-ResolutionTaskHolder@243 {
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@245 }
-}
-
-ResolutionTaskHolder@247 {
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@249 }
-}
-
-ResolutionTaskHolder@251 {
-    <name not found> = ArrayList@252[1] { ResolutionCandidate@253 }
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@253 }
-}
-
-ResolutionTaskHolder@255 {
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
-    <name not found> = ArrayList@258[1] { ResolutionCandidate@257 }
-}
-
-ResolutionTaskHolder@259 {
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@261 }
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@261 }
-}
-
-ResolutionTaskHolder@263 {
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@265 }
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@265 }
-}
-
-ResolutionTaskHolder@267 {
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
-    <name not found> = ArrayList@270[1] { ResolutionCandidate@269 }
-}
-
-ResolutionTaskHolder@271 {
-    <name not found> = ArrayList@272[1] { ResolutionCandidate@273 }
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@273 }
-}
-
-ResolutionTaskHolder@275 {
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -819,19 +666,50 @@ ResolutionTaskHolder@275 {
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@216 {
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@217 {
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@218 {
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@276 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@219 {
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -842,14 +720,7 @@ ResolutionTaskHolder@276 {
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@277 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@220 {
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -860,33 +731,165 @@ ResolutionTaskHolder@277 {
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@278 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@279 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@280 {
+null {
+    <name not found> = ArrayList@221[1] { ResolutionCandidate@157 }
+    <name not found> = ArrayList@222[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@223[1] { ResolutionCandidate@208 }
+    <name not found> = ArrayList@224[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@225[1] { ResolutionCandidate@178 }
+    <name not found> = ArrayList@226[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@228[1] { ResolutionCandidate@154 }
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@231[1] { ResolutionCandidate@205 }
+    <name not found> = ArrayList@232[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@233[1] { ResolutionCandidate@139 }
+    <name not found> = ArrayList@234[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@235[1] { ResolutionCandidate@160 }
+    <name not found> = ArrayList@236[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@237[1] { ResolutionCandidate@202 }
+    <name not found> = ArrayList@238[1] { ResolutionCandidate@193 }
+    <name not found> = ArrayList@239[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@240[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@241[1] { ResolutionCandidate@190 }
+    <name not found> = ArrayList@242[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@243[1] { ResolutionCandidate@163 }
+    <name not found> = ArrayList@244[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@245[1] { ResolutionCandidate@196 }
+    <name not found> = ArrayList@246[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@247[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@248[1] { ResolutionCandidate@175 }
+    <name not found> = ArrayList@249[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@250[1] { ResolutionCandidate@124 }
+    <name not found> = ArrayList@251[1] { ResolutionCandidate@172 }
+    <name not found> = ArrayList@252[1] { ResolutionCandidate@127 }
+    <name not found> = ArrayList@253[1] { ResolutionCandidate@142 }
+    <name not found> = ArrayList@254[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@255[1] { ResolutionCandidate@136 }
+    <name not found> = ArrayList@256[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@257[1] { ResolutionCandidate@145 }
+    <name not found> = ArrayList@258[1] { ResolutionCandidate@181 }
+    <name not found> = ArrayList@259[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@260[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@261[1] { ResolutionCandidate@211 }
+    <name not found> = ArrayList@262[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@263[1] { ResolutionCandidate@184 }
+    <name not found> = ArrayList@264[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@265[1] { ResolutionCandidate@151 }
+    <name not found> = ArrayList@266[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@267[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@268[1] { ResolutionCandidate@166 }
+    <name not found> = ArrayList@269[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@270[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@271[1] { ResolutionCandidate@199 }
+    <name not found> = ArrayList@272[1] { ResolutionCandidate@133 }
+    <name not found> = ArrayList@273[1] { ResolutionCandidate@169 }
+    <name not found> = ArrayList@274[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@275[1] { ResolutionCandidate@187 }
+    <name not found> = ArrayList@276[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@277[1] { ResolutionCandidate@148 }
+    <name not found> = ArrayList@278[1] { ResolutionCandidate@214 }
+    <name not found> = ArrayList@279[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@280[1] { ResolutionCandidate@112 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
diff --git a/compiler/testData/diagnostics/tests/inner/nestedClassExtendsOuter.lazy.log b/compiler/testData/diagnostics/tests/inner/nestedClassExtendsOuter.lazy.log
index c0ad6ac8c0c..f3d022ddc5a 100644
--- a/compiler/testData/diagnostics/tests/inner/nestedClassExtendsOuter.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/nestedClassExtendsOuter.lazy.log
@@ -39,19 +39,22 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@26 {
     <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
 }
 
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
+ResolutionTaskHolder@29 {
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
 }
 
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
+}
+
+null {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@28 }
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@34 }
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inner/nestedClassExtendsOuterGeneric.lazy.log b/compiler/testData/diagnostics/tests/inner/nestedClassExtendsOuterGeneric.lazy.log
index 1d9337d15f8..273ad0b644f 100644
--- a/compiler/testData/diagnostics/tests/inner/nestedClassExtendsOuterGeneric.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/nestedClassExtendsOuterGeneric.lazy.log
@@ -43,43 +43,46 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@34 {
     <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+}
+
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
 }
 
 ResolutionTaskHolder@46 {
     <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
+null {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@54 }
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inner/nestedVsInnerAccessOuterMember.lazy.log b/compiler/testData/diagnostics/tests/inner/nestedVsInnerAccessOuterMember.lazy.log
index 23a7cb9a54e..8c935e95814 100644
--- a/compiler/testData/diagnostics/tests/inner/nestedVsInnerAccessOuterMember.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/nestedVsInnerAccessOuterMember.lazy.log
@@ -59,210 +59,191 @@ LazyJavaPackageFragment@15['lang'] {
 
 ResolutionTaskHolder@33 {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
     <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+}
+
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
     <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
     <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@62 {
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
     <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+}
+
+ResolutionTaskHolder@65 {
     <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+}
+
+ResolutionTaskHolder@68 {
     <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
@@ -275,86 +256,108 @@ ResolutionTaskHolder@72 {
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
+}
+
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
+}
+
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
+}
+
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
 }
 
 ResolutionTaskHolder@83 {
     <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
 }
 
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
+null {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@88 }
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inner/outerGenericParam.lazy.log b/compiler/testData/diagnostics/tests/inner/outerGenericParam.lazy.log
index dcb4dd6b1a8..f29b46aba13 100644
--- a/compiler/testData/diagnostics/tests/inner/outerGenericParam.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/outerGenericParam.lazy.log
@@ -26,15 +26,18 @@ LazyJavaPackageFragment@10['java'] {
 
 ResolutionTaskHolder@24 {
     <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
 }
 
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
+ResolutionTaskHolder@27 {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
 }
 
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
+}
+
+null {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@26 }
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@29 }
 }
diff --git a/compiler/testData/diagnostics/tests/inner/outerProtectedMember.lazy.log b/compiler/testData/diagnostics/tests/inner/outerProtectedMember.lazy.log
index 58a7beadfd2..1a803e30802 100644
--- a/compiler/testData/diagnostics/tests/inner/outerProtectedMember.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/outerProtectedMember.lazy.log
@@ -32,5 +32,8 @@ LazyJavaPackageFragment@10['java'] {
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
+}
+
+null {
     <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
 }
diff --git a/compiler/testData/diagnostics/tests/inner/outerSuperClassMember.lazy.log b/compiler/testData/diagnostics/tests/inner/outerSuperClassMember.lazy.log
index 1003d1ab094..a302dc568dc 100644
--- a/compiler/testData/diagnostics/tests/inner/outerSuperClassMember.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/outerSuperClassMember.lazy.log
@@ -38,31 +38,7 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@27 {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
@@ -159,7 +135,34 @@ ResolutionTaskHolder@27 {
     <name not found> = EmptyList@19[empty]
 }
 
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
+}
+
+null {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@31 }
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/classObjectOfNestedClass.lazy.log b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/classObjectOfNestedClass.lazy.log
index ef97031aed3..03701734c17 100644
--- a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/classObjectOfNestedClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/classObjectOfNestedClass.lazy.log
@@ -34,47 +34,50 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@23 {
     <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@25 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@26 {
+    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
+ResolutionTaskHolder@29 {
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
     <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
     <name not found> = EmptyList@20[empty]
 }
 
 ResolutionTaskHolder@35 {
     <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+null {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@28 }
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@25 }
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/constructNestedClass.lazy.log b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/constructNestedClass.lazy.log
index 567e5c95db2..535cbe5c871 100644
--- a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/constructNestedClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/constructNestedClass.lazy.log
@@ -43,74 +43,100 @@ LazyJavaPackageFragment@15['lang'] {
 
 ResolutionTaskHolder@32 {
     <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
+}
+
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
 }
 
 ResolutionTaskHolder@44 {
     <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
+}
+
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
 }
 
 ResolutionTaskHolder@56 {
     <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+}
+
+ResolutionTaskHolder@59 {
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
 }
 
 ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+ResolutionTaskHolder@61 {
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@62 {
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -119,6 +145,9 @@ ResolutionTaskHolder@68 {
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
+}
+
+ResolutionTaskHolder@63 {
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -129,19 +158,7 @@ ResolutionTaskHolder@68 {
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@64 {
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -152,9 +169,7 @@ ResolutionTaskHolder@69 {
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@65 {
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -165,9 +180,7 @@ ResolutionTaskHolder@70 {
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@71 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@66 {
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -178,9 +191,7 @@ ResolutionTaskHolder@71 {
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@67 {
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -191,46 +202,38 @@ ResolutionTaskHolder@72 {
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@76 {
+null {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@55 }
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
diff --git a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/dataLocalVariable.lazy.log b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/dataLocalVariable.lazy.log
index ac09bd4fe02..ae1c88dde40 100644
--- a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/dataLocalVariable.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/dataLocalVariable.lazy.log
@@ -46,24 +46,27 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@35 {
     <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+}
+
+null {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@37 }
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/enumConstant.lazy.log b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/enumConstant.lazy.log
index 726b2ef27a5..9cbc267e36a 100644
--- a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/enumConstant.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/enumConstant.lazy.log
@@ -32,21 +32,15 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@23 {
     <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@25 }
-    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@26 {
+    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@31 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@29 {
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
@@ -57,9 +51,7 @@ ResolutionTaskHolder@31 {
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@32 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@30 {
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
@@ -69,3 +61,14 @@ ResolutionTaskHolder@32 {
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
+
+null {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@28 }
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@25 }
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/genericNestedClass.lazy.log b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/genericNestedClass.lazy.log
index 89f19b4272d..37d33634f4d 100644
--- a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/genericNestedClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/genericNestedClass.lazy.log
@@ -41,10 +41,6 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@33 {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -62,36 +58,25 @@ ResolutionTaskHolder@33 {
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
 ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -102,9 +87,7 @@ ResolutionTaskHolder@49 {
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@46 {
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -115,9 +98,7 @@ ResolutionTaskHolder@50 {
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@47 {
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -128,7 +109,29 @@ ResolutionTaskHolder@51 {
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@52 {
+ResolutionTaskHolder@48 {
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+}
+
+null {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@35 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
diff --git a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/importNestedClass.lazy.log b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/importNestedClass.lazy.log
index d39bbe31965..40bcad9789f 100644
--- a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/importNestedClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/importNestedClass.lazy.log
@@ -59,43 +59,56 @@ LazyJavaPackageFragment@18['lang'] {
 
 ResolutionTaskHolder@42 {
     <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
+}
+
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
 ResolutionTaskHolder@54 {
     <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+}
+
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
+ResolutionTaskHolder@61 {
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
@@ -103,17 +116,6 @@ ResolutionTaskHolder@58 {
 }
 
 ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
@@ -124,9 +126,7 @@ ResolutionTaskHolder@66 {
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@67 {
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
+ResolutionTaskHolder@63 {
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
@@ -137,20 +137,23 @@ ResolutionTaskHolder@67 {
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@69 {
+null {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@50 }
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
diff --git a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedClassInPackage.lazy.log b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedClassInPackage.lazy.log
index 0bfe2e544ee..10a4e237466 100644
--- a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedClassInPackage.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedClassInPackage.lazy.log
@@ -29,7 +29,15 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@24 {
     <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@27 {
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
@@ -45,15 +53,10 @@ ResolutionTaskHolder@28 {
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+null {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@26 }
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
diff --git a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedEnumConstant.lazy.log b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedEnumConstant.lazy.log
index 0b6eb2d0d2e..0d472b48f34 100644
--- a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedEnumConstant.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedEnumConstant.lazy.log
@@ -32,14 +32,32 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@23 {
     <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@25 }
+    <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@26 {
+    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
+    <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@29 {
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
+ResolutionTaskHolder@30 {
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
@@ -53,8 +71,6 @@ ResolutionTaskHolder@31 {
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
 }
 
 ResolutionTaskHolder@32 {
@@ -66,24 +82,11 @@ ResolutionTaskHolder@32 {
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@34 {
+null {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@28 }
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@25 }
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
diff --git a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedObjects.lazy.log b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedObjects.lazy.log
index 086f43d7ad3..251f16b5d63 100644
--- a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedObjects.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedObjects.lazy.log
@@ -32,21 +32,24 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@24 {
     <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
-    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@27 {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
+    <name not found> = EmptyList@21[empty]
+}
+
+null {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@26 }
+    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/typePosition.lazy.log b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/typePosition.lazy.log
index 0262646c0fd..17bc9975aec 100644
--- a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/typePosition.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/typePosition.lazy.log
@@ -23,10 +23,13 @@ LazyJavaPackageFragment@7['java'] {
 
 ResolutionTaskHolder@23 {
     <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@25 }
 }
 
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
+ResolutionTaskHolder@26 {
+    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
+}
+
+null {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@25 }
 }
diff --git a/compiler/testData/diagnostics/tests/inner/referenceToSelfInLocal.lazy.log b/compiler/testData/diagnostics/tests/inner/referenceToSelfInLocal.lazy.log
index 3c63ccfe2a7..dd20dfd6502 100644
--- a/compiler/testData/diagnostics/tests/inner/referenceToSelfInLocal.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/referenceToSelfInLocal.lazy.log
@@ -41,15 +41,6 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@30 {
     <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
@@ -60,17 +51,8 @@ ResolutionTaskHolder@30 {
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
@@ -81,15 +63,8 @@ ResolutionTaskHolder@34 {
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
@@ -98,20 +73,48 @@ ResolutionTaskHolder@38 {
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@42 {
     <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+null {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@41 }
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/inner/resolvePackageClassInObjects.lazy.log b/compiler/testData/diagnostics/tests/inner/resolvePackageClassInObjects.lazy.log
index d69633aea18..8d5170759e3 100644
--- a/compiler/testData/diagnostics/tests/inner/resolvePackageClassInObjects.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/resolvePackageClassInObjects.lazy.log
@@ -20,10 +20,13 @@ LazyJavaPackageFragment@6['java'] {
 
 ResolutionTaskHolder@20 {
     <name not found> = ArrayList@21[1] { ResolutionCandidate@22 }
-    <name not found> = ArrayList@23[1] { ResolutionCandidate@22 }
 }
 
-ResolutionTaskHolder@24 {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
+ResolutionTaskHolder@23 {
+    <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
+}
+
+null {
+    <name not found> = ArrayList@26[1] { ResolutionCandidate@22 }
+    <name not found> = ArrayList@27[1] { ResolutionCandidate@25 }
 }
diff --git a/compiler/testData/diagnostics/tests/inner/selfAnnotationForClassObject.lazy.log b/compiler/testData/diagnostics/tests/inner/selfAnnotationForClassObject.lazy.log
index 815350860c8..31b020f71a0 100644
--- a/compiler/testData/diagnostics/tests/inner/selfAnnotationForClassObject.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/selfAnnotationForClassObject.lazy.log
@@ -41,10 +41,13 @@ LazyJavaPackageFragment@15['lang'] {
 
 ResolutionTaskHolder@32 {
     <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
 }
 
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+}
+
+null {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@34 }
 }
diff --git a/compiler/testData/diagnostics/tests/inner/visibility.lazy.log b/compiler/testData/diagnostics/tests/inner/visibility.lazy.log
index acd19533feb..21971fd5818 100644
--- a/compiler/testData/diagnostics/tests/inner/visibility.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/visibility.lazy.log
@@ -42,14 +42,6 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@27 {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
@@ -83,14 +75,8 @@ ResolutionTaskHolder@27 {
     <name not found> = EmptyList@19[empty]
 }
 
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
@@ -116,9 +102,8 @@ ResolutionTaskHolder@31 {
     <name not found> = EmptyList@19[empty]
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
@@ -142,6 +127,20 @@ ResolutionTaskHolder@35 {
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
+}
+
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
@@ -151,10 +150,6 @@ ResolutionTaskHolder@35 {
 
 ResolutionTaskHolder@39 {
     <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
@@ -172,12 +167,8 @@ ResolutionTaskHolder@39 {
     <name not found> = EmptyList@19[empty]
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
@@ -195,126 +186,140 @@ ResolutionTaskHolder@43 {
     <name not found> = EmptyList@19[empty]
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
 }
 
 ResolutionTaskHolder@51 {
     <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
 }
 
 ResolutionTaskHolder@63 {
     <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
 }
 
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
 }
 
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
+}
+
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
 }
 
 ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
 }
 
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
+ResolutionTaskHolder@76 {
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
 }
 
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
+ResolutionTaskHolder@77 {
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
 }
 
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
+ResolutionTaskHolder@78 {
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
@@ -325,29 +330,7 @@ ResolutionTaskHolder@91 {
     <name not found> = EmptyList@19[empty]
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
+ResolutionTaskHolder@79 {
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
@@ -358,29 +341,7 @@ ResolutionTaskHolder@92 {
     <name not found> = EmptyList@19[empty]
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
+ResolutionTaskHolder@80 {
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
@@ -391,33 +352,75 @@ ResolutionTaskHolder@93 {
     <name not found> = EmptyList@19[empty]
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@96 {
+null {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@71 }
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
diff --git a/compiler/testData/diagnostics/tests/j+k/GenericsInSupertypes.lazy.log b/compiler/testData/diagnostics/tests/j+k/GenericsInSupertypes.lazy.log
index a851cc809ab..993642e0932 100644
--- a/compiler/testData/diagnostics/tests/j+k/GenericsInSupertypes.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/GenericsInSupertypes.lazy.log
@@ -481,7 +481,7 @@ LazyJavaClassifierType@455['Collection<? extends E>'] {
 
 LazyJavaClassifierType@460['Collection<? extends E>'] {
     arguments = ArrayList@461[1] { TypeProjectionImpl@462 }
-    classifier = JavaClassImpl@438['Collection']
+    classifier = JavaClassImpl@432['Collection']
     memberScope = SubstitutingScope@463
     nullable = 'true': Boolean@407
     typeConstructor = DeserializedClassTypeConstructor@459
@@ -489,7 +489,7 @@ LazyJavaClassifierType@460['Collection<? extends E>'] {
 
 LazyJavaClassifierType@464['Collection<? extends E>'] {
     arguments = ArrayList@465[1] { TypeProjectionImpl@466 }
-    classifier = JavaClassImpl@432['Collection']
+    classifier = JavaClassImpl@438['Collection']
     memberScope = SubstitutingScope@467
     nullable = 'true': Boolean@407
     typeConstructor = DeserializedClassTypeConstructor@459
@@ -561,7 +561,7 @@ LazyJavaClassifierType@501['Collection<?>'] {
 
 LazyJavaClassifierType@506['Collection<?>'] {
     arguments = ArrayList@507[1] { LazyStarProjection@508 }
-    classifier = JavaClassImpl@484['Collection']
+    classifier = JavaClassImpl@479['Collection']
     memberScope = SubstitutingScope@509
     nullable = 'true': Boolean@407
     typeConstructor = DeserializedClassTypeConstructor@459
@@ -569,7 +569,7 @@ LazyJavaClassifierType@506['Collection<?>'] {
 
 LazyJavaClassifierType@510['Collection<?>'] {
     arguments = ArrayList@511[1] { LazyStarProjection@512 }
-    classifier = JavaClassImpl@479['Collection']
+    classifier = JavaClassImpl@489['Collection']
     memberScope = SubstitutingScope@513
     nullable = 'true': Boolean@407
     typeConstructor = DeserializedClassTypeConstructor@459
@@ -577,7 +577,7 @@ LazyJavaClassifierType@510['Collection<?>'] {
 
 LazyJavaClassifierType@514['Collection<?>'] {
     arguments = ArrayList@515[1] { LazyStarProjection@516 }
-    classifier = JavaClassImpl@494['Collection']
+    classifier = JavaClassImpl@484['Collection']
     memberScope = SubstitutingScope@517
     nullable = 'true': Boolean@407
     typeConstructor = DeserializedClassTypeConstructor@459
@@ -585,7 +585,7 @@ LazyJavaClassifierType@514['Collection<?>'] {
 
 LazyJavaClassifierType@518['Collection<?>'] {
     arguments = ArrayList@519[1] { LazyStarProjection@520 }
-    classifier = JavaClassImpl@489['Collection']
+    classifier = JavaClassImpl@499['Collection']
     memberScope = SubstitutingScope@521
     nullable = 'true': Boolean@407
     typeConstructor = DeserializedClassTypeConstructor@459
@@ -593,7 +593,7 @@ LazyJavaClassifierType@518['Collection<?>'] {
 
 LazyJavaClassifierType@522['Collection<?>'] {
     arguments = ArrayList@523[1] { LazyStarProjection@524 }
-    classifier = JavaClassImpl@504['Collection']
+    classifier = JavaClassImpl@494['Collection']
     memberScope = SubstitutingScope@525
     nullable = 'true': Boolean@407
     typeConstructor = DeserializedClassTypeConstructor@459
@@ -601,7 +601,7 @@ LazyJavaClassifierType@522['Collection<?>'] {
 
 LazyJavaClassifierType@526['Collection<?>'] {
     arguments = ArrayList@527[1] { LazyStarProjection@528 }
-    classifier = JavaClassImpl@499['Collection']
+    classifier = JavaClassImpl@504['Collection']
     memberScope = SubstitutingScope@529
     nullable = 'true': Boolean@407
     typeConstructor = DeserializedClassTypeConstructor@459
@@ -634,49 +634,49 @@ LazyJavaClassifierType@543['E'] {
     arguments = ArrayList@544[empty]
     classifier = JavaTypeParameterImpl@545['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@546
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
 }
 
-LazyJavaClassifierType@547['E'] {
-    arguments = ArrayList@548[empty]
-    classifier = JavaTypeParameterImpl@549['E']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
-}
-
-LazyJavaClassifierType@550['E'] {
-    arguments = ArrayList@551[empty]
-    classifier = JavaTypeParameterImpl@552['E']
+LazyJavaClassifierType@546['E'] {
+    arguments = ArrayList@547[empty]
+    classifier = JavaTypeParameterImpl@548['E']
     nullable = 'false': Boolean@396
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
 }
 
-LazyJavaClassifierType@553['E'] {
-    arguments = ArrayList@554[empty]
-    classifier = JavaTypeParameterImpl@555['E']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
-}
-
-LazyJavaClassifierType@556['E'] {
-    arguments = ArrayList@557[empty]
-    classifier = JavaTypeParameterImpl@558['E']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
-}
-
-LazyJavaClassifierType@559['E'] {
-    arguments = ArrayList@560[empty]
-    classifier = JavaTypeParameterImpl@561['E']
+LazyJavaClassifierType@549['E'] {
+    arguments = ArrayList@550[empty]
+    classifier = JavaTypeParameterImpl@551['E']
     nullable = 'false': Boolean@396
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
 }
 
+LazyJavaClassifierType@552['E'] {
+    arguments = ArrayList@553[empty]
+    classifier = JavaTypeParameterImpl@554['E']
+    nullable = 'false': Boolean@396
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
+}
+
+LazyJavaClassifierType@555['E'] {
+    arguments = ArrayList@556[empty]
+    classifier = JavaTypeParameterImpl@557['E']
+    nullable = 'false': Boolean@396
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+}
+
+LazyJavaClassifierType@558['E'] {
+    arguments = ArrayList@559[empty]
+    classifier = JavaTypeParameterImpl@560['E']
+    nullable = 'false': Boolean@396
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
+}
+
 LazyJavaClassifierType@562['E'] {
     arguments = ArrayList@563[empty]
     classifier = JavaTypeParameterImpl@564['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@546
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
 }
 
 LazyJavaClassifierType@565['E'] {
@@ -690,49 +690,49 @@ LazyJavaClassifierType@568['E'] {
     arguments = ArrayList@569[empty]
     classifier = JavaTypeParameterImpl@570['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
 }
 
 LazyJavaClassifierType@571['E'] {
     arguments = ArrayList@572[empty]
     classifier = JavaTypeParameterImpl@573['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
 }
 
 LazyJavaClassifierType@574['E'] {
     arguments = ArrayList@575[empty]
     classifier = JavaTypeParameterImpl@576['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
 }
 
 LazyJavaClassifierType@577['E'] {
     arguments = ArrayList@578[empty]
     classifier = JavaTypeParameterImpl@579['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
 }
 
 LazyJavaClassifierType@580['E'] {
     arguments = ArrayList@581[empty]
     classifier = JavaTypeParameterImpl@582['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
 }
 
 LazyJavaClassifierType@583['E'] {
     arguments = ArrayList@584[empty]
     classifier = JavaTypeParameterImpl@585['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
 }
 
 LazyJavaClassifierType@586['E'] {
     arguments = ArrayList@587[empty]
     classifier = JavaTypeParameterImpl@588['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@546
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
 }
 
 LazyJavaClassifierType@589['E'] {
@@ -746,21 +746,21 @@ LazyJavaClassifierType@592['E'] {
     arguments = ArrayList@593[empty]
     classifier = JavaTypeParameterImpl@594['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
 }
 
 LazyJavaClassifierType@595['E'] {
     arguments = ArrayList@596[empty]
     classifier = JavaTypeParameterImpl@597['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
 }
 
 LazyJavaClassifierType@598['E'] {
     arguments = ArrayList@599[empty]
     classifier = JavaTypeParameterImpl@600['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
 }
 
 LazyJavaClassifierType@601['E'] {
@@ -781,63 +781,63 @@ LazyJavaClassifierType@607['E'] {
     arguments = ArrayList@608[empty]
     classifier = JavaTypeParameterImpl@609['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
 }
 
 LazyJavaClassifierType@610['E'] {
     arguments = ArrayList@611[empty]
     classifier = JavaTypeParameterImpl@612['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
 }
 
 LazyJavaClassifierType@613['E'] {
     arguments = ArrayList@614[empty]
     classifier = JavaTypeParameterImpl@615['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@546
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
 }
 
 LazyJavaClassifierType@616['E'] {
     arguments = ArrayList@617[empty]
     classifier = JavaTypeParameterImpl@618['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
 }
 
 LazyJavaClassifierType@619['E'] {
     arguments = ArrayList@620[empty]
     classifier = JavaTypeParameterImpl@621['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
 }
 
 LazyJavaClassifierType@622['E'] {
     arguments = ArrayList@623[empty]
     classifier = JavaTypeParameterImpl@624['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
 }
 
 LazyJavaClassifierType@625['E'] {
     arguments = ArrayList@626[empty]
     classifier = JavaTypeParameterImpl@627['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
 }
 
 LazyJavaClassifierType@628['E'] {
     arguments = ArrayList@629[empty]
     classifier = JavaTypeParameterImpl@630['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
 }
 
 LazyJavaClassifierType@631['E'] {
     arguments = ArrayList@632[empty]
     classifier = JavaTypeParameterImpl@633['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@546
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
 }
 
 LazyJavaClassifierType@634['E'] {
@@ -851,21 +851,21 @@ LazyJavaClassifierType@637['E'] {
     arguments = ArrayList@638[empty]
     classifier = JavaTypeParameterImpl@639['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
 }
 
 LazyJavaClassifierType@640['E'] {
     arguments = ArrayList@641[empty]
     classifier = JavaTypeParameterImpl@642['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
 }
 
 LazyJavaClassifierType@643['E'] {
     arguments = ArrayList@644[empty]
     classifier = JavaTypeParameterImpl@645['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
 }
 
 LazyJavaClassifierType@646['E'] {
@@ -879,21 +879,21 @@ LazyJavaClassifierType@649['E'] {
     arguments = ArrayList@650[empty]
     classifier = JavaTypeParameterImpl@651['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
 }
 
 LazyJavaClassifierType@652['E'] {
     arguments = ArrayList@653[empty]
     classifier = JavaTypeParameterImpl@654['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
 }
 
 LazyJavaClassifierType@655['E'] {
     arguments = ArrayList@656[empty]
     classifier = JavaTypeParameterImpl@657['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
 }
 
 LazyJavaClassifierType@658['E'] {
@@ -907,21 +907,21 @@ LazyJavaClassifierType@661['E'] {
     arguments = ArrayList@662[empty]
     classifier = JavaTypeParameterImpl@663['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@546
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
 }
 
 LazyJavaClassifierType@664['E'] {
     arguments = ArrayList@665[empty]
     classifier = JavaTypeParameterImpl@666['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
 }
 
 LazyJavaClassifierType@667['E'] {
     arguments = ArrayList@668[empty]
     classifier = JavaTypeParameterImpl@669['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
 }
 
 LazyJavaClassifierType@670['E'] {
@@ -935,40 +935,40 @@ LazyJavaClassifierType@673['E'] {
     arguments = ArrayList@674[empty]
     classifier = JavaTypeParameterImpl@675['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
 }
 
 LazyJavaClassifierType@676['E'] {
     arguments = ArrayList@677[empty]
     classifier = JavaTypeParameterImpl@678['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
 }
 
 LazyJavaClassifierType@679['E'] {
     arguments = ArrayList@680[empty]
-    classifier = JavaTypeParameterImpl@545['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@546
-}
-
-LazyJavaClassifierType@681['E'] {
-    arguments = ArrayList@682[empty]
-    classifier = JavaTypeParameterImpl@657['E']
+    classifier = JavaTypeParameterImpl@554['E']
     nullable = 'true': Boolean@407
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
 }
 
+LazyJavaClassifierType@681['E'] {
+    arguments = ArrayList@682[empty]
+    classifier = JavaTypeParameterImpl@633['E']
+    nullable = 'true': Boolean@407
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
+}
+
 LazyJavaClassifierType@683['E'] {
     arguments = ArrayList@684[empty]
-    classifier = JavaTypeParameterImpl@561['E']
+    classifier = JavaTypeParameterImpl@639['E']
     nullable = 'true': Boolean@407
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
 }
 
 LazyJavaClassifierType@685['E'] {
     arguments = ArrayList@686[empty]
-    classifier = JavaTypeParameterImpl@654['E']
+    classifier = JavaTypeParameterImpl@672['E']
     nullable = 'true': Boolean@407
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
 }
@@ -977,301 +977,301 @@ LazyJavaClassifierType@687['E'] {
     arguments = ArrayList@688[empty]
     classifier = JavaTypeParameterImpl@594['E']
     nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
 }
 
 LazyJavaClassifierType@689['E'] {
     arguments = ArrayList@690[empty]
-    classifier = JavaTypeParameterImpl@609['E']
+    classifier = JavaTypeParameterImpl@576['E']
     nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
 }
 
 LazyJavaClassifierType@691['E'] {
     arguments = ArrayList@692[empty]
-    classifier = JavaTypeParameterImpl@552['E']
+    classifier = JavaTypeParameterImpl@621['E']
     nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
 }
 
 LazyJavaClassifierType@693['E'] {
     arguments = ArrayList@694[empty]
-    classifier = JavaTypeParameterImpl@678['E']
+    classifier = JavaTypeParameterImpl@567['E']
     nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
 }
 
 LazyJavaClassifierType@695['E'] {
     arguments = ArrayList@696[empty]
-    classifier = JavaTypeParameterImpl@660['E']
+    classifier = JavaTypeParameterImpl@630['E']
     nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
 }
 
 LazyJavaClassifierType@697['E'] {
     arguments = ArrayList@698[empty]
-    classifier = JavaTypeParameterImpl@564['E']
+    classifier = JavaTypeParameterImpl@603['E']
     nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@546
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
 }
 
 LazyJavaClassifierType@699['E'] {
     arguments = ArrayList@700[empty]
-    classifier = JavaTypeParameterImpl@549['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
-}
-
-LazyJavaClassifierType@701['E'] {
-    arguments = ArrayList@702[empty]
-    classifier = JavaTypeParameterImpl@633['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@546
-}
-
-LazyJavaClassifierType@703['E'] {
-    arguments = ArrayList@704[empty]
-    classifier = JavaTypeParameterImpl@558['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
-}
-
-LazyJavaClassifierType@705['E'] {
-    arguments = ArrayList@706[empty]
-    classifier = JavaTypeParameterImpl@663['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@546
-}
-
-LazyJavaClassifierType@707['E'] {
-    arguments = ArrayList@708[empty]
-    classifier = JavaTypeParameterImpl@639['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
-}
-
-LazyJavaClassifierType@709['E'] {
-    arguments = ArrayList@710[empty]
-    classifier = JavaTypeParameterImpl@606['E']
+    classifier = JavaTypeParameterImpl@551['E']
     nullable = 'true': Boolean@407
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
 }
 
+LazyJavaClassifierType@701['E'] {
+    arguments = ArrayList@702[empty]
+    classifier = JavaTypeParameterImpl@615['E']
+    nullable = 'true': Boolean@407
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
+}
+
+LazyJavaClassifierType@703['E'] {
+    arguments = ArrayList@704[empty]
+    classifier = JavaTypeParameterImpl@654['E']
+    nullable = 'true': Boolean@407
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
+}
+
+LazyJavaClassifierType@705['E'] {
+    arguments = ArrayList@706[empty]
+    classifier = JavaTypeParameterImpl@678['E']
+    nullable = 'true': Boolean@407
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
+}
+
+LazyJavaClassifierType@707['E'] {
+    arguments = ArrayList@708[empty]
+    classifier = JavaTypeParameterImpl@582['E']
+    nullable = 'true': Boolean@407
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
+}
+
+LazyJavaClassifierType@709['E'] {
+    arguments = ArrayList@710[empty]
+    classifier = JavaTypeParameterImpl@597['E']
+    nullable = 'true': Boolean@407
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
+}
+
 LazyJavaClassifierType@711['E'] {
     arguments = ArrayList@712[empty]
-    classifier = JavaTypeParameterImpl@573['E']
+    classifier = JavaTypeParameterImpl@648['E']
     nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
 }
 
 LazyJavaClassifierType@713['E'] {
     arguments = ArrayList@714[empty]
-    classifier = JavaTypeParameterImpl@555['E']
+    classifier = JavaTypeParameterImpl@557['E']
     nullable = 'true': Boolean@407
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
 }
 
 LazyJavaClassifierType@715['E'] {
     arguments = ArrayList@716[empty]
-    classifier = JavaTypeParameterImpl@675['E']
+    classifier = JavaTypeParameterImpl@548['E']
     nullable = 'true': Boolean@407
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
 }
 
 LazyJavaClassifierType@717['E'] {
     arguments = ArrayList@718[empty]
-    classifier = JavaTypeParameterImpl@603['E']
+    classifier = JavaTypeParameterImpl@591['E']
     nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
 }
 
 LazyJavaClassifierType@719['E'] {
     arguments = ArrayList@720[empty]
-    classifier = JavaTypeParameterImpl@618['E']
+    classifier = JavaTypeParameterImpl@624['E']
     nullable = 'true': Boolean@407
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
 }
 
 LazyJavaClassifierType@721['E'] {
     arguments = ArrayList@722[empty]
-    classifier = JavaTypeParameterImpl@651['E']
+    classifier = JavaTypeParameterImpl@606['E']
     nullable = 'true': Boolean@407
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
 }
 
 LazyJavaClassifierType@723['E'] {
     arguments = ArrayList@724[empty]
-    classifier = JavaTypeParameterImpl@579['E']
+    classifier = JavaTypeParameterImpl@675['E']
     nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
 }
 
 LazyJavaClassifierType@725['E'] {
     arguments = ArrayList@726[empty]
-    classifier = JavaTypeParameterImpl@600['E']
+    classifier = JavaTypeParameterImpl@579['E']
     nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
 }
 
 LazyJavaClassifierType@727['E'] {
     arguments = ArrayList@728[empty]
-    classifier = JavaTypeParameterImpl@597['E']
+    classifier = JavaTypeParameterImpl@536['E']
     nullable = 'true': Boolean@407
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
 }
 
 LazyJavaClassifierType@729['E'] {
     arguments = ArrayList@730[empty]
-    classifier = JavaTypeParameterImpl@648['E']
+    classifier = JavaTypeParameterImpl@645['E']
     nullable = 'true': Boolean@407
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
 }
 
 LazyJavaClassifierType@731['E'] {
     arguments = ArrayList@732[empty]
-    classifier = JavaTypeParameterImpl@585['E']
+    classifier = JavaTypeParameterImpl@660['E']
     nullable = 'true': Boolean@407
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
 }
 
 LazyJavaClassifierType@733['E'] {
     arguments = ArrayList@734[empty]
-    classifier = JavaTypeParameterImpl@642['E']
+    classifier = JavaTypeParameterImpl@541['E']
     nullable = 'true': Boolean@407
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
 }
 
 LazyJavaClassifierType@735['E'] {
     arguments = ArrayList@736[empty]
-    classifier = JavaTypeParameterImpl@615['E']
+    classifier = JavaTypeParameterImpl@585['E']
     nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@546
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
 }
 
 LazyJavaClassifierType@737['E'] {
     arguments = ArrayList@738[empty]
-    classifier = JavaTypeParameterImpl@612['E']
+    classifier = JavaTypeParameterImpl@618['E']
     nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
 }
 
 LazyJavaClassifierType@739['E'] {
     arguments = ArrayList@740[empty]
-    classifier = JavaTypeParameterImpl@672['E']
+    classifier = JavaTypeParameterImpl@663['E']
     nullable = 'true': Boolean@407
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
 }
 
 LazyJavaClassifierType@741['E'] {
     arguments = ArrayList@742[empty]
-    classifier = JavaTypeParameterImpl@536['E']
+    classifier = JavaTypeParameterImpl@636['E']
     nullable = 'true': Boolean@407
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
 }
 
 LazyJavaClassifierType@743['E'] {
     arguments = ArrayList@744[empty]
-    classifier = JavaTypeParameterImpl@567['E']
+    classifier = JavaTypeParameterImpl@627['E']
     nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
 }
 
 LazyJavaClassifierType@745['E'] {
     arguments = ArrayList@746[empty]
-    classifier = JavaTypeParameterImpl@627['E']
+    classifier = JavaTypeParameterImpl@588['E']
     nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
 }
 
 LazyJavaClassifierType@747['E'] {
     arguments = ArrayList@748[empty]
-    classifier = JavaTypeParameterImpl@645['E']
+    classifier = JavaTypeParameterImpl@609['E']
     nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
 }
 
 LazyJavaClassifierType@749['E'] {
     arguments = ArrayList@750[empty]
-    classifier = JavaTypeParameterImpl@591['E']
+    classifier = JavaTypeParameterImpl@573['E']
     nullable = 'true': Boolean@407
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
 }
 
 LazyJavaClassifierType@751['E'] {
     arguments = ArrayList@752[empty]
-    classifier = JavaTypeParameterImpl@588['E']
+    classifier = JavaTypeParameterImpl@600['E']
     nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@546
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
 }
 
 LazyJavaClassifierType@753['E'] {
     arguments = ArrayList@754[empty]
-    classifier = JavaTypeParameterImpl@570['E']
+    classifier = JavaTypeParameterImpl@666['E']
     nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
 }
 
 LazyJavaClassifierType@755['E'] {
     arguments = ArrayList@756[empty]
-    classifier = JavaTypeParameterImpl@669['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
-}
-
-LazyJavaClassifierType@757['E'] {
-    arguments = ArrayList@758[empty]
-    classifier = JavaTypeParameterImpl@621['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
-}
-
-LazyJavaClassifierType@759['E'] {
-    arguments = ArrayList@760[empty]
-    classifier = JavaTypeParameterImpl@576['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
-}
-
-LazyJavaClassifierType@761['E'] {
-    arguments = ArrayList@762[empty]
-    classifier = JavaTypeParameterImpl@636['E']
+    classifier = JavaTypeParameterImpl@545['E']
     nullable = 'true': Boolean@407
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
 }
 
+LazyJavaClassifierType@757['E'] {
+    arguments = ArrayList@758[empty]
+    classifier = JavaTypeParameterImpl@657['E']
+    nullable = 'true': Boolean@407
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
+}
+
+LazyJavaClassifierType@759['E'] {
+    arguments = ArrayList@760[empty]
+    classifier = JavaTypeParameterImpl@560['E']
+    nullable = 'true': Boolean@407
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
+}
+
+LazyJavaClassifierType@761['E'] {
+    arguments = ArrayList@762[empty]
+    classifier = JavaTypeParameterImpl@651['E']
+    nullable = 'true': Boolean@407
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
+}
+
 LazyJavaClassifierType@763['E'] {
     arguments = ArrayList@764[empty]
-    classifier = JavaTypeParameterImpl@630['E']
+    classifier = JavaTypeParameterImpl@564['E']
     nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
 }
 
 LazyJavaClassifierType@765['E'] {
     arguments = ArrayList@766[empty]
-    classifier = JavaTypeParameterImpl@624['E']
+    classifier = JavaTypeParameterImpl@642['E']
     nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
 }
 
 LazyJavaClassifierType@767['E'] {
     arguments = ArrayList@768[empty]
-    classifier = JavaTypeParameterImpl@541['E']
+    classifier = JavaTypeParameterImpl@570['E']
     nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
 }
 
 LazyJavaClassifierType@769['E'] {
     arguments = ArrayList@770[empty]
-    classifier = JavaTypeParameterImpl@666['E']
+    classifier = JavaTypeParameterImpl@612['E']
     nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
 }
 
 LazyJavaClassifierType@771['E'] {
     arguments = ArrayList@772[empty]
-    classifier = JavaTypeParameterImpl@582['E']
+    classifier = JavaTypeParameterImpl@669['E']
     nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
 }
 
 LazyJavaClassifierType@773['Iterator<E>'] {
@@ -1330,7 +1330,7 @@ LazyJavaClassifierType@802['List<E>'] {
     typeConstructor = DeserializedClassTypeConstructor@807
 }
 
-LazyJavaClassifierType@372['List<E>'] {
+LazyJavaClassifierType@367['List<E>'] {
     arguments = ArrayList@808[1] { TypeProjectionImpl@809 }
     classifier = JavaClassImpl@810['List']
     memberScope = SubstitutingScope@811
@@ -1346,7 +1346,7 @@ LazyJavaClassifierType@812['List<E>'] {
     typeConstructor = DeserializedClassTypeConstructor@807
 }
 
-LazyJavaClassifierType@367['List<E>'] {
+LazyJavaClassifierType@372['List<E>'] {
     arguments = ArrayList@817[1] { TypeProjectionImpl@818 }
     classifier = JavaClassImpl@819['List']
     memberScope = SubstitutingScope@820
@@ -1412,7 +1412,7 @@ LazyJavaClassifierType@851['ListIterator<E>'] {
 
 LazyJavaClassifierType@856['ListIterator<E>'] {
     arguments = ArrayList@857[1] { TypeProjectionImpl@858 }
-    classifier = JavaClassImpl@839['ListIterator']
+    classifier = JavaClassImpl@833['ListIterator']
     memberScope = SubstitutingScope@859
     nullable = 'true': Boolean@407
     typeConstructor = DeserializedClassTypeConstructor@855
@@ -1420,7 +1420,7 @@ LazyJavaClassifierType@856['ListIterator<E>'] {
 
 LazyJavaClassifierType@860['ListIterator<E>'] {
     arguments = ArrayList@861[1] { TypeProjectionImpl@862 }
-    classifier = JavaClassImpl@833['ListIterator']
+    classifier = JavaClassImpl@839['ListIterator']
     memberScope = SubstitutingScope@863
     nullable = 'true': Boolean@407
     typeConstructor = DeserializedClassTypeConstructor@855
@@ -1540,7 +1540,7 @@ LazyJavaClassifierType@906['Object'] {
 
 LazyJavaClassifierType@909['Object'] {
     arguments = ArrayList@910[empty]
-    classifier = JavaClassImpl@908['Object']
+    classifier = JavaClassImpl@881['Object']
     memberScope = DeserializedClassMemberScope@871
     nullable = 'true': Boolean@407
     typeConstructor = DeserializedClassTypeConstructor@872
@@ -1548,7 +1548,7 @@ LazyJavaClassifierType@909['Object'] {
 
 LazyJavaClassifierType@911['Object'] {
     arguments = ArrayList@912[empty]
-    classifier = JavaClassImpl@878['Object']
+    classifier = JavaClassImpl@875['Object']
     memberScope = DeserializedClassMemberScope@871
     nullable = 'true': Boolean@407
     typeConstructor = DeserializedClassTypeConstructor@872
@@ -1556,7 +1556,7 @@ LazyJavaClassifierType@911['Object'] {
 
 LazyJavaClassifierType@913['Object'] {
     arguments = ArrayList@914[empty]
-    classifier = JavaClassImpl@905['Object']
+    classifier = JavaClassImpl@870['Object']
     memberScope = DeserializedClassMemberScope@871
     nullable = 'true': Boolean@407
     typeConstructor = DeserializedClassTypeConstructor@872
@@ -1564,7 +1564,7 @@ LazyJavaClassifierType@913['Object'] {
 
 LazyJavaClassifierType@915['Object'] {
     arguments = ArrayList@916[empty]
-    classifier = JavaClassImpl@899['Object']
+    classifier = JavaClassImpl@905['Object']
     memberScope = DeserializedClassMemberScope@871
     nullable = 'true': Boolean@407
     typeConstructor = DeserializedClassTypeConstructor@872
@@ -1572,7 +1572,7 @@ LazyJavaClassifierType@915['Object'] {
 
 LazyJavaClassifierType@917['Object'] {
     arguments = ArrayList@918[empty]
-    classifier = JavaClassImpl@884['Object']
+    classifier = JavaClassImpl@899['Object']
     memberScope = DeserializedClassMemberScope@871
     nullable = 'true': Boolean@407
     typeConstructor = DeserializedClassTypeConstructor@872
@@ -1580,7 +1580,7 @@ LazyJavaClassifierType@917['Object'] {
 
 LazyJavaClassifierType@919['Object'] {
     arguments = ArrayList@920[empty]
-    classifier = JavaClassImpl@887['Object']
+    classifier = JavaClassImpl@908['Object']
     memberScope = DeserializedClassMemberScope@871
     nullable = 'true': Boolean@407
     typeConstructor = DeserializedClassTypeConstructor@872
@@ -1588,7 +1588,7 @@ LazyJavaClassifierType@919['Object'] {
 
 LazyJavaClassifierType@921['Object'] {
     arguments = ArrayList@922[empty]
-    classifier = JavaClassImpl@896['Object']
+    classifier = JavaClassImpl@878['Object']
     memberScope = DeserializedClassMemberScope@871
     nullable = 'true': Boolean@407
     typeConstructor = DeserializedClassTypeConstructor@872
@@ -1596,7 +1596,7 @@ LazyJavaClassifierType@921['Object'] {
 
 LazyJavaClassifierType@923['Object'] {
     arguments = ArrayList@924[empty]
-    classifier = JavaClassImpl@890['Object']
+    classifier = JavaClassImpl@896['Object']
     memberScope = DeserializedClassMemberScope@871
     nullable = 'true': Boolean@407
     typeConstructor = DeserializedClassTypeConstructor@872
@@ -1604,7 +1604,7 @@ LazyJavaClassifierType@923['Object'] {
 
 LazyJavaClassifierType@925['Object'] {
     arguments = ArrayList@926[empty]
-    classifier = JavaClassImpl@870['Object']
+    classifier = JavaClassImpl@890['Object']
     memberScope = DeserializedClassMemberScope@871
     nullable = 'true': Boolean@407
     typeConstructor = DeserializedClassTypeConstructor@872
@@ -1612,7 +1612,7 @@ LazyJavaClassifierType@925['Object'] {
 
 LazyJavaClassifierType@927['Object'] {
     arguments = ArrayList@928[empty]
-    classifier = JavaClassImpl@875['Object']
+    classifier = JavaClassImpl@902['Object']
     memberScope = DeserializedClassMemberScope@871
     nullable = 'true': Boolean@407
     typeConstructor = DeserializedClassTypeConstructor@872
@@ -1620,7 +1620,7 @@ LazyJavaClassifierType@927['Object'] {
 
 LazyJavaClassifierType@929['Object'] {
     arguments = ArrayList@930[empty]
-    classifier = JavaClassImpl@902['Object']
+    classifier = JavaClassImpl@884['Object']
     memberScope = DeserializedClassMemberScope@871
     nullable = 'true': Boolean@407
     typeConstructor = DeserializedClassTypeConstructor@872
@@ -1628,7 +1628,7 @@ LazyJavaClassifierType@929['Object'] {
 
 LazyJavaClassifierType@931['Object'] {
     arguments = ArrayList@932[empty]
-    classifier = JavaClassImpl@881['Object']
+    classifier = JavaClassImpl@893['Object']
     memberScope = DeserializedClassMemberScope@871
     nullable = 'true': Boolean@407
     typeConstructor = DeserializedClassTypeConstructor@872
@@ -1636,7 +1636,7 @@ LazyJavaClassifierType@931['Object'] {
 
 LazyJavaClassifierType@933['Object'] {
     arguments = ArrayList@934[empty]
-    classifier = JavaClassImpl@893['Object']
+    classifier = JavaClassImpl@887['Object']
     memberScope = DeserializedClassMemberScope@871
     nullable = 'true': Boolean@407
     typeConstructor = DeserializedClassTypeConstructor@872
@@ -1793,7 +1793,7 @@ LazyJavaClassifierType@990['T'] {
 
 LazyJavaClassifierType@993['T'] {
     arguments = ArrayList@994[empty]
-    classifier = JavaTypeParameterImpl@981['T']
+    classifier = JavaTypeParameterImpl@989['T']
     nullable = 'true': Boolean@407
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@982
 }
@@ -1807,16 +1807,16 @@ LazyJavaClassifierType@995['T'] {
 
 LazyJavaClassifierType@997['T'] {
     arguments = ArrayList@998[empty]
-    classifier = JavaTypeParameterImpl@989['T']
+    classifier = JavaTypeParameterImpl@992['T']
     nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@982
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@986
 }
 
 LazyJavaClassifierType@999['T'] {
     arguments = ArrayList@1000[empty]
-    classifier = JavaTypeParameterImpl@992['T']
+    classifier = JavaTypeParameterImpl@981['T']
     nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@986
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@982
 }
 
 LazyJavaClassifierType@1001['TB'] {
@@ -1877,14 +1877,14 @@ LazyJavaClassifierType@1021['TC'] {
 
 LazyJavaClassifierType@1024['TC'] {
     arguments = ArrayList@1025[empty]
-    classifier = JavaTypeParameterImpl@1023['TC']
+    classifier = JavaTypeParameterImpl@1019['TC']
     nullable = 'true': Boolean@407
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1020
 }
 
 LazyJavaClassifierType@1026['TC'] {
     arguments = ArrayList@1027[empty]
-    classifier = JavaTypeParameterImpl@1019['TC']
+    classifier = JavaTypeParameterImpl@1023['TC']
     nullable = 'true': Boolean@407
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1020
 }
@@ -1962,36 +1962,36 @@ LazyJavaPackageFragment@1048['util'] {
     classes('ArrayList': Name@1081) = LazyJavaClassDescriptor@161['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@1082
 }
 
-LazyJavaTypeParameterDescriptor@369['E'] {
+LazyJavaTypeParameterDescriptor@364['E'] {
     defaultType = JetTypeImpl@1083['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
     upperBounds = LinkedHashSet@1084[1] { NullableType@1085 }
     upperBoundsAsType = NullableType@1085
 }
 
-LazyJavaTypeParameterDescriptor@360['E'] {
+LazyJavaTypeParameterDescriptor@369['E'] {
     defaultType = JetTypeImpl@1086['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@546
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
     upperBounds = LinkedHashSet@1087[1] { NullableType@1088 }
     upperBoundsAsType = NullableType@1088
 }
 
-LazyJavaTypeParameterDescriptor@364['E'] {
+LazyJavaTypeParameterDescriptor@360['E'] {
     defaultType = JetTypeImpl@1089['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
     upperBounds = LinkedHashSet@1090[1] { NullableType@1091 }
     upperBoundsAsType = NullableType@1091
 }
 
 LazyJavaTypeParameterDescriptor@1092['T'] {
     defaultType = JetTypeImpl@1093['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@986
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@982
     upperBounds = LinkedHashSet@1094[1] { NullableType@1095 }
     upperBoundsAsType = NullableType@1095
 }
 
 LazyJavaTypeParameterDescriptor@1096['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@982
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@986
     upperBounds = LinkedHashSet@1097[1] { NullableType@1098 }
     upperBoundsAsType = NullableType@1098
 }
@@ -2009,11 +2009,11 @@ LazyJavaTypeParameterDescriptor@379['TC'] {
 }
 
 LazyJavaTypeParameterResolver@1105 {
-    resolve(JavaTypeParameterImpl@1106['E']) = LazyJavaTypeParameterDescriptor@364['E']
+    resolve(JavaTypeParameterImpl@1106['E']) = LazyJavaTypeParameterDescriptor@360['E']
 }
 
 LazyJavaTypeParameterResolver@1107 {
-    resolve(JavaTypeParameterImpl@1108['E']) = LazyJavaTypeParameterDescriptor@360['E']
+    resolve(JavaTypeParameterImpl@1108['E']) = LazyJavaTypeParameterDescriptor@364['E']
 }
 
 LazyJavaTypeParameterResolver@1109 {
@@ -2021,7 +2021,7 @@ LazyJavaTypeParameterResolver@1109 {
 }
 
 LazyJavaTypeParameterResolver@1111 {
-    resolve(JavaTypeParameterImpl@660['E']) = null
+    resolve(JavaTypeParameterImpl@606['E']) = null
 }
 
 LazyJavaTypeParameterResolver@1112 {
@@ -2029,27 +2029,27 @@ LazyJavaTypeParameterResolver@1112 {
 }
 
 LazyJavaTypeParameterResolver@1113 {
-    resolve(JavaTypeParameterImpl@576['E']) = null
+    resolve(JavaTypeParameterImpl@675['E']) = null
 }
 
 LazyJavaTypeParameterResolver@1114 {
-    resolve(JavaTypeParameterImpl@612['E']) = null
+    resolve(JavaTypeParameterImpl@567['E']) = null
 }
 
 LazyJavaTypeParameterResolver@1115 {
-    resolve(JavaTypeParameterImpl@579['E']) = null
+    resolve(JavaTypeParameterImpl@660['E']) = null
 }
 
 LazyJavaTypeParameterResolver@1116 {
-    resolve(JavaTypeParameterImpl@558['E']) = null
+    resolve(JavaTypeParameterImpl@603['E']) = null
 }
 
 LazyJavaTypeParameterResolver@1117 {
-    resolve(JavaTypeParameterImpl@545['E']) = null
+    resolve(JavaTypeParameterImpl@557['E']) = null
 }
 
 LazyJavaTypeParameterResolver@1118 {
-    resolve(JavaTypeParameterImpl@603['E']) = null
+    resolve(JavaTypeParameterImpl@594['E']) = null
 }
 
 LazyJavaTypeParameterResolver@1119 {
@@ -2057,7 +2057,7 @@ LazyJavaTypeParameterResolver@1119 {
 }
 
 LazyJavaTypeParameterResolver@1120 {
-    resolve(JavaTypeParameterImpl@675['E']) = null
+    resolve(JavaTypeParameterImpl@645['E']) = null
 }
 
 LazyJavaTypeParameterResolver@1121 {
@@ -2065,67 +2065,67 @@ LazyJavaTypeParameterResolver@1121 {
 }
 
 LazyJavaTypeParameterResolver@1122 {
-    resolve(JavaTypeParameterImpl@606['E']) = null
+    resolve(JavaTypeParameterImpl@573['E']) = null
 }
 
 LazyJavaTypeParameterResolver@1123 {
-    resolve(JavaTypeParameterImpl@639['E']) = null
+    resolve(JavaTypeParameterImpl@612['E']) = null
 }
 
 LazyJavaTypeParameterResolver@1124 {
-    resolve(JavaTypeParameterImpl@645['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1125 {
     resolve(JavaTypeParameterImpl@651['E']) = null
 }
 
+LazyJavaTypeParameterResolver@1125 {
+    resolve(JavaTypeParameterImpl@621['E']) = null
+}
+
 LazyJavaTypeParameterResolver@1126 {
-    resolve(JavaTypeParameterImpl@633['E']) = null
+    resolve(JavaTypeParameterImpl@576['E']) = null
 }
 
 LazyJavaTypeParameterResolver@1127 {
-    resolve(JavaTypeParameterImpl@663['E']) = null
+    resolve(JavaTypeParameterImpl@633['E']) = null
 }
 
 LazyJavaTypeParameterResolver@1128 {
-    resolve(JavaTypeParameterImpl@618['E']) = null
+    resolve(JavaTypeParameterImpl@545['E']) = null
 }
 
 LazyJavaTypeParameterResolver@1129 {
-    resolve(JavaTypeParameterImpl@585['E']) = null
+    resolve(JavaTypeParameterImpl@636['E']) = null
 }
 
 LazyJavaTypeParameterResolver@1130 {
-    resolve(JavaTypeParameterImpl@672['E']) = null
+    resolve(JavaTypeParameterImpl@588['E']) = null
 }
 
 LazyJavaTypeParameterResolver@1131 {
-    resolve(JavaTypeParameterImpl@600['E']) = null
+    resolve(JavaTypeParameterImpl@639['E']) = null
 }
 
 LazyJavaTypeParameterResolver@1132 {
-    resolve(JavaTypeParameterImpl@654['E']) = null
+    resolve(JavaTypeParameterImpl@609['E']) = null
 }
 
 LazyJavaTypeParameterResolver@1133 {
-    resolve(JavaTypeParameterImpl@594['E']) = null
+    resolve(JavaTypeParameterImpl@648['E']) = null
 }
 
 LazyJavaTypeParameterResolver@1134 {
-    resolve(JavaTypeParameterImpl@627['E']) = null
+    resolve(JavaTypeParameterImpl@672['E']) = null
 }
 
 LazyJavaTypeParameterResolver@1135 {
-    resolve(JavaTypeParameterImpl@642['E']) = null
+    resolve(JavaTypeParameterImpl@657['E']) = null
 }
 
 LazyJavaTypeParameterResolver@1136 {
-    resolve(JavaTypeParameterImpl@1137['T']) = LazyJavaTypeParameterDescriptor@1092['T']
+    resolve(JavaTypeParameterImpl@1137['T']) = LazyJavaTypeParameterDescriptor@1096['T']
 }
 
 LazyJavaTypeParameterResolver@1138 {
-    resolve(JavaTypeParameterImpl@1139['T']) = LazyJavaTypeParameterDescriptor@1096['T']
+    resolve(JavaTypeParameterImpl@1139['T']) = LazyJavaTypeParameterDescriptor@1092['T']
 }
 
 LazyJavaTypeParameterResolver@1140 {
@@ -2133,7 +2133,7 @@ LazyJavaTypeParameterResolver@1140 {
 }
 
 LazyJavaTypeParameterResolver@1142 {
-    resolve(JavaTypeParameterImpl@1010['TB']) = null
+    resolve(JavaTypeParameterImpl@1003['TB']) = null
 }
 
 LazyJavaTypeParameterResolver@1143 {
@@ -2142,10 +2142,13 @@ LazyJavaTypeParameterResolver@1143 {
 
 ResolutionTaskHolder@1145 {
     <name not found> = ArrayList@1146[1] { ResolutionCandidate@1147 }
-    <name not found> = ArrayList@1148[1] { ResolutionCandidate@1147 }
 }
 
-ResolutionTaskHolder@1149 {
-    <name not found> = ArrayList@1150[3] { ResolutionCandidate@1151, ResolutionCandidate@1152, ResolutionCandidate@1153 }
-    <name not found> = ArrayList@1154[3] { ResolutionCandidate@1151, ResolutionCandidate@1152, ResolutionCandidate@1153 }
+ResolutionTaskHolder@1148 {
+    <name not found> = ArrayList@1149[3] { ResolutionCandidate@1150, ResolutionCandidate@1151, ResolutionCandidate@1152 }
+}
+
+null {
+    <name not found> = ArrayList@1153[1] { ResolutionCandidate@1147 }
+    <name not found> = ArrayList@1154[3] { ResolutionCandidate@1150, ResolutionCandidate@1151, ResolutionCandidate@1152 }
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/InheritedGenericFunction.lazy.log b/compiler/testData/diagnostics/tests/j+k/InheritedGenericFunction.lazy.log
index a4d43d1eadf..6c7f124d41d 100644
--- a/compiler/testData/diagnostics/tests/j+k/InheritedGenericFunction.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/InheritedGenericFunction.lazy.log
@@ -67,7 +67,7 @@ LazyJavaClassTypeConstructor@57['C'] {
     supertypes = ArrayList@65[2] { LazyJavaClassifierType@66['B'], LazyJavaClassifierType@67['A'] }
 }
 
-LazyJavaClassifierType@63['A'] {
+LazyJavaClassifierType@67['A'] {
     arguments = ArrayList@68[empty]
     classifier = JavaClassImpl@69['A']
     memberScope = LazyJavaClassMemberScope@4
@@ -75,7 +75,7 @@ LazyJavaClassifierType@63['A'] {
     typeConstructor = LazyJavaClassTypeConstructor@24['A']
 }
 
-LazyJavaClassifierType@67['A'] {
+LazyJavaClassifierType@63['A'] {
     arguments = ArrayList@71[empty]
     classifier = JavaClassImpl@72['A']
     memberScope = LazyJavaClassMemberScope@4
@@ -142,7 +142,7 @@ LazyJavaPackageFragmentProvider@93 {
     packageFragments('kotlin.jvm': FqName@106) = null
     packageFragments('p': FqName@107) = LazyJavaPackageFragment@108['p']
     packageFragments('p.C': FqName@109) = null
-    topLevelClasses(JavaClassImpl@72['A']) = LazyJavaClassDescriptor@0['A']
+    topLevelClasses(JavaClassImpl@69['A']) = LazyJavaClassDescriptor@0['A']
     topLevelClasses(JavaClassImpl@74['B']) = LazyJavaClassDescriptor@25['B']
     topLevelClasses(JavaClassImpl@110['C']) = LazyJavaClassDescriptor@40['C']
 }
@@ -189,5 +189,8 @@ LazyJavaTypeParameterResolver@131 {
 
 ResolutionTaskHolder@133 {
     <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
+}
+
+null {
     <name not found> = ArrayList@136[1] { ResolutionCandidate@135 }
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/KJKInheritance.lazy.log b/compiler/testData/diagnostics/tests/j+k/KJKInheritance.lazy.log
index 846130b827a..ac4926527be 100644
--- a/compiler/testData/diagnostics/tests/j+k/KJKInheritance.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/KJKInheritance.lazy.log
@@ -76,23 +76,26 @@ LazyJavaPackageFragment@50['lang'] {
 
 ResolutionTaskHolder@69 {
     <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
+}
+
+null {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@71 }
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/KJKInheritanceGeneric.lazy.log b/compiler/testData/diagnostics/tests/j+k/KJKInheritanceGeneric.lazy.log
index c1e040e6f27..682d1a344cc 100644
--- a/compiler/testData/diagnostics/tests/j+k/KJKInheritanceGeneric.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/KJKInheritanceGeneric.lazy.log
@@ -111,28 +111,31 @@ LazyJavaPackageFragment@65['lang'] {
 
 ResolutionTaskHolder@91 {
     <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
 }
 
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
 }
 
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
 }
 
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
+}
+
+null {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@96 }
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/OverrideVararg.lazy.log b/compiler/testData/diagnostics/tests/j+k/OverrideVararg.lazy.log
index 2def85459b0..4870d605db4 100644
--- a/compiler/testData/diagnostics/tests/j+k/OverrideVararg.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/OverrideVararg.lazy.log
@@ -84,18 +84,21 @@ LazyJavaPackageFragment@55['lang'] {
 
 ResolutionTaskHolder@74 {
     <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
+}
+
+null {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@79 }
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/Simple.lazy.log b/compiler/testData/diagnostics/tests/j+k/Simple.lazy.log
index 8ca215257da..12fd5fde257 100644
--- a/compiler/testData/diagnostics/tests/j+k/Simple.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/Simple.lazy.log
@@ -63,10 +63,13 @@ LazyJavaPackageFragment@27['java'] {
 
 ResolutionTaskHolder@51 {
     <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+}
+
+null {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@56 }
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/StaticMembersFromSuperclasses.lazy.log b/compiler/testData/diagnostics/tests/j+k/StaticMembersFromSuperclasses.lazy.log
index 27c4cdfa6f8..510ae4218bd 100644
--- a/compiler/testData/diagnostics/tests/j+k/StaticMembersFromSuperclasses.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/StaticMembersFromSuperclasses.lazy.log
@@ -83,19 +83,22 @@ LazyJavaTypeAttributes@55 {
 
 ResolutionTaskHolder@57 {
     <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+    <name not found> = EmptyList@6[empty]
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
+null {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@59 }
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
diff --git a/compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-NotNull-SpecialTypes.lazy.log b/compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-NotNull-SpecialTypes.lazy.log
index 92ab5b44c97..e7c72bb57fc 100644
--- a/compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-NotNull-SpecialTypes.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-NotNull-SpecialTypes.lazy.log
@@ -66,14 +66,14 @@ LazyJavaClassifierType@47['T'] {
 
 LazyJavaClassifierType@50['T'] {
     arguments = ArrayList@51[empty]
-    classifier = JavaTypeParameterImpl@45['T']
+    classifier = JavaTypeParameterImpl@49['T']
     nullable = 'true': Boolean@42
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@46
 }
 
 LazyJavaClassifierType@52['T'] {
     arguments = ArrayList@53[empty]
-    classifier = JavaTypeParameterImpl@49['T']
+    classifier = JavaTypeParameterImpl@45['T']
     nullable = 'true': Boolean@42
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@46
 }
@@ -141,28 +141,31 @@ LazyJavaTypeParameterResolver@90 {
 
 ResolutionTaskHolder@91 {
     <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@76[empty]
-    <name not found> = EmptyList@76[empty]
     <name not found> = EmptyList@76[empty]
     <name not found> = EmptyList@76[empty]
 }
 
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
-    <name not found> = EmptyList@76[empty]
-    <name not found> = EmptyList@76[empty]
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
     <name not found> = EmptyList@76[empty]
     <name not found> = EmptyList@76[empty]
 }
 
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
 }
 
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
+}
+
+null {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@99 }
+    <name not found> = EmptyList@76[empty]
+    <name not found> = EmptyList@76[empty]
+    <name not found> = EmptyList@76[empty]
+    <name not found> = EmptyList@76[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-NotNull-UserTypes.lazy.log b/compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-NotNull-UserTypes.lazy.log
index ae85ab47431..2a14de7deec 100644
--- a/compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-NotNull-UserTypes.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-NotNull-UserTypes.lazy.log
@@ -80,14 +80,14 @@ LazyJavaClassifierType@52['T'] {
 
 LazyJavaClassifierType@55['T'] {
     arguments = ArrayList@56[empty]
-    classifier = JavaTypeParameterImpl@54['T']
+    classifier = JavaTypeParameterImpl@50['T']
     nullable = 'true': Boolean@42
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@51
 }
 
 LazyJavaClassifierType@57['T'] {
     arguments = ArrayList@58[empty]
-    classifier = JavaTypeParameterImpl@50['T']
+    classifier = JavaTypeParameterImpl@54['T']
     nullable = 'true': Boolean@42
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@51
 }
@@ -147,37 +147,40 @@ LazyJavaTypeParameterResolver@92 {
 }
 
 LazyJavaTypeParameterResolver@94 {
-    resolve(JavaTypeParameterImpl@54['T']) = null
+    resolve(JavaTypeParameterImpl@50['T']) = null
 }
 
 LazyJavaTypeParameterResolver@95 {
-    resolve(JavaTypeParameterImpl@50['T']) = null
+    resolve(JavaTypeParameterImpl@54['T']) = null
 }
 
 ResolutionTaskHolder@96 {
     <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
     <name not found> = EmptyList@81[empty]
     <name not found> = EmptyList@81[empty]
 }
 
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
     <name not found> = EmptyList@81[empty]
     <name not found> = EmptyList@81[empty]
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
 }
 
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
+}
+
+null {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@104 }
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-SpecialTypes.lazy.log b/compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-SpecialTypes.lazy.log
index 6f7d5105d1b..b50e3e91080 100644
--- a/compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-SpecialTypes.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-SpecialTypes.lazy.log
@@ -129,42 +129,45 @@ LazyJavaTypeParameterResolver@84 {
 }
 
 LazyJavaTypeParameterResolver@86 {
-    resolve(JavaTypeParameterImpl@50['T']) = null
+    resolve(JavaTypeParameterImpl@46['T']) = null
 }
 
 LazyJavaTypeParameterResolver@87 {
-    resolve(JavaTypeParameterImpl@46['T']) = null
+    resolve(JavaTypeParameterImpl@50['T']) = null
 }
 
 ResolutionTaskHolder@88 {
     <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
     <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
 }
 
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
+}
+
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
 }
 
 ResolutionTaskHolder@100 {
     <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
+null {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@99 }
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-UserTypes.lazy.log b/compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-UserTypes.lazy.log
index c34cd88d0a4..91b2d777691 100644
--- a/compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-UserTypes.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-UserTypes.lazy.log
@@ -149,42 +149,45 @@ LazyJavaTypeParameterResolver@95 {
 }
 
 LazyJavaTypeParameterResolver@97 {
-    resolve(JavaTypeParameterImpl@61['T']) = null
+    resolve(JavaTypeParameterImpl@57['T']) = null
 }
 
 LazyJavaTypeParameterResolver@98 {
-    resolve(JavaTypeParameterImpl@57['T']) = null
+    resolve(JavaTypeParameterImpl@61['T']) = null
 }
 
 ResolutionTaskHolder@99 {
     <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
     <name not found> = EmptyList@84[empty]
     <name not found> = EmptyList@84[empty]
 }
 
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
     <name not found> = EmptyList@84[empty]
     <name not found> = EmptyList@84[empty]
 }
 
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
+}
+
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
 }
 
 ResolutionTaskHolder@111 {
     <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@113 }
 }
 
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@117 }
+null {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@113 }
+    <name not found> = EmptyList@84[empty]
+    <name not found> = EmptyList@84[empty]
+    <name not found> = EmptyList@84[empty]
+    <name not found> = EmptyList@84[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/UnboxingNulls.lazy.log b/compiler/testData/diagnostics/tests/j+k/UnboxingNulls.lazy.log
index 710a0eb1111..12d0395e57e 100644
--- a/compiler/testData/diagnostics/tests/j+k/UnboxingNulls.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/UnboxingNulls.lazy.log
@@ -88,30 +88,33 @@ LazyJavaTypeParameterResolver@63 {
 
 ResolutionTaskHolder@64 {
     <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+}
+
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
+}
+
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[8] { ResolutionCandidate@72, ResolutionCandidate@73, ResolutionCandidate@74, ... }
+}
+
+ResolutionTaskHolder@75 {
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[8] { ResolutionCandidate@74, ResolutionCandidate@75, ResolutionCandidate@76, ... }
-    <name not found> = ArrayList@77[8] { ResolutionCandidate@74, ResolutionCandidate@75, ResolutionCandidate@76, ... }
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
+null {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@78[8] { ResolutionCandidate@72, ResolutionCandidate@73, ResolutionCandidate@74, ... }
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
diff --git a/compiler/testData/diagnostics/tests/j+k/ambiguousSamAdapters.lazy.log b/compiler/testData/diagnostics/tests/j+k/ambiguousSamAdapters.lazy.log
index ff86a02a263..17f3afc8c8a 100644
--- a/compiler/testData/diagnostics/tests/j+k/ambiguousSamAdapters.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/ambiguousSamAdapters.lazy.log
@@ -159,22 +159,42 @@ LazyJavaPackageFragment@97['lang'] {
 
 ResolutionTaskHolder@117 {
     <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
+}
+
+ResolutionTaskHolder@120 {
+    <name not found> = ArrayList@121[2] { ResolutionCandidate@122, ResolutionCandidate@123 }
+    <name not found> = ArrayList@124[2] { ResolutionCandidate@125, ResolutionCandidate@126 }
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+}
+
+ResolutionTaskHolder@127 {
+    <name not found> = ArrayList@128[2] { ResolutionCandidate@129, ResolutionCandidate@130 }
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+}
+
+ResolutionTaskHolder@131 {
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[2] { ResolutionCandidate@123, ResolutionCandidate@124 }
-    <name not found> = ArrayList@125[2] { ResolutionCandidate@126, ResolutionCandidate@127 }
-    <name not found> = ArrayList@128[4] { ResolutionCandidate@123, ResolutionCandidate@126, ResolutionCandidate@124, ... }
+ResolutionTaskHolder@132 {
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
@@ -185,31 +205,14 @@ ResolutionTaskHolder@121 {
     <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[2] { ResolutionCandidate@131, ResolutionCandidate@132 }
-    <name not found> = ArrayList@133[4] { ResolutionCandidate@131, ResolutionCandidate@134, ResolutionCandidate@132, ... }
+null {
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@134[4] { ResolutionCandidate@122, ResolutionCandidate@125, ResolutionCandidate@123, ... }
+    <name not found> = ArrayList@135[4] { ResolutionCandidate@129, ResolutionCandidate@136, ResolutionCandidate@130, ... }
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@135 {
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
diff --git a/compiler/testData/diagnostics/tests/j+k/cantDeclareIfSamAdapterIsInherited.lazy.log b/compiler/testData/diagnostics/tests/j+k/cantDeclareIfSamAdapterIsInherited.lazy.log
index 6bf01e648ac..11a5710d896 100644
--- a/compiler/testData/diagnostics/tests/j+k/cantDeclareIfSamAdapterIsInherited.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/cantDeclareIfSamAdapterIsInherited.lazy.log
@@ -92,10 +92,13 @@ LazyJavaPackageFragment@60['java'] {
 
 ResolutionTaskHolder@79 {
     <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
 }
 
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
+}
+
+null {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@84 }
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/invisiblePackagePrivateInheritedMember.lazy.log b/compiler/testData/diagnostics/tests/j+k/invisiblePackagePrivateInheritedMember.lazy.log
index 70150beca02..b7ec9e73270 100644
--- a/compiler/testData/diagnostics/tests/j+k/invisiblePackagePrivateInheritedMember.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/invisiblePackagePrivateInheritedMember.lazy.log
@@ -78,9 +78,6 @@ LazyJavaPackageFragment@43['lang'] {
 
 ResolutionTaskHolder@61 {
     <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
     <name not found> = EmptyList@52[empty]
     <name not found> = EmptyList@52[empty]
     <name not found> = EmptyList@52[empty]
@@ -94,9 +91,15 @@ ResolutionTaskHolder@61 {
     <name not found> = EmptyList@52[empty]
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+}
+
+null {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@63 }
     <name not found> = EmptyList@52[empty]
     <name not found> = EmptyList@52[empty]
     <name not found> = EmptyList@52[empty]
diff --git a/compiler/testData/diagnostics/tests/j+k/kt1402.lazy.log b/compiler/testData/diagnostics/tests/j+k/kt1402.lazy.log
index 98ed0520d09..820b4ebd757 100644
--- a/compiler/testData/diagnostics/tests/j+k/kt1402.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/kt1402.lazy.log
@@ -79,23 +79,26 @@ LazyJavaPackageFragment@39['lang'] {
 
 ResolutionTaskHolder@59 {
     <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
 }
 
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
+}
+
+null {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@67 }
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/kt1431.lazy.log b/compiler/testData/diagnostics/tests/j+k/kt1431.lazy.log
index 9d00df3a5e1..e13f029d0ca 100644
--- a/compiler/testData/diagnostics/tests/j+k/kt1431.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/kt1431.lazy.log
@@ -37,14 +37,14 @@ LazyJavaClassifierType@26['B'] {
 
 LazyJavaClassifierType@29['B'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaTypeParameterImpl@28['B']
+    classifier = JavaTypeParameterImpl@23['B']
     nullable = 'true': Boolean@31
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@25
 }
 
 LazyJavaClassifierType@32['B'] {
     arguments = ArrayList@33[empty]
-    classifier = JavaTypeParameterImpl@23['B']
+    classifier = JavaTypeParameterImpl@28['B']
     nullable = 'true': Boolean@31
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@25
 }
@@ -149,25 +149,28 @@ LazyJavaTypeParameterResolver@95 {
 
 ResolutionTaskHolder@97 {
     <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
+    <name not found> = EmptyList@8[empty]
+    <name not found> = EmptyList@8[empty]
+}
+
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
+}
+
+ResolutionTaskHolder@103 {
+    <name not found> = EmptyList@8[empty]
+    <name not found> = EmptyList@8[empty]
+    <name not found> = EmptyList@8[empty]
+    <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
 }
 
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
+null {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@102 }
     <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
diff --git a/compiler/testData/diagnostics/tests/j+k/kt2394.lazy.log b/compiler/testData/diagnostics/tests/j+k/kt2394.lazy.log
index 38ee22dbe54..620258f47e9 100644
--- a/compiler/testData/diagnostics/tests/j+k/kt2394.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/kt2394.lazy.log
@@ -45,30 +45,33 @@ LazyJavaPackageFragment@19['java'] {
 
 ResolutionTaskHolder@45 {
     <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
+}
+
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
 }
 
 ResolutionTaskHolder@57 {
     <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+null {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@56 }
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/kt2619.lazy.log b/compiler/testData/diagnostics/tests/j+k/kt2619.lazy.log
index 95af734ee1f..99938150cef 100644
--- a/compiler/testData/diagnostics/tests/j+k/kt2619.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/kt2619.lazy.log
@@ -46,5 +46,8 @@ LazyJavaPackageFragment@14['java'] {
 
 ResolutionTaskHolder@37 {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
+}
+
+null {
     <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/kt2641.lazy.log b/compiler/testData/diagnostics/tests/j+k/kt2641.lazy.log
index 47b6f871258..0b7f7ef0343 100644
--- a/compiler/testData/diagnostics/tests/j+k/kt2641.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/kt2641.lazy.log
@@ -193,11 +193,11 @@ LazyJavaTypeParameterResolver@147 {
 }
 
 LazyJavaTypeParameterResolver@149 {
-    resolve(JavaTypeParameterImpl@67['T']) = LazyJavaTypeParameterDescriptor@38['T']
+    resolve(JavaTypeParameterImpl@150['T']) = LazyJavaTypeParameterDescriptor@46['T']
 }
 
-LazyJavaTypeParameterResolver@150 {
-    resolve(JavaTypeParameterImpl@151['T']) = LazyJavaTypeParameterDescriptor@46['T']
+LazyJavaTypeParameterResolver@151 {
+    resolve(JavaTypeParameterImpl@62['T']) = LazyJavaTypeParameterDescriptor@38['T']
 }
 
 LazyJavaTypeParameterResolver@152 {
@@ -210,15 +210,18 @@ LazyJavaTypeParameterResolver@153 {
 
 ResolutionTaskHolder@154 {
     <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@156 }
 }
 
-ResolutionTaskHolder@158 {
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@160 }
+ResolutionTaskHolder@157 {
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
 }
 
-ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@164 }
+ResolutionTaskHolder@160 {
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
+}
+
+null {
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@159 }
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@156 }
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@162 }
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/kt2890.lazy.log b/compiler/testData/diagnostics/tests/j+k/kt2890.lazy.log
index 8118238c600..bfe2061a23a 100644
--- a/compiler/testData/diagnostics/tests/j+k/kt2890.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/kt2890.lazy.log
@@ -112,14 +112,14 @@ LazyJavaClassifierType@74['E'] {
     arguments = ArrayList@75[empty]
     classifier = JavaTypeParameterImpl@76['E']
     nullable = 'false': Boolean@61
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
 }
 
-LazyJavaClassifierType@77['E'] {
-    arguments = ArrayList@78[empty]
-    classifier = JavaTypeParameterImpl@79['E']
+LazyJavaClassifierType@78['E'] {
+    arguments = ArrayList@79[empty]
+    classifier = JavaTypeParameterImpl@80['E']
     nullable = 'false': Boolean@61
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
 }
 
 LazyJavaClassifierType@81['E'] {
@@ -138,23 +138,23 @@ LazyJavaClassifierType@84['E'] {
 
 LazyJavaClassifierType@86['E'] {
     arguments = ArrayList@87[empty]
-    classifier = JavaTypeParameterImpl@72['E']
+    classifier = JavaTypeParameterImpl@76['E']
     nullable = 'true': Boolean@67
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
 }
 
 LazyJavaClassifierType@88['E'] {
     arguments = ArrayList@89[empty]
-    classifier = JavaTypeParameterImpl@76['E']
+    classifier = JavaTypeParameterImpl@72['E']
     nullable = 'true': Boolean@67
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
 }
 
 LazyJavaClassifierType@90['E'] {
     arguments = ArrayList@91[empty]
-    classifier = JavaTypeParameterImpl@79['E']
+    classifier = JavaTypeParameterImpl@80['E']
     nullable = 'true': Boolean@67
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
 }
 
 LazyJavaClassifierType@92['Integer'] {
@@ -173,14 +173,14 @@ LazyJavaClassifierType@96['Integer'] {
 
 LazyJavaClassifierType@99['Integer'] {
     arguments = ArrayList@100[empty]
-    classifier = JavaClassImpl@98['Integer']
+    classifier = JavaClassImpl@94['Integer']
     nullable = 'true': Boolean@67
     typeConstructor = DeserializedClassTypeConstructor@95
 }
 
 LazyJavaClassifierType@101['Integer'] {
     arguments = ArrayList@102[empty]
-    classifier = JavaClassImpl@94['Integer']
+    classifier = JavaClassImpl@98['Integer']
     nullable = 'true': Boolean@67
     typeConstructor = DeserializedClassTypeConstructor@95
 }
@@ -304,47 +304,50 @@ LazyJavaTypeParameterDescriptor@39['E'] {
 }
 
 LazyJavaTypeParameterDescriptor@34['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
 }
 
 LazyJavaTypeParameterResolver@172 {
-    resolve(JavaTypeParameterImpl@173['E']) = LazyJavaTypeParameterDescriptor@39['E']
+    resolve(JavaTypeParameterImpl@76['E']) = LazyJavaTypeParameterDescriptor@34['E']
 }
 
-LazyJavaTypeParameterResolver@174 {
-    resolve(JavaTypeParameterImpl@79['E']) = LazyJavaTypeParameterDescriptor@34['E']
+LazyJavaTypeParameterResolver@173 {
+    resolve(JavaTypeParameterImpl@174['E']) = LazyJavaTypeParameterDescriptor@39['E']
 }
 
 ResolutionTaskHolder@175 {
     <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@177 }
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@178 {
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@181 {
+    <name not found> = ArrayList@182[3] { ResolutionCandidate@183, ResolutionCandidate@184, ResolutionCandidate@185 }
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@186 {
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@179 {
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@181 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@183 {
-    <name not found> = ArrayList@184[3] { ResolutionCandidate@185, ResolutionCandidate@186, ResolutionCandidate@187 }
-    <name not found> = ArrayList@188[3] { ResolutionCandidate@185, ResolutionCandidate@186, ResolutionCandidate@187 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@189 {
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+null {
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@180 }
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@177 }
+    <name not found> = ArrayList@189[3] { ResolutionCandidate@183, ResolutionCandidate@184, ResolutionCandidate@185 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
diff --git a/compiler/testData/diagnostics/tests/j+k/kt3307.lazy.log b/compiler/testData/diagnostics/tests/j+k/kt3307.lazy.log
index 542d424618c..f3ce56c74c9 100644
--- a/compiler/testData/diagnostics/tests/j+k/kt3307.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/kt3307.lazy.log
@@ -140,33 +140,36 @@ LazyJavaTypeParameterResolver@85 {
 
 ResolutionTaskHolder@87 {
     <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
     <name not found> = EmptyList@74[empty]
     <name not found> = EmptyList@74[empty]
 }
 
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
     <name not found> = EmptyList@74[empty]
     <name not found> = EmptyList@74[empty]
 }
 
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
+}
+
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
 }
 
 ResolutionTaskHolder@99 {
     <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
 }
 
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
+null {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@98 }
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/kt3311.lazy.log b/compiler/testData/diagnostics/tests/j+k/kt3311.lazy.log
index f27f51a8176..6aa38c95cca 100644
--- a/compiler/testData/diagnostics/tests/j+k/kt3311.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/kt3311.lazy.log
@@ -77,34 +77,37 @@ LazyJavaPackageFragment@52['lang'] {
 
 ResolutionTaskHolder@76 {
     <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
 }
 
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
+}
+
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
 }
 
 ResolutionTaskHolder@88 {
     <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
 }
 
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
+null {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@87 }
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/mutableIterator.lazy.log b/compiler/testData/diagnostics/tests/j+k/mutableIterator.lazy.log
index 17190eb74d7..335cf222e9e 100644
--- a/compiler/testData/diagnostics/tests/j+k/mutableIterator.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/mutableIterator.lazy.log
@@ -71,7 +71,7 @@ LazyJavaClassifierType@52['Iterator<T>'] {
 
 LazyJavaClassifierType@57['Iterator<T>'] {
     arguments = ArrayList@58[1] { TypeProjectionImpl@59 }
-    classifier = JavaClassImpl@55['Iterator']
+    classifier = JavaClassImpl@49['Iterator']
     memberScope = SubstitutingScope@60
     nullable = 'true': Boolean@40
     typeConstructor = DeserializedClassTypeConstructor@61
@@ -79,7 +79,7 @@ LazyJavaClassifierType@57['Iterator<T>'] {
 
 LazyJavaClassifierType@62['Iterator<T>'] {
     arguments = ArrayList@63[1] { TypeProjectionImpl@64 }
-    classifier = JavaClassImpl@49['Iterator']
+    classifier = JavaClassImpl@55['Iterator']
     memberScope = SubstitutingScope@65
     nullable = 'true': Boolean@40
     typeConstructor = DeserializedClassTypeConstructor@61
@@ -148,56 +148,56 @@ LazyJavaClassifierType@91['T'] {
 
 LazyJavaClassifierType@94['T'] {
     arguments = ArrayList@95[empty]
-    classifier = JavaTypeParameterImpl@93['T']
+    classifier = JavaTypeParameterImpl@75['T']
     nullable = 'true': Boolean@40
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
 }
 
 LazyJavaClassifierType@96['T'] {
     arguments = ArrayList@97[empty]
-    classifier = JavaTypeParameterImpl@71['T']
+    classifier = JavaTypeParameterImpl@78['T']
     nullable = 'true': Boolean@40
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
 }
 
 LazyJavaClassifierType@98['T'] {
     arguments = ArrayList@99[empty]
-    classifier = JavaTypeParameterImpl@90['T']
+    classifier = JavaTypeParameterImpl@81['T']
     nullable = 'true': Boolean@40
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
 }
 
 LazyJavaClassifierType@100['T'] {
     arguments = ArrayList@101[empty]
-    classifier = JavaTypeParameterImpl@78['T']
+    classifier = JavaTypeParameterImpl@84['T']
     nullable = 'true': Boolean@40
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
 }
 
 LazyJavaClassifierType@102['T'] {
     arguments = ArrayList@103[empty]
-    classifier = JavaTypeParameterImpl@84['T']
+    classifier = JavaTypeParameterImpl@90['T']
     nullable = 'true': Boolean@40
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
 }
 
 LazyJavaClassifierType@104['T'] {
     arguments = ArrayList@105[empty]
-    classifier = JavaTypeParameterImpl@87['T']
+    classifier = JavaTypeParameterImpl@93['T']
     nullable = 'true': Boolean@40
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
 }
 
 LazyJavaClassifierType@106['T'] {
     arguments = ArrayList@107[empty]
-    classifier = JavaTypeParameterImpl@81['T']
+    classifier = JavaTypeParameterImpl@71['T']
     nullable = 'true': Boolean@40
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
 }
 
 LazyJavaClassifierType@108['T'] {
     arguments = ArrayList@109[empty]
-    classifier = JavaTypeParameterImpl@75['T']
+    classifier = JavaTypeParameterImpl@87['T']
     nullable = 'true': Boolean@40
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
 }
@@ -264,15 +264,15 @@ LazyJavaTypeParameterResolver@162 {
 }
 
 LazyJavaTypeParameterResolver@164 {
-    resolve(JavaTypeParameterImpl@84['T']) = null
+    resolve(JavaTypeParameterImpl@81['T']) = null
 }
 
 LazyJavaTypeParameterResolver@165 {
-    resolve(JavaTypeParameterImpl@75['T']) = null
+    resolve(JavaTypeParameterImpl@93['T']) = null
 }
 
 LazyJavaTypeParameterResolver@166 {
-    resolve(JavaTypeParameterImpl@87['T']) = null
+    resolve(JavaTypeParameterImpl@71['T']) = null
 }
 
 LazyJavaTypeParameterResolver@167 {
@@ -281,80 +281,83 @@ LazyJavaTypeParameterResolver@167 {
 
 ResolutionTaskHolder@168 {
     <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@170 }
 }
 
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@174 }
+ResolutionTaskHolder@171 {
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
 }
 
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@178 }
+ResolutionTaskHolder@174 {
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
+}
+
+ResolutionTaskHolder@177 {
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
 }
 
 ResolutionTaskHolder@180 {
     <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@182 }
 }
 
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@186 }
+ResolutionTaskHolder@183 {
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
 }
 
-ResolutionTaskHolder@188 {
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@190 }
+ResolutionTaskHolder@186 {
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
+}
+
+ResolutionTaskHolder@189 {
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
 }
 
 ResolutionTaskHolder@192 {
     <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@194 }
 }
 
-ResolutionTaskHolder@196 {
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@198 }
+ResolutionTaskHolder@195 {
+    <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
 }
 
-ResolutionTaskHolder@200 {
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@202 }
+ResolutionTaskHolder@198 {
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
+}
+
+ResolutionTaskHolder@201 {
+    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
 }
 
 ResolutionTaskHolder@204 {
     <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@206 }
 }
 
-ResolutionTaskHolder@208 {
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@210 }
+ResolutionTaskHolder@207 {
+    <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
 }
 
-ResolutionTaskHolder@212 {
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@214 }
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@214 }
+ResolutionTaskHolder@210 {
+    <name not found> = ArrayList@211[1] { ResolutionCandidate@212 }
 }
 
-ResolutionTaskHolder@216 {
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@218 }
+ResolutionTaskHolder@213 {
+    <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
 }
 
-ResolutionTaskHolder@220 {
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@222 }
-}
-
-ResolutionTaskHolder@224 {
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@226 }
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@226 }
-}
-
-ResolutionTaskHolder@228 {
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@230 }
+null {
+    <name not found> = ArrayList@216[1] { ResolutionCandidate@206 }
+    <name not found> = ArrayList@217[1] { ResolutionCandidate@215 }
+    <name not found> = ArrayList@218[1] { ResolutionCandidate@185 }
+    <name not found> = ArrayList@219[1] { ResolutionCandidate@170 }
+    <name not found> = ArrayList@220[1] { ResolutionCandidate@173 }
+    <name not found> = ArrayList@221[1] { ResolutionCandidate@191 }
+    <name not found> = ArrayList@222[1] { ResolutionCandidate@194 }
+    <name not found> = ArrayList@223[1] { ResolutionCandidate@209 }
+    <name not found> = ArrayList@224[1] { ResolutionCandidate@182 }
+    <name not found> = ArrayList@225[1] { ResolutionCandidate@176 }
+    <name not found> = ArrayList@226[1] { ResolutionCandidate@179 }
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@200 }
+    <name not found> = ArrayList@228[1] { ResolutionCandidate@188 }
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@203 }
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@212 }
+    <name not found> = ArrayList@231[1] { ResolutionCandidate@197 }
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/overrideRawType.lazy.log b/compiler/testData/diagnostics/tests/j+k/overrideRawType.lazy.log
index 17c257dc563..2837d96bec8 100644
--- a/compiler/testData/diagnostics/tests/j+k/overrideRawType.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/overrideRawType.lazy.log
@@ -126,14 +126,14 @@ LazyJavaClassifierType@84['String'] {
 
 LazyJavaClassifierType@87['String'] {
     arguments = ArrayList@88[empty]
-    classifier = JavaClassImpl@86['String']
+    classifier = JavaClassImpl@82['String']
     nullable = 'true': Boolean@65
     typeConstructor = DeserializedClassTypeConstructor@83
 }
 
 LazyJavaClassifierType@89['String'] {
     arguments = ArrayList@90[empty]
-    classifier = JavaClassImpl@82['String']
+    classifier = JavaClassImpl@86['String']
     nullable = 'true': Boolean@65
     typeConstructor = DeserializedClassTypeConstructor@83
 }
@@ -154,14 +154,14 @@ LazyJavaClassifierType@95['Throwable'] {
 
 LazyJavaClassifierType@98['Throwable'] {
     arguments = ArrayList@99[empty]
-    classifier = JavaClassImpl@93['Throwable']
+    classifier = JavaClassImpl@97['Throwable']
     nullable = 'true': Boolean@65
     typeConstructor = DeserializedClassTypeConstructor@94
 }
 
 LazyJavaClassifierType@100['Throwable'] {
     arguments = ArrayList@101[empty]
-    classifier = JavaClassImpl@97['Throwable']
+    classifier = JavaClassImpl@93['Throwable']
     nullable = 'true': Boolean@65
     typeConstructor = DeserializedClassTypeConstructor@94
 }
@@ -232,15 +232,18 @@ LazyJavaTypeParameterResolver@143 {
 
 ResolutionTaskHolder@145 {
     <name not found> = ArrayList@146[4] { ResolutionCandidate@147, ResolutionCandidate@148, ResolutionCandidate@149, ... }
-    <name not found> = ArrayList@150[4] { ResolutionCandidate@147, ResolutionCandidate@148, ResolutionCandidate@149, ... }
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+}
+
+null {
+    <name not found> = ArrayList@150[4] { ResolutionCandidate@147, ResolutionCandidate@148, ResolutionCandidate@149, ... }
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
diff --git a/compiler/testData/diagnostics/tests/j+k/packagePrivateClassStaticMember.lazy.log b/compiler/testData/diagnostics/tests/j+k/packagePrivateClassStaticMember.lazy.log
index c0a7c37599a..f26431dac63 100644
--- a/compiler/testData/diagnostics/tests/j+k/packagePrivateClassStaticMember.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/packagePrivateClassStaticMember.lazy.log
@@ -53,20 +53,23 @@ LazyJavaPackageFragment@27['lang'] {
 
 ResolutionTaskHolder@42 {
     <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+}
+
+ResolutionTaskHolder@45 {
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
+null {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@44 }
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
diff --git a/compiler/testData/diagnostics/tests/j+k/packageVisibility.lazy.log b/compiler/testData/diagnostics/tests/j+k/packageVisibility.lazy.log
index fa4f45ee4fb..70fc2b8d71c 100644
--- a/compiler/testData/diagnostics/tests/j+k/packageVisibility.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/packageVisibility.lazy.log
@@ -130,10 +130,6 @@ LazyJavaPackageFragment@69['lang'] {
 
 ResolutionTaskHolder@88 {
     <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
@@ -151,12 +147,8 @@ ResolutionTaskHolder@88 {
     <name not found> = EmptyList@10[empty]
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
@@ -174,9 +166,8 @@ ResolutionTaskHolder@92 {
     <name not found> = EmptyList@10[empty]
 }
 
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
@@ -192,6 +183,22 @@ ResolutionTaskHolder@96 {
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
+}
+
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
@@ -199,10 +206,6 @@ ResolutionTaskHolder@96 {
 
 ResolutionTaskHolder@100 {
     <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
@@ -220,12 +223,8 @@ ResolutionTaskHolder@100 {
     <name not found> = EmptyList@10[empty]
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
@@ -243,9 +242,8 @@ ResolutionTaskHolder@104 {
     <name not found> = EmptyList@10[empty]
 }
 
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
@@ -261,6 +259,22 @@ ResolutionTaskHolder@108 {
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
+}
+
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
@@ -268,62 +282,66 @@ ResolutionTaskHolder@108 {
 
 ResolutionTaskHolder@112 {
     <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
 }
 
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
+ResolutionTaskHolder@115 {
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
 }
 
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
+ResolutionTaskHolder@118 {
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
+}
+
+ResolutionTaskHolder@121 {
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
 }
 
 ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@126 }
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+}
+
+ResolutionTaskHolder@125 {
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+}
+
+ResolutionTaskHolder@126 {
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+}
+
+ResolutionTaskHolder@127 {
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
@@ -331,24 +349,28 @@ ResolutionTaskHolder@124 {
 }
 
 ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
 }
 
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
+ResolutionTaskHolder@129 {
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
 }
 
-ResolutionTaskHolder@136 {
+ResolutionTaskHolder@130 {
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
@@ -357,13 +379,20 @@ ResolutionTaskHolder@136 {
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
+}
+
+ResolutionTaskHolder@131 {
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
 }
 
-ResolutionTaskHolder@137 {
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
+ResolutionTaskHolder@132 {
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
@@ -374,9 +403,7 @@ ResolutionTaskHolder@137 {
     <name not found> = EmptyList@10[empty]
 }
 
-ResolutionTaskHolder@138 {
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
+ResolutionTaskHolder@133 {
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
@@ -387,9 +414,7 @@ ResolutionTaskHolder@138 {
     <name not found> = EmptyList@10[empty]
 }
 
-ResolutionTaskHolder@139 {
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
+ResolutionTaskHolder@134 {
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
@@ -400,9 +425,7 @@ ResolutionTaskHolder@139 {
     <name not found> = EmptyList@10[empty]
 }
 
-ResolutionTaskHolder@140 {
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
+ResolutionTaskHolder@135 {
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
@@ -413,85 +436,65 @@ ResolutionTaskHolder@140 {
     <name not found> = EmptyList@10[empty]
 }
 
-ResolutionTaskHolder@141 {
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-}
-
-ResolutionTaskHolder@143 {
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-}
-
-ResolutionTaskHolder@144 {
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-}
-
-ResolutionTaskHolder@145 {
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-}
-
-ResolutionTaskHolder@146 {
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-}
-
-ResolutionTaskHolder@147 {
+null {
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@123 }
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
diff --git a/compiler/testData/diagnostics/tests/j+k/privateNestedClassStaticMember.lazy.log b/compiler/testData/diagnostics/tests/j+k/privateNestedClassStaticMember.lazy.log
index 18c9cf6c463..f20e9959719 100644
--- a/compiler/testData/diagnostics/tests/j+k/privateNestedClassStaticMember.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/privateNestedClassStaticMember.lazy.log
@@ -83,7 +83,6 @@ LazyJavaPackageFragment@36['lang'] {
 
 ResolutionTaskHolder@60 {
     <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
@@ -99,6 +98,14 @@ ResolutionTaskHolder@60 {
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
+}
+
+ResolutionTaskHolder@63 {
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
@@ -113,8 +120,6 @@ ResolutionTaskHolder@64 {
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
 }
 
 ResolutionTaskHolder@65 {
@@ -126,12 +131,10 @@ ResolutionTaskHolder@65 {
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = EmptyList@7[empty]
+null {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@62 }
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
diff --git a/compiler/testData/diagnostics/tests/j+k/protectedStaticSamePackage.lazy.log b/compiler/testData/diagnostics/tests/j+k/protectedStaticSamePackage.lazy.log
index a251d2011c2..60b8065a005 100644
--- a/compiler/testData/diagnostics/tests/j+k/protectedStaticSamePackage.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/protectedStaticSamePackage.lazy.log
@@ -70,23 +70,16 @@ LazyJavaPackageFragment@42['test'] {
 
 ResolutionTaskHolder@53 {
     <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@7[empty]
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
     <name not found> = EmptyList@7[empty]
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
+ResolutionTaskHolder@59 {
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
@@ -97,9 +90,7 @@ ResolutionTaskHolder@61 {
     <name not found> = EmptyList@7[empty]
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
+ResolutionTaskHolder@60 {
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
@@ -109,3 +100,15 @@ ResolutionTaskHolder@62 {
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
 }
+
+null {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@55 }
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/j+k/recursiveRawUpperBound.lazy.log b/compiler/testData/diagnostics/tests/j+k/recursiveRawUpperBound.lazy.log
index 168f9564e9a..167c646e76f 100644
--- a/compiler/testData/diagnostics/tests/j+k/recursiveRawUpperBound.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/recursiveRawUpperBound.lazy.log
@@ -95,10 +95,13 @@ LazyJavaTypeParameterResolver@63 {
 
 ResolutionTaskHolder@65 {
     <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
+}
+
+null {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@70 }
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/samInConstructorWithGenerics.lazy.log b/compiler/testData/diagnostics/tests/j+k/samInConstructorWithGenerics.lazy.log
index aae75d147b9..cfb459d6112 100644
--- a/compiler/testData/diagnostics/tests/j+k/samInConstructorWithGenerics.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/samInConstructorWithGenerics.lazy.log
@@ -150,5 +150,8 @@ LazyJavaTypeParameterResolver@105 {
 ResolutionTaskHolder@107 {
     <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
     <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
+}
+
+null {
     <name not found> = ArrayList@112[2] { ResolutionCandidate@109, ResolutionCandidate@111 }
 }
diff --git a/compiler/testData/diagnostics/tests/jdk-annotations/ArrayListAndMap.lazy.log b/compiler/testData/diagnostics/tests/jdk-annotations/ArrayListAndMap.lazy.log
index b1cff802af6..088854376b4 100644
--- a/compiler/testData/diagnostics/tests/jdk-annotations/ArrayListAndMap.lazy.log
+++ b/compiler/testData/diagnostics/tests/jdk-annotations/ArrayListAndMap.lazy.log
@@ -239,18 +239,18 @@ LazyJavaClassifierType@173['AutoCloseable'] {
     typeConstructor = LazyJavaClassTypeConstructor@83['AutoCloseable']
 }
 
-LazyJavaClassifierType@183['Cloneable'] {
-    arguments = ArrayList@215[empty]
-    classifier = JavaClassImpl@216['Cloneable']
-    memberScope = DeserializedClassMemberScope@217
-    typeConstructor = DeserializedClassTypeConstructor@218
+LazyJavaClassifierType@215['Cloneable'] {
+    arguments = ArrayList@216[empty]
+    classifier = JavaClassImpl@217['Cloneable']
+    memberScope = DeserializedClassMemberScope@218
+    typeConstructor = DeserializedClassTypeConstructor@219
 }
 
-LazyJavaClassifierType@219['Cloneable'] {
+LazyJavaClassifierType@183['Cloneable'] {
     arguments = ArrayList@220[empty]
     classifier = JavaClassImpl@221['Cloneable']
-    memberScope = DeserializedClassMemberScope@217
-    typeConstructor = DeserializedClassTypeConstructor@218
+    memberScope = DeserializedClassMemberScope@218
+    typeConstructor = DeserializedClassTypeConstructor@219
 }
 
 LazyJavaClassifierType@191['Closeable'] {
@@ -309,7 +309,7 @@ LazyJavaClassifierType@247['Collection<? extends E>'] {
 
 LazyJavaClassifierType@252['Collection<? extends E>'] {
     arguments = ArrayList@253[1] { TypeProjectionImpl@254 }
-    classifier = JavaClassImpl@245['Collection']
+    classifier = JavaClassImpl@229['Collection']
     memberScope = SubstitutingScope@255
     nullable = 'true': Boolean@256
     typeConstructor = DeserializedClassTypeConstructor@257
@@ -317,7 +317,7 @@ LazyJavaClassifierType@252['Collection<? extends E>'] {
 
 LazyJavaClassifierType@258['Collection<? extends E>'] {
     arguments = ArrayList@259[1] { TypeProjectionImpl@260 }
-    classifier = JavaClassImpl@240['Collection']
+    classifier = JavaClassImpl@235['Collection']
     memberScope = SubstitutingScope@261
     nullable = 'true': Boolean@256
     typeConstructor = DeserializedClassTypeConstructor@257
@@ -333,7 +333,7 @@ LazyJavaClassifierType@262['Collection<? extends E>'] {
 
 LazyJavaClassifierType@266['Collection<? extends E>'] {
     arguments = ArrayList@267[1] { TypeProjectionImpl@268 }
-    classifier = JavaClassImpl@235['Collection']
+    classifier = JavaClassImpl@240['Collection']
     memberScope = SubstitutingScope@269
     nullable = 'true': Boolean@256
     typeConstructor = DeserializedClassTypeConstructor@257
@@ -341,7 +341,7 @@ LazyJavaClassifierType@266['Collection<? extends E>'] {
 
 LazyJavaClassifierType@270['Collection<? extends E>'] {
     arguments = ArrayList@271[1] { TypeProjectionImpl@272 }
-    classifier = JavaClassImpl@229['Collection']
+    classifier = JavaClassImpl@245['Collection']
     memberScope = SubstitutingScope@273
     nullable = 'true': Boolean@256
     typeConstructor = DeserializedClassTypeConstructor@257
@@ -365,21 +365,21 @@ LazyJavaClassifierType@282['E'] {
     arguments = ArrayList@283[empty]
     classifier = JavaTypeParameterImpl@284['E']
     nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@285
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
 }
 
-LazyJavaClassifierType@286['E'] {
-    arguments = ArrayList@287[empty]
-    classifier = JavaTypeParameterImpl@288['E']
+LazyJavaClassifierType@285['E'] {
+    arguments = ArrayList@286[empty]
+    classifier = JavaTypeParameterImpl@287['E']
     nullable = 'false': Boolean@201
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
 }
 
-LazyJavaClassifierType@289['E'] {
-    arguments = ArrayList@290[empty]
-    classifier = JavaTypeParameterImpl@291['E']
+LazyJavaClassifierType@288['E'] {
+    arguments = ArrayList@289[empty]
+    classifier = JavaTypeParameterImpl@290['E']
     nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@291
 }
 
 LazyJavaClassifierType@292['E'] {
@@ -393,42 +393,42 @@ LazyJavaClassifierType@296['E'] {
     arguments = ArrayList@297[empty]
     classifier = JavaTypeParameterImpl@298['E']
     nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@285
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@291
 }
 
 LazyJavaClassifierType@299['E'] {
     arguments = ArrayList@300[empty]
     classifier = JavaTypeParameterImpl@301['E']
     nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@285
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@291
 }
 
 LazyJavaClassifierType@302['E'] {
     arguments = ArrayList@303[empty]
     classifier = JavaTypeParameterImpl@304['E']
     nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@285
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
 }
 
 LazyJavaClassifierType@305['E'] {
     arguments = ArrayList@306[empty]
     classifier = JavaTypeParameterImpl@307['E']
     nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@285
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@291
 }
 
 LazyJavaClassifierType@308['E'] {
     arguments = ArrayList@309[empty]
     classifier = JavaTypeParameterImpl@310['E']
     nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@285
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
 }
 
 LazyJavaClassifierType@311['E'] {
     arguments = ArrayList@312[empty]
     classifier = JavaTypeParameterImpl@313['E']
     nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@295
 }
 
 LazyJavaClassifierType@314['E'] {
@@ -442,7 +442,7 @@ LazyJavaClassifierType@317['E'] {
     arguments = ArrayList@318[empty]
     classifier = JavaTypeParameterImpl@319['E']
     nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@295
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
 }
 
 LazyJavaClassifierType@320['E'] {
@@ -463,14 +463,14 @@ LazyJavaClassifierType@326['E'] {
     arguments = ArrayList@327[empty]
     classifier = JavaTypeParameterImpl@328['E']
     nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@295
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
 }
 
 LazyJavaClassifierType@329['E'] {
     arguments = ArrayList@330[empty]
     classifier = JavaTypeParameterImpl@331['E']
     nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@285
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@291
 }
 
 LazyJavaClassifierType@332['E'] {
@@ -484,14 +484,14 @@ LazyJavaClassifierType@335['E'] {
     arguments = ArrayList@336[empty]
     classifier = JavaTypeParameterImpl@337['E']
     nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@291
 }
 
 LazyJavaClassifierType@338['E'] {
     arguments = ArrayList@339[empty]
     classifier = JavaTypeParameterImpl@340['E']
     nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@291
 }
 
 LazyJavaClassifierType@341['E'] {
@@ -505,159 +505,159 @@ LazyJavaClassifierType@344['E'] {
     arguments = ArrayList@345[empty]
     classifier = JavaTypeParameterImpl@346['E']
     nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@295
 }
 
 LazyJavaClassifierType@347['E'] {
     arguments = ArrayList@348[empty]
+    classifier = JavaTypeParameterImpl@340['E']
+    nullable = 'true': Boolean@256
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@291
+}
+
+LazyJavaClassifierType@349['E'] {
+    arguments = ArrayList@350[empty]
+    classifier = JavaTypeParameterImpl@304['E']
+    nullable = 'true': Boolean@256
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
+}
+
+LazyJavaClassifierType@351['E'] {
+    arguments = ArrayList@352[empty]
+    classifier = JavaTypeParameterImpl@298['E']
+    nullable = 'true': Boolean@256
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@291
+}
+
+LazyJavaClassifierType@353['E'] {
+    arguments = ArrayList@354[empty]
+    classifier = JavaTypeParameterImpl@319['E']
+    nullable = 'true': Boolean@256
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
+}
+
+LazyJavaClassifierType@355['E'] {
+    arguments = ArrayList@356[empty]
     classifier = JavaTypeParameterImpl@343['E']
     nullable = 'true': Boolean@256
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
 }
 
-LazyJavaClassifierType@349['E'] {
-    arguments = ArrayList@350[empty]
-    classifier = JavaTypeParameterImpl@307['E']
+LazyJavaClassifierType@357['E'] {
+    arguments = ArrayList@358[empty]
+    classifier = JavaTypeParameterImpl@301['E']
     nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@285
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@291
 }
 
-LazyJavaClassifierType@351['E'] {
-    arguments = ArrayList@352[empty]
-    classifier = JavaTypeParameterImpl@328['E']
-    nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@295
-}
-
-LazyJavaClassifierType@353['E'] {
-    arguments = ArrayList@354[empty]
+LazyJavaClassifierType@359['E'] {
+    arguments = ArrayList@360[empty]
     classifier = JavaTypeParameterImpl@325['E']
     nullable = 'true': Boolean@256
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@295
 }
 
-LazyJavaClassifierType@355['E'] {
-    arguments = ArrayList@356[empty]
-    classifier = JavaTypeParameterImpl@294['E']
-    nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@295
-}
-
-LazyJavaClassifierType@357['E'] {
-    arguments = ArrayList@358[empty]
-    classifier = JavaTypeParameterImpl@316['E']
-    nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
-}
-
-LazyJavaClassifierType@359['E'] {
-    arguments = ArrayList@360[empty]
-    classifier = JavaTypeParameterImpl@340['E']
-    nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
-}
-
 LazyJavaClassifierType@361['E'] {
     arguments = ArrayList@362[empty]
-    classifier = JavaTypeParameterImpl@331['E']
+    classifier = JavaTypeParameterImpl@310['E']
     nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@285
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
 }
 
 LazyJavaClassifierType@363['E'] {
     arguments = ArrayList@364[empty]
-    classifier = JavaTypeParameterImpl@291['E']
+    classifier = JavaTypeParameterImpl@290['E']
     nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@291
 }
 
 LazyJavaClassifierType@365['E'] {
     arguments = ArrayList@366[empty]
-    classifier = JavaTypeParameterImpl@313['E']
+    classifier = JavaTypeParameterImpl@287['E']
     nullable = 'true': Boolean@256
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
 }
 
 LazyJavaClassifierType@367['E'] {
     arguments = ArrayList@368[empty]
-    classifier = JavaTypeParameterImpl@304['E']
+    classifier = JavaTypeParameterImpl@346['E']
     nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@285
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@295
 }
 
 LazyJavaClassifierType@369['E'] {
     arguments = ArrayList@370[empty]
-    classifier = JavaTypeParameterImpl@334['E']
+    classifier = JavaTypeParameterImpl@322['E']
     nullable = 'true': Boolean@256
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
 }
 
 LazyJavaClassifierType@371['E'] {
     arguments = ArrayList@372[empty]
-    classifier = JavaTypeParameterImpl@310['E']
-    nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@285
-}
-
-LazyJavaClassifierType@373['E'] {
-    arguments = ArrayList@374[empty]
-    classifier = JavaTypeParameterImpl@280['E']
+    classifier = JavaTypeParameterImpl@284['E']
     nullable = 'true': Boolean@256
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
 }
 
+LazyJavaClassifierType@373['E'] {
+    arguments = ArrayList@374[empty]
+    classifier = JavaTypeParameterImpl@313['E']
+    nullable = 'true': Boolean@256
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@295
+}
+
 LazyJavaClassifierType@375['E'] {
     arguments = ArrayList@376[empty]
-    classifier = JavaTypeParameterImpl@346['E']
+    classifier = JavaTypeParameterImpl@334['E']
     nullable = 'true': Boolean@256
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
 }
 
 LazyJavaClassifierType@377['E'] {
     arguments = ArrayList@378[empty]
-    classifier = JavaTypeParameterImpl@284['E']
+    classifier = JavaTypeParameterImpl@337['E']
     nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@285
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@291
 }
 
 LazyJavaClassifierType@379['E'] {
     arguments = ArrayList@380[empty]
-    classifier = JavaTypeParameterImpl@319['E']
+    classifier = JavaTypeParameterImpl@294['E']
     nullable = 'true': Boolean@256
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@295
 }
 
 LazyJavaClassifierType@381['E'] {
     arguments = ArrayList@382[empty]
-    classifier = JavaTypeParameterImpl@322['E']
+    classifier = JavaTypeParameterImpl@280['E']
     nullable = 'true': Boolean@256
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
 }
 
 LazyJavaClassifierType@383['E'] {
     arguments = ArrayList@384[empty]
-    classifier = JavaTypeParameterImpl@298['E']
+    classifier = JavaTypeParameterImpl@331['E']
     nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@285
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@291
 }
 
 LazyJavaClassifierType@385['E'] {
     arguments = ArrayList@386[empty]
-    classifier = JavaTypeParameterImpl@301['E']
-    nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@285
-}
-
-LazyJavaClassifierType@387['E'] {
-    arguments = ArrayList@388[empty]
-    classifier = JavaTypeParameterImpl@337['E']
+    classifier = JavaTypeParameterImpl@328['E']
     nullable = 'true': Boolean@256
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
 }
 
+LazyJavaClassifierType@387['E'] {
+    arguments = ArrayList@388[empty]
+    classifier = JavaTypeParameterImpl@307['E']
+    nullable = 'true': Boolean@256
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@291
+}
+
 LazyJavaClassifierType@389['E'] {
     arguments = ArrayList@390[empty]
-    classifier = JavaTypeParameterImpl@288['E']
+    classifier = JavaTypeParameterImpl@316['E']
     nullable = 'true': Boolean@256
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
 }
@@ -699,21 +699,21 @@ LazyJavaClassifierType@406['K'] {
     arguments = ArrayList@407[empty]
     classifier = JavaTypeParameterImpl@408['K']
     nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@398
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@402
 }
 
 LazyJavaClassifierType@409['K'] {
     arguments = ArrayList@410[empty]
     classifier = JavaTypeParameterImpl@411['K']
     nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@398
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@402
 }
 
 LazyJavaClassifierType@412['K'] {
     arguments = ArrayList@413[empty]
     classifier = JavaTypeParameterImpl@414['K']
     nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@398
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@402
 }
 
 LazyJavaClassifierType@415['K'] {
@@ -725,9 +725,9 @@ LazyJavaClassifierType@415['K'] {
 
 LazyJavaClassifierType@418['K'] {
     arguments = ArrayList@419[empty]
-    classifier = JavaTypeParameterImpl@414['K']
+    classifier = JavaTypeParameterImpl@408['K']
     nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@398
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@402
 }
 
 LazyJavaClassifierType@420['K'] {
@@ -739,37 +739,37 @@ LazyJavaClassifierType@420['K'] {
 
 LazyJavaClassifierType@422['K'] {
     arguments = ArrayList@423[empty]
-    classifier = JavaTypeParameterImpl@408['K']
+    classifier = JavaTypeParameterImpl@411['K']
     nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@398
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@402
 }
 
 LazyJavaClassifierType@424['K'] {
     arguments = ArrayList@425[empty]
-    classifier = JavaTypeParameterImpl@411['K']
+    classifier = JavaTypeParameterImpl@401['K']
     nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@398
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@402
 }
 
 LazyJavaClassifierType@426['K'] {
     arguments = ArrayList@427[empty]
-    classifier = JavaTypeParameterImpl@397['K']
+    classifier = JavaTypeParameterImpl@414['K']
     nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@398
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@402
 }
 
 LazyJavaClassifierType@428['K'] {
     arguments = ArrayList@429[empty]
-    classifier = JavaTypeParameterImpl@417['K']
+    classifier = JavaTypeParameterImpl@397['K']
     nullable = 'true': Boolean@256
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@398
 }
 
 LazyJavaClassifierType@430['K'] {
     arguments = ArrayList@431[empty]
-    classifier = JavaTypeParameterImpl@401['K']
+    classifier = JavaTypeParameterImpl@417['K']
     nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@402
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@398
 }
 
 LazyJavaClassifierType@154['List<E>'] {
@@ -835,7 +835,7 @@ LazyJavaClassifierType@469['Object'] {
 
 LazyJavaClassifierType@472['Object'] {
     arguments = ArrayList@473[empty]
-    classifier = JavaClassImpl@471['Object']
+    classifier = JavaClassImpl@466['Object']
     memberScope = DeserializedClassMemberScope@467
     nullable = 'true': Boolean@256
     typeConstructor = DeserializedClassTypeConstructor@468
@@ -843,7 +843,7 @@ LazyJavaClassifierType@472['Object'] {
 
 LazyJavaClassifierType@474['Object'] {
     arguments = ArrayList@475[empty]
-    classifier = JavaClassImpl@466['Object']
+    classifier = JavaClassImpl@471['Object']
     memberScope = DeserializedClassMemberScope@467
     nullable = 'true': Boolean@256
     typeConstructor = DeserializedClassTypeConstructor@468
@@ -972,14 +972,14 @@ LazyJavaClassifierType@522['V'] {
     arguments = ArrayList@523[empty]
     classifier = JavaTypeParameterImpl@524['V']
     nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@525
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
 }
 
-LazyJavaClassifierType@526['V'] {
-    arguments = ArrayList@527[empty]
-    classifier = JavaTypeParameterImpl@528['V']
+LazyJavaClassifierType@525['V'] {
+    arguments = ArrayList@526[empty]
+    classifier = JavaTypeParameterImpl@527['V']
     nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@525
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@528
 }
 
 LazyJavaClassifierType@529['V'] {
@@ -993,7 +993,7 @@ LazyJavaClassifierType@532['V'] {
     arguments = ArrayList@533[empty]
     classifier = JavaTypeParameterImpl@534['V']
     nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@525
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
 }
 
 LazyJavaClassifierType@535['V'] {
@@ -1007,7 +1007,7 @@ LazyJavaClassifierType@538['V'] {
     arguments = ArrayList@539[empty]
     classifier = JavaTypeParameterImpl@540['V']
     nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@525
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@528
 }
 
 LazyJavaClassifierType@541['V'] {
@@ -1028,89 +1028,89 @@ LazyJavaClassifierType@547['V'] {
     arguments = ArrayList@548[empty]
     classifier = JavaTypeParameterImpl@549['V']
     nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@528
 }
 
 LazyJavaClassifierType@550['V'] {
     arguments = ArrayList@551[empty]
     classifier = JavaTypeParameterImpl@552['V']
     nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@528
 }
 
 LazyJavaClassifierType@553['V'] {
     arguments = ArrayList@554[empty]
-    classifier = JavaTypeParameterImpl@528['V']
+    classifier = JavaTypeParameterImpl@527['V']
     nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@525
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@528
 }
 
 LazyJavaClassifierType@555['V'] {
     arguments = ArrayList@556[empty]
-    classifier = JavaTypeParameterImpl@534['V']
+    classifier = JavaTypeParameterImpl@543['V']
     nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@525
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
 }
 
 LazyJavaClassifierType@557['V'] {
     arguments = ArrayList@558[empty]
-    classifier = JavaTypeParameterImpl@520['V']
+    classifier = JavaTypeParameterImpl@534['V']
     nullable = 'true': Boolean@256
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
 }
 
 LazyJavaClassifierType@559['V'] {
     arguments = ArrayList@560[empty]
-    classifier = JavaTypeParameterImpl@543['V']
+    classifier = JavaTypeParameterImpl@540['V']
     nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@528
 }
 
 LazyJavaClassifierType@561['V'] {
     arguments = ArrayList@562[empty]
-    classifier = JavaTypeParameterImpl@546['V']
+    classifier = JavaTypeParameterImpl@549['V']
     nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@528
 }
 
 LazyJavaClassifierType@563['V'] {
     arguments = ArrayList@564[empty]
-    classifier = JavaTypeParameterImpl@524['V']
+    classifier = JavaTypeParameterImpl@531['V']
     nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@525
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
 }
 
 LazyJavaClassifierType@565['V'] {
     arguments = ArrayList@566[empty]
-    classifier = JavaTypeParameterImpl@531['V']
+    classifier = JavaTypeParameterImpl@524['V']
     nullable = 'true': Boolean@256
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
 }
 
 LazyJavaClassifierType@567['V'] {
     arguments = ArrayList@568[empty]
-    classifier = JavaTypeParameterImpl@552['V']
+    classifier = JavaTypeParameterImpl@537['V']
     nullable = 'true': Boolean@256
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
 }
 
 LazyJavaClassifierType@569['V'] {
     arguments = ArrayList@570[empty]
-    classifier = JavaTypeParameterImpl@549['V']
+    classifier = JavaTypeParameterImpl@546['V']
     nullable = 'true': Boolean@256
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
 }
 
 LazyJavaClassifierType@571['V'] {
     arguments = ArrayList@572[empty]
-    classifier = JavaTypeParameterImpl@540['V']
+    classifier = JavaTypeParameterImpl@552['V']
     nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@525
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@528
 }
 
 LazyJavaClassifierType@573['V'] {
     arguments = ArrayList@574[empty]
-    classifier = JavaTypeParameterImpl@537['V']
+    classifier = JavaTypeParameterImpl@520['V']
     nullable = 'true': Boolean@256
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
 }
@@ -1189,7 +1189,7 @@ LazyJavaPackageFragmentProvider@575 {
     topLevelClasses(JavaClassImpl@498['OutputStream']) = LazyJavaClassDescriptor@110['OutputStream']
     topLevelClasses(JavaClassImpl@501['PrintStream']) = LazyJavaClassDescriptor@114['PrintStream']
     topLevelClasses(JavaClassImpl@505['RandomAccess']) = LazyJavaClassDescriptor@127['RandomAccess']
-    topLevelClasses(JavaClassImpl@508['Serializable']) = LazyJavaClassDescriptor@131['Serializable']
+    topLevelClasses(JavaClassImpl@511['Serializable']) = LazyJavaClassDescriptor@131['Serializable']
     topLevelClasses(JavaClassImpl@646['System']) = LazyJavaClassDescriptor@135['System']
 }
 
@@ -1238,16 +1238,16 @@ LazyJavaPackageFragment@605['util'] {
     memberIndex = computeMemberIndex$1@671 // through LazyPackageFragmentScopeForJavaPackage@662
 }
 
-LazyJavaTypeParameterDescriptor@151['E'] {
+LazyJavaTypeParameterDescriptor@164['E'] {
     defaultType = JetTypeImpl@672['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@285
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
     upperBounds = LinkedHashSet@673[1] { NullableType@674 }
     upperBoundsAsType = NullableType@674
 }
 
-LazyJavaTypeParameterDescriptor@164['E'] {
+LazyJavaTypeParameterDescriptor@151['E'] {
     defaultType = JetTypeImpl@675['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@291
     upperBounds = LinkedHashSet@676[1] { NullableType@677 }
     upperBoundsAsType = NullableType@677
 }
@@ -1261,42 +1261,42 @@ LazyJavaTypeParameterDescriptor@147['E'] {
 
 LazyJavaTypeParameterDescriptor@178['K'] {
     defaultType = JetTypeImpl@681['K']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@398
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@402
     upperBounds = LinkedHashSet@682[1] { NullableType@683 }
     upperBoundsAsType = NullableType@683
 }
 
 LazyJavaTypeParameterDescriptor@156['K'] {
     defaultType = JetTypeImpl@684['K']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@402
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@398
     upperBounds = LinkedHashSet@685[1] { NullableType@686 }
     upperBoundsAsType = NullableType@686
 }
 
-LazyJavaTypeParameterDescriptor@179['V'] {
+LazyJavaTypeParameterDescriptor@157['V'] {
     defaultType = JetTypeImpl@687['V']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@528
     upperBounds = LinkedHashSet@688[1] { NullableType@689 }
     upperBoundsAsType = NullableType@689
 }
 
-LazyJavaTypeParameterDescriptor@157['V'] {
+LazyJavaTypeParameterDescriptor@179['V'] {
     defaultType = JetTypeImpl@690['V']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@525
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
     upperBounds = LinkedHashSet@691[1] { NullableType@692 }
     upperBoundsAsType = NullableType@692
 }
 
 LazyJavaTypeParameterResolver@693 {
-    resolve(JavaTypeParameterImpl@694['E']) = LazyJavaTypeParameterDescriptor@164['E']
+    resolve(JavaTypeParameterImpl@301['E']) = LazyJavaTypeParameterDescriptor@151['E']
 }
 
-LazyJavaTypeParameterResolver@695 {
+LazyJavaTypeParameterResolver@694 {
     resolve(JavaTypeParameterImpl@325['E']) = LazyJavaTypeParameterDescriptor@147['E']
 }
 
-LazyJavaTypeParameterResolver@696 {
-    resolve(JavaTypeParameterImpl@284['E']) = LazyJavaTypeParameterDescriptor@151['E']
+LazyJavaTypeParameterResolver@695 {
+    resolve(JavaTypeParameterImpl@696['E']) = LazyJavaTypeParameterDescriptor@164['E']
 }
 
 LazyJavaTypeParameterResolver@697 {
@@ -1304,45 +1304,45 @@ LazyJavaTypeParameterResolver@697 {
 }
 
 LazyJavaTypeParameterResolver@698 {
-    resolve(JavaTypeParameterImpl@310['E']) = null
+    resolve(JavaTypeParameterImpl@316['E']) = null
 }
 
 LazyJavaTypeParameterResolver@699 {
-    resolve(JavaTypeParameterImpl@294['E']) = null
-}
-
-LazyJavaTypeParameterResolver@700 {
-    resolve(JavaTypeParameterImpl@340['E']) = null
-}
-
-LazyJavaTypeParameterResolver@701 {
-    resolve(JavaTypeParameterImpl@334['E']) = null
-}
-
-LazyJavaTypeParameterResolver@702 {
-    resolve(JavaTypeParameterImpl@337['E']) = null
-}
-
-LazyJavaTypeParameterResolver@703 {
-    resolve(JavaTypeParameterImpl@319['E']) = null
-}
-
-LazyJavaTypeParameterResolver@704 {
-    resolve(JavaTypeParameterImpl@331['E']) = null
-}
-
-LazyJavaTypeParameterResolver@705 {
-    resolve(JavaTypeParameterImpl@298['E']) = null
-}
-
-LazyJavaTypeParameterResolver@706 {
     resolve(JavaTypeParameterImpl@343['E']) = null
 }
 
-LazyJavaTypeParameterResolver@707 {
+LazyJavaTypeParameterResolver@700 {
+    resolve(JavaTypeParameterImpl@331['E']) = null
+}
+
+LazyJavaTypeParameterResolver@701 {
+    resolve(JavaTypeParameterImpl@340['E']) = null
+}
+
+LazyJavaTypeParameterResolver@702 {
+    resolve(JavaTypeParameterImpl@294['E']) = null
+}
+
+LazyJavaTypeParameterResolver@703 {
+    resolve(JavaTypeParameterImpl@346['E']) = null
+}
+
+LazyJavaTypeParameterResolver@704 {
+    resolve(JavaTypeParameterImpl@304['E']) = null
+}
+
+LazyJavaTypeParameterResolver@705 {
     resolve(JavaTypeParameterImpl@322['E']) = null
 }
 
+LazyJavaTypeParameterResolver@706 {
+    resolve(JavaTypeParameterImpl@310['E']) = null
+}
+
+LazyJavaTypeParameterResolver@707 {
+    resolve(JavaTypeParameterImpl@337['E']) = null
+}
+
 LazyJavaTypeParameterResolver@708 {
     resolve(JavaTypeParameterImpl@709['K']) = LazyJavaTypeParameterDescriptor@178['K']
     resolve(JavaTypeParameterImpl@710['V']) = LazyJavaTypeParameterDescriptor@179['V']
@@ -1354,13 +1354,13 @@ LazyJavaTypeParameterResolver@711 {
 }
 
 LazyJavaTypeParameterResolver@714 {
-    resolve(JavaTypeParameterImpl@411['K']) = null
-    resolve(JavaTypeParameterImpl@520['V']) = null
+    resolve(JavaTypeParameterImpl@408['K']) = null
+    resolve(JavaTypeParameterImpl@537['V']) = null
 }
 
 LazyJavaTypeParameterResolver@715 {
-    resolve(JavaTypeParameterImpl@405['K']) = null
-    resolve(JavaTypeParameterImpl@534['V']) = null
+    resolve(JavaTypeParameterImpl@397['K']) = null
+    resolve(JavaTypeParameterImpl@552['V']) = null
 }
 
 LazyJavaTypeParameterResolver@716 {
@@ -1368,253 +1368,192 @@ LazyJavaTypeParameterResolver@716 {
 }
 
 LazyJavaTypeParameterResolver@717 {
-    resolve(JavaTypeParameterImpl@540['V']) = null
+    resolve(JavaTypeParameterImpl@546['V']) = null
 }
 
 ResolutionTaskHolder@718 {
     <name not found> = ArrayList@719[10] { ResolutionCandidate@720, ResolutionCandidate@721, ResolutionCandidate@722, ... }
-    <name not found> = ArrayList@723[10] { ResolutionCandidate@720, ResolutionCandidate@721, ResolutionCandidate@722, ... }
 }
 
-ResolutionTaskHolder@724 {
-    <name not found> = ArrayList@725[10] { ResolutionCandidate@726, ResolutionCandidate@727, ResolutionCandidate@728, ... }
-    <name not found> = ArrayList@729[10] { ResolutionCandidate@726, ResolutionCandidate@727, ResolutionCandidate@728, ... }
+ResolutionTaskHolder@723 {
+    <name not found> = ArrayList@724[10] { ResolutionCandidate@725, ResolutionCandidate@726, ResolutionCandidate@727, ... }
 }
 
-ResolutionTaskHolder@730 {
+ResolutionTaskHolder@728 {
+    <name not found> = ArrayList@729[1] { ResolutionCandidate@730 }
     <name not found> = ArrayList@731[1] { ResolutionCandidate@732 }
-    <name not found> = ArrayList@733[1] { ResolutionCandidate@732 }
+    <name not found> = EmptyList@13[empty]
+}
+
+ResolutionTaskHolder@733 {
     <name not found> = ArrayList@734[1] { ResolutionCandidate@735 }
-    <name not found> = ArrayList@736[1] { ResolutionCandidate@735 }
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
 }
 
-ResolutionTaskHolder@737 {
-    <name not found> = ArrayList@738[1] { ResolutionCandidate@739 }
-    <name not found> = ArrayList@740[1] { ResolutionCandidate@739 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
+ResolutionTaskHolder@736 {
+    <name not found> = ArrayList@737[1] { ResolutionCandidate@738 }
     <name not found> = EmptyList@13[empty]
 }
 
-ResolutionTaskHolder@741 {
-    <name not found> = ArrayList@742[1] { ResolutionCandidate@743 }
-    <name not found> = ArrayList@744[1] { ResolutionCandidate@743 }
-    <name not found> = EmptyList@13[empty]
+ResolutionTaskHolder@739 {
+    <name not found> = ArrayList@740[1] { ResolutionCandidate@741 }
     <name not found> = EmptyList@13[empty]
 }
 
+ResolutionTaskHolder@742 {
+    <name not found> = ArrayList@743[1] { ResolutionCandidate@744 }
+}
+
 ResolutionTaskHolder@745 {
     <name not found> = ArrayList@746[1] { ResolutionCandidate@747 }
-    <name not found> = ArrayList@748[1] { ResolutionCandidate@747 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
 }
 
-ResolutionTaskHolder@749 {
-    <name not found> = ArrayList@750[1] { ResolutionCandidate@751 }
-    <name not found> = ArrayList@752[1] { ResolutionCandidate@751 }
+ResolutionTaskHolder@748 {
+    <name not found> = ArrayList@749[1] { ResolutionCandidate@750 }
 }
 
-ResolutionTaskHolder@753 {
-    <name not found> = ArrayList@754[1] { ResolutionCandidate@755 }
-    <name not found> = ArrayList@756[1] { ResolutionCandidate@755 }
+ResolutionTaskHolder@751 {
+    <name not found> = ArrayList@752[1] { ResolutionCandidate@753 }
+}
+
+ResolutionTaskHolder@754 {
+    <name not found> = ArrayList@755[1] { ResolutionCandidate@756 }
 }
 
 ResolutionTaskHolder@757 {
     <name not found> = ArrayList@758[1] { ResolutionCandidate@759 }
-    <name not found> = ArrayList@760[1] { ResolutionCandidate@759 }
 }
 
-ResolutionTaskHolder@761 {
-    <name not found> = ArrayList@762[1] { ResolutionCandidate@763 }
-    <name not found> = ArrayList@764[1] { ResolutionCandidate@763 }
+ResolutionTaskHolder@760 {
+    <name not found> = ArrayList@761[1] { ResolutionCandidate@762 }
 }
 
-ResolutionTaskHolder@765 {
-    <name not found> = ArrayList@766[1] { ResolutionCandidate@767 }
-    <name not found> = ArrayList@768[1] { ResolutionCandidate@767 }
+ResolutionTaskHolder@763 {
+    <name not found> = ArrayList@764[1] { ResolutionCandidate@765 }
+}
+
+ResolutionTaskHolder@766 {
+    <name not found> = ArrayList@767[1] { ResolutionCandidate@768 }
 }
 
 ResolutionTaskHolder@769 {
     <name not found> = ArrayList@770[1] { ResolutionCandidate@771 }
-    <name not found> = ArrayList@772[1] { ResolutionCandidate@771 }
 }
 
-ResolutionTaskHolder@773 {
-    <name not found> = ArrayList@774[1] { ResolutionCandidate@775 }
-    <name not found> = ArrayList@776[1] { ResolutionCandidate@775 }
+ResolutionTaskHolder@772 {
+    <name not found> = ArrayList@773[1] { ResolutionCandidate@774 }
 }
 
-ResolutionTaskHolder@777 {
-    <name not found> = ArrayList@778[1] { ResolutionCandidate@779 }
-    <name not found> = ArrayList@780[1] { ResolutionCandidate@779 }
+ResolutionTaskHolder@775 {
+    <name not found> = ArrayList@776[1] { ResolutionCandidate@777 }
+}
+
+ResolutionTaskHolder@778 {
+    <name not found> = ArrayList@779[1] { ResolutionCandidate@780 }
 }
 
 ResolutionTaskHolder@781 {
     <name not found> = ArrayList@782[1] { ResolutionCandidate@783 }
-    <name not found> = ArrayList@784[1] { ResolutionCandidate@783 }
 }
 
-ResolutionTaskHolder@785 {
-    <name not found> = ArrayList@786[1] { ResolutionCandidate@787 }
-    <name not found> = ArrayList@788[1] { ResolutionCandidate@787 }
+ResolutionTaskHolder@784 {
+    <name not found> = ArrayList@785[1] { ResolutionCandidate@786 }
 }
 
-ResolutionTaskHolder@789 {
-    <name not found> = ArrayList@790[1] { ResolutionCandidate@791 }
-    <name not found> = ArrayList@792[1] { ResolutionCandidate@791 }
+ResolutionTaskHolder@787 {
+    <name not found> = ArrayList@788[1] { ResolutionCandidate@789 }
+}
+
+ResolutionTaskHolder@790 {
+    <name not found> = ArrayList@791[1] { ResolutionCandidate@792 }
 }
 
 ResolutionTaskHolder@793 {
     <name not found> = ArrayList@794[1] { ResolutionCandidate@795 }
-    <name not found> = ArrayList@796[1] { ResolutionCandidate@795 }
 }
 
-ResolutionTaskHolder@797 {
-    <name not found> = ArrayList@798[1] { ResolutionCandidate@799 }
-    <name not found> = ArrayList@800[1] { ResolutionCandidate@799 }
+ResolutionTaskHolder@796 {
+    <name not found> = ArrayList@797[1] { ResolutionCandidate@798 }
 }
 
-ResolutionTaskHolder@801 {
-    <name not found> = ArrayList@802[1] { ResolutionCandidate@803 }
-    <name not found> = ArrayList@804[1] { ResolutionCandidate@803 }
+ResolutionTaskHolder@799 {
+    <name not found> = ArrayList@800[1] { ResolutionCandidate@801 }
+}
+
+ResolutionTaskHolder@802 {
+    <name not found> = ArrayList@803[1] { ResolutionCandidate@804 }
 }
 
 ResolutionTaskHolder@805 {
     <name not found> = ArrayList@806[1] { ResolutionCandidate@807 }
-    <name not found> = ArrayList@808[1] { ResolutionCandidate@807 }
 }
 
-ResolutionTaskHolder@809 {
-    <name not found> = ArrayList@810[1] { ResolutionCandidate@811 }
-    <name not found> = ArrayList@812[1] { ResolutionCandidate@811 }
+ResolutionTaskHolder@808 {
+    <name not found> = ArrayList@809[1] { ResolutionCandidate@810 }
 }
 
-ResolutionTaskHolder@813 {
-    <name not found> = ArrayList@814[1] { ResolutionCandidate@815 }
-    <name not found> = ArrayList@816[1] { ResolutionCandidate@815 }
+ResolutionTaskHolder@811 {
+    <name not found> = ArrayList@812[2] { ResolutionCandidate@813, ResolutionCandidate@814 }
 }
 
-ResolutionTaskHolder@817 {
-    <name not found> = ArrayList@818[1] { ResolutionCandidate@819 }
-    <name not found> = ArrayList@820[1] { ResolutionCandidate@819 }
+ResolutionTaskHolder@815 {
+    <name not found> = ArrayList@816[2] { ResolutionCandidate@817, ResolutionCandidate@818 }
 }
 
-ResolutionTaskHolder@821 {
-    <name not found> = ArrayList@822[1] { ResolutionCandidate@823 }
-    <name not found> = ArrayList@824[1] { ResolutionCandidate@823 }
+ResolutionTaskHolder@819 {
+    <name not found> = ArrayList@820[2] { ResolutionCandidate@821, ResolutionCandidate@822 }
 }
 
-ResolutionTaskHolder@825 {
-    <name not found> = ArrayList@826[1] { ResolutionCandidate@827 }
-    <name not found> = ArrayList@828[1] { ResolutionCandidate@827 }
+ResolutionTaskHolder@823 {
+    <name not found> = ArrayList@824[2] { ResolutionCandidate@825, ResolutionCandidate@826 }
 }
 
-ResolutionTaskHolder@829 {
-    <name not found> = ArrayList@830[1] { ResolutionCandidate@831 }
-    <name not found> = ArrayList@832[1] { ResolutionCandidate@831 }
+ResolutionTaskHolder@827 {
+    <name not found> = ArrayList@828[3] { ResolutionCandidate@829, ResolutionCandidate@830, ResolutionCandidate@831 }
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
 }
 
-ResolutionTaskHolder@833 {
-    <name not found> = ArrayList@834[1] { ResolutionCandidate@835 }
-    <name not found> = ArrayList@836[1] { ResolutionCandidate@835 }
+ResolutionTaskHolder@832 {
+    <name not found> = ArrayList@833[3] { ResolutionCandidate@834, ResolutionCandidate@835, ResolutionCandidate@836 }
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
 }
 
 ResolutionTaskHolder@837 {
-    <name not found> = ArrayList@838[1] { ResolutionCandidate@839 }
-    <name not found> = ArrayList@840[1] { ResolutionCandidate@839 }
-}
-
-ResolutionTaskHolder@841 {
-    <name not found> = ArrayList@842[2] { ResolutionCandidate@843, ResolutionCandidate@844 }
-    <name not found> = ArrayList@845[2] { ResolutionCandidate@843, ResolutionCandidate@844 }
-}
-
-ResolutionTaskHolder@846 {
-    <name not found> = ArrayList@847[2] { ResolutionCandidate@848, ResolutionCandidate@849 }
-    <name not found> = ArrayList@850[2] { ResolutionCandidate@848, ResolutionCandidate@849 }
-}
-
-ResolutionTaskHolder@851 {
-    <name not found> = ArrayList@852[2] { ResolutionCandidate@853, ResolutionCandidate@854 }
-    <name not found> = ArrayList@855[2] { ResolutionCandidate@853, ResolutionCandidate@854 }
-}
-
-ResolutionTaskHolder@856 {
-    <name not found> = ArrayList@857[2] { ResolutionCandidate@858, ResolutionCandidate@859 }
-    <name not found> = ArrayList@860[2] { ResolutionCandidate@858, ResolutionCandidate@859 }
-}
-
-ResolutionTaskHolder@861 {
-    <name not found> = ArrayList@862[3] { ResolutionCandidate@863, ResolutionCandidate@864, ResolutionCandidate@865 }
-    <name not found> = ArrayList@866[3] { ResolutionCandidate@863, ResolutionCandidate@864, ResolutionCandidate@865 }
+    <name not found> = ArrayList@838[3] { ResolutionCandidate@839, ResolutionCandidate@840, ResolutionCandidate@841 }
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
+}
+
+ResolutionTaskHolder@842 {
+    <name not found> = ArrayList@843[3] { ResolutionCandidate@844, ResolutionCandidate@845, ResolutionCandidate@846 }
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
 }
 
+ResolutionTaskHolder@847 {
+    <name not found> = ArrayList@848[4] { ResolutionCandidate@849, ResolutionCandidate@850, ResolutionCandidate@851, ... }
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+}
+
+ResolutionTaskHolder@852 {
+    <name not found> = ArrayList@853[4] { ResolutionCandidate@854, ResolutionCandidate@855, ResolutionCandidate@856, ... }
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+}
+
+ResolutionTaskHolder@857 {
+    <name not found> = ArrayList@858[8] { ResolutionCandidate@859, ResolutionCandidate@860, ResolutionCandidate@861, ... }
+}
+
+ResolutionTaskHolder@862 {
+    <name not found> = ArrayList@863[8] { ResolutionCandidate@864, ResolutionCandidate@865, ResolutionCandidate@866, ... }
+}
+
 ResolutionTaskHolder@867 {
-    <name not found> = ArrayList@868[3] { ResolutionCandidate@869, ResolutionCandidate@870, ResolutionCandidate@871 }
-    <name not found> = ArrayList@872[3] { ResolutionCandidate@869, ResolutionCandidate@870, ResolutionCandidate@871 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@873 {
-    <name not found> = ArrayList@874[3] { ResolutionCandidate@875, ResolutionCandidate@876, ResolutionCandidate@877 }
-    <name not found> = ArrayList@878[3] { ResolutionCandidate@875, ResolutionCandidate@876, ResolutionCandidate@877 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@879 {
-    <name not found> = ArrayList@880[3] { ResolutionCandidate@881, ResolutionCandidate@882, ResolutionCandidate@883 }
-    <name not found> = ArrayList@884[3] { ResolutionCandidate@881, ResolutionCandidate@882, ResolutionCandidate@883 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@885 {
-    <name not found> = ArrayList@886[4] { ResolutionCandidate@887, ResolutionCandidate@888, ResolutionCandidate@889, ... }
-    <name not found> = ArrayList@890[4] { ResolutionCandidate@887, ResolutionCandidate@888, ResolutionCandidate@889, ... }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@891 {
-    <name not found> = ArrayList@892[4] { ResolutionCandidate@893, ResolutionCandidate@894, ResolutionCandidate@895, ... }
-    <name not found> = ArrayList@896[4] { ResolutionCandidate@893, ResolutionCandidate@894, ResolutionCandidate@895, ... }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@897 {
-    <name not found> = ArrayList@898[8] { ResolutionCandidate@899, ResolutionCandidate@900, ResolutionCandidate@901, ... }
-    <name not found> = ArrayList@902[8] { ResolutionCandidate@899, ResolutionCandidate@900, ResolutionCandidate@901, ... }
-}
-
-ResolutionTaskHolder@903 {
-    <name not found> = ArrayList@904[8] { ResolutionCandidate@905, ResolutionCandidate@906, ResolutionCandidate@907, ... }
-    <name not found> = ArrayList@908[8] { ResolutionCandidate@905, ResolutionCandidate@906, ResolutionCandidate@907, ... }
-}
-
-ResolutionTaskHolder@909 {
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
@@ -1625,7 +1564,71 @@ ResolutionTaskHolder@909 {
     <name not found> = EmptyList@13[empty]
 }
 
-ResolutionTaskHolder@910 {
+ResolutionTaskHolder@868 {
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+}
+
+null {
+    <name not found> = ArrayList@869[10] { ResolutionCandidate@725, ResolutionCandidate@726, ResolutionCandidate@727, ... }
+    <name not found> = ArrayList@870[10] { ResolutionCandidate@720, ResolutionCandidate@721, ResolutionCandidate@722, ... }
+    <name not found> = ArrayList@871[1] { ResolutionCandidate@801 }
+    <name not found> = ArrayList@872[1] { ResolutionCandidate@780 }
+    <name not found> = ArrayList@873[1] { ResolutionCandidate@771 }
+    <name not found> = ArrayList@874[1] { ResolutionCandidate@786 }
+    <name not found> = ArrayList@875[1] { ResolutionCandidate@762 }
+    <name not found> = ArrayList@876[1] { ResolutionCandidate@789 }
+    <name not found> = ArrayList@877[1] { ResolutionCandidate@747 }
+    <name not found> = ArrayList@878[1] { ResolutionCandidate@807 }
+    <name not found> = ArrayList@879[1] { ResolutionCandidate@750 }
+    <name not found> = ArrayList@880[1] { ResolutionCandidate@798 }
+    <name not found> = ArrayList@881[1] { ResolutionCandidate@756 }
+    <name not found> = ArrayList@882[1] { ResolutionCandidate@759 }
+    <name not found> = ArrayList@883[1] { ResolutionCandidate@753 }
+    <name not found> = ArrayList@884[1] { ResolutionCandidate@795 }
+    <name not found> = ArrayList@885[1] { ResolutionCandidate@804 }
+    <name not found> = ArrayList@886[1] { ResolutionCandidate@735 }
+    <name not found> = ArrayList@887[1] { ResolutionCandidate@741 }
+    <name not found> = ArrayList@888[1] { ResolutionCandidate@768 }
+    <name not found> = ArrayList@889[1] { ResolutionCandidate@777 }
+    <name not found> = ArrayList@890[1] { ResolutionCandidate@744 }
+    <name not found> = ArrayList@891[1] { ResolutionCandidate@783 }
+    <name not found> = ArrayList@892[1] { ResolutionCandidate@774 }
+    <name not found> = ArrayList@893[1] { ResolutionCandidate@730 }
+    <name not found> = ArrayList@894[1] { ResolutionCandidate@732 }
+    <name not found> = ArrayList@895[1] { ResolutionCandidate@738 }
+    <name not found> = ArrayList@896[1] { ResolutionCandidate@792 }
+    <name not found> = ArrayList@897[1] { ResolutionCandidate@810 }
+    <name not found> = ArrayList@898[1] { ResolutionCandidate@765 }
+    <name not found> = ArrayList@899[2] { ResolutionCandidate@821, ResolutionCandidate@822 }
+    <name not found> = ArrayList@900[2] { ResolutionCandidate@825, ResolutionCandidate@826 }
+    <name not found> = ArrayList@901[2] { ResolutionCandidate@813, ResolutionCandidate@814 }
+    <name not found> = ArrayList@902[2] { ResolutionCandidate@817, ResolutionCandidate@818 }
+    <name not found> = ArrayList@903[3] { ResolutionCandidate@829, ResolutionCandidate@830, ResolutionCandidate@831 }
+    <name not found> = ArrayList@904[3] { ResolutionCandidate@844, ResolutionCandidate@845, ResolutionCandidate@846 }
+    <name not found> = ArrayList@905[3] { ResolutionCandidate@839, ResolutionCandidate@840, ResolutionCandidate@841 }
+    <name not found> = ArrayList@906[3] { ResolutionCandidate@834, ResolutionCandidate@835, ResolutionCandidate@836 }
+    <name not found> = ArrayList@907[4] { ResolutionCandidate@849, ResolutionCandidate@850, ResolutionCandidate@851, ... }
+    <name not found> = ArrayList@908[4] { ResolutionCandidate@854, ResolutionCandidate@855, ResolutionCandidate@856, ... }
+    <name not found> = ArrayList@909[8] { ResolutionCandidate@864, ResolutionCandidate@865, ResolutionCandidate@866, ... }
+    <name not found> = ArrayList@910[8] { ResolutionCandidate@859, ResolutionCandidate@860, ResolutionCandidate@861, ... }
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
diff --git a/compiler/testData/diagnostics/tests/jdk-annotations/ArrayListClone.lazy.log b/compiler/testData/diagnostics/tests/jdk-annotations/ArrayListClone.lazy.log
index 45639c5dd7a..316e9e18411 100644
--- a/compiler/testData/diagnostics/tests/jdk-annotations/ArrayListClone.lazy.log
+++ b/compiler/testData/diagnostics/tests/jdk-annotations/ArrayListClone.lazy.log
@@ -122,94 +122,94 @@ LazyJavaClassifierType@90['E'] {
     arguments = ArrayList@91[empty]
     classifier = JavaTypeParameterImpl@92['E']
     nullable = 'false': Boolean@71
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@93
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@86
 }
 
-LazyJavaClassifierType@94['E'] {
-    arguments = ArrayList@95[empty]
-    classifier = JavaTypeParameterImpl@96['E']
+LazyJavaClassifierType@93['E'] {
+    arguments = ArrayList@94[empty]
+    classifier = JavaTypeParameterImpl@95['E']
     nullable = 'false': Boolean@71
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@93
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@96
 }
 
 LazyJavaClassifierType@97['E'] {
     arguments = ArrayList@98[empty]
     classifier = JavaTypeParameterImpl@99['E']
     nullable = 'false': Boolean@71
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@86
 }
 
-LazyJavaClassifierType@101['E'] {
-    arguments = ArrayList@102[empty]
-    classifier = JavaTypeParameterImpl@103['E']
+LazyJavaClassifierType@100['E'] {
+    arguments = ArrayList@101[empty]
+    classifier = JavaTypeParameterImpl@102['E']
     nullable = 'false': Boolean@71
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@86
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
 }
 
 LazyJavaClassifierType@104['E'] {
     arguments = ArrayList@105[empty]
     classifier = JavaTypeParameterImpl@106['E']
     nullable = 'false': Boolean@71
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@86
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@96
 }
 
 LazyJavaClassifierType@107['E'] {
     arguments = ArrayList@108[empty]
-    classifier = JavaTypeParameterImpl@96['E']
+    classifier = JavaTypeParameterImpl@85['E']
     nullable = 'true': Boolean@77
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@93
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@86
 }
 
 LazyJavaClassifierType@109['E'] {
     arguments = ArrayList@110[empty]
-    classifier = JavaTypeParameterImpl@85['E']
+    classifier = JavaTypeParameterImpl@89['E']
     nullable = 'true': Boolean@77
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@86
 }
 
 LazyJavaClassifierType@111['E'] {
     arguments = ArrayList@112[empty]
-    classifier = JavaTypeParameterImpl@106['E']
+    classifier = JavaTypeParameterImpl@102['E']
     nullable = 'true': Boolean@77
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@86
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
 }
 
 LazyJavaClassifierType@113['E'] {
     arguments = ArrayList@114[empty]
     classifier = JavaTypeParameterImpl@92['E']
     nullable = 'true': Boolean@77
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@93
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@86
 }
 
 LazyJavaClassifierType@115['E'] {
     arguments = ArrayList@116[empty]
-    classifier = JavaTypeParameterImpl@103['E']
+    classifier = JavaTypeParameterImpl@106['E']
     nullable = 'true': Boolean@77
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@86
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@96
 }
 
 LazyJavaClassifierType@117['E'] {
     arguments = ArrayList@118[empty]
-    classifier = JavaTypeParameterImpl@89['E']
+    classifier = JavaTypeParameterImpl@99['E']
     nullable = 'true': Boolean@77
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@86
 }
 
 LazyJavaClassifierType@119['E'] {
     arguments = ArrayList@120[empty]
-    classifier = JavaTypeParameterImpl@99['E']
+    classifier = JavaTypeParameterImpl@95['E']
     nullable = 'true': Boolean@77
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@96
 }
 
-LazyJavaClassifierType@41['List<E>'] {
+LazyJavaClassifierType@46['List<E>'] {
     arguments = ArrayList@121[1] { TypeProjectionImpl@122 }
     classifier = JavaClassImpl@123['List']
     memberScope = SubstitutingScope@124
     typeConstructor = DeserializedClassTypeConstructor@125
 }
 
-LazyJavaClassifierType@46['List<E>'] {
+LazyJavaClassifierType@41['List<E>'] {
     arguments = ArrayList@126[1] { TypeProjectionImpl@127 }
     classifier = JavaClassImpl@128['List']
     memberScope = SubstitutingScope@129
@@ -336,20 +336,20 @@ LazyJavaTypeParameterDescriptor@43['E'] {
     upperBounds = LinkedHashSet@207[1] { NullableType@208 }
 }
 
-LazyJavaTypeParameterDescriptor@34['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
+LazyJavaTypeParameterDescriptor@38['E'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@96
 }
 
-LazyJavaTypeParameterDescriptor@38['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@93
+LazyJavaTypeParameterDescriptor@34['E'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
 }
 
 LazyJavaTypeParameterResolver@209 {
-    resolve(JavaTypeParameterImpl@210['E']) = LazyJavaTypeParameterDescriptor@34['E']
+    resolve(JavaTypeParameterImpl@210['E']) = LazyJavaTypeParameterDescriptor@38['E']
 }
 
 LazyJavaTypeParameterResolver@211 {
-    resolve(JavaTypeParameterImpl@212['E']) = LazyJavaTypeParameterDescriptor@38['E']
+    resolve(JavaTypeParameterImpl@212['E']) = LazyJavaTypeParameterDescriptor@34['E']
 }
 
 LazyJavaTypeParameterResolver@213 {
@@ -358,19 +358,22 @@ LazyJavaTypeParameterResolver@213 {
 
 ResolutionTaskHolder@215 {
     <name not found> = ArrayList@216[1] { ResolutionCandidate@217 }
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@217 }
 }
 
-ResolutionTaskHolder@219 {
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@221 }
+ResolutionTaskHolder@218 {
+    <name not found> = ArrayList@219[1] { ResolutionCandidate@220 }
 }
 
-ResolutionTaskHolder@223 {
-    <name not found> = ArrayList@224[3] { ResolutionCandidate@225, ResolutionCandidate@226, ResolutionCandidate@227 }
-    <name not found> = ArrayList@228[3] { ResolutionCandidate@225, ResolutionCandidate@226, ResolutionCandidate@227 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
+ResolutionTaskHolder@221 {
+    <name not found> = ArrayList@222[3] { ResolutionCandidate@223, ResolutionCandidate@224, ResolutionCandidate@225 }
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+}
+
+null {
+    <name not found> = ArrayList@226[1] { ResolutionCandidate@220 }
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@217 }
+    <name not found> = ArrayList@228[3] { ResolutionCandidate@223, ResolutionCandidate@224, ResolutionCandidate@225 }
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/jdk-annotations/ArrayListToArray.lazy.log b/compiler/testData/diagnostics/tests/jdk-annotations/ArrayListToArray.lazy.log
index b575610dbb0..cf9498d241e 100644
--- a/compiler/testData/diagnostics/tests/jdk-annotations/ArrayListToArray.lazy.log
+++ b/compiler/testData/diagnostics/tests/jdk-annotations/ArrayListToArray.lazy.log
@@ -127,14 +127,14 @@ LazyJavaClassifierType@102['E'] {
     arguments = ArrayList@103[empty]
     classifier = JavaTypeParameterImpl@104['E']
     nullable = 'false': Boolean@67
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@105
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
-LazyJavaClassifierType@106['E'] {
-    arguments = ArrayList@107[empty]
-    classifier = JavaTypeParameterImpl@108['E']
+LazyJavaClassifierType@105['E'] {
+    arguments = ArrayList@106[empty]
+    classifier = JavaTypeParameterImpl@107['E']
     nullable = 'false': Boolean@67
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 LazyJavaClassifierType@109['E'] {
@@ -160,49 +160,49 @@ LazyJavaClassifierType@115['E'] {
 
 LazyJavaClassifierType@118['E'] {
     arguments = ArrayList@119[empty]
-    classifier = JavaTypeParameterImpl@111['E']
+    classifier = JavaTypeParameterImpl@95['E']
     nullable = 'true': Boolean@87
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@120['E'] {
     arguments = ArrayList@121[empty]
-    classifier = JavaTypeParameterImpl@108['E']
+    classifier = JavaTypeParameterImpl@100['E']
     nullable = 'true': Boolean@87
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@122['E'] {
     arguments = ArrayList@123[empty]
-    classifier = JavaTypeParameterImpl@104['E']
+    classifier = JavaTypeParameterImpl@107['E']
     nullable = 'true': Boolean@87
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@105
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 LazyJavaClassifierType@124['E'] {
     arguments = ArrayList@125[empty]
-    classifier = JavaTypeParameterImpl@114['E']
+    classifier = JavaTypeParameterImpl@117['E']
     nullable = 'true': Boolean@87
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@126['E'] {
     arguments = ArrayList@127[empty]
-    classifier = JavaTypeParameterImpl@100['E']
+    classifier = JavaTypeParameterImpl@104['E']
     nullable = 'true': Boolean@87
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@128['E'] {
     arguments = ArrayList@129[empty]
-    classifier = JavaTypeParameterImpl@117['E']
+    classifier = JavaTypeParameterImpl@114['E']
     nullable = 'true': Boolean@87
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@130['E'] {
     arguments = ArrayList@131[empty]
-    classifier = JavaTypeParameterImpl@95['E']
+    classifier = JavaTypeParameterImpl@111['E']
     nullable = 'true': Boolean@87
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
@@ -240,7 +240,7 @@ LazyJavaClassifierType@146['Object'] {
 
 LazyJavaClassifierType@149['Object'] {
     arguments = ArrayList@150[empty]
-    classifier = JavaClassImpl@143['Object']
+    classifier = JavaClassImpl@148['Object']
     memberScope = DeserializedClassMemberScope@144
     nullable = 'true': Boolean@87
     typeConstructor = DeserializedClassTypeConstructor@145
@@ -248,7 +248,7 @@ LazyJavaClassifierType@149['Object'] {
 
 LazyJavaClassifierType@151['Object'] {
     arguments = ArrayList@152[empty]
-    classifier = JavaClassImpl@148['Object']
+    classifier = JavaClassImpl@143['Object']
     memberScope = DeserializedClassMemberScope@144
     nullable = 'true': Boolean@87
     typeConstructor = DeserializedClassTypeConstructor@145
@@ -294,49 +294,49 @@ LazyJavaClassifierType@168['T'] {
     arguments = ArrayList@169[empty]
     classifier = JavaTypeParameterImpl@170['T']
     nullable = 'false': Boolean@67
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@171
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@167
 }
 
-LazyJavaClassifierType@172['T'] {
-    arguments = ArrayList@173[empty]
-    classifier = JavaTypeParameterImpl@174['T']
+LazyJavaClassifierType@171['T'] {
+    arguments = ArrayList@172[empty]
+    classifier = JavaTypeParameterImpl@173['T']
     nullable = 'false': Boolean@67
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@167
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@174
 }
 
 LazyJavaClassifierType@175['T'] {
     arguments = ArrayList@176[empty]
     classifier = JavaTypeParameterImpl@177['T']
     nullable = 'false': Boolean@67
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@171
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@174
 }
 
 LazyJavaClassifierType@178['T'] {
     arguments = ArrayList@179[empty]
-    classifier = JavaTypeParameterImpl@166['T']
+    classifier = JavaTypeParameterImpl@170['T']
     nullable = 'true': Boolean@87
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@167
 }
 
 LazyJavaClassifierType@180['T'] {
     arguments = ArrayList@181[empty]
-    classifier = JavaTypeParameterImpl@177['T']
+    classifier = JavaTypeParameterImpl@166['T']
     nullable = 'true': Boolean@87
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@171
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@167
 }
 
 LazyJavaClassifierType@182['T'] {
     arguments = ArrayList@183[empty]
-    classifier = JavaTypeParameterImpl@170['T']
+    classifier = JavaTypeParameterImpl@177['T']
     nullable = 'true': Boolean@87
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@171
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@174
 }
 
 LazyJavaClassifierType@184['T'] {
     arguments = ArrayList@185[empty]
-    classifier = JavaTypeParameterImpl@174['T']
+    classifier = JavaTypeParameterImpl@173['T']
     nullable = 'true': Boolean@87
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@167
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@174
 }
 
 LazyJavaPackageFragmentProvider@186 {
@@ -411,39 +411,39 @@ LazyJavaTypeParameterDescriptor@53['E'] {
     upperBounds = LinkedHashSet@240[1] { NullableType@241 }
 }
 
-LazyJavaTypeParameterDescriptor@48['E'] {
+LazyJavaTypeParameterDescriptor@44['E'] {
     defaultType = JetTypeImpl@242['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
-LazyJavaTypeParameterDescriptor@44['E'] {
+LazyJavaTypeParameterDescriptor@48['E'] {
     defaultType = JetTypeImpl@243['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@105
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaTypeParameterDescriptor@244['T'] {
     defaultType = JetTypeImpl@245['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@167
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@174
     upperBounds = LinkedHashSet@246[1] { NullableType@247 }
     upperBoundsAsType = NullableType@247
 }
 
 LazyJavaTypeParameterDescriptor@248['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@171
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@167
     upperBounds = LinkedHashSet@249[1] { NullableType@250 }
     upperBoundsAsType = NullableType@250
 }
 
 LazyJavaTypeParameterResolver@251 {
-    resolve(JavaTypeParameterImpl@252['E']) = LazyJavaTypeParameterDescriptor@48['E']
+    resolve(JavaTypeParameterImpl@252['E']) = LazyJavaTypeParameterDescriptor@53['E']
 }
 
 LazyJavaTypeParameterResolver@253 {
-    resolve(JavaTypeParameterImpl@254['E']) = LazyJavaTypeParameterDescriptor@44['E']
+    resolve(JavaTypeParameterImpl@254['E']) = LazyJavaTypeParameterDescriptor@48['E']
 }
 
 LazyJavaTypeParameterResolver@255 {
-    resolve(JavaTypeParameterImpl@256['E']) = LazyJavaTypeParameterDescriptor@53['E']
+    resolve(JavaTypeParameterImpl@256['E']) = LazyJavaTypeParameterDescriptor@44['E']
 }
 
 LazyJavaTypeParameterResolver@257 {
@@ -456,26 +456,29 @@ LazyJavaTypeParameterResolver@259 {
 
 ResolutionTaskHolder@261 {
     <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@263 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@265 {
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@267 }
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@267 }
+ResolutionTaskHolder@264 {
+    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
 }
 
-ResolutionTaskHolder@269 {
-    <name not found> = ArrayList@270[2] { ResolutionCandidate@271, ResolutionCandidate@272 }
-    <name not found> = ArrayList@273[2] { ResolutionCandidate@271, ResolutionCandidate@272 }
+ResolutionTaskHolder@267 {
+    <name not found> = ArrayList@268[2] { ResolutionCandidate@269, ResolutionCandidate@270 }
 }
 
-ResolutionTaskHolder@274 {
-    <name not found> = ArrayList@275[3] { ResolutionCandidate@276, ResolutionCandidate@277, ResolutionCandidate@278 }
-    <name not found> = ArrayList@279[3] { ResolutionCandidate@276, ResolutionCandidate@277, ResolutionCandidate@278 }
+ResolutionTaskHolder@271 {
+    <name not found> = ArrayList@272[3] { ResolutionCandidate@273, ResolutionCandidate@274, ResolutionCandidate@275 }
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+}
+
+null {
+    <name not found> = ArrayList@276[1] { ResolutionCandidate@266 }
+    <name not found> = ArrayList@277[1] { ResolutionCandidate@263 }
+    <name not found> = ArrayList@278[2] { ResolutionCandidate@269, ResolutionCandidate@270 }
+    <name not found> = ArrayList@279[3] { ResolutionCandidate@273, ResolutionCandidate@274, ResolutionCandidate@275 }
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
diff --git a/compiler/testData/diagnostics/tests/jdk-annotations/sql/DriverManager.lazy.log b/compiler/testData/diagnostics/tests/jdk-annotations/sql/DriverManager.lazy.log
index 5246b90b7b9..863b43b5cd5 100644
--- a/compiler/testData/diagnostics/tests/jdk-annotations/sql/DriverManager.lazy.log
+++ b/compiler/testData/diagnostics/tests/jdk-annotations/sql/DriverManager.lazy.log
@@ -135,28 +135,28 @@ LazyJavaClassifierType@66['Connection'] {
 
 LazyJavaClassifierType@69['Connection'] {
     arguments = ArrayList@70[empty]
-    classifier = JavaClassImpl@68['Connection']
+    classifier = JavaClassImpl@65['Connection']
     nullable = 'true': Boolean@56
     typeConstructor = LazyJavaClassTypeConstructor@5['Connection']
 }
 
 LazyJavaClassifierType@71['Connection'] {
     arguments = ArrayList@72[empty]
-    classifier = JavaClassImpl@59['Connection']
+    classifier = JavaClassImpl@68['Connection']
     nullable = 'true': Boolean@56
     typeConstructor = LazyJavaClassTypeConstructor@5['Connection']
 }
 
 LazyJavaClassifierType@73['Connection'] {
     arguments = ArrayList@74[empty]
-    classifier = JavaClassImpl@62['Connection']
+    classifier = JavaClassImpl@59['Connection']
     nullable = 'true': Boolean@56
     typeConstructor = LazyJavaClassTypeConstructor@5['Connection']
 }
 
 LazyJavaClassifierType@75['Connection'] {
     arguments = ArrayList@76[empty]
-    classifier = JavaClassImpl@65['Connection']
+    classifier = JavaClassImpl@62['Connection']
     nullable = 'true': Boolean@56
     typeConstructor = LazyJavaClassTypeConstructor@5['Connection']
 }
@@ -198,7 +198,7 @@ LazyJavaClassifierType@89['Driver'] {
 
 LazyJavaClassifierType@91['Driver'] {
     arguments = ArrayList@92[empty]
-    classifier = JavaClassImpl@88['Driver']
+    classifier = JavaClassImpl@79['Driver']
     nullable = 'true': Boolean@56
     typeConstructor = LazyJavaClassTypeConstructor@7['Driver']
 }
@@ -212,7 +212,7 @@ LazyJavaClassifierType@93['Driver'] {
 
 LazyJavaClassifierType@95['Driver'] {
     arguments = ArrayList@96[empty]
-    classifier = JavaClassImpl@79['Driver']
+    classifier = JavaClassImpl@88['Driver']
     nullable = 'true': Boolean@56
     typeConstructor = LazyJavaClassTypeConstructor@7['Driver']
 }
@@ -272,14 +272,14 @@ LazyJavaClassifierType@118['Properties'] {
 
 LazyJavaClassifierType@121['Properties'] {
     arguments = ArrayList@122[empty]
-    classifier = JavaClassImpl@120['Properties']
+    classifier = JavaClassImpl@117['Properties']
     nullable = 'true': Boolean@56
     typeConstructor = LazyJavaClassTypeConstructor@34['Properties']
 }
 
 LazyJavaClassifierType@123['Properties'] {
     arguments = ArrayList@124[empty]
-    classifier = JavaClassImpl@117['Properties']
+    classifier = JavaClassImpl@120['Properties']
     nullable = 'true': Boolean@56
     typeConstructor = LazyJavaClassTypeConstructor@34['Properties']
 }
@@ -342,21 +342,21 @@ LazyJavaClassifierType@147['String'] {
 
 LazyJavaClassifierType@149['String'] {
     arguments = ArrayList@150[empty]
-    classifier = JavaClassImpl@143['String']
+    classifier = JavaClassImpl@127['String']
     nullable = 'true': Boolean@56
     typeConstructor = DeserializedClassTypeConstructor@128
 }
 
 LazyJavaClassifierType@151['String'] {
     arguments = ArrayList@152[empty]
-    classifier = JavaClassImpl@127['String']
+    classifier = JavaClassImpl@143['String']
     nullable = 'true': Boolean@56
     typeConstructor = DeserializedClassTypeConstructor@128
 }
 
 LazyJavaClassifierType@153['String'] {
     arguments = ArrayList@154[empty]
-    classifier = JavaClassImpl@131['String']
+    classifier = JavaClassImpl@140['String']
     nullable = 'true': Boolean@56
     typeConstructor = DeserializedClassTypeConstructor@128
 }
@@ -377,7 +377,7 @@ LazyJavaClassifierType@157['String'] {
 
 LazyJavaClassifierType@159['String'] {
     arguments = ArrayList@160[empty]
-    classifier = JavaClassImpl@140['String']
+    classifier = JavaClassImpl@131['String']
     nullable = 'true': Boolean@56
     typeConstructor = DeserializedClassTypeConstructor@128
 }
@@ -409,7 +409,7 @@ LazyJavaPackageFragmentProvider@163 {
     packageFragments('kotlin.jvm': FqName@187) = null
     topLevelClasses(JavaClassImpl@49['AutoCloseable']) = LazyJavaClassDescriptor@0['AutoCloseable']
     topLevelClasses(JavaClassImpl@52['ClassLoader']) = LazyJavaClassDescriptor@2['ClassLoader']
-    topLevelClasses(JavaClassImpl@62['Connection']) = LazyJavaClassDescriptor@4['Connection']
+    topLevelClasses(JavaClassImpl@65['Connection']) = LazyJavaClassDescriptor@4['Connection']
     topLevelClasses(JavaClassImpl@188['Driver']) = LazyJavaClassDescriptor@6['Driver']
     topLevelClasses(JavaClassImpl@189['DriverManager']) = LazyJavaClassDescriptor@8['DriverManager']
     topLevelClasses(JavaClassImpl@190['Enumeration']) = LazyJavaClassDescriptor@31['Enumeration']
@@ -466,227 +466,282 @@ LazyJavaTypeParameterResolver@220 {
 
 ResolutionTaskHolder@222 {
     <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@224 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@226 {
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@228 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
+ResolutionTaskHolder@225 {
+    <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@230 {
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@232 }
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@232 }
+ResolutionTaskHolder@228 {
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
+}
+
+ResolutionTaskHolder@231 {
+    <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
 }
 
 ResolutionTaskHolder@234 {
     <name not found> = ArrayList@235[1] { ResolutionCandidate@236 }
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@236 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@238 {
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@240 }
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@240 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
+ResolutionTaskHolder@237 {
+    <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
 }
 
-ResolutionTaskHolder@242 {
-    <name not found> = ArrayList@243[1] { ResolutionCandidate@244 }
-    <name not found> = ArrayList@245[1] { ResolutionCandidate@244 }
+ResolutionTaskHolder@240 {
+    <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
+}
+
+ResolutionTaskHolder@243 {
+    <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
 }
 
 ResolutionTaskHolder@246 {
     <name not found> = ArrayList@247[1] { ResolutionCandidate@248 }
-    <name not found> = ArrayList@249[1] { ResolutionCandidate@248 }
 }
 
-ResolutionTaskHolder@250 {
-    <name not found> = ArrayList@251[1] { ResolutionCandidate@252 }
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@252 }
+ResolutionTaskHolder@249 {
+    <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
 }
 
-ResolutionTaskHolder@254 {
-    <name not found> = ArrayList@255[1] { ResolutionCandidate@256 }
-    <name not found> = ArrayList@257[1] { ResolutionCandidate@256 }
+ResolutionTaskHolder@252 {
+    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
+}
+
+ResolutionTaskHolder@255 {
+    <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
 }
 
 ResolutionTaskHolder@258 {
     <name not found> = ArrayList@259[1] { ResolutionCandidate@260 }
-    <name not found> = ArrayList@261[1] { ResolutionCandidate@260 }
 }
 
-ResolutionTaskHolder@262 {
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@264 }
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@264 }
+ResolutionTaskHolder@261 {
+    <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
 }
 
-ResolutionTaskHolder@266 {
-    <name not found> = ArrayList@267[1] { ResolutionCandidate@268 }
-    <name not found> = ArrayList@269[1] { ResolutionCandidate@268 }
+ResolutionTaskHolder@264 {
+    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
+}
+
+ResolutionTaskHolder@267 {
+    <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
 }
 
 ResolutionTaskHolder@270 {
     <name not found> = ArrayList@271[1] { ResolutionCandidate@272 }
-    <name not found> = ArrayList@273[1] { ResolutionCandidate@272 }
 }
 
-ResolutionTaskHolder@274 {
-    <name not found> = ArrayList@275[1] { ResolutionCandidate@276 }
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@276 }
+ResolutionTaskHolder@273 {
+    <name not found> = ArrayList@274[1] { ResolutionCandidate@275 }
 }
 
-ResolutionTaskHolder@278 {
-    <name not found> = ArrayList@279[1] { ResolutionCandidate@280 }
-    <name not found> = ArrayList@281[1] { ResolutionCandidate@280 }
+ResolutionTaskHolder@276 {
+    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
+}
+
+ResolutionTaskHolder@279 {
+    <name not found> = ArrayList@280[1] { ResolutionCandidate@281 }
 }
 
 ResolutionTaskHolder@282 {
     <name not found> = ArrayList@283[1] { ResolutionCandidate@284 }
-    <name not found> = ArrayList@285[1] { ResolutionCandidate@284 }
 }
 
-ResolutionTaskHolder@286 {
-    <name not found> = ArrayList@287[1] { ResolutionCandidate@288 }
-    <name not found> = ArrayList@289[1] { ResolutionCandidate@288 }
+ResolutionTaskHolder@285 {
+    <name not found> = ArrayList@286[1] { ResolutionCandidate@287 }
 }
 
-ResolutionTaskHolder@290 {
-    <name not found> = ArrayList@291[1] { ResolutionCandidate@292 }
-    <name not found> = ArrayList@293[1] { ResolutionCandidate@292 }
+ResolutionTaskHolder@288 {
+    <name not found> = ArrayList@289[1] { ResolutionCandidate@290 }
+}
+
+ResolutionTaskHolder@291 {
+    <name not found> = ArrayList@292[1] { ResolutionCandidate@293 }
 }
 
 ResolutionTaskHolder@294 {
     <name not found> = ArrayList@295[1] { ResolutionCandidate@296 }
-    <name not found> = ArrayList@297[1] { ResolutionCandidate@296 }
 }
 
-ResolutionTaskHolder@298 {
-    <name not found> = ArrayList@299[1] { ResolutionCandidate@300 }
-    <name not found> = ArrayList@301[1] { ResolutionCandidate@300 }
+ResolutionTaskHolder@297 {
+    <name not found> = ArrayList@298[1] { ResolutionCandidate@299 }
 }
 
-ResolutionTaskHolder@302 {
-    <name not found> = ArrayList@303[1] { ResolutionCandidate@304 }
-    <name not found> = ArrayList@305[1] { ResolutionCandidate@304 }
+ResolutionTaskHolder@300 {
+    <name not found> = ArrayList@301[1] { ResolutionCandidate@302 }
+}
+
+ResolutionTaskHolder@303 {
+    <name not found> = ArrayList@304[1] { ResolutionCandidate@305 }
 }
 
 ResolutionTaskHolder@306 {
     <name not found> = ArrayList@307[1] { ResolutionCandidate@308 }
-    <name not found> = ArrayList@309[1] { ResolutionCandidate@308 }
 }
 
-ResolutionTaskHolder@310 {
-    <name not found> = ArrayList@311[1] { ResolutionCandidate@312 }
-    <name not found> = ArrayList@313[1] { ResolutionCandidate@312 }
+ResolutionTaskHolder@309 {
+    <name not found> = ArrayList@310[1] { ResolutionCandidate@311 }
 }
 
-ResolutionTaskHolder@314 {
-    <name not found> = ArrayList@315[1] { ResolutionCandidate@316 }
-    <name not found> = ArrayList@317[1] { ResolutionCandidate@316 }
+ResolutionTaskHolder@312 {
+    <name not found> = ArrayList@313[1] { ResolutionCandidate@314 }
+}
+
+ResolutionTaskHolder@315 {
+    <name not found> = ArrayList@316[1] { ResolutionCandidate@317 }
 }
 
 ResolutionTaskHolder@318 {
     <name not found> = ArrayList@319[1] { ResolutionCandidate@320 }
-    <name not found> = ArrayList@321[1] { ResolutionCandidate@320 }
 }
 
-ResolutionTaskHolder@322 {
-    <name not found> = ArrayList@323[1] { ResolutionCandidate@324 }
-    <name not found> = ArrayList@325[1] { ResolutionCandidate@324 }
+ResolutionTaskHolder@321 {
+    <name not found> = ArrayList@322[1] { ResolutionCandidate@323 }
 }
 
-ResolutionTaskHolder@326 {
-    <name not found> = ArrayList@327[1] { ResolutionCandidate@328 }
-    <name not found> = ArrayList@329[1] { ResolutionCandidate@328 }
+ResolutionTaskHolder@324 {
+    <name not found> = ArrayList@325[1] { ResolutionCandidate@326 }
+}
+
+ResolutionTaskHolder@327 {
+    <name not found> = ArrayList@328[1] { ResolutionCandidate@329 }
 }
 
 ResolutionTaskHolder@330 {
     <name not found> = ArrayList@331[1] { ResolutionCandidate@332 }
-    <name not found> = ArrayList@333[1] { ResolutionCandidate@332 }
 }
 
-ResolutionTaskHolder@334 {
-    <name not found> = ArrayList@335[1] { ResolutionCandidate@336 }
-    <name not found> = ArrayList@337[1] { ResolutionCandidate@336 }
+ResolutionTaskHolder@333 {
+    <name not found> = ArrayList@334[1] { ResolutionCandidate@335 }
 }
 
-ResolutionTaskHolder@338 {
-    <name not found> = ArrayList@339[1] { ResolutionCandidate@340 }
-    <name not found> = ArrayList@341[1] { ResolutionCandidate@340 }
+ResolutionTaskHolder@336 {
+    <name not found> = ArrayList@337[1] { ResolutionCandidate@338 }
+}
+
+ResolutionTaskHolder@339 {
+    <name not found> = ArrayList@340[1] { ResolutionCandidate@341 }
 }
 
 ResolutionTaskHolder@342 {
-    <name not found> = ArrayList@343[1] { ResolutionCandidate@344 }
-    <name not found> = ArrayList@345[1] { ResolutionCandidate@344 }
+    <name not found> = ArrayList@343[3] { ResolutionCandidate@344, ResolutionCandidate@345, ResolutionCandidate@346 }
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@346 {
-    <name not found> = ArrayList@347[1] { ResolutionCandidate@348 }
-    <name not found> = ArrayList@349[1] { ResolutionCandidate@348 }
+ResolutionTaskHolder@347 {
+    <name not found> = ArrayList@348[3] { ResolutionCandidate@349, ResolutionCandidate@350, ResolutionCandidate@351 }
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@350 {
-    <name not found> = ArrayList@351[1] { ResolutionCandidate@352 }
-    <name not found> = ArrayList@353[1] { ResolutionCandidate@352 }
+ResolutionTaskHolder@352 {
+    <name not found> = ArrayList@353[3] { ResolutionCandidate@354, ResolutionCandidate@355, ResolutionCandidate@356 }
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@354 {
-    <name not found> = ArrayList@355[1] { ResolutionCandidate@356 }
-    <name not found> = ArrayList@357[1] { ResolutionCandidate@356 }
-}
-
-ResolutionTaskHolder@358 {
-    <name not found> = ArrayList@359[1] { ResolutionCandidate@360 }
-    <name not found> = ArrayList@361[1] { ResolutionCandidate@360 }
+ResolutionTaskHolder@357 {
+    <name not found> = ArrayList@358[3] { ResolutionCandidate@359, ResolutionCandidate@360, ResolutionCandidate@361 }
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
 }
 
 ResolutionTaskHolder@362 {
-    <name not found> = ArrayList@363[1] { ResolutionCandidate@364 }
-    <name not found> = ArrayList@365[1] { ResolutionCandidate@364 }
+    <name not found> = ArrayList@363[3] { ResolutionCandidate@364, ResolutionCandidate@365, ResolutionCandidate@366 }
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@366 {
-    <name not found> = ArrayList@367[1] { ResolutionCandidate@368 }
-    <name not found> = ArrayList@369[1] { ResolutionCandidate@368 }
+ResolutionTaskHolder@367 {
+    <name not found> = ArrayList@368[3] { ResolutionCandidate@369, ResolutionCandidate@370, ResolutionCandidate@371 }
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@370 {
-    <name not found> = ArrayList@371[1] { ResolutionCandidate@372 }
-    <name not found> = ArrayList@373[1] { ResolutionCandidate@372 }
+ResolutionTaskHolder@372 {
+    <name not found> = ArrayList@373[3] { ResolutionCandidate@374, ResolutionCandidate@375, ResolutionCandidate@376 }
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@374 {
-    <name not found> = ArrayList@375[1] { ResolutionCandidate@376 }
-    <name not found> = ArrayList@377[1] { ResolutionCandidate@376 }
-}
-
-ResolutionTaskHolder@378 {
-    <name not found> = ArrayList@379[1] { ResolutionCandidate@380 }
-    <name not found> = ArrayList@381[1] { ResolutionCandidate@380 }
+ResolutionTaskHolder@377 {
+    <name not found> = ArrayList@378[3] { ResolutionCandidate@379, ResolutionCandidate@380, ResolutionCandidate@381 }
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
 }
 
 ResolutionTaskHolder@382 {
-    <name not found> = ArrayList@383[3] { ResolutionCandidate@384, ResolutionCandidate@385, ResolutionCandidate@386 }
-    <name not found> = ArrayList@387[4] { ResolutionCandidate@384, ResolutionCandidate@385, ResolutionCandidate@386, ... }
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+}
+
+ResolutionTaskHolder@383 {
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+}
+
+ResolutionTaskHolder@384 {
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+}
+
+ResolutionTaskHolder@385 {
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+}
+
+ResolutionTaskHolder@386 {
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+}
+
+ResolutionTaskHolder@387 {
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
@@ -694,71 +749,61 @@ ResolutionTaskHolder@382 {
 }
 
 ResolutionTaskHolder@388 {
-    <name not found> = ArrayList@389[3] { ResolutionCandidate@390, ResolutionCandidate@391, ResolutionCandidate@392 }
-    <name not found> = ArrayList@393[4] { ResolutionCandidate@390, ResolutionCandidate@391, ResolutionCandidate@392, ... }
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@394 {
-    <name not found> = ArrayList@395[3] { ResolutionCandidate@396, ResolutionCandidate@397, ResolutionCandidate@398 }
-    <name not found> = ArrayList@399[4] { ResolutionCandidate@396, ResolutionCandidate@397, ResolutionCandidate@398, ... }
+ResolutionTaskHolder@389 {
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@400 {
-    <name not found> = ArrayList@401[3] { ResolutionCandidate@402, ResolutionCandidate@403, ResolutionCandidate@404 }
-    <name not found> = ArrayList@405[4] { ResolutionCandidate@402, ResolutionCandidate@403, ResolutionCandidate@404, ... }
+ResolutionTaskHolder@390 {
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@406 {
-    <name not found> = ArrayList@407[3] { ResolutionCandidate@408, ResolutionCandidate@409, ResolutionCandidate@410 }
-    <name not found> = ArrayList@411[4] { ResolutionCandidate@408, ResolutionCandidate@409, ResolutionCandidate@410, ... }
+ResolutionTaskHolder@391 {
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@412 {
-    <name not found> = ArrayList@413[3] { ResolutionCandidate@414, ResolutionCandidate@415, ResolutionCandidate@416 }
-    <name not found> = ArrayList@417[4] { ResolutionCandidate@414, ResolutionCandidate@415, ResolutionCandidate@416, ... }
+ResolutionTaskHolder@392 {
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@418 {
-    <name not found> = ArrayList@419[3] { ResolutionCandidate@420, ResolutionCandidate@421, ResolutionCandidate@422 }
-    <name not found> = ArrayList@423[4] { ResolutionCandidate@420, ResolutionCandidate@421, ResolutionCandidate@422, ... }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@424 {
-    <name not found> = ArrayList@425[3] { ResolutionCandidate@426, ResolutionCandidate@427, ResolutionCandidate@428 }
-    <name not found> = ArrayList@429[4] { ResolutionCandidate@426, ResolutionCandidate@427, ResolutionCandidate@428, ... }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@430 {
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
+ResolutionTaskHolder@393 {
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
@@ -769,9 +814,7 @@ ResolutionTaskHolder@430 {
     <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@431 {
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
+ResolutionTaskHolder@394 {
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
@@ -782,137 +825,97 @@ ResolutionTaskHolder@431 {
     <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@432 {
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@433 {
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@434 {
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@435 {
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@436 {
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@437 {
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@438 {
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@439 {
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@440 {
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@441 {
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@442 {
+null {
+    <name not found> = ArrayList@395[1] { ResolutionCandidate@266 }
+    <name not found> = ArrayList@396[1] { ResolutionCandidate@329 }
+    <name not found> = ArrayList@397[1] { ResolutionCandidate@296 }
+    <name not found> = ArrayList@398[1] { ResolutionCandidate@302 }
+    <name not found> = ArrayList@399[1] { ResolutionCandidate@290 }
+    <name not found> = ArrayList@400[1] { ResolutionCandidate@338 }
+    <name not found> = ArrayList@401[1] { ResolutionCandidate@287 }
+    <name not found> = ArrayList@402[1] { ResolutionCandidate@320 }
+    <name not found> = ArrayList@403[1] { ResolutionCandidate@332 }
+    <name not found> = ArrayList@404[1] { ResolutionCandidate@278 }
+    <name not found> = ArrayList@405[1] { ResolutionCandidate@314 }
+    <name not found> = ArrayList@406[1] { ResolutionCandidate@311 }
+    <name not found> = ArrayList@407[1] { ResolutionCandidate@263 }
+    <name not found> = ArrayList@408[1] { ResolutionCandidate@275 }
+    <name not found> = ArrayList@409[1] { ResolutionCandidate@239 }
+    <name not found> = ArrayList@410[1] { ResolutionCandidate@248 }
+    <name not found> = ArrayList@411[1] { ResolutionCandidate@245 }
+    <name not found> = ArrayList@412[1] { ResolutionCandidate@305 }
+    <name not found> = ArrayList@413[1] { ResolutionCandidate@335 }
+    <name not found> = ArrayList@414[1] { ResolutionCandidate@251 }
+    <name not found> = ArrayList@415[1] { ResolutionCandidate@260 }
+    <name not found> = ArrayList@416[1] { ResolutionCandidate@254 }
+    <name not found> = ArrayList@417[1] { ResolutionCandidate@341 }
+    <name not found> = ArrayList@418[1] { ResolutionCandidate@293 }
+    <name not found> = ArrayList@419[1] { ResolutionCandidate@269 }
+    <name not found> = ArrayList@420[1] { ResolutionCandidate@326 }
+    <name not found> = ArrayList@421[1] { ResolutionCandidate@257 }
+    <name not found> = ArrayList@422[1] { ResolutionCandidate@323 }
+    <name not found> = ArrayList@423[1] { ResolutionCandidate@272 }
+    <name not found> = ArrayList@424[1] { ResolutionCandidate@284 }
+    <name not found> = ArrayList@425[1] { ResolutionCandidate@233 }
+    <name not found> = ArrayList@426[1] { ResolutionCandidate@317 }
+    <name not found> = ArrayList@427[1] { ResolutionCandidate@299 }
+    <name not found> = ArrayList@428[1] { ResolutionCandidate@230 }
+    <name not found> = ArrayList@429[1] { ResolutionCandidate@242 }
+    <name not found> = ArrayList@430[1] { ResolutionCandidate@227 }
+    <name not found> = ArrayList@431[1] { ResolutionCandidate@308 }
+    <name not found> = ArrayList@432[1] { ResolutionCandidate@281 }
+    <name not found> = ArrayList@433[1] { ResolutionCandidate@224 }
+    <name not found> = ArrayList@434[1] { ResolutionCandidate@236 }
+    <name not found> = ArrayList@435[4] { ResolutionCandidate@379, ResolutionCandidate@380, ResolutionCandidate@381, ... }
+    <name not found> = ArrayList@436[4] { ResolutionCandidate@349, ResolutionCandidate@350, ResolutionCandidate@351, ... }
+    <name not found> = ArrayList@437[4] { ResolutionCandidate@374, ResolutionCandidate@375, ResolutionCandidate@376, ... }
+    <name not found> = ArrayList@438[4] { ResolutionCandidate@354, ResolutionCandidate@355, ResolutionCandidate@356, ... }
+    <name not found> = ArrayList@439[4] { ResolutionCandidate@369, ResolutionCandidate@370, ResolutionCandidate@371, ... }
+    <name not found> = ArrayList@440[4] { ResolutionCandidate@359, ResolutionCandidate@360, ResolutionCandidate@361, ... }
+    <name not found> = ArrayList@441[4] { ResolutionCandidate@344, ResolutionCandidate@345, ResolutionCandidate@346, ... }
+    <name not found> = ArrayList@442[4] { ResolutionCandidate@364, ResolutionCandidate@365, ResolutionCandidate@366, ... }
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
diff --git a/compiler/testData/diagnostics/tests/jdk-annotations/sql/ResultSet.lazy.log b/compiler/testData/diagnostics/tests/jdk-annotations/sql/ResultSet.lazy.log
index c63740e3af9..2c6c945b6c1 100644
--- a/compiler/testData/diagnostics/tests/jdk-annotations/sql/ResultSet.lazy.log
+++ b/compiler/testData/diagnostics/tests/jdk-annotations/sql/ResultSet.lazy.log
@@ -108,10 +108,13 @@ LazyJavaPackageFragment@51['sql'] {
 
 ResolutionTaskHolder@71 {
     <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
 }
 
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
+}
+
+null {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@76 }
 }
diff --git a/compiler/testData/diagnostics/tests/jdk-annotations/sql/Statement.lazy.log b/compiler/testData/diagnostics/tests/jdk-annotations/sql/Statement.lazy.log
index 6e620aa9f5c..b48d36bc21d 100644
--- a/compiler/testData/diagnostics/tests/jdk-annotations/sql/Statement.lazy.log
+++ b/compiler/testData/diagnostics/tests/jdk-annotations/sql/Statement.lazy.log
@@ -86,14 +86,14 @@ LazyJavaClassifierType@59['ResultSet'] {
 
 LazyJavaClassifierType@62['ResultSet'] {
     arguments = ArrayList@63[empty]
-    classifier = JavaClassImpl@57['ResultSet']
+    classifier = JavaClassImpl@61['ResultSet']
     nullable = 'true': Boolean@64
     typeConstructor = LazyJavaClassTypeConstructor@20['ResultSet']
 }
 
 LazyJavaClassifierType@65['ResultSet'] {
     arguments = ArrayList@66[empty]
-    classifier = JavaClassImpl@61['ResultSet']
+    classifier = JavaClassImpl@57['ResultSet']
     nullable = 'true': Boolean@64
     typeConstructor = LazyJavaClassTypeConstructor@20['ResultSet']
 }
@@ -149,42 +149,42 @@ LazyJavaClassifierType@85['String'] {
 
 LazyJavaClassifierType@88['String'] {
     arguments = ArrayList@89[empty]
-    classifier = JavaClassImpl@75['String']
+    classifier = JavaClassImpl@87['String']
     nullable = 'true': Boolean@64
     typeConstructor = DeserializedClassTypeConstructor@72
 }
 
 LazyJavaClassifierType@90['String'] {
     arguments = ArrayList@91[empty]
-    classifier = JavaClassImpl@78['String']
+    classifier = JavaClassImpl@75['String']
     nullable = 'true': Boolean@64
     typeConstructor = DeserializedClassTypeConstructor@72
 }
 
 LazyJavaClassifierType@92['String'] {
     arguments = ArrayList@93[empty]
-    classifier = JavaClassImpl@87['String']
+    classifier = JavaClassImpl@78['String']
     nullable = 'true': Boolean@64
     typeConstructor = DeserializedClassTypeConstructor@72
 }
 
 LazyJavaClassifierType@94['String'] {
     arguments = ArrayList@95[empty]
-    classifier = JavaClassImpl@71['String']
+    classifier = JavaClassImpl@81['String']
     nullable = 'true': Boolean@64
     typeConstructor = DeserializedClassTypeConstructor@72
 }
 
 LazyJavaClassifierType@96['String'] {
     arguments = ArrayList@97[empty]
-    classifier = JavaClassImpl@81['String']
+    classifier = JavaClassImpl@84['String']
     nullable = 'true': Boolean@64
     typeConstructor = DeserializedClassTypeConstructor@72
 }
 
 LazyJavaClassifierType@98['String'] {
     arguments = ArrayList@99[empty]
-    classifier = JavaClassImpl@84['String']
+    classifier = JavaClassImpl@71['String']
     nullable = 'true': Boolean@64
     typeConstructor = DeserializedClassTypeConstructor@72
 }
@@ -215,7 +215,7 @@ LazyJavaPackageFragmentProvider@104 {
     packageFragments('kotlin.jvm': FqName@121) = null
     topLevelClasses(JavaClassImpl@50['AutoCloseable']) = LazyJavaClassDescriptor@0['AutoCloseable']
     topLevelClasses(JavaClassImpl@122['PreparedStatement']) = LazyJavaClassDescriptor@7['PreparedStatement']
-    topLevelClasses(JavaClassImpl@57['ResultSet']) = LazyJavaClassDescriptor@19['ResultSet']
+    topLevelClasses(JavaClassImpl@61['ResultSet']) = LazyJavaClassDescriptor@19['ResultSet']
     topLevelClasses(JavaClassImpl@123['Statement']) = LazyJavaClassDescriptor@21['Statement']
 }
 
@@ -244,80 +244,83 @@ LazyJavaPackageFragment@114['sql'] {
 
 ResolutionTaskHolder@138 {
     <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@140 }
 }
 
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@144 }
+ResolutionTaskHolder@141 {
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
 }
 
-ResolutionTaskHolder@146 {
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@148 }
+ResolutionTaskHolder@144 {
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
+}
+
+ResolutionTaskHolder@147 {
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
 }
 
 ResolutionTaskHolder@150 {
     <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@152 }
 }
 
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@156 }
+ResolutionTaskHolder@153 {
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
 }
 
-ResolutionTaskHolder@158 {
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@160 }
+ResolutionTaskHolder@156 {
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
+}
+
+ResolutionTaskHolder@159 {
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
 }
 
 ResolutionTaskHolder@162 {
     <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@164 }
 }
 
-ResolutionTaskHolder@166 {
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@168 }
+ResolutionTaskHolder@165 {
+    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
 }
 
-ResolutionTaskHolder@170 {
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@172 }
+ResolutionTaskHolder@168 {
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
+}
+
+ResolutionTaskHolder@171 {
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
 }
 
 ResolutionTaskHolder@174 {
     <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@176 }
 }
 
-ResolutionTaskHolder@178 {
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@180 }
+ResolutionTaskHolder@177 {
+    <name not found> = ArrayList@178[2] { ResolutionCandidate@179, ResolutionCandidate@180 }
 }
 
-ResolutionTaskHolder@182 {
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@184 }
+ResolutionTaskHolder@181 {
+    <name not found> = ArrayList@182[4] { ResolutionCandidate@183, ResolutionCandidate@184, ResolutionCandidate@185, ... }
 }
 
 ResolutionTaskHolder@186 {
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@188 }
+    <name not found> = ArrayList@187[4] { ResolutionCandidate@188, ResolutionCandidate@189, ResolutionCandidate@190, ... }
 }
 
-ResolutionTaskHolder@190 {
-    <name not found> = ArrayList@191[2] { ResolutionCandidate@192, ResolutionCandidate@193 }
-    <name not found> = ArrayList@194[2] { ResolutionCandidate@192, ResolutionCandidate@193 }
-}
-
-ResolutionTaskHolder@195 {
-    <name not found> = ArrayList@196[4] { ResolutionCandidate@197, ResolutionCandidate@198, ResolutionCandidate@199, ... }
-    <name not found> = ArrayList@200[4] { ResolutionCandidate@197, ResolutionCandidate@198, ResolutionCandidate@199, ... }
-}
-
-ResolutionTaskHolder@201 {
-    <name not found> = ArrayList@202[4] { ResolutionCandidate@203, ResolutionCandidate@204, ResolutionCandidate@205, ... }
-    <name not found> = ArrayList@206[4] { ResolutionCandidate@203, ResolutionCandidate@204, ResolutionCandidate@205, ... }
+null {
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@152 }
+    <name not found> = ArrayList@192[1] { ResolutionCandidate@149 }
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@140 }
+    <name not found> = ArrayList@194[1] { ResolutionCandidate@155 }
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@173 }
+    <name not found> = ArrayList@196[1] { ResolutionCandidate@170 }
+    <name not found> = ArrayList@197[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@198[1] { ResolutionCandidate@143 }
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@176 }
+    <name not found> = ArrayList@200[1] { ResolutionCandidate@161 }
+    <name not found> = ArrayList@201[1] { ResolutionCandidate@164 }
+    <name not found> = ArrayList@202[1] { ResolutionCandidate@167 }
+    <name not found> = ArrayList@203[1] { ResolutionCandidate@146 }
+    <name not found> = ArrayList@204[2] { ResolutionCandidate@179, ResolutionCandidate@180 }
+    <name not found> = ArrayList@205[4] { ResolutionCandidate@188, ResolutionCandidate@189, ResolutionCandidate@190, ... }
+    <name not found> = ArrayList@206[4] { ResolutionCandidate@183, ResolutionCandidate@184, ResolutionCandidate@185, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/kt310.lazy.log b/compiler/testData/diagnostics/tests/kt310.lazy.log
index 327e6a95797..dd031228181 100644
--- a/compiler/testData/diagnostics/tests/kt310.lazy.log
+++ b/compiler/testData/diagnostics/tests/kt310.lazy.log
@@ -42,12 +42,6 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@30 {
     <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
@@ -73,19 +67,15 @@ ResolutionTaskHolder@30 {
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@39 {
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
@@ -95,3 +85,16 @@ ResolutionTaskHolder@42 {
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
+
+null {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@38 }
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/kt53.lazy.log b/compiler/testData/diagnostics/tests/kt53.lazy.log
index bea9966b30a..b12c99a638c 100644
--- a/compiler/testData/diagnostics/tests/kt53.lazy.log
+++ b/compiler/testData/diagnostics/tests/kt53.lazy.log
@@ -35,7 +35,10 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@29 {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+}
+
+null {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
     <name not found> = EmptyList@26[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/labels/kt1703.lazy.log b/compiler/testData/diagnostics/tests/labels/kt1703.lazy.log
index 57c0d35d579..53a4b411707 100644
--- a/compiler/testData/diagnostics/tests/labels/kt1703.lazy.log
+++ b/compiler/testData/diagnostics/tests/labels/kt1703.lazy.log
@@ -68,93 +68,96 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@46 {
     <name not found> = ArrayList@47[16] { ResolutionCandidate@48, ResolutionCandidate@49, ResolutionCandidate@50, ... }
-    <name not found> = ArrayList@51[16] { ResolutionCandidate@48, ResolutionCandidate@49, ResolutionCandidate@50, ... }
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
+    <name not found> = EmptyList@38[empty]
+}
+
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
 ResolutionTaskHolder@59 {
     <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
     <name not found> = EmptyList@38[empty]
 }
 
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
+}
+
 ResolutionTaskHolder@71 {
     <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
 }
 
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
+}
+
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
 }
 
 ResolutionTaskHolder@83 {
     <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
 }
 
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
 }
 
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
 }
 
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
 }
 
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
+null {
+    <name not found> = ArrayList@95[16] { ResolutionCandidate@48, ResolutionCandidate@49, ResolutionCandidate@50, ... }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@82 }
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/labels/kt361.lazy.log b/compiler/testData/diagnostics/tests/labels/kt361.lazy.log
index aef7fd27615..9b4cf7afc7a 100644
--- a/compiler/testData/diagnostics/tests/labels/kt361.lazy.log
+++ b/compiler/testData/diagnostics/tests/labels/kt361.lazy.log
@@ -27,5 +27,8 @@ LazyJavaPackageFragment@6['java'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
+}
+
+null {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
 }
diff --git a/compiler/testData/diagnostics/tests/labels/kt3920.lazy.log b/compiler/testData/diagnostics/tests/labels/kt3920.lazy.log
index 3844972a144..01a1d86cc66 100644
--- a/compiler/testData/diagnostics/tests/labels/kt3920.lazy.log
+++ b/compiler/testData/diagnostics/tests/labels/kt3920.lazy.log
@@ -41,31 +41,34 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@29 {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+}
+
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
 }
 
 ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@42[7] { ResolutionCandidate@43, ResolutionCandidate@44, ResolutionCandidate@45, ... }
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[7] { ResolutionCandidate@47, ResolutionCandidate@48, ResolutionCandidate@49, ... }
-    <name not found> = ArrayList@50[7] { ResolutionCandidate@47, ResolutionCandidate@48, ResolutionCandidate@49, ... }
+null {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@50[7] { ResolutionCandidate@43, ResolutionCandidate@44, ResolutionCandidate@45, ... }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/labels/kt3988.lazy.log b/compiler/testData/diagnostics/tests/labels/kt3988.lazy.log
index 684e6841c3c..1bac6a2bb23 100644
--- a/compiler/testData/diagnostics/tests/labels/kt3988.lazy.log
+++ b/compiler/testData/diagnostics/tests/labels/kt3988.lazy.log
@@ -59,15 +59,6 @@ LazyJavaPackageFragment@15['lang'] {
 
 ResolutionTaskHolder@44 {
     <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
@@ -78,21 +69,33 @@ ResolutionTaskHolder@44 {
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
+}
+
+null {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@46 }
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/labels/kt4247.lazy.log b/compiler/testData/diagnostics/tests/labels/kt4247.lazy.log
index 994d37303aa..786951a2f0f 100644
--- a/compiler/testData/diagnostics/tests/labels/kt4247.lazy.log
+++ b/compiler/testData/diagnostics/tests/labels/kt4247.lazy.log
@@ -38,34 +38,37 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@29 {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+}
+
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
 }
 
 ResolutionTaskHolder@41 {
     <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+null {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@43 }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/labels/kt4586.lazy.log b/compiler/testData/diagnostics/tests/labels/kt4586.lazy.log
index c4abde1c3a3..0ec1d388d67 100644
--- a/compiler/testData/diagnostics/tests/labels/kt4586.lazy.log
+++ b/compiler/testData/diagnostics/tests/labels/kt4586.lazy.log
@@ -192,84 +192,84 @@ LazyJavaClassifierType@120['AbstractStringBuilder'] {
 
 LazyJavaClassifierType@123['AbstractStringBuilder'] {
     arguments = ArrayList@124[empty]
-    classifier = JavaClassImpl@119['AbstractStringBuilder']
+    classifier = JavaClassImpl@110['AbstractStringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@126['AbstractStringBuilder'] {
     arguments = ArrayList@127[empty]
-    classifier = JavaClassImpl@89['AbstractStringBuilder']
+    classifier = JavaClassImpl@116['AbstractStringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@128['AbstractStringBuilder'] {
     arguments = ArrayList@129[empty]
-    classifier = JavaClassImpl@95['AbstractStringBuilder']
+    classifier = JavaClassImpl@119['AbstractStringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@130['AbstractStringBuilder'] {
     arguments = ArrayList@131[empty]
-    classifier = JavaClassImpl@101['AbstractStringBuilder']
+    classifier = JavaClassImpl@85['AbstractStringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@132['AbstractStringBuilder'] {
     arguments = ArrayList@133[empty]
-    classifier = JavaClassImpl@107['AbstractStringBuilder']
+    classifier = JavaClassImpl@92['AbstractStringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@134['AbstractStringBuilder'] {
     arguments = ArrayList@135[empty]
-    classifier = JavaClassImpl@92['AbstractStringBuilder']
+    classifier = JavaClassImpl@89['AbstractStringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@136['AbstractStringBuilder'] {
     arguments = ArrayList@137[empty]
-    classifier = JavaClassImpl@110['AbstractStringBuilder']
+    classifier = JavaClassImpl@122['AbstractStringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@138['AbstractStringBuilder'] {
     arguments = ArrayList@139[empty]
-    classifier = JavaClassImpl@122['AbstractStringBuilder']
+    classifier = JavaClassImpl@104['AbstractStringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@140['AbstractStringBuilder'] {
     arguments = ArrayList@141[empty]
-    classifier = JavaClassImpl@85['AbstractStringBuilder']
+    classifier = JavaClassImpl@98['AbstractStringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@142['AbstractStringBuilder'] {
     arguments = ArrayList@143[empty]
-    classifier = JavaClassImpl@116['AbstractStringBuilder']
+    classifier = JavaClassImpl@101['AbstractStringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@144['AbstractStringBuilder'] {
     arguments = ArrayList@145[empty]
-    classifier = JavaClassImpl@104['AbstractStringBuilder']
+    classifier = JavaClassImpl@107['AbstractStringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@146['AbstractStringBuilder'] {
     arguments = ArrayList@147[empty]
-    classifier = JavaClassImpl@98['AbstractStringBuilder']
+    classifier = JavaClassImpl@95['AbstractStringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
 }
@@ -324,14 +324,14 @@ LazyJavaClassifierType@163['Appendable'] {
 
 LazyJavaClassifierType@165['Appendable'] {
     arguments = ArrayList@166[empty]
-    classifier = JavaClassImpl@162['Appendable']
+    classifier = JavaClassImpl@156['Appendable']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@32['Appendable']
 }
 
 LazyJavaClassifierType@167['Appendable'] {
     arguments = ArrayList@168[empty]
-    classifier = JavaClassImpl@156['Appendable']
+    classifier = JavaClassImpl@162['Appendable']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@32['Appendable']
 }
@@ -401,49 +401,49 @@ LazyJavaClassifierType@193['CharSequence'] {
 
 LazyJavaClassifierType@196['CharSequence'] {
     arguments = ArrayList@197[empty]
-    classifier = JavaClassImpl@192['CharSequence']
+    classifier = JavaClassImpl@189['CharSequence']
     nullable = 'true': Boolean@125
     typeConstructor = DeserializedClassTypeConstructor@172
 }
 
 LazyJavaClassifierType@198['CharSequence'] {
     arguments = ArrayList@199[empty]
-    classifier = JavaClassImpl@195['CharSequence']
+    classifier = JavaClassImpl@180['CharSequence']
     nullable = 'true': Boolean@125
     typeConstructor = DeserializedClassTypeConstructor@172
 }
 
 LazyJavaClassifierType@200['CharSequence'] {
     arguments = ArrayList@201[empty]
-    classifier = JavaClassImpl@186['CharSequence']
+    classifier = JavaClassImpl@177['CharSequence']
     nullable = 'true': Boolean@125
     typeConstructor = DeserializedClassTypeConstructor@172
 }
 
 LazyJavaClassifierType@202['CharSequence'] {
     arguments = ArrayList@203[empty]
-    classifier = JavaClassImpl@189['CharSequence']
+    classifier = JavaClassImpl@195['CharSequence']
     nullable = 'true': Boolean@125
     typeConstructor = DeserializedClassTypeConstructor@172
 }
 
 LazyJavaClassifierType@204['CharSequence'] {
     arguments = ArrayList@205[empty]
-    classifier = JavaClassImpl@177['CharSequence']
+    classifier = JavaClassImpl@186['CharSequence']
     nullable = 'true': Boolean@125
     typeConstructor = DeserializedClassTypeConstructor@172
 }
 
 LazyJavaClassifierType@206['CharSequence'] {
     arguments = ArrayList@207[empty]
-    classifier = JavaClassImpl@183['CharSequence']
+    classifier = JavaClassImpl@192['CharSequence']
     nullable = 'true': Boolean@125
     typeConstructor = DeserializedClassTypeConstructor@172
 }
 
 LazyJavaClassifierType@208['CharSequence'] {
     arguments = ArrayList@209[empty]
-    classifier = JavaClassImpl@180['CharSequence']
+    classifier = JavaClassImpl@183['CharSequence']
     nullable = 'true': Boolean@125
     typeConstructor = DeserializedClassTypeConstructor@172
 }
@@ -545,14 +545,14 @@ LazyJavaClassifierType@244['String'] {
 
 LazyJavaClassifierType@247['String'] {
     arguments = ArrayList@248[empty]
-    classifier = JavaClassImpl@233['String']
+    classifier = JavaClassImpl@240['String']
     nullable = 'true': Boolean@125
     typeConstructor = DeserializedClassTypeConstructor@234
 }
 
 LazyJavaClassifierType@249['String'] {
     arguments = ArrayList@250[empty]
-    classifier = JavaClassImpl@240['String']
+    classifier = JavaClassImpl@246['String']
     nullable = 'true': Boolean@125
     typeConstructor = DeserializedClassTypeConstructor@234
 }
@@ -566,14 +566,14 @@ LazyJavaClassifierType@251['String'] {
 
 LazyJavaClassifierType@253['String'] {
     arguments = ArrayList@254[empty]
-    classifier = JavaClassImpl@243['String']
+    classifier = JavaClassImpl@233['String']
     nullable = 'true': Boolean@125
     typeConstructor = DeserializedClassTypeConstructor@234
 }
 
 LazyJavaClassifierType@255['String'] {
     arguments = ArrayList@256[empty]
-    classifier = JavaClassImpl@246['String']
+    classifier = JavaClassImpl@243['String']
     nullable = 'true': Boolean@125
     typeConstructor = DeserializedClassTypeConstructor@234
 }
@@ -594,14 +594,14 @@ LazyJavaClassifierType@260['StringBuffer'] {
 
 LazyJavaClassifierType@263['StringBuffer'] {
     arguments = ArrayList@264[empty]
-    classifier = JavaClassImpl@259['StringBuffer']
+    classifier = JavaClassImpl@262['StringBuffer']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@41['StringBuffer']
 }
 
 LazyJavaClassifierType@265['StringBuffer'] {
     arguments = ArrayList@266[empty]
-    classifier = JavaClassImpl@262['StringBuffer']
+    classifier = JavaClassImpl@259['StringBuffer']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@41['StringBuffer']
 }
@@ -713,105 +713,105 @@ LazyJavaClassifierType@309['StringBuilder'] {
 
 LazyJavaClassifierType@312['StringBuilder'] {
     arguments = ArrayList@313[empty]
-    classifier = JavaClassImpl@308['StringBuilder']
+    classifier = JavaClassImpl@299['StringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
 }
 
 LazyJavaClassifierType@314['StringBuilder'] {
     arguments = ArrayList@315[empty]
-    classifier = JavaClassImpl@272['StringBuilder']
+    classifier = JavaClassImpl@275['StringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
 }
 
 LazyJavaClassifierType@316['StringBuilder'] {
     arguments = ArrayList@317[empty]
-    classifier = JavaClassImpl@281['StringBuilder']
+    classifier = JavaClassImpl@269['StringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
 }
 
 LazyJavaClassifierType@318['StringBuilder'] {
     arguments = ArrayList@319[empty]
-    classifier = JavaClassImpl@311['StringBuilder']
+    classifier = JavaClassImpl@305['StringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
 }
 
 LazyJavaClassifierType@320['StringBuilder'] {
     arguments = ArrayList@321[empty]
-    classifier = JavaClassImpl@299['StringBuilder']
+    classifier = JavaClassImpl@290['StringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
 }
 
 LazyJavaClassifierType@322['StringBuilder'] {
     arguments = ArrayList@323[empty]
-    classifier = JavaClassImpl@284['StringBuilder']
+    classifier = JavaClassImpl@302['StringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
 }
 
 LazyJavaClassifierType@324['StringBuilder'] {
     arguments = ArrayList@325[empty]
-    classifier = JavaClassImpl@275['StringBuilder']
+    classifier = JavaClassImpl@296['StringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
 }
 
 LazyJavaClassifierType@326['StringBuilder'] {
     arguments = ArrayList@327[empty]
-    classifier = JavaClassImpl@269['StringBuilder']
+    classifier = JavaClassImpl@278['StringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
 }
 
 LazyJavaClassifierType@328['StringBuilder'] {
     arguments = ArrayList@329[empty]
-    classifier = JavaClassImpl@302['StringBuilder']
+    classifier = JavaClassImpl@284['StringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
 }
 
 LazyJavaClassifierType@330['StringBuilder'] {
     arguments = ArrayList@331[empty]
-    classifier = JavaClassImpl@305['StringBuilder']
+    classifier = JavaClassImpl@287['StringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
 }
 
 LazyJavaClassifierType@332['StringBuilder'] {
     arguments = ArrayList@333[empty]
-    classifier = JavaClassImpl@293['StringBuilder']
+    classifier = JavaClassImpl@311['StringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
 }
 
 LazyJavaClassifierType@334['StringBuilder'] {
     arguments = ArrayList@335[empty]
-    classifier = JavaClassImpl@278['StringBuilder']
+    classifier = JavaClassImpl@308['StringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
 }
 
 LazyJavaClassifierType@336['StringBuilder'] {
     arguments = ArrayList@337[empty]
-    classifier = JavaClassImpl@287['StringBuilder']
+    classifier = JavaClassImpl@272['StringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
 }
 
 LazyJavaClassifierType@338['StringBuilder'] {
     arguments = ArrayList@339[empty]
-    classifier = JavaClassImpl@290['StringBuilder']
+    classifier = JavaClassImpl@293['StringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
 }
 
 LazyJavaClassifierType@340['StringBuilder'] {
     arguments = ArrayList@341[empty]
-    classifier = JavaClassImpl@296['StringBuilder']
+    classifier = JavaClassImpl@281['StringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
 }
@@ -882,39 +882,34 @@ LazyJavaPackageFragment@353['lang'] {
 
 ResolutionTaskHolder@380 {
     <name not found> = ArrayList@381[13] { ResolutionCandidate@382, ResolutionCandidate@383, ResolutionCandidate@384, ... }
-    <name not found> = ArrayList@385[14] { ResolutionCandidate@382, ResolutionCandidate@383, ResolutionCandidate@386, ... }
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+}
+
+ResolutionTaskHolder@385 {
+    <name not found> = ArrayList@386[13] { ResolutionCandidate@387, ResolutionCandidate@388, ResolutionCandidate@389, ... }
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+}
+
+ResolutionTaskHolder@390 {
+    <name not found> = ArrayList@391[13] { ResolutionCandidate@392, ResolutionCandidate@393, ResolutionCandidate@394, ... }
+}
+
+ResolutionTaskHolder@395 {
+    <name not found> = ArrayList@396[1] { ResolutionCandidate@397 }
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
 }
 
-ResolutionTaskHolder@387 {
-    <name not found> = ArrayList@388[13] { ResolutionCandidate@389, ResolutionCandidate@390, ResolutionCandidate@391, ... }
-    <name not found> = ArrayList@392[14] { ResolutionCandidate@389, ResolutionCandidate@390, ResolutionCandidate@393, ... }
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-}
-
-ResolutionTaskHolder@394 {
-    <name not found> = ArrayList@395[13] { ResolutionCandidate@396, ResolutionCandidate@397, ResolutionCandidate@398, ... }
-    <name not found> = ArrayList@399[14] { ResolutionCandidate@396, ResolutionCandidate@397, ResolutionCandidate@400, ... }
-}
-
-ResolutionTaskHolder@401 {
-    <name not found> = ArrayList@402[1] { ResolutionCandidate@403 }
-    <name not found> = ArrayList@404[1] { ResolutionCandidate@403 }
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
+ResolutionTaskHolder@398 {
+    <name not found> = ArrayList@399[1] { ResolutionCandidate@400 }
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
@@ -924,62 +919,70 @@ ResolutionTaskHolder@401 {
     <name not found> = EmptyList@11[empty]
 }
 
-ResolutionTaskHolder@405 {
-    <name not found> = ArrayList@406[1] { ResolutionCandidate@407 }
-    <name not found> = ArrayList@408[1] { ResolutionCandidate@407 }
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
+ResolutionTaskHolder@401 {
+    <name not found> = ArrayList@402[1] { ResolutionCandidate@403 }
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
 }
 
-ResolutionTaskHolder@409 {
-    <name not found> = ArrayList@410[1] { ResolutionCandidate@411 }
-    <name not found> = ArrayList@412[1] { ResolutionCandidate@411 }
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
+ResolutionTaskHolder@404 {
+    <name not found> = ArrayList@405[1] { ResolutionCandidate@406 }
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
 }
 
+ResolutionTaskHolder@407 {
+    <name not found> = ArrayList@408[1] { ResolutionCandidate@409 }
+}
+
+ResolutionTaskHolder@410 {
+    <name not found> = ArrayList@411[1] { ResolutionCandidate@412 }
+}
+
 ResolutionTaskHolder@413 {
     <name not found> = ArrayList@414[1] { ResolutionCandidate@415 }
-    <name not found> = ArrayList@416[1] { ResolutionCandidate@415 }
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
+}
+
+ResolutionTaskHolder@416 {
+    <name not found> = ArrayList@417[1] { ResolutionCandidate@418 }
+}
+
+ResolutionTaskHolder@419 {
+    <name not found> = ArrayList@420[4] { ResolutionCandidate@421, ResolutionCandidate@422, ResolutionCandidate@423, ... }
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
 }
 
-ResolutionTaskHolder@417 {
-    <name not found> = ArrayList@418[1] { ResolutionCandidate@419 }
-    <name not found> = ArrayList@420[1] { ResolutionCandidate@419 }
-}
-
-ResolutionTaskHolder@421 {
-    <name not found> = ArrayList@422[1] { ResolutionCandidate@423 }
-    <name not found> = ArrayList@424[1] { ResolutionCandidate@423 }
-}
-
-ResolutionTaskHolder@425 {
-    <name not found> = ArrayList@426[1] { ResolutionCandidate@427 }
-    <name not found> = ArrayList@428[1] { ResolutionCandidate@427 }
-}
-
-ResolutionTaskHolder@429 {
-    <name not found> = ArrayList@430[1] { ResolutionCandidate@431 }
-    <name not found> = ArrayList@432[1] { ResolutionCandidate@431 }
-}
-
-ResolutionTaskHolder@433 {
-    <name not found> = ArrayList@434[4] { ResolutionCandidate@435, ResolutionCandidate@436, ResolutionCandidate@437, ... }
-    <name not found> = ArrayList@438[4] { ResolutionCandidate@435, ResolutionCandidate@436, ResolutionCandidate@437, ... }
+null {
+    <name not found> = ArrayList@424[14] { ResolutionCandidate@382, ResolutionCandidate@383, ResolutionCandidate@425, ... }
+    <name not found> = ArrayList@426[14] { ResolutionCandidate@387, ResolutionCandidate@388, ResolutionCandidate@427, ... }
+    <name not found> = ArrayList@428[14] { ResolutionCandidate@392, ResolutionCandidate@393, ResolutionCandidate@429, ... }
+    <name not found> = ArrayList@430[1] { ResolutionCandidate@406 }
+    <name not found> = ArrayList@431[1] { ResolutionCandidate@397 }
+    <name not found> = ArrayList@432[1] { ResolutionCandidate@412 }
+    <name not found> = ArrayList@433[1] { ResolutionCandidate@403 }
+    <name not found> = ArrayList@434[1] { ResolutionCandidate@400 }
+    <name not found> = ArrayList@435[1] { ResolutionCandidate@415 }
+    <name not found> = ArrayList@436[1] { ResolutionCandidate@418 }
+    <name not found> = ArrayList@437[1] { ResolutionCandidate@409 }
+    <name not found> = ArrayList@438[4] { ResolutionCandidate@421, ResolutionCandidate@422, ResolutionCandidate@423, ... }
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
diff --git a/compiler/testData/diagnostics/tests/labels/kt591.lazy.log b/compiler/testData/diagnostics/tests/labels/kt591.lazy.log
index 2585b6ebab3..7911557ae7b 100644
--- a/compiler/testData/diagnostics/tests/labels/kt591.lazy.log
+++ b/compiler/testData/diagnostics/tests/labels/kt591.lazy.log
@@ -38,16 +38,19 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@29 {
     <name not found> = ArrayList@30[14] { ResolutionCandidate@31, ResolutionCandidate@32, ResolutionCandidate@33, ... }
-    <name not found> = ArrayList@34[14] { ResolutionCandidate@31, ResolutionCandidate@32, ResolutionCandidate@33, ... }
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+}
+
+null {
+    <name not found> = ArrayList@39[14] { ResolutionCandidate@31, ResolutionCandidate@32, ResolutionCandidate@33, ... }
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@38 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/labels/labelReferencesInsideObjectExpressions.lazy.log b/compiler/testData/diagnostics/tests/labels/labelReferencesInsideObjectExpressions.lazy.log
index 6bd608f1207..ca033050e87 100644
--- a/compiler/testData/diagnostics/tests/labels/labelReferencesInsideObjectExpressions.lazy.log
+++ b/compiler/testData/diagnostics/tests/labels/labelReferencesInsideObjectExpressions.lazy.log
@@ -30,10 +30,13 @@ LazyJavaPackageFragment@10['java'] {
 
 ResolutionTaskHolder@26 {
     <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
 }
 
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
+ResolutionTaskHolder@29 {
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
+}
+
+null {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@28 }
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@31 }
 }
diff --git a/compiler/testData/diagnostics/tests/labels/labelsMustBeNamed.lazy.log b/compiler/testData/diagnostics/tests/labels/labelsMustBeNamed.lazy.log
index cc91bb8bba1..c589d2cd550 100644
--- a/compiler/testData/diagnostics/tests/labels/labelsMustBeNamed.lazy.log
+++ b/compiler/testData/diagnostics/tests/labels/labelsMustBeNamed.lazy.log
@@ -54,53 +54,56 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
+    <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
 }
 
 ResolutionTaskHolder@51 {
     <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
 }
 
 ResolutionTaskHolder@63 {
     <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
 }
 
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
 }
 
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
+null {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@50 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/library/Collections.lazy.log b/compiler/testData/diagnostics/tests/library/Collections.lazy.log
index 45cc382c5b0..308e94a7f0b 100644
--- a/compiler/testData/diagnostics/tests/library/Collections.lazy.log
+++ b/compiler/testData/diagnostics/tests/library/Collections.lazy.log
@@ -104,806 +104,830 @@ LazyJavaPackageFragment@41['lang'] {
 
 ResolutionTaskHolder@94 {
     <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
 }
 
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
 }
 
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
+}
+
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
 }
 
 ResolutionTaskHolder@106 {
     <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
 }
 
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
 }
 
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
+}
+
+ResolutionTaskHolder@115 {
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
 }
 
 ResolutionTaskHolder@118 {
     <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
 }
 
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
+ResolutionTaskHolder@121 {
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
 }
 
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
+ResolutionTaskHolder@124 {
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
+}
+
+ResolutionTaskHolder@127 {
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
 }
 
 ResolutionTaskHolder@130 {
     <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@132 }
 }
 
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@136 }
+ResolutionTaskHolder@133 {
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
 }
 
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@140 }
+ResolutionTaskHolder@136 {
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
+}
+
+ResolutionTaskHolder@139 {
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
 }
 
 ResolutionTaskHolder@142 {
     <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@144 }
 }
 
-ResolutionTaskHolder@146 {
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@148 }
+ResolutionTaskHolder@145 {
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
 }
 
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@152 }
+ResolutionTaskHolder@148 {
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
+}
+
+ResolutionTaskHolder@151 {
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
 }
 
 ResolutionTaskHolder@154 {
     <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@156 }
 }
 
-ResolutionTaskHolder@158 {
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@160 }
+ResolutionTaskHolder@157 {
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
 }
 
-ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@164 }
+ResolutionTaskHolder@160 {
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
+}
+
+ResolutionTaskHolder@163 {
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
 }
 
 ResolutionTaskHolder@166 {
     <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@168 }
 }
 
-ResolutionTaskHolder@170 {
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@172 }
+ResolutionTaskHolder@169 {
+    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
 }
 
-ResolutionTaskHolder@174 {
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@176 }
+ResolutionTaskHolder@172 {
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
+}
+
+ResolutionTaskHolder@175 {
+    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
 }
 
 ResolutionTaskHolder@178 {
     <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@180 }
 }
 
-ResolutionTaskHolder@182 {
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@184 }
+ResolutionTaskHolder@181 {
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
 }
 
-ResolutionTaskHolder@186 {
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@188 }
+ResolutionTaskHolder@184 {
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
+}
+
+ResolutionTaskHolder@187 {
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
 }
 
 ResolutionTaskHolder@190 {
     <name not found> = ArrayList@191[1] { ResolutionCandidate@192 }
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@192 }
 }
 
-ResolutionTaskHolder@194 {
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@196 }
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@196 }
+ResolutionTaskHolder@193 {
+    <name not found> = ArrayList@194[1] { ResolutionCandidate@195 }
 }
 
-ResolutionTaskHolder@198 {
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@200 }
+ResolutionTaskHolder@196 {
+    <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
+}
+
+ResolutionTaskHolder@199 {
+    <name not found> = ArrayList@200[1] { ResolutionCandidate@201 }
 }
 
 ResolutionTaskHolder@202 {
     <name not found> = ArrayList@203[1] { ResolutionCandidate@204 }
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@204 }
 }
 
-ResolutionTaskHolder@206 {
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@208 }
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@208 }
+ResolutionTaskHolder@205 {
+    <name not found> = ArrayList@206[1] { ResolutionCandidate@207 }
 }
 
-ResolutionTaskHolder@210 {
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@212 }
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@212 }
+ResolutionTaskHolder@208 {
+    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
+}
+
+ResolutionTaskHolder@211 {
+    <name not found> = ArrayList@212[1] { ResolutionCandidate@213 }
 }
 
 ResolutionTaskHolder@214 {
     <name not found> = ArrayList@215[1] { ResolutionCandidate@216 }
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@216 }
 }
 
-ResolutionTaskHolder@218 {
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@220 }
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@220 }
+ResolutionTaskHolder@217 {
+    <name not found> = ArrayList@218[1] { ResolutionCandidate@219 }
 }
 
-ResolutionTaskHolder@222 {
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@224 }
+ResolutionTaskHolder@220 {
+    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
+}
+
+ResolutionTaskHolder@223 {
+    <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
 }
 
 ResolutionTaskHolder@226 {
     <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@228 }
 }
 
-ResolutionTaskHolder@230 {
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@232 }
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@232 }
+ResolutionTaskHolder@229 {
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
 }
 
-ResolutionTaskHolder@234 {
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@236 }
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@236 }
+ResolutionTaskHolder@232 {
+    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
+}
+
+ResolutionTaskHolder@235 {
+    <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
 }
 
 ResolutionTaskHolder@238 {
     <name not found> = ArrayList@239[1] { ResolutionCandidate@240 }
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@240 }
 }
 
-ResolutionTaskHolder@242 {
-    <name not found> = ArrayList@243[1] { ResolutionCandidate@244 }
-    <name not found> = ArrayList@245[1] { ResolutionCandidate@244 }
+ResolutionTaskHolder@241 {
+    <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
 }
 
-ResolutionTaskHolder@246 {
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@248 }
-    <name not found> = ArrayList@249[1] { ResolutionCandidate@248 }
+ResolutionTaskHolder@244 {
+    <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
+}
+
+ResolutionTaskHolder@247 {
+    <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
 }
 
 ResolutionTaskHolder@250 {
     <name not found> = ArrayList@251[1] { ResolutionCandidate@252 }
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@252 }
 }
 
-ResolutionTaskHolder@254 {
-    <name not found> = ArrayList@255[1] { ResolutionCandidate@256 }
-    <name not found> = ArrayList@257[1] { ResolutionCandidate@256 }
+ResolutionTaskHolder@253 {
+    <name not found> = ArrayList@254[1] { ResolutionCandidate@255 }
 }
 
-ResolutionTaskHolder@258 {
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@260 }
-    <name not found> = ArrayList@261[1] { ResolutionCandidate@260 }
+ResolutionTaskHolder@256 {
+    <name not found> = ArrayList@257[1] { ResolutionCandidate@258 }
+}
+
+ResolutionTaskHolder@259 {
+    <name not found> = ArrayList@260[1] { ResolutionCandidate@261 }
 }
 
 ResolutionTaskHolder@262 {
     <name not found> = ArrayList@263[1] { ResolutionCandidate@264 }
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@264 }
 }
 
-ResolutionTaskHolder@266 {
-    <name not found> = ArrayList@267[1] { ResolutionCandidate@268 }
-    <name not found> = ArrayList@269[1] { ResolutionCandidate@268 }
+ResolutionTaskHolder@265 {
+    <name not found> = ArrayList@266[1] { ResolutionCandidate@267 }
 }
 
-ResolutionTaskHolder@270 {
-    <name not found> = ArrayList@271[1] { ResolutionCandidate@272 }
-    <name not found> = ArrayList@273[1] { ResolutionCandidate@272 }
+ResolutionTaskHolder@268 {
+    <name not found> = ArrayList@269[1] { ResolutionCandidate@270 }
+}
+
+ResolutionTaskHolder@271 {
+    <name not found> = ArrayList@272[1] { ResolutionCandidate@273 }
 }
 
 ResolutionTaskHolder@274 {
     <name not found> = ArrayList@275[1] { ResolutionCandidate@276 }
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@276 }
 }
 
-ResolutionTaskHolder@278 {
-    <name not found> = ArrayList@279[1] { ResolutionCandidate@280 }
-    <name not found> = ArrayList@281[1] { ResolutionCandidate@280 }
+ResolutionTaskHolder@277 {
+    <name not found> = ArrayList@278[1] { ResolutionCandidate@279 }
 }
 
-ResolutionTaskHolder@282 {
-    <name not found> = ArrayList@283[1] { ResolutionCandidate@284 }
-    <name not found> = ArrayList@285[1] { ResolutionCandidate@284 }
+ResolutionTaskHolder@280 {
+    <name not found> = ArrayList@281[1] { ResolutionCandidate@282 }
+}
+
+ResolutionTaskHolder@283 {
+    <name not found> = ArrayList@284[1] { ResolutionCandidate@285 }
 }
 
 ResolutionTaskHolder@286 {
     <name not found> = ArrayList@287[1] { ResolutionCandidate@288 }
-    <name not found> = ArrayList@289[1] { ResolutionCandidate@288 }
 }
 
-ResolutionTaskHolder@290 {
-    <name not found> = ArrayList@291[1] { ResolutionCandidate@292 }
-    <name not found> = ArrayList@293[1] { ResolutionCandidate@292 }
+ResolutionTaskHolder@289 {
+    <name not found> = ArrayList@290[1] { ResolutionCandidate@291 }
 }
 
-ResolutionTaskHolder@294 {
-    <name not found> = ArrayList@295[1] { ResolutionCandidate@296 }
-    <name not found> = ArrayList@297[1] { ResolutionCandidate@296 }
+ResolutionTaskHolder@292 {
+    <name not found> = ArrayList@293[1] { ResolutionCandidate@294 }
+}
+
+ResolutionTaskHolder@295 {
+    <name not found> = ArrayList@296[1] { ResolutionCandidate@297 }
 }
 
 ResolutionTaskHolder@298 {
     <name not found> = ArrayList@299[1] { ResolutionCandidate@300 }
-    <name not found> = ArrayList@301[1] { ResolutionCandidate@300 }
 }
 
-ResolutionTaskHolder@302 {
-    <name not found> = ArrayList@303[1] { ResolutionCandidate@304 }
-    <name not found> = ArrayList@305[1] { ResolutionCandidate@304 }
+ResolutionTaskHolder@301 {
+    <name not found> = ArrayList@302[1] { ResolutionCandidate@303 }
 }
 
-ResolutionTaskHolder@306 {
-    <name not found> = ArrayList@307[1] { ResolutionCandidate@308 }
-    <name not found> = ArrayList@309[1] { ResolutionCandidate@308 }
+ResolutionTaskHolder@304 {
+    <name not found> = ArrayList@305[1] { ResolutionCandidate@306 }
+}
+
+ResolutionTaskHolder@307 {
+    <name not found> = ArrayList@308[1] { ResolutionCandidate@309 }
 }
 
 ResolutionTaskHolder@310 {
     <name not found> = ArrayList@311[1] { ResolutionCandidate@312 }
-    <name not found> = ArrayList@313[1] { ResolutionCandidate@312 }
 }
 
-ResolutionTaskHolder@314 {
-    <name not found> = ArrayList@315[1] { ResolutionCandidate@316 }
-    <name not found> = ArrayList@317[1] { ResolutionCandidate@316 }
+ResolutionTaskHolder@313 {
+    <name not found> = ArrayList@314[1] { ResolutionCandidate@315 }
 }
 
-ResolutionTaskHolder@318 {
-    <name not found> = ArrayList@319[1] { ResolutionCandidate@320 }
-    <name not found> = ArrayList@321[1] { ResolutionCandidate@320 }
+ResolutionTaskHolder@316 {
+    <name not found> = ArrayList@317[1] { ResolutionCandidate@318 }
+}
+
+ResolutionTaskHolder@319 {
+    <name not found> = ArrayList@320[1] { ResolutionCandidate@321 }
 }
 
 ResolutionTaskHolder@322 {
     <name not found> = ArrayList@323[1] { ResolutionCandidate@324 }
-    <name not found> = ArrayList@325[1] { ResolutionCandidate@324 }
 }
 
-ResolutionTaskHolder@326 {
-    <name not found> = ArrayList@327[1] { ResolutionCandidate@328 }
-    <name not found> = ArrayList@329[1] { ResolutionCandidate@328 }
+ResolutionTaskHolder@325 {
+    <name not found> = ArrayList@326[1] { ResolutionCandidate@327 }
 }
 
-ResolutionTaskHolder@330 {
-    <name not found> = ArrayList@331[1] { ResolutionCandidate@332 }
-    <name not found> = ArrayList@333[1] { ResolutionCandidate@332 }
+ResolutionTaskHolder@328 {
+    <name not found> = ArrayList@329[1] { ResolutionCandidate@330 }
+}
+
+ResolutionTaskHolder@331 {
+    <name not found> = ArrayList@332[1] { ResolutionCandidate@333 }
 }
 
 ResolutionTaskHolder@334 {
     <name not found> = ArrayList@335[1] { ResolutionCandidate@336 }
-    <name not found> = ArrayList@337[1] { ResolutionCandidate@336 }
 }
 
-ResolutionTaskHolder@338 {
-    <name not found> = ArrayList@339[1] { ResolutionCandidate@340 }
-    <name not found> = ArrayList@341[1] { ResolutionCandidate@340 }
+ResolutionTaskHolder@337 {
+    <name not found> = ArrayList@338[1] { ResolutionCandidate@339 }
 }
 
-ResolutionTaskHolder@342 {
-    <name not found> = ArrayList@343[1] { ResolutionCandidate@344 }
-    <name not found> = ArrayList@345[1] { ResolutionCandidate@344 }
+ResolutionTaskHolder@340 {
+    <name not found> = ArrayList@341[1] { ResolutionCandidate@342 }
+}
+
+ResolutionTaskHolder@343 {
+    <name not found> = ArrayList@344[1] { ResolutionCandidate@345 }
 }
 
 ResolutionTaskHolder@346 {
     <name not found> = ArrayList@347[1] { ResolutionCandidate@348 }
-    <name not found> = ArrayList@349[1] { ResolutionCandidate@348 }
 }
 
-ResolutionTaskHolder@350 {
-    <name not found> = ArrayList@351[1] { ResolutionCandidate@352 }
-    <name not found> = ArrayList@353[1] { ResolutionCandidate@352 }
+ResolutionTaskHolder@349 {
+    <name not found> = ArrayList@350[1] { ResolutionCandidate@351 }
 }
 
-ResolutionTaskHolder@354 {
-    <name not found> = ArrayList@355[1] { ResolutionCandidate@356 }
-    <name not found> = ArrayList@357[1] { ResolutionCandidate@356 }
+ResolutionTaskHolder@352 {
+    <name not found> = ArrayList@353[1] { ResolutionCandidate@354 }
+}
+
+ResolutionTaskHolder@355 {
+    <name not found> = ArrayList@356[1] { ResolutionCandidate@357 }
 }
 
 ResolutionTaskHolder@358 {
     <name not found> = ArrayList@359[1] { ResolutionCandidate@360 }
-    <name not found> = ArrayList@361[1] { ResolutionCandidate@360 }
 }
 
-ResolutionTaskHolder@362 {
-    <name not found> = ArrayList@363[1] { ResolutionCandidate@364 }
-    <name not found> = ArrayList@365[1] { ResolutionCandidate@364 }
+ResolutionTaskHolder@361 {
+    <name not found> = ArrayList@362[1] { ResolutionCandidate@363 }
 }
 
-ResolutionTaskHolder@366 {
-    <name not found> = ArrayList@367[1] { ResolutionCandidate@368 }
-    <name not found> = ArrayList@369[1] { ResolutionCandidate@368 }
+ResolutionTaskHolder@364 {
+    <name not found> = ArrayList@365[1] { ResolutionCandidate@366 }
+}
+
+ResolutionTaskHolder@367 {
+    <name not found> = ArrayList@368[1] { ResolutionCandidate@369 }
 }
 
 ResolutionTaskHolder@370 {
     <name not found> = ArrayList@371[1] { ResolutionCandidate@372 }
-    <name not found> = ArrayList@373[1] { ResolutionCandidate@372 }
 }
 
-ResolutionTaskHolder@374 {
-    <name not found> = ArrayList@375[1] { ResolutionCandidate@376 }
-    <name not found> = ArrayList@377[1] { ResolutionCandidate@376 }
+ResolutionTaskHolder@373 {
+    <name not found> = ArrayList@374[1] { ResolutionCandidate@375 }
 }
 
-ResolutionTaskHolder@378 {
-    <name not found> = ArrayList@379[1] { ResolutionCandidate@380 }
-    <name not found> = ArrayList@381[1] { ResolutionCandidate@380 }
+ResolutionTaskHolder@376 {
+    <name not found> = ArrayList@377[1] { ResolutionCandidate@378 }
+}
+
+ResolutionTaskHolder@379 {
+    <name not found> = ArrayList@380[1] { ResolutionCandidate@381 }
 }
 
 ResolutionTaskHolder@382 {
     <name not found> = ArrayList@383[1] { ResolutionCandidate@384 }
-    <name not found> = ArrayList@385[1] { ResolutionCandidate@384 }
 }
 
-ResolutionTaskHolder@386 {
-    <name not found> = ArrayList@387[1] { ResolutionCandidate@388 }
-    <name not found> = ArrayList@389[1] { ResolutionCandidate@388 }
+ResolutionTaskHolder@385 {
+    <name not found> = ArrayList@386[1] { ResolutionCandidate@387 }
 }
 
-ResolutionTaskHolder@390 {
-    <name not found> = ArrayList@391[1] { ResolutionCandidate@392 }
-    <name not found> = ArrayList@393[1] { ResolutionCandidate@392 }
+ResolutionTaskHolder@388 {
+    <name not found> = ArrayList@389[1] { ResolutionCandidate@390 }
+}
+
+ResolutionTaskHolder@391 {
+    <name not found> = ArrayList@392[1] { ResolutionCandidate@393 }
 }
 
 ResolutionTaskHolder@394 {
     <name not found> = ArrayList@395[1] { ResolutionCandidate@396 }
-    <name not found> = ArrayList@397[1] { ResolutionCandidate@396 }
 }
 
-ResolutionTaskHolder@398 {
-    <name not found> = ArrayList@399[1] { ResolutionCandidate@400 }
-    <name not found> = ArrayList@401[1] { ResolutionCandidate@400 }
+ResolutionTaskHolder@397 {
+    <name not found> = ArrayList@398[1] { ResolutionCandidate@399 }
 }
 
-ResolutionTaskHolder@402 {
-    <name not found> = ArrayList@403[1] { ResolutionCandidate@404 }
-    <name not found> = ArrayList@405[1] { ResolutionCandidate@404 }
+ResolutionTaskHolder@400 {
+    <name not found> = ArrayList@401[1] { ResolutionCandidate@402 }
+}
+
+ResolutionTaskHolder@403 {
+    <name not found> = ArrayList@404[1] { ResolutionCandidate@405 }
 }
 
 ResolutionTaskHolder@406 {
     <name not found> = ArrayList@407[1] { ResolutionCandidate@408 }
-    <name not found> = ArrayList@409[1] { ResolutionCandidate@408 }
 }
 
-ResolutionTaskHolder@410 {
-    <name not found> = ArrayList@411[1] { ResolutionCandidate@412 }
-    <name not found> = ArrayList@413[1] { ResolutionCandidate@412 }
+ResolutionTaskHolder@409 {
+    <name not found> = ArrayList@410[1] { ResolutionCandidate@411 }
 }
 
-ResolutionTaskHolder@414 {
-    <name not found> = ArrayList@415[1] { ResolutionCandidate@416 }
-    <name not found> = ArrayList@417[1] { ResolutionCandidate@416 }
+ResolutionTaskHolder@412 {
+    <name not found> = ArrayList@413[1] { ResolutionCandidate@414 }
+}
+
+ResolutionTaskHolder@415 {
+    <name not found> = ArrayList@416[1] { ResolutionCandidate@417 }
 }
 
 ResolutionTaskHolder@418 {
     <name not found> = ArrayList@419[1] { ResolutionCandidate@420 }
-    <name not found> = ArrayList@421[1] { ResolutionCandidate@420 }
 }
 
-ResolutionTaskHolder@422 {
-    <name not found> = ArrayList@423[1] { ResolutionCandidate@424 }
-    <name not found> = ArrayList@425[1] { ResolutionCandidate@424 }
+ResolutionTaskHolder@421 {
+    <name not found> = ArrayList@422[1] { ResolutionCandidate@423 }
 }
 
-ResolutionTaskHolder@426 {
-    <name not found> = ArrayList@427[1] { ResolutionCandidate@428 }
-    <name not found> = ArrayList@429[1] { ResolutionCandidate@428 }
+ResolutionTaskHolder@424 {
+    <name not found> = ArrayList@425[1] { ResolutionCandidate@426 }
+}
+
+ResolutionTaskHolder@427 {
+    <name not found> = ArrayList@428[1] { ResolutionCandidate@429 }
 }
 
 ResolutionTaskHolder@430 {
     <name not found> = ArrayList@431[1] { ResolutionCandidate@432 }
-    <name not found> = ArrayList@433[1] { ResolutionCandidate@432 }
 }
 
-ResolutionTaskHolder@434 {
-    <name not found> = ArrayList@435[1] { ResolutionCandidate@436 }
-    <name not found> = ArrayList@437[1] { ResolutionCandidate@436 }
+ResolutionTaskHolder@433 {
+    <name not found> = ArrayList@434[1] { ResolutionCandidate@435 }
 }
 
-ResolutionTaskHolder@438 {
-    <name not found> = ArrayList@439[1] { ResolutionCandidate@440 }
-    <name not found> = ArrayList@441[1] { ResolutionCandidate@440 }
+ResolutionTaskHolder@436 {
+    <name not found> = ArrayList@437[1] { ResolutionCandidate@438 }
+}
+
+ResolutionTaskHolder@439 {
+    <name not found> = ArrayList@440[1] { ResolutionCandidate@441 }
 }
 
 ResolutionTaskHolder@442 {
     <name not found> = ArrayList@443[1] { ResolutionCandidate@444 }
-    <name not found> = ArrayList@445[1] { ResolutionCandidate@444 }
 }
 
-ResolutionTaskHolder@446 {
-    <name not found> = ArrayList@447[1] { ResolutionCandidate@448 }
-    <name not found> = ArrayList@449[1] { ResolutionCandidate@448 }
+ResolutionTaskHolder@445 {
+    <name not found> = ArrayList@446[1] { ResolutionCandidate@447 }
 }
 
-ResolutionTaskHolder@450 {
-    <name not found> = ArrayList@451[1] { ResolutionCandidate@452 }
-    <name not found> = ArrayList@453[1] { ResolutionCandidate@452 }
+ResolutionTaskHolder@448 {
+    <name not found> = ArrayList@449[1] { ResolutionCandidate@450 }
+}
+
+ResolutionTaskHolder@451 {
+    <name not found> = ArrayList@452[1] { ResolutionCandidate@453 }
 }
 
 ResolutionTaskHolder@454 {
     <name not found> = ArrayList@455[1] { ResolutionCandidate@456 }
-    <name not found> = ArrayList@457[1] { ResolutionCandidate@456 }
 }
 
-ResolutionTaskHolder@458 {
-    <name not found> = ArrayList@459[1] { ResolutionCandidate@460 }
-    <name not found> = ArrayList@461[1] { ResolutionCandidate@460 }
+ResolutionTaskHolder@457 {
+    <name not found> = ArrayList@458[1] { ResolutionCandidate@459 }
 }
 
-ResolutionTaskHolder@462 {
-    <name not found> = ArrayList@463[1] { ResolutionCandidate@464 }
-    <name not found> = ArrayList@465[1] { ResolutionCandidate@464 }
+ResolutionTaskHolder@460 {
+    <name not found> = ArrayList@461[1] { ResolutionCandidate@462 }
+}
+
+ResolutionTaskHolder@463 {
+    <name not found> = ArrayList@464[1] { ResolutionCandidate@465 }
 }
 
 ResolutionTaskHolder@466 {
     <name not found> = ArrayList@467[1] { ResolutionCandidate@468 }
-    <name not found> = ArrayList@469[1] { ResolutionCandidate@468 }
 }
 
-ResolutionTaskHolder@470 {
-    <name not found> = ArrayList@471[1] { ResolutionCandidate@472 }
-    <name not found> = ArrayList@473[1] { ResolutionCandidate@472 }
+ResolutionTaskHolder@469 {
+    <name not found> = ArrayList@470[1] { ResolutionCandidate@471 }
 }
 
-ResolutionTaskHolder@474 {
-    <name not found> = ArrayList@475[1] { ResolutionCandidate@476 }
-    <name not found> = ArrayList@477[1] { ResolutionCandidate@476 }
+ResolutionTaskHolder@472 {
+    <name not found> = ArrayList@473[1] { ResolutionCandidate@474 }
+}
+
+ResolutionTaskHolder@475 {
+    <name not found> = ArrayList@476[1] { ResolutionCandidate@477 }
 }
 
 ResolutionTaskHolder@478 {
     <name not found> = ArrayList@479[1] { ResolutionCandidate@480 }
-    <name not found> = ArrayList@481[1] { ResolutionCandidate@480 }
 }
 
-ResolutionTaskHolder@482 {
-    <name not found> = ArrayList@483[1] { ResolutionCandidate@484 }
-    <name not found> = ArrayList@485[1] { ResolutionCandidate@484 }
+ResolutionTaskHolder@481 {
+    <name not found> = ArrayList@482[1] { ResolutionCandidate@483 }
 }
 
-ResolutionTaskHolder@486 {
-    <name not found> = ArrayList@487[1] { ResolutionCandidate@488 }
-    <name not found> = ArrayList@489[1] { ResolutionCandidate@488 }
+ResolutionTaskHolder@484 {
+    <name not found> = ArrayList@485[1] { ResolutionCandidate@486 }
+}
+
+ResolutionTaskHolder@487 {
+    <name not found> = ArrayList@488[1] { ResolutionCandidate@489 }
 }
 
 ResolutionTaskHolder@490 {
     <name not found> = ArrayList@491[1] { ResolutionCandidate@492 }
-    <name not found> = ArrayList@493[1] { ResolutionCandidate@492 }
 }
 
-ResolutionTaskHolder@494 {
-    <name not found> = ArrayList@495[1] { ResolutionCandidate@496 }
-    <name not found> = ArrayList@497[1] { ResolutionCandidate@496 }
+ResolutionTaskHolder@493 {
+    <name not found> = ArrayList@494[1] { ResolutionCandidate@495 }
 }
 
-ResolutionTaskHolder@498 {
-    <name not found> = ArrayList@499[1] { ResolutionCandidate@500 }
-    <name not found> = ArrayList@501[1] { ResolutionCandidate@500 }
+ResolutionTaskHolder@496 {
+    <name not found> = ArrayList@497[1] { ResolutionCandidate@498 }
+}
+
+ResolutionTaskHolder@499 {
+    <name not found> = ArrayList@500[1] { ResolutionCandidate@501 }
 }
 
 ResolutionTaskHolder@502 {
     <name not found> = ArrayList@503[1] { ResolutionCandidate@504 }
-    <name not found> = ArrayList@505[1] { ResolutionCandidate@504 }
 }
 
-ResolutionTaskHolder@506 {
-    <name not found> = ArrayList@507[1] { ResolutionCandidate@508 }
-    <name not found> = ArrayList@509[1] { ResolutionCandidate@508 }
+ResolutionTaskHolder@505 {
+    <name not found> = ArrayList@506[1] { ResolutionCandidate@507 }
 }
 
-ResolutionTaskHolder@510 {
-    <name not found> = ArrayList@511[1] { ResolutionCandidate@512 }
-    <name not found> = ArrayList@513[1] { ResolutionCandidate@512 }
+ResolutionTaskHolder@508 {
+    <name not found> = ArrayList@509[1] { ResolutionCandidate@510 }
+}
+
+ResolutionTaskHolder@511 {
+    <name not found> = ArrayList@512[1] { ResolutionCandidate@513 }
 }
 
 ResolutionTaskHolder@514 {
     <name not found> = ArrayList@515[1] { ResolutionCandidate@516 }
-    <name not found> = ArrayList@517[1] { ResolutionCandidate@516 }
 }
 
-ResolutionTaskHolder@518 {
-    <name not found> = ArrayList@519[1] { ResolutionCandidate@520 }
-    <name not found> = ArrayList@521[1] { ResolutionCandidate@520 }
+ResolutionTaskHolder@517 {
+    <name not found> = ArrayList@518[1] { ResolutionCandidate@519 }
 }
 
-ResolutionTaskHolder@522 {
-    <name not found> = ArrayList@523[1] { ResolutionCandidate@524 }
-    <name not found> = ArrayList@525[1] { ResolutionCandidate@524 }
+ResolutionTaskHolder@520 {
+    <name not found> = ArrayList@521[1] { ResolutionCandidate@522 }
+}
+
+ResolutionTaskHolder@523 {
+    <name not found> = ArrayList@524[1] { ResolutionCandidate@525 }
 }
 
 ResolutionTaskHolder@526 {
     <name not found> = ArrayList@527[1] { ResolutionCandidate@528 }
-    <name not found> = ArrayList@529[1] { ResolutionCandidate@528 }
 }
 
-ResolutionTaskHolder@530 {
-    <name not found> = ArrayList@531[1] { ResolutionCandidate@532 }
-    <name not found> = ArrayList@533[1] { ResolutionCandidate@532 }
+ResolutionTaskHolder@529 {
+    <name not found> = ArrayList@530[1] { ResolutionCandidate@531 }
 }
 
-ResolutionTaskHolder@534 {
-    <name not found> = ArrayList@535[1] { ResolutionCandidate@536 }
-    <name not found> = ArrayList@537[1] { ResolutionCandidate@536 }
+ResolutionTaskHolder@532 {
+    <name not found> = ArrayList@533[1] { ResolutionCandidate@534 }
+}
+
+ResolutionTaskHolder@535 {
+    <name not found> = ArrayList@536[1] { ResolutionCandidate@537 }
 }
 
 ResolutionTaskHolder@538 {
     <name not found> = ArrayList@539[1] { ResolutionCandidate@540 }
-    <name not found> = ArrayList@541[1] { ResolutionCandidate@540 }
 }
 
-ResolutionTaskHolder@542 {
-    <name not found> = ArrayList@543[1] { ResolutionCandidate@544 }
-    <name not found> = ArrayList@545[1] { ResolutionCandidate@544 }
+ResolutionTaskHolder@541 {
+    <name not found> = ArrayList@542[1] { ResolutionCandidate@543 }
 }
 
-ResolutionTaskHolder@546 {
-    <name not found> = ArrayList@547[1] { ResolutionCandidate@548 }
-    <name not found> = ArrayList@549[1] { ResolutionCandidate@548 }
+ResolutionTaskHolder@544 {
+    <name not found> = ArrayList@545[1] { ResolutionCandidate@546 }
 }
 
-ResolutionTaskHolder@550 {
-    <name not found> = ArrayList@551[1] { ResolutionCandidate@552 }
-    <name not found> = ArrayList@553[1] { ResolutionCandidate@552 }
+ResolutionTaskHolder@547 {
+    <name not found> = ArrayList@548[2] { ResolutionCandidate@549, ResolutionCandidate@550 }
 }
 
-ResolutionTaskHolder@554 {
-    <name not found> = ArrayList@555[1] { ResolutionCandidate@556 }
-    <name not found> = ArrayList@557[1] { ResolutionCandidate@556 }
+ResolutionTaskHolder@551 {
+    <name not found> = ArrayList@552[2] { ResolutionCandidate@553, ResolutionCandidate@554 }
 }
 
-ResolutionTaskHolder@558 {
-    <name not found> = ArrayList@559[1] { ResolutionCandidate@560 }
-    <name not found> = ArrayList@561[1] { ResolutionCandidate@560 }
+ResolutionTaskHolder@555 {
+    <name not found> = ArrayList@556[2] { ResolutionCandidate@557, ResolutionCandidate@558 }
 }
 
-ResolutionTaskHolder@562 {
-    <name not found> = ArrayList@563[1] { ResolutionCandidate@564 }
-    <name not found> = ArrayList@565[1] { ResolutionCandidate@564 }
+ResolutionTaskHolder@559 {
+    <name not found> = ArrayList@560[2] { ResolutionCandidate@561, ResolutionCandidate@562 }
 }
 
-ResolutionTaskHolder@566 {
-    <name not found> = ArrayList@567[1] { ResolutionCandidate@568 }
-    <name not found> = ArrayList@569[1] { ResolutionCandidate@568 }
+ResolutionTaskHolder@563 {
+    <name not found> = ArrayList@564[2] { ResolutionCandidate@565, ResolutionCandidate@566 }
 }
 
-ResolutionTaskHolder@570 {
-    <name not found> = ArrayList@571[1] { ResolutionCandidate@572 }
-    <name not found> = ArrayList@573[1] { ResolutionCandidate@572 }
+ResolutionTaskHolder@567 {
+    <name not found> = ArrayList@568[2] { ResolutionCandidate@569, ResolutionCandidate@570 }
 }
 
-ResolutionTaskHolder@574 {
-    <name not found> = ArrayList@575[1] { ResolutionCandidate@576 }
-    <name not found> = ArrayList@577[1] { ResolutionCandidate@576 }
+ResolutionTaskHolder@571 {
+    <name not found> = ArrayList@572[2] { ResolutionCandidate@573, ResolutionCandidate@574 }
 }
 
-ResolutionTaskHolder@578 {
-    <name not found> = ArrayList@579[1] { ResolutionCandidate@580 }
-    <name not found> = ArrayList@581[1] { ResolutionCandidate@580 }
+ResolutionTaskHolder@575 {
+    <name not found> = ArrayList@576[2] { ResolutionCandidate@577, ResolutionCandidate@578 }
+}
+
+ResolutionTaskHolder@579 {
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+}
+
+ResolutionTaskHolder@580 {
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+}
+
+ResolutionTaskHolder@581 {
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
 }
 
 ResolutionTaskHolder@582 {
-    <name not found> = ArrayList@583[1] { ResolutionCandidate@584 }
-    <name not found> = ArrayList@585[1] { ResolutionCandidate@584 }
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+}
+
+ResolutionTaskHolder@583 {
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+}
+
+ResolutionTaskHolder@584 {
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+}
+
+ResolutionTaskHolder@585 {
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
 }
 
 ResolutionTaskHolder@586 {
-    <name not found> = ArrayList@587[1] { ResolutionCandidate@588 }
-    <name not found> = ArrayList@589[1] { ResolutionCandidate@588 }
-}
-
-ResolutionTaskHolder@590 {
-    <name not found> = ArrayList@591[1] { ResolutionCandidate@592 }
-    <name not found> = ArrayList@593[1] { ResolutionCandidate@592 }
-}
-
-ResolutionTaskHolder@594 {
-    <name not found> = ArrayList@595[1] { ResolutionCandidate@596 }
-    <name not found> = ArrayList@597[1] { ResolutionCandidate@596 }
-}
-
-ResolutionTaskHolder@598 {
-    <name not found> = ArrayList@599[1] { ResolutionCandidate@600 }
-    <name not found> = ArrayList@601[1] { ResolutionCandidate@600 }
-}
-
-ResolutionTaskHolder@602 {
-    <name not found> = ArrayList@603[1] { ResolutionCandidate@604 }
-    <name not found> = ArrayList@605[1] { ResolutionCandidate@604 }
-}
-
-ResolutionTaskHolder@606 {
-    <name not found> = ArrayList@607[1] { ResolutionCandidate@608 }
-    <name not found> = ArrayList@609[1] { ResolutionCandidate@608 }
-}
-
-ResolutionTaskHolder@610 {
-    <name not found> = ArrayList@611[1] { ResolutionCandidate@612 }
-    <name not found> = ArrayList@613[1] { ResolutionCandidate@612 }
-}
-
-ResolutionTaskHolder@614 {
-    <name not found> = ArrayList@615[1] { ResolutionCandidate@616 }
-    <name not found> = ArrayList@617[1] { ResolutionCandidate@616 }
-}
-
-ResolutionTaskHolder@618 {
-    <name not found> = ArrayList@619[1] { ResolutionCandidate@620 }
-    <name not found> = ArrayList@621[1] { ResolutionCandidate@620 }
-}
-
-ResolutionTaskHolder@622 {
-    <name not found> = ArrayList@623[1] { ResolutionCandidate@624 }
-    <name not found> = ArrayList@625[1] { ResolutionCandidate@624 }
-}
-
-ResolutionTaskHolder@626 {
-    <name not found> = ArrayList@627[1] { ResolutionCandidate@628 }
-    <name not found> = ArrayList@629[1] { ResolutionCandidate@628 }
-}
-
-ResolutionTaskHolder@630 {
-    <name not found> = ArrayList@631[1] { ResolutionCandidate@632 }
-    <name not found> = ArrayList@633[1] { ResolutionCandidate@632 }
-}
-
-ResolutionTaskHolder@634 {
-    <name not found> = ArrayList@635[1] { ResolutionCandidate@636 }
-    <name not found> = ArrayList@637[1] { ResolutionCandidate@636 }
-}
-
-ResolutionTaskHolder@638 {
-    <name not found> = ArrayList@639[1] { ResolutionCandidate@640 }
-    <name not found> = ArrayList@641[1] { ResolutionCandidate@640 }
-}
-
-ResolutionTaskHolder@642 {
-    <name not found> = ArrayList@643[1] { ResolutionCandidate@644 }
-    <name not found> = ArrayList@645[1] { ResolutionCandidate@644 }
-}
-
-ResolutionTaskHolder@646 {
-    <name not found> = ArrayList@647[1] { ResolutionCandidate@648 }
-    <name not found> = ArrayList@649[1] { ResolutionCandidate@648 }
-}
-
-ResolutionTaskHolder@650 {
-    <name not found> = ArrayList@651[1] { ResolutionCandidate@652 }
-    <name not found> = ArrayList@653[1] { ResolutionCandidate@652 }
-}
-
-ResolutionTaskHolder@654 {
-    <name not found> = ArrayList@655[1] { ResolutionCandidate@656 }
-    <name not found> = ArrayList@657[1] { ResolutionCandidate@656 }
-}
-
-ResolutionTaskHolder@658 {
-    <name not found> = ArrayList@659[1] { ResolutionCandidate@660 }
-    <name not found> = ArrayList@661[1] { ResolutionCandidate@660 }
-}
-
-ResolutionTaskHolder@662 {
-    <name not found> = ArrayList@663[1] { ResolutionCandidate@664 }
-    <name not found> = ArrayList@665[1] { ResolutionCandidate@664 }
-}
-
-ResolutionTaskHolder@666 {
-    <name not found> = ArrayList@667[1] { ResolutionCandidate@668 }
-    <name not found> = ArrayList@669[1] { ResolutionCandidate@668 }
-}
-
-ResolutionTaskHolder@670 {
-    <name not found> = ArrayList@671[1] { ResolutionCandidate@672 }
-    <name not found> = ArrayList@673[1] { ResolutionCandidate@672 }
-}
-
-ResolutionTaskHolder@674 {
-    <name not found> = ArrayList@675[1] { ResolutionCandidate@676 }
-    <name not found> = ArrayList@677[1] { ResolutionCandidate@676 }
-}
-
-ResolutionTaskHolder@678 {
-    <name not found> = ArrayList@679[1] { ResolutionCandidate@680 }
-    <name not found> = ArrayList@681[1] { ResolutionCandidate@680 }
-}
-
-ResolutionTaskHolder@682 {
-    <name not found> = ArrayList@683[1] { ResolutionCandidate@684 }
-    <name not found> = ArrayList@685[1] { ResolutionCandidate@684 }
-}
-
-ResolutionTaskHolder@686 {
-    <name not found> = ArrayList@687[1] { ResolutionCandidate@688 }
-    <name not found> = ArrayList@689[1] { ResolutionCandidate@688 }
-}
-
-ResolutionTaskHolder@690 {
-    <name not found> = ArrayList@691[1] { ResolutionCandidate@692 }
-    <name not found> = ArrayList@693[1] { ResolutionCandidate@692 }
-}
-
-ResolutionTaskHolder@694 {
-    <name not found> = ArrayList@695[1] { ResolutionCandidate@696 }
-    <name not found> = ArrayList@697[1] { ResolutionCandidate@696 }
-}
-
-ResolutionTaskHolder@698 {
-    <name not found> = ArrayList@699[2] { ResolutionCandidate@700, ResolutionCandidate@701 }
-    <name not found> = ArrayList@702[2] { ResolutionCandidate@700, ResolutionCandidate@701 }
-}
-
-ResolutionTaskHolder@703 {
-    <name not found> = ArrayList@704[2] { ResolutionCandidate@705, ResolutionCandidate@706 }
-    <name not found> = ArrayList@707[2] { ResolutionCandidate@705, ResolutionCandidate@706 }
-}
-
-ResolutionTaskHolder@708 {
-    <name not found> = ArrayList@709[2] { ResolutionCandidate@710, ResolutionCandidate@711 }
-    <name not found> = ArrayList@712[2] { ResolutionCandidate@710, ResolutionCandidate@711 }
-}
-
-ResolutionTaskHolder@713 {
-    <name not found> = ArrayList@714[2] { ResolutionCandidate@715, ResolutionCandidate@716 }
-    <name not found> = ArrayList@717[2] { ResolutionCandidate@715, ResolutionCandidate@716 }
-}
-
-ResolutionTaskHolder@718 {
-    <name not found> = ArrayList@719[2] { ResolutionCandidate@720, ResolutionCandidate@721 }
-    <name not found> = ArrayList@722[2] { ResolutionCandidate@720, ResolutionCandidate@721 }
-}
-
-ResolutionTaskHolder@723 {
-    <name not found> = ArrayList@724[2] { ResolutionCandidate@725, ResolutionCandidate@726 }
-    <name not found> = ArrayList@727[2] { ResolutionCandidate@725, ResolutionCandidate@726 }
-}
-
-ResolutionTaskHolder@728 {
-    <name not found> = ArrayList@729[2] { ResolutionCandidate@730, ResolutionCandidate@731 }
-    <name not found> = ArrayList@732[2] { ResolutionCandidate@730, ResolutionCandidate@731 }
-}
-
-ResolutionTaskHolder@733 {
-    <name not found> = ArrayList@734[2] { ResolutionCandidate@735, ResolutionCandidate@736 }
-    <name not found> = ArrayList@737[2] { ResolutionCandidate@735, ResolutionCandidate@736 }
-}
-
-ResolutionTaskHolder@738 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
@@ -930,13 +954,7 @@ ResolutionTaskHolder@738 {
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@739 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
+ResolutionTaskHolder@587 {
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
@@ -963,13 +981,7 @@ ResolutionTaskHolder@739 {
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@740 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
+ResolutionTaskHolder@588 {
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
@@ -996,13 +1008,7 @@ ResolutionTaskHolder@740 {
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@741 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
+ResolutionTaskHolder@589 {
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
@@ -1029,13 +1035,7 @@ ResolutionTaskHolder@741 {
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@742 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
+ResolutionTaskHolder@590 {
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
@@ -1062,13 +1062,7 @@ ResolutionTaskHolder@742 {
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@743 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
+ResolutionTaskHolder@591 {
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
@@ -1095,13 +1089,7 @@ ResolutionTaskHolder@743 {
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@744 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
+ResolutionTaskHolder@592 {
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
@@ -1128,13 +1116,7 @@ ResolutionTaskHolder@744 {
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@745 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
+ResolutionTaskHolder@593 {
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
@@ -1161,25 +1143,7 @@ ResolutionTaskHolder@745 {
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@746 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
+ResolutionTaskHolder@594 {
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
@@ -1194,25 +1158,7 @@ ResolutionTaskHolder@746 {
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@747 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
+ResolutionTaskHolder@595 {
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
@@ -1227,25 +1173,7 @@ ResolutionTaskHolder@747 {
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@748 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
+ResolutionTaskHolder@596 {
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
@@ -1260,25 +1188,7 @@ ResolutionTaskHolder@748 {
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@749 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
+ResolutionTaskHolder@597 {
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
@@ -1293,25 +1203,7 @@ ResolutionTaskHolder@749 {
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@750 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
+ResolutionTaskHolder@598 {
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
@@ -1326,13 +1218,7 @@ ResolutionTaskHolder@750 {
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@751 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
+ResolutionTaskHolder@599 {
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
@@ -1345,6 +1231,9 @@ ResolutionTaskHolder@751 {
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
+}
+
+ResolutionTaskHolder@600 {
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
@@ -1359,13 +1248,7 @@ ResolutionTaskHolder@751 {
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@752 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
+ResolutionTaskHolder@601 {
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
@@ -1378,6 +1261,9 @@ ResolutionTaskHolder@752 {
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
+}
+
+ResolutionTaskHolder@602 {
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
@@ -1392,10 +1278,7 @@ ResolutionTaskHolder@752 {
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@753 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
+ResolutionTaskHolder@603 {
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
@@ -1410,10 +1293,7 @@ ResolutionTaskHolder@753 {
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@754 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
+ResolutionTaskHolder@604 {
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
@@ -1428,10 +1308,7 @@ ResolutionTaskHolder@754 {
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@755 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
+ResolutionTaskHolder@605 {
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
@@ -1446,10 +1323,7 @@ ResolutionTaskHolder@755 {
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@756 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
+ResolutionTaskHolder@606 {
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
@@ -1464,10 +1338,7 @@ ResolutionTaskHolder@756 {
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@757 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
+ResolutionTaskHolder@607 {
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
@@ -1482,10 +1353,7 @@ ResolutionTaskHolder@757 {
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@758 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
+ResolutionTaskHolder@608 {
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
@@ -1500,7 +1368,166 @@ ResolutionTaskHolder@758 {
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@759 {
+null {
+    <name not found> = ArrayList@609[1] { ResolutionCandidate@294 }
+    <name not found> = ArrayList@610[1] { ResolutionCandidate@207 }
+    <name not found> = ArrayList@611[1] { ResolutionCandidate@240 }
+    <name not found> = ArrayList@612[1] { ResolutionCandidate@156 }
+    <name not found> = ArrayList@613[1] { ResolutionCandidate@336 }
+    <name not found> = ArrayList@614[1] { ResolutionCandidate@435 }
+    <name not found> = ArrayList@615[1] { ResolutionCandidate@192 }
+    <name not found> = ArrayList@616[1] { ResolutionCandidate@366 }
+    <name not found> = ArrayList@617[1] { ResolutionCandidate@135 }
+    <name not found> = ArrayList@618[1] { ResolutionCandidate@381 }
+    <name not found> = ArrayList@619[1] { ResolutionCandidate@453 }
+    <name not found> = ArrayList@620[1] { ResolutionCandidate@387 }
+    <name not found> = ArrayList@621[1] { ResolutionCandidate@282 }
+    <name not found> = ArrayList@622[1] { ResolutionCandidate@414 }
+    <name not found> = ArrayList@623[1] { ResolutionCandidate@285 }
+    <name not found> = ArrayList@624[1] { ResolutionCandidate@402 }
+    <name not found> = ArrayList@625[1] { ResolutionCandidate@288 }
+    <name not found> = ArrayList@626[1] { ResolutionCandidate@216 }
+    <name not found> = ArrayList@627[1] { ResolutionCandidate@375 }
+    <name not found> = ArrayList@628[1] { ResolutionCandidate@438 }
+    <name not found> = ArrayList@629[1] { ResolutionCandidate@540 }
+    <name not found> = ArrayList@630[1] { ResolutionCandidate@180 }
+    <name not found> = ArrayList@631[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@632[1] { ResolutionCandidate@522 }
+    <name not found> = ArrayList@633[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@634[1] { ResolutionCandidate@483 }
+    <name not found> = ArrayList@635[1] { ResolutionCandidate@504 }
+    <name not found> = ArrayList@636[1] { ResolutionCandidate@519 }
+    <name not found> = ArrayList@637[1] { ResolutionCandidate@342 }
+    <name not found> = ArrayList@638[1] { ResolutionCandidate@474 }
+    <name not found> = ArrayList@639[1] { ResolutionCandidate@513 }
+    <name not found> = ArrayList@640[1] { ResolutionCandidate@396 }
+    <name not found> = ArrayList@641[1] { ResolutionCandidate@444 }
+    <name not found> = ArrayList@642[1] { ResolutionCandidate@159 }
+    <name not found> = ArrayList@643[1] { ResolutionCandidate@357 }
+    <name not found> = ArrayList@644[1] { ResolutionCandidate@498 }
+    <name not found> = ArrayList@645[1] { ResolutionCandidate@417 }
+    <name not found> = ArrayList@646[1] { ResolutionCandidate@345 }
+    <name not found> = ArrayList@647[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@648[1] { ResolutionCandidate@165 }
+    <name not found> = ArrayList@649[1] { ResolutionCandidate@324 }
+    <name not found> = ArrayList@650[1] { ResolutionCandidate@510 }
+    <name not found> = ArrayList@651[1] { ResolutionCandidate@213 }
+    <name not found> = ArrayList@652[1] { ResolutionCandidate@279 }
+    <name not found> = ArrayList@653[1] { ResolutionCandidate@126 }
+    <name not found> = ArrayList@654[1] { ResolutionCandidate@306 }
+    <name not found> = ArrayList@655[1] { ResolutionCandidate@258 }
+    <name not found> = ArrayList@656[1] { ResolutionCandidate@183 }
+    <name not found> = ArrayList@657[1] { ResolutionCandidate@201 }
+    <name not found> = ArrayList@658[1] { ResolutionCandidate@360 }
+    <name not found> = ArrayList@659[1] { ResolutionCandidate@276 }
+    <name not found> = ArrayList@660[1] { ResolutionCandidate@468 }
+    <name not found> = ArrayList@661[1] { ResolutionCandidate@339 }
+    <name not found> = ArrayList@662[1] { ResolutionCandidate@543 }
+    <name not found> = ArrayList@663[1] { ResolutionCandidate@198 }
+    <name not found> = ArrayList@664[1] { ResolutionCandidate@534 }
+    <name not found> = ArrayList@665[1] { ResolutionCandidate@369 }
+    <name not found> = ArrayList@666[1] { ResolutionCandidate@432 }
+    <name not found> = ArrayList@667[1] { ResolutionCandidate@318 }
+    <name not found> = ArrayList@668[1] { ResolutionCandidate@372 }
+    <name not found> = ArrayList@669[1] { ResolutionCandidate@378 }
+    <name not found> = ArrayList@670[1] { ResolutionCandidate@348 }
+    <name not found> = ArrayList@671[1] { ResolutionCandidate@300 }
+    <name not found> = ArrayList@672[1] { ResolutionCandidate@423 }
+    <name not found> = ArrayList@673[1] { ResolutionCandidate@390 }
+    <name not found> = ArrayList@674[1] { ResolutionCandidate@222 }
+    <name not found> = ArrayList@675[1] { ResolutionCandidate@462 }
+    <name not found> = ArrayList@676[1] { ResolutionCandidate@480 }
+    <name not found> = ArrayList@677[1] { ResolutionCandidate@420 }
+    <name not found> = ArrayList@678[1] { ResolutionCandidate@261 }
+    <name not found> = ArrayList@679[1] { ResolutionCandidate@516 }
+    <name not found> = ArrayList@680[1] { ResolutionCandidate@327 }
+    <name not found> = ArrayList@681[1] { ResolutionCandidate@546 }
+    <name not found> = ArrayList@682[1] { ResolutionCandidate@399 }
+    <name not found> = ArrayList@683[1] { ResolutionCandidate@465 }
+    <name not found> = ArrayList@684[1] { ResolutionCandidate@177 }
+    <name not found> = ArrayList@685[1] { ResolutionCandidate@486 }
+    <name not found> = ArrayList@686[1] { ResolutionCandidate@234 }
+    <name not found> = ArrayList@687[1] { ResolutionCandidate@171 }
+    <name not found> = ArrayList@688[1] { ResolutionCandidate@354 }
+    <name not found> = ArrayList@689[1] { ResolutionCandidate@249 }
+    <name not found> = ArrayList@690[1] { ResolutionCandidate@204 }
+    <name not found> = ArrayList@691[1] { ResolutionCandidate@333 }
+    <name not found> = ArrayList@692[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@693[1] { ResolutionCandidate@447 }
+    <name not found> = ArrayList@694[1] { ResolutionCandidate@441 }
+    <name not found> = ArrayList@695[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@696[1] { ResolutionCandidate@141 }
+    <name not found> = ArrayList@697[1] { ResolutionCandidate@189 }
+    <name not found> = ArrayList@698[1] { ResolutionCandidate@219 }
+    <name not found> = ArrayList@699[1] { ResolutionCandidate@243 }
+    <name not found> = ArrayList@700[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@701[1] { ResolutionCandidate@531 }
+    <name not found> = ArrayList@702[1] { ResolutionCandidate@525 }
+    <name not found> = ArrayList@703[1] { ResolutionCandidate@507 }
+    <name not found> = ArrayList@704[1] { ResolutionCandidate@228 }
+    <name not found> = ArrayList@705[1] { ResolutionCandidate@255 }
+    <name not found> = ArrayList@706[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@707[1] { ResolutionCandidate@195 }
+    <name not found> = ArrayList@708[1] { ResolutionCandidate@363 }
+    <name not found> = ArrayList@709[1] { ResolutionCandidate@426 }
+    <name not found> = ArrayList@710[1] { ResolutionCandidate@312 }
+    <name not found> = ArrayList@711[1] { ResolutionCandidate@528 }
+    <name not found> = ArrayList@712[1] { ResolutionCandidate@210 }
+    <name not found> = ArrayList@713[1] { ResolutionCandidate@147 }
+    <name not found> = ArrayList@714[1] { ResolutionCandidate@429 }
+    <name not found> = ArrayList@715[1] { ResolutionCandidate@477 }
+    <name not found> = ArrayList@716[1] { ResolutionCandidate@252 }
+    <name not found> = ArrayList@717[1] { ResolutionCandidate@153 }
+    <name not found> = ArrayList@718[1] { ResolutionCandidate@330 }
+    <name not found> = ArrayList@719[1] { ResolutionCandidate@537 }
+    <name not found> = ArrayList@720[1] { ResolutionCandidate@129 }
+    <name not found> = ArrayList@721[1] { ResolutionCandidate@246 }
+    <name not found> = ArrayList@722[1] { ResolutionCandidate@393 }
+    <name not found> = ArrayList@723[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@724[1] { ResolutionCandidate@267 }
+    <name not found> = ArrayList@725[1] { ResolutionCandidate@471 }
+    <name not found> = ArrayList@726[1] { ResolutionCandidate@132 }
+    <name not found> = ArrayList@727[1] { ResolutionCandidate@501 }
+    <name not found> = ArrayList@728[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@729[1] { ResolutionCandidate@408 }
+    <name not found> = ArrayList@730[1] { ResolutionCandidate@237 }
+    <name not found> = ArrayList@731[1] { ResolutionCandidate@303 }
+    <name not found> = ArrayList@732[1] { ResolutionCandidate@264 }
+    <name not found> = ArrayList@733[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@734[1] { ResolutionCandidate@273 }
+    <name not found> = ArrayList@735[1] { ResolutionCandidate@174 }
+    <name not found> = ArrayList@736[1] { ResolutionCandidate@309 }
+    <name not found> = ArrayList@737[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@738[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@739[1] { ResolutionCandidate@489 }
+    <name not found> = ArrayList@740[1] { ResolutionCandidate@321 }
+    <name not found> = ArrayList@741[1] { ResolutionCandidate@225 }
+    <name not found> = ArrayList@742[1] { ResolutionCandidate@270 }
+    <name not found> = ArrayList@743[1] { ResolutionCandidate@186 }
+    <name not found> = ArrayList@744[1] { ResolutionCandidate@231 }
+    <name not found> = ArrayList@745[1] { ResolutionCandidate@351 }
+    <name not found> = ArrayList@746[1] { ResolutionCandidate@291 }
+    <name not found> = ArrayList@747[1] { ResolutionCandidate@492 }
+    <name not found> = ArrayList@748[1] { ResolutionCandidate@168 }
+    <name not found> = ArrayList@749[1] { ResolutionCandidate@384 }
+    <name not found> = ArrayList@750[1] { ResolutionCandidate@411 }
+    <name not found> = ArrayList@751[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@752[1] { ResolutionCandidate@297 }
+    <name not found> = ArrayList@753[1] { ResolutionCandidate@405 }
+    <name not found> = ArrayList@754[1] { ResolutionCandidate@456 }
+    <name not found> = ArrayList@755[1] { ResolutionCandidate@315 }
+    <name not found> = ArrayList@756[1] { ResolutionCandidate@495 }
+    <name not found> = ArrayList@757[1] { ResolutionCandidate@450 }
+    <name not found> = ArrayList@758[1] { ResolutionCandidate@162 }
+    <name not found> = ArrayList@759[1] { ResolutionCandidate@459 }
+    <name not found> = ArrayList@760[2] { ResolutionCandidate@561, ResolutionCandidate@562 }
+    <name not found> = ArrayList@761[2] { ResolutionCandidate@549, ResolutionCandidate@550 }
+    <name not found> = ArrayList@762[2] { ResolutionCandidate@553, ResolutionCandidate@554 }
+    <name not found> = ArrayList@763[2] { ResolutionCandidate@577, ResolutionCandidate@578 }
+    <name not found> = ArrayList@764[2] { ResolutionCandidate@565, ResolutionCandidate@566 }
+    <name not found> = ArrayList@765[2] { ResolutionCandidate@557, ResolutionCandidate@558 }
+    <name not found> = ArrayList@766[2] { ResolutionCandidate@573, ResolutionCandidate@574 }
+    <name not found> = ArrayList@767[2] { ResolutionCandidate@569, ResolutionCandidate@570 }
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
@@ -1516,9 +1543,6 @@ ResolutionTaskHolder@759 {
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@760 {
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
@@ -1534,9 +1558,6 @@ ResolutionTaskHolder@760 {
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@761 {
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
@@ -1552,9 +1573,6 @@ ResolutionTaskHolder@761 {
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@762 {
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
@@ -1570,9 +1588,6 @@ ResolutionTaskHolder@762 {
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@763 {
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
@@ -1588,9 +1603,6 @@ ResolutionTaskHolder@763 {
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@764 {
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
@@ -1606,9 +1618,6 @@ ResolutionTaskHolder@764 {
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@765 {
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
@@ -1624,9 +1633,6 @@ ResolutionTaskHolder@765 {
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@766 {
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
@@ -1642,9 +1648,6 @@ ResolutionTaskHolder@766 {
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@767 {
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
diff --git a/compiler/testData/diagnostics/tests/library/kt828.lazy.log b/compiler/testData/diagnostics/tests/library/kt828.lazy.log
index 9120b1b9a26..02f4ed7148b 100644
--- a/compiler/testData/diagnostics/tests/library/kt828.lazy.log
+++ b/compiler/testData/diagnostics/tests/library/kt828.lazy.log
@@ -23,95 +23,98 @@ LazyJavaPackageFragment@5['java'] {
 
 ResolutionTaskHolder@21 {
     <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@23 }
 }
 
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
+ResolutionTaskHolder@24 {
+    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+ResolutionTaskHolder@27 {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
+}
+
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
 }
 
 ResolutionTaskHolder@33 {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+}
+
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
 }
 
 ResolutionTaskHolder@45 {
     <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
+}
+
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
 }
 
 ResolutionTaskHolder@57 {
     <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
+}
+
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
 }
 
 ResolutionTaskHolder@69 {
     <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
 }
 
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
+null {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@23 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@26 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@35 }
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/collectionMethodStub.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/collectionMethodStub.lazy.log
index d81db424d0b..d2afbc46bbf 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/collectionMethodStub.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/collectionMethodStub.lazy.log
@@ -56,14 +56,14 @@ LazyJavaClassifierType@30['String'] {
 
 LazyJavaClassifierType@33['String'] {
     arguments = ArrayList@34[empty]
-    classifier = JavaClassImpl@32['String']
+    classifier = JavaClassImpl@27['String']
     nullable = 'true': Boolean@35
     typeConstructor = DeserializedClassTypeConstructor@29
 }
 
 LazyJavaClassifierType@36['String'] {
     arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@27['String']
+    classifier = JavaClassImpl@32['String']
     nullable = 'true': Boolean@35
     typeConstructor = DeserializedClassTypeConstructor@29
 }
@@ -154,15 +154,6 @@ LazyJavaPackageFragment@62['lang'] {
 
 ResolutionTaskHolder@90 {
     <name not found> = ArrayList@91[4] { ResolutionCandidate@92, ResolutionCandidate@93, ResolutionCandidate@94, ... }
-    <name not found> = ArrayList@95[4] { ResolutionCandidate@92, ResolutionCandidate@93, ResolutionCandidate@94, ... }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
@@ -173,17 +164,8 @@ ResolutionTaskHolder@90 {
     <name not found> = EmptyList@82[empty]
 }
 
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[4] { ResolutionCandidate@98, ResolutionCandidate@99, ResolutionCandidate@100, ... }
-    <name not found> = ArrayList@101[4] { ResolutionCandidate@98, ResolutionCandidate@99, ResolutionCandidate@100, ... }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[4] { ResolutionCandidate@97, ResolutionCandidate@98, ResolutionCandidate@99, ... }
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
@@ -194,9 +176,30 @@ ResolutionTaskHolder@96 {
     <name not found> = EmptyList@82[empty]
 }
 
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[4] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
-    <name not found> = ArrayList@107[4] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[4] { ResolutionCandidate@102, ResolutionCandidate@103, ResolutionCandidate@104, ... }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+}
+
+null {
+    <name not found> = ArrayList@105[4] { ResolutionCandidate@97, ResolutionCandidate@98, ResolutionCandidate@99, ... }
+    <name not found> = ArrayList@106[4] { ResolutionCandidate@102, ResolutionCandidate@103, ResolutionCandidate@104, ... }
+    <name not found> = ArrayList@107[4] { ResolutionCandidate@92, ResolutionCandidate@93, ResolutionCandidate@94, ... }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/differentGenericArguments.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/differentGenericArguments.lazy.log
index 8876b315ada..b35a0fe0ef6 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/differentGenericArguments.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/differentGenericArguments.lazy.log
@@ -52,7 +52,7 @@ LazyJavaPackageFragment@20['<root>'] {
     memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@45
 }
 
-LazyJavaPackageFragment@35['<root>'] {
+LazyJavaPackageFragment@2['<root>'] {
     classes('M1': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@52
     classes('foo': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@52
     classes('p': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@52
@@ -63,7 +63,7 @@ LazyJavaPackageFragment@35['<root>'] {
     memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@52
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@35['<root>'] {
     classes('M1': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@54
     classes('foo': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@54
     classes('p': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@54
@@ -81,14 +81,14 @@ LazyJavaPackageFragment@37['java'] {
     memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@57
 }
 
-LazyJavaPackageFragment@23['java'] {
+LazyJavaPackageFragment@6['java'] {
     classes('lang': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@61
     deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@61
     functions('lang': Name@62) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@61
     memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@61
 }
 
-LazyJavaPackageFragment@6['java'] {
+LazyJavaPackageFragment@23['java'] {
     classes('lang': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@65
     deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@65
     functions('lang': Name@66) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@65
@@ -126,10 +126,6 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@75 {
     <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
@@ -147,17 +143,8 @@ ResolutionTaskHolder@75 {
     <name not found> = EmptyList@49[empty]
 }
 
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
@@ -168,16 +155,32 @@ ResolutionTaskHolder@79 {
     <name not found> = EmptyList@49[empty]
 }
 
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
 }
 
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
+}
+
+null {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@77 }
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/differentGenericArgumentsReversed.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/differentGenericArgumentsReversed.lazy.log
index 0281ef558ea..db8a5dfebdb 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/differentGenericArgumentsReversed.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/differentGenericArgumentsReversed.lazy.log
@@ -41,7 +41,7 @@ LazyJavaPackageFragmentProvider@34 {
     packageFragments('p': FqName@43) = null
 }
 
-LazyJavaPackageFragment@35['<root>'] {
+LazyJavaPackageFragment@21['<root>'] {
     classes('M1': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
     classes('foo': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@45
     classes('p': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@45
@@ -52,7 +52,7 @@ LazyJavaPackageFragment@35['<root>'] {
     memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@45
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@35['<root>'] {
     classes('M1': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@52
     classes('foo': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@52
     classes('p': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@52
@@ -63,7 +63,7 @@ LazyJavaPackageFragment@2['<root>'] {
     memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@52
 }
 
-LazyJavaPackageFragment@21['<root>'] {
+LazyJavaPackageFragment@2['<root>'] {
     classes('M1': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@54
     classes('foo': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@54
     classes('p': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@54
@@ -81,14 +81,14 @@ LazyJavaPackageFragment@37['java'] {
     memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@57
 }
 
-LazyJavaPackageFragment@6['java'] {
+LazyJavaPackageFragment@24['java'] {
     classes('lang': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@61
     deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@61
     functions('lang': Name@62) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@61
     memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@61
 }
 
-LazyJavaPackageFragment@24['java'] {
+LazyJavaPackageFragment@6['java'] {
     classes('lang': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@65
     deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@65
     functions('lang': Name@66) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@65
@@ -106,7 +106,7 @@ LazyJavaPackageFragment@8['lang'] {
     memberIndex = computeMemberIndex$1@70 // through LazyPackageFragmentScopeForJavaPackage@69
 }
 
-LazyJavaPackageFragment@26['lang'] {
+LazyJavaPackageFragment@39['lang'] {
     classes('M1': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@71
     classes('foo': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@71
     deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@71
@@ -115,7 +115,7 @@ LazyJavaPackageFragment@26['lang'] {
     memberIndex = computeMemberIndex$1@72 // through LazyPackageFragmentScopeForJavaPackage@71
 }
 
-LazyJavaPackageFragment@39['lang'] {
+LazyJavaPackageFragment@26['lang'] {
     classes('M1': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@73
     classes('foo': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@73
     deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@73
@@ -126,10 +126,6 @@ LazyJavaPackageFragment@39['lang'] {
 
 ResolutionTaskHolder@75 {
     <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
@@ -147,17 +143,8 @@ ResolutionTaskHolder@75 {
     <name not found> = EmptyList@49[empty]
 }
 
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
@@ -168,16 +155,32 @@ ResolutionTaskHolder@79 {
     <name not found> = EmptyList@49[empty]
 }
 
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
 }
 
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
+}
+
+null {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@77 }
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateClass.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateClass.lazy.log
index 43a7a7a2bbd..541aaf45013 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateClass.lazy.log
@@ -53,7 +53,7 @@ LazyJavaPackageFragment@5['<root>'] {
     memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@44
 }
 
-LazyJavaPackageFragment@34['<root>'] {
+LazyJavaPackageFragment@20['<root>'] {
     classes('B': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@51
     classes('foo': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@51
     classes('p': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@51
@@ -64,7 +64,7 @@ LazyJavaPackageFragment@34['<root>'] {
     memberIndex = computeMemberIndex$1@52 // through LazyPackageFragmentScopeForJavaPackage@51
 }
 
-LazyJavaPackageFragment@20['<root>'] {
+LazyJavaPackageFragment@34['<root>'] {
     classes('B': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@53
     classes('foo': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@53
     classes('p': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@53
@@ -75,7 +75,7 @@ LazyJavaPackageFragment@20['<root>'] {
     memberIndex = computeMemberIndex$1@54 // through LazyPackageFragmentScopeForJavaPackage@53
 }
 
-LazyJavaPackageFragment@23['java'] {
+LazyJavaPackageFragment@8['java'] {
     classes('lang': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@56
     deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@56
     functions('lang': Name@57) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@56
@@ -89,7 +89,7 @@ LazyJavaPackageFragment@36['java'] {
     memberIndex = computeMemberIndex$1@62 // through LazyPackageFragmentScopeForJavaPackage@60
 }
 
-LazyJavaPackageFragment@8['java'] {
+LazyJavaPackageFragment@23['java'] {
     classes('lang': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@64
     deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@64
     functions('lang': Name@65) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@64
@@ -107,7 +107,7 @@ LazyJavaPackageFragment@10['lang'] {
     memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@68
 }
 
-LazyJavaPackageFragment@25['lang'] {
+LazyJavaPackageFragment@38['lang'] {
     classes('B': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@70
     classes('foo': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@70
     deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@70
@@ -116,7 +116,7 @@ LazyJavaPackageFragment@25['lang'] {
     memberIndex = computeMemberIndex$1@71 // through LazyPackageFragmentScopeForJavaPackage@70
 }
 
-LazyJavaPackageFragment@38['lang'] {
+LazyJavaPackageFragment@25['lang'] {
     classes('B': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@72
     classes('foo': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@72
     deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@72
@@ -127,15 +127,6 @@ LazyJavaPackageFragment@38['lang'] {
 
 ResolutionTaskHolder@74 {
     <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
@@ -146,40 +137,52 @@ ResolutionTaskHolder@74 {
     <name not found> = EmptyList@48[empty]
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
 }
 
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
 }
 
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
+}
+
 ResolutionTaskHolder@86 {
     <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[8] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
 }
 
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[8] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102, ... }
-    <name not found> = ArrayList@103[8] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102, ... }
+null {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@103[8] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateNestedClasses.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateNestedClasses.lazy.log
index af68d91af2d..0217f37b180 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateNestedClasses.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateNestedClasses.lazy.log
@@ -48,7 +48,7 @@ LazyJavaPackageFragmentProvider@34 {
     packageFragments('p.M1': FqName@18) = null
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@20['<root>'] {
     classes('M1': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
     classes('a': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@45
     classes('b': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@45
@@ -92,7 +92,7 @@ LazyJavaPackageFragment@35['<root>'] {
     memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@58
 }
 
-LazyJavaPackageFragment@20['<root>'] {
+LazyJavaPackageFragment@2['<root>'] {
     classes('M1': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@60
     classes('a': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@60
     classes('b': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@60
@@ -196,15 +196,6 @@ LazyJavaPackageFragment@39['lang'] {
 
 ResolutionTaskHolder@81 {
     <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
@@ -215,17 +206,8 @@ ResolutionTaskHolder@81 {
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
@@ -236,13 +218,16 @@ ResolutionTaskHolder@85 {
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
@@ -251,236 +236,254 @@ ResolutionTaskHolder@89 {
 
 ResolutionTaskHolder@93 {
     <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
 
 ResolutionTaskHolder@105 {
     <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
+ResolutionTaskHolder@111 {
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
 
 ResolutionTaskHolder@117 {
     <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@120 {
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@127 }
+ResolutionTaskHolder@123 {
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@126 {
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
 
 ResolutionTaskHolder@129 {
     <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@131 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@135 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@132 {
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@139 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@135 {
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
     <name not found> = EmptyList@55[empty]
 }
 
+ResolutionTaskHolder@138 {
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
+}
+
 ResolutionTaskHolder@141 {
     <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@143 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@147 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@144 {
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
 }
 
-ResolutionTaskHolder@149 {
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@151 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@147 {
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
+}
+
+ResolutionTaskHolder@150 {
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
 }
 
 ResolutionTaskHolder@153 {
     <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@155 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@159 }
+ResolutionTaskHolder@156 {
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
 }
 
-ResolutionTaskHolder@161 {
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@163 }
+ResolutionTaskHolder@159 {
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
+}
+
+ResolutionTaskHolder@162 {
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
 }
 
 ResolutionTaskHolder@165 {
     <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@167 }
 }
 
-ResolutionTaskHolder@169 {
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@171 }
+ResolutionTaskHolder@168 {
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
 }
 
-ResolutionTaskHolder@173 {
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@175 }
+ResolutionTaskHolder@171 {
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
+}
+
+ResolutionTaskHolder@174 {
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
 }
 
 ResolutionTaskHolder@177 {
     <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@179 }
 }
 
-ResolutionTaskHolder@181 {
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@183 }
+ResolutionTaskHolder@180 {
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
 }
 
-ResolutionTaskHolder@185 {
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@187 }
+ResolutionTaskHolder@183 {
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@189 {
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@191 }
-}
-
-ResolutionTaskHolder@193 {
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@195 }
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@195 }
-}
-
-ResolutionTaskHolder@197 {
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@199 }
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@199 }
-}
-
-ResolutionTaskHolder@201 {
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@203 }
-}
-
-ResolutionTaskHolder@205 {
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@207 }
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@207 }
-}
-
-ResolutionTaskHolder@209 {
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@211 }
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@211 }
-}
-
-ResolutionTaskHolder@213 {
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@215 }
-}
-
-ResolutionTaskHolder@217 {
+null {
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@134 }
+    <name not found> = ArrayList@189[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@131 }
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@192[1] { ResolutionCandidate@137 }
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@194[1] { ResolutionCandidate@170 }
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@196[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@197[1] { ResolutionCandidate@146 }
+    <name not found> = ArrayList@198[1] { ResolutionCandidate@143 }
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@200[1] { ResolutionCandidate@164 }
+    <name not found> = ArrayList@201[1] { ResolutionCandidate@179 }
+    <name not found> = ArrayList@202[1] { ResolutionCandidate@122 }
+    <name not found> = ArrayList@203[1] { ResolutionCandidate@149 }
+    <name not found> = ArrayList@204[1] { ResolutionCandidate@152 }
+    <name not found> = ArrayList@205[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@206[1] { ResolutionCandidate@182 }
+    <name not found> = ArrayList@207[1] { ResolutionCandidate@173 }
+    <name not found> = ArrayList@208[1] { ResolutionCandidate@125 }
+    <name not found> = ArrayList@209[1] { ResolutionCandidate@167 }
+    <name not found> = ArrayList@210[1] { ResolutionCandidate@140 }
+    <name not found> = ArrayList@211[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@212[1] { ResolutionCandidate@155 }
+    <name not found> = ArrayList@213[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@214[1] { ResolutionCandidate@128 }
+    <name not found> = ArrayList@215[1] { ResolutionCandidate@176 }
+    <name not found> = ArrayList@216[1] { ResolutionCandidate@161 }
+    <name not found> = ArrayList@217[1] { ResolutionCandidate@113 }
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateSuperClass.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateSuperClass.lazy.log
index d323c627c60..44c0d490763 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateSuperClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateSuperClass.lazy.log
@@ -41,7 +41,7 @@ LazyJavaPackageFragmentProvider@34 {
     packageFragments('p': FqName@43) = null
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@35['<root>'] {
     classes('M1': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
     classes('foo': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@45
     classes('p': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@45
@@ -52,7 +52,7 @@ LazyJavaPackageFragment@2['<root>'] {
     memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@45
 }
 
-LazyJavaPackageFragment@35['<root>'] {
+LazyJavaPackageFragment@2['<root>'] {
     classes('M1': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@52
     classes('foo': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@52
     classes('p': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@52
@@ -106,7 +106,7 @@ LazyJavaPackageFragment@8['lang'] {
     memberIndex = computeMemberIndex$1@70 // through LazyPackageFragmentScopeForJavaPackage@69
 }
 
-LazyJavaPackageFragment@26['lang'] {
+LazyJavaPackageFragment@39['lang'] {
     classes('M1': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@71
     classes('foo': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@71
     deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@71
@@ -115,7 +115,7 @@ LazyJavaPackageFragment@26['lang'] {
     memberIndex = computeMemberIndex$1@72 // through LazyPackageFragmentScopeForJavaPackage@71
 }
 
-LazyJavaPackageFragment@39['lang'] {
+LazyJavaPackageFragment@26['lang'] {
     classes('M1': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@73
     classes('foo': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@73
     deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@73
@@ -126,15 +126,6 @@ LazyJavaPackageFragment@39['lang'] {
 
 ResolutionTaskHolder@75 {
     <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
@@ -145,25 +136,37 @@ ResolutionTaskHolder@75 {
     <name not found> = EmptyList@49[empty]
 }
 
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
 }
 
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
 }
 
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
+}
+
+null {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@83 }
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericArgumentNumberMismatch.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericArgumentNumberMismatch.lazy.log
index 1e462aed01d..ccb5903ff18 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericArgumentNumberMismatch.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericArgumentNumberMismatch.lazy.log
@@ -45,7 +45,7 @@ LazyJavaPackageFragmentProvider@38 {
     packageFragments('p': FqName@47) = null
 }
 
-LazyJavaPackageFragment@39['<root>'] {
+LazyJavaPackageFragment@21['<root>'] {
     classes('M1': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@49
     classes('foo': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@49
     classes('p': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@49
@@ -56,7 +56,7 @@ LazyJavaPackageFragment@39['<root>'] {
     memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@49
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@39['<root>'] {
     classes('M1': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@56
     classes('foo': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@56
     classes('p': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@56
@@ -67,7 +67,7 @@ LazyJavaPackageFragment@2['<root>'] {
     memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@56
 }
 
-LazyJavaPackageFragment@21['<root>'] {
+LazyJavaPackageFragment@2['<root>'] {
     classes('M1': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@58
     classes('foo': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@58
     classes('p': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@58
@@ -78,7 +78,7 @@ LazyJavaPackageFragment@21['<root>'] {
     memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@58
 }
 
-LazyJavaPackageFragment@25['java'] {
+LazyJavaPackageFragment@6['java'] {
     classes('lang': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@61
     deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@61
     functions('lang': Name@62) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@61
@@ -92,7 +92,7 @@ LazyJavaPackageFragment@41['java'] {
     memberIndex = computeMemberIndex$1@67 // through LazyPackageFragmentScopeForJavaPackage@65
 }
 
-LazyJavaPackageFragment@6['java'] {
+LazyJavaPackageFragment@25['java'] {
     classes('lang': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@69
     deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@69
     functions('lang': Name@70) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@69
@@ -110,7 +110,7 @@ LazyJavaPackageFragment@8['lang'] {
     memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@73
 }
 
-LazyJavaPackageFragment@27['lang'] {
+LazyJavaPackageFragment@43['lang'] {
     classes('M1': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@75
     classes('foo': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@75
     deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@75
@@ -119,7 +119,7 @@ LazyJavaPackageFragment@27['lang'] {
     memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@75
 }
 
-LazyJavaPackageFragment@43['lang'] {
+LazyJavaPackageFragment@27['lang'] {
     classes('M1': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@77
     classes('foo': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@77
     deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@77
@@ -130,15 +130,6 @@ LazyJavaPackageFragment@43['lang'] {
 
 ResolutionTaskHolder@79 {
     <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
@@ -149,34 +140,46 @@ ResolutionTaskHolder@79 {
     <name not found> = EmptyList@53[empty]
 }
 
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
 }
 
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
+}
+
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
 }
 
 ResolutionTaskHolder@91 {
     <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
 }
 
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
+null {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@90 }
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericSuperClass.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericSuperClass.lazy.log
index a29df972954..632af4e9e20 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericSuperClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericSuperClass.lazy.log
@@ -146,7 +146,7 @@ LazyJavaPackageFragment@11['lang'] {
     memberIndex = computeMemberIndex$1@96 // through LazyPackageFragmentScopeForJavaPackage@95
 }
 
-LazyJavaPackageFragment@41['lang'] {
+LazyJavaPackageFragment@63['lang'] {
     classes('M1': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@97
     classes('a': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@97
     classes('c': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@97
@@ -159,7 +159,7 @@ LazyJavaPackageFragment@41['lang'] {
     memberIndex = computeMemberIndex$1@98 // through LazyPackageFragmentScopeForJavaPackage@97
 }
 
-LazyJavaPackageFragment@63['lang'] {
+LazyJavaPackageFragment@41['lang'] {
     classes('M1': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@99
     classes('a': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@99
     classes('c': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@99
@@ -174,10 +174,6 @@ LazyJavaPackageFragment@63['lang'] {
 
 ResolutionTaskHolder@101 {
     <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
@@ -195,12 +191,8 @@ ResolutionTaskHolder@101 {
     <name not found> = EmptyList@75[empty]
 }
 
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
@@ -218,15 +210,8 @@ ResolutionTaskHolder@105 {
     <name not found> = EmptyList@75[empty]
 }
 
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
@@ -235,57 +220,75 @@ ResolutionTaskHolder@109 {
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
+}
+
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
 }
 
 ResolutionTaskHolder@113 {
     <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
 }
 
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
 }
 
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
+ResolutionTaskHolder@119 {
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
 }
 
+ResolutionTaskHolder@122 {
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
+}
+
 ResolutionTaskHolder@125 {
     <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@127 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
 }
 
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@131 }
+ResolutionTaskHolder@128 {
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
 }
 
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@135 }
-}
-
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@139 }
+null {
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@127 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@124 }
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@118 }
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/inTheSameModuleWithUsage.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/inTheSameModuleWithUsage.lazy.log
index f90b22c2a02..5b2dc4ae06b 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/inTheSameModuleWithUsage.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/inTheSameModuleWithUsage.lazy.log
@@ -59,15 +59,6 @@ LazyJavaPackageFragment@22['lang'] {
 
 ResolutionTaskHolder@46 {
     <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
@@ -78,26 +69,38 @@ ResolutionTaskHolder@46 {
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
 }
 
 ResolutionTaskHolder@58 {
     <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
+null {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@54 }
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/inTheSameModuleWithUsageNoTypeAnnotation.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/inTheSameModuleWithUsageNoTypeAnnotation.lazy.log
index 5f2926ecb00..587d6831572 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/inTheSameModuleWithUsageNoTypeAnnotation.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/inTheSameModuleWithUsageNoTypeAnnotation.lazy.log
@@ -24,14 +24,14 @@ LazyJavaPackageFragmentProvider@16 {
     packageFragments('p.A': FqName@26) = null
 }
 
-LazyJavaPackageFragment@19['java'] {
+LazyJavaPackageFragment@5['java'] {
     classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
     deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@28
     functions('lang': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@28
     memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@28
 }
 
-LazyJavaPackageFragment@5['java'] {
+LazyJavaPackageFragment@19['java'] {
     classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
     deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@34
     functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
@@ -60,15 +60,6 @@ LazyJavaPackageFragment@21['lang'] {
 
 ResolutionTaskHolder@44 {
     <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
@@ -79,32 +70,21 @@ ResolutionTaskHolder@44 {
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
+}
+
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
 }
 
 ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
@@ -131,7 +111,30 @@ ResolutionTaskHolder@60 {
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@61 {
+ResolutionTaskHolder@57 {
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+}
+
+null {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@55 }
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/members.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/members.lazy.log
index e92d62ead87..bd2602d34ef 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/members.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/members.lazy.log
@@ -42,7 +42,7 @@ LazyJavaPackageFragmentProvider@31 {
     packageFragments('p.A': FqName@44) = null
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@32['<root>'] {
     classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@46
     classes('M1': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@46
     classes('M2': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@46
@@ -54,7 +54,7 @@ LazyJavaPackageFragment@2['<root>'] {
     memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@46
 }
 
-LazyJavaPackageFragment@32['<root>'] {
+LazyJavaPackageFragment@17['<root>'] {
     classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@54
     classes('M1': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@54
     classes('M2': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@54
@@ -66,7 +66,7 @@ LazyJavaPackageFragment@32['<root>'] {
     memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@54
 }
 
-LazyJavaPackageFragment@17['<root>'] {
+LazyJavaPackageFragment@2['<root>'] {
     classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@56
     classes('M1': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@56
     classes('M2': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@56
@@ -132,15 +132,6 @@ LazyJavaPackageFragment@37['lang'] {
 
 ResolutionTaskHolder@78 {
     <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
@@ -151,17 +142,8 @@ ResolutionTaskHolder@78 {
     <name not found> = EmptyList@51[empty]
 }
 
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
@@ -172,50 +154,71 @@ ResolutionTaskHolder@82 {
     <name not found> = EmptyList@51[empty]
 }
 
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
+}
+
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
 }
 
 ResolutionTaskHolder@90 {
     <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
 }
 
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
+}
+
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
 }
 
 ResolutionTaskHolder@102 {
     <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
 }
 
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
 }
 
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
+null {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@101 }
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameClassNameDifferentPackages.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameClassNameDifferentPackages.lazy.log
index 3345dd289b0..664c9846f96 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameClassNameDifferentPackages.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameClassNameDifferentPackages.lazy.log
@@ -45,14 +45,14 @@ LazyJavaPackageFragment@17['<root>'] {
     memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
 }
 
-LazyJavaPackageFragment@20['java'] {
+LazyJavaPackageFragment@5['java'] {
     classes('lang': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
     deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@40
     functions('lang': Name@41) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
     memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@40
 }
 
-LazyJavaPackageFragment@5['java'] {
+LazyJavaPackageFragment@20['java'] {
     classes('lang': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@44
     deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@44
     functions('lang': Name@45) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@44
@@ -77,15 +77,6 @@ LazyJavaPackageFragment@22['lang'] {
 
 ResolutionTaskHolder@52 {
     <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
@@ -96,16 +87,28 @@ ResolutionTaskHolder@52 {
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
+}
+
+null {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@60 }
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameGenericArguments.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameGenericArguments.lazy.log
index 817af33ae8c..98fdf6bae31 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameGenericArguments.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameGenericArguments.lazy.log
@@ -45,7 +45,7 @@ LazyJavaPackageFragmentProvider@38 {
     packageFragments('p': FqName@47) = null
 }
 
-LazyJavaPackageFragment@21['<root>'] {
+LazyJavaPackageFragment@2['<root>'] {
     classes('M1': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@49
     classes('foo': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@49
     classes('p': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@49
@@ -56,7 +56,7 @@ LazyJavaPackageFragment@21['<root>'] {
     memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@49
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@39['<root>'] {
     classes('M1': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@56
     classes('foo': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@56
     classes('p': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@56
@@ -67,7 +67,7 @@ LazyJavaPackageFragment@2['<root>'] {
     memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@56
 }
 
-LazyJavaPackageFragment@39['<root>'] {
+LazyJavaPackageFragment@21['<root>'] {
     classes('M1': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@58
     classes('foo': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@58
     classes('p': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@58
@@ -130,15 +130,6 @@ LazyJavaPackageFragment@27['lang'] {
 
 ResolutionTaskHolder@79 {
     <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
@@ -149,25 +140,37 @@ ResolutionTaskHolder@79 {
     <name not found> = EmptyList@53[empty]
 }
 
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
 }
 
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
 }
 
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
+}
+
+null {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@84 }
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParams.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParams.lazy.log
index 2de4d794b55..029e1b8b265 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParams.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParams.lazy.log
@@ -95,7 +95,7 @@ LazyJavaPackageFragmentProvider@57 {
     packageFragments('p.X': FqName@45) = null
 }
 
-LazyJavaPackageFragment@28['<root>'] {
+LazyJavaPackageFragment@2['<root>'] {
     classes('B': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@73
     classes('C': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@73
     classes('String': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@73
@@ -105,7 +105,7 @@ LazyJavaPackageFragment@28['<root>'] {
     memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@73
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@28['<root>'] {
     classes('B': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@81
     classes('C': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@81
     classes('String': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@81
@@ -125,14 +125,14 @@ LazyJavaPackageFragment@47['<root>'] {
     memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@83
 }
 
-LazyJavaPackageFragment@32['java'] {
+LazyJavaPackageFragment@8['java'] {
     classes('lang': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@86
     deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@86
     functions('lang': Name@87) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@86
     memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@86
 }
 
-LazyJavaPackageFragment@8['java'] {
+LazyJavaPackageFragment@32['java'] {
     classes('lang': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@90
     deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@90
     functions('lang': Name@91) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@90
@@ -155,15 +155,18 @@ LazyJavaPackageFragment@61['java'] {
 
 ResolutionTaskHolder@101 {
     <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
 }
 
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
 }
 
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[3] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113 }
-    <name not found> = ArrayList@114[3] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113 }
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[3] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111 }
+}
+
+null {
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@114[3] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111 }
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsBoundMismatch.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsBoundMismatch.lazy.log
index c110206ae0d..09e728f0854 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsBoundMismatch.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsBoundMismatch.lazy.log
@@ -95,7 +95,7 @@ LazyJavaPackageFragmentProvider@61 {
     packageFragments('p.X': FqName@49) = null
 }
 
-LazyJavaPackageFragment@51['<root>'] {
+LazyJavaPackageFragment@2['<root>'] {
     classes('B': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@77
     classes('C': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@77
     classes('Tr': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@77
@@ -105,7 +105,7 @@ LazyJavaPackageFragment@51['<root>'] {
     memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@77
 }
 
-LazyJavaPackageFragment@28['<root>'] {
+LazyJavaPackageFragment@51['<root>'] {
     classes('B': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@85
     classes('C': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@85
     classes('Tr': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@85
@@ -115,7 +115,7 @@ LazyJavaPackageFragment@28['<root>'] {
     memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@85
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@28['<root>'] {
     classes('B': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@87
     classes('C': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@87
     classes('Tr': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@87
@@ -125,28 +125,28 @@ LazyJavaPackageFragment@2['<root>'] {
     memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@87
 }
 
-LazyJavaPackageFragment@8['java'] {
+LazyJavaPackageFragment@33['java'] {
     classes('lang': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@90
     deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@90
     functions('lang': Name@91) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@90
     memberIndex = computeMemberIndex$1@92 // through LazyPackageFragmentScopeForJavaPackage@90
 }
 
-LazyJavaPackageFragment@53['java'] {
+LazyJavaPackageFragment@65['java'] {
     classes('lang': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@94
     deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@94
     functions('lang': Name@95) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@94
     memberIndex = computeMemberIndex$1@96 // through LazyPackageFragmentScopeForJavaPackage@94
 }
 
-LazyJavaPackageFragment@65['java'] {
+LazyJavaPackageFragment@53['java'] {
     classes('lang': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@98
     deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@98
     functions('lang': Name@99) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@98
     memberIndex = computeMemberIndex$1@100 // through LazyPackageFragmentScopeForJavaPackage@98
 }
 
-LazyJavaPackageFragment@33['java'] {
+LazyJavaPackageFragment@8['java'] {
     classes('lang': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@102
     deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@102
     functions('lang': Name@103) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@102
@@ -155,15 +155,18 @@ LazyJavaPackageFragment@33['java'] {
 
 ResolutionTaskHolder@105 {
     <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
 }
 
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
 }
 
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[3] { ResolutionCandidate@115, ResolutionCandidate@116, ResolutionCandidate@117 }
-    <name not found> = ArrayList@118[3] { ResolutionCandidate@115, ResolutionCandidate@116, ResolutionCandidate@117 }
+ResolutionTaskHolder@111 {
+    <name not found> = ArrayList@112[3] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115 }
+}
+
+null {
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@118[3] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115 }
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsIndexMismatch.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsIndexMismatch.lazy.log
index 2f69ec0a2c9..5c660c7107b 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsIndexMismatch.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsIndexMismatch.lazy.log
@@ -115,7 +115,7 @@ LazyJavaPackageFragmentProvider@65 {
     packageFragments('p._': FqName@53) = null
 }
 
-LazyJavaPackageFragment@55['<root>'] {
+LazyJavaPackageFragment@2['<root>'] {
     classes('B': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@81
     classes('C': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@81
     classes('p': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@81
@@ -124,7 +124,7 @@ LazyJavaPackageFragment@55['<root>'] {
     memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@81
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@55['<root>'] {
     classes('B': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@88
     classes('C': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@88
     classes('p': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@88
@@ -142,28 +142,28 @@ LazyJavaPackageFragment@32['<root>'] {
     memberIndex = computeMemberIndex$1@91 // through LazyPackageFragmentScopeForJavaPackage@90
 }
 
-LazyJavaPackageFragment@9['java'] {
+LazyJavaPackageFragment@37['java'] {
     classes('lang': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@93
     deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@93
     functions('lang': Name@94) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@93
     memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@93
 }
 
-LazyJavaPackageFragment@57['java'] {
+LazyJavaPackageFragment@69['java'] {
     classes('lang': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@97
     deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@97
     functions('lang': Name@98) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@97
     memberIndex = computeMemberIndex$1@99 // through LazyPackageFragmentScopeForJavaPackage@97
 }
 
-LazyJavaPackageFragment@69['java'] {
+LazyJavaPackageFragment@9['java'] {
     classes('lang': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@101
     deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@101
     functions('lang': Name@102) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@101
     memberIndex = computeMemberIndex$1@103 // through LazyPackageFragmentScopeForJavaPackage@101
 }
 
-LazyJavaPackageFragment@37['java'] {
+LazyJavaPackageFragment@57['java'] {
     classes('lang': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@105
     deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@105
     functions('lang': Name@106) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@105
@@ -172,15 +172,18 @@ LazyJavaPackageFragment@37['java'] {
 
 ResolutionTaskHolder@108 {
     <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
 }
 
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
+ResolutionTaskHolder@111 {
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
 }
 
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[3] { ResolutionCandidate@118, ResolutionCandidate@119, ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[3] { ResolutionCandidate@118, ResolutionCandidate@119, ResolutionCandidate@120 }
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[3] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118 }
+}
+
+null {
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@113 }
+    <name not found> = ArrayList@121[3] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118 }
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsNameMismatch.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsNameMismatch.lazy.log
index d869cf1c8f6..57cd315ab04 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsNameMismatch.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsNameMismatch.lazy.log
@@ -95,7 +95,7 @@ LazyJavaPackageFragmentProvider@57 {
     packageFragments('p.X': FqName@45) = null
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@47['<root>'] {
     classes('B': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@73
     classes('C': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@73
     classes('p': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@73
@@ -104,7 +104,7 @@ LazyJavaPackageFragment@2['<root>'] {
     memberIndex = computeMemberIndex$1@79 // through LazyPackageFragmentScopeForJavaPackage@73
 }
 
-LazyJavaPackageFragment@47['<root>'] {
+LazyJavaPackageFragment@28['<root>'] {
     classes('B': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@80
     classes('C': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@80
     classes('p': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@80
@@ -113,7 +113,7 @@ LazyJavaPackageFragment@47['<root>'] {
     memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@80
 }
 
-LazyJavaPackageFragment@28['<root>'] {
+LazyJavaPackageFragment@2['<root>'] {
     classes('B': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@82
     classes('C': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@82
     classes('p': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@82
@@ -122,14 +122,14 @@ LazyJavaPackageFragment@28['<root>'] {
     memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@82
 }
 
-LazyJavaPackageFragment@61['java'] {
+LazyJavaPackageFragment@32['java'] {
     classes('lang': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@85
     deserializedPackageScope = Empty@76 // through LazyPackageFragmentScopeForJavaPackage@85
     functions('lang': Name@86) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@85
     memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@85
 }
 
-LazyJavaPackageFragment@49['java'] {
+LazyJavaPackageFragment@61['java'] {
     classes('lang': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@89
     deserializedPackageScope = Empty@76 // through LazyPackageFragmentScopeForJavaPackage@89
     functions('lang': Name@90) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@89
@@ -143,7 +143,7 @@ LazyJavaPackageFragment@8['java'] {
     memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@93
 }
 
-LazyJavaPackageFragment@32['java'] {
+LazyJavaPackageFragment@49['java'] {
     classes('lang': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@97
     deserializedPackageScope = Empty@76 // through LazyPackageFragmentScopeForJavaPackage@97
     functions('lang': Name@98) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@97
@@ -152,20 +152,23 @@ LazyJavaPackageFragment@32['java'] {
 
 ResolutionTaskHolder@100 {
     <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
 }
 
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
 }
 
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[3] { ResolutionCandidate@114, ResolutionCandidate@115, ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[3] { ResolutionCandidate@114, ResolutionCandidate@115, ResolutionCandidate@116 }
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[3] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113 }
+}
+
+null {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@117[3] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113 }
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInReturnType.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInReturnType.lazy.log
index 8e711a5b02e..f28e7d0b15d 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInReturnType.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInReturnType.lazy.log
@@ -95,7 +95,7 @@ LazyJavaPackageFragmentProvider@57 {
     packageFragments('p.X': FqName@45) = null
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@47['<root>'] {
     classes('B': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@73
     classes('C': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@73
     classes('String': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@73
@@ -115,7 +115,7 @@ LazyJavaPackageFragment@28['<root>'] {
     memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@81
 }
 
-LazyJavaPackageFragment@47['<root>'] {
+LazyJavaPackageFragment@2['<root>'] {
     classes('B': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@83
     classes('C': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@83
     classes('String': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@83
@@ -132,21 +132,21 @@ LazyJavaPackageFragment@49['java'] {
     memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@86
 }
 
-LazyJavaPackageFragment@32['java'] {
+LazyJavaPackageFragment@61['java'] {
     classes('lang': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@90
     deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@90
     functions('lang': Name@91) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@90
     memberIndex = computeMemberIndex$1@92 // through LazyPackageFragmentScopeForJavaPackage@90
 }
 
-LazyJavaPackageFragment@8['java'] {
+LazyJavaPackageFragment@32['java'] {
     classes('lang': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@94
     deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@94
     functions('lang': Name@95) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@94
     memberIndex = computeMemberIndex$1@96 // through LazyPackageFragmentScopeForJavaPackage@94
 }
 
-LazyJavaPackageFragment@61['java'] {
+LazyJavaPackageFragment@8['java'] {
     classes('lang': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@98
     deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@98
     functions('lang': Name@99) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@98
@@ -155,15 +155,18 @@ LazyJavaPackageFragment@61['java'] {
 
 ResolutionTaskHolder@101 {
     <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
 }
 
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
 }
 
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[3] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113 }
-    <name not found> = ArrayList@114[3] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113 }
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[3] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111 }
+}
+
+null {
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@114[3] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111 }
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classVsFunctionGenericsInParamsMismatch.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classVsFunctionGenericsInParamsMismatch.lazy.log
index 2813272e590..fe8651f7cde 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classVsFunctionGenericsInParamsMismatch.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classVsFunctionGenericsInParamsMismatch.lazy.log
@@ -95,7 +95,7 @@ LazyJavaPackageFragmentProvider@69 {
     packageFragments('p.C': FqName@66) = null
 }
 
-LazyJavaPackageFragment@70['<root>'] {
+LazyJavaPackageFragment@47['<root>'] {
     classes('B': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@81
     classes('C': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@81
     classes('p': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@81
@@ -104,7 +104,7 @@ LazyJavaPackageFragment@70['<root>'] {
     memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@81
 }
 
-LazyJavaPackageFragment@47['<root>'] {
+LazyJavaPackageFragment@2['<root>'] {
     classes('B': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@88
     classes('C': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@88
     classes('p': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@88
@@ -113,7 +113,7 @@ LazyJavaPackageFragment@47['<root>'] {
     memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@88
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@70['<root>'] {
     classes('B': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@90
     classes('C': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@90
     classes('p': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@90
@@ -122,7 +122,7 @@ LazyJavaPackageFragment@2['<root>'] {
     memberIndex = computeMemberIndex$1@91 // through LazyPackageFragmentScopeForJavaPackage@90
 }
 
-LazyJavaPackageFragment@8['java'] {
+LazyJavaPackageFragment@72['java'] {
     classes('lang': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@93
     deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@93
     functions('lang': Name@94) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@93
@@ -136,14 +136,14 @@ LazyJavaPackageFragment@32['java'] {
     memberIndex = computeMemberIndex$1@99 // through LazyPackageFragmentScopeForJavaPackage@97
 }
 
-LazyJavaPackageFragment@52['java'] {
+LazyJavaPackageFragment@8['java'] {
     classes('lang': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@101
     deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@101
     functions('lang': Name@102) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@101
     memberIndex = computeMemberIndex$1@103 // through LazyPackageFragmentScopeForJavaPackage@101
 }
 
-LazyJavaPackageFragment@72['java'] {
+LazyJavaPackageFragment@52['java'] {
     classes('lang': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@105
     deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@105
     functions('lang': Name@106) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@105
@@ -152,35 +152,38 @@ LazyJavaPackageFragment@72['java'] {
 
 ResolutionTaskHolder@108 {
     <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
 }
 
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
+ResolutionTaskHolder@111 {
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
 }
 
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
+}
+
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
 }
 
 ResolutionTaskHolder@120 {
     <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
 }
 
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@126 }
+ResolutionTaskHolder@123 {
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
 }
 
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
+ResolutionTaskHolder@126 {
+    <name not found> = ArrayList@127[3] { ResolutionCandidate@128, ResolutionCandidate@129, ResolutionCandidate@130 }
 }
 
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[3] { ResolutionCandidate@134, ResolutionCandidate@135, ResolutionCandidate@136 }
-    <name not found> = ArrayList@137[3] { ResolutionCandidate@134, ResolutionCandidate@135, ResolutionCandidate@136 }
+null {
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@122 }
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@125 }
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@113 }
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@137[3] { ResolutionCandidate@128, ResolutionCandidate@129, ResolutionCandidate@130 }
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/covariantReturnTypes.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/covariantReturnTypes.lazy.log
index 47fb03383cc..fb00c69056f 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/covariantReturnTypes.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/covariantReturnTypes.lazy.log
@@ -22,38 +22,38 @@ LazyJavaPackageFragmentProvider@0 {
 
 LazyJavaPackageFragmentProvider@23 {
     packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@24['<root>']
-    packageFragments('B': FqName@4) = null
+    packageFragments('B': FqName@25) = null
     packageFragments('C': FqName@5) = null
-    packageFragments('java': FqName@25) = LazyJavaPackageFragment@26['java']
-    packageFragments('java.lang': FqName@27) = LazyJavaPackageFragment@28['lang']
-    packageFragments('java.lang.B': FqName@11) = null
+    packageFragments('java': FqName@26) = LazyJavaPackageFragment@27['java']
+    packageFragments('java.lang': FqName@28) = LazyJavaPackageFragment@29['lang']
+    packageFragments('java.lang.B': FqName@30) = null
     packageFragments('java.lang.C': FqName@12) = null
-    packageFragments('kotlin': FqName@29) = null
-    packageFragments('kotlin.B': FqName@15) = null
+    packageFragments('kotlin': FqName@31) = null
+    packageFragments('kotlin.B': FqName@32) = null
     packageFragments('kotlin.C': FqName@16) = null
-    packageFragments('kotlin.io': FqName@30) = null
-    packageFragments('kotlin.jvm': FqName@31) = null
-    packageFragments('p': FqName@32) = null
-    packageFragments('p.B': FqName@33) = null
-    packageFragments('p.C': FqName@22) = null
+    packageFragments('kotlin.io': FqName@33) = null
+    packageFragments('kotlin.jvm': FqName@34) = null
+    packageFragments('p': FqName@35) = null
+    packageFragments('p.B': FqName@36) = null
+    packageFragments('p.C': FqName@37) = null
 }
 
-LazyJavaPackageFragmentProvider@34 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@35['<root>']
-    packageFragments('B': FqName@36) = null
+LazyJavaPackageFragmentProvider@38 {
+    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@39['<root>']
+    packageFragments('B': FqName@4) = null
     packageFragments('C': FqName@5) = null
-    packageFragments('java': FqName@37) = LazyJavaPackageFragment@38['java']
-    packageFragments('java.lang': FqName@39) = LazyJavaPackageFragment@40['lang']
-    packageFragments('java.lang.B': FqName@41) = null
+    packageFragments('java': FqName@40) = LazyJavaPackageFragment@41['java']
+    packageFragments('java.lang': FqName@42) = LazyJavaPackageFragment@43['lang']
+    packageFragments('java.lang.B': FqName@11) = null
     packageFragments('java.lang.C': FqName@12) = null
-    packageFragments('kotlin': FqName@42) = null
-    packageFragments('kotlin.B': FqName@43) = null
+    packageFragments('kotlin': FqName@44) = null
+    packageFragments('kotlin.B': FqName@15) = null
     packageFragments('kotlin.C': FqName@16) = null
-    packageFragments('kotlin.io': FqName@44) = null
-    packageFragments('kotlin.jvm': FqName@45) = null
-    packageFragments('p': FqName@46) = null
-    packageFragments('p.B': FqName@47) = null
-    packageFragments('p.C': FqName@48) = null
+    packageFragments('kotlin.io': FqName@45) = null
+    packageFragments('kotlin.jvm': FqName@46) = null
+    packageFragments('p': FqName@47) = null
+    packageFragments('p.B': FqName@48) = null
+    packageFragments('p.C': FqName@22) = null
 }
 
 LazyJavaPackageFragmentProvider@49 {
@@ -68,7 +68,7 @@ LazyJavaPackageFragmentProvider@49 {
     packageFragments('kotlin.jvm': FqName@60) = null
     packageFragments('p': FqName@61) = null
     packageFragments('p.B': FqName@62) = null
-    packageFragments('p.C': FqName@48) = null
+    packageFragments('p.C': FqName@37) = null
 }
 
 LazyJavaPackageFragment@24['<root>'] {
@@ -80,7 +80,7 @@ LazyJavaPackageFragment@24['<root>'] {
     memberIndex = computeMemberIndex$1@70 // through LazyPackageFragmentScopeForJavaPackage@64
 }
 
-LazyJavaPackageFragment@35['<root>'] {
+LazyJavaPackageFragment@39['<root>'] {
     classes('B': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@71
     classes('C': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@71
     classes('p': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@71
@@ -98,28 +98,28 @@ LazyJavaPackageFragment@2['<root>'] {
     memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@73
 }
 
-LazyJavaPackageFragment@26['java'] {
+LazyJavaPackageFragment@41['java'] {
     classes('lang': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@76
     deserializedPackageScope = Empty@67 // through LazyPackageFragmentScopeForJavaPackage@76
     functions('lang': Name@77) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@76
     memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@76
 }
 
-LazyJavaPackageFragment@38['java'] {
+LazyJavaPackageFragment@53['java'] {
     classes('lang': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@80
     deserializedPackageScope = Empty@67 // through LazyPackageFragmentScopeForJavaPackage@80
     functions('lang': Name@81) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@80
     memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@80
 }
 
-LazyJavaPackageFragment@7['java'] {
+LazyJavaPackageFragment@27['java'] {
     classes('lang': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@84
     deserializedPackageScope = Empty@67 // through LazyPackageFragmentScopeForJavaPackage@84
     functions('lang': Name@85) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@84
     memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@84
 }
 
-LazyJavaPackageFragment@53['java'] {
+LazyJavaPackageFragment@7['java'] {
     classes('lang': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@88
     deserializedPackageScope = Empty@67 // through LazyPackageFragmentScopeForJavaPackage@88
     functions('lang': Name@89) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@88
@@ -128,15 +128,18 @@ LazyJavaPackageFragment@53['java'] {
 
 ResolutionTaskHolder@91 {
     <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
 }
 
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
 }
 
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[3] { ResolutionCandidate@101, ResolutionCandidate@102, ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[3] { ResolutionCandidate@101, ResolutionCandidate@102, ResolutionCandidate@103 }
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[3] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101 }
+}
+
+null {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@104[3] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101 }
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differenceInParamNames.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differenceInParamNames.lazy.log
index d13eb78ceec..9e8bade54af 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differenceInParamNames.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differenceInParamNames.lazy.log
@@ -65,7 +65,7 @@ LazyJavaPackageFragmentProvider@50 {
     packageFragments('kotlin.jvm': FqName@61) = null
     packageFragments('p': FqName@62) = null
     packageFragments('p.B': FqName@63) = null
-    packageFragments('p.C': FqName@47) = null
+    packageFragments('p.C': FqName@24) = null
 }
 
 LazyJavaPackageFragmentProvider@64 {
@@ -86,12 +86,12 @@ LazyJavaPackageFragmentProvider@64 {
     packageFragments('kotlin.jvm': FqName@81) = null
     packageFragments('p': FqName@82) = null
     packageFragments('p.B': FqName@83) = null
-    packageFragments('p.C': FqName@24) = null
+    packageFragments('p.C': FqName@47) = null
     packageFragments('p.Int': FqName@84) = null
     packageFragments('p.String': FqName@85) = null
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@51['<root>'] {
     classes('B': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@87
     classes('C': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@87
     classes('p': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@87
@@ -100,7 +100,7 @@ LazyJavaPackageFragment@2['<root>'] {
     memberIndex = computeMemberIndex$1@93 // through LazyPackageFragmentScopeForJavaPackage@87
 }
 
-LazyJavaPackageFragment@28['<root>'] {
+LazyJavaPackageFragment@2['<root>'] {
     classes('B': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@94
     classes('C': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@94
     classes('p': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@94
@@ -109,7 +109,7 @@ LazyJavaPackageFragment@28['<root>'] {
     memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@94
 }
 
-LazyJavaPackageFragment@51['<root>'] {
+LazyJavaPackageFragment@28['<root>'] {
     classes('B': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@96
     classes('C': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@96
     classes('p': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@96
@@ -118,28 +118,28 @@ LazyJavaPackageFragment@51['<root>'] {
     memberIndex = computeMemberIndex$1@97 // through LazyPackageFragmentScopeForJavaPackage@96
 }
 
-LazyJavaPackageFragment@33['java'] {
+LazyJavaPackageFragment@70['java'] {
     classes('lang': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@99
     deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@99
     functions('lang': Name@100) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@99
     memberIndex = computeMemberIndex$1@101 // through LazyPackageFragmentScopeForJavaPackage@99
 }
 
-LazyJavaPackageFragment@54['java'] {
+LazyJavaPackageFragment@33['java'] {
     classes('lang': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@103
     deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@103
     functions('lang': Name@104) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@103
     memberIndex = computeMemberIndex$1@105 // through LazyPackageFragmentScopeForJavaPackage@103
 }
 
-LazyJavaPackageFragment@70['java'] {
+LazyJavaPackageFragment@8['java'] {
     classes('lang': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@107
     deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@107
     functions('lang': Name@108) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@107
     memberIndex = computeMemberIndex$1@109 // through LazyPackageFragmentScopeForJavaPackage@107
 }
 
-LazyJavaPackageFragment@8['java'] {
+LazyJavaPackageFragment@54['java'] {
     classes('lang': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@111
     deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@111
     functions('lang': Name@112) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@111
@@ -148,15 +148,18 @@ LazyJavaPackageFragment@8['java'] {
 
 ResolutionTaskHolder@114 {
     <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
 }
 
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
 }
 
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[3] { ResolutionCandidate@124, ResolutionCandidate@125, ResolutionCandidate@126 }
-    <name not found> = ArrayList@127[3] { ResolutionCandidate@124, ResolutionCandidate@125, ResolutionCandidate@126 }
+ResolutionTaskHolder@120 {
+    <name not found> = ArrayList@121[3] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124 }
+}
+
+null {
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@127[3] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124 }
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentGenericsInParams.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentGenericsInParams.lazy.log
index 2c5ff109a0f..4a150e73e78 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentGenericsInParams.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentGenericsInParams.lazy.log
@@ -162,7 +162,7 @@ LazyJavaPackageFragment@40['<root>'] {
     memberIndex = computeMemberIndex$1@126 // through LazyPackageFragmentScopeForJavaPackage@120
 }
 
-LazyJavaPackageFragment@67['<root>'] {
+LazyJavaPackageFragment@97['<root>'] {
     classes('B': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@127
     classes('C': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@127
     classes('p': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@127
@@ -171,7 +171,7 @@ LazyJavaPackageFragment@67['<root>'] {
     memberIndex = computeMemberIndex$1@128 // through LazyPackageFragmentScopeForJavaPackage@127
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@67['<root>'] {
     classes('B': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@129
     classes('C': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@129
     classes('p': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@129
@@ -180,7 +180,7 @@ LazyJavaPackageFragment@2['<root>'] {
     memberIndex = computeMemberIndex$1@130 // through LazyPackageFragmentScopeForJavaPackage@129
 }
 
-LazyJavaPackageFragment@97['<root>'] {
+LazyJavaPackageFragment@2['<root>'] {
     classes('B': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@131
     classes('C': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@131
     classes('p': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@131
@@ -189,28 +189,28 @@ LazyJavaPackageFragment@97['<root>'] {
     memberIndex = computeMemberIndex$1@132 // through LazyPackageFragmentScopeForJavaPackage@131
 }
 
-LazyJavaPackageFragment@74['java'] {
+LazyJavaPackageFragment@99['java'] {
     classes('lang': Name@133) = null // through LazyPackageFragmentScopeForJavaPackage@134
     deserializedPackageScope = Empty@123 // through LazyPackageFragmentScopeForJavaPackage@134
     functions('lang': Name@135) = EmptyList@125[empty] // through LazyPackageFragmentScopeForJavaPackage@134
     memberIndex = computeMemberIndex$1@136 // through LazyPackageFragmentScopeForJavaPackage@134
 }
 
-LazyJavaPackageFragment@99['java'] {
+LazyJavaPackageFragment@11['java'] {
     classes('lang': Name@137) = null // through LazyPackageFragmentScopeForJavaPackage@138
     deserializedPackageScope = Empty@123 // through LazyPackageFragmentScopeForJavaPackage@138
     functions('lang': Name@139) = EmptyList@125[empty] // through LazyPackageFragmentScopeForJavaPackage@138
     memberIndex = computeMemberIndex$1@140 // through LazyPackageFragmentScopeForJavaPackage@138
 }
 
-LazyJavaPackageFragment@46['java'] {
+LazyJavaPackageFragment@74['java'] {
     classes('lang': Name@141) = null // through LazyPackageFragmentScopeForJavaPackage@142
     deserializedPackageScope = Empty@123 // through LazyPackageFragmentScopeForJavaPackage@142
     functions('lang': Name@143) = EmptyList@125[empty] // through LazyPackageFragmentScopeForJavaPackage@142
     memberIndex = computeMemberIndex$1@144 // through LazyPackageFragmentScopeForJavaPackage@142
 }
 
-LazyJavaPackageFragment@11['java'] {
+LazyJavaPackageFragment@46['java'] {
     classes('lang': Name@145) = null // through LazyPackageFragmentScopeForJavaPackage@146
     deserializedPackageScope = Empty@123 // through LazyPackageFragmentScopeForJavaPackage@146
     functions('lang': Name@147) = EmptyList@125[empty] // through LazyPackageFragmentScopeForJavaPackage@146
@@ -226,15 +226,18 @@ LazyJavaPackageFragment@110['java'] {
 
 ResolutionTaskHolder@153 {
     <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@155 }
 }
 
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@159 }
+ResolutionTaskHolder@156 {
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
 }
 
-ResolutionTaskHolder@161 {
-    <name not found> = ArrayList@162[3] { ResolutionCandidate@163, ResolutionCandidate@164, ResolutionCandidate@165 }
-    <name not found> = ArrayList@166[3] { ResolutionCandidate@163, ResolutionCandidate@164, ResolutionCandidate@165 }
+ResolutionTaskHolder@159 {
+    <name not found> = ArrayList@160[3] { ResolutionCandidate@161, ResolutionCandidate@162, ResolutionCandidate@163 }
+}
+
+null {
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@155 }
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@166[3] { ResolutionCandidate@161, ResolutionCandidate@162, ResolutionCandidate@163 }
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentNumberOfParams.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentNumberOfParams.lazy.log
index f0797430a29..fc6f3de0215 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentNumberOfParams.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentNumberOfParams.lazy.log
@@ -65,7 +65,7 @@ LazyJavaPackageFragmentProvider@50 {
     packageFragments('kotlin.jvm': FqName@61) = null
     packageFragments('p': FqName@62) = null
     packageFragments('p.B': FqName@63) = null
-    packageFragments('p.C': FqName@47) = null
+    packageFragments('p.C': FqName@24) = null
 }
 
 LazyJavaPackageFragmentProvider@64 {
@@ -86,12 +86,12 @@ LazyJavaPackageFragmentProvider@64 {
     packageFragments('kotlin.jvm': FqName@81) = null
     packageFragments('p': FqName@82) = null
     packageFragments('p.B': FqName@83) = null
-    packageFragments('p.C': FqName@24) = null
+    packageFragments('p.C': FqName@47) = null
     packageFragments('p.Int': FqName@84) = null
     packageFragments('p.String': FqName@85) = null
 }
 
-LazyJavaPackageFragment@28['<root>'] {
+LazyJavaPackageFragment@2['<root>'] {
     classes('B': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@87
     classes('C': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@87
     classes('p': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@87
@@ -100,7 +100,7 @@ LazyJavaPackageFragment@28['<root>'] {
     memberIndex = computeMemberIndex$1@93 // through LazyPackageFragmentScopeForJavaPackage@87
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@51['<root>'] {
     classes('B': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@94
     classes('C': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@94
     classes('p': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@94
@@ -109,7 +109,7 @@ LazyJavaPackageFragment@2['<root>'] {
     memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@94
 }
 
-LazyJavaPackageFragment@51['<root>'] {
+LazyJavaPackageFragment@28['<root>'] {
     classes('B': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@96
     classes('C': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@96
     classes('p': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@96
@@ -118,28 +118,28 @@ LazyJavaPackageFragment@51['<root>'] {
     memberIndex = computeMemberIndex$1@97 // through LazyPackageFragmentScopeForJavaPackage@96
 }
 
-LazyJavaPackageFragment@8['java'] {
+LazyJavaPackageFragment@70['java'] {
     classes('lang': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@99
     deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@99
     functions('lang': Name@100) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@99
     memberIndex = computeMemberIndex$1@101 // through LazyPackageFragmentScopeForJavaPackage@99
 }
 
-LazyJavaPackageFragment@54['java'] {
+LazyJavaPackageFragment@8['java'] {
     classes('lang': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@103
     deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@103
     functions('lang': Name@104) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@103
     memberIndex = computeMemberIndex$1@105 // through LazyPackageFragmentScopeForJavaPackage@103
 }
 
-LazyJavaPackageFragment@70['java'] {
+LazyJavaPackageFragment@33['java'] {
     classes('lang': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@107
     deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@107
     functions('lang': Name@108) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@107
     memberIndex = computeMemberIndex$1@109 // through LazyPackageFragmentScopeForJavaPackage@107
 }
 
-LazyJavaPackageFragment@33['java'] {
+LazyJavaPackageFragment@54['java'] {
     classes('lang': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@111
     deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@111
     functions('lang': Name@112) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@111
@@ -148,15 +148,18 @@ LazyJavaPackageFragment@33['java'] {
 
 ResolutionTaskHolder@114 {
     <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
 }
 
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
 }
 
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[3] { ResolutionCandidate@124, ResolutionCandidate@125, ResolutionCandidate@126 }
-    <name not found> = ArrayList@127[3] { ResolutionCandidate@124, ResolutionCandidate@125, ResolutionCandidate@126 }
+ResolutionTaskHolder@120 {
+    <name not found> = ArrayList@121[3] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124 }
+}
+
+null {
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@127[3] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124 }
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentReturnTypes.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentReturnTypes.lazy.log
index fde987cfb14..3adc94aa4ef 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentReturnTypes.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentReturnTypes.lazy.log
@@ -71,7 +71,7 @@ LazyJavaPackageFragmentProvider@49 {
     packageFragments('p.C': FqName@37) = null
 }
 
-LazyJavaPackageFragment@39['<root>'] {
+LazyJavaPackageFragment@2['<root>'] {
     classes('B': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@64
     classes('C': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@64
     classes('p': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@64
@@ -80,7 +80,7 @@ LazyJavaPackageFragment@39['<root>'] {
     memberIndex = computeMemberIndex$1@70 // through LazyPackageFragmentScopeForJavaPackage@64
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@24['<root>'] {
     classes('B': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@71
     classes('C': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@71
     classes('p': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@71
@@ -89,7 +89,7 @@ LazyJavaPackageFragment@2['<root>'] {
     memberIndex = computeMemberIndex$1@72 // through LazyPackageFragmentScopeForJavaPackage@71
 }
 
-LazyJavaPackageFragment@24['<root>'] {
+LazyJavaPackageFragment@39['<root>'] {
     classes('B': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@73
     classes('C': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@73
     classes('p': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@73
@@ -98,21 +98,21 @@ LazyJavaPackageFragment@24['<root>'] {
     memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@73
 }
 
-LazyJavaPackageFragment@27['java'] {
+LazyJavaPackageFragment@41['java'] {
     classes('lang': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@76
     deserializedPackageScope = Empty@67 // through LazyPackageFragmentScopeForJavaPackage@76
     functions('lang': Name@77) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@76
     memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@76
 }
 
-LazyJavaPackageFragment@53['java'] {
+LazyJavaPackageFragment@27['java'] {
     classes('lang': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@80
     deserializedPackageScope = Empty@67 // through LazyPackageFragmentScopeForJavaPackage@80
     functions('lang': Name@81) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@80
     memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@80
 }
 
-LazyJavaPackageFragment@41['java'] {
+LazyJavaPackageFragment@53['java'] {
     classes('lang': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@84
     deserializedPackageScope = Empty@67 // through LazyPackageFragmentScopeForJavaPackage@84
     functions('lang': Name@85) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@84
@@ -128,15 +128,18 @@ LazyJavaPackageFragment@7['java'] {
 
 ResolutionTaskHolder@91 {
     <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
 }
 
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
 }
 
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[3] { ResolutionCandidate@101, ResolutionCandidate@102, ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[3] { ResolutionCandidate@101, ResolutionCandidate@102, ResolutionCandidate@103 }
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[3] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101 }
+}
+
+null {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@104[3] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101 }
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/extensionMatch.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/extensionMatch.lazy.log
index 7430a261c25..95672d41759 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/extensionMatch.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/extensionMatch.lazy.log
@@ -57,7 +57,7 @@ LazyJavaPackageFragmentProvider@42 {
     packageFragments('kotlin.jvm': FqName@53) = null
     packageFragments('p': FqName@54) = null
     packageFragments('p.B': FqName@55) = null
-    packageFragments('p.C': FqName@21) = null
+    packageFragments('p.C': FqName@40) = null
 }
 
 LazyJavaPackageFragmentProvider@56 {
@@ -75,11 +75,11 @@ LazyJavaPackageFragmentProvider@56 {
     packageFragments('kotlin.jvm': FqName@70) = null
     packageFragments('p': FqName@71) = null
     packageFragments('p.B': FqName@72) = null
-    packageFragments('p.C': FqName@40) = null
+    packageFragments('p.C': FqName@21) = null
     packageFragments('p.String': FqName@73) = null
 }
 
-LazyJavaPackageFragment@24['<root>'] {
+LazyJavaPackageFragment@2['<root>'] {
     classes('B': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@75
     classes('C': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@75
     classes('p': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@75
@@ -88,7 +88,7 @@ LazyJavaPackageFragment@24['<root>'] {
     memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@75
 }
 
-LazyJavaPackageFragment@43['<root>'] {
+LazyJavaPackageFragment@24['<root>'] {
     classes('B': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@82
     classes('C': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@82
     classes('p': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@82
@@ -97,7 +97,7 @@ LazyJavaPackageFragment@43['<root>'] {
     memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@82
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@43['<root>'] {
     classes('B': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@84
     classes('C': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@84
     classes('p': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@84
@@ -106,21 +106,21 @@ LazyJavaPackageFragment@2['<root>'] {
     memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@84
 }
 
-LazyJavaPackageFragment@28['java'] {
+LazyJavaPackageFragment@46['java'] {
     classes('lang': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@87
     deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@87
     functions('lang': Name@88) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@87
     memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@87
 }
 
-LazyJavaPackageFragment@7['java'] {
+LazyJavaPackageFragment@28['java'] {
     classes('lang': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@91
     deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@91
     functions('lang': Name@92) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@91
     memberIndex = computeMemberIndex$1@93 // through LazyPackageFragmentScopeForJavaPackage@91
 }
 
-LazyJavaPackageFragment@46['java'] {
+LazyJavaPackageFragment@7['java'] {
     classes('lang': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@95
     deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@95
     functions('lang': Name@96) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@95
@@ -136,9 +136,12 @@ LazyJavaPackageFragment@61['java'] {
 
 ResolutionTaskHolder@102 {
     <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+}
+
+null {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
     <name not found> = EmptyList@80[empty]
     <name not found> = EmptyList@80[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParams.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParams.lazy.log
index adefdb418c0..ed1e558c6f4 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParams.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParams.lazy.log
@@ -68,7 +68,7 @@ LazyJavaPackageFragmentProvider@46 {
     packageFragments('kotlin.jvm': FqName@57) = null
     packageFragments('p': FqName@58) = null
     packageFragments('p.B': FqName@59) = null
-    packageFragments('p.C': FqName@44) = null
+    packageFragments('p.C': FqName@24) = null
     packageFragments('p.String': FqName@25) = null
 }
 
@@ -87,11 +87,11 @@ LazyJavaPackageFragmentProvider@60 {
     packageFragments('kotlin.jvm': FqName@74) = null
     packageFragments('p': FqName@75) = null
     packageFragments('p.B': FqName@76) = null
-    packageFragments('p.C': FqName@24) = null
+    packageFragments('p.C': FqName@44) = null
     packageFragments('p.T': FqName@77) = null
 }
 
-LazyJavaPackageFragment@28['<root>'] {
+LazyJavaPackageFragment@47['<root>'] {
     classes('B': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@79
     classes('C': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@79
     classes('String': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@79
@@ -101,7 +101,7 @@ LazyJavaPackageFragment@28['<root>'] {
     memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@79
 }
 
-LazyJavaPackageFragment@47['<root>'] {
+LazyJavaPackageFragment@28['<root>'] {
     classes('B': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@87
     classes('C': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@87
     classes('String': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@87
@@ -121,21 +121,21 @@ LazyJavaPackageFragment@2['<root>'] {
     memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@89
 }
 
-LazyJavaPackageFragment@8['java'] {
+LazyJavaPackageFragment@65['java'] {
     classes('lang': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@92
     deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@92
     functions('lang': Name@93) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@92
     memberIndex = computeMemberIndex$1@94 // through LazyPackageFragmentScopeForJavaPackage@92
 }
 
-LazyJavaPackageFragment@65['java'] {
+LazyJavaPackageFragment@32['java'] {
     classes('lang': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@96
     deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@96
     functions('lang': Name@97) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@96
     memberIndex = computeMemberIndex$1@98 // through LazyPackageFragmentScopeForJavaPackage@96
 }
 
-LazyJavaPackageFragment@32['java'] {
+LazyJavaPackageFragment@8['java'] {
     classes('lang': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@100
     deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@100
     functions('lang': Name@101) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@100
@@ -151,30 +151,33 @@ LazyJavaPackageFragment@50['java'] {
 
 ResolutionTaskHolder@107 {
     <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
 }
 
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@113 }
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
 }
 
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@117 }
+ResolutionTaskHolder@113 {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
+}
+
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
 }
 
 ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@120[3] { ResolutionCandidate@121, ResolutionCandidate@122, ResolutionCandidate@123 }
 }
 
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[3] { ResolutionCandidate@125, ResolutionCandidate@126, ResolutionCandidate@127 }
-    <name not found> = ArrayList@128[3] { ResolutionCandidate@125, ResolutionCandidate@126, ResolutionCandidate@127 }
+ResolutionTaskHolder@124 {
+    <name not found> = ArrayList@125[3] { ResolutionCandidate@126, ResolutionCandidate@127, ResolutionCandidate@128 }
 }
 
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[3] { ResolutionCandidate@131, ResolutionCandidate@132, ResolutionCandidate@133 }
-    <name not found> = ArrayList@134[3] { ResolutionCandidate@131, ResolutionCandidate@132, ResolutionCandidate@133 }
+null {
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@133[3] { ResolutionCandidate@126, ResolutionCandidate@127, ResolutionCandidate@128 }
+    <name not found> = ArrayList@134[3] { ResolutionCandidate@121, ResolutionCandidate@122, ResolutionCandidate@123 }
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsBoundsMismatch.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsBoundsMismatch.lazy.log
index c0c35207603..e829c6a9d18 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsBoundsMismatch.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsBoundsMismatch.lazy.log
@@ -116,28 +116,28 @@ LazyJavaPackageFragment@2['<root>'] {
     memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@89
 }
 
-LazyJavaPackageFragment@8['java'] {
+LazyJavaPackageFragment@50['java'] {
     classes('lang': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@92
     deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@92
     functions('lang': Name@93) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@92
     memberIndex = computeMemberIndex$1@94 // through LazyPackageFragmentScopeForJavaPackage@92
 }
 
-LazyJavaPackageFragment@65['java'] {
+LazyJavaPackageFragment@32['java'] {
     classes('lang': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@96
     deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@96
     functions('lang': Name@97) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@96
     memberIndex = computeMemberIndex$1@98 // through LazyPackageFragmentScopeForJavaPackage@96
 }
 
-LazyJavaPackageFragment@50['java'] {
+LazyJavaPackageFragment@8['java'] {
     classes('lang': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@100
     deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@100
     functions('lang': Name@101) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@100
     memberIndex = computeMemberIndex$1@102 // through LazyPackageFragmentScopeForJavaPackage@100
 }
 
-LazyJavaPackageFragment@32['java'] {
+LazyJavaPackageFragment@65['java'] {
     classes('lang': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@104
     deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@104
     functions('lang': Name@105) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@104
@@ -151,14 +151,14 @@ LazyJavaPackageFragment@52['lang'] {
     memberIndex = computeMemberIndex$1@108 // through LazyPackageFragmentScopeForJavaPackage@107
 }
 
-LazyJavaPackageFragment@34['lang'] {
+LazyJavaPackageFragment@10['lang'] {
     classes('foo': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@109
     deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@109
     functions('foo': Name@81) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@109
     memberIndex = computeMemberIndex$1@110 // through LazyPackageFragmentScopeForJavaPackage@109
 }
 
-LazyJavaPackageFragment@10['lang'] {
+LazyJavaPackageFragment@34['lang'] {
     classes('foo': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@111
     deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@111
     functions('foo': Name@81) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@111
@@ -167,22 +167,14 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@113 {
     <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
 }
 
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
 }
 
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[3] { ResolutionCandidate@123, ResolutionCandidate@124, ResolutionCandidate@125 }
-    <name not found> = ArrayList@126[3] { ResolutionCandidate@123, ResolutionCandidate@124, ResolutionCandidate@125 }
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
+ResolutionTaskHolder@119 {
+    <name not found> = ArrayList@120[3] { ResolutionCandidate@121, ResolutionCandidate@122, ResolutionCandidate@123 }
     <name not found> = EmptyList@84[empty]
     <name not found> = EmptyList@84[empty]
     <name not found> = EmptyList@84[empty]
@@ -207,3 +199,14 @@ ResolutionTaskHolder@121 {
     <name not found> = EmptyList@84[empty]
     <name not found> = EmptyList@84[empty]
 }
+
+null {
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@126[3] { ResolutionCandidate@121, ResolutionCandidate@122, ResolutionCandidate@123 }
+    <name not found> = EmptyList@84[empty]
+    <name not found> = EmptyList@84[empty]
+    <name not found> = EmptyList@84[empty]
+    <name not found> = EmptyList@84[empty]
+    <name not found> = EmptyList@84[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsEqNull.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsEqNull.lazy.log
index 7d1d6057af4..c3623e865c2 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsEqNull.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsEqNull.lazy.log
@@ -80,7 +80,7 @@ LazyJavaPackageFragmentProvider@56 {
     packageFragments('p.T': FqName@73) = null
 }
 
-LazyJavaPackageFragment@43['<root>'] {
+LazyJavaPackageFragment@2['<root>'] {
     classes('B': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@75
     classes('String': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@75
     classes('equals': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@75
@@ -91,7 +91,7 @@ LazyJavaPackageFragment@43['<root>'] {
     memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@75
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@43['<root>'] {
     classes('B': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@83
     classes('String': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@83
     classes('equals': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@83
@@ -113,14 +113,14 @@ LazyJavaPackageFragment@25['<root>'] {
     memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@85
 }
 
-LazyJavaPackageFragment@7['java'] {
+LazyJavaPackageFragment@29['java'] {
     classes('lang': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@88
     deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@88
     functions('lang': Name@89) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@88
     memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@88
 }
 
-LazyJavaPackageFragment@29['java'] {
+LazyJavaPackageFragment@46['java'] {
     classes('lang': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@92
     deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@92
     functions('lang': Name@93) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@92
@@ -134,7 +134,7 @@ LazyJavaPackageFragment@61['java'] {
     memberIndex = computeMemberIndex$1@98 // through LazyPackageFragmentScopeForJavaPackage@96
 }
 
-LazyJavaPackageFragment@46['java'] {
+LazyJavaPackageFragment@7['java'] {
     classes('lang': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@100
     deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@100
     functions('lang': Name@101) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@100
@@ -164,96 +164,99 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@109 {
     <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
-    <name not found> = EmptyList@80[empty]
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
     <name not found> = EmptyList@80[empty]
 }
 
-ResolutionTaskHolder@116 {
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
     <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
+    <name not found> = EmptyList@80[empty]
+}
+
+ResolutionTaskHolder@119 {
     <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@121 }
-    <name not found> = EmptyList@80[empty]
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
     <name not found> = EmptyList@80[empty]
 }
 
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@125 }
+ResolutionTaskHolder@124 {
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
     <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
-    <name not found> = EmptyList@80[empty]
     <name not found> = EmptyList@80[empty]
 }
 
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@135 }
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
+ResolutionTaskHolder@129 {
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
 }
 
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@139 }
+ResolutionTaskHolder@132 {
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
+}
+
+ResolutionTaskHolder@135 {
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
+}
+
+ResolutionTaskHolder@138 {
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
 }
 
 ResolutionTaskHolder@141 {
     <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@143 }
 }
 
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@147 }
+ResolutionTaskHolder@144 {
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
 }
 
-ResolutionTaskHolder@149 {
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@151 }
+ResolutionTaskHolder@147 {
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
+}
+
+ResolutionTaskHolder@150 {
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
 }
 
 ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@155 }
+    <name not found> = ArrayList@154[2] { ResolutionCandidate@155, ResolutionCandidate@156 }
 }
 
 ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@159 }
+    <name not found> = ArrayList@158[2] { ResolutionCandidate@159, ResolutionCandidate@160 }
 }
 
 ResolutionTaskHolder@161 {
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@163 }
+    <name not found> = ArrayList@162[2] { ResolutionCandidate@163, ResolutionCandidate@164 }
 }
 
 ResolutionTaskHolder@165 {
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@167 }
+    <name not found> = ArrayList@166[2] { ResolutionCandidate@167, ResolutionCandidate@168 }
 }
 
-ResolutionTaskHolder@169 {
-    <name not found> = ArrayList@170[2] { ResolutionCandidate@171, ResolutionCandidate@172 }
-    <name not found> = ArrayList@173[2] { ResolutionCandidate@171, ResolutionCandidate@172 }
-}
-
-ResolutionTaskHolder@174 {
-    <name not found> = ArrayList@175[2] { ResolutionCandidate@176, ResolutionCandidate@177 }
-    <name not found> = ArrayList@178[2] { ResolutionCandidate@176, ResolutionCandidate@177 }
-}
-
-ResolutionTaskHolder@179 {
-    <name not found> = ArrayList@180[2] { ResolutionCandidate@181, ResolutionCandidate@182 }
-    <name not found> = ArrayList@183[2] { ResolutionCandidate@181, ResolutionCandidate@182 }
-}
-
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[2] { ResolutionCandidate@186, ResolutionCandidate@187 }
-    <name not found> = ArrayList@188[2] { ResolutionCandidate@186, ResolutionCandidate@187 }
+null {
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@152 }
+    <name not found> = ArrayList@170[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@146 }
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@140 }
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@176[1] { ResolutionCandidate@134 }
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@131 }
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@113 }
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@149 }
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@143 }
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@126 }
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@128 }
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@137 }
+    <name not found> = ArrayList@185[2] { ResolutionCandidate@167, ResolutionCandidate@168 }
+    <name not found> = ArrayList@186[2] { ResolutionCandidate@155, ResolutionCandidate@156 }
+    <name not found> = ArrayList@187[2] { ResolutionCandidate@163, ResolutionCandidate@164 }
+    <name not found> = ArrayList@188[2] { ResolutionCandidate@159, ResolutionCandidate@160 }
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsNotIs.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsNotIs.lazy.log
index f8d75abcd86..01601fd44bb 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsNotIs.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsNotIs.lazy.log
@@ -68,7 +68,7 @@ LazyJavaPackageFragmentProvider@46 {
     packageFragments('kotlin.jvm': FqName@57) = null
     packageFragments('p': FqName@58) = null
     packageFragments('p.B': FqName@59) = null
-    packageFragments('p.C': FqName@24) = null
+    packageFragments('p.C': FqName@44) = null
     packageFragments('p.String': FqName@25) = null
 }
 
@@ -87,7 +87,7 @@ LazyJavaPackageFragmentProvider@60 {
     packageFragments('kotlin.jvm': FqName@74) = null
     packageFragments('p': FqName@75) = null
     packageFragments('p.B': FqName@76) = null
-    packageFragments('p.C': FqName@44) = null
+    packageFragments('p.C': FqName@24) = null
     packageFragments('p.T': FqName@77) = null
 }
 
@@ -101,7 +101,7 @@ LazyJavaPackageFragment@2['<root>'] {
     memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@79
 }
 
-LazyJavaPackageFragment@47['<root>'] {
+LazyJavaPackageFragment@28['<root>'] {
     classes('B': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@87
     classes('C': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@87
     classes('String': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@87
@@ -111,7 +111,7 @@ LazyJavaPackageFragment@47['<root>'] {
     memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@87
 }
 
-LazyJavaPackageFragment@28['<root>'] {
+LazyJavaPackageFragment@47['<root>'] {
     classes('B': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@89
     classes('C': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@89
     classes('String': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@89
@@ -121,21 +121,21 @@ LazyJavaPackageFragment@28['<root>'] {
     memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@89
 }
 
-LazyJavaPackageFragment@65['java'] {
+LazyJavaPackageFragment@32['java'] {
     classes('lang': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@92
     deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@92
     functions('lang': Name@93) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@92
     memberIndex = computeMemberIndex$1@94 // through LazyPackageFragmentScopeForJavaPackage@92
 }
 
-LazyJavaPackageFragment@8['java'] {
+LazyJavaPackageFragment@65['java'] {
     classes('lang': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@96
     deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@96
     functions('lang': Name@97) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@96
     memberIndex = computeMemberIndex$1@98 // through LazyPackageFragmentScopeForJavaPackage@96
 }
 
-LazyJavaPackageFragment@32['java'] {
+LazyJavaPackageFragment@8['java'] {
     classes('lang': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@100
     deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@100
     functions('lang': Name@101) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@100
@@ -151,30 +151,33 @@ LazyJavaPackageFragment@50['java'] {
 
 ResolutionTaskHolder@107 {
     <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
 }
 
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@113 }
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
 }
 
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@117 }
+ResolutionTaskHolder@113 {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
+}
+
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
 }
 
 ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@120[3] { ResolutionCandidate@121, ResolutionCandidate@122, ResolutionCandidate@123 }
 }
 
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[3] { ResolutionCandidate@125, ResolutionCandidate@126, ResolutionCandidate@127 }
-    <name not found> = ArrayList@128[3] { ResolutionCandidate@125, ResolutionCandidate@126, ResolutionCandidate@127 }
+ResolutionTaskHolder@124 {
+    <name not found> = ArrayList@125[3] { ResolutionCandidate@126, ResolutionCandidate@127, ResolutionCandidate@128 }
 }
 
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[3] { ResolutionCandidate@131, ResolutionCandidate@132, ResolutionCandidate@133 }
-    <name not found> = ArrayList@134[3] { ResolutionCandidate@131, ResolutionCandidate@132, ResolutionCandidate@133 }
+null {
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@133[3] { ResolutionCandidate@121, ResolutionCandidate@122, ResolutionCandidate@123 }
+    <name not found> = ArrayList@134[3] { ResolutionCandidate@126, ResolutionCandidate@127, ResolutionCandidate@128 }
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnFooT.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnFooT.lazy.log
index b29bd142da4..dbf7d17ec57 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnFooT.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnFooT.lazy.log
@@ -103,7 +103,7 @@ LazyJavaPackageFragmentProvider@65 {
     packageFragments('p.T': FqName@83) = null
 }
 
-LazyJavaPackageFragment@32['<root>'] {
+LazyJavaPackageFragment@2['<root>'] {
     classes('B': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@85
     classes('C': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@85
     classes('String': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@85
@@ -113,7 +113,7 @@ LazyJavaPackageFragment@32['<root>'] {
     memberIndex = computeMemberIndex$1@92 // through LazyPackageFragmentScopeForJavaPackage@85
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@55['<root>'] {
     classes('B': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@93
     classes('C': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@93
     classes('String': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@93
@@ -123,7 +123,7 @@ LazyJavaPackageFragment@2['<root>'] {
     memberIndex = computeMemberIndex$1@94 // through LazyPackageFragmentScopeForJavaPackage@93
 }
 
-LazyJavaPackageFragment@55['<root>'] {
+LazyJavaPackageFragment@32['<root>'] {
     classes('B': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@95
     classes('C': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@95
     classes('String': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@95
@@ -133,28 +133,28 @@ LazyJavaPackageFragment@55['<root>'] {
     memberIndex = computeMemberIndex$1@96 // through LazyPackageFragmentScopeForJavaPackage@95
 }
 
-LazyJavaPackageFragment@57['java'] {
+LazyJavaPackageFragment@9['java'] {
     classes('lang': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@98
     deserializedPackageScope = Empty@89 // through LazyPackageFragmentScopeForJavaPackage@98
     functions('lang': Name@99) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@98
     memberIndex = computeMemberIndex$1@100 // through LazyPackageFragmentScopeForJavaPackage@98
 }
 
-LazyJavaPackageFragment@70['java'] {
+LazyJavaPackageFragment@57['java'] {
     classes('lang': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@102
     deserializedPackageScope = Empty@89 // through LazyPackageFragmentScopeForJavaPackage@102
     functions('lang': Name@103) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@102
     memberIndex = computeMemberIndex$1@104 // through LazyPackageFragmentScopeForJavaPackage@102
 }
 
-LazyJavaPackageFragment@9['java'] {
+LazyJavaPackageFragment@37['java'] {
     classes('lang': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@106
     deserializedPackageScope = Empty@89 // through LazyPackageFragmentScopeForJavaPackage@106
     functions('lang': Name@107) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@106
     memberIndex = computeMemberIndex$1@108 // through LazyPackageFragmentScopeForJavaPackage@106
 }
 
-LazyJavaPackageFragment@37['java'] {
+LazyJavaPackageFragment@70['java'] {
     classes('lang': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@110
     deserializedPackageScope = Empty@89 // through LazyPackageFragmentScopeForJavaPackage@110
     functions('lang': Name@111) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@110
@@ -163,30 +163,33 @@ LazyJavaPackageFragment@37['java'] {
 
 ResolutionTaskHolder@113 {
     <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
 }
 
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
 }
 
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
+ResolutionTaskHolder@119 {
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
+}
+
+ResolutionTaskHolder@122 {
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
 }
 
 ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@127 }
+    <name not found> = ArrayList@126[3] { ResolutionCandidate@127, ResolutionCandidate@128, ResolutionCandidate@129 }
 }
 
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[3] { ResolutionCandidate@131, ResolutionCandidate@132, ResolutionCandidate@133 }
-    <name not found> = ArrayList@134[3] { ResolutionCandidate@131, ResolutionCandidate@132, ResolutionCandidate@133 }
+ResolutionTaskHolder@130 {
+    <name not found> = ArrayList@131[3] { ResolutionCandidate@132, ResolutionCandidate@133, ResolutionCandidate@134 }
 }
 
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[3] { ResolutionCandidate@137, ResolutionCandidate@138, ResolutionCandidate@139 }
-    <name not found> = ArrayList@140[3] { ResolutionCandidate@137, ResolutionCandidate@138, ResolutionCandidate@139 }
+null {
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@124 }
+    <name not found> = ArrayList@139[3] { ResolutionCandidate@127, ResolutionCandidate@128, ResolutionCandidate@129 }
+    <name not found> = ArrayList@140[3] { ResolutionCandidate@132, ResolutionCandidate@133, ResolutionCandidate@134 }
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnT.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnT.lazy.log
index dd08980e41f..fd2c2b3584e 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnT.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnT.lazy.log
@@ -91,7 +91,7 @@ LazyJavaPackageFragmentProvider@57 {
     packageFragments('p.T': FqName@71) = null
 }
 
-LazyJavaPackageFragment@47['<root>'] {
+LazyJavaPackageFragment@28['<root>'] {
     classes('B': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@73
     classes('C': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@73
     classes('String': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@73
@@ -101,7 +101,7 @@ LazyJavaPackageFragment@47['<root>'] {
     memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@73
 }
 
-LazyJavaPackageFragment@28['<root>'] {
+LazyJavaPackageFragment@47['<root>'] {
     classes('B': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@81
     classes('C': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@81
     classes('String': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@81
@@ -128,7 +128,7 @@ LazyJavaPackageFragment@61['java'] {
     memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@86
 }
 
-LazyJavaPackageFragment@8['java'] {
+LazyJavaPackageFragment@49['java'] {
     classes('lang': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@90
     deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@90
     functions('lang': Name@91) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@90
@@ -142,7 +142,7 @@ LazyJavaPackageFragment@32['java'] {
     memberIndex = computeMemberIndex$1@96 // through LazyPackageFragmentScopeForJavaPackage@94
 }
 
-LazyJavaPackageFragment@49['java'] {
+LazyJavaPackageFragment@8['java'] {
     classes('lang': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@98
     deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@98
     functions('lang': Name@99) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@98
@@ -151,30 +151,33 @@ LazyJavaPackageFragment@49['java'] {
 
 ResolutionTaskHolder@101 {
     <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
 }
 
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
 }
 
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
+}
+
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
 }
 
 ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@114[3] { ResolutionCandidate@115, ResolutionCandidate@116, ResolutionCandidate@117 }
 }
 
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[3] { ResolutionCandidate@119, ResolutionCandidate@120, ResolutionCandidate@121 }
-    <name not found> = ArrayList@122[3] { ResolutionCandidate@119, ResolutionCandidate@120, ResolutionCandidate@121 }
+ResolutionTaskHolder@118 {
+    <name not found> = ArrayList@119[3] { ResolutionCandidate@120, ResolutionCandidate@121, ResolutionCandidate@122 }
 }
 
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[3] { ResolutionCandidate@125, ResolutionCandidate@126, ResolutionCandidate@127 }
-    <name not found> = ArrayList@128[3] { ResolutionCandidate@125, ResolutionCandidate@126, ResolutionCandidate@127 }
+null {
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@127[3] { ResolutionCandidate@115, ResolutionCandidate@116, ResolutionCandidate@117 }
+    <name not found> = ArrayList@128[3] { ResolutionCandidate@120, ResolutionCandidate@121, ResolutionCandidate@122 }
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noGenericsInParams.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noGenericsInParams.lazy.log
index 27b849b9d36..b6e9dab7b92 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noGenericsInParams.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noGenericsInParams.lazy.log
@@ -65,7 +65,7 @@ LazyJavaPackageFragmentProvider@50 {
     packageFragments('kotlin.jvm': FqName@61) = null
     packageFragments('p': FqName@62) = null
     packageFragments('p.B': FqName@63) = null
-    packageFragments('p.C': FqName@24) = null
+    packageFragments('p.C': FqName@47) = null
 }
 
 LazyJavaPackageFragmentProvider@64 {
@@ -86,12 +86,12 @@ LazyJavaPackageFragmentProvider@64 {
     packageFragments('kotlin.jvm': FqName@81) = null
     packageFragments('p': FqName@82) = null
     packageFragments('p.B': FqName@83) = null
-    packageFragments('p.C': FqName@47) = null
+    packageFragments('p.C': FqName@24) = null
     packageFragments('p.Int': FqName@84) = null
     packageFragments('p.String': FqName@85) = null
 }
 
-LazyJavaPackageFragment@51['<root>'] {
+LazyJavaPackageFragment@2['<root>'] {
     classes('B': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@87
     classes('C': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@87
     classes('p': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@87
@@ -109,7 +109,7 @@ LazyJavaPackageFragment@28['<root>'] {
     memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@94
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@51['<root>'] {
     classes('B': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@96
     classes('C': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@96
     classes('p': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@96
@@ -118,28 +118,28 @@ LazyJavaPackageFragment@2['<root>'] {
     memberIndex = computeMemberIndex$1@97 // through LazyPackageFragmentScopeForJavaPackage@96
 }
 
-LazyJavaPackageFragment@33['java'] {
+LazyJavaPackageFragment@8['java'] {
     classes('lang': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@99
     deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@99
     functions('lang': Name@100) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@99
     memberIndex = computeMemberIndex$1@101 // through LazyPackageFragmentScopeForJavaPackage@99
 }
 
-LazyJavaPackageFragment@54['java'] {
+LazyJavaPackageFragment@70['java'] {
     classes('lang': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@103
     deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@103
     functions('lang': Name@104) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@103
     memberIndex = computeMemberIndex$1@105 // through LazyPackageFragmentScopeForJavaPackage@103
 }
 
-LazyJavaPackageFragment@8['java'] {
+LazyJavaPackageFragment@33['java'] {
     classes('lang': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@107
     deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@107
     functions('lang': Name@108) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@107
     memberIndex = computeMemberIndex$1@109 // through LazyPackageFragmentScopeForJavaPackage@107
 }
 
-LazyJavaPackageFragment@70['java'] {
+LazyJavaPackageFragment@54['java'] {
     classes('lang': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@111
     deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@111
     functions('lang': Name@112) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@111
@@ -148,15 +148,18 @@ LazyJavaPackageFragment@70['java'] {
 
 ResolutionTaskHolder@114 {
     <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
 }
 
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
 }
 
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[3] { ResolutionCandidate@124, ResolutionCandidate@125, ResolutionCandidate@126 }
-    <name not found> = ArrayList@127[3] { ResolutionCandidate@124, ResolutionCandidate@125, ResolutionCandidate@126 }
+ResolutionTaskHolder@120 {
+    <name not found> = ArrayList@121[3] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124 }
+}
+
+null {
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@127[3] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124 }
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noParams.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noParams.lazy.log
index 6fad33d99cb..99feec92832 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noParams.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noParams.lazy.log
@@ -67,7 +67,7 @@ LazyJavaPackageFragmentProvider@48 {
     packageFragments('p.C': FqName@18) = null
 }
 
-LazyJavaPackageFragment@20['<root>'] {
+LazyJavaPackageFragment@35['<root>'] {
     classes('B': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@63
     classes('C': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@63
     classes('p': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@63
@@ -76,7 +76,7 @@ LazyJavaPackageFragment@20['<root>'] {
     memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@63
 }
 
-LazyJavaPackageFragment@35['<root>'] {
+LazyJavaPackageFragment@2['<root>'] {
     classes('B': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@70
     classes('C': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@70
     classes('p': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@70
@@ -85,7 +85,7 @@ LazyJavaPackageFragment@35['<root>'] {
     memberIndex = computeMemberIndex$1@71 // through LazyPackageFragmentScopeForJavaPackage@70
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@20['<root>'] {
     classes('B': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@72
     classes('C': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@72
     classes('p': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@72
@@ -94,28 +94,28 @@ LazyJavaPackageFragment@2['<root>'] {
     memberIndex = computeMemberIndex$1@73 // through LazyPackageFragmentScopeForJavaPackage@72
 }
 
-LazyJavaPackageFragment@6['java'] {
+LazyJavaPackageFragment@38['java'] {
     classes('lang': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@75
     deserializedPackageScope = Empty@66 // through LazyPackageFragmentScopeForJavaPackage@75
     functions('lang': Name@76) = EmptyList@68[empty] // through LazyPackageFragmentScopeForJavaPackage@75
     memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@75
 }
 
-LazyJavaPackageFragment@23['java'] {
+LazyJavaPackageFragment@6['java'] {
     classes('lang': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@79
     deserializedPackageScope = Empty@66 // through LazyPackageFragmentScopeForJavaPackage@79
     functions('lang': Name@80) = EmptyList@68[empty] // through LazyPackageFragmentScopeForJavaPackage@79
     memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@79
 }
 
-LazyJavaPackageFragment@38['java'] {
+LazyJavaPackageFragment@52['java'] {
     classes('lang': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@83
     deserializedPackageScope = Empty@66 // through LazyPackageFragmentScopeForJavaPackage@83
     functions('lang': Name@84) = EmptyList@68[empty] // through LazyPackageFragmentScopeForJavaPackage@83
     memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@83
 }
 
-LazyJavaPackageFragment@52['java'] {
+LazyJavaPackageFragment@23['java'] {
     classes('lang': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@87
     deserializedPackageScope = Empty@66 // through LazyPackageFragmentScopeForJavaPackage@87
     functions('lang': Name@88) = EmptyList@68[empty] // through LazyPackageFragmentScopeForJavaPackage@87
@@ -124,15 +124,18 @@ LazyJavaPackageFragment@52['java'] {
 
 ResolutionTaskHolder@90 {
     <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
 }
 
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[3] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[3] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102 }
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[3] { ResolutionCandidate@98, ResolutionCandidate@99, ResolutionCandidate@100 }
+}
+
+null {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@103[3] { ResolutionCandidate@98, ResolutionCandidate@99, ResolutionCandidate@100 }
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/sameGenericsInParams.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/sameGenericsInParams.lazy.log
index d9b51d21149..91ad05589c5 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/sameGenericsInParams.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/sameGenericsInParams.lazy.log
@@ -93,7 +93,7 @@ LazyJavaPackageFragmentProvider@66 {
     packageFragments('kotlin.jvm': FqName@89) = null
     packageFragments('p': FqName@90) = null
     packageFragments('p.B': FqName@91) = null
-    packageFragments('p.C': FqName@30) = null
+    packageFragments('p.C': FqName@61) = null
     packageFragments('p.G1': FqName@92) = null
     packageFragments('p.G2': FqName@93) = null
     packageFragments('p.Int': FqName@94) = null
@@ -127,7 +127,7 @@ LazyJavaPackageFragmentProvider@96 {
     packageFragments('kotlin.jvm': FqName@119) = null
     packageFragments('p': FqName@120) = null
     packageFragments('p.B': FqName@121) = null
-    packageFragments('p.C': FqName@61) = null
+    packageFragments('p.C': FqName@30) = null
     packageFragments('p.G1': FqName@122) = null
     packageFragments('p.G2': FqName@123) = null
     packageFragments('p.Int': FqName@124) = null
@@ -158,7 +158,7 @@ LazyJavaPackageFragmentProvider@126 {
     packageFragments('kotlin.jvm': FqName@134) = null
     packageFragments('p': FqName@135) = null
     packageFragments('p.B': FqName@121) = null
-    packageFragments('p.C': FqName@61) = null
+    packageFragments('p.C': FqName@30) = null
     packageFragments('p.G1': FqName@136) = null
     packageFragments('p.G2': FqName@137) = null
     packageFragments('p.Int': FqName@124) = null
@@ -217,7 +217,7 @@ LazyJavaPackageFragment@97['<root>'] {
     memberIndex = computeMemberIndex$1@155 // through LazyPackageFragmentScopeForJavaPackage@154
 }
 
-LazyJavaPackageFragment@129['java'] {
+LazyJavaPackageFragment@10['java'] {
     classes('lang': Name@156) = null // through LazyPackageFragmentScopeForJavaPackage@157
     deserializedPackageScope = Empty@146 // through LazyPackageFragmentScopeForJavaPackage@157
     functions('lang': Name@158) = EmptyList@148[empty] // through LazyPackageFragmentScopeForJavaPackage@157
@@ -231,21 +231,21 @@ LazyJavaPackageFragment@43['java'] {
     memberIndex = computeMemberIndex$1@163 // through LazyPackageFragmentScopeForJavaPackage@161
 }
 
-LazyJavaPackageFragment@104['java'] {
+LazyJavaPackageFragment@129['java'] {
     classes('lang': Name@164) = null // through LazyPackageFragmentScopeForJavaPackage@165
     deserializedPackageScope = Empty@146 // through LazyPackageFragmentScopeForJavaPackage@165
     functions('lang': Name@166) = EmptyList@148[empty] // through LazyPackageFragmentScopeForJavaPackage@165
     memberIndex = computeMemberIndex$1@167 // through LazyPackageFragmentScopeForJavaPackage@165
 }
 
-LazyJavaPackageFragment@74['java'] {
+LazyJavaPackageFragment@104['java'] {
     classes('lang': Name@168) = null // through LazyPackageFragmentScopeForJavaPackage@169
     deserializedPackageScope = Empty@146 // through LazyPackageFragmentScopeForJavaPackage@169
     functions('lang': Name@170) = EmptyList@148[empty] // through LazyPackageFragmentScopeForJavaPackage@169
     memberIndex = computeMemberIndex$1@171 // through LazyPackageFragmentScopeForJavaPackage@169
 }
 
-LazyJavaPackageFragment@10['java'] {
+LazyJavaPackageFragment@74['java'] {
     classes('lang': Name@172) = null // through LazyPackageFragmentScopeForJavaPackage@173
     deserializedPackageScope = Empty@146 // through LazyPackageFragmentScopeForJavaPackage@173
     functions('lang': Name@174) = EmptyList@148[empty] // through LazyPackageFragmentScopeForJavaPackage@173
@@ -254,25 +254,28 @@ LazyJavaPackageFragment@10['java'] {
 
 ResolutionTaskHolder@176 {
     <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@178 }
 }
 
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@182 }
+ResolutionTaskHolder@179 {
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
 }
 
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@186 }
+ResolutionTaskHolder@182 {
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
+}
+
+ResolutionTaskHolder@185 {
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
 }
 
 ResolutionTaskHolder@188 {
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@190 }
+    <name not found> = ArrayList@189[3] { ResolutionCandidate@190, ResolutionCandidate@191, ResolutionCandidate@192 }
 }
 
-ResolutionTaskHolder@192 {
-    <name not found> = ArrayList@193[3] { ResolutionCandidate@194, ResolutionCandidate@195, ResolutionCandidate@196 }
-    <name not found> = ArrayList@197[3] { ResolutionCandidate@194, ResolutionCandidate@195, ResolutionCandidate@196 }
+null {
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@184 }
+    <name not found> = ArrayList@194[1] { ResolutionCandidate@187 }
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@178 }
+    <name not found> = ArrayList@196[1] { ResolutionCandidate@181 }
+    <name not found> = ArrayList@197[3] { ResolutionCandidate@190, ResolutionCandidate@191, ResolutionCandidate@192 }
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/simpleWithInheritance.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/simpleWithInheritance.lazy.log
index 201185635de..e0a8499e8c2 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/simpleWithInheritance.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/simpleWithInheritance.lazy.log
@@ -60,8 +60,8 @@ LazyJavaPackageFragmentProvider@39 {
     packageFragments('kotlin.jvm': FqName@50) = null
     packageFragments('p': FqName@51) = null
     packageFragments('p.B': FqName@52) = null
-    packageFragments('p.C': FqName@37) = null
-    packageFragments('p.D': FqName@22) = null
+    packageFragments('p.C': FqName@21) = null
+    packageFragments('p.D': FqName@38) = null
 }
 
 LazyJavaPackageFragmentProvider@53 {
@@ -76,7 +76,7 @@ LazyJavaPackageFragmentProvider@53 {
     packageFragments('kotlin.jvm': FqName@64) = null
     packageFragments('p': FqName@65) = null
     packageFragments('p.B': FqName@66) = null
-    packageFragments('p.C': FqName@21) = null
+    packageFragments('p.C': FqName@37) = null
 }
 
 LazyJavaPackageFragment@2['<root>'] {
@@ -89,7 +89,7 @@ LazyJavaPackageFragment@2['<root>'] {
     memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@68
 }
 
-LazyJavaPackageFragment@40['<root>'] {
+LazyJavaPackageFragment@24['<root>'] {
     classes('B': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@76
     classes('C': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@76
     classes('D': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@76
@@ -99,7 +99,7 @@ LazyJavaPackageFragment@40['<root>'] {
     memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@76
 }
 
-LazyJavaPackageFragment@24['<root>'] {
+LazyJavaPackageFragment@40['<root>'] {
     classes('B': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@78
     classes('C': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@78
     classes('D': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@78
@@ -109,28 +109,28 @@ LazyJavaPackageFragment@24['<root>'] {
     memberIndex = computeMemberIndex$1@79 // through LazyPackageFragmentScopeForJavaPackage@78
 }
 
-LazyJavaPackageFragment@57['java'] {
+LazyJavaPackageFragment@43['java'] {
     classes('lang': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@81
     deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@81
     functions('lang': Name@82) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@81
     memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@81
 }
 
-LazyJavaPackageFragment@43['java'] {
+LazyJavaPackageFragment@27['java'] {
     classes('lang': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@85
     deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@85
     functions('lang': Name@86) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@85
     memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@85
 }
 
-LazyJavaPackageFragment@7['java'] {
+LazyJavaPackageFragment@57['java'] {
     classes('lang': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@89
     deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@89
     functions('lang': Name@90) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@89
     memberIndex = computeMemberIndex$1@91 // through LazyPackageFragmentScopeForJavaPackage@89
 }
 
-LazyJavaPackageFragment@27['java'] {
+LazyJavaPackageFragment@7['java'] {
     classes('lang': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@93
     deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@93
     functions('lang': Name@94) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@93
@@ -139,20 +139,23 @@ LazyJavaPackageFragment@27['java'] {
 
 ResolutionTaskHolder@96 {
     <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
 }
 
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
 }
 
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[4] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
-    <name not found> = ArrayList@113[4] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[4] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
+}
+
+null {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@113[4] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/substitutedGenericInParams.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/substitutedGenericInParams.lazy.log
index 211a8695a25..bbcfdf2a10d 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/substitutedGenericInParams.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/substitutedGenericInParams.lazy.log
@@ -83,7 +83,7 @@ LazyJavaPackageFragmentProvider@53 {
     packageFragments('p.T': FqName@67) = null
 }
 
-LazyJavaPackageFragment@24['<root>'] {
+LazyJavaPackageFragment@2['<root>'] {
     classes('B': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@69
     classes('C': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@69
     classes('p': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@69
@@ -92,7 +92,7 @@ LazyJavaPackageFragment@24['<root>'] {
     memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@69
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@24['<root>'] {
     classes('B': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@76
     classes('C': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@76
     classes('p': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@76
@@ -110,28 +110,28 @@ LazyJavaPackageFragment@43['<root>'] {
     memberIndex = computeMemberIndex$1@79 // through LazyPackageFragmentScopeForJavaPackage@78
 }
 
-LazyJavaPackageFragment@28['java'] {
+LazyJavaPackageFragment@7['java'] {
     classes('lang': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@81
     deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@81
     functions('lang': Name@82) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@81
     memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@81
 }
 
-LazyJavaPackageFragment@45['java'] {
+LazyJavaPackageFragment@57['java'] {
     classes('lang': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@85
     deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@85
     functions('lang': Name@86) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@85
     memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@85
 }
 
-LazyJavaPackageFragment@57['java'] {
+LazyJavaPackageFragment@45['java'] {
     classes('lang': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@89
     deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@89
     functions('lang': Name@90) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@89
     memberIndex = computeMemberIndex$1@91 // through LazyPackageFragmentScopeForJavaPackage@89
 }
 
-LazyJavaPackageFragment@7['java'] {
+LazyJavaPackageFragment@28['java'] {
     classes('lang': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@93
     deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@93
     functions('lang': Name@94) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@93
@@ -140,15 +140,18 @@ LazyJavaPackageFragment@7['java'] {
 
 ResolutionTaskHolder@96 {
     <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
 }
 
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[3] { ResolutionCandidate@106, ResolutionCandidate@107, ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[3] { ResolutionCandidate@106, ResolutionCandidate@107, ResolutionCandidate@108 }
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[3] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106 }
+}
+
+null {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@109[3] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106 }
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/differentSuperTraits.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/differentSuperTraits.lazy.log
index e899846e6f6..5ae0a22200c 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/differentSuperTraits.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/differentSuperTraits.lazy.log
@@ -67,7 +67,7 @@ LazyJavaPackageFragmentProvider@44 {
     packageFragments('p.C': FqName@43) = null
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@45['<root>'] {
     classes('B': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@55
     classes('C': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@55
     classes('p': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@55
@@ -76,7 +76,7 @@ LazyJavaPackageFragment@2['<root>'] {
     memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@55
 }
 
-LazyJavaPackageFragment@45['<root>'] {
+LazyJavaPackageFragment@29['<root>'] {
     classes('B': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@62
     classes('C': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@62
     classes('p': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@62
@@ -85,7 +85,7 @@ LazyJavaPackageFragment@45['<root>'] {
     memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@62
 }
 
-LazyJavaPackageFragment@29['<root>'] {
+LazyJavaPackageFragment@2['<root>'] {
     classes('B': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@64
     classes('C': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@64
     classes('p': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@64
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTrait.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTrait.lazy.log
index 8782956d98f..fe83893a5a6 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTrait.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTrait.lazy.log
@@ -63,7 +63,7 @@ LazyJavaPackageFragmentProvider@40 {
     packageFragments('p.B': FqName@22) = null
 }
 
-LazyJavaPackageFragment@41['<root>'] {
+LazyJavaPackageFragment@25['<root>'] {
     classes('A': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@51
     classes('B': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@51
     classes('p': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@51
@@ -72,7 +72,7 @@ LazyJavaPackageFragment@41['<root>'] {
     memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@51
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@41['<root>'] {
     classes('A': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@58
     classes('B': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@58
     classes('p': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@58
@@ -81,7 +81,7 @@ LazyJavaPackageFragment@2['<root>'] {
     memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@58
 }
 
-LazyJavaPackageFragment@25['<root>'] {
+LazyJavaPackageFragment@2['<root>'] {
     classes('A': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@60
     classes('B': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@60
     classes('p': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@60
@@ -97,14 +97,14 @@ LazyJavaPackageFragment@28['java'] {
     memberIndex = computeMemberIndex$1@65 // through LazyPackageFragmentScopeForJavaPackage@63
 }
 
-LazyJavaPackageFragment@8['java'] {
+LazyJavaPackageFragment@43['java'] {
     classes('lang': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@67
     deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@67
     functions('lang': Name@68) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@67
     memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@67
 }
 
-LazyJavaPackageFragment@43['java'] {
+LazyJavaPackageFragment@8['java'] {
     classes('lang': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@71
     deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@71
     functions('lang': Name@72) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@71
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTraitDifferentBounds.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTraitDifferentBounds.lazy.log
index bdd996cd083..11b01401774 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTraitDifferentBounds.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTraitDifferentBounds.lazy.log
@@ -91,7 +91,7 @@ LazyJavaPackageFragmentProvider@55 {
     packageFragments('p.T': FqName@77) = null
 }
 
-LazyJavaPackageFragment@56['<root>'] {
+LazyJavaPackageFragment@33['<root>'] {
     classes('A': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@79
     classes('Array': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@79
     classes('B': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@79
@@ -102,7 +102,7 @@ LazyJavaPackageFragment@56['<root>'] {
     memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@79
 }
 
-LazyJavaPackageFragment@33['<root>'] {
+LazyJavaPackageFragment@56['<root>'] {
     classes('A': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@88
     classes('Array': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@88
     classes('B': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@88
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTraitGenerics.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTraitGenerics.lazy.log
index 5a758da9a15..b2966d2cc60 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTraitGenerics.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTraitGenerics.lazy.log
@@ -65,22 +65,22 @@ LazyJavaPackageFragmentProvider@56 {
     packageFragments('A': FqName@3) = null
     packageFragments('B': FqName@4) = null
     packageFragments('Foo': FqName@6) = null
-    packageFragments('String': FqName@35) = null
+    packageFragments('String': FqName@7) = null
     packageFragments('java': FqName@58) = LazyJavaPackageFragment@59['java']
     packageFragments('java.lang': FqName@60) = LazyJavaPackageFragment@61['lang']
     packageFragments('java.lang.A': FqName@13) = null
     packageFragments('java.lang.B': FqName@14) = null
-    packageFragments('java.lang.String': FqName@42) = null
+    packageFragments('java.lang.String': FqName@16) = null
     packageFragments('kotlin': FqName@62) = null
     packageFragments('kotlin.A': FqName@19) = null
     packageFragments('kotlin.B': FqName@20) = null
-    packageFragments('kotlin.String': FqName@46) = null
+    packageFragments('kotlin.String': FqName@22) = null
     packageFragments('kotlin.io': FqName@63) = null
     packageFragments('kotlin.jvm': FqName@64) = null
     packageFragments('p': FqName@65) = null
-    packageFragments('p.A': FqName@27) = null
-    packageFragments('p.B': FqName@52) = null
-    packageFragments('p.String': FqName@54) = null
+    packageFragments('p.A': FqName@51) = null
+    packageFragments('p.B': FqName@28) = null
+    packageFragments('p.String': FqName@30) = null
 }
 
 LazyJavaPackageFragment@57['<root>'] {
@@ -93,7 +93,7 @@ LazyJavaPackageFragment@57['<root>'] {
     memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@67
 }
 
-LazyJavaPackageFragment@33['<root>'] {
+LazyJavaPackageFragment@2['<root>'] {
     classes('A': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@75
     classes('B': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@75
     classes('String': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@75
@@ -103,7 +103,7 @@ LazyJavaPackageFragment@33['<root>'] {
     memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@75
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@33['<root>'] {
     classes('A': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@77
     classes('B': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@77
     classes('String': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@77
diff --git a/compiler/testData/diagnostics/tests/multimodule/internal.lazy.log b/compiler/testData/diagnostics/tests/multimodule/internal.lazy.log
index b422aaa2120..d7b2d63d7e0 100644
--- a/compiler/testData/diagnostics/tests/multimodule/internal.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/internal.lazy.log
@@ -99,15 +99,6 @@ LazyJavaPackageFragment@22['lang'] {
 
 ResolutionTaskHolder@53 {
     <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
@@ -118,17 +109,8 @@ ResolutionTaskHolder@53 {
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
@@ -139,15 +121,8 @@ ResolutionTaskHolder@57 {
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
@@ -156,114 +131,142 @@ ResolutionTaskHolder@61 {
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
+}
+
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
 
 ResolutionTaskHolder@65 {
     <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
+}
+
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
 
 ResolutionTaskHolder@77 {
     <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
     <name not found> = EmptyList@34[empty]
 }
 
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
+}
+
 ResolutionTaskHolder@89 {
     <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
 }
 
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
+}
+
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
 }
 
 ResolutionTaskHolder@101 {
     <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
 }
 
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
 }
 
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
 }
 
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@127 }
+null {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@109 }
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/packagePrivate.lazy.log b/compiler/testData/diagnostics/tests/multimodule/packagePrivate.lazy.log
index 8564200f802..b48e505d714 100644
--- a/compiler/testData/diagnostics/tests/multimodule/packagePrivate.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/packagePrivate.lazy.log
@@ -34,34 +34,32 @@ LazyJavaPackageFragmentProvider@20 {
     packageFragments('p.c': FqName@19) = null
 }
 
-LazyJavaPackageFragment@10['java'] {
+LazyJavaPackageFragment@23['java'] {
     classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
     deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@31
     functions('lang': Name@33) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@31
     memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@31
 }
 
-LazyJavaPackageFragment@23['java'] {
+LazyJavaPackageFragment@10['java'] {
     classes('lang': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
     deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@37
     functions('lang': Name@38) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
     memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@37
 }
 
-LazyJavaPackageFragment@25['lang'] {
+LazyJavaPackageFragment@12['lang'] {
     classes('a': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
     deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@41
 }
 
-LazyJavaPackageFragment@12['lang'] {
+LazyJavaPackageFragment@25['lang'] {
     classes('a': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@43
     deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@43
 }
 
 ResolutionTaskHolder@44 {
     <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
@@ -71,9 +69,14 @@ ResolutionTaskHolder@44 {
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
+    <name not found> = EmptyList@34[empty]
+}
+
+null {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@46 }
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/namedArguments/allowForJavaAnnotation.lazy.log b/compiler/testData/diagnostics/tests/namedArguments/allowForJavaAnnotation.lazy.log
index 2b0e0e90f90..b3a4c66a9fe 100644
--- a/compiler/testData/diagnostics/tests/namedArguments/allowForJavaAnnotation.lazy.log
+++ b/compiler/testData/diagnostics/tests/namedArguments/allowForJavaAnnotation.lazy.log
@@ -47,5 +47,8 @@ LazyJavaPackageFragment@23['java'] {
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+}
+
+null {
     <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
 }
diff --git a/compiler/testData/diagnostics/tests/namedArguments/disallowForJavaConstructor.lazy.log b/compiler/testData/diagnostics/tests/namedArguments/disallowForJavaConstructor.lazy.log
index 592e220f40d..2cf8851230b 100644
--- a/compiler/testData/diagnostics/tests/namedArguments/disallowForJavaConstructor.lazy.log
+++ b/compiler/testData/diagnostics/tests/namedArguments/disallowForJavaConstructor.lazy.log
@@ -61,9 +61,12 @@ LazyJavaPackageFragment@22['lang'] {
 
 ResolutionTaskHolder@39 {
     <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+}
+
+null {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/namedArguments/disallowForJavaMethods.lazy.log b/compiler/testData/diagnostics/tests/namedArguments/disallowForJavaMethods.lazy.log
index 69b60c0e525..e3cd31b93cc 100644
--- a/compiler/testData/diagnostics/tests/namedArguments/disallowForJavaMethods.lazy.log
+++ b/compiler/testData/diagnostics/tests/namedArguments/disallowForJavaMethods.lazy.log
@@ -112,12 +112,6 @@ LazyJavaPackageFragment@62['lang'] {
 
 ResolutionTaskHolder@87 {
     <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
@@ -143,77 +137,86 @@ ResolutionTaskHolder@87 {
     <name not found> = EmptyList@13[empty]
 }
 
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
 }
 
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
+}
+
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
 }
 
 ResolutionTaskHolder@99 {
     <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
 }
 
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
 }
 
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
+}
+
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
 }
 
 ResolutionTaskHolder@111 {
     <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@113 }
 }
 
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@117 }
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
 }
 
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@121 }
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
 }
 
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@125 }
+ResolutionTaskHolder@120 {
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
 }
 
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@129 }
-}
-
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@133 }
+null {
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@122 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@113 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@119 }
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterConstructor.lazy.log b/compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterConstructor.lazy.log
index a22169a6893..7452fb72479 100644
--- a/compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterConstructor.lazy.log
+++ b/compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterConstructor.lazy.log
@@ -103,13 +103,16 @@ LazyJavaPackageFragment@48['test'] {
 ResolutionTaskHolder@61 {
     <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
     <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[2] { ResolutionCandidate@63, ResolutionCandidate@65 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
 }
+
+null {
+    <name not found> = ArrayList@66[2] { ResolutionCandidate@63, ResolutionCandidate@65 }
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterFunction.lazy.log b/compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterFunction.lazy.log
index 33182ae5d79..760c4aacc7b 100644
--- a/compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterFunction.lazy.log
+++ b/compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterFunction.lazy.log
@@ -113,7 +113,14 @@ LazyJavaPackageFragment@59['test'] {
 ResolutionTaskHolder@70 {
     <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
     <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[2] { ResolutionCandidate@72, ResolutionCandidate@74 }
+    <name not found> = EmptyList@8[empty]
+    <name not found> = EmptyList@8[empty]
+    <name not found> = EmptyList@8[empty]
+    <name not found> = EmptyList@8[empty]
+    <name not found> = EmptyList@8[empty]
+}
+
+ResolutionTaskHolder@75 {
     <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
@@ -124,12 +131,8 @@ ResolutionTaskHolder@70 {
     <name not found> = EmptyList@8[empty]
 }
 
-ResolutionTaskHolder@76 {
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
+null {
+    <name not found> = ArrayList@76[2] { ResolutionCandidate@72, ResolutionCandidate@74 }
     <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
diff --git a/compiler/testData/diagnostics/tests/namedArguments/namedArgumentsAndDefaultValues.lazy.log b/compiler/testData/diagnostics/tests/namedArguments/namedArgumentsAndDefaultValues.lazy.log
index ceeb154aecd..cf9d9b6d4f7 100644
--- a/compiler/testData/diagnostics/tests/namedArguments/namedArgumentsAndDefaultValues.lazy.log
+++ b/compiler/testData/diagnostics/tests/namedArguments/namedArgumentsAndDefaultValues.lazy.log
@@ -49,10 +49,6 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@35 {
     <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
@@ -70,12 +66,8 @@ ResolutionTaskHolder@35 {
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
@@ -93,9 +85,8 @@ ResolutionTaskHolder@39 {
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
@@ -111,6 +102,22 @@ ResolutionTaskHolder@43 {
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
+}
+
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
@@ -118,10 +125,6 @@ ResolutionTaskHolder@43 {
 
 ResolutionTaskHolder@47 {
     <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
@@ -139,12 +142,8 @@ ResolutionTaskHolder@47 {
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
@@ -162,86 +161,83 @@ ResolutionTaskHolder@51 {
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
+}
+
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
 ResolutionTaskHolder@59 {
     <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
+}
+
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
 ResolutionTaskHolder@71 {
     <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
+}
+
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
 ResolutionTaskHolder@83 {
     <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
+}
+
+ResolutionTaskHolder@86 {
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
@@ -249,50 +245,6 @@ ResolutionTaskHolder@83 {
 }
 
 ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
@@ -303,7 +255,58 @@ ResolutionTaskHolder@103 {
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@104 {
+null {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@40 }
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/AssertNotNull.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/AssertNotNull.lazy.log
index 542a6e38f04..48182e82173 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/AssertNotNull.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/AssertNotNull.lazy.log
@@ -50,208 +50,211 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@39 {
     <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@31[empty]
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@50[2] { ResolutionCandidate@51, ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[2] { ResolutionCandidate@51, ResolutionCandidate@52 }
-    <name not found> = EmptyList@31[empty]
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@47[2] { ResolutionCandidate@48, ResolutionCandidate@49 }
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
+}
+
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+}
+
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
 }
 
 ResolutionTaskHolder@62 {
     <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
+}
+
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
 }
 
 ResolutionTaskHolder@74 {
     <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
 }
 
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
+}
+
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
 }
 
 ResolutionTaskHolder@86 {
     <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
+}
+
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
 }
 
 ResolutionTaskHolder@98 {
     <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
 }
 
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
 }
 
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
+}
+
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
 }
 
 ResolutionTaskHolder@110 {
     <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
 }
 
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
+ResolutionTaskHolder@113 {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
 }
 
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
+}
+
+ResolutionTaskHolder@119 {
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
 }
 
 ResolutionTaskHolder@122 {
     <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
 }
 
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
+ResolutionTaskHolder@125 {
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
 }
 
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@132 }
+ResolutionTaskHolder@128 {
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
+}
+
+ResolutionTaskHolder@131 {
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
 }
 
 ResolutionTaskHolder@134 {
     <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@136 }
 }
 
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@140 }
+ResolutionTaskHolder@137 {
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
 }
 
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@144 }
+ResolutionTaskHolder@140 {
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
+}
+
+ResolutionTaskHolder@143 {
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
 }
 
 ResolutionTaskHolder@146 {
     <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@148 }
 }
 
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@152 }
+ResolutionTaskHolder@149 {
+    <name not found> = ArrayList@150[8] { ResolutionCandidate@151, ResolutionCandidate@152, ResolutionCandidate@153, ... }
 }
 
 ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@156 }
+    <name not found> = ArrayList@155[8] { ResolutionCandidate@156, ResolutionCandidate@157, ResolutionCandidate@158, ... }
 }
 
-ResolutionTaskHolder@158 {
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@160 }
+ResolutionTaskHolder@159 {
+    <name not found> = ArrayList@160[8] { ResolutionCandidate@161, ResolutionCandidate@162, ResolutionCandidate@163, ... }
 }
 
-ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@164 }
+ResolutionTaskHolder@164 {
+    <name not found> = ArrayList@165[8] { ResolutionCandidate@166, ResolutionCandidate@167, ResolutionCandidate@168, ... }
 }
 
-ResolutionTaskHolder@166 {
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@168 }
+ResolutionTaskHolder@169 {
+    <name not found> = ArrayList@170[8] { ResolutionCandidate@171, ResolutionCandidate@172, ResolutionCandidate@173, ... }
 }
 
-ResolutionTaskHolder@170 {
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@172 }
-}
-
-ResolutionTaskHolder@174 {
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@176 }
-}
-
-ResolutionTaskHolder@178 {
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@180 }
-}
-
-ResolutionTaskHolder@182 {
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@184 }
-}
-
-ResolutionTaskHolder@186 {
-    <name not found> = ArrayList@187[8] { ResolutionCandidate@188, ResolutionCandidate@189, ResolutionCandidate@190, ... }
-    <name not found> = ArrayList@191[8] { ResolutionCandidate@188, ResolutionCandidate@189, ResolutionCandidate@190, ... }
-}
-
-ResolutionTaskHolder@192 {
-    <name not found> = ArrayList@193[8] { ResolutionCandidate@194, ResolutionCandidate@195, ResolutionCandidate@196, ... }
-    <name not found> = ArrayList@197[8] { ResolutionCandidate@194, ResolutionCandidate@195, ResolutionCandidate@196, ... }
-}
-
-ResolutionTaskHolder@198 {
-    <name not found> = ArrayList@199[8] { ResolutionCandidate@200, ResolutionCandidate@201, ResolutionCandidate@202, ... }
-    <name not found> = ArrayList@203[8] { ResolutionCandidate@200, ResolutionCandidate@201, ResolutionCandidate@202, ... }
-}
-
-ResolutionTaskHolder@204 {
-    <name not found> = ArrayList@205[8] { ResolutionCandidate@206, ResolutionCandidate@207, ResolutionCandidate@208, ... }
-    <name not found> = ArrayList@209[8] { ResolutionCandidate@206, ResolutionCandidate@207, ResolutionCandidate@208, ... }
-}
-
-ResolutionTaskHolder@210 {
-    <name not found> = ArrayList@211[8] { ResolutionCandidate@212, ResolutionCandidate@213, ResolutionCandidate@214, ... }
-    <name not found> = ArrayList@215[8] { ResolutionCandidate@212, ResolutionCandidate@213, ResolutionCandidate@214, ... }
+null {
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@139 }
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@176[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@142 }
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@136 }
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@189[1] { ResolutionCandidate@133 }
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@192[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@148 }
+    <name not found> = ArrayList@194[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@196[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@197[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@198[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@200[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@201[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@202[1] { ResolutionCandidate@145 }
+    <name not found> = ArrayList@203[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@204[1] { ResolutionCandidate@124 }
+    <name not found> = ArrayList@205[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@206[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@207[1] { ResolutionCandidate@127 }
+    <name not found> = ArrayList@208[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@209[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@210[2] { ResolutionCandidate@48, ResolutionCandidate@49 }
+    <name not found> = ArrayList@211[8] { ResolutionCandidate@171, ResolutionCandidate@172, ResolutionCandidate@173, ... }
+    <name not found> = ArrayList@212[8] { ResolutionCandidate@151, ResolutionCandidate@152, ResolutionCandidate@153, ... }
+    <name not found> = ArrayList@213[8] { ResolutionCandidate@156, ResolutionCandidate@157, ResolutionCandidate@158, ... }
+    <name not found> = ArrayList@214[8] { ResolutionCandidate@161, ResolutionCandidate@162, ResolutionCandidate@163, ... }
+    <name not found> = ArrayList@215[8] { ResolutionCandidate@166, ResolutionCandidate@167, ResolutionCandidate@168, ... }
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/InfixCallNullability.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/InfixCallNullability.lazy.log
index 7bae8e2bbdd..0e87667e95e 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/InfixCallNullability.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/InfixCallNullability.lazy.log
@@ -61,13 +61,7 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -92,15 +86,36 @@ ResolutionTaskHolder@40 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@47 {
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
     <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@50 {
     <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -125,15 +140,9 @@ ResolutionTaskHolder@47 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@58[8] { ResolutionCandidate@59, ResolutionCandidate@60, ResolutionCandidate@61, ... }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -158,15 +167,9 @@ ResolutionTaskHolder@54 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
     <name not found> = ArrayList@65[8] { ResolutionCandidate@66, ResolutionCandidate@67, ResolutionCandidate@68, ... }
-    <name not found> = ArrayList@69[8] { ResolutionCandidate@66, ResolutionCandidate@67, ResolutionCandidate@68, ... }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -191,11 +194,9 @@ ResolutionTaskHolder@61 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@74[8] { ResolutionCandidate@75, ResolutionCandidate@76, ResolutionCandidate@77, ... }
-    <name not found> = ArrayList@78[8] { ResolutionCandidate@75, ResolutionCandidate@76, ResolutionCandidate@77, ... }
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@72[8] { ResolutionCandidate@73, ResolutionCandidate@74, ResolutionCandidate@75, ... }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -218,6 +219,29 @@ ResolutionTaskHolder@70 {
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -226,9 +250,6 @@ ResolutionTaskHolder@70 {
 
 ResolutionTaskHolder@79 {
     <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@83[8] { ResolutionCandidate@84, ResolutionCandidate@85, ResolutionCandidate@86, ... }
-    <name not found> = ArrayList@87[8] { ResolutionCandidate@84, ResolutionCandidate@85, ResolutionCandidate@86, ... }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -252,6 +273,57 @@ ResolutionTaskHolder@79 {
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -259,12 +331,6 @@ ResolutionTaskHolder@79 {
 
 ResolutionTaskHolder@88 {
     <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -290,14 +356,8 @@ ResolutionTaskHolder@88 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -323,9 +383,8 @@ ResolutionTaskHolder@92 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -349,6 +408,28 @@ ResolutionTaskHolder@96 {
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -358,362 +439,152 @@ ResolutionTaskHolder@96 {
 
 ResolutionTaskHolder@100 {
     <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
 ResolutionTaskHolder@112 {
     <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@115 {
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
 }
 
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@118 {
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
+}
+
+ResolutionTaskHolder@121 {
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
 }
 
 ResolutionTaskHolder@124 {
     <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@126 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@127 {
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
 }
 
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@130 {
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
+}
+
+ResolutionTaskHolder@133 {
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
 }
 
 ResolutionTaskHolder@136 {
     <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
+ResolutionTaskHolder@139 {
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
 }
 
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
+ResolutionTaskHolder@142 {
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
+}
+
+ResolutionTaskHolder@145 {
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
 }
 
 ResolutionTaskHolder@148 {
     <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
 }
 
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
+ResolutionTaskHolder@151 {
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
 }
 
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
+ResolutionTaskHolder@154 {
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
+}
+
+ResolutionTaskHolder@157 {
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
 }
 
 ResolutionTaskHolder@160 {
     <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@162 }
 }
 
-ResolutionTaskHolder@164 {
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@166 }
+ResolutionTaskHolder@163 {
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
 }
 
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@170 }
+ResolutionTaskHolder@166 {
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
+}
+
+ResolutionTaskHolder@169 {
+    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
 }
 
 ResolutionTaskHolder@172 {
     <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@174 }
 }
 
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@178 }
+ResolutionTaskHolder@175 {
+    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
 }
 
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@182 }
+ResolutionTaskHolder@178 {
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
+}
+
+ResolutionTaskHolder@181 {
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
 }
 
 ResolutionTaskHolder@184 {
     <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@186 }
 }
 
-ResolutionTaskHolder@188 {
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@190 }
+ResolutionTaskHolder@187 {
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
 }
 
-ResolutionTaskHolder@192 {
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@194 }
+ResolutionTaskHolder@190 {
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@192 }
+}
+
+ResolutionTaskHolder@193 {
+    <name not found> = ArrayList@194[1] { ResolutionCandidate@195 }
 }
 
 ResolutionTaskHolder@196 {
     <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@198 }
 }
 
-ResolutionTaskHolder@200 {
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@202 }
+ResolutionTaskHolder@199 {
+    <name not found> = ArrayList@200[1] { ResolutionCandidate@201 }
 }
 
-ResolutionTaskHolder@204 {
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@206 }
-}
-
-ResolutionTaskHolder@208 {
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@210 }
-}
-
-ResolutionTaskHolder@212 {
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@214 }
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@214 }
-}
-
-ResolutionTaskHolder@216 {
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@218 }
-}
-
-ResolutionTaskHolder@220 {
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@222 }
-}
-
-ResolutionTaskHolder@224 {
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@226 }
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@226 }
-}
-
-ResolutionTaskHolder@228 {
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@230 }
-}
-
-ResolutionTaskHolder@232 {
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@234 }
-}
-
-ResolutionTaskHolder@236 {
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@238 }
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@238 }
-}
-
-ResolutionTaskHolder@240 {
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
-    <name not found> = ArrayList@243[1] { ResolutionCandidate@242 }
-}
-
-ResolutionTaskHolder@244 {
-    <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@246 }
-}
-
-ResolutionTaskHolder@248 {
-    <name not found> = ArrayList@249[1] { ResolutionCandidate@250 }
-    <name not found> = ArrayList@251[1] { ResolutionCandidate@250 }
-}
-
-ResolutionTaskHolder@252 {
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
-    <name not found> = ArrayList@255[1] { ResolutionCandidate@254 }
-}
-
-ResolutionTaskHolder@256 {
-    <name not found> = ArrayList@257[8] { ResolutionCandidate@258, ResolutionCandidate@259, ResolutionCandidate@260, ... }
-    <name not found> = ArrayList@261[8] { ResolutionCandidate@258, ResolutionCandidate@259, ResolutionCandidate@260, ... }
+ResolutionTaskHolder@202 {
+    <name not found> = ArrayList@203[8] { ResolutionCandidate@204, ResolutionCandidate@205, ResolutionCandidate@206, ... }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -737,6 +608,28 @@ ResolutionTaskHolder@256 {
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@207 {
+    <name not found> = ArrayList@208[8] { ResolutionCandidate@209, ResolutionCandidate@210, ResolutionCandidate@211, ... }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -744,45 +637,155 @@ ResolutionTaskHolder@256 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@262 {
-    <name not found> = ArrayList@263[8] { ResolutionCandidate@264, ResolutionCandidate@265, ResolutionCandidate@266, ... }
-    <name not found> = ArrayList@267[8] { ResolutionCandidate@264, ResolutionCandidate@265, ResolutionCandidate@266, ... }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@212 {
+    <name not found> = ArrayList@213[8] { ResolutionCandidate@214, ResolutionCandidate@215, ResolutionCandidate@216, ... }
 }
 
-ResolutionTaskHolder@268 {
-    <name not found> = ArrayList@269[8] { ResolutionCandidate@270, ResolutionCandidate@271, ResolutionCandidate@272, ... }
-    <name not found> = ArrayList@273[8] { ResolutionCandidate@270, ResolutionCandidate@271, ResolutionCandidate@272, ... }
+ResolutionTaskHolder@217 {
+    <name not found> = ArrayList@218[8] { ResolutionCandidate@219, ResolutionCandidate@220, ResolutionCandidate@221, ... }
 }
 
-ResolutionTaskHolder@274 {
-    <name not found> = ArrayList@275[8] { ResolutionCandidate@276, ResolutionCandidate@277, ResolutionCandidate@278, ... }
-    <name not found> = ArrayList@279[8] { ResolutionCandidate@276, ResolutionCandidate@277, ResolutionCandidate@278, ... }
+null {
+    <name not found> = ArrayList@222[1] { ResolutionCandidate@168 }
+    <name not found> = ArrayList@223[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@224[1] { ResolutionCandidate@141 }
+    <name not found> = ArrayList@225[1] { ResolutionCandidate@186 }
+    <name not found> = ArrayList@226[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@192 }
+    <name not found> = ArrayList@228[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@195 }
+    <name not found> = ArrayList@231[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@232[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@233[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@234[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@235[1] { ResolutionCandidate@180 }
+    <name not found> = ArrayList@236[1] { ResolutionCandidate@189 }
+    <name not found> = ArrayList@237[1] { ResolutionCandidate@159 }
+    <name not found> = ArrayList@238[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@239[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@240[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@241[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@242[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@243[1] { ResolutionCandidate@162 }
+    <name not found> = ArrayList@244[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@245[1] { ResolutionCandidate@153 }
+    <name not found> = ArrayList@246[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@247[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@248[1] { ResolutionCandidate@147 }
+    <name not found> = ArrayList@249[1] { ResolutionCandidate@171 }
+    <name not found> = ArrayList@250[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@251[1] { ResolutionCandidate@126 }
+    <name not found> = ArrayList@252[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@253[1] { ResolutionCandidate@129 }
+    <name not found> = ArrayList@254[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@255[1] { ResolutionCandidate@174 }
+    <name not found> = ArrayList@256[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@257[1] { ResolutionCandidate@135 }
+    <name not found> = ArrayList@258[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@259[1] { ResolutionCandidate@198 }
+    <name not found> = ArrayList@260[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@261[1] { ResolutionCandidate@183 }
+    <name not found> = ArrayList@262[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@263[1] { ResolutionCandidate@132 }
+    <name not found> = ArrayList@264[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@265[1] { ResolutionCandidate@165 }
+    <name not found> = ArrayList@266[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@267[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@268[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@269[1] { ResolutionCandidate@201 }
+    <name not found> = ArrayList@270[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@271[1] { ResolutionCandidate@177 }
+    <name not found> = ArrayList@272[1] { ResolutionCandidate@156 }
+    <name not found> = ArrayList@273[8] { ResolutionCandidate@66, ResolutionCandidate@67, ResolutionCandidate@68, ... }
+    <name not found> = ArrayList@274[8] { ResolutionCandidate@219, ResolutionCandidate@220, ResolutionCandidate@221, ... }
+    <name not found> = ArrayList@275[8] { ResolutionCandidate@59, ResolutionCandidate@60, ResolutionCandidate@61, ... }
+    <name not found> = ArrayList@276[8] { ResolutionCandidate@73, ResolutionCandidate@74, ResolutionCandidate@75, ... }
+    <name not found> = ArrayList@277[8] { ResolutionCandidate@209, ResolutionCandidate@210, ResolutionCandidate@211, ... }
+    <name not found> = ArrayList@278[8] { ResolutionCandidate@204, ResolutionCandidate@205, ResolutionCandidate@206, ... }
+    <name not found> = ArrayList@279[8] { ResolutionCandidate@214, ResolutionCandidate@215, ResolutionCandidate@216, ... }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/NullableNothingIsExactlyNull.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/NullableNothingIsExactlyNull.lazy.log
index 3cac6fabbe3..05c67e988a4 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/NullableNothingIsExactlyNull.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/NullableNothingIsExactlyNull.lazy.log
@@ -42,58 +42,61 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[16] { ResolutionCandidate@33, ResolutionCandidate@34, ResolutionCandidate@35, ... }
-    <name not found> = ArrayList@36[16] { ResolutionCandidate@33, ResolutionCandidate@34, ResolutionCandidate@35, ... }
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[16] { ResolutionCandidate@39, ResolutionCandidate@40, ResolutionCandidate@41, ... }
-    <name not found> = ArrayList@42[16] { ResolutionCandidate@39, ResolutionCandidate@40, ResolutionCandidate@41, ... }
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[16] { ResolutionCandidate@38, ResolutionCandidate@39, ResolutionCandidate@40, ... }
 }
 
-ResolutionTaskHolder@43 {
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
     <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@23[empty]
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
     <name not found> = EmptyList@23[empty]
 }
 
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
+}
+
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+}
+
 ResolutionTaskHolder@57 {
     <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
+null {
+    <name not found> = ArrayList@69[16] { ResolutionCandidate@33, ResolutionCandidate@34, ResolutionCandidate@35, ... }
+    <name not found> = ArrayList@70[16] { ResolutionCandidate@38, ResolutionCandidate@39, ResolutionCandidate@40, ... }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@65 }
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/PreferExtensionsOnNullableReceiver.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/PreferExtensionsOnNullableReceiver.lazy.log
index 4f003bc46b5..10648571645 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/PreferExtensionsOnNullableReceiver.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/PreferExtensionsOnNullableReceiver.lazy.log
@@ -37,14 +37,17 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@20[empty]
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
+}
+
+null {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@32 }
+    <name not found> = EmptyList@20[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/QualifiedExpressionNullability.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/QualifiedExpressionNullability.lazy.log
index 3d038b94d49..e13f24a8e52 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/QualifiedExpressionNullability.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/QualifiedExpressionNullability.lazy.log
@@ -41,12 +41,6 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@32 {
     <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -72,14 +66,8 @@ ResolutionTaskHolder@32 {
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -105,9 +93,8 @@ ResolutionTaskHolder@36 {
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -131,6 +118,28 @@ ResolutionTaskHolder@40 {
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
+}
+
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -140,12 +149,6 @@ ResolutionTaskHolder@40 {
 
 ResolutionTaskHolder@44 {
     <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -171,14 +174,8 @@ ResolutionTaskHolder@44 {
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -204,14 +201,8 @@ ResolutionTaskHolder@48 {
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -237,370 +228,382 @@ ResolutionTaskHolder@52 {
     <name not found> = EmptyList@24[empty]
 }
 
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
+}
+
 ResolutionTaskHolder@56 {
     <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
+}
+
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
 }
 
 ResolutionTaskHolder@68 {
     <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
 }
 
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
+}
+
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
 }
 
 ResolutionTaskHolder@80 {
     <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
 }
 
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
 }
 
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
+}
+
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
 }
 
 ResolutionTaskHolder@92 {
     <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
 }
 
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
 }
 
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
+}
+
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
 }
 
 ResolutionTaskHolder@104 {
     <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
 }
 
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
 }
 
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
+}
+
+ResolutionTaskHolder@113 {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
 }
 
 ResolutionTaskHolder@116 {
     <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
 }
 
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
+ResolutionTaskHolder@119 {
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
 }
 
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@126 }
+ResolutionTaskHolder@122 {
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
+}
+
+ResolutionTaskHolder@125 {
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
 }
 
 ResolutionTaskHolder@128 {
     <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
 }
 
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
+ResolutionTaskHolder@131 {
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
 }
 
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
+ResolutionTaskHolder@134 {
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
+}
+
+ResolutionTaskHolder@137 {
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
 }
 
 ResolutionTaskHolder@140 {
     <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
 }
 
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
+ResolutionTaskHolder@143 {
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
 }
 
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
+ResolutionTaskHolder@146 {
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
+}
+
+ResolutionTaskHolder@149 {
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
 }
 
 ResolutionTaskHolder@152 {
     <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
 }
 
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
+ResolutionTaskHolder@155 {
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
 }
 
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@162 }
+ResolutionTaskHolder@158 {
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
+}
+
+ResolutionTaskHolder@161 {
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
 }
 
 ResolutionTaskHolder@164 {
     <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@166 }
 }
 
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@170 }
+ResolutionTaskHolder@167 {
+    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
 }
 
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@174 }
+ResolutionTaskHolder@170 {
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
+}
+
+ResolutionTaskHolder@173 {
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
 }
 
 ResolutionTaskHolder@176 {
     <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@178 }
 }
 
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@182 }
+ResolutionTaskHolder@179 {
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
 }
 
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@186 }
+ResolutionTaskHolder@182 {
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
+}
+
+ResolutionTaskHolder@185 {
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
 }
 
 ResolutionTaskHolder@188 {
     <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@190 }
 }
 
-ResolutionTaskHolder@192 {
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@194 }
+ResolutionTaskHolder@191 {
+    <name not found> = ArrayList@192[1] { ResolutionCandidate@193 }
 }
 
-ResolutionTaskHolder@196 {
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@198 }
+ResolutionTaskHolder@194 {
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@196 }
+}
+
+ResolutionTaskHolder@197 {
+    <name not found> = ArrayList@198[1] { ResolutionCandidate@199 }
 }
 
 ResolutionTaskHolder@200 {
     <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@202 }
 }
 
-ResolutionTaskHolder@204 {
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@206 }
+ResolutionTaskHolder@203 {
+    <name not found> = ArrayList@204[1] { ResolutionCandidate@205 }
 }
 
-ResolutionTaskHolder@208 {
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@210 }
+ResolutionTaskHolder@206 {
+    <name not found> = ArrayList@207[1] { ResolutionCandidate@208 }
+}
+
+ResolutionTaskHolder@209 {
+    <name not found> = ArrayList@210[1] { ResolutionCandidate@211 }
 }
 
 ResolutionTaskHolder@212 {
     <name not found> = ArrayList@213[1] { ResolutionCandidate@214 }
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@214 }
 }
 
-ResolutionTaskHolder@216 {
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@218 }
+ResolutionTaskHolder@215 {
+    <name not found> = ArrayList@216[1] { ResolutionCandidate@217 }
 }
 
-ResolutionTaskHolder@220 {
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@222 }
+ResolutionTaskHolder@218 {
+    <name not found> = ArrayList@219[1] { ResolutionCandidate@220 }
+}
+
+ResolutionTaskHolder@221 {
+    <name not found> = ArrayList@222[1] { ResolutionCandidate@223 }
 }
 
 ResolutionTaskHolder@224 {
     <name not found> = ArrayList@225[1] { ResolutionCandidate@226 }
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@226 }
 }
 
-ResolutionTaskHolder@228 {
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@230 }
+ResolutionTaskHolder@227 {
+    <name not found> = ArrayList@228[1] { ResolutionCandidate@229 }
 }
 
-ResolutionTaskHolder@232 {
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@234 }
+ResolutionTaskHolder@230 {
+    <name not found> = ArrayList@231[1] { ResolutionCandidate@232 }
+}
+
+ResolutionTaskHolder@233 {
+    <name not found> = ArrayList@234[1] { ResolutionCandidate@235 }
 }
 
 ResolutionTaskHolder@236 {
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@238 }
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@238 }
+    <name not found> = ArrayList@237[2] { ResolutionCandidate@238, ResolutionCandidate@239 }
 }
 
 ResolutionTaskHolder@240 {
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
-    <name not found> = ArrayList@243[1] { ResolutionCandidate@242 }
+    <name not found> = ArrayList@241[2] { ResolutionCandidate@242, ResolutionCandidate@243 }
 }
 
 ResolutionTaskHolder@244 {
-    <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@246 }
+    <name not found> = ArrayList@245[2] { ResolutionCandidate@246, ResolutionCandidate@247 }
 }
 
 ResolutionTaskHolder@248 {
-    <name not found> = ArrayList@249[1] { ResolutionCandidate@250 }
-    <name not found> = ArrayList@251[1] { ResolutionCandidate@250 }
+    <name not found> = ArrayList@249[2] { ResolutionCandidate@250, ResolutionCandidate@251 }
 }
 
 ResolutionTaskHolder@252 {
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
-    <name not found> = ArrayList@255[1] { ResolutionCandidate@254 }
+    <name not found> = ArrayList@253[2] { ResolutionCandidate@254, ResolutionCandidate@255 }
 }
 
 ResolutionTaskHolder@256 {
-    <name not found> = ArrayList@257[1] { ResolutionCandidate@258 }
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@258 }
+    <name not found> = ArrayList@257[2] { ResolutionCandidate@258, ResolutionCandidate@259 }
 }
 
-ResolutionTaskHolder@260 {
-    <name not found> = ArrayList@261[1] { ResolutionCandidate@262 }
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@262 }
-}
-
-ResolutionTaskHolder@264 {
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
-    <name not found> = ArrayList@267[1] { ResolutionCandidate@266 }
-}
-
-ResolutionTaskHolder@268 {
-    <name not found> = ArrayList@269[1] { ResolutionCandidate@270 }
-    <name not found> = ArrayList@271[1] { ResolutionCandidate@270 }
-}
-
-ResolutionTaskHolder@272 {
-    <name not found> = ArrayList@273[1] { ResolutionCandidate@274 }
-    <name not found> = ArrayList@275[1] { ResolutionCandidate@274 }
-}
-
-ResolutionTaskHolder@276 {
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
-    <name not found> = ArrayList@279[1] { ResolutionCandidate@278 }
-}
-
-ResolutionTaskHolder@280 {
-    <name not found> = ArrayList@281[1] { ResolutionCandidate@282 }
-    <name not found> = ArrayList@283[1] { ResolutionCandidate@282 }
-}
-
-ResolutionTaskHolder@284 {
-    <name not found> = ArrayList@285[1] { ResolutionCandidate@286 }
-    <name not found> = ArrayList@287[1] { ResolutionCandidate@286 }
-}
-
-ResolutionTaskHolder@288 {
-    <name not found> = ArrayList@289[1] { ResolutionCandidate@290 }
-    <name not found> = ArrayList@291[1] { ResolutionCandidate@290 }
-}
-
-ResolutionTaskHolder@292 {
-    <name not found> = ArrayList@293[1] { ResolutionCandidate@294 }
-    <name not found> = ArrayList@295[1] { ResolutionCandidate@294 }
-}
-
-ResolutionTaskHolder@296 {
-    <name not found> = ArrayList@297[1] { ResolutionCandidate@298 }
-    <name not found> = ArrayList@299[1] { ResolutionCandidate@298 }
-}
-
-ResolutionTaskHolder@300 {
-    <name not found> = ArrayList@301[1] { ResolutionCandidate@302 }
-    <name not found> = ArrayList@303[1] { ResolutionCandidate@302 }
-}
-
-ResolutionTaskHolder@304 {
-    <name not found> = ArrayList@305[2] { ResolutionCandidate@306, ResolutionCandidate@307 }
-    <name not found> = ArrayList@308[2] { ResolutionCandidate@306, ResolutionCandidate@307 }
-}
-
-ResolutionTaskHolder@309 {
-    <name not found> = ArrayList@310[2] { ResolutionCandidate@311, ResolutionCandidate@312 }
-    <name not found> = ArrayList@313[2] { ResolutionCandidate@311, ResolutionCandidate@312 }
-}
-
-ResolutionTaskHolder@314 {
-    <name not found> = ArrayList@315[2] { ResolutionCandidate@316, ResolutionCandidate@317 }
-    <name not found> = ArrayList@318[2] { ResolutionCandidate@316, ResolutionCandidate@317 }
-}
-
-ResolutionTaskHolder@319 {
-    <name not found> = ArrayList@320[2] { ResolutionCandidate@321, ResolutionCandidate@322 }
-    <name not found> = ArrayList@323[2] { ResolutionCandidate@321, ResolutionCandidate@322 }
-}
-
-ResolutionTaskHolder@324 {
-    <name not found> = ArrayList@325[2] { ResolutionCandidate@326, ResolutionCandidate@327 }
-    <name not found> = ArrayList@328[2] { ResolutionCandidate@326, ResolutionCandidate@327 }
-}
-
-ResolutionTaskHolder@329 {
-    <name not found> = ArrayList@330[2] { ResolutionCandidate@331, ResolutionCandidate@332 }
-    <name not found> = ArrayList@333[2] { ResolutionCandidate@331, ResolutionCandidate@332 }
+null {
+    <name not found> = ArrayList@260[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@261[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@262[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@263[1] { ResolutionCandidate@187 }
+    <name not found> = ArrayList@264[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@265[1] { ResolutionCandidate@214 }
+    <name not found> = ArrayList@266[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@267[1] { ResolutionCandidate@220 }
+    <name not found> = ArrayList@268[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@269[1] { ResolutionCandidate@202 }
+    <name not found> = ArrayList@270[1] { ResolutionCandidate@163 }
+    <name not found> = ArrayList@271[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@272[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@273[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@274[1] { ResolutionCandidate@193 }
+    <name not found> = ArrayList@275[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@276[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@277[1] { ResolutionCandidate@232 }
+    <name not found> = ArrayList@278[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@279[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@280[1] { ResolutionCandidate@235 }
+    <name not found> = ArrayList@281[1] { ResolutionCandidate@184 }
+    <name not found> = ArrayList@282[1] { ResolutionCandidate@124 }
+    <name not found> = ArrayList@283[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@284[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@285[1] { ResolutionCandidate@157 }
+    <name not found> = ArrayList@286[1] { ResolutionCandidate@133 }
+    <name not found> = ArrayList@287[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@288[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@289[1] { ResolutionCandidate@166 }
+    <name not found> = ArrayList@290[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@291[1] { ResolutionCandidate@205 }
+    <name not found> = ArrayList@292[1] { ResolutionCandidate@196 }
+    <name not found> = ArrayList@293[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@294[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@295[1] { ResolutionCandidate@223 }
+    <name not found> = ArrayList@296[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@297[1] { ResolutionCandidate@151 }
+    <name not found> = ArrayList@298[1] { ResolutionCandidate@190 }
+    <name not found> = ArrayList@299[1] { ResolutionCandidate@178 }
+    <name not found> = ArrayList@300[1] { ResolutionCandidate@169 }
+    <name not found> = ArrayList@301[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@302[1] { ResolutionCandidate@139 }
+    <name not found> = ArrayList@303[1] { ResolutionCandidate@208 }
+    <name not found> = ArrayList@304[1] { ResolutionCandidate@172 }
+    <name not found> = ArrayList@305[1] { ResolutionCandidate@181 }
+    <name not found> = ArrayList@306[1] { ResolutionCandidate@145 }
+    <name not found> = ArrayList@307[1] { ResolutionCandidate@211 }
+    <name not found> = ArrayList@308[1] { ResolutionCandidate@175 }
+    <name not found> = ArrayList@309[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@310[1] { ResolutionCandidate@160 }
+    <name not found> = ArrayList@311[1] { ResolutionCandidate@127 }
+    <name not found> = ArrayList@312[1] { ResolutionCandidate@229 }
+    <name not found> = ArrayList@313[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@314[1] { ResolutionCandidate@217 }
+    <name not found> = ArrayList@315[1] { ResolutionCandidate@136 }
+    <name not found> = ArrayList@316[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@317[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@318[1] { ResolutionCandidate@148 }
+    <name not found> = ArrayList@319[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@320[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@321[1] { ResolutionCandidate@199 }
+    <name not found> = ArrayList@322[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@323[1] { ResolutionCandidate@226 }
+    <name not found> = ArrayList@324[1] { ResolutionCandidate@154 }
+    <name not found> = ArrayList@325[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@326[1] { ResolutionCandidate@142 }
+    <name not found> = ArrayList@327[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@328[2] { ResolutionCandidate@250, ResolutionCandidate@251 }
+    <name not found> = ArrayList@329[2] { ResolutionCandidate@258, ResolutionCandidate@259 }
+    <name not found> = ArrayList@330[2] { ResolutionCandidate@242, ResolutionCandidate@243 }
+    <name not found> = ArrayList@331[2] { ResolutionCandidate@246, ResolutionCandidate@247 }
+    <name not found> = ArrayList@332[2] { ResolutionCandidate@238, ResolutionCandidate@239 }
+    <name not found> = ArrayList@333[2] { ResolutionCandidate@254, ResolutionCandidate@255 }
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/ReceiverNullability.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/ReceiverNullability.lazy.log
index 3096f0d8c73..7b2feebadd2 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/ReceiverNullability.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/ReceiverNullability.lazy.log
@@ -41,18 +41,6 @@ LazyJavaPackageFragment@7['lang'] {
 
 ResolutionTaskHolder@26 {
     <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
@@ -102,20 +90,8 @@ ResolutionTaskHolder@26 {
     <name not found> = EmptyList@18[empty]
 }
 
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
+ResolutionTaskHolder@29 {
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
@@ -165,9 +141,8 @@ ResolutionTaskHolder@30 {
     <name not found> = EmptyList@18[empty]
 }
 
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
@@ -199,6 +174,34 @@ ResolutionTaskHolder@34 {
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
+}
+
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
@@ -210,22 +213,6 @@ ResolutionTaskHolder@34 {
 
 ResolutionTaskHolder@38 {
     <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
@@ -251,14 +238,8 @@ ResolutionTaskHolder@38 {
     <name not found> = EmptyList@18[empty]
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
@@ -284,32 +265,17 @@ ResolutionTaskHolder@42 {
     <name not found> = EmptyList@18[empty]
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
+}
+
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
@@ -319,12 +285,6 @@ ResolutionTaskHolder@46 {
 
 ResolutionTaskHolder@50 {
     <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
@@ -332,31 +292,22 @@ ResolutionTaskHolder@50 {
     <name not found> = EmptyList@18[empty]
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
+}
+
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
@@ -364,32 +315,27 @@ ResolutionTaskHolder@58 {
 
 ResolutionTaskHolder@62 {
     <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
+}
+
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
@@ -397,130 +343,187 @@ ResolutionTaskHolder@70 {
 
 ResolutionTaskHolder@74 {
     <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
 }
 
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
+}
+
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
 }
 
 ResolutionTaskHolder@86 {
     <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
+}
+
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
 }
 
 ResolutionTaskHolder@98 {
     <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
 }
 
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
 }
 
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
+}
+
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
 }
 
 ResolutionTaskHolder@110 {
     <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
 }
 
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
+ResolutionTaskHolder@113 {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
 }
 
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@132 }
-}
-
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@136 }
-}
-
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@140 }
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@144 }
+null {
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@28 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@55 }
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/SenselessNullInWhen.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/SenselessNullInWhen.lazy.log
index 9795a3de66a..3937a13d17b 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/SenselessNullInWhen.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/SenselessNullInWhen.lazy.log
@@ -21,5 +21,8 @@ LazyJavaPackageFragment@5['java'] {
 
 ResolutionTaskHolder@21 {
     <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
+}
+
+null {
     <name not found> = ArrayList@24[1] { ResolutionCandidate@23 }
 }
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/dataFlowInfoAfterExclExcl.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/dataFlowInfoAfterExclExcl.lazy.log
index c1226be9eef..2fa27ed839b 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/dataFlowInfoAfterExclExcl.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/dataFlowInfoAfterExclExcl.lazy.log
@@ -42,34 +42,37 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
 }
 
 ResolutionTaskHolder@43 {
     <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+null {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@39 }
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/equalityUnderNotNullCheck.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/equalityUnderNotNullCheck.lazy.log
index cc6d4552a35..e6768f06e13 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/equalityUnderNotNullCheck.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/equalityUnderNotNullCheck.lazy.log
@@ -27,15 +27,18 @@ LazyJavaPackageFragment@6['java'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[3] { ResolutionCandidate@35, ResolutionCandidate@36, ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[3] { ResolutionCandidate@35, ResolutionCandidate@36, ResolutionCandidate@37 }
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[3] { ResolutionCandidate@33, ResolutionCandidate@34, ResolutionCandidate@35 }
+}
+
+null {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@27 }
+    <name not found> = ArrayList@38[3] { ResolutionCandidate@33, ResolutionCandidate@34, ResolutionCandidate@35 }
 }
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/funcLiteralArgsInsideAmbiguity.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/funcLiteralArgsInsideAmbiguity.lazy.log
index 9347840df20..c17ba0695d0 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/funcLiteralArgsInsideAmbiguity.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/funcLiteralArgsInsideAmbiguity.lazy.log
@@ -38,52 +38,55 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[16] { ResolutionCandidate@33, ResolutionCandidate@34, ResolutionCandidate@35, ... }
-    <name not found> = ArrayList@36[16] { ResolutionCandidate@33, ResolutionCandidate@34, ResolutionCandidate@35, ... }
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[16] { ResolutionCandidate@39, ResolutionCandidate@40, ResolutionCandidate@41, ... }
-    <name not found> = ArrayList@42[16] { ResolutionCandidate@39, ResolutionCandidate@40, ResolutionCandidate@41, ... }
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[16] { ResolutionCandidate@38, ResolutionCandidate@39, ResolutionCandidate@40, ... }
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[16] { ResolutionCandidate@45, ResolutionCandidate@46, ResolutionCandidate@47, ... }
-    <name not found> = ArrayList@48[16] { ResolutionCandidate@45, ResolutionCandidate@46, ResolutionCandidate@47, ... }
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[16] { ResolutionCandidate@43, ResolutionCandidate@44, ResolutionCandidate@45, ... }
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
+}
+
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+}
+
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
 }
 
 ResolutionTaskHolder@60 {
     <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[2] { ResolutionCandidate@65, ResolutionCandidate@66 }
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[2] { ResolutionCandidate@74, ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[2] { ResolutionCandidate@74, ResolutionCandidate@75 }
-    <name not found> = EmptyList@25[empty]
+null {
+    <name not found> = ArrayList@67[16] { ResolutionCandidate@38, ResolutionCandidate@39, ResolutionCandidate@40, ... }
+    <name not found> = ArrayList@68[16] { ResolutionCandidate@43, ResolutionCandidate@44, ResolutionCandidate@45, ... }
+    <name not found> = ArrayList@69[16] { ResolutionCandidate@33, ResolutionCandidate@34, ResolutionCandidate@35, ... }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@76[2] { ResolutionCandidate@65, ResolutionCandidate@66 }
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/funcLiteralArgsInsideUnresolvedFunction.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/funcLiteralArgsInsideUnresolvedFunction.lazy.log
index 1f9071a33c4..848daf734e4 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/funcLiteralArgsInsideUnresolvedFunction.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/funcLiteralArgsInsideUnresolvedFunction.lazy.log
@@ -38,33 +38,23 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[16] { ResolutionCandidate@33, ResolutionCandidate@34, ResolutionCandidate@35, ... }
-    <name not found> = ArrayList@36[16] { ResolutionCandidate@33, ResolutionCandidate@34, ResolutionCandidate@35, ... }
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
     <name not found> = EmptyList@25[empty]
 }
 
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
+}
+
 ResolutionTaskHolder@44 {
     <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@47 {
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
@@ -83,9 +73,7 @@ ResolutionTaskHolder@52 {
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@48 {
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
@@ -95,3 +83,18 @@ ResolutionTaskHolder@53 {
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
+
+null {
+    <name not found> = ArrayList@49[16] { ResolutionCandidate@33, ResolutionCandidate@34, ResolutionCandidate@35, ... }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@43 }
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt1270.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt1270.lazy.log
index 90c43f6948f..3a311d4bc1d 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt1270.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt1270.lazy.log
@@ -76,14 +76,14 @@ LazyJavaClassifierType@63['K'] {
     arguments = ArrayList@64[empty]
     classifier = JavaTypeParameterImpl@65['K']
     nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
 }
 
-LazyJavaClassifierType@67['K'] {
-    arguments = ArrayList@68[empty]
-    classifier = JavaTypeParameterImpl@69['K']
+LazyJavaClassifierType@66['K'] {
+    arguments = ArrayList@67[empty]
+    classifier = JavaTypeParameterImpl@68['K']
     nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
 }
 
 LazyJavaClassifierType@70['K'] {
@@ -95,16 +95,16 @@ LazyJavaClassifierType@70['K'] {
 
 LazyJavaClassifierType@73['K'] {
     arguments = ArrayList@74[empty]
-    classifier = JavaTypeParameterImpl@57['K']
+    classifier = JavaTypeParameterImpl@62['K']
     nullable = 'true': Boolean@75
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
 }
 
 LazyJavaClassifierType@76['K'] {
     arguments = ArrayList@77[empty]
-    classifier = JavaTypeParameterImpl@65['K']
+    classifier = JavaTypeParameterImpl@68['K']
     nullable = 'true': Boolean@75
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
 }
 
 LazyJavaClassifierType@78['K'] {
@@ -116,14 +116,14 @@ LazyJavaClassifierType@78['K'] {
 
 LazyJavaClassifierType@80['K'] {
     arguments = ArrayList@81[empty]
-    classifier = JavaTypeParameterImpl@69['K']
+    classifier = JavaTypeParameterImpl@65['K']
     nullable = 'true': Boolean@75
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
 }
 
 LazyJavaClassifierType@82['K'] {
     arguments = ArrayList@83[empty]
-    classifier = JavaTypeParameterImpl@62['K']
+    classifier = JavaTypeParameterImpl@57['K']
     nullable = 'true': Boolean@75
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
 }
@@ -144,14 +144,14 @@ LazyJavaClassifierType@91['Map<? extends K, ? extends V>'] {
     typeConstructor = DeserializedClassTypeConstructor@96
 }
 
-LazyJavaClassifierType@41['Map<K, V>'] {
+LazyJavaClassifierType@35['Map<K, V>'] {
     arguments = ArrayList@97[2] { TypeProjectionImpl@98, TypeProjectionImpl@99 }
     classifier = JavaClassImpl@100['Map']
     memberScope = SubstitutingScope@101
     typeConstructor = DeserializedClassTypeConstructor@90
 }
 
-LazyJavaClassifierType@35['Map<K, V>'] {
+LazyJavaClassifierType@41['Map<K, V>'] {
     arguments = ArrayList@102[2] { TypeProjectionImpl@103, TypeProjectionImpl@104 }
     classifier = JavaClassImpl@105['Map']
     memberScope = SubstitutingScope@106
@@ -218,91 +218,91 @@ LazyJavaClassifierType@130['V'] {
     arguments = ArrayList@131[empty]
     classifier = JavaTypeParameterImpl@132['V']
     nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@133
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@129
 }
 
-LazyJavaClassifierType@134['V'] {
-    arguments = ArrayList@135[empty]
-    classifier = JavaTypeParameterImpl@136['V']
-    nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@133
-}
-
-LazyJavaClassifierType@137['V'] {
-    arguments = ArrayList@138[empty]
-    classifier = JavaTypeParameterImpl@139['V']
+LazyJavaClassifierType@133['V'] {
+    arguments = ArrayList@134[empty]
+    classifier = JavaTypeParameterImpl@135['V']
     nullable = 'false': Boolean@58
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@129
 }
 
+LazyJavaClassifierType@136['V'] {
+    arguments = ArrayList@137[empty]
+    classifier = JavaTypeParameterImpl@138['V']
+    nullable = 'false': Boolean@58
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@139
+}
+
 LazyJavaClassifierType@140['V'] {
     arguments = ArrayList@141[empty]
     classifier = JavaTypeParameterImpl@142['V']
     nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@133
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@129
 }
 
 LazyJavaClassifierType@143['V'] {
     arguments = ArrayList@144[empty]
     classifier = JavaTypeParameterImpl@145['V']
     nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@133
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@139
 }
 
 LazyJavaClassifierType@146['V'] {
     arguments = ArrayList@147[empty]
     classifier = JavaTypeParameterImpl@148['V']
     nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@133
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@129
 }
 
 LazyJavaClassifierType@149['V'] {
     arguments = ArrayList@150[empty]
-    classifier = JavaTypeParameterImpl@136['V']
+    classifier = JavaTypeParameterImpl@142['V']
     nullable = 'true': Boolean@75
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@133
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@129
 }
 
 LazyJavaClassifierType@151['V'] {
     arguments = ArrayList@152[empty]
-    classifier = JavaTypeParameterImpl@142['V']
+    classifier = JavaTypeParameterImpl@132['V']
     nullable = 'true': Boolean@75
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@133
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@129
 }
 
 LazyJavaClassifierType@153['V'] {
     arguments = ArrayList@154[empty]
-    classifier = JavaTypeParameterImpl@132['V']
+    classifier = JavaTypeParameterImpl@128['V']
     nullable = 'true': Boolean@75
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@133
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@129
 }
 
 LazyJavaClassifierType@155['V'] {
     arguments = ArrayList@156[empty]
-    classifier = JavaTypeParameterImpl@139['V']
+    classifier = JavaTypeParameterImpl@148['V']
     nullable = 'true': Boolean@75
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@129
 }
 
 LazyJavaClassifierType@157['V'] {
     arguments = ArrayList@158[empty]
-    classifier = JavaTypeParameterImpl@128['V']
+    classifier = JavaTypeParameterImpl@135['V']
     nullable = 'true': Boolean@75
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@129
 }
 
 LazyJavaClassifierType@159['V'] {
     arguments = ArrayList@160[empty]
-    classifier = JavaTypeParameterImpl@148['V']
+    classifier = JavaTypeParameterImpl@145['V']
     nullable = 'true': Boolean@75
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@133
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@139
 }
 
 LazyJavaClassifierType@161['V'] {
     arguments = ArrayList@162[empty]
-    classifier = JavaTypeParameterImpl@145['V']
+    classifier = JavaTypeParameterImpl@138['V']
     nullable = 'true': Boolean@75
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@133
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@139
 }
 
 LazyJavaPackageFragmentProvider@163 {
@@ -361,16 +361,16 @@ LazyJavaTypeParameterDescriptor@37['K'] {
 
 LazyJavaTypeParameterDescriptor@32['K'] {
     defaultType = JetTypeImpl@206['K']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
-}
-
-LazyJavaTypeParameterDescriptor@38['V'] {
-    defaultType = JetTypeImpl@207['V']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@133
-    upperBounds = LinkedHashSet@208[1] { NullableType@209 }
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
 }
 
 LazyJavaTypeParameterDescriptor@33['V'] {
+    defaultType = JetTypeImpl@207['V']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@139
+    upperBounds = LinkedHashSet@208[1] { NullableType@209 }
+}
+
+LazyJavaTypeParameterDescriptor@38['V'] {
     defaultType = JetTypeImpl@210['V']
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@129
     upperBounds = LinkedHashSet@211[1] { NullableType@212 }
@@ -387,40 +387,32 @@ LazyJavaTypeParameterResolver@216 {
 }
 
 LazyJavaTypeParameterResolver@219 {
-    resolve(JavaTypeParameterImpl@139['V']) = null
+    resolve(JavaTypeParameterImpl@138['V']) = null
 }
 
 LazyJavaTypeParameterResolver@220 {
-    resolve(JavaTypeParameterImpl@145['V']) = null
+    resolve(JavaTypeParameterImpl@135['V']) = null
 }
 
 ResolutionTaskHolder@221 {
     <name not found> = ArrayList@222[1] { ResolutionCandidate@223 }
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@223 }
 }
 
-ResolutionTaskHolder@225 {
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@227 }
+ResolutionTaskHolder@224 {
+    <name not found> = ArrayList@225[1] { ResolutionCandidate@226 }
 }
 
-ResolutionTaskHolder@229 {
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@231 }
+ResolutionTaskHolder@227 {
+    <name not found> = ArrayList@228[1] { ResolutionCandidate@229 }
 }
 
-ResolutionTaskHolder@233 {
-    <name not found> = ArrayList@234[4] { ResolutionCandidate@235, ResolutionCandidate@236, ResolutionCandidate@237, ... }
-    <name not found> = ArrayList@238[4] { ResolutionCandidate@235, ResolutionCandidate@236, ResolutionCandidate@237, ... }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@230 {
+    <name not found> = ArrayList@231[4] { ResolutionCandidate@232, ResolutionCandidate@233, ResolutionCandidate@234, ... }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@239 {
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@235 {
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -431,9 +423,7 @@ ResolutionTaskHolder@239 {
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@240 {
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@236 {
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -443,3 +433,16 @@ ResolutionTaskHolder@240 {
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
+
+null {
+    <name not found> = ArrayList@237[1] { ResolutionCandidate@226 }
+    <name not found> = ArrayList@238[1] { ResolutionCandidate@223 }
+    <name not found> = ArrayList@239[1] { ResolutionCandidate@229 }
+    <name not found> = ArrayList@240[4] { ResolutionCandidate@232, ResolutionCandidate@233, ResolutionCandidate@234, ... }
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt1680.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt1680.lazy.log
index 24b3d7a20b9..08a4099e014 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt1680.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt1680.lazy.log
@@ -33,76 +33,79 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@27 {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@22[empty]
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@34 {
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
     <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
+    <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@37 {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+}
+
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
 }
 
 ResolutionTaskHolder@49 {
     <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
+}
+
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
 }
 
 ResolutionTaskHolder@61 {
     <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
+null {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@36 }
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt1778.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt1778.lazy.log
index 9885ff966ae..8a8199f5b34 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt1778.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt1778.lazy.log
@@ -62,140 +62,143 @@ LazyJavaPackageFragment@27['lang'] {
 
 ResolutionTaskHolder@53 {
     <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
+}
+
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
 }
 
 ResolutionTaskHolder@65 {
     <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
+}
+
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
 }
 
 ResolutionTaskHolder@77 {
     <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
 }
 
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
 }
 
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
+}
+
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
 }
 
 ResolutionTaskHolder@89 {
     <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
 }
 
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
+}
+
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
 }
 
 ResolutionTaskHolder@101 {
     <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
 }
 
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
 }
 
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
+}
+
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
 }
 
 ResolutionTaskHolder@113 {
     <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
 }
 
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
 }
 
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
+ResolutionTaskHolder@119 {
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
+}
+
+ResolutionTaskHolder@122 {
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
 }
 
 ResolutionTaskHolder@125 {
     <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@127 }
 }
 
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@131 }
+ResolutionTaskHolder@128 {
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
 }
 
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@135 }
+ResolutionTaskHolder@131 {
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
 }
 
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@139 }
+ResolutionTaskHolder@134 {
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
 }
 
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@143 }
-}
-
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@147 }
-}
-
-ResolutionTaskHolder@149 {
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@151 }
-}
-
-ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@155 }
-}
-
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@159 }
-}
-
-ResolutionTaskHolder@161 {
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@163 }
+null {
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@127 }
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@136 }
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@133 }
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@124 }
 }
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2109.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2109.lazy.log
index 041e63314d2..740b97c35da 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2109.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2109.lazy.log
@@ -30,32 +30,35 @@ LazyJavaPackageFragment@7['lang'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
 }
 
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
 }
 
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
+}
+
 ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@37[2] { ResolutionCandidate@38, ResolutionCandidate@39 }
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[2] { ResolutionCandidate@42, ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[2] { ResolutionCandidate@42, ResolutionCandidate@43 }
+null {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@27 }
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@44[2] { ResolutionCandidate@38, ResolutionCandidate@39 }
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2125.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2125.lazy.log
index 959b74d10bf..63138ff665e 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2125.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2125.lazy.log
@@ -36,9 +36,7 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
@@ -61,32 +59,37 @@ ResolutionTaskHolder@28 {
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
+}
+
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
@@ -102,12 +105,13 @@ ResolutionTaskHolder@35 {
 
 ResolutionTaskHolder@39 {
     <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
+}
+
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
+}
+
+ResolutionTaskHolder@45 {
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
@@ -118,19 +122,7 @@ ResolutionTaskHolder@39 {
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@46 {
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
@@ -141,28 +133,39 @@ ResolutionTaskHolder@51 {
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@47 {
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@48 {
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@54 {
+null {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@38 }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2146.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2146.lazy.log
index 9cf8d2d6946..c8100c41d6c 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2146.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2146.lazy.log
@@ -28,153 +28,156 @@ LazyJavaPackageFragment@7['lang'] {
 
 ResolutionTaskHolder@24 {
     <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@19[empty]
+    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
     <name not found> = EmptyList@19[empty]
 }
 
-ResolutionTaskHolder@31 {
+ResolutionTaskHolder@29 {
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
+    <name not found> = EmptyList@19[empty]
+}
+
+ResolutionTaskHolder@34 {
     <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+}
+
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
 }
 
 ResolutionTaskHolder@46 {
     <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
 }
 
 ResolutionTaskHolder@58 {
     <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
+}
+
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
 }
 
 ResolutionTaskHolder@70 {
     <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
+}
+
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
 }
 
 ResolutionTaskHolder@82 {
     <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
 }
 
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
+}
+
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
 }
 
 ResolutionTaskHolder@94 {
     <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
 }
 
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
 }
 
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
+}
+
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
 }
 
 ResolutionTaskHolder@106 {
     <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
 }
 
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
 }
 
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
 }
 
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@132 }
-}
-
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@136 }
-}
-
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@140 }
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@144 }
+null {
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@26 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@28 }
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@114 }
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2164.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2164.lazy.log
index 64f6994596c..4908bc36c1a 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2164.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2164.lazy.log
@@ -42,28 +42,18 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@35 {
     <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@29[empty]
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@42 {
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+    <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@45 {
     <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -81,9 +71,8 @@ ResolutionTaskHolder@49 {
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -99,297 +88,311 @@ ResolutionTaskHolder@53 {
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
 }
 
 ResolutionTaskHolder@57 {
     <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
 ResolutionTaskHolder@69 {
     <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
 ResolutionTaskHolder@81 {
     <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
 ResolutionTaskHolder@93 {
     <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
 }
 
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
+}
+
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
 }
 
 ResolutionTaskHolder@105 {
     <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
 }
 
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
+ResolutionTaskHolder@111 {
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
+}
+
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
 }
 
 ResolutionTaskHolder@117 {
     <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
 }
 
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
+ResolutionTaskHolder@120 {
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
 }
 
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@127 }
+ResolutionTaskHolder@123 {
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
+}
+
+ResolutionTaskHolder@126 {
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
 }
 
 ResolutionTaskHolder@129 {
     <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@131 }
 }
 
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@135 }
+ResolutionTaskHolder@132 {
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
 }
 
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@139 }
+ResolutionTaskHolder@135 {
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
+}
+
+ResolutionTaskHolder@138 {
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
 }
 
 ResolutionTaskHolder@141 {
     <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@143 }
 }
 
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@147 }
+ResolutionTaskHolder@144 {
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
 }
 
-ResolutionTaskHolder@149 {
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@151 }
+ResolutionTaskHolder@147 {
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
+}
+
+ResolutionTaskHolder@150 {
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
 }
 
 ResolutionTaskHolder@153 {
     <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@155 }
 }
 
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@159 }
+ResolutionTaskHolder@156 {
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
 }
 
-ResolutionTaskHolder@161 {
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@163 }
+ResolutionTaskHolder@159 {
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
+}
+
+ResolutionTaskHolder@162 {
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
 }
 
 ResolutionTaskHolder@165 {
     <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@167 }
 }
 
-ResolutionTaskHolder@169 {
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@171 }
+ResolutionTaskHolder@168 {
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
 }
 
-ResolutionTaskHolder@173 {
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@175 }
+ResolutionTaskHolder@171 {
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
+}
+
+ResolutionTaskHolder@174 {
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
 }
 
 ResolutionTaskHolder@177 {
     <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@179 }
 }
 
-ResolutionTaskHolder@181 {
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@183 }
+ResolutionTaskHolder@180 {
+    <name not found> = ArrayList@181[8] { ResolutionCandidate@182, ResolutionCandidate@183, ResolutionCandidate@184, ... }
 }
 
-ResolutionTaskHolder@185 {
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@187 }
-}
-
-ResolutionTaskHolder@189 {
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@191 }
-}
-
-ResolutionTaskHolder@193 {
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@195 }
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@195 }
-}
-
-ResolutionTaskHolder@197 {
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@199 }
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@199 }
-}
-
-ResolutionTaskHolder@201 {
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@203 }
-}
-
-ResolutionTaskHolder@205 {
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@207 }
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@207 }
-}
-
-ResolutionTaskHolder@209 {
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@211 }
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@211 }
-}
-
-ResolutionTaskHolder@213 {
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@215 }
-}
-
-ResolutionTaskHolder@217 {
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@219 }
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@219 }
-}
-
-ResolutionTaskHolder@221 {
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@223 }
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@223 }
-}
-
-ResolutionTaskHolder@225 {
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@227 }
-}
-
-ResolutionTaskHolder@229 {
-    <name not found> = ArrayList@230[8] { ResolutionCandidate@231, ResolutionCandidate@232, ResolutionCandidate@233, ... }
-    <name not found> = ArrayList@234[8] { ResolutionCandidate@231, ResolutionCandidate@232, ResolutionCandidate@233, ... }
+null {
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@131 }
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@189[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@152 }
+    <name not found> = ArrayList@192[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@125 }
+    <name not found> = ArrayList@194[1] { ResolutionCandidate@167 }
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@196[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@197[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@198[1] { ResolutionCandidate@140 }
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@200[1] { ResolutionCandidate@137 }
+    <name not found> = ArrayList@201[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@202[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@203[1] { ResolutionCandidate@143 }
+    <name not found> = ArrayList@204[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@205[1] { ResolutionCandidate@170 }
+    <name not found> = ArrayList@206[1] { ResolutionCandidate@146 }
+    <name not found> = ArrayList@207[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@208[1] { ResolutionCandidate@149 }
+    <name not found> = ArrayList@209[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@210[1] { ResolutionCandidate@122 }
+    <name not found> = ArrayList@211[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@212[1] { ResolutionCandidate@155 }
+    <name not found> = ArrayList@213[1] { ResolutionCandidate@176 }
+    <name not found> = ArrayList@214[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@215[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@216[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@217[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@218[1] { ResolutionCandidate@161 }
+    <name not found> = ArrayList@219[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@220[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@221[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@222[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@223[1] { ResolutionCandidate@113 }
+    <name not found> = ArrayList@224[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@225[1] { ResolutionCandidate@173 }
+    <name not found> = ArrayList@226[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@128 }
+    <name not found> = ArrayList@228[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@134 }
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@231[1] { ResolutionCandidate@164 }
+    <name not found> = ArrayList@232[1] { ResolutionCandidate@179 }
+    <name not found> = ArrayList@233[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@234[8] { ResolutionCandidate@182, ResolutionCandidate@183, ResolutionCandidate@184, ... }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2176.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2176.lazy.log
index 8452b3f4530..cb27e4e753f 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2176.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2176.lazy.log
@@ -25,60 +25,63 @@ LazyJavaPackageFragment@6['java'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+}
+
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
 }
 
 ResolutionTaskHolder@37 {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+}
+
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
 }
 
 ResolutionTaskHolder@49 {
     <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+null {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@27 }
 }
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2195.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2195.lazy.log
index 7fae1b14eb2..7d95126f345 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2195.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2195.lazy.log
@@ -30,26 +30,29 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@19[empty]
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
     <name not found> = EmptyList@19[empty]
 }
 
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@19[empty]
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
     <name not found> = EmptyList@19[empty]
 }
 
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
+}
+
 ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@37[2] { ResolutionCandidate@38, ResolutionCandidate@39 }
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[2] { ResolutionCandidate@42, ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[2] { ResolutionCandidate@42, ResolutionCandidate@43 }
+null {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@27 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@44[2] { ResolutionCandidate@38, ResolutionCandidate@39 }
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2212.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2212.lazy.log
index 302c675d373..c0087c95314 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2212.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2212.lazy.log
@@ -102,14 +102,14 @@ LazyJavaClassifierType@55['AutoCloseable'] {
     typeConstructor = LazyJavaClassTypeConstructor@11['AutoCloseable']
 }
 
-LazyJavaClassifierType@66['Closeable'] {
+LazyJavaClassifierType@61['Closeable'] {
     arguments = ArrayList@72[empty]
     classifier = JavaClassImpl@73['Closeable']
     memberScope = LazyJavaClassMemberScope@13
     typeConstructor = LazyJavaClassTypeConstructor@15['Closeable']
 }
 
-LazyJavaClassifierType@61['Closeable'] {
+LazyJavaClassifierType@66['Closeable'] {
     arguments = ArrayList@74[empty]
     classifier = JavaClassImpl@75['Closeable']
     memberScope = LazyJavaClassMemberScope@13
@@ -225,7 +225,7 @@ LazyJavaPackageFragmentProvider@109 {
     packageFragments('kt2212.System': FqName@137) = null
     topLevelClasses(JavaClassImpl@69['Appendable']) = LazyJavaClassDescriptor@2['Appendable']
     topLevelClasses(JavaClassImpl@71['AutoCloseable']) = LazyJavaClassDescriptor@8['AutoCloseable']
-    topLevelClasses(JavaClassImpl@73['Closeable']) = LazyJavaClassDescriptor@12['Closeable']
+    topLevelClasses(JavaClassImpl@75['Closeable']) = LazyJavaClassDescriptor@12['Closeable']
     topLevelClasses(JavaClassImpl@77['FilterOutputStream']) = LazyJavaClassDescriptor@16['FilterOutputStream']
     topLevelClasses(JavaClassImpl@97['OutputStream']) = LazyJavaClassDescriptor@20['OutputStream']
     topLevelClasses(JavaClassImpl@100['PrintStream']) = LazyJavaClassDescriptor@24['PrintStream']
@@ -249,53 +249,40 @@ LazyJavaPackageFragment@121['lang'] {
 
 ResolutionTaskHolder@148 {
     <name not found> = ArrayList@149[10] { ResolutionCandidate@150, ResolutionCandidate@151, ResolutionCandidate@152, ... }
-    <name not found> = ArrayList@153[10] { ResolutionCandidate@150, ResolutionCandidate@151, ResolutionCandidate@152, ... }
 }
 
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[16] { ResolutionCandidate@156, ResolutionCandidate@157, ResolutionCandidate@158, ... }
-    <name not found> = ArrayList@159[16] { ResolutionCandidate@156, ResolutionCandidate@157, ResolutionCandidate@158, ... }
+ResolutionTaskHolder@153 {
+    <name not found> = ArrayList@154[16] { ResolutionCandidate@155, ResolutionCandidate@156, ResolutionCandidate@157, ... }
 }
 
-ResolutionTaskHolder@160 {
+ResolutionTaskHolder@158 {
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
     <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@162 }
+    <name not found> = EmptyList@4[empty]
+}
+
+ResolutionTaskHolder@163 {
     <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@165 }
-    <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
 }
 
-ResolutionTaskHolder@167 {
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@169 }
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
+ResolutionTaskHolder@166 {
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
 }
 
-ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@173 }
+ResolutionTaskHolder@169 {
+    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
+}
+
+ResolutionTaskHolder@172 {
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
 }
 
 ResolutionTaskHolder@175 {
     <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@177 }
 }
 
-ResolutionTaskHolder@179 {
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@181 }
-}
-
-ResolutionTaskHolder@183 {
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@185 }
-}
-
-ResolutionTaskHolder@187 {
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
+ResolutionTaskHolder@178 {
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
@@ -305,3 +292,19 @@ ResolutionTaskHolder@187 {
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
 }
+
+null {
+    <name not found> = ArrayList@179[10] { ResolutionCandidate@150, ResolutionCandidate@151, ResolutionCandidate@152, ... }
+    <name not found> = ArrayList@180[16] { ResolutionCandidate@155, ResolutionCandidate@156, ResolutionCandidate@157, ... }
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@171 }
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@160 }
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@162 }
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@165 }
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@177 }
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@174 }
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@168 }
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2216.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2216.lazy.log
index 375c76ceb18..d60b0c56b35 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2216.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2216.lazy.log
@@ -41,41 +41,55 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[16] { ResolutionCandidate@33, ResolutionCandidate@34, ResolutionCandidate@35, ... }
-    <name not found> = ArrayList@36[16] { ResolutionCandidate@33, ResolutionCandidate@34, ResolutionCandidate@35, ... }
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@23[empty]
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
     <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@23[empty]
+}
+
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
     <name not found> = EmptyList@23[empty]
 }
 
 ResolutionTaskHolder@51 {
     <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@54[8] { ResolutionCandidate@55, ResolutionCandidate@56, ResolutionCandidate@57, ... }
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
 }
 
 ResolutionTaskHolder@58 {
     <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@62[8] { ResolutionCandidate@63, ResolutionCandidate@64, ResolutionCandidate@65, ... }
-    <name not found> = ArrayList@66[8] { ResolutionCandidate@63, ResolutionCandidate@64, ResolutionCandidate@65, ... }
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
@@ -91,6 +105,10 @@ ResolutionTaskHolder@58 {
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
+}
+
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
@@ -102,266 +120,237 @@ ResolutionTaskHolder@58 {
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+}
+
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
 }
 
 ResolutionTaskHolder@67 {
     <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
+}
+
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
 }
 
 ResolutionTaskHolder@79 {
     <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
 }
 
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
+}
+
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
 }
 
 ResolutionTaskHolder@91 {
     <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
 }
 
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
 }
 
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
+}
+
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
 }
 
 ResolutionTaskHolder@103 {
     <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
 }
 
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
 }
 
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@113 }
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
+}
+
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
 }
 
 ResolutionTaskHolder@115 {
     <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@117 }
 }
 
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@121 }
+ResolutionTaskHolder@118 {
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
 }
 
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@125 }
+ResolutionTaskHolder@121 {
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
+}
+
+ResolutionTaskHolder@124 {
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
 }
 
 ResolutionTaskHolder@127 {
     <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@129 }
 }
 
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@133 }
+ResolutionTaskHolder@130 {
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
 }
 
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@137 }
+ResolutionTaskHolder@133 {
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
+}
+
+ResolutionTaskHolder@136 {
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
 }
 
 ResolutionTaskHolder@139 {
     <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@141 }
 }
 
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@145 }
+ResolutionTaskHolder@142 {
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
 }
 
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@149 }
+ResolutionTaskHolder@145 {
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
+}
+
+ResolutionTaskHolder@148 {
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
 }
 
 ResolutionTaskHolder@151 {
     <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@153 }
 }
 
-ResolutionTaskHolder@155 {
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@157 }
+ResolutionTaskHolder@154 {
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
 }
 
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@161 }
+ResolutionTaskHolder@157 {
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
+}
+
+ResolutionTaskHolder@160 {
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
 }
 
 ResolutionTaskHolder@163 {
     <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@165 }
 }
 
-ResolutionTaskHolder@167 {
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@169 }
+ResolutionTaskHolder@166 {
+    <name not found> = ArrayList@167[8] { ResolutionCandidate@168, ResolutionCandidate@169, ResolutionCandidate@170, ... }
 }
 
 ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@173 }
+    <name not found> = ArrayList@172[8] { ResolutionCandidate@173, ResolutionCandidate@174, ResolutionCandidate@175, ... }
 }
 
-ResolutionTaskHolder@175 {
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@177 }
+ResolutionTaskHolder@176 {
+    <name not found> = ArrayList@177[8] { ResolutionCandidate@178, ResolutionCandidate@179, ResolutionCandidate@180, ... }
 }
 
-ResolutionTaskHolder@179 {
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@181 }
+ResolutionTaskHolder@181 {
+    <name not found> = ArrayList@182[8] { ResolutionCandidate@183, ResolutionCandidate@184, ResolutionCandidate@185, ... }
 }
 
-ResolutionTaskHolder@183 {
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@185 }
-}
-
-ResolutionTaskHolder@187 {
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@189 }
-}
-
-ResolutionTaskHolder@191 {
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@193 }
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@193 }
-}
-
-ResolutionTaskHolder@195 {
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@197 }
-}
-
-ResolutionTaskHolder@199 {
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@201 }
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@201 }
-}
-
-ResolutionTaskHolder@203 {
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@205 }
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@205 }
-}
-
-ResolutionTaskHolder@207 {
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@209 }
-}
-
-ResolutionTaskHolder@211 {
-    <name not found> = ArrayList@212[8] { ResolutionCandidate@213, ResolutionCandidate@214, ResolutionCandidate@215, ... }
-    <name not found> = ArrayList@216[8] { ResolutionCandidate@213, ResolutionCandidate@214, ResolutionCandidate@215, ... }
-}
-
-ResolutionTaskHolder@217 {
-    <name not found> = ArrayList@218[8] { ResolutionCandidate@219, ResolutionCandidate@220, ResolutionCandidate@221, ... }
-    <name not found> = ArrayList@222[8] { ResolutionCandidate@219, ResolutionCandidate@220, ResolutionCandidate@221, ... }
-}
-
-ResolutionTaskHolder@223 {
-    <name not found> = ArrayList@224[8] { ResolutionCandidate@225, ResolutionCandidate@226, ResolutionCandidate@227, ... }
-    <name not found> = ArrayList@228[8] { ResolutionCandidate@225, ResolutionCandidate@226, ResolutionCandidate@227, ... }
-}
-
-ResolutionTaskHolder@229 {
-    <name not found> = ArrayList@230[8] { ResolutionCandidate@231, ResolutionCandidate@232, ResolutionCandidate@233, ... }
-    <name not found> = ArrayList@234[8] { ResolutionCandidate@231, ResolutionCandidate@232, ResolutionCandidate@233, ... }
+null {
+    <name not found> = ArrayList@186[16] { ResolutionCandidate@33, ResolutionCandidate@34, ResolutionCandidate@35, ... }
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@153 }
+    <name not found> = ArrayList@189[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@126 }
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@162 }
+    <name not found> = ArrayList@192[1] { ResolutionCandidate@132 }
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@194[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@196[1] { ResolutionCandidate@165 }
+    <name not found> = ArrayList@197[1] { ResolutionCandidate@129 }
+    <name not found> = ArrayList@198[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@200[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@201[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@202[1] { ResolutionCandidate@135 }
+    <name not found> = ArrayList@203[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@204[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@205[1] { ResolutionCandidate@141 }
+    <name not found> = ArrayList@206[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@207[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@208[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@209[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@210[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@211[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@212[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@213[1] { ResolutionCandidate@159 }
+    <name not found> = ArrayList@214[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@215[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@216[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@217[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@218[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@219[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@220[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@221[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@222[1] { ResolutionCandidate@156 }
+    <name not found> = ArrayList@223[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@224[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@225[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@226[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@228[1] { ResolutionCandidate@147 }
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@230[8] { ResolutionCandidate@183, ResolutionCandidate@184, ResolutionCandidate@185, ... }
+    <name not found> = ArrayList@231[8] { ResolutionCandidate@178, ResolutionCandidate@179, ResolutionCandidate@180, ... }
+    <name not found> = ArrayList@232[8] { ResolutionCandidate@173, ResolutionCandidate@174, ResolutionCandidate@175, ... }
+    <name not found> = ArrayList@233[8] { ResolutionCandidate@168, ResolutionCandidate@169, ResolutionCandidate@170, ... }
+    <name not found> = ArrayList@234[8] { ResolutionCandidate@55, ResolutionCandidate@56, ResolutionCandidate@57, ... }
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2223.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2223.lazy.log
index d66d5320d05..c92c402cf7d 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2223.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2223.lazy.log
@@ -32,24 +32,27 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@26 {
     <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@21[empty]
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+}
+
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
 }
 
 ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@38[2] { ResolutionCandidate@39, ResolutionCandidate@40 }
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[2] { ResolutionCandidate@43, ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[2] { ResolutionCandidate@43, ResolutionCandidate@44 }
+null {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@28 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@45[2] { ResolutionCandidate@39, ResolutionCandidate@40 }
+    <name not found> = EmptyList@21[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2234.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2234.lazy.log
index ecf0015bd32..8f08c7c637c 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2234.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2234.lazy.log
@@ -56,143 +56,146 @@ LazyJavaPackageFragment@23['lang'] {
 
 ResolutionTaskHolder@49 {
     <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@43[empty]
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
     <name not found> = EmptyList@43[empty]
 }
 
-ResolutionTaskHolder@56 {
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
     <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+    <name not found> = EmptyList@43[empty]
+}
+
+ResolutionTaskHolder@59 {
     <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
+    <name not found> = EmptyList@43[empty]
+}
+
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
 }
 
 ResolutionTaskHolder@70 {
     <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
+}
+
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
 }
 
 ResolutionTaskHolder@82 {
     <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
 }
 
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
+}
+
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
 }
 
 ResolutionTaskHolder@94 {
     <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
 }
 
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
 }
 
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
+}
+
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
 }
 
 ResolutionTaskHolder@106 {
     <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
 }
 
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
 }
 
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
+}
+
+ResolutionTaskHolder@115 {
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
 }
 
 ResolutionTaskHolder@118 {
     <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
 }
 
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
+ResolutionTaskHolder@121 {
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
 }
 
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@132 }
-}
-
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@136 }
-}
-
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@140 }
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@144 }
-}
-
-ResolutionTaskHolder@146 {
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@148 }
+null {
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@117 }
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2336.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2336.lazy.log
index 736d8b8cf63..ad8aa9f29b3 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2336.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2336.lazy.log
@@ -51,58 +51,61 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@37 {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+    <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
 }
 
 ResolutionTaskHolder@48 {
     <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+}
+
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
 }
 
 ResolutionTaskHolder@60 {
     <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[2] { ResolutionCandidate@68, ResolutionCandidate@69 }
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[2] { ResolutionCandidate@78, ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[2] { ResolutionCandidate@78, ResolutionCandidate@79 }
+null {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@80[2] { ResolutionCandidate@68, ResolutionCandidate@69 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt244.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt244.lazy.log
index 1c41bd53157..43610786455 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt244.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt244.lazy.log
@@ -103,14 +103,14 @@ LazyJavaClassifierType@55['AutoCloseable'] {
     typeConstructor = LazyJavaClassTypeConstructor@11['AutoCloseable']
 }
 
-LazyJavaClassifierType@61['Closeable'] {
+LazyJavaClassifierType@66['Closeable'] {
     arguments = ArrayList@72[empty]
     classifier = JavaClassImpl@73['Closeable']
     memberScope = LazyJavaClassMemberScope@13
     typeConstructor = LazyJavaClassTypeConstructor@15['Closeable']
 }
 
-LazyJavaClassifierType@66['Closeable'] {
+LazyJavaClassifierType@61['Closeable'] {
     arguments = ArrayList@74[empty]
     classifier = JavaClassImpl@75['Closeable']
     memberScope = LazyJavaClassMemberScope@13
@@ -223,7 +223,7 @@ LazyJavaPackageFragmentProvider@109 {
     packageFragments('kt244.System': FqName@134) = null
     topLevelClasses(JavaClassImpl@69['Appendable']) = LazyJavaClassDescriptor@2['Appendable']
     topLevelClasses(JavaClassImpl@71['AutoCloseable']) = LazyJavaClassDescriptor@8['AutoCloseable']
-    topLevelClasses(JavaClassImpl@75['Closeable']) = LazyJavaClassDescriptor@12['Closeable']
+    topLevelClasses(JavaClassImpl@73['Closeable']) = LazyJavaClassDescriptor@12['Closeable']
     topLevelClasses(JavaClassImpl@77['FilterOutputStream']) = LazyJavaClassDescriptor@16['FilterOutputStream']
     topLevelClasses(JavaClassImpl@97['OutputStream']) = LazyJavaClassDescriptor@20['OutputStream']
     topLevelClasses(JavaClassImpl@100['PrintStream']) = LazyJavaClassDescriptor@24['PrintStream']
@@ -248,152 +248,155 @@ LazyJavaPackageFragment@120['lang'] {
 
 ResolutionTaskHolder@146 {
     <name not found> = ArrayList@147[10] { ResolutionCandidate@148, ResolutionCandidate@149, ResolutionCandidate@150, ... }
-    <name not found> = ArrayList@151[10] { ResolutionCandidate@148, ResolutionCandidate@149, ResolutionCandidate@150, ... }
 }
 
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@157 }
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
+ResolutionTaskHolder@151 {
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
 }
 
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@164 }
-    <name not found> = EmptyList@4[empty]
+ResolutionTaskHolder@156 {
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
+}
+
+ResolutionTaskHolder@161 {
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
     <name not found> = EmptyList@4[empty]
 }
 
 ResolutionTaskHolder@166 {
     <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@168 }
+    <name not found> = EmptyList@4[empty]
+}
+
+ResolutionTaskHolder@169 {
     <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@171 }
-    <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
 }
 
-ResolutionTaskHolder@173 {
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@175 }
-    <name not found> = EmptyList@4[empty]
+ResolutionTaskHolder@172 {
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
     <name not found> = EmptyList@4[empty]
 }
 
-ResolutionTaskHolder@177 {
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@179 }
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
+ResolutionTaskHolder@175 {
+    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
+}
+
+ResolutionTaskHolder@178 {
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
 }
 
 ResolutionTaskHolder@181 {
     <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@183 }
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
 }
 
-ResolutionTaskHolder@185 {
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@187 }
+ResolutionTaskHolder@184 {
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
 }
 
-ResolutionTaskHolder@189 {
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@191 }
+ResolutionTaskHolder@187 {
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
+}
+
+ResolutionTaskHolder@190 {
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@192 }
 }
 
 ResolutionTaskHolder@193 {
     <name not found> = ArrayList@194[1] { ResolutionCandidate@195 }
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@195 }
 }
 
-ResolutionTaskHolder@197 {
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@199 }
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@199 }
+ResolutionTaskHolder@196 {
+    <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
 }
 
-ResolutionTaskHolder@201 {
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@203 }
+ResolutionTaskHolder@199 {
+    <name not found> = ArrayList@200[1] { ResolutionCandidate@201 }
+}
+
+ResolutionTaskHolder@202 {
+    <name not found> = ArrayList@203[1] { ResolutionCandidate@204 }
 }
 
 ResolutionTaskHolder@205 {
     <name not found> = ArrayList@206[1] { ResolutionCandidate@207 }
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@207 }
 }
 
-ResolutionTaskHolder@209 {
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@211 }
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@211 }
+ResolutionTaskHolder@208 {
+    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
 }
 
-ResolutionTaskHolder@213 {
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@215 }
+ResolutionTaskHolder@211 {
+    <name not found> = ArrayList@212[2] { ResolutionCandidate@213, ResolutionCandidate@214 }
 }
 
-ResolutionTaskHolder@217 {
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@219 }
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@219 }
+ResolutionTaskHolder@215 {
+    <name not found> = ArrayList@216[2] { ResolutionCandidate@217, ResolutionCandidate@218 }
 }
 
-ResolutionTaskHolder@221 {
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@223 }
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@223 }
+ResolutionTaskHolder@219 {
+    <name not found> = ArrayList@220[2] { ResolutionCandidate@221, ResolutionCandidate@222 }
 }
 
-ResolutionTaskHolder@225 {
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@227 }
+ResolutionTaskHolder@223 {
+    <name not found> = ArrayList@224[2] { ResolutionCandidate@225, ResolutionCandidate@226 }
 }
 
-ResolutionTaskHolder@229 {
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@231 }
+ResolutionTaskHolder@227 {
+    <name not found> = ArrayList@228[2] { ResolutionCandidate@229, ResolutionCandidate@230 }
 }
 
-ResolutionTaskHolder@233 {
-    <name not found> = ArrayList@234[2] { ResolutionCandidate@235, ResolutionCandidate@236 }
-    <name not found> = ArrayList@237[2] { ResolutionCandidate@235, ResolutionCandidate@236 }
+ResolutionTaskHolder@231 {
+    <name not found> = ArrayList@232[2] { ResolutionCandidate@233, ResolutionCandidate@234 }
 }
 
-ResolutionTaskHolder@238 {
-    <name not found> = ArrayList@239[2] { ResolutionCandidate@240, ResolutionCandidate@241 }
-    <name not found> = ArrayList@242[2] { ResolutionCandidate@240, ResolutionCandidate@241 }
+ResolutionTaskHolder@235 {
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
 }
 
-ResolutionTaskHolder@243 {
-    <name not found> = ArrayList@244[2] { ResolutionCandidate@245, ResolutionCandidate@246 }
-    <name not found> = ArrayList@247[2] { ResolutionCandidate@245, ResolutionCandidate@246 }
-}
-
-ResolutionTaskHolder@248 {
-    <name not found> = ArrayList@249[2] { ResolutionCandidate@250, ResolutionCandidate@251 }
-    <name not found> = ArrayList@252[2] { ResolutionCandidate@250, ResolutionCandidate@251 }
-}
-
-ResolutionTaskHolder@253 {
-    <name not found> = ArrayList@254[2] { ResolutionCandidate@255, ResolutionCandidate@256 }
-    <name not found> = ArrayList@257[2] { ResolutionCandidate@255, ResolutionCandidate@256 }
-}
-
-ResolutionTaskHolder@258 {
-    <name not found> = ArrayList@259[2] { ResolutionCandidate@260, ResolutionCandidate@261 }
-    <name not found> = ArrayList@262[2] { ResolutionCandidate@260, ResolutionCandidate@261 }
-}
-
-ResolutionTaskHolder@263 {
+null {
+    <name not found> = ArrayList@236[10] { ResolutionCandidate@148, ResolutionCandidate@149, ResolutionCandidate@150, ... }
+    <name not found> = ArrayList@237[1] { ResolutionCandidate@204 }
+    <name not found> = ArrayList@238[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@239[1] { ResolutionCandidate@160 }
+    <name not found> = ArrayList@240[1] { ResolutionCandidate@183 }
+    <name not found> = ArrayList@241[1] { ResolutionCandidate@186 }
+    <name not found> = ArrayList@242[1] { ResolutionCandidate@201 }
+    <name not found> = ArrayList@243[1] { ResolutionCandidate@153 }
+    <name not found> = ArrayList@244[1] { ResolutionCandidate@155 }
+    <name not found> = ArrayList@245[1] { ResolutionCandidate@207 }
+    <name not found> = ArrayList@246[1] { ResolutionCandidate@189 }
+    <name not found> = ArrayList@247[1] { ResolutionCandidate@168 }
+    <name not found> = ArrayList@248[1] { ResolutionCandidate@198 }
+    <name not found> = ArrayList@249[1] { ResolutionCandidate@174 }
+    <name not found> = ArrayList@250[1] { ResolutionCandidate@192 }
+    <name not found> = ArrayList@251[1] { ResolutionCandidate@210 }
+    <name not found> = ArrayList@252[1] { ResolutionCandidate@163 }
+    <name not found> = ArrayList@253[1] { ResolutionCandidate@165 }
+    <name not found> = ArrayList@254[1] { ResolutionCandidate@195 }
+    <name not found> = ArrayList@255[1] { ResolutionCandidate@177 }
+    <name not found> = ArrayList@256[1] { ResolutionCandidate@171 }
+    <name not found> = ArrayList@257[1] { ResolutionCandidate@180 }
+    <name not found> = ArrayList@258[2] { ResolutionCandidate@233, ResolutionCandidate@234 }
+    <name not found> = ArrayList@259[2] { ResolutionCandidate@217, ResolutionCandidate@218 }
+    <name not found> = ArrayList@260[2] { ResolutionCandidate@221, ResolutionCandidate@222 }
+    <name not found> = ArrayList@261[2] { ResolutionCandidate@225, ResolutionCandidate@226 }
+    <name not found> = ArrayList@262[2] { ResolutionCandidate@213, ResolutionCandidate@214 }
+    <name not found> = ArrayList@263[2] { ResolutionCandidate@229, ResolutionCandidate@230 }
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt362.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt362.lazy.log
index 1a09710f41f..6dbd31764bf 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt362.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt362.lazy.log
@@ -40,39 +40,60 @@ LazyJavaPackageFragment@17['lang'] {
 
 ResolutionTaskHolder@35 {
     <name not found> = ArrayList@36[16] { ResolutionCandidate@37, ResolutionCandidate@38, ResolutionCandidate@39, ... }
-    <name not found> = ArrayList@40[16] { ResolutionCandidate@37, ResolutionCandidate@38, ResolutionCandidate@39, ... }
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[16] { ResolutionCandidate@43, ResolutionCandidate@44, ResolutionCandidate@45, ... }
-    <name not found> = ArrayList@46[16] { ResolutionCandidate@43, ResolutionCandidate@44, ResolutionCandidate@45, ... }
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[16] { ResolutionCandidate@42, ResolutionCandidate@43, ResolutionCandidate@44, ... }
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[16] { ResolutionCandidate@49, ResolutionCandidate@50, ResolutionCandidate@51, ... }
-    <name not found> = ArrayList@52[16] { ResolutionCandidate@49, ResolutionCandidate@50, ResolutionCandidate@51, ... }
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[16] { ResolutionCandidate@47, ResolutionCandidate@48, ResolutionCandidate@49, ... }
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[16] { ResolutionCandidate@55, ResolutionCandidate@56, ResolutionCandidate@57, ... }
-    <name not found> = ArrayList@58[16] { ResolutionCandidate@55, ResolutionCandidate@56, ResolutionCandidate@57, ... }
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[16] { ResolutionCandidate@52, ResolutionCandidate@53, ResolutionCandidate@54, ... }
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[16] { ResolutionCandidate@61, ResolutionCandidate@62, ResolutionCandidate@63, ... }
-    <name not found> = ArrayList@64[16] { ResolutionCandidate@61, ResolutionCandidate@62, ResolutionCandidate@63, ... }
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[16] { ResolutionCandidate@57, ResolutionCandidate@58, ResolutionCandidate@59, ... }
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[16] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64, ... }
 }
 
 ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[16] { ResolutionCandidate@67, ResolutionCandidate@68, ResolutionCandidate@69, ... }
-    <name not found> = ArrayList@70[16] { ResolutionCandidate@67, ResolutionCandidate@68, ResolutionCandidate@69, ... }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+}
+
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
 }
 
 ResolutionTaskHolder@71 {
     <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
@@ -86,11 +107,8 @@ ResolutionTaskHolder@71 {
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
@@ -104,163 +122,99 @@ ResolutionTaskHolder@75 {
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
+}
+
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
 ResolutionTaskHolder@83 {
     <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
 }
 
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
+}
+
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
 }
 
 ResolutionTaskHolder@95 {
     <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
 }
 
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
 }
 
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
+}
+
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
 }
 
 ResolutionTaskHolder@107 {
     <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
 }
 
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@113 }
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
 }
 
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@117 }
+ResolutionTaskHolder@113 {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
+}
+
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
 }
 
 ResolutionTaskHolder@119 {
     <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@121 }
 }
 
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@125 }
+ResolutionTaskHolder@122 {
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
 }
 
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@129 }
+ResolutionTaskHolder@125 {
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
+}
+
+ResolutionTaskHolder@128 {
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
 }
 
 ResolutionTaskHolder@131 {
     <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@133 }
 }
 
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@137 }
+ResolutionTaskHolder@134 {
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
 }
 
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@141 }
+ResolutionTaskHolder@137 {
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
+}
+
+ResolutionTaskHolder@140 {
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
 }
 
 ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@145 }
-}
-
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@149 }
-}
-
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@153 }
-}
-
-ResolutionTaskHolder@155 {
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@157 }
-}
-
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@161 }
-}
-
-ResolutionTaskHolder@163 {
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@165 }
-}
-
-ResolutionTaskHolder@167 {
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@169 }
-}
-
-ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@173 }
-}
-
-ResolutionTaskHolder@175 {
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
@@ -271,7 +225,56 @@ ResolutionTaskHolder@175 {
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@176 {
+ResolutionTaskHolder@144 {
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+}
+
+null {
+    <name not found> = ArrayList@145[16] { ResolutionCandidate@47, ResolutionCandidate@48, ResolutionCandidate@49, ... }
+    <name not found> = ArrayList@146[16] { ResolutionCandidate@57, ResolutionCandidate@58, ResolutionCandidate@59, ... }
+    <name not found> = ArrayList@147[16] { ResolutionCandidate@37, ResolutionCandidate@38, ResolutionCandidate@39, ... }
+    <name not found> = ArrayList@148[16] { ResolutionCandidate@42, ResolutionCandidate@43, ResolutionCandidate@44, ... }
+    <name not found> = ArrayList@149[16] { ResolutionCandidate@52, ResolutionCandidate@53, ResolutionCandidate@54, ... }
+    <name not found> = ArrayList@150[16] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64, ... }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@124 }
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@127 }
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@139 }
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@136 }
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@166[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@168[1] { ResolutionCandidate@142 }
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@170[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@176[1] { ResolutionCandidate@133 }
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/noSenselessNullOnNullableType.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/noSenselessNullOnNullableType.lazy.log
index 768655a3702..8c1c35b4acd 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/noSenselessNullOnNullableType.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/noSenselessNullOnNullableType.lazy.log
@@ -100,25 +100,28 @@ LazyJavaPackageFragment@45['lang'] {
 
 ResolutionTaskHolder@71 {
     <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+}
+
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
+}
+
+ResolutionTaskHolder@77 {
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
+null {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@76 }
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/noUnnecessaryNotNullAssertionOnErrorType.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/noUnnecessaryNotNullAssertionOnErrorType.lazy.log
index ee11a968843..c6e75921e8c 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/noUnnecessaryNotNullAssertionOnErrorType.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/noUnnecessaryNotNullAssertionOnErrorType.lazy.log
@@ -34,23 +34,15 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
 }
 
-ResolutionTaskHolder@36 {
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@34 {
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
@@ -69,9 +61,20 @@ ResolutionTaskHolder@36 {
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@35 {
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+}
+
+null {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@33 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/senslessComparisonWithNullOnTypeParameters.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/senslessComparisonWithNullOnTypeParameters.lazy.log
index 863437990c8..c4baf1334e3 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/senslessComparisonWithNullOnTypeParameters.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/senslessComparisonWithNullOnTypeParameters.lazy.log
@@ -29,80 +29,83 @@ LazyJavaPackageFragment@7['java'] {
 
 ResolutionTaskHolder@27 {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
 }
 
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
+}
+
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
 }
 
 ResolutionTaskHolder@39 {
     <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
 }
 
 ResolutionTaskHolder@51 {
     <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
 }
 
 ResolutionTaskHolder@63 {
     <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
 }
 
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
 }
 
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
 }
 
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
 }
 
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
+null {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@74 }
 }
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/smartCastReceiverWithGenerics.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/smartCastReceiverWithGenerics.lazy.log
index 4519e772e70..34015fa6f3f 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/smartCastReceiverWithGenerics.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/smartCastReceiverWithGenerics.lazy.log
@@ -45,33 +45,36 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
+    <name not found> = EmptyList@23[empty]
+}
+
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
 }
 
 ResolutionTaskHolder@42 {
     <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
+null {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@44 }
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/smartCastsAndBooleanExpressions.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/smartCastsAndBooleanExpressions.lazy.log
index 7db6461db1d..bdf4addbec9 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/smartCastsAndBooleanExpressions.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/smartCastsAndBooleanExpressions.lazy.log
@@ -34,72 +34,75 @@ LazyJavaPackageFragment@7['lang'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@17[empty]
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
     <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@32 {
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
     <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@17[empty]
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
     <name not found> = EmptyList@17[empty]
 }
 
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+}
+
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+}
+
 ResolutionTaskHolder@46 {
     <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
 }
 
 ResolutionTaskHolder@58 {
     <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
+null {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@27 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@45 }
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/nullableTypes/nullAssertOnTypeWithNullableUpperBound.lazy.log b/compiler/testData/diagnostics/tests/nullableTypes/nullAssertOnTypeWithNullableUpperBound.lazy.log
index 553a358e5d4..c6fb79e7b80 100644
--- a/compiler/testData/diagnostics/tests/nullableTypes/nullAssertOnTypeWithNullableUpperBound.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullableTypes/nullAssertOnTypeWithNullableUpperBound.lazy.log
@@ -26,55 +26,58 @@ LazyJavaPackageFragment@6['java'] {
 
 ResolutionTaskHolder@24 {
     <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
 }
 
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
+ResolutionTaskHolder@27 {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
 }
 
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
+}
+
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
 }
 
 ResolutionTaskHolder@36 {
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
+}
+
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
 }
 
 ResolutionTaskHolder@48 {
     <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+null {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@26 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@35 }
 }
diff --git a/compiler/testData/diagnostics/tests/nullableTypes/nullableArgumentForIn.lazy.log b/compiler/testData/diagnostics/tests/nullableTypes/nullableArgumentForIn.lazy.log
index fbe9bd34764..18b7f1e1874 100644
--- a/compiler/testData/diagnostics/tests/nullableTypes/nullableArgumentForIn.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullableTypes/nullableArgumentForIn.lazy.log
@@ -34,12 +34,6 @@ LazyJavaPackageFragment@7['lang'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
@@ -65,12 +59,21 @@ ResolutionTaskHolder@25 {
     <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[7] { ResolutionCandidate@35, ResolutionCandidate@36, ResolutionCandidate@37, ... }
-    <name not found> = ArrayList@38[7] { ResolutionCandidate@35, ResolutionCandidate@36, ResolutionCandidate@37, ... }
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[7] { ResolutionCandidate@33, ResolutionCandidate@34, ResolutionCandidate@35, ... }
+}
+
+null {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@27 }
+    <name not found> = ArrayList@38[7] { ResolutionCandidate@33, ResolutionCandidate@34, ResolutionCandidate@35, ... }
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/nullableTypes/redundantNullableInSupertype.lazy.log b/compiler/testData/diagnostics/tests/nullableTypes/redundantNullableInSupertype.lazy.log
index cdda8195024..ea201760805 100644
--- a/compiler/testData/diagnostics/tests/nullableTypes/redundantNullableInSupertype.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullableTypes/redundantNullableInSupertype.lazy.log
@@ -27,10 +27,13 @@ LazyJavaPackageFragment@7['java'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
+}
+
+null {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@27 }
 }
diff --git a/compiler/testData/diagnostics/tests/nullableTypes/safeCallOnTypeWithNullableUpperBound.lazy.log b/compiler/testData/diagnostics/tests/nullableTypes/safeCallOnTypeWithNullableUpperBound.lazy.log
index 3ee058cd832..577c1db1683 100644
--- a/compiler/testData/diagnostics/tests/nullableTypes/safeCallOnTypeWithNullableUpperBound.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullableTypes/safeCallOnTypeWithNullableUpperBound.lazy.log
@@ -26,45 +26,48 @@ LazyJavaPackageFragment@6['java'] {
 
 ResolutionTaskHolder@24 {
     <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
 }
 
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
+ResolutionTaskHolder@27 {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
 }
 
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
+}
+
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
 }
 
 ResolutionTaskHolder@36 {
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
+}
+
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
 }
 
 ResolutionTaskHolder@48 {
     <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+}
+
+null {
     <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@26 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@47 }
 }
diff --git a/compiler/testData/diagnostics/tests/nullableTypes/safeCallWithInvoke.lazy.log b/compiler/testData/diagnostics/tests/nullableTypes/safeCallWithInvoke.lazy.log
index ef848cda1e9..7286c57d9a1 100644
--- a/compiler/testData/diagnostics/tests/nullableTypes/safeCallWithInvoke.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullableTypes/safeCallWithInvoke.lazy.log
@@ -25,33 +25,124 @@ LazyJavaPackageFragmentProvider@4 {
 LazyJavaPackageFragment@6['<root>'] {
     classes('B': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
     classes('Int': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('b': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('foo': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('invoke': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('B': Name@23) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('b': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('foo': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('invoke': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('foo': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('invoke': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('B': Name@23) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('foo': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('invoke': Name@27) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@24
 }
 
 LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('lang': Name@34) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('lang': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('lang': Name@33) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@32
 }
 
 LazyJavaPackageFragment@13['lang'] {
-    classes('B': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('b': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('foo': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('invoke': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('B': Name@23) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('b': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('foo': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('invoke': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('B': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    classes('foo': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    classes('invoke': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('B': Name@23) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('foo': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('invoke': Name@27) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
+    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@35
+}
+
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+    <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+    <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
+    <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+    <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
+}
+
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
+}
+
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
+}
+
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
+}
+
+null {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@39 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/nullableTypes/uselessElvis.lazy.log b/compiler/testData/diagnostics/tests/nullableTypes/uselessElvis.lazy.log
index d0f079fd12c..bc520621bd2 100644
--- a/compiler/testData/diagnostics/tests/nullableTypes/uselessElvis.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullableTypes/uselessElvis.lazy.log
@@ -37,44 +37,47 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@20[empty]
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
+}
+
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
 }
 
 ResolutionTaskHolder@39 {
     <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
 }
 
 ResolutionTaskHolder@51 {
     <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+null {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@53 }
+    <name not found> = EmptyList@20[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/numbers/characterIsNotANumber.lazy.log b/compiler/testData/diagnostics/tests/numbers/characterIsNotANumber.lazy.log
index 4e708710eef..862455ad058 100644
--- a/compiler/testData/diagnostics/tests/numbers/characterIsNotANumber.lazy.log
+++ b/compiler/testData/diagnostics/tests/numbers/characterIsNotANumber.lazy.log
@@ -42,10 +42,6 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
@@ -63,12 +59,8 @@ ResolutionTaskHolder@31 {
     <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
@@ -86,12 +78,8 @@ ResolutionTaskHolder@35 {
     <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
@@ -109,22 +97,37 @@ ResolutionTaskHolder@39 {
     <name not found> = EmptyList@23[empty]
 }
 
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+}
+
 ResolutionTaskHolder@43 {
     <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+null {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@39 }
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/numbers/doublesInSimpleConstraints.lazy.log b/compiler/testData/diagnostics/tests/numbers/doublesInSimpleConstraints.lazy.log
index d8bf3dff606..b31f9f287be 100644
--- a/compiler/testData/diagnostics/tests/numbers/doublesInSimpleConstraints.lazy.log
+++ b/compiler/testData/diagnostics/tests/numbers/doublesInSimpleConstraints.lazy.log
@@ -46,75 +46,78 @@ LazyJavaPackageFragment@17['lang'] {
 
 ResolutionTaskHolder@41 {
     <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
+}
+
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
 }
 
 ResolutionTaskHolder@53 {
     <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
+}
+
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
 }
 
 ResolutionTaskHolder@65 {
     <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
+null {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@49 }
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/numbers/intValuesOutOfRange.lazy.log b/compiler/testData/diagnostics/tests/numbers/intValuesOutOfRange.lazy.log
index 639009efc62..f7368e07109 100644
--- a/compiler/testData/diagnostics/tests/numbers/intValuesOutOfRange.lazy.log
+++ b/compiler/testData/diagnostics/tests/numbers/intValuesOutOfRange.lazy.log
@@ -47,10 +47,6 @@ LazyJavaPackageFragment@18['lang'] {
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
@@ -68,21 +64,28 @@ ResolutionTaskHolder@40 {
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
+}
+
+null {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@42 }
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/numbers/numbersInSimpleConstraints.lazy.log b/compiler/testData/diagnostics/tests/numbers/numbersInSimpleConstraints.lazy.log
index c555fe1dfd1..551d4d693e3 100644
--- a/compiler/testData/diagnostics/tests/numbers/numbersInSimpleConstraints.lazy.log
+++ b/compiler/testData/diagnostics/tests/numbers/numbersInSimpleConstraints.lazy.log
@@ -42,7 +42,7 @@ LazyJavaClassifierType@22['String'] {
 
 LazyJavaClassifierType@25['String'] {
     arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@21['String']
+    classifier = JavaClassImpl@16['String']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@18
 }
@@ -56,7 +56,7 @@ LazyJavaClassifierType@28['String'] {
 
 LazyJavaClassifierType@30['String'] {
     arguments = ArrayList@31[empty]
-    classifier = JavaClassImpl@16['String']
+    classifier = JavaClassImpl@21['String']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@18
 }
@@ -91,14 +91,14 @@ LazyJavaClassifierType@42['Throwable'] {
 
 LazyJavaClassifierType@44['Throwable'] {
     arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@38['Throwable']
+    classifier = JavaClassImpl@41['Throwable']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@35
 }
 
 LazyJavaClassifierType@46['Throwable'] {
     arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@41['Throwable']
+    classifier = JavaClassImpl@38['Throwable']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@35
 }
@@ -225,10 +225,6 @@ LazyJavaPackageFragment@84['lang'] {
 
 ResolutionTaskHolder@151 {
     <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@153 }
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
     <name not found> = EmptyList@137[empty]
     <name not found> = EmptyList@137[empty]
     <name not found> = EmptyList@137[empty]
@@ -246,12 +242,8 @@ ResolutionTaskHolder@151 {
     <name not found> = EmptyList@137[empty]
 }
 
-ResolutionTaskHolder@155 {
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@157 }
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
+ResolutionTaskHolder@154 {
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
     <name not found> = EmptyList@137[empty]
     <name not found> = EmptyList@137[empty]
     <name not found> = EmptyList@137[empty]
@@ -269,9 +261,8 @@ ResolutionTaskHolder@155 {
     <name not found> = EmptyList@137[empty]
 }
 
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@161 }
+ResolutionTaskHolder@157 {
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
     <name not found> = EmptyList@137[empty]
     <name not found> = EmptyList@137[empty]
     <name not found> = EmptyList@137[empty]
@@ -287,6 +278,22 @@ ResolutionTaskHolder@159 {
     <name not found> = EmptyList@137[empty]
     <name not found> = EmptyList@137[empty]
     <name not found> = EmptyList@137[empty]
+}
+
+ResolutionTaskHolder@160 {
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
     <name not found> = EmptyList@137[empty]
     <name not found> = EmptyList@137[empty]
     <name not found> = EmptyList@137[empty]
@@ -294,451 +301,447 @@ ResolutionTaskHolder@159 {
 
 ResolutionTaskHolder@163 {
     <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@165 }
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
     <name not found> = EmptyList@137[empty]
     <name not found> = EmptyList@137[empty]
 }
 
-ResolutionTaskHolder@167 {
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@169 }
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
+ResolutionTaskHolder@166 {
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
     <name not found> = EmptyList@137[empty]
     <name not found> = EmptyList@137[empty]
 }
 
-ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@173 }
+ResolutionTaskHolder@169 {
+    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
     <name not found> = EmptyList@137[empty]
     <name not found> = EmptyList@137[empty]
+}
+
+ResolutionTaskHolder@172 {
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
     <name not found> = EmptyList@137[empty]
     <name not found> = EmptyList@137[empty]
 }
 
 ResolutionTaskHolder@175 {
     <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@177 }
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
     <name not found> = EmptyList@137[empty]
     <name not found> = EmptyList@137[empty]
 }
 
-ResolutionTaskHolder@179 {
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@181 }
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
+ResolutionTaskHolder@178 {
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
     <name not found> = EmptyList@137[empty]
     <name not found> = EmptyList@137[empty]
 }
 
-ResolutionTaskHolder@183 {
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@185 }
+ResolutionTaskHolder@181 {
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
     <name not found> = EmptyList@137[empty]
     <name not found> = EmptyList@137[empty]
+}
+
+ResolutionTaskHolder@184 {
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
     <name not found> = EmptyList@137[empty]
     <name not found> = EmptyList@137[empty]
 }
 
 ResolutionTaskHolder@187 {
     <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@189 }
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
     <name not found> = EmptyList@137[empty]
     <name not found> = EmptyList@137[empty]
 }
 
-ResolutionTaskHolder@191 {
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@193 }
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@193 }
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
+ResolutionTaskHolder@190 {
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@192 }
     <name not found> = EmptyList@137[empty]
     <name not found> = EmptyList@137[empty]
 }
 
-ResolutionTaskHolder@195 {
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@197 }
+ResolutionTaskHolder@193 {
+    <name not found> = ArrayList@194[1] { ResolutionCandidate@195 }
     <name not found> = EmptyList@137[empty]
     <name not found> = EmptyList@137[empty]
+}
+
+ResolutionTaskHolder@196 {
+    <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
     <name not found> = EmptyList@137[empty]
     <name not found> = EmptyList@137[empty]
 }
 
 ResolutionTaskHolder@199 {
     <name not found> = ArrayList@200[1] { ResolutionCandidate@201 }
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@201 }
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
     <name not found> = EmptyList@137[empty]
     <name not found> = EmptyList@137[empty]
 }
 
-ResolutionTaskHolder@203 {
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@205 }
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@205 }
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
+ResolutionTaskHolder@202 {
+    <name not found> = ArrayList@203[1] { ResolutionCandidate@204 }
     <name not found> = EmptyList@137[empty]
     <name not found> = EmptyList@137[empty]
 }
 
-ResolutionTaskHolder@207 {
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@209 }
+ResolutionTaskHolder@205 {
+    <name not found> = ArrayList@206[1] { ResolutionCandidate@207 }
     <name not found> = EmptyList@137[empty]
     <name not found> = EmptyList@137[empty]
+}
+
+ResolutionTaskHolder@208 {
+    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
     <name not found> = EmptyList@137[empty]
     <name not found> = EmptyList@137[empty]
 }
 
 ResolutionTaskHolder@211 {
     <name not found> = ArrayList@212[1] { ResolutionCandidate@213 }
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@213 }
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
     <name not found> = EmptyList@137[empty]
     <name not found> = EmptyList@137[empty]
 }
 
-ResolutionTaskHolder@215 {
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@217 }
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@217 }
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
+ResolutionTaskHolder@214 {
+    <name not found> = ArrayList@215[1] { ResolutionCandidate@216 }
     <name not found> = EmptyList@137[empty]
     <name not found> = EmptyList@137[empty]
 }
 
-ResolutionTaskHolder@219 {
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@221 }
+ResolutionTaskHolder@217 {
+    <name not found> = ArrayList@218[1] { ResolutionCandidate@219 }
     <name not found> = EmptyList@137[empty]
     <name not found> = EmptyList@137[empty]
+}
+
+ResolutionTaskHolder@220 {
+    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
     <name not found> = EmptyList@137[empty]
     <name not found> = EmptyList@137[empty]
 }
 
 ResolutionTaskHolder@223 {
     <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@225 }
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
     <name not found> = EmptyList@137[empty]
     <name not found> = EmptyList@137[empty]
 }
 
-ResolutionTaskHolder@227 {
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@229 }
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@229 }
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
+ResolutionTaskHolder@226 {
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
     <name not found> = EmptyList@137[empty]
     <name not found> = EmptyList@137[empty]
 }
 
-ResolutionTaskHolder@231 {
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@233 }
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
+ResolutionTaskHolder@229 {
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
+}
+
+ResolutionTaskHolder@232 {
+    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
 }
 
 ResolutionTaskHolder@235 {
     <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@237 }
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
 }
 
-ResolutionTaskHolder@239 {
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@241 }
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@241 }
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
+ResolutionTaskHolder@238 {
+    <name not found> = ArrayList@239[1] { ResolutionCandidate@240 }
 }
 
-ResolutionTaskHolder@243 {
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@245 }
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
+ResolutionTaskHolder@241 {
+    <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
+}
+
+ResolutionTaskHolder@244 {
+    <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
 }
 
 ResolutionTaskHolder@247 {
     <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@249 }
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
 }
 
-ResolutionTaskHolder@251 {
-    <name not found> = ArrayList@252[1] { ResolutionCandidate@253 }
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@253 }
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
+ResolutionTaskHolder@250 {
+    <name not found> = ArrayList@251[1] { ResolutionCandidate@252 }
 }
 
-ResolutionTaskHolder@255 {
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
-    <name not found> = ArrayList@258[1] { ResolutionCandidate@257 }
+ResolutionTaskHolder@253 {
+    <name not found> = ArrayList@254[1] { ResolutionCandidate@255 }
+}
+
+ResolutionTaskHolder@256 {
+    <name not found> = ArrayList@257[1] { ResolutionCandidate@258 }
 }
 
 ResolutionTaskHolder@259 {
     <name not found> = ArrayList@260[1] { ResolutionCandidate@261 }
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@261 }
 }
 
-ResolutionTaskHolder@263 {
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@265 }
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@265 }
+ResolutionTaskHolder@262 {
+    <name not found> = ArrayList@263[1] { ResolutionCandidate@264 }
 }
 
-ResolutionTaskHolder@267 {
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
-    <name not found> = ArrayList@270[1] { ResolutionCandidate@269 }
+ResolutionTaskHolder@265 {
+    <name not found> = ArrayList@266[1] { ResolutionCandidate@267 }
+}
+
+ResolutionTaskHolder@268 {
+    <name not found> = ArrayList@269[1] { ResolutionCandidate@270 }
 }
 
 ResolutionTaskHolder@271 {
     <name not found> = ArrayList@272[1] { ResolutionCandidate@273 }
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@273 }
 }
 
-ResolutionTaskHolder@275 {
-    <name not found> = ArrayList@276[1] { ResolutionCandidate@277 }
-    <name not found> = ArrayList@278[1] { ResolutionCandidate@277 }
+ResolutionTaskHolder@274 {
+    <name not found> = ArrayList@275[1] { ResolutionCandidate@276 }
 }
 
-ResolutionTaskHolder@279 {
-    <name not found> = ArrayList@280[1] { ResolutionCandidate@281 }
-    <name not found> = ArrayList@282[1] { ResolutionCandidate@281 }
+ResolutionTaskHolder@277 {
+    <name not found> = ArrayList@278[1] { ResolutionCandidate@279 }
+}
+
+ResolutionTaskHolder@280 {
+    <name not found> = ArrayList@281[1] { ResolutionCandidate@282 }
 }
 
 ResolutionTaskHolder@283 {
     <name not found> = ArrayList@284[1] { ResolutionCandidate@285 }
-    <name not found> = ArrayList@286[1] { ResolutionCandidate@285 }
 }
 
-ResolutionTaskHolder@287 {
-    <name not found> = ArrayList@288[1] { ResolutionCandidate@289 }
-    <name not found> = ArrayList@290[1] { ResolutionCandidate@289 }
+ResolutionTaskHolder@286 {
+    <name not found> = ArrayList@287[1] { ResolutionCandidate@288 }
 }
 
-ResolutionTaskHolder@291 {
-    <name not found> = ArrayList@292[1] { ResolutionCandidate@293 }
-    <name not found> = ArrayList@294[1] { ResolutionCandidate@293 }
+ResolutionTaskHolder@289 {
+    <name not found> = ArrayList@290[1] { ResolutionCandidate@291 }
+}
+
+ResolutionTaskHolder@292 {
+    <name not found> = ArrayList@293[1] { ResolutionCandidate@294 }
 }
 
 ResolutionTaskHolder@295 {
     <name not found> = ArrayList@296[1] { ResolutionCandidate@297 }
-    <name not found> = ArrayList@298[1] { ResolutionCandidate@297 }
 }
 
-ResolutionTaskHolder@299 {
-    <name not found> = ArrayList@300[1] { ResolutionCandidate@301 }
-    <name not found> = ArrayList@302[1] { ResolutionCandidate@301 }
+ResolutionTaskHolder@298 {
+    <name not found> = ArrayList@299[1] { ResolutionCandidate@300 }
 }
 
-ResolutionTaskHolder@303 {
-    <name not found> = ArrayList@304[1] { ResolutionCandidate@305 }
-    <name not found> = ArrayList@306[1] { ResolutionCandidate@305 }
+ResolutionTaskHolder@301 {
+    <name not found> = ArrayList@302[1] { ResolutionCandidate@303 }
+}
+
+ResolutionTaskHolder@304 {
+    <name not found> = ArrayList@305[1] { ResolutionCandidate@306 }
 }
 
 ResolutionTaskHolder@307 {
     <name not found> = ArrayList@308[1] { ResolutionCandidate@309 }
-    <name not found> = ArrayList@310[1] { ResolutionCandidate@309 }
 }
 
-ResolutionTaskHolder@311 {
-    <name not found> = ArrayList@312[1] { ResolutionCandidate@313 }
-    <name not found> = ArrayList@314[1] { ResolutionCandidate@313 }
+ResolutionTaskHolder@310 {
+    <name not found> = ArrayList@311[1] { ResolutionCandidate@312 }
 }
 
-ResolutionTaskHolder@315 {
-    <name not found> = ArrayList@316[1] { ResolutionCandidate@317 }
-    <name not found> = ArrayList@318[1] { ResolutionCandidate@317 }
+ResolutionTaskHolder@313 {
+    <name not found> = ArrayList@314[1] { ResolutionCandidate@315 }
+}
+
+ResolutionTaskHolder@316 {
+    <name not found> = ArrayList@317[1] { ResolutionCandidate@318 }
 }
 
 ResolutionTaskHolder@319 {
     <name not found> = ArrayList@320[1] { ResolutionCandidate@321 }
-    <name not found> = ArrayList@322[1] { ResolutionCandidate@321 }
 }
 
-ResolutionTaskHolder@323 {
-    <name not found> = ArrayList@324[1] { ResolutionCandidate@325 }
-    <name not found> = ArrayList@326[1] { ResolutionCandidate@325 }
+ResolutionTaskHolder@322 {
+    <name not found> = ArrayList@323[1] { ResolutionCandidate@324 }
 }
 
-ResolutionTaskHolder@327 {
-    <name not found> = ArrayList@328[1] { ResolutionCandidate@329 }
-    <name not found> = ArrayList@330[1] { ResolutionCandidate@329 }
+ResolutionTaskHolder@325 {
+    <name not found> = ArrayList@326[1] { ResolutionCandidate@327 }
+}
+
+ResolutionTaskHolder@328 {
+    <name not found> = ArrayList@329[1] { ResolutionCandidate@330 }
 }
 
 ResolutionTaskHolder@331 {
     <name not found> = ArrayList@332[1] { ResolutionCandidate@333 }
-    <name not found> = ArrayList@334[1] { ResolutionCandidate@333 }
 }
 
-ResolutionTaskHolder@335 {
-    <name not found> = ArrayList@336[1] { ResolutionCandidate@337 }
-    <name not found> = ArrayList@338[1] { ResolutionCandidate@337 }
+ResolutionTaskHolder@334 {
+    <name not found> = ArrayList@335[1] { ResolutionCandidate@336 }
 }
 
-ResolutionTaskHolder@339 {
-    <name not found> = ArrayList@340[1] { ResolutionCandidate@341 }
-    <name not found> = ArrayList@342[1] { ResolutionCandidate@341 }
+ResolutionTaskHolder@337 {
+    <name not found> = ArrayList@338[1] { ResolutionCandidate@339 }
+}
+
+ResolutionTaskHolder@340 {
+    <name not found> = ArrayList@341[1] { ResolutionCandidate@342 }
 }
 
 ResolutionTaskHolder@343 {
     <name not found> = ArrayList@344[1] { ResolutionCandidate@345 }
-    <name not found> = ArrayList@346[1] { ResolutionCandidate@345 }
 }
 
-ResolutionTaskHolder@347 {
-    <name not found> = ArrayList@348[1] { ResolutionCandidate@349 }
-    <name not found> = ArrayList@350[1] { ResolutionCandidate@349 }
+ResolutionTaskHolder@346 {
+    <name not found> = ArrayList@347[1] { ResolutionCandidate@348 }
 }
 
-ResolutionTaskHolder@351 {
-    <name not found> = ArrayList@352[1] { ResolutionCandidate@353 }
-    <name not found> = ArrayList@354[1] { ResolutionCandidate@353 }
+ResolutionTaskHolder@349 {
+    <name not found> = ArrayList@350[1] { ResolutionCandidate@351 }
 }
 
-ResolutionTaskHolder@355 {
-    <name not found> = ArrayList@356[1] { ResolutionCandidate@357 }
-    <name not found> = ArrayList@358[1] { ResolutionCandidate@357 }
+ResolutionTaskHolder@352 {
+    <name not found> = ArrayList@353[4] { ResolutionCandidate@354, ResolutionCandidate@355, ResolutionCandidate@356, ... }
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
 }
 
-ResolutionTaskHolder@359 {
-    <name not found> = ArrayList@360[1] { ResolutionCandidate@361 }
-    <name not found> = ArrayList@362[1] { ResolutionCandidate@361 }
+ResolutionTaskHolder@357 {
+    <name not found> = ArrayList@358[4] { ResolutionCandidate@359, ResolutionCandidate@360, ResolutionCandidate@361, ... }
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
 }
 
-ResolutionTaskHolder@363 {
-    <name not found> = ArrayList@364[1] { ResolutionCandidate@365 }
-    <name not found> = ArrayList@366[1] { ResolutionCandidate@365 }
+ResolutionTaskHolder@362 {
+    <name not found> = ArrayList@363[4] { ResolutionCandidate@364, ResolutionCandidate@365, ResolutionCandidate@366, ... }
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
 }
 
-ResolutionTaskHolder@367 {
-    <name not found> = ArrayList@368[1] { ResolutionCandidate@369 }
-    <name not found> = ArrayList@370[1] { ResolutionCandidate@369 }
-}
-
-ResolutionTaskHolder@371 {
-    <name not found> = ArrayList@372[1] { ResolutionCandidate@373 }
-    <name not found> = ArrayList@374[1] { ResolutionCandidate@373 }
-}
-
-ResolutionTaskHolder@375 {
-    <name not found> = ArrayList@376[1] { ResolutionCandidate@377 }
-    <name not found> = ArrayList@378[1] { ResolutionCandidate@377 }
-}
-
-ResolutionTaskHolder@379 {
-    <name not found> = ArrayList@380[1] { ResolutionCandidate@381 }
-    <name not found> = ArrayList@382[1] { ResolutionCandidate@381 }
-}
-
-ResolutionTaskHolder@383 {
-    <name not found> = ArrayList@384[1] { ResolutionCandidate@385 }
-    <name not found> = ArrayList@386[1] { ResolutionCandidate@385 }
-}
-
-ResolutionTaskHolder@387 {
-    <name not found> = ArrayList@388[1] { ResolutionCandidate@389 }
-    <name not found> = ArrayList@390[1] { ResolutionCandidate@389 }
-}
-
-ResolutionTaskHolder@391 {
-    <name not found> = ArrayList@392[1] { ResolutionCandidate@393 }
-    <name not found> = ArrayList@394[1] { ResolutionCandidate@393 }
-}
-
-ResolutionTaskHolder@395 {
-    <name not found> = ArrayList@396[1] { ResolutionCandidate@397 }
-    <name not found> = ArrayList@398[1] { ResolutionCandidate@397 }
-}
-
-ResolutionTaskHolder@399 {
-    <name not found> = ArrayList@400[1] { ResolutionCandidate@401 }
-    <name not found> = ArrayList@402[1] { ResolutionCandidate@401 }
-}
-
-ResolutionTaskHolder@403 {
-    <name not found> = ArrayList@404[1] { ResolutionCandidate@405 }
-    <name not found> = ArrayList@406[1] { ResolutionCandidate@405 }
-}
-
-ResolutionTaskHolder@407 {
-    <name not found> = ArrayList@408[1] { ResolutionCandidate@409 }
-    <name not found> = ArrayList@410[1] { ResolutionCandidate@409 }
-}
-
-ResolutionTaskHolder@411 {
-    <name not found> = ArrayList@412[1] { ResolutionCandidate@413 }
-    <name not found> = ArrayList@414[1] { ResolutionCandidate@413 }
-}
-
-ResolutionTaskHolder@415 {
-    <name not found> = ArrayList@416[1] { ResolutionCandidate@417 }
-    <name not found> = ArrayList@418[1] { ResolutionCandidate@417 }
-}
-
-ResolutionTaskHolder@419 {
-    <name not found> = ArrayList@420[4] { ResolutionCandidate@421, ResolutionCandidate@422, ResolutionCandidate@423, ... }
-    <name not found> = ArrayList@424[5] { ResolutionCandidate@421, ResolutionCandidate@422, ResolutionCandidate@423, ... }
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-}
-
-ResolutionTaskHolder@425 {
-    <name not found> = ArrayList@426[4] { ResolutionCandidate@427, ResolutionCandidate@428, ResolutionCandidate@429, ... }
-    <name not found> = ArrayList@430[5] { ResolutionCandidate@427, ResolutionCandidate@428, ResolutionCandidate@429, ... }
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-}
-
-ResolutionTaskHolder@431 {
-    <name not found> = ArrayList@432[4] { ResolutionCandidate@433, ResolutionCandidate@434, ResolutionCandidate@435, ... }
-    <name not found> = ArrayList@436[5] { ResolutionCandidate@433, ResolutionCandidate@434, ResolutionCandidate@435, ... }
+null {
+    <name not found> = ArrayList@367[1] { ResolutionCandidate@234 }
+    <name not found> = ArrayList@368[1] { ResolutionCandidate@267 }
+    <name not found> = ArrayList@369[1] { ResolutionCandidate@342 }
+    <name not found> = ArrayList@370[1] { ResolutionCandidate@186 }
+    <name not found> = ArrayList@371[1] { ResolutionCandidate@183 }
+    <name not found> = ArrayList@372[1] { ResolutionCandidate@165 }
+    <name not found> = ArrayList@373[1] { ResolutionCandidate@201 }
+    <name not found> = ArrayList@374[1] { ResolutionCandidate@327 }
+    <name not found> = ArrayList@375[1] { ResolutionCandidate@195 }
+    <name not found> = ArrayList@376[1] { ResolutionCandidate@324 }
+    <name not found> = ArrayList@377[1] { ResolutionCandidate@207 }
+    <name not found> = ArrayList@378[1] { ResolutionCandidate@252 }
+    <name not found> = ArrayList@379[1] { ResolutionCandidate@216 }
+    <name not found> = ArrayList@380[1] { ResolutionCandidate@171 }
+    <name not found> = ArrayList@381[1] { ResolutionCandidate@156 }
+    <name not found> = ArrayList@382[1] { ResolutionCandidate@162 }
+    <name not found> = ArrayList@383[1] { ResolutionCandidate@180 }
+    <name not found> = ArrayList@384[1] { ResolutionCandidate@276 }
+    <name not found> = ArrayList@385[1] { ResolutionCandidate@210 }
+    <name not found> = ArrayList@386[1] { ResolutionCandidate@291 }
+    <name not found> = ArrayList@387[1] { ResolutionCandidate@312 }
+    <name not found> = ArrayList@388[1] { ResolutionCandidate@297 }
+    <name not found> = ArrayList@389[1] { ResolutionCandidate@306 }
+    <name not found> = ArrayList@390[1] { ResolutionCandidate@288 }
+    <name not found> = ArrayList@391[1] { ResolutionCandidate@231 }
+    <name not found> = ArrayList@392[1] { ResolutionCandidate@303 }
+    <name not found> = ArrayList@393[1] { ResolutionCandidate@282 }
+    <name not found> = ArrayList@394[1] { ResolutionCandidate@261 }
+    <name not found> = ArrayList@395[1] { ResolutionCandidate@189 }
+    <name not found> = ArrayList@396[1] { ResolutionCandidate@309 }
+    <name not found> = ArrayList@397[1] { ResolutionCandidate@336 }
+    <name not found> = ArrayList@398[1] { ResolutionCandidate@318 }
+    <name not found> = ArrayList@399[1] { ResolutionCandidate@330 }
+    <name not found> = ArrayList@400[1] { ResolutionCandidate@153 }
+    <name not found> = ArrayList@401[1] { ResolutionCandidate@339 }
+    <name not found> = ArrayList@402[1] { ResolutionCandidate@174 }
+    <name not found> = ArrayList@403[1] { ResolutionCandidate@270 }
+    <name not found> = ArrayList@404[1] { ResolutionCandidate@213 }
+    <name not found> = ArrayList@405[1] { ResolutionCandidate@258 }
+    <name not found> = ArrayList@406[1] { ResolutionCandidate@198 }
+    <name not found> = ArrayList@407[1] { ResolutionCandidate@300 }
+    <name not found> = ArrayList@408[1] { ResolutionCandidate@315 }
+    <name not found> = ArrayList@409[1] { ResolutionCandidate@246 }
+    <name not found> = ArrayList@410[1] { ResolutionCandidate@285 }
+    <name not found> = ArrayList@411[1] { ResolutionCandidate@219 }
+    <name not found> = ArrayList@412[1] { ResolutionCandidate@264 }
+    <name not found> = ArrayList@413[1] { ResolutionCandidate@177 }
+    <name not found> = ArrayList@414[1] { ResolutionCandidate@333 }
+    <name not found> = ArrayList@415[1] { ResolutionCandidate@255 }
+    <name not found> = ArrayList@416[1] { ResolutionCandidate@228 }
+    <name not found> = ArrayList@417[1] { ResolutionCandidate@294 }
+    <name not found> = ArrayList@418[1] { ResolutionCandidate@168 }
+    <name not found> = ArrayList@419[1] { ResolutionCandidate@348 }
+    <name not found> = ArrayList@420[1] { ResolutionCandidate@240 }
+    <name not found> = ArrayList@421[1] { ResolutionCandidate@351 }
+    <name not found> = ArrayList@422[1] { ResolutionCandidate@279 }
+    <name not found> = ArrayList@423[1] { ResolutionCandidate@159 }
+    <name not found> = ArrayList@424[1] { ResolutionCandidate@273 }
+    <name not found> = ArrayList@425[1] { ResolutionCandidate@225 }
+    <name not found> = ArrayList@426[1] { ResolutionCandidate@345 }
+    <name not found> = ArrayList@427[1] { ResolutionCandidate@192 }
+    <name not found> = ArrayList@428[1] { ResolutionCandidate@321 }
+    <name not found> = ArrayList@429[1] { ResolutionCandidate@243 }
+    <name not found> = ArrayList@430[1] { ResolutionCandidate@222 }
+    <name not found> = ArrayList@431[1] { ResolutionCandidate@249 }
+    <name not found> = ArrayList@432[1] { ResolutionCandidate@204 }
+    <name not found> = ArrayList@433[1] { ResolutionCandidate@237 }
+    <name not found> = ArrayList@434[5] { ResolutionCandidate@359, ResolutionCandidate@360, ResolutionCandidate@361, ... }
+    <name not found> = ArrayList@435[5] { ResolutionCandidate@354, ResolutionCandidate@355, ResolutionCandidate@356, ... }
+    <name not found> = ArrayList@436[5] { ResolutionCandidate@364, ResolutionCandidate@365, ResolutionCandidate@366, ... }
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
+    <name not found> = EmptyList@137[empty]
     <name not found> = EmptyList@137[empty]
     <name not found> = EmptyList@137[empty]
     <name not found> = EmptyList@137[empty]
diff --git a/compiler/testData/diagnostics/tests/objects/Objects.lazy.log b/compiler/testData/diagnostics/tests/objects/Objects.lazy.log
index 64c4c39ee9e..f7eee427424 100644
--- a/compiler/testData/diagnostics/tests/objects/Objects.lazy.log
+++ b/compiler/testData/diagnostics/tests/objects/Objects.lazy.log
@@ -57,83 +57,86 @@ LazyJavaPackageFragment@15['lang'] {
 
 ResolutionTaskHolder@45 {
     <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
+}
+
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
+    <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
 ResolutionTaskHolder@56 {
     <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@38[empty]
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
     <name not found> = EmptyList@38[empty]
+}
+
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
     <name not found> = EmptyList@38[empty]
 }
 
 ResolutionTaskHolder@68 {
     <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+}
+
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
+}
+
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[8] { ResolutionCandidate@76, ResolutionCandidate@77, ResolutionCandidate@78, ... }
+}
+
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[8] { ResolutionCandidate@81, ResolutionCandidate@82, ResolutionCandidate@83, ... }
+}
+
+null {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@94[8] { ResolutionCandidate@81, ResolutionCandidate@82, ResolutionCandidate@83, ... }
+    <name not found> = ArrayList@95[8] { ResolutionCandidate@76, ResolutionCandidate@77, ResolutionCandidate@78, ... }
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[8] { ResolutionCandidate@86, ResolutionCandidate@87, ResolutionCandidate@88, ... }
-    <name not found> = ArrayList@89[8] { ResolutionCandidate@86, ResolutionCandidate@87, ResolutionCandidate@88, ... }
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[8] { ResolutionCandidate@92, ResolutionCandidate@93, ResolutionCandidate@94, ... }
-    <name not found> = ArrayList@95[8] { ResolutionCandidate@92, ResolutionCandidate@93, ResolutionCandidate@94, ... }
-}
diff --git a/compiler/testData/diagnostics/tests/objects/ObjectsLocal.lazy.log b/compiler/testData/diagnostics/tests/objects/ObjectsLocal.lazy.log
index b26981d9f2e..cd2bf0a4b35 100644
--- a/compiler/testData/diagnostics/tests/objects/ObjectsLocal.lazy.log
+++ b/compiler/testData/diagnostics/tests/objects/ObjectsLocal.lazy.log
@@ -50,63 +50,44 @@ LazyJavaPackageFragment@15['lang'] {
 
 ResolutionTaskHolder@43 {
     <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
     <name not found> = EmptyList@37[empty]
 }
 
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+}
+
 ResolutionTaskHolder@55 {
     <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
+}
+
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
 }
 
 ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
@@ -125,7 +106,29 @@ ResolutionTaskHolder@75 {
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@76 {
+ResolutionTaskHolder@68 {
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+}
+
+null {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@45 }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
diff --git a/compiler/testData/diagnostics/tests/objects/ObjectsNested.lazy.log b/compiler/testData/diagnostics/tests/objects/ObjectsNested.lazy.log
index 6c738bb9032..8bf8182e477 100644
--- a/compiler/testData/diagnostics/tests/objects/ObjectsNested.lazy.log
+++ b/compiler/testData/diagnostics/tests/objects/ObjectsNested.lazy.log
@@ -57,57 +57,7 @@ LazyJavaPackageFragment@15['lang'] {
 
 ResolutionTaskHolder@42 {
     <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
@@ -158,83 +108,62 @@ ResolutionTaskHolder@42 {
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@49 {
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
     <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+}
+
+ResolutionTaskHolder@52 {
     <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
@@ -261,35 +190,9 @@ ResolutionTaskHolder@49 {
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
     <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
@@ -316,42 +219,9 @@ ResolutionTaskHolder@56 {
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
@@ -360,6 +230,10 @@ ResolutionTaskHolder@63 {
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
+}
+
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
@@ -373,39 +247,19 @@ ResolutionTaskHolder@63 {
 
 ResolutionTaskHolder@70 {
     <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+}
+
+ResolutionTaskHolder@73 {
     <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
@@ -417,219 +271,86 @@ ResolutionTaskHolder@77 {
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
     <name not found> = EmptyList@36[empty]
+}
+
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
     <name not found> = EmptyList@36[empty]
+}
+
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
     <name not found> = EmptyList@36[empty]
 }
 
 ResolutionTaskHolder@85 {
     <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@36[empty]
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
     <name not found> = EmptyList@36[empty]
+}
+
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
     <name not found> = EmptyList@36[empty]
 }
 
 ResolutionTaskHolder@97 {
     <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
-    <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
-    <name not found> = EmptyList@36[empty]
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
     <name not found> = EmptyList@36[empty]
+}
+
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
     <name not found> = EmptyList@36[empty]
 }
 
 ResolutionTaskHolder@109 {
     <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
-    <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
-    <name not found> = EmptyList@36[empty]
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
+ResolutionTaskHolder@115 {
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
     <name not found> = EmptyList@36[empty]
+}
+
+ResolutionTaskHolder@118 {
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
     <name not found> = EmptyList@36[empty]
 }
 
 ResolutionTaskHolder@121 {
     <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@127 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@131 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@135 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@139 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@143 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@147 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@149 {
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@151 }
-}
-
-ResolutionTaskHolder@153 {
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
+ResolutionTaskHolder@124 {
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
@@ -856,17 +577,7 @@ ResolutionTaskHolder@153 {
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@154 {
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
+ResolutionTaskHolder@125 {
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
@@ -909,7 +620,299 @@ ResolutionTaskHolder@154 {
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@155 {
+ResolutionTaskHolder@126 {
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+}
+
+null {
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@108 }
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
diff --git a/compiler/testData/diagnostics/tests/objects/invokeOnInnerObject.lazy.log b/compiler/testData/diagnostics/tests/objects/invokeOnInnerObject.lazy.log
index 7a8aeb12d4c..c755df68c4b 100644
--- a/compiler/testData/diagnostics/tests/objects/invokeOnInnerObject.lazy.log
+++ b/compiler/testData/diagnostics/tests/objects/invokeOnInnerObject.lazy.log
@@ -45,17 +45,7 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
@@ -96,9 +86,8 @@ ResolutionTaskHolder@31 {
     <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
@@ -106,30 +95,44 @@ ResolutionTaskHolder@38 {
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
+}
+
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
 }
 
 ResolutionTaskHolder@42 {
     <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
+null {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@47 }
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/objects/kt2240.lazy.log b/compiler/testData/diagnostics/tests/objects/kt2240.lazy.log
index 51f5a0b3cb7..e02c0ca6324 100644
--- a/compiler/testData/diagnostics/tests/objects/kt2240.lazy.log
+++ b/compiler/testData/diagnostics/tests/objects/kt2240.lazy.log
@@ -44,15 +44,6 @@ LazyJavaPackageFragment@16['lang'] {
 
 ResolutionTaskHolder@34 {
     <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
@@ -63,18 +54,30 @@ ResolutionTaskHolder@34 {
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+}
+
+null {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@39 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/objects/kt5527.lazy.log b/compiler/testData/diagnostics/tests/objects/kt5527.lazy.log
index 53b23591225..65fc3ea96c5 100644
--- a/compiler/testData/diagnostics/tests/objects/kt5527.lazy.log
+++ b/compiler/testData/diagnostics/tests/objects/kt5527.lazy.log
@@ -43,10 +43,6 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@32 {
     <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -64,12 +60,8 @@ ResolutionTaskHolder@32 {
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -87,11 +79,8 @@ ResolutionTaskHolder@36 {
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -107,59 +96,43 @@ ResolutionTaskHolder@40 {
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
+}
+
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
     <name not found> = EmptyList@24[empty]
 }
 
 ResolutionTaskHolder@44 {
     <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
     <name not found> = EmptyList@24[empty]
+}
+
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
     <name not found> = EmptyList@24[empty]
 }
 
 ResolutionTaskHolder@56 {
     <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@62 {
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -170,7 +143,37 @@ ResolutionTaskHolder@72 {
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@73 {
+ResolutionTaskHolder@63 {
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+}
+
+null {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@37 }
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
diff --git a/compiler/testData/diagnostics/tests/objects/localObjectInsideObject.lazy.log b/compiler/testData/diagnostics/tests/objects/localObjectInsideObject.lazy.log
index e1bcf7b8556..631cc708ed5 100644
--- a/compiler/testData/diagnostics/tests/objects/localObjectInsideObject.lazy.log
+++ b/compiler/testData/diagnostics/tests/objects/localObjectInsideObject.lazy.log
@@ -41,15 +41,18 @@ LazyJavaPackageFragment@14['java'] {
 
 ResolutionTaskHolder@30 {
     <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
 }
 
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+}
+
+null {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@32 }
 }
diff --git a/compiler/testData/diagnostics/tests/objects/localObjects.lazy.log b/compiler/testData/diagnostics/tests/objects/localObjects.lazy.log
index ad00762ae07..b7156b52539 100644
--- a/compiler/testData/diagnostics/tests/objects/localObjects.lazy.log
+++ b/compiler/testData/diagnostics/tests/objects/localObjects.lazy.log
@@ -28,9 +28,6 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@20 {
     <name not found> = ArrayList@21[1] { ResolutionCandidate@22 }
-    <name not found> = ArrayList@23[1] { ResolutionCandidate@22 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
@@ -44,7 +41,13 @@ ResolutionTaskHolder@20 {
     <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@24 {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
+ResolutionTaskHolder@23 {
+    <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
+}
+
+null {
+    <name not found> = ArrayList@26[1] { ResolutionCandidate@25 }
+    <name not found> = ArrayList@27[1] { ResolutionCandidate@22 }
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/operatorsOverloading/AssignOperatorAmbiguity.lazy.log b/compiler/testData/diagnostics/tests/operatorsOverloading/AssignOperatorAmbiguity.lazy.log
index 7ddc5ff6049..97cb7385fb0 100644
--- a/compiler/testData/diagnostics/tests/operatorsOverloading/AssignOperatorAmbiguity.lazy.log
+++ b/compiler/testData/diagnostics/tests/operatorsOverloading/AssignOperatorAmbiguity.lazy.log
@@ -39,15 +39,6 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@34 {
     <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -58,77 +49,89 @@ ResolutionTaskHolder@34 {
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
+}
+
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@27[empty]
 }
 
 ResolutionTaskHolder@46 {
     <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
 }
 
 ResolutionTaskHolder@58 {
     <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
+}
+
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
 }
 
 ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@71[8] { ResolutionCandidate@72, ResolutionCandidate@73, ResolutionCandidate@74, ... }
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[8] { ResolutionCandidate@77, ResolutionCandidate@78, ResolutionCandidate@79, ... }
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[8] { ResolutionCandidate@84, ResolutionCandidate@85, ResolutionCandidate@86, ... }
-    <name not found> = ArrayList@87[8] { ResolutionCandidate@84, ResolutionCandidate@85, ResolutionCandidate@86, ... }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[8] { ResolutionCandidate@90, ResolutionCandidate@91, ResolutionCandidate@92, ... }
-    <name not found> = ArrayList@93[8] { ResolutionCandidate@90, ResolutionCandidate@91, ResolutionCandidate@92, ... }
+null {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@92[8] { ResolutionCandidate@72, ResolutionCandidate@73, ResolutionCandidate@74, ... }
+    <name not found> = ArrayList@93[8] { ResolutionCandidate@77, ResolutionCandidate@78, ResolutionCandidate@79, ... }
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/operatorsOverloading/AssignmentOperations.lazy.log b/compiler/testData/diagnostics/tests/operatorsOverloading/AssignmentOperations.lazy.log
index c61f186f069..da053422337 100644
--- a/compiler/testData/diagnostics/tests/operatorsOverloading/AssignmentOperations.lazy.log
+++ b/compiler/testData/diagnostics/tests/operatorsOverloading/AssignmentOperations.lazy.log
@@ -82,12 +82,6 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -113,14 +107,8 @@ ResolutionTaskHolder@40 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -146,9 +134,8 @@ ResolutionTaskHolder@44 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -157,6 +144,10 @@ ResolutionTaskHolder@48 {
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -169,15 +160,6 @@ ResolutionTaskHolder@48 {
 
 ResolutionTaskHolder@52 {
     <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -188,17 +170,8 @@ ResolutionTaskHolder@52 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -209,15 +182,8 @@ ResolutionTaskHolder@56 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -226,231 +192,317 @@ ResolutionTaskHolder@60 {
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
 ResolutionTaskHolder@64 {
     <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
 ResolutionTaskHolder@76 {
     <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
 ResolutionTaskHolder@88 {
     <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
+}
+
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
 }
 
 ResolutionTaskHolder@100 {
     <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
 }
 
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
+}
+
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
 }
 
 ResolutionTaskHolder@112 {
     <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
 }
 
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
+ResolutionTaskHolder@115 {
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
 }
 
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
+ResolutionTaskHolder@118 {
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
+}
+
+ResolutionTaskHolder@121 {
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
 }
 
 ResolutionTaskHolder@124 {
     <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@126 }
 }
 
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
+ResolutionTaskHolder@127 {
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
 }
 
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
+ResolutionTaskHolder@130 {
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
+}
+
+ResolutionTaskHolder@133 {
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
 }
 
 ResolutionTaskHolder@136 {
     <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
 }
 
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
+ResolutionTaskHolder@139 {
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
 }
 
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
+ResolutionTaskHolder@142 {
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
+}
+
+ResolutionTaskHolder@145 {
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
 }
 
 ResolutionTaskHolder@148 {
     <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
 }
 
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
+ResolutionTaskHolder@151 {
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
+}
+
+ResolutionTaskHolder@154 {
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@155 {
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
 }
 
 ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@157 {
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@158 {
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@159 {
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
 }
 
 ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@162 }
-}
-
-ResolutionTaskHolder@164 {
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@166 }
-}
-
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@170 }
-}
-
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@174 }
-}
-
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@178 }
-}
-
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@182 }
-}
-
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@186 }
-}
-
-ResolutionTaskHolder@188 {
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@190 }
-}
-
-ResolutionTaskHolder@192 {
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -475,6 +527,81 @@ ResolutionTaskHolder@192 {
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@161 {
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@162 {
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@163 {
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -483,13 +610,7 @@ ResolutionTaskHolder@192 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@193 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@164 {
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -516,13 +637,7 @@ ResolutionTaskHolder@193 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@194 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@165 {
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -549,13 +664,7 @@ ResolutionTaskHolder@194 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@195 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@166 {
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -582,271 +691,165 @@ ResolutionTaskHolder@195 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@196 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@197 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@198 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@199 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@200 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@201 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@202 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@203 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@204 {
+null {
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@168[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@126 }
+    <name not found> = ArrayList@170[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@153 }
+    <name not found> = ArrayList@176[1] { ResolutionCandidate@129 }
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@132 }
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@147 }
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@141 }
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@189[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@192[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@135 }
+    <name not found> = ArrayList@194[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@196[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@197[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@198[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@200[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@201[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@202[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@203[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@204[1] { ResolutionCandidate@51 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
diff --git a/compiler/testData/diagnostics/tests/operatorsOverloading/IteratorAmbiguity.lazy.log b/compiler/testData/diagnostics/tests/operatorsOverloading/IteratorAmbiguity.lazy.log
index ba0ed794cf9..fc9255b4540 100644
--- a/compiler/testData/diagnostics/tests/operatorsOverloading/IteratorAmbiguity.lazy.log
+++ b/compiler/testData/diagnostics/tests/operatorsOverloading/IteratorAmbiguity.lazy.log
@@ -57,15 +57,6 @@ LazyJavaPackageFragment@14['lang'] {
 
 ResolutionTaskHolder@39 {
     <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
@@ -76,17 +67,8 @@ ResolutionTaskHolder@39 {
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
@@ -97,17 +79,8 @@ ResolutionTaskHolder@43 {
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
@@ -118,28 +91,58 @@ ResolutionTaskHolder@47 {
     <name not found> = EmptyList@31[empty]
 }
 
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+}
+
 ResolutionTaskHolder@51 {
     <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[2] { ResolutionCandidate@61, ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[2] { ResolutionCandidate@61, ResolutionCandidate@62 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[2] { ResolutionCandidate@56, ResolutionCandidate@57 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[2] { ResolutionCandidate@66, ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[2] { ResolutionCandidate@66, ResolutionCandidate@67 }
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[2] { ResolutionCandidate@60, ResolutionCandidate@61 }
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+}
+
+null {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@67[2] { ResolutionCandidate@60, ResolutionCandidate@61 }
+    <name not found> = ArrayList@68[2] { ResolutionCandidate@56, ResolutionCandidate@57 }
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
diff --git a/compiler/testData/diagnostics/tests/operatorsOverloading/assignmentOperationsCheckReturnType.lazy.log b/compiler/testData/diagnostics/tests/operatorsOverloading/assignmentOperationsCheckReturnType.lazy.log
index b946b1dcac8..5e6d58d8ad8 100644
--- a/compiler/testData/diagnostics/tests/operatorsOverloading/assignmentOperationsCheckReturnType.lazy.log
+++ b/compiler/testData/diagnostics/tests/operatorsOverloading/assignmentOperationsCheckReturnType.lazy.log
@@ -46,407 +46,809 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
+}
+
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
 }
 
 ResolutionTaskHolder@52 {
     <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
+}
+
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
 }
 
 ResolutionTaskHolder@64 {
     <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
+}
+
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
 }
 
 ResolutionTaskHolder@76 {
     <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
 }
 
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
+}
+
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
 }
 
 ResolutionTaskHolder@88 {
     <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
 }
 
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
+}
+
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
 }
 
 ResolutionTaskHolder@100 {
     <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
 }
 
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
+}
+
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
 }
 
 ResolutionTaskHolder@112 {
     <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
 }
 
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
+ResolutionTaskHolder@115 {
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
 }
 
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
+ResolutionTaskHolder@118 {
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
+}
+
+ResolutionTaskHolder@121 {
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
 }
 
 ResolutionTaskHolder@124 {
     <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@126 }
 }
 
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
+ResolutionTaskHolder@127 {
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
 }
 
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
+ResolutionTaskHolder@130 {
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
+}
+
+ResolutionTaskHolder@133 {
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
 }
 
 ResolutionTaskHolder@136 {
     <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
 }
 
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
+ResolutionTaskHolder@139 {
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
 }
 
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
+ResolutionTaskHolder@142 {
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
+}
+
+ResolutionTaskHolder@145 {
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
 }
 
 ResolutionTaskHolder@148 {
     <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
 }
 
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
+ResolutionTaskHolder@151 {
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
 }
 
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
+ResolutionTaskHolder@154 {
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
+}
+
+ResolutionTaskHolder@157 {
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
 }
 
 ResolutionTaskHolder@160 {
     <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@162 }
 }
 
-ResolutionTaskHolder@164 {
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@166 }
+ResolutionTaskHolder@163 {
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
 }
 
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@170 }
+ResolutionTaskHolder@166 {
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
+}
+
+ResolutionTaskHolder@169 {
+    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
 }
 
 ResolutionTaskHolder@172 {
     <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@174 }
 }
 
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@178 }
+ResolutionTaskHolder@175 {
+    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
 }
 
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@182 }
+ResolutionTaskHolder@178 {
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
+}
+
+ResolutionTaskHolder@181 {
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
 }
 
 ResolutionTaskHolder@184 {
     <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@186 }
 }
 
-ResolutionTaskHolder@188 {
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@190 }
+ResolutionTaskHolder@187 {
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
 }
 
-ResolutionTaskHolder@192 {
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@194 }
+ResolutionTaskHolder@190 {
+    <name not found> = ArrayList@191[7] { ResolutionCandidate@192, ResolutionCandidate@193, ResolutionCandidate@194, ... }
 }
 
-ResolutionTaskHolder@196 {
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@198 }
+ResolutionTaskHolder@195 {
+    <name not found> = ArrayList@196[7] { ResolutionCandidate@197, ResolutionCandidate@198, ResolutionCandidate@199, ... }
 }
 
 ResolutionTaskHolder@200 {
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@202 }
+    <name not found> = ArrayList@201[7] { ResolutionCandidate@202, ResolutionCandidate@203, ResolutionCandidate@204, ... }
 }
 
-ResolutionTaskHolder@204 {
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@206 }
+ResolutionTaskHolder@205 {
+    <name not found> = ArrayList@206[7] { ResolutionCandidate@207, ResolutionCandidate@208, ResolutionCandidate@209, ... }
 }
 
-ResolutionTaskHolder@208 {
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@210 }
+ResolutionTaskHolder@210 {
+    <name not found> = ArrayList@211[7] { ResolutionCandidate@212, ResolutionCandidate@213, ResolutionCandidate@214, ... }
 }
 
-ResolutionTaskHolder@212 {
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@214 }
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@214 }
-}
-
-ResolutionTaskHolder@216 {
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@218 }
+ResolutionTaskHolder@215 {
+    <name not found> = ArrayList@216[7] { ResolutionCandidate@217, ResolutionCandidate@218, ResolutionCandidate@219, ... }
 }
 
 ResolutionTaskHolder@220 {
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@222 }
+    <name not found> = ArrayList@221[7] { ResolutionCandidate@222, ResolutionCandidate@223, ResolutionCandidate@224, ... }
 }
 
-ResolutionTaskHolder@224 {
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@226 }
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@226 }
+ResolutionTaskHolder@225 {
+    <name not found> = ArrayList@226[7] { ResolutionCandidate@227, ResolutionCandidate@228, ResolutionCandidate@229, ... }
 }
 
-ResolutionTaskHolder@228 {
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@230 }
+ResolutionTaskHolder@230 {
+    <name not found> = ArrayList@231[7] { ResolutionCandidate@232, ResolutionCandidate@233, ResolutionCandidate@234, ... }
 }
 
-ResolutionTaskHolder@232 {
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@234 }
-}
-
-ResolutionTaskHolder@236 {
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@238 }
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@238 }
+ResolutionTaskHolder@235 {
+    <name not found> = ArrayList@236[7] { ResolutionCandidate@237, ResolutionCandidate@238, ResolutionCandidate@239, ... }
 }
 
 ResolutionTaskHolder@240 {
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
-    <name not found> = ArrayList@243[1] { ResolutionCandidate@242 }
+    <name not found> = ArrayList@241[7] { ResolutionCandidate@242, ResolutionCandidate@243, ResolutionCandidate@244, ... }
 }
 
-ResolutionTaskHolder@244 {
-    <name not found> = ArrayList@245[7] { ResolutionCandidate@246, ResolutionCandidate@247, ResolutionCandidate@248, ... }
-    <name not found> = ArrayList@249[7] { ResolutionCandidate@246, ResolutionCandidate@247, ResolutionCandidate@248, ... }
+ResolutionTaskHolder@245 {
+    <name not found> = ArrayList@246[7] { ResolutionCandidate@247, ResolutionCandidate@248, ResolutionCandidate@249, ... }
 }
 
 ResolutionTaskHolder@250 {
-    <name not found> = ArrayList@251[7] { ResolutionCandidate@252, ResolutionCandidate@253, ResolutionCandidate@254, ... }
-    <name not found> = ArrayList@255[7] { ResolutionCandidate@252, ResolutionCandidate@253, ResolutionCandidate@254, ... }
+    <name not found> = ArrayList@251[8] { ResolutionCandidate@252, ResolutionCandidate@253, ResolutionCandidate@254, ... }
 }
 
-ResolutionTaskHolder@256 {
-    <name not found> = ArrayList@257[7] { ResolutionCandidate@258, ResolutionCandidate@259, ResolutionCandidate@260, ... }
-    <name not found> = ArrayList@261[7] { ResolutionCandidate@258, ResolutionCandidate@259, ResolutionCandidate@260, ... }
+ResolutionTaskHolder@255 {
+    <name not found> = ArrayList@256[8] { ResolutionCandidate@257, ResolutionCandidate@258, ResolutionCandidate@259, ... }
 }
 
-ResolutionTaskHolder@262 {
-    <name not found> = ArrayList@263[7] { ResolutionCandidate@264, ResolutionCandidate@265, ResolutionCandidate@266, ... }
-    <name not found> = ArrayList@267[7] { ResolutionCandidate@264, ResolutionCandidate@265, ResolutionCandidate@266, ... }
+ResolutionTaskHolder@260 {
+    <name not found> = ArrayList@261[8] { ResolutionCandidate@262, ResolutionCandidate@263, ResolutionCandidate@264, ... }
 }
 
-ResolutionTaskHolder@268 {
-    <name not found> = ArrayList@269[7] { ResolutionCandidate@270, ResolutionCandidate@271, ResolutionCandidate@272, ... }
-    <name not found> = ArrayList@273[7] { ResolutionCandidate@270, ResolutionCandidate@271, ResolutionCandidate@272, ... }
+ResolutionTaskHolder@265 {
+    <name not found> = ArrayList@266[8] { ResolutionCandidate@267, ResolutionCandidate@268, ResolutionCandidate@269, ... }
 }
 
-ResolutionTaskHolder@274 {
-    <name not found> = ArrayList@275[7] { ResolutionCandidate@276, ResolutionCandidate@277, ResolutionCandidate@278, ... }
-    <name not found> = ArrayList@279[7] { ResolutionCandidate@276, ResolutionCandidate@277, ResolutionCandidate@278, ... }
+ResolutionTaskHolder@270 {
+    <name not found> = ArrayList@271[8] { ResolutionCandidate@272, ResolutionCandidate@273, ResolutionCandidate@274, ... }
+}
+
+ResolutionTaskHolder@275 {
+    <name not found> = ArrayList@276[8] { ResolutionCandidate@277, ResolutionCandidate@278, ResolutionCandidate@279, ... }
 }
 
 ResolutionTaskHolder@280 {
-    <name not found> = ArrayList@281[7] { ResolutionCandidate@282, ResolutionCandidate@283, ResolutionCandidate@284, ... }
-    <name not found> = ArrayList@285[7] { ResolutionCandidate@282, ResolutionCandidate@283, ResolutionCandidate@284, ... }
+    <name not found> = ArrayList@281[8] { ResolutionCandidate@282, ResolutionCandidate@283, ResolutionCandidate@284, ... }
 }
 
-ResolutionTaskHolder@286 {
-    <name not found> = ArrayList@287[7] { ResolutionCandidate@288, ResolutionCandidate@289, ResolutionCandidate@290, ... }
-    <name not found> = ArrayList@291[7] { ResolutionCandidate@288, ResolutionCandidate@289, ResolutionCandidate@290, ... }
+ResolutionTaskHolder@285 {
+    <name not found> = ArrayList@286[8] { ResolutionCandidate@287, ResolutionCandidate@288, ResolutionCandidate@289, ... }
 }
 
-ResolutionTaskHolder@292 {
-    <name not found> = ArrayList@293[7] { ResolutionCandidate@294, ResolutionCandidate@295, ResolutionCandidate@296, ... }
-    <name not found> = ArrayList@297[7] { ResolutionCandidate@294, ResolutionCandidate@295, ResolutionCandidate@296, ... }
+ResolutionTaskHolder@290 {
+    <name not found> = ArrayList@291[8] { ResolutionCandidate@292, ResolutionCandidate@293, ResolutionCandidate@294, ... }
 }
 
-ResolutionTaskHolder@298 {
-    <name not found> = ArrayList@299[7] { ResolutionCandidate@300, ResolutionCandidate@301, ResolutionCandidate@302, ... }
-    <name not found> = ArrayList@303[7] { ResolutionCandidate@300, ResolutionCandidate@301, ResolutionCandidate@302, ... }
+ResolutionTaskHolder@295 {
+    <name not found> = ArrayList@296[8] { ResolutionCandidate@297, ResolutionCandidate@298, ResolutionCandidate@299, ... }
 }
 
-ResolutionTaskHolder@304 {
-    <name not found> = ArrayList@305[7] { ResolutionCandidate@306, ResolutionCandidate@307, ResolutionCandidate@308, ... }
-    <name not found> = ArrayList@309[7] { ResolutionCandidate@306, ResolutionCandidate@307, ResolutionCandidate@308, ... }
+ResolutionTaskHolder@300 {
+    <name not found> = ArrayList@301[8] { ResolutionCandidate@302, ResolutionCandidate@303, ResolutionCandidate@304, ... }
+}
+
+ResolutionTaskHolder@305 {
+    <name not found> = ArrayList@306[8] { ResolutionCandidate@307, ResolutionCandidate@308, ResolutionCandidate@309, ... }
 }
 
 ResolutionTaskHolder@310 {
-    <name not found> = ArrayList@311[7] { ResolutionCandidate@312, ResolutionCandidate@313, ResolutionCandidate@314, ... }
-    <name not found> = ArrayList@315[7] { ResolutionCandidate@312, ResolutionCandidate@313, ResolutionCandidate@314, ... }
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@311 {
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@312 {
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@313 {
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@314 {
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@315 {
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
 }
 
 ResolutionTaskHolder@316 {
-    <name not found> = ArrayList@317[8] { ResolutionCandidate@318, ResolutionCandidate@319, ResolutionCandidate@320, ... }
-    <name not found> = ArrayList@321[8] { ResolutionCandidate@318, ResolutionCandidate@319, ResolutionCandidate@320, ... }
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@317 {
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@318 {
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@319 {
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@320 {
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@321 {
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
 }
 
 ResolutionTaskHolder@322 {
-    <name not found> = ArrayList@323[8] { ResolutionCandidate@324, ResolutionCandidate@325, ResolutionCandidate@326, ... }
-    <name not found> = ArrayList@327[8] { ResolutionCandidate@324, ResolutionCandidate@325, ResolutionCandidate@326, ... }
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@323 {
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@324 {
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@325 {
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@326 {
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@327 {
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
 }
 
 ResolutionTaskHolder@328 {
-    <name not found> = ArrayList@329[8] { ResolutionCandidate@330, ResolutionCandidate@331, ResolutionCandidate@332, ... }
-    <name not found> = ArrayList@333[8] { ResolutionCandidate@330, ResolutionCandidate@331, ResolutionCandidate@332, ... }
-}
-
-ResolutionTaskHolder@334 {
-    <name not found> = ArrayList@335[8] { ResolutionCandidate@336, ResolutionCandidate@337, ResolutionCandidate@338, ... }
-    <name not found> = ArrayList@339[8] { ResolutionCandidate@336, ResolutionCandidate@337, ResolutionCandidate@338, ... }
-}
-
-ResolutionTaskHolder@340 {
-    <name not found> = ArrayList@341[8] { ResolutionCandidate@342, ResolutionCandidate@343, ResolutionCandidate@344, ... }
-    <name not found> = ArrayList@345[8] { ResolutionCandidate@342, ResolutionCandidate@343, ResolutionCandidate@344, ... }
-}
-
-ResolutionTaskHolder@346 {
-    <name not found> = ArrayList@347[8] { ResolutionCandidate@348, ResolutionCandidate@349, ResolutionCandidate@350, ... }
-    <name not found> = ArrayList@351[8] { ResolutionCandidate@348, ResolutionCandidate@349, ResolutionCandidate@350, ... }
-}
-
-ResolutionTaskHolder@352 {
-    <name not found> = ArrayList@353[8] { ResolutionCandidate@354, ResolutionCandidate@355, ResolutionCandidate@356, ... }
-    <name not found> = ArrayList@357[8] { ResolutionCandidate@354, ResolutionCandidate@355, ResolutionCandidate@356, ... }
-}
-
-ResolutionTaskHolder@358 {
-    <name not found> = ArrayList@359[8] { ResolutionCandidate@360, ResolutionCandidate@361, ResolutionCandidate@362, ... }
-    <name not found> = ArrayList@363[8] { ResolutionCandidate@360, ResolutionCandidate@361, ResolutionCandidate@362, ... }
-}
-
-ResolutionTaskHolder@364 {
-    <name not found> = ArrayList@365[8] { ResolutionCandidate@366, ResolutionCandidate@367, ResolutionCandidate@368, ... }
-    <name not found> = ArrayList@369[8] { ResolutionCandidate@366, ResolutionCandidate@367, ResolutionCandidate@368, ... }
-}
-
-ResolutionTaskHolder@370 {
-    <name not found> = ArrayList@371[8] { ResolutionCandidate@372, ResolutionCandidate@373, ResolutionCandidate@374, ... }
-    <name not found> = ArrayList@375[8] { ResolutionCandidate@372, ResolutionCandidate@373, ResolutionCandidate@374, ... }
-}
-
-ResolutionTaskHolder@376 {
-    <name not found> = ArrayList@377[8] { ResolutionCandidate@378, ResolutionCandidate@379, ResolutionCandidate@380, ... }
-    <name not found> = ArrayList@381[8] { ResolutionCandidate@378, ResolutionCandidate@379, ResolutionCandidate@380, ... }
-}
-
-ResolutionTaskHolder@382 {
-    <name not found> = ArrayList@383[8] { ResolutionCandidate@384, ResolutionCandidate@385, ResolutionCandidate@386, ... }
-    <name not found> = ArrayList@387[8] { ResolutionCandidate@384, ResolutionCandidate@385, ResolutionCandidate@386, ... }
-}
-
-ResolutionTaskHolder@388 {
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
@@ -471,6 +873,135 @@ ResolutionTaskHolder@388 {
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@329 {
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@330 {
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@331 {
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@332 {
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@333 {
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
@@ -479,13 +1010,7 @@ ResolutionTaskHolder@388 {
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@389 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@334 {
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
@@ -512,13 +1037,7 @@ ResolutionTaskHolder@389 {
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@390 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@335 {
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
@@ -545,733 +1064,217 @@ ResolutionTaskHolder@390 {
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@391 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@392 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@393 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@394 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@395 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@396 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@397 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@398 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@399 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@400 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@401 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@402 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@403 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@404 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@405 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@406 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@407 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@408 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@409 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@410 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@411 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@412 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@413 {
+null {
+    <name not found> = ArrayList@336[1] { ResolutionCandidate@147 }
+    <name not found> = ArrayList@337[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@338[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@339[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@340[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@341[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@342[1] { ResolutionCandidate@171 }
+    <name not found> = ArrayList@343[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@344[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@345[1] { ResolutionCandidate@177 }
+    <name not found> = ArrayList@346[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@347[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@348[1] { ResolutionCandidate@189 }
+    <name not found> = ArrayList@349[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@350[1] { ResolutionCandidate@159 }
+    <name not found> = ArrayList@351[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@352[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@353[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@354[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@355[1] { ResolutionCandidate@165 }
+    <name not found> = ArrayList@356[1] { ResolutionCandidate@126 }
+    <name not found> = ArrayList@357[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@358[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@359[1] { ResolutionCandidate@129 }
+    <name not found> = ArrayList@360[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@361[1] { ResolutionCandidate@132 }
+    <name not found> = ArrayList@362[1] { ResolutionCandidate@186 }
+    <name not found> = ArrayList@363[1] { ResolutionCandidate@153 }
+    <name not found> = ArrayList@364[1] { ResolutionCandidate@168 }
+    <name not found> = ArrayList@365[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@366[1] { ResolutionCandidate@135 }
+    <name not found> = ArrayList@367[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@368[1] { ResolutionCandidate@141 }
+    <name not found> = ArrayList@369[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@370[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@371[1] { ResolutionCandidate@174 }
+    <name not found> = ArrayList@372[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@373[1] { ResolutionCandidate@156 }
+    <name not found> = ArrayList@374[1] { ResolutionCandidate@180 }
+    <name not found> = ArrayList@375[1] { ResolutionCandidate@183 }
+    <name not found> = ArrayList@376[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@377[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@378[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@379[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@380[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@381[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@382[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@383[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@384[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@385[1] { ResolutionCandidate@162 }
+    <name not found> = ArrayList@386[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@387[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@388[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@389[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@390[7] { ResolutionCandidate@192, ResolutionCandidate@193, ResolutionCandidate@194, ... }
+    <name not found> = ArrayList@391[7] { ResolutionCandidate@202, ResolutionCandidate@203, ResolutionCandidate@204, ... }
+    <name not found> = ArrayList@392[7] { ResolutionCandidate@222, ResolutionCandidate@223, ResolutionCandidate@224, ... }
+    <name not found> = ArrayList@393[7] { ResolutionCandidate@242, ResolutionCandidate@243, ResolutionCandidate@244, ... }
+    <name not found> = ArrayList@394[7] { ResolutionCandidate@247, ResolutionCandidate@248, ResolutionCandidate@249, ... }
+    <name not found> = ArrayList@395[7] { ResolutionCandidate@237, ResolutionCandidate@238, ResolutionCandidate@239, ... }
+    <name not found> = ArrayList@396[7] { ResolutionCandidate@212, ResolutionCandidate@213, ResolutionCandidate@214, ... }
+    <name not found> = ArrayList@397[7] { ResolutionCandidate@207, ResolutionCandidate@208, ResolutionCandidate@209, ... }
+    <name not found> = ArrayList@398[7] { ResolutionCandidate@217, ResolutionCandidate@218, ResolutionCandidate@219, ... }
+    <name not found> = ArrayList@399[7] { ResolutionCandidate@197, ResolutionCandidate@198, ResolutionCandidate@199, ... }
+    <name not found> = ArrayList@400[7] { ResolutionCandidate@227, ResolutionCandidate@228, ResolutionCandidate@229, ... }
+    <name not found> = ArrayList@401[7] { ResolutionCandidate@232, ResolutionCandidate@233, ResolutionCandidate@234, ... }
+    <name not found> = ArrayList@402[8] { ResolutionCandidate@272, ResolutionCandidate@273, ResolutionCandidate@274, ... }
+    <name not found> = ArrayList@403[8] { ResolutionCandidate@277, ResolutionCandidate@278, ResolutionCandidate@279, ... }
+    <name not found> = ArrayList@404[8] { ResolutionCandidate@287, ResolutionCandidate@288, ResolutionCandidate@289, ... }
+    <name not found> = ArrayList@405[8] { ResolutionCandidate@307, ResolutionCandidate@308, ResolutionCandidate@309, ... }
+    <name not found> = ArrayList@406[8] { ResolutionCandidate@262, ResolutionCandidate@263, ResolutionCandidate@264, ... }
+    <name not found> = ArrayList@407[8] { ResolutionCandidate@282, ResolutionCandidate@283, ResolutionCandidate@284, ... }
+    <name not found> = ArrayList@408[8] { ResolutionCandidate@252, ResolutionCandidate@253, ResolutionCandidate@254, ... }
+    <name not found> = ArrayList@409[8] { ResolutionCandidate@302, ResolutionCandidate@303, ResolutionCandidate@304, ... }
+    <name not found> = ArrayList@410[8] { ResolutionCandidate@267, ResolutionCandidate@268, ResolutionCandidate@269, ... }
+    <name not found> = ArrayList@411[8] { ResolutionCandidate@292, ResolutionCandidate@293, ResolutionCandidate@294, ... }
+    <name not found> = ArrayList@412[8] { ResolutionCandidate@297, ResolutionCandidate@298, ResolutionCandidate@299, ... }
+    <name not found> = ArrayList@413[8] { ResolutionCandidate@257, ResolutionCandidate@258, ResolutionCandidate@259, ... }
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
diff --git a/compiler/testData/diagnostics/tests/operatorsOverloading/kt1028.lazy.log b/compiler/testData/diagnostics/tests/operatorsOverloading/kt1028.lazy.log
index 1ed79b90839..8177a8e0669 100644
--- a/compiler/testData/diagnostics/tests/operatorsOverloading/kt1028.lazy.log
+++ b/compiler/testData/diagnostics/tests/operatorsOverloading/kt1028.lazy.log
@@ -140,63 +140,63 @@ LazyJavaClassifierType@124['E'] {
     arguments = ArrayList@125[empty]
     classifier = JavaTypeParameterImpl@126['E']
     nullable = 'false': Boolean@94
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
 
-LazyJavaClassifierType@127['E'] {
-    arguments = ArrayList@128[empty]
-    classifier = JavaTypeParameterImpl@129['E']
+LazyJavaClassifierType@128['E'] {
+    arguments = ArrayList@129[empty]
+    classifier = JavaTypeParameterImpl@130['E']
     nullable = 'false': Boolean@94
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
 
 LazyJavaClassifierType@131['E'] {
     arguments = ArrayList@132[empty]
     classifier = JavaTypeParameterImpl@133['E']
     nullable = 'false': Boolean@94
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
 }
 
-LazyJavaClassifierType@134['E'] {
-    arguments = ArrayList@135[empty]
-    classifier = JavaTypeParameterImpl@136['E']
-    nullable = 'false': Boolean@94
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
-}
-
-LazyJavaClassifierType@137['E'] {
-    arguments = ArrayList@138[empty]
-    classifier = JavaTypeParameterImpl@139['E']
+LazyJavaClassifierType@135['E'] {
+    arguments = ArrayList@136[empty]
+    classifier = JavaTypeParameterImpl@137['E']
     nullable = 'false': Boolean@94
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
 }
 
-LazyJavaClassifierType@140['E'] {
-    arguments = ArrayList@141[empty]
-    classifier = JavaTypeParameterImpl@142['E']
+LazyJavaClassifierType@138['E'] {
+    arguments = ArrayList@139[empty]
+    classifier = JavaTypeParameterImpl@140['E']
+    nullable = 'false': Boolean@94
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
+}
+
+LazyJavaClassifierType@141['E'] {
+    arguments = ArrayList@142[empty]
+    classifier = JavaTypeParameterImpl@143['E']
+    nullable = 'false': Boolean@94
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
+}
+
+LazyJavaClassifierType@144['E'] {
+    arguments = ArrayList@145[empty]
+    classifier = JavaTypeParameterImpl@146['E']
     nullable = 'false': Boolean@94
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
 }
 
-LazyJavaClassifierType@143['E'] {
-    arguments = ArrayList@144[empty]
-    classifier = JavaTypeParameterImpl@145['E']
+LazyJavaClassifierType@147['E'] {
+    arguments = ArrayList@148[empty]
+    classifier = JavaTypeParameterImpl@149['E']
     nullable = 'false': Boolean@94
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
-}
-
-LazyJavaClassifierType@146['E'] {
-    arguments = ArrayList@147[empty]
-    classifier = JavaTypeParameterImpl@148['E']
-    nullable = 'false': Boolean@94
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@149
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
 }
 
 LazyJavaClassifierType@150['E'] {
     arguments = ArrayList@151[empty]
     classifier = JavaTypeParameterImpl@152['E']
     nullable = 'false': Boolean@94
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
 }
 
 LazyJavaClassifierType@153['E'] {
@@ -210,42 +210,42 @@ LazyJavaClassifierType@156['E'] {
     arguments = ArrayList@157[empty]
     classifier = JavaTypeParameterImpl@158['E']
     nullable = 'false': Boolean@94
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
 }
 
 LazyJavaClassifierType@159['E'] {
     arguments = ArrayList@160[empty]
     classifier = JavaTypeParameterImpl@161['E']
     nullable = 'false': Boolean@94
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
 
 LazyJavaClassifierType@162['E'] {
     arguments = ArrayList@163[empty]
     classifier = JavaTypeParameterImpl@164['E']
     nullable = 'false': Boolean@94
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@149
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
 }
 
 LazyJavaClassifierType@165['E'] {
     arguments = ArrayList@166[empty]
     classifier = JavaTypeParameterImpl@167['E']
     nullable = 'false': Boolean@94
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@149
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
 }
 
 LazyJavaClassifierType@168['E'] {
     arguments = ArrayList@169[empty]
     classifier = JavaTypeParameterImpl@170['E']
     nullable = 'false': Boolean@94
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@149
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
 }
 
 LazyJavaClassifierType@171['E'] {
     arguments = ArrayList@172[empty]
     classifier = JavaTypeParameterImpl@173['E']
     nullable = 'false': Boolean@94
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
 
 LazyJavaClassifierType@174['E'] {
@@ -259,105 +259,105 @@ LazyJavaClassifierType@177['E'] {
     arguments = ArrayList@178[empty]
     classifier = JavaTypeParameterImpl@179['E']
     nullable = 'false': Boolean@94
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
 
 LazyJavaClassifierType@180['E'] {
     arguments = ArrayList@181[empty]
     classifier = JavaTypeParameterImpl@182['E']
     nullable = 'false': Boolean@94
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
 }
 
 LazyJavaClassifierType@183['E'] {
     arguments = ArrayList@184[empty]
-    classifier = JavaTypeParameterImpl@173['E']
-    nullable = 'true': Boolean@114
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
-}
-
-LazyJavaClassifierType@185['E'] {
-    arguments = ArrayList@186[empty]
-    classifier = JavaTypeParameterImpl@139['E']
+    classifier = JavaTypeParameterImpl@167['E']
     nullable = 'true': Boolean@114
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
 }
 
+LazyJavaClassifierType@185['E'] {
+    arguments = ArrayList@186[empty]
+    classifier = JavaTypeParameterImpl@133['E']
+    nullable = 'true': Boolean@114
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
+}
+
 LazyJavaClassifierType@187['E'] {
     arguments = ArrayList@188[empty]
-    classifier = JavaTypeParameterImpl@164['E']
+    classifier = JavaTypeParameterImpl@182['E']
     nullable = 'true': Boolean@114
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@149
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
 }
 
 LazyJavaClassifierType@189['E'] {
     arguments = ArrayList@190[empty]
-    classifier = JavaTypeParameterImpl@182['E']
+    classifier = JavaTypeParameterImpl@146['E']
     nullable = 'true': Boolean@114
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
 }
 
 LazyJavaClassifierType@191['E'] {
     arguments = ArrayList@192[empty]
-    classifier = JavaTypeParameterImpl@152['E']
+    classifier = JavaTypeParameterImpl@164['E']
     nullable = 'true': Boolean@114
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
 }
 
 LazyJavaClassifierType@193['E'] {
     arguments = ArrayList@194[empty]
-    classifier = JavaTypeParameterImpl@161['E']
+    classifier = JavaTypeParameterImpl@149['E']
     nullable = 'true': Boolean@114
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
 }
 
 LazyJavaClassifierType@195['E'] {
     arguments = ArrayList@196[empty]
-    classifier = JavaTypeParameterImpl@145['E']
+    classifier = JavaTypeParameterImpl@152['E']
     nullable = 'true': Boolean@114
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
 }
 
 LazyJavaClassifierType@197['E'] {
     arguments = ArrayList@198[empty]
-    classifier = JavaTypeParameterImpl@126['E']
+    classifier = JavaTypeParameterImpl@140['E']
     nullable = 'true': Boolean@114
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
 
 LazyJavaClassifierType@199['E'] {
     arguments = ArrayList@200[empty]
-    classifier = JavaTypeParameterImpl@142['E']
+    classifier = JavaTypeParameterImpl@158['E']
     nullable = 'true': Boolean@114
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
 }
 
 LazyJavaClassifierType@201['E'] {
     arguments = ArrayList@202[empty]
-    classifier = JavaTypeParameterImpl@179['E']
+    classifier = JavaTypeParameterImpl@170['E']
     nullable = 'true': Boolean@114
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
 }
 
 LazyJavaClassifierType@203['E'] {
     arguments = ArrayList@204[empty]
-    classifier = JavaTypeParameterImpl@170['E']
+    classifier = JavaTypeParameterImpl@179['E']
     nullable = 'true': Boolean@114
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@149
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
 
 LazyJavaClassifierType@205['E'] {
     arguments = ArrayList@206[empty]
-    classifier = JavaTypeParameterImpl@133['E']
+    classifier = JavaTypeParameterImpl@155['E']
     nullable = 'true': Boolean@114
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
 }
 
 LazyJavaClassifierType@207['E'] {
     arguments = ArrayList@208[empty]
-    classifier = JavaTypeParameterImpl@129['E']
+    classifier = JavaTypeParameterImpl@176['E']
     nullable = 'true': Boolean@114
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
 }
 
 LazyJavaClassifierType@209['E'] {
@@ -369,44 +369,44 @@ LazyJavaClassifierType@209['E'] {
 
 LazyJavaClassifierType@211['E'] {
     arguments = ArrayList@212[empty]
-    classifier = JavaTypeParameterImpl@158['E']
+    classifier = JavaTypeParameterImpl@173['E']
     nullable = 'true': Boolean@114
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
 
 LazyJavaClassifierType@213['E'] {
     arguments = ArrayList@214[empty]
-    classifier = JavaTypeParameterImpl@176['E']
+    classifier = JavaTypeParameterImpl@143['E']
     nullable = 'true': Boolean@114
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
 
 LazyJavaClassifierType@215['E'] {
     arguments = ArrayList@216[empty]
-    classifier = JavaTypeParameterImpl@155['E']
+    classifier = JavaTypeParameterImpl@137['E']
     nullable = 'true': Boolean@114
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
 }
 
 LazyJavaClassifierType@217['E'] {
     arguments = ArrayList@218[empty]
-    classifier = JavaTypeParameterImpl@148['E']
+    classifier = JavaTypeParameterImpl@126['E']
     nullable = 'true': Boolean@114
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@149
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
 
 LazyJavaClassifierType@219['E'] {
     arguments = ArrayList@220[empty]
-    classifier = JavaTypeParameterImpl@167['E']
+    classifier = JavaTypeParameterImpl@130['E']
     nullable = 'true': Boolean@114
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@149
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
 
 LazyJavaClassifierType@221['E'] {
     arguments = ArrayList@222[empty]
-    classifier = JavaTypeParameterImpl@136['E']
+    classifier = JavaTypeParameterImpl@161['E']
     nullable = 'true': Boolean@114
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
 
 LazyJavaClassifierType@223['Iterator<E>'] {
@@ -490,7 +490,7 @@ LazyJavaClassifierType@266['Object'] {
 
 LazyJavaClassifierType@269['Object'] {
     arguments = ArrayList@270[empty]
-    classifier = JavaClassImpl@268['Object']
+    classifier = JavaClassImpl@263['Object']
     memberScope = DeserializedClassMemberScope@264
     nullable = 'true': Boolean@114
     typeConstructor = DeserializedClassTypeConstructor@265
@@ -498,7 +498,7 @@ LazyJavaClassifierType@269['Object'] {
 
 LazyJavaClassifierType@271['Object'] {
     arguments = ArrayList@272[empty]
-    classifier = JavaClassImpl@263['Object']
+    classifier = JavaClassImpl@268['Object']
     memberScope = DeserializedClassMemberScope@264
     nullable = 'true': Boolean@114
     typeConstructor = DeserializedClassTypeConstructor@265
@@ -641,49 +641,49 @@ LazyJavaPackageFragment@308['util'] {
     memberIndex = computeMemberIndex$1@360 // through LazyPackageFragmentScopeForJavaPackage@356
 }
 
-LazyJavaTypeParameterDescriptor@80['E'] {
+LazyJavaTypeParameterDescriptor@75['E'] {
     defaultType = JetTypeImpl@361['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
     upperBounds = LinkedHashSet@362[1] { NullableType@363 }
     upperBoundsAsType = NullableType@363
 }
 
 LazyJavaTypeParameterDescriptor@71['E'] {
     defaultType = JetTypeImpl@364['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@149
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
     upperBounds = LinkedHashSet@365[1] { NullableType@366 }
     upperBoundsAsType = NullableType@366
 }
 
-LazyJavaTypeParameterDescriptor@75['E'] {
+LazyJavaTypeParameterDescriptor@80['E'] {
     defaultType = JetTypeImpl@367['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
     upperBounds = LinkedHashSet@368[1] { NullableType@369 }
     upperBoundsAsType = NullableType@369
 }
 
 LazyJavaTypeParameterResolver@370 {
-    resolve(JavaTypeParameterImpl@371['E']) = LazyJavaTypeParameterDescriptor@75['E']
+    resolve(JavaTypeParameterImpl@371['E']) = LazyJavaTypeParameterDescriptor@80['E']
 }
 
 LazyJavaTypeParameterResolver@372 {
-    resolve(JavaTypeParameterImpl@373['E']) = LazyJavaTypeParameterDescriptor@71['E']
+    resolve(JavaTypeParameterImpl@373['E']) = LazyJavaTypeParameterDescriptor@75['E']
 }
 
 LazyJavaTypeParameterResolver@374 {
-    resolve(JavaTypeParameterImpl@375['E']) = LazyJavaTypeParameterDescriptor@80['E']
+    resolve(JavaTypeParameterImpl@375['E']) = LazyJavaTypeParameterDescriptor@71['E']
 }
 
 LazyJavaTypeParameterResolver@376 {
-    resolve(JavaTypeParameterImpl@176['E']) = null
+    resolve(JavaTypeParameterImpl@164['E']) = null
 }
 
 LazyJavaTypeParameterResolver@377 {
-    resolve(JavaTypeParameterImpl@152['E']) = null
+    resolve(JavaTypeParameterImpl@182['E']) = null
 }
 
 LazyJavaTypeParameterResolver@378 {
-    resolve(JavaTypeParameterImpl@133['E']) = null
+    resolve(JavaTypeParameterImpl@161['E']) = null
 }
 
 LazyJavaTypeParameterResolver@379 {
@@ -691,39 +691,31 @@ LazyJavaTypeParameterResolver@379 {
 }
 
 LazyJavaTypeParameterResolver@380 {
-    resolve(JavaTypeParameterImpl@170['E']) = null
+    resolve(JavaTypeParameterImpl@122['E']) = null
 }
 
 LazyJavaTypeParameterResolver@381 {
-    resolve(JavaTypeParameterImpl@129['E']) = null
+    resolve(JavaTypeParameterImpl@170['E']) = null
 }
 
 LazyJavaTypeParameterResolver@382 {
-    resolve(JavaTypeParameterImpl@136['E']) = null
+    resolve(JavaTypeParameterImpl@130['E']) = null
 }
 
 LazyJavaTypeParameterResolver@383 {
-    resolve(JavaTypeParameterImpl@179['E']) = null
+    resolve(JavaTypeParameterImpl@152['E']) = null
 }
 
 LazyJavaTypeParameterResolver@384 {
-    resolve(JavaTypeParameterImpl@145['E']) = null
+    resolve(JavaTypeParameterImpl@173['E']) = null
 }
 
 LazyJavaTypeParameterResolver@385 {
-    resolve(JavaTypeParameterImpl@164['E']) = null
+    resolve(JavaTypeParameterImpl@143['E']) = null
 }
 
 ResolutionTaskHolder@386 {
     <name not found> = ArrayList@387[1] { ResolutionCandidate@388 }
-    <name not found> = ArrayList@389[1] { ResolutionCandidate@388 }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
@@ -757,17 +749,8 @@ ResolutionTaskHolder@386 {
     <name not found> = EmptyList@62[empty]
 }
 
-ResolutionTaskHolder@390 {
-    <name not found> = ArrayList@391[1] { ResolutionCandidate@392 }
-    <name not found> = ArrayList@393[1] { ResolutionCandidate@392 }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
+ResolutionTaskHolder@389 {
+    <name not found> = ArrayList@390[1] { ResolutionCandidate@391 }
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
@@ -778,9 +761,8 @@ ResolutionTaskHolder@390 {
     <name not found> = EmptyList@62[empty]
 }
 
-ResolutionTaskHolder@394 {
-    <name not found> = ArrayList@395[1] { ResolutionCandidate@396 }
-    <name not found> = ArrayList@397[1] { ResolutionCandidate@396 }
+ResolutionTaskHolder@392 {
+    <name not found> = ArrayList@393[1] { ResolutionCandidate@394 }
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
@@ -789,6 +771,10 @@ ResolutionTaskHolder@394 {
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
+}
+
+ResolutionTaskHolder@395 {
+    <name not found> = ArrayList@396[1] { ResolutionCandidate@397 }
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
@@ -801,181 +787,119 @@ ResolutionTaskHolder@394 {
 
 ResolutionTaskHolder@398 {
     <name not found> = ArrayList@399[1] { ResolutionCandidate@400 }
-    <name not found> = ArrayList@401[1] { ResolutionCandidate@400 }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
 }
 
-ResolutionTaskHolder@402 {
-    <name not found> = ArrayList@403[1] { ResolutionCandidate@404 }
-    <name not found> = ArrayList@405[1] { ResolutionCandidate@404 }
-    <name not found> = EmptyList@62[empty]
+ResolutionTaskHolder@401 {
+    <name not found> = ArrayList@402[1] { ResolutionCandidate@403 }
     <name not found> = EmptyList@62[empty]
 }
 
-ResolutionTaskHolder@406 {
-    <name not found> = ArrayList@407[1] { ResolutionCandidate@408 }
-    <name not found> = ArrayList@409[1] { ResolutionCandidate@408 }
+ResolutionTaskHolder@404 {
+    <name not found> = ArrayList@405[1] { ResolutionCandidate@406 }
     <name not found> = EmptyList@62[empty]
+}
+
+ResolutionTaskHolder@407 {
+    <name not found> = ArrayList@408[1] { ResolutionCandidate@409 }
     <name not found> = EmptyList@62[empty]
 }
 
 ResolutionTaskHolder@410 {
     <name not found> = ArrayList@411[1] { ResolutionCandidate@412 }
-    <name not found> = ArrayList@413[1] { ResolutionCandidate@412 }
-    <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
 }
 
-ResolutionTaskHolder@414 {
-    <name not found> = ArrayList@415[1] { ResolutionCandidate@416 }
-    <name not found> = ArrayList@417[1] { ResolutionCandidate@416 }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
+ResolutionTaskHolder@413 {
+    <name not found> = ArrayList@414[1] { ResolutionCandidate@415 }
 }
 
-ResolutionTaskHolder@418 {
-    <name not found> = ArrayList@419[1] { ResolutionCandidate@420 }
-    <name not found> = ArrayList@421[1] { ResolutionCandidate@420 }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
+ResolutionTaskHolder@416 {
+    <name not found> = ArrayList@417[1] { ResolutionCandidate@418 }
+}
+
+ResolutionTaskHolder@419 {
+    <name not found> = ArrayList@420[1] { ResolutionCandidate@421 }
 }
 
 ResolutionTaskHolder@422 {
     <name not found> = ArrayList@423[1] { ResolutionCandidate@424 }
-    <name not found> = ArrayList@425[1] { ResolutionCandidate@424 }
 }
 
-ResolutionTaskHolder@426 {
-    <name not found> = ArrayList@427[1] { ResolutionCandidate@428 }
-    <name not found> = ArrayList@429[1] { ResolutionCandidate@428 }
+ResolutionTaskHolder@425 {
+    <name not found> = ArrayList@426[1] { ResolutionCandidate@427 }
 }
 
-ResolutionTaskHolder@430 {
-    <name not found> = ArrayList@431[1] { ResolutionCandidate@432 }
-    <name not found> = ArrayList@433[1] { ResolutionCandidate@432 }
+ResolutionTaskHolder@428 {
+    <name not found> = ArrayList@429[1] { ResolutionCandidate@430 }
+}
+
+ResolutionTaskHolder@431 {
+    <name not found> = ArrayList@432[1] { ResolutionCandidate@433 }
 }
 
 ResolutionTaskHolder@434 {
     <name not found> = ArrayList@435[1] { ResolutionCandidate@436 }
-    <name not found> = ArrayList@437[1] { ResolutionCandidate@436 }
 }
 
-ResolutionTaskHolder@438 {
-    <name not found> = ArrayList@439[1] { ResolutionCandidate@440 }
-    <name not found> = ArrayList@441[1] { ResolutionCandidate@440 }
+ResolutionTaskHolder@437 {
+    <name not found> = ArrayList@438[1] { ResolutionCandidate@439 }
 }
 
-ResolutionTaskHolder@442 {
-    <name not found> = ArrayList@443[1] { ResolutionCandidate@444 }
-    <name not found> = ArrayList@445[1] { ResolutionCandidate@444 }
+ResolutionTaskHolder@440 {
+    <name not found> = ArrayList@441[1] { ResolutionCandidate@442 }
+}
+
+ResolutionTaskHolder@443 {
+    <name not found> = ArrayList@444[1] { ResolutionCandidate@445 }
 }
 
 ResolutionTaskHolder@446 {
     <name not found> = ArrayList@447[1] { ResolutionCandidate@448 }
-    <name not found> = ArrayList@449[1] { ResolutionCandidate@448 }
 }
 
-ResolutionTaskHolder@450 {
-    <name not found> = ArrayList@451[1] { ResolutionCandidate@452 }
-    <name not found> = ArrayList@453[1] { ResolutionCandidate@452 }
+ResolutionTaskHolder@449 {
+    <name not found> = ArrayList@450[1] { ResolutionCandidate@451 }
 }
 
-ResolutionTaskHolder@454 {
-    <name not found> = ArrayList@455[1] { ResolutionCandidate@456 }
-    <name not found> = ArrayList@457[1] { ResolutionCandidate@456 }
+ResolutionTaskHolder@452 {
+    <name not found> = ArrayList@453[1] { ResolutionCandidate@454 }
+}
+
+ResolutionTaskHolder@455 {
+    <name not found> = ArrayList@456[1] { ResolutionCandidate@457 }
 }
 
 ResolutionTaskHolder@458 {
     <name not found> = ArrayList@459[1] { ResolutionCandidate@460 }
-    <name not found> = ArrayList@461[1] { ResolutionCandidate@460 }
 }
 
-ResolutionTaskHolder@462 {
-    <name not found> = ArrayList@463[1] { ResolutionCandidate@464 }
-    <name not found> = ArrayList@465[1] { ResolutionCandidate@464 }
+ResolutionTaskHolder@461 {
+    <name not found> = ArrayList@462[1] { ResolutionCandidate@463 }
 }
 
-ResolutionTaskHolder@466 {
-    <name not found> = ArrayList@467[1] { ResolutionCandidate@468 }
-    <name not found> = ArrayList@469[1] { ResolutionCandidate@468 }
+ResolutionTaskHolder@464 {
+    <name not found> = ArrayList@465[1] { ResolutionCandidate@466 }
+}
+
+ResolutionTaskHolder@467 {
+    <name not found> = ArrayList@468[1] { ResolutionCandidate@469 }
 }
 
 ResolutionTaskHolder@470 {
     <name not found> = ArrayList@471[1] { ResolutionCandidate@472 }
-    <name not found> = ArrayList@473[1] { ResolutionCandidate@472 }
 }
 
-ResolutionTaskHolder@474 {
-    <name not found> = ArrayList@475[1] { ResolutionCandidate@476 }
-    <name not found> = ArrayList@477[1] { ResolutionCandidate@476 }
+ResolutionTaskHolder@473 {
+    <name not found> = ArrayList@474[2] { ResolutionCandidate@475, ResolutionCandidate@476 }
 }
 
-ResolutionTaskHolder@478 {
-    <name not found> = ArrayList@479[1] { ResolutionCandidate@480 }
-    <name not found> = ArrayList@481[1] { ResolutionCandidate@480 }
+ResolutionTaskHolder@477 {
+    <name not found> = ArrayList@478[2] { ResolutionCandidate@479, ResolutionCandidate@480 }
 }
 
-ResolutionTaskHolder@482 {
-    <name not found> = ArrayList@483[1] { ResolutionCandidate@484 }
-    <name not found> = ArrayList@485[1] { ResolutionCandidate@484 }
-}
-
-ResolutionTaskHolder@486 {
-    <name not found> = ArrayList@487[1] { ResolutionCandidate@488 }
-    <name not found> = ArrayList@489[1] { ResolutionCandidate@488 }
-}
-
-ResolutionTaskHolder@490 {
-    <name not found> = ArrayList@491[1] { ResolutionCandidate@492 }
-    <name not found> = ArrayList@493[1] { ResolutionCandidate@492 }
-}
-
-ResolutionTaskHolder@494 {
-    <name not found> = ArrayList@495[1] { ResolutionCandidate@496 }
-    <name not found> = ArrayList@497[1] { ResolutionCandidate@496 }
-}
-
-ResolutionTaskHolder@498 {
-    <name not found> = ArrayList@499[1] { ResolutionCandidate@500 }
-    <name not found> = ArrayList@501[1] { ResolutionCandidate@500 }
-}
-
-ResolutionTaskHolder@502 {
-    <name not found> = ArrayList@503[2] { ResolutionCandidate@504, ResolutionCandidate@505 }
-    <name not found> = ArrayList@506[2] { ResolutionCandidate@504, ResolutionCandidate@505 }
-}
-
-ResolutionTaskHolder@507 {
-    <name not found> = ArrayList@508[2] { ResolutionCandidate@509, ResolutionCandidate@510 }
-    <name not found> = ArrayList@511[2] { ResolutionCandidate@509, ResolutionCandidate@510 }
-}
-
-ResolutionTaskHolder@512 {
-    <name not found> = ArrayList@513[3] { ResolutionCandidate@514, ResolutionCandidate@515, ResolutionCandidate@516 }
-    <name not found> = ArrayList@517[3] { ResolutionCandidate@514, ResolutionCandidate@515, ResolutionCandidate@516 }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
+ResolutionTaskHolder@481 {
+    <name not found> = ArrayList@482[3] { ResolutionCandidate@483, ResolutionCandidate@484, ResolutionCandidate@485 }
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
@@ -986,19 +910,7 @@ ResolutionTaskHolder@512 {
     <name not found> = EmptyList@62[empty]
 }
 
-ResolutionTaskHolder@518 {
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
+ResolutionTaskHolder@486 {
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
@@ -1049,19 +961,7 @@ ResolutionTaskHolder@518 {
     <name not found> = EmptyList@62[empty]
 }
 
-ResolutionTaskHolder@519 {
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
+ResolutionTaskHolder@487 {
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
@@ -1112,13 +1012,7 @@ ResolutionTaskHolder@519 {
     <name not found> = EmptyList@62[empty]
 }
 
-ResolutionTaskHolder@520 {
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
+ResolutionTaskHolder@488 {
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
@@ -1145,7 +1039,116 @@ ResolutionTaskHolder@520 {
     <name not found> = EmptyList@62[empty]
 }
 
-ResolutionTaskHolder@521 {
+ResolutionTaskHolder@489 {
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+}
+
+null {
+    <name not found> = ArrayList@490[1] { ResolutionCandidate@391 }
+    <name not found> = ArrayList@491[1] { ResolutionCandidate@403 }
+    <name not found> = ArrayList@492[1] { ResolutionCandidate@445 }
+    <name not found> = ArrayList@493[1] { ResolutionCandidate@400 }
+    <name not found> = ArrayList@494[1] { ResolutionCandidate@415 }
+    <name not found> = ArrayList@495[1] { ResolutionCandidate@412 }
+    <name not found> = ArrayList@496[1] { ResolutionCandidate@430 }
+    <name not found> = ArrayList@497[1] { ResolutionCandidate@454 }
+    <name not found> = ArrayList@498[1] { ResolutionCandidate@418 }
+    <name not found> = ArrayList@499[1] { ResolutionCandidate@439 }
+    <name not found> = ArrayList@500[1] { ResolutionCandidate@406 }
+    <name not found> = ArrayList@501[1] { ResolutionCandidate@433 }
+    <name not found> = ArrayList@502[1] { ResolutionCandidate@409 }
+    <name not found> = ArrayList@503[1] { ResolutionCandidate@397 }
+    <name not found> = ArrayList@504[1] { ResolutionCandidate@451 }
+    <name not found> = ArrayList@505[1] { ResolutionCandidate@394 }
+    <name not found> = ArrayList@506[1] { ResolutionCandidate@469 }
+    <name not found> = ArrayList@507[1] { ResolutionCandidate@436 }
+    <name not found> = ArrayList@508[1] { ResolutionCandidate@472 }
+    <name not found> = ArrayList@509[1] { ResolutionCandidate@442 }
+    <name not found> = ArrayList@510[1] { ResolutionCandidate@448 }
+    <name not found> = ArrayList@511[1] { ResolutionCandidate@388 }
+    <name not found> = ArrayList@512[1] { ResolutionCandidate@460 }
+    <name not found> = ArrayList@513[1] { ResolutionCandidate@463 }
+    <name not found> = ArrayList@514[1] { ResolutionCandidate@466 }
+    <name not found> = ArrayList@515[1] { ResolutionCandidate@424 }
+    <name not found> = ArrayList@516[1] { ResolutionCandidate@457 }
+    <name not found> = ArrayList@517[1] { ResolutionCandidate@421 }
+    <name not found> = ArrayList@518[1] { ResolutionCandidate@427 }
+    <name not found> = ArrayList@519[2] { ResolutionCandidate@475, ResolutionCandidate@476 }
+    <name not found> = ArrayList@520[2] { ResolutionCandidate@479, ResolutionCandidate@480 }
+    <name not found> = ArrayList@521[3] { ResolutionCandidate@483, ResolutionCandidate@484, ResolutionCandidate@485 }
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
diff --git a/compiler/testData/diagnostics/tests/operatorsOverloading/kt3450.lazy.log b/compiler/testData/diagnostics/tests/operatorsOverloading/kt3450.lazy.log
index d91d3754750..550a45dd635 100644
--- a/compiler/testData/diagnostics/tests/operatorsOverloading/kt3450.lazy.log
+++ b/compiler/testData/diagnostics/tests/operatorsOverloading/kt3450.lazy.log
@@ -82,24 +82,24 @@ LazyJavaPackageFragment@18['lang'] {
 
 ResolutionTaskHolder@54 {
     <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@58[2] { ResolutionCandidate@59, ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[2] { ResolutionCandidate@59, ResolutionCandidate@60 }
+    <name not found> = ArrayList@57[2] { ResolutionCandidate@58, ResolutionCandidate@59 }
+    <name not found> = EmptyList@46[empty]
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
@@ -112,15 +112,6 @@ ResolutionTaskHolder@62 {
 
 ResolutionTaskHolder@66 {
     <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
@@ -131,121 +122,133 @@ ResolutionTaskHolder@66 {
     <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
+}
+
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
 }
 
 ResolutionTaskHolder@78 {
     <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
+}
+
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
 }
 
 ResolutionTaskHolder@90 {
     <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
 }
 
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
+}
+
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
 }
 
 ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@103[2] { ResolutionCandidate@104, ResolutionCandidate@105 }
 }
 
 ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@107[2] { ResolutionCandidate@108, ResolutionCandidate@109 }
 }
 
 ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@111[2] { ResolutionCandidate@112, ResolutionCandidate@113 }
 }
 
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[2] { ResolutionCandidate@120, ResolutionCandidate@121 }
-    <name not found> = ArrayList@122[2] { ResolutionCandidate@120, ResolutionCandidate@121 }
-}
-
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[2] { ResolutionCandidate@125, ResolutionCandidate@126 }
-    <name not found> = ArrayList@127[2] { ResolutionCandidate@125, ResolutionCandidate@126 }
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[2] { ResolutionCandidate@130, ResolutionCandidate@131 }
-    <name not found> = ArrayList@132[2] { ResolutionCandidate@130, ResolutionCandidate@131 }
+null {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@129[2] { ResolutionCandidate@112, ResolutionCandidate@113 }
+    <name not found> = ArrayList@130[2] { ResolutionCandidate@108, ResolutionCandidate@109 }
+    <name not found> = ArrayList@131[2] { ResolutionCandidate@104, ResolutionCandidate@105 }
+    <name not found> = ArrayList@132[2] { ResolutionCandidate@58, ResolutionCandidate@59 }
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/overload/SyntheticAndNotSynthetic.lazy.log b/compiler/testData/diagnostics/tests/overload/SyntheticAndNotSynthetic.lazy.log
index 418b000d853..c384230ab03 100644
--- a/compiler/testData/diagnostics/tests/overload/SyntheticAndNotSynthetic.lazy.log
+++ b/compiler/testData/diagnostics/tests/overload/SyntheticAndNotSynthetic.lazy.log
@@ -84,20 +84,23 @@ LazyJavaPackageFragment@49['lang'] {
 
 ResolutionTaskHolder@74 {
     <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
     <name not found> = EmptyList@16[empty]
     <name not found> = EmptyList@16[empty]
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
+    <name not found> = EmptyList@16[empty]
 }
 
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[2] { ResolutionCandidate@84, ResolutionCandidate@86 }
-    <name not found> = EmptyList@16[empty]
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
+}
+
+null {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@85[2] { ResolutionCandidate@76, ResolutionCandidate@86 }
     <name not found> = EmptyList@16[empty]
     <name not found> = EmptyList@16[empty]
     <name not found> = EmptyList@16[empty]
diff --git a/compiler/testData/diagnostics/tests/overload/kt1998.lazy.log b/compiler/testData/diagnostics/tests/overload/kt1998.lazy.log
index 1d864d09536..d72f8728ff8 100644
--- a/compiler/testData/diagnostics/tests/overload/kt1998.lazy.log
+++ b/compiler/testData/diagnostics/tests/overload/kt1998.lazy.log
@@ -37,16 +37,19 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@29 {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@36[3] { ResolutionCandidate@37, ResolutionCandidate@38, ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[3] { ResolutionCandidate@37, ResolutionCandidate@38, ResolutionCandidate@39 }
-    <name not found> = EmptyList@26[empty]
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@34[3] { ResolutionCandidate@35, ResolutionCandidate@36, ResolutionCandidate@37 }
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
+}
+
+null {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@44[3] { ResolutionCandidate@35, ResolutionCandidate@36, ResolutionCandidate@37 }
+    <name not found> = EmptyList@26[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/override/AbstractFunImplemented.lazy.log b/compiler/testData/diagnostics/tests/override/AbstractFunImplemented.lazy.log
index c68dc9a7466..4b859b9725e 100644
--- a/compiler/testData/diagnostics/tests/override/AbstractFunImplemented.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/AbstractFunImplemented.lazy.log
@@ -31,5 +31,8 @@ LazyJavaPackageFragment@9['java'] {
 
 ResolutionTaskHolder@27 {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
+}
+
+null {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
 }
diff --git a/compiler/testData/diagnostics/tests/override/AbstractFunNotImplemented.lazy.log b/compiler/testData/diagnostics/tests/override/AbstractFunNotImplemented.lazy.log
index c9b666b0931..a4fac0eac67 100644
--- a/compiler/testData/diagnostics/tests/override/AbstractFunNotImplemented.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/AbstractFunNotImplemented.lazy.log
@@ -27,5 +27,8 @@ LazyJavaPackageFragment@7['java'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
+}
+
+null {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
 }
diff --git a/compiler/testData/diagnostics/tests/override/AbstractValImplemented.lazy.log b/compiler/testData/diagnostics/tests/override/AbstractValImplemented.lazy.log
index d043a961e7a..36b2b48a9c1 100644
--- a/compiler/testData/diagnostics/tests/override/AbstractValImplemented.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/AbstractValImplemented.lazy.log
@@ -32,5 +32,8 @@ LazyJavaPackageFragment@10['java'] {
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
+}
+
+null {
     <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
 }
diff --git a/compiler/testData/diagnostics/tests/override/AbstractValNotImplemented.lazy.log b/compiler/testData/diagnostics/tests/override/AbstractValNotImplemented.lazy.log
index c9b666b0931..a4fac0eac67 100644
--- a/compiler/testData/diagnostics/tests/override/AbstractValNotImplemented.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/AbstractValNotImplemented.lazy.log
@@ -27,5 +27,8 @@ LazyJavaPackageFragment@7['java'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
+}
+
+null {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
 }
diff --git a/compiler/testData/diagnostics/tests/override/AbstractVarImplemented.lazy.log b/compiler/testData/diagnostics/tests/override/AbstractVarImplemented.lazy.log
index c68dc9a7466..4b859b9725e 100644
--- a/compiler/testData/diagnostics/tests/override/AbstractVarImplemented.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/AbstractVarImplemented.lazy.log
@@ -31,5 +31,8 @@ LazyJavaPackageFragment@9['java'] {
 
 ResolutionTaskHolder@27 {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
+}
+
+null {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
 }
diff --git a/compiler/testData/diagnostics/tests/override/AbstractVarNotImplemented.lazy.log b/compiler/testData/diagnostics/tests/override/AbstractVarNotImplemented.lazy.log
index c9b666b0931..a4fac0eac67 100644
--- a/compiler/testData/diagnostics/tests/override/AbstractVarNotImplemented.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/AbstractVarNotImplemented.lazy.log
@@ -27,5 +27,8 @@ LazyJavaPackageFragment@7['java'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
+}
+
+null {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
 }
diff --git a/compiler/testData/diagnostics/tests/override/AllPrivateFromSuperTypes.lazy.log b/compiler/testData/diagnostics/tests/override/AllPrivateFromSuperTypes.lazy.log
index 3d22aae09ae..825008b4259 100644
--- a/compiler/testData/diagnostics/tests/override/AllPrivateFromSuperTypes.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/AllPrivateFromSuperTypes.lazy.log
@@ -44,12 +44,6 @@ ResolutionTaskHolder@35 {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
     <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
     <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
@@ -72,7 +66,16 @@ ResolutionTaskHolder@35 {
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+}
+
+null {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@43 }
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/override/AllProtectedFromSupertypes.lazy.log b/compiler/testData/diagnostics/tests/override/AllProtectedFromSupertypes.lazy.log
index f89a7b8b601..aa4be6c039c 100644
--- a/compiler/testData/diagnostics/tests/override/AllProtectedFromSupertypes.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/AllProtectedFromSupertypes.lazy.log
@@ -41,12 +41,15 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@35 {
     <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
+}
+
+null {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@37 }
+    <name not found> = EmptyList@31[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/override/ComplexValRedeclaration.lazy.log b/compiler/testData/diagnostics/tests/override/ComplexValRedeclaration.lazy.log
index 0472e9a4c48..80bc37b7972 100644
--- a/compiler/testData/diagnostics/tests/override/ComplexValRedeclaration.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/ComplexValRedeclaration.lazy.log
@@ -31,10 +31,13 @@ LazyJavaPackageFragment@7['java'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
+}
+
+null {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@33 }
 }
diff --git a/compiler/testData/diagnostics/tests/override/ConflictingFunctionSignatureFromSuperclass.lazy.log b/compiler/testData/diagnostics/tests/override/ConflictingFunctionSignatureFromSuperclass.lazy.log
index 66bdefa8ec0..340b674c6e9 100644
--- a/compiler/testData/diagnostics/tests/override/ConflictingFunctionSignatureFromSuperclass.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/ConflictingFunctionSignatureFromSuperclass.lazy.log
@@ -25,5 +25,8 @@ LazyJavaPackageFragment@8['java'] {
 
 ResolutionTaskHolder@22 {
     <name not found> = ArrayList@23[1] { ResolutionCandidate@24 }
+}
+
+null {
     <name not found> = ArrayList@25[1] { ResolutionCandidate@24 }
 }
diff --git a/compiler/testData/diagnostics/tests/override/ConflictingPropertySignatureFromSuperclass.lazy.log b/compiler/testData/diagnostics/tests/override/ConflictingPropertySignatureFromSuperclass.lazy.log
index 6c56d847fa9..88bdff3191d 100644
--- a/compiler/testData/diagnostics/tests/override/ConflictingPropertySignatureFromSuperclass.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/ConflictingPropertySignatureFromSuperclass.lazy.log
@@ -27,5 +27,8 @@ LazyJavaPackageFragment@11['java'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
+}
+
+null {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
 }
diff --git a/compiler/testData/diagnostics/tests/override/DefaultParameterValueInOverride.lazy.log b/compiler/testData/diagnostics/tests/override/DefaultParameterValueInOverride.lazy.log
index 45a11cf3d10..deb9144c62f 100644
--- a/compiler/testData/diagnostics/tests/override/DefaultParameterValueInOverride.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/DefaultParameterValueInOverride.lazy.log
@@ -28,10 +28,13 @@ LazyJavaPackageFragment@8['java'] {
 
 ResolutionTaskHolder@26 {
     <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
 }
 
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
+ResolutionTaskHolder@29 {
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
+}
+
+null {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@28 }
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@31 }
 }
diff --git a/compiler/testData/diagnostics/tests/override/Delegation.lazy.log b/compiler/testData/diagnostics/tests/override/Delegation.lazy.log
index b6578388157..be14958dc06 100644
--- a/compiler/testData/diagnostics/tests/override/Delegation.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/Delegation.lazy.log
@@ -42,30 +42,33 @@ LazyJavaPackageFragment@9['java'] {
 
 ResolutionTaskHolder@42 {
     <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+}
+
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
 }
 
 ResolutionTaskHolder@54 {
     <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
+null {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@50 }
 }
diff --git a/compiler/testData/diagnostics/tests/override/DelegationFun.lazy.log b/compiler/testData/diagnostics/tests/override/DelegationFun.lazy.log
index e8b1f24f55b..82610b8238e 100644
--- a/compiler/testData/diagnostics/tests/override/DelegationFun.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/DelegationFun.lazy.log
@@ -22,5 +22,8 @@ LazyJavaPackageFragment@8['java'] {
 
 ResolutionTaskHolder@22 {
     <name not found> = ArrayList@23[1] { ResolutionCandidate@24 }
+}
+
+null {
     <name not found> = ArrayList@25[1] { ResolutionCandidate@24 }
 }
diff --git a/compiler/testData/diagnostics/tests/override/DelegationVal.lazy.log b/compiler/testData/diagnostics/tests/override/DelegationVal.lazy.log
index 5b57884103d..25800f96074 100644
--- a/compiler/testData/diagnostics/tests/override/DelegationVal.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/DelegationVal.lazy.log
@@ -26,5 +26,8 @@ LazyJavaPackageFragment@10['java'] {
 
 ResolutionTaskHolder@26 {
     <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
+}
+
+null {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
 }
diff --git a/compiler/testData/diagnostics/tests/override/DelegationVar.lazy.log b/compiler/testData/diagnostics/tests/override/DelegationVar.lazy.log
index 5b57884103d..25800f96074 100644
--- a/compiler/testData/diagnostics/tests/override/DelegationVar.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/DelegationVar.lazy.log
@@ -26,5 +26,8 @@ LazyJavaPackageFragment@10['java'] {
 
 ResolutionTaskHolder@26 {
     <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
+}
+
+null {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
 }
diff --git a/compiler/testData/diagnostics/tests/override/EqualityOfIntersectionTypes.lazy.log b/compiler/testData/diagnostics/tests/override/EqualityOfIntersectionTypes.lazy.log
index 4a0e2c35a07..893bbda3ee3 100644
--- a/compiler/testData/diagnostics/tests/override/EqualityOfIntersectionTypes.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/EqualityOfIntersectionTypes.lazy.log
@@ -40,20 +40,23 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+}
+
+null {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@36 }
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
diff --git a/compiler/testData/diagnostics/tests/override/ExtendFunctionClass.lazy.log b/compiler/testData/diagnostics/tests/override/ExtendFunctionClass.lazy.log
index 11f1234ede8..445a798ba95 100644
--- a/compiler/testData/diagnostics/tests/override/ExtendFunctionClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/ExtendFunctionClass.lazy.log
@@ -31,5 +31,8 @@ LazyJavaPackageFragment@13['java'] {
 
 ResolutionTaskHolder@29 {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
+}
+
+null {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
 }
diff --git a/compiler/testData/diagnostics/tests/override/FakeOverrideAbstractAndNonAbstractFun.lazy.log b/compiler/testData/diagnostics/tests/override/FakeOverrideAbstractAndNonAbstractFun.lazy.log
index b7b45c62a8e..7b035eaf6d8 100644
--- a/compiler/testData/diagnostics/tests/override/FakeOverrideAbstractAndNonAbstractFun.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/FakeOverrideAbstractAndNonAbstractFun.lazy.log
@@ -34,5 +34,8 @@ LazyJavaPackageFragment@10['java'] {
 
 ResolutionTaskHolder@30 {
     <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
+}
+
+null {
     <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
 }
diff --git a/compiler/testData/diagnostics/tests/override/FakeOverrideDifferentDeclarationSignatures.lazy.log b/compiler/testData/diagnostics/tests/override/FakeOverrideDifferentDeclarationSignatures.lazy.log
index 834fea0262d..a8a9177db60 100644
--- a/compiler/testData/diagnostics/tests/override/FakeOverrideDifferentDeclarationSignatures.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/FakeOverrideDifferentDeclarationSignatures.lazy.log
@@ -39,10 +39,13 @@ LazyJavaPackageFragment@11['java'] {
 
 ResolutionTaskHolder@35 {
     <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
+}
+
+null {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@37 }
 }
diff --git a/compiler/testData/diagnostics/tests/override/Generics.lazy.log b/compiler/testData/diagnostics/tests/override/Generics.lazy.log
index 96848203279..2dcc068b6c4 100644
--- a/compiler/testData/diagnostics/tests/override/Generics.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/Generics.lazy.log
@@ -78,170 +78,173 @@ LazyJavaPackageFragment@27['java'] {
 
 ResolutionTaskHolder@76 {
     <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
 }
 
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
+}
+
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
 }
 
 ResolutionTaskHolder@88 {
     <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
 }
 
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
+}
+
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
 }
 
 ResolutionTaskHolder@100 {
     <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
 }
 
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
+}
+
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
 }
 
 ResolutionTaskHolder@112 {
     <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
 }
 
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
+ResolutionTaskHolder@115 {
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
 }
 
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
+ResolutionTaskHolder@118 {
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
+}
+
+ResolutionTaskHolder@121 {
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
 }
 
 ResolutionTaskHolder@124 {
     <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@126 }
 }
 
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
+ResolutionTaskHolder@127 {
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
 }
 
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
+ResolutionTaskHolder@130 {
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
+}
+
+ResolutionTaskHolder@133 {
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
 }
 
 ResolutionTaskHolder@136 {
     <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
 }
 
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
+ResolutionTaskHolder@139 {
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
 }
 
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
+ResolutionTaskHolder@142 {
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
+}
+
+ResolutionTaskHolder@145 {
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
 }
 
 ResolutionTaskHolder@148 {
     <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
 }
 
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
+ResolutionTaskHolder@151 {
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
 }
 
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
+ResolutionTaskHolder@154 {
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
+}
+
+ResolutionTaskHolder@157 {
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
 }
 
 ResolutionTaskHolder@160 {
     <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@162 }
 }
 
-ResolutionTaskHolder@164 {
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@166 }
+ResolutionTaskHolder@163 {
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
 }
 
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@170 }
+ResolutionTaskHolder@166 {
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
+}
+
+ResolutionTaskHolder@169 {
+    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
 }
 
 ResolutionTaskHolder@172 {
     <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@174 }
 }
 
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@178 }
+ResolutionTaskHolder@175 {
+    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
 }
 
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@182 }
-}
-
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@186 }
-}
-
-ResolutionTaskHolder@188 {
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@190 }
-}
-
-ResolutionTaskHolder@192 {
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@194 }
-}
-
-ResolutionTaskHolder@196 {
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@198 }
-}
-
-ResolutionTaskHolder@200 {
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@202 }
-}
-
-ResolutionTaskHolder@204 {
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@206 }
-}
-
-ResolutionTaskHolder@208 {
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@210 }
+null {
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@168 }
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@174 }
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@126 }
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@141 }
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@129 }
+    <name not found> = ArrayList@189[1] { ResolutionCandidate@132 }
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@192[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@194[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@196[1] { ResolutionCandidate@135 }
+    <name not found> = ArrayList@197[1] { ResolutionCandidate@153 }
+    <name not found> = ArrayList@198[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@162 }
+    <name not found> = ArrayList@200[1] { ResolutionCandidate@159 }
+    <name not found> = ArrayList@201[1] { ResolutionCandidate@156 }
+    <name not found> = ArrayList@202[1] { ResolutionCandidate@147 }
+    <name not found> = ArrayList@203[1] { ResolutionCandidate@177 }
+    <name not found> = ArrayList@204[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@205[1] { ResolutionCandidate@165 }
+    <name not found> = ArrayList@206[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@207[1] { ResolutionCandidate@171 }
+    <name not found> = ArrayList@208[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@209[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@210[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@211[1] { ResolutionCandidate@138 }
 }
diff --git a/compiler/testData/diagnostics/tests/override/InvisiblePotentialOverride.lazy.log b/compiler/testData/diagnostics/tests/override/InvisiblePotentialOverride.lazy.log
index c5be54ce755..01401efdc6e 100644
--- a/compiler/testData/diagnostics/tests/override/InvisiblePotentialOverride.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/InvisiblePotentialOverride.lazy.log
@@ -31,5 +31,8 @@ LazyJavaPackageFragment@8['java'] {
 
 ResolutionTaskHolder@29 {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
+}
+
+null {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
 }
diff --git a/compiler/testData/diagnostics/tests/override/MissingDelegate.lazy.log b/compiler/testData/diagnostics/tests/override/MissingDelegate.lazy.log
index 5bfe260b256..1d173e75a7d 100644
--- a/compiler/testData/diagnostics/tests/override/MissingDelegate.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/MissingDelegate.lazy.log
@@ -54,10 +54,6 @@ ResolutionTaskHolder@29 {
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
 }
 
 ResolutionTaskHolder@30 {
@@ -69,6 +65,13 @@ ResolutionTaskHolder@30 {
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
+}
+
+null {
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/override/MultipleDefaultsAndNamesInSupertypes.lazy.log b/compiler/testData/diagnostics/tests/override/MultipleDefaultsAndNamesInSupertypes.lazy.log
index 181cdf98e04..f4c3b0e8925 100644
--- a/compiler/testData/diagnostics/tests/override/MultipleDefaultsAndNamesInSupertypes.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/MultipleDefaultsAndNamesInSupertypes.lazy.log
@@ -37,10 +37,13 @@ LazyJavaPackageFragment@11['java'] {
 
 ResolutionTaskHolder@33 {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+}
+
+null {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@38 }
 }
diff --git a/compiler/testData/diagnostics/tests/override/NonGenerics.lazy.log b/compiler/testData/diagnostics/tests/override/NonGenerics.lazy.log
index 50b3f0110c7..921514e3a71 100644
--- a/compiler/testData/diagnostics/tests/override/NonGenerics.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/NonGenerics.lazy.log
@@ -52,37 +52,30 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@47 {
     <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
     <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
     <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
+}
+
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
     <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
@@ -91,37 +84,30 @@ ResolutionTaskHolder@55 {
 
 ResolutionTaskHolder@59 {
     <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
     <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
 }
 
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
     <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
+}
+
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
     <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
@@ -130,61 +116,78 @@ ResolutionTaskHolder@67 {
 
 ResolutionTaskHolder@71 {
     <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
 }
 
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
 }
 
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
+}
+
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
 }
 
 ResolutionTaskHolder@83 {
     <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
 }
 
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
 }
 
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
 }
 
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
+null {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@55 }
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/override/ObjectDelegationManyImpl.lazy.log b/compiler/testData/diagnostics/tests/override/ObjectDelegationManyImpl.lazy.log
index a6453a88d65..41d494e389f 100644
--- a/compiler/testData/diagnostics/tests/override/ObjectDelegationManyImpl.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/ObjectDelegationManyImpl.lazy.log
@@ -36,14 +36,17 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+    <name not found> = EmptyList@25[empty]
+}
+
+null {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@33 }
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/override/OverridingFinalMember.lazy.log b/compiler/testData/diagnostics/tests/override/OverridingFinalMember.lazy.log
index b4129b01928..9038322a171 100644
--- a/compiler/testData/diagnostics/tests/override/OverridingFinalMember.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/OverridingFinalMember.lazy.log
@@ -20,5 +20,8 @@ LazyJavaPackageFragment@6['java'] {
 
 ResolutionTaskHolder@20 {
     <name not found> = ArrayList@21[1] { ResolutionCandidate@22 }
+}
+
+null {
     <name not found> = ArrayList@23[1] { ResolutionCandidate@22 }
 }
diff --git a/compiler/testData/diagnostics/tests/override/ParentInheritsManyImplementations.lazy.log b/compiler/testData/diagnostics/tests/override/ParentInheritsManyImplementations.lazy.log
index 464ae3cd17e..9a139f52c72 100644
--- a/compiler/testData/diagnostics/tests/override/ParentInheritsManyImplementations.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/ParentInheritsManyImplementations.lazy.log
@@ -40,5 +40,8 @@ LazyJavaPackageFragment@17['java'] {
 
 ResolutionTaskHolder@37 {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
+}
+
+null {
     <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
 }
diff --git a/compiler/testData/diagnostics/tests/override/PropertyInConstructor.lazy.log b/compiler/testData/diagnostics/tests/override/PropertyInConstructor.lazy.log
index 3ee01cc9ff3..a7882308f71 100644
--- a/compiler/testData/diagnostics/tests/override/PropertyInConstructor.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/PropertyInConstructor.lazy.log
@@ -33,5 +33,8 @@ LazyJavaPackageFragment@11['java'] {
 
 ResolutionTaskHolder@29 {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
+}
+
+null {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
 }
diff --git a/compiler/testData/diagnostics/tests/override/ProtectedAndPrivateFromSupertypes.lazy.log b/compiler/testData/diagnostics/tests/override/ProtectedAndPrivateFromSupertypes.lazy.log
index 7532202633b..6e5958eb8f5 100644
--- a/compiler/testData/diagnostics/tests/override/ProtectedAndPrivateFromSupertypes.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/ProtectedAndPrivateFromSupertypes.lazy.log
@@ -45,12 +45,15 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@39 {
     <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
+}
+
+null {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@41 }
+    <name not found> = EmptyList@35[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/override/SuspiciousCase1.lazy.log b/compiler/testData/diagnostics/tests/override/SuspiciousCase1.lazy.log
index 87216c996b9..236c7cd8f4f 100644
--- a/compiler/testData/diagnostics/tests/override/SuspiciousCase1.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/SuspiciousCase1.lazy.log
@@ -46,10 +46,13 @@ LazyJavaPackageFragment@13['java'] {
 
 ResolutionTaskHolder@42 {
     <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+}
+
+null {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@47 }
 }
diff --git a/compiler/testData/diagnostics/tests/override/kt1862.lazy.log b/compiler/testData/diagnostics/tests/override/kt1862.lazy.log
index a0ec993bf57..f014579751b 100644
--- a/compiler/testData/diagnostics/tests/override/kt1862.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/kt1862.lazy.log
@@ -31,10 +31,13 @@ LazyJavaPackageFragment@10['java'] {
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
 }
 
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+}
+
+null {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@33 }
 }
diff --git a/compiler/testData/diagnostics/tests/override/kt2491.lazy.log b/compiler/testData/diagnostics/tests/override/kt2491.lazy.log
index c0d3dce139b..4133fc7eb07 100644
--- a/compiler/testData/diagnostics/tests/override/kt2491.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/kt2491.lazy.log
@@ -28,10 +28,13 @@ LazyJavaPackageFragment@9['java'] {
 
 ResolutionTaskHolder@26 {
     <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
 }
 
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
+ResolutionTaskHolder@29 {
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
+}
+
+null {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@28 }
 }
diff --git a/compiler/testData/diagnostics/tests/override/kt4763.lazy.log b/compiler/testData/diagnostics/tests/override/kt4763.lazy.log
index b7046a22cf6..142202e7c58 100644
--- a/compiler/testData/diagnostics/tests/override/kt4763.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/kt4763.lazy.log
@@ -39,10 +39,13 @@ LazyJavaPackageFragment@12['java'] {
 
 ResolutionTaskHolder@35 {
     <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
+}
+
+null {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@40 }
 }
diff --git a/compiler/testData/diagnostics/tests/override/kt4763property.lazy.log b/compiler/testData/diagnostics/tests/override/kt4763property.lazy.log
index a03850c5e74..557669db2e1 100644
--- a/compiler/testData/diagnostics/tests/override/kt4763property.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/kt4763property.lazy.log
@@ -43,10 +43,13 @@ LazyJavaPackageFragment@13['java'] {
 
 ResolutionTaskHolder@37 {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+}
+
+null {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@42 }
 }
diff --git a/compiler/testData/diagnostics/tests/override/kt4785.lazy.log b/compiler/testData/diagnostics/tests/override/kt4785.lazy.log
index 17d4e23c58a..40ae70e2b58 100644
--- a/compiler/testData/diagnostics/tests/override/kt4785.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/kt4785.lazy.log
@@ -28,10 +28,13 @@ LazyJavaPackageFragment@9['java'] {
 
 ResolutionTaskHolder@26 {
     <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
 }
 
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
+ResolutionTaskHolder@29 {
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
+}
+
+null {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@28 }
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@31 }
 }
diff --git a/compiler/testData/diagnostics/tests/override/kt4785delegation.lazy.log b/compiler/testData/diagnostics/tests/override/kt4785delegation.lazy.log
index fad87a0842f..9b0f9f49011 100644
--- a/compiler/testData/diagnostics/tests/override/kt4785delegation.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/kt4785delegation.lazy.log
@@ -23,5 +23,8 @@ LazyJavaPackageFragment@7['java'] {
 
 ResolutionTaskHolder@23 {
     <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
+}
+
+null {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@25 }
 }
diff --git a/compiler/testData/diagnostics/tests/override/kt880.lazy.log b/compiler/testData/diagnostics/tests/override/kt880.lazy.log
index 39f7422ae56..ac3981a8955 100644
--- a/compiler/testData/diagnostics/tests/override/kt880.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/kt880.lazy.log
@@ -41,14 +41,17 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@32 {
     <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+}
+
+null {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@34 }
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/override/parameterNames/differentNamesInSupertypesDiagnostic.lazy.log b/compiler/testData/diagnostics/tests/override/parameterNames/differentNamesInSupertypesDiagnostic.lazy.log
index ed8b02ee014..48ad4ab99b4 100644
--- a/compiler/testData/diagnostics/tests/override/parameterNames/differentNamesInSupertypesDiagnostic.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/parameterNames/differentNamesInSupertypesDiagnostic.lazy.log
@@ -56,14 +56,14 @@ LazyJavaClassifierType@30['String'] {
 
 LazyJavaClassifierType@33['String'] {
     arguments = ArrayList@34[empty]
-    classifier = JavaClassImpl@32['String']
+    classifier = JavaClassImpl@27['String']
     nullable = 'true': Boolean@35
     typeConstructor = DeserializedClassTypeConstructor@29
 }
 
 LazyJavaClassifierType@36['String'] {
     arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@27['String']
+    classifier = JavaClassImpl@32['String']
     nullable = 'true': Boolean@35
     typeConstructor = DeserializedClassTypeConstructor@29
 }
@@ -84,14 +84,14 @@ LazyJavaClassifierType@42['Throwable'] {
 
 LazyJavaClassifierType@45['Throwable'] {
     arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@40['Throwable']
+    classifier = JavaClassImpl@44['Throwable']
     nullable = 'true': Boolean@35
     typeConstructor = DeserializedClassTypeConstructor@41
 }
 
 LazyJavaClassifierType@47['Throwable'] {
     arguments = ArrayList@48[empty]
-    classifier = JavaClassImpl@44['Throwable']
+    classifier = JavaClassImpl@40['Throwable']
     nullable = 'true': Boolean@35
     typeConstructor = DeserializedClassTypeConstructor@41
 }
@@ -149,15 +149,18 @@ LazyJavaPackageFragment@62['lang'] {
 
 ResolutionTaskHolder@85 {
     <name not found> = ArrayList@86[4] { ResolutionCandidate@87, ResolutionCandidate@88, ResolutionCandidate@89, ... }
-    <name not found> = ArrayList@90[4] { ResolutionCandidate@87, ResolutionCandidate@88, ResolutionCandidate@89, ... }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+}
+
+null {
+    <name not found> = ArrayList@90[4] { ResolutionCandidate@87, ResolutionCandidate@88, ResolutionCandidate@89, ... }
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
diff --git a/compiler/testData/diagnostics/tests/override/parameterNames/kjkWithSeveralSupers.lazy.log b/compiler/testData/diagnostics/tests/override/parameterNames/kjkWithSeveralSupers.lazy.log
index ed85c0b5c03..1ae8653c7fd 100644
--- a/compiler/testData/diagnostics/tests/override/parameterNames/kjkWithSeveralSupers.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/parameterNames/kjkWithSeveralSupers.lazy.log
@@ -144,7 +144,7 @@ LazyJavaClassifierType@120['JSuper1'] {
     typeConstructor = LazyJavaClassTypeConstructor@24['JSuper1']
 }
 
-LazyJavaClassifierType@121['JSuper2'] {
+LazyJavaClassifierType@130['JSuper2'] {
     arguments = ArrayList@139[empty]
     classifier = JavaClassImpl@140['JSuper2']
     memberScope = LazyJavaClassMemberScope@27
@@ -152,7 +152,7 @@ LazyJavaClassifierType@121['JSuper2'] {
     typeConstructor = LazyJavaClassTypeConstructor@38['JSuper2']
 }
 
-LazyJavaClassifierType@126['JSuper2'] {
+LazyJavaClassifierType@121['JSuper2'] {
     arguments = ArrayList@141[empty]
     classifier = JavaClassImpl@142['JSuper2']
     memberScope = LazyJavaClassMemberScope@27
@@ -160,7 +160,7 @@ LazyJavaClassifierType@126['JSuper2'] {
     typeConstructor = LazyJavaClassTypeConstructor@38['JSuper2']
 }
 
-LazyJavaClassifierType@130['JSuper2'] {
+LazyJavaClassifierType@126['JSuper2'] {
     arguments = ArrayList@143[empty]
     classifier = JavaClassImpl@144['JSuper2']
     memberScope = LazyJavaClassMemberScope@27
@@ -168,7 +168,7 @@ LazyJavaClassifierType@130['JSuper2'] {
     typeConstructor = LazyJavaClassTypeConstructor@38['JSuper2']
 }
 
-LazyJavaClassifierType@125['KSuper'] {
+LazyJavaClassifierType@119['KSuper'] {
     arguments = ArrayList@145[empty]
     classifier = JavaClassImpl@146['KSuper']
     memberScope = WritableScopeImpl@147
@@ -176,7 +176,7 @@ LazyJavaClassifierType@125['KSuper'] {
     typeConstructor = TypeConstructorImpl$1@148
 }
 
-LazyJavaClassifierType@131['KSuper'] {
+LazyJavaClassifierType@125['KSuper'] {
     arguments = ArrayList@149[empty]
     classifier = JavaClassImpl@150['KSuper']
     memberScope = WritableScopeImpl@147
@@ -184,7 +184,7 @@ LazyJavaClassifierType@131['KSuper'] {
     typeConstructor = TypeConstructorImpl$1@148
 }
 
-LazyJavaClassifierType@119['KSuper'] {
+LazyJavaClassifierType@131['KSuper'] {
     arguments = ArrayList@151[empty]
     classifier = JavaClassImpl@152['KSuper']
     memberScope = WritableScopeImpl@147
@@ -226,7 +226,7 @@ LazyJavaPackageFragmentProvider@158 {
     packageFragments('kotlin.io': FqName@182) = null
     packageFragments('kotlin.jvm': FqName@183) = null
     topLevelClasses(JavaClassImpl@138['JSuper1']) = LazyJavaClassDescriptor@0['JSuper1']
-    topLevelClasses(JavaClassImpl@140['JSuper2']) = LazyJavaClassDescriptor@25['JSuper2']
+    topLevelClasses(JavaClassImpl@142['JSuper2']) = LazyJavaClassDescriptor@25['JSuper2']
     topLevelClasses(JavaClassImpl@184['Sub1']) = LazyJavaClassDescriptor@39['Sub1']
     topLevelClasses(JavaClassImpl@185['Sub2']) = LazyJavaClassDescriptor@58['Sub2']
     topLevelClasses(JavaClassImpl@186['Sub3']) = LazyJavaClassDescriptor@85['Sub3']
diff --git a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/collectionOrNull.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/collectionOrNull.lazy.log
index 40b6161f9e9..383c31eda0d 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/collectionOrNull.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/collectionOrNull.lazy.log
@@ -51,14 +51,14 @@ LazyJavaClassifierType@33['String'] {
 
 LazyJavaClassifierType@36['String'] {
     arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@35['String']
+    classifier = JavaClassImpl@31['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
 
 LazyJavaClassifierType@38['String'] {
     arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@31['String']
+    classifier = JavaClassImpl@35['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
@@ -128,40 +128,29 @@ LazyJavaPackageFragment@63['p'] {
 
 ResolutionTaskHolder@86 {
     <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
+}
+
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
 }
 
 ResolutionTaskHolder@98 {
     <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
 }
 
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
+ResolutionTaskHolder@101 {
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
@@ -171,3 +160,17 @@ ResolutionTaskHolder@106 {
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
 }
+
+null {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@88 }
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/inferenceWithBound.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/inferenceWithBound.lazy.log
index bf829a8ac90..940643236f7 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/inferenceWithBound.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/inferenceWithBound.lazy.log
@@ -88,26 +88,26 @@ LazyJavaClassifierType@52['Sub'] {
 
 LazyJavaClassifierType@55['Sub'] {
     arguments = ArrayList@56[empty]
-    classifier = JavaClassImpl@54['Sub']
+    classifier = JavaClassImpl@51['Sub']
     nullable = 'true': Boolean@35
     typeConstructor = LazyJavaClassTypeConstructor@16['Sub']
 }
 
 LazyJavaClassifierType@57['Sub'] {
     arguments = ArrayList@58[empty]
-    classifier = JavaClassImpl@51['Sub']
+    classifier = JavaClassImpl@54['Sub']
     nullable = 'true': Boolean@35
     typeConstructor = LazyJavaClassTypeConstructor@16['Sub']
 }
 
-LazyJavaClassifierType@59['Super'] {
-    arguments = ArrayList@60[empty]
-    classifier = JavaClassImpl@61['Super']
+LazyJavaClassifierType@23['Super'] {
+    arguments = ArrayList@59[empty]
+    classifier = JavaClassImpl@60['Super']
     nullable = 'false': Boolean@30
     typeConstructor = LazyJavaClassTypeConstructor@18['Super']
 }
 
-LazyJavaClassifierType@23['Super'] {
+LazyJavaClassifierType@61['Super'] {
     arguments = ArrayList@62[empty]
     classifier = JavaClassImpl@63['Super']
     nullable = 'false': Boolean@30
@@ -130,7 +130,7 @@ LazyJavaClassifierType@67['Super'] {
 
 LazyJavaClassifierType@69['Super'] {
     arguments = ArrayList@70[empty]
-    classifier = JavaClassImpl@61['Super']
+    classifier = JavaClassImpl@63['Super']
     nullable = 'true': Boolean@35
     typeConstructor = LazyJavaClassTypeConstructor@18['Super']
 }
@@ -164,7 +164,7 @@ LazyJavaPackageFragmentProvider@71 {
     packageFragments('p.Super': FqName@101) = null
     packageFragments('p.T': FqName@102) = null
     topLevelClasses(JavaClassImpl@103['Other']) = LazyJavaClassDescriptor@0['Other']
-    topLevelClasses(JavaClassImpl@54['Sub']) = LazyJavaClassDescriptor@15['Sub']
+    topLevelClasses(JavaClassImpl@51['Sub']) = LazyJavaClassDescriptor@15['Sub']
     topLevelClasses(JavaClassImpl@104['Super']) = LazyJavaClassDescriptor@17['Super']
 }
 
@@ -208,55 +208,41 @@ LazyJavaPackageFragment@97['p'] {
 
 ResolutionTaskHolder@123 {
     <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@125 }
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
 }
 
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@129 }
-    <name not found> = EmptyList@11[empty]
+ResolutionTaskHolder@126 {
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
     <name not found> = EmptyList@11[empty]
 }
 
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@133 }
-    <name not found> = EmptyList@11[empty]
+ResolutionTaskHolder@129 {
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
     <name not found> = EmptyList@11[empty]
 }
 
+ResolutionTaskHolder@132 {
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
+}
+
 ResolutionTaskHolder@135 {
     <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@137 }
 }
 
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@141 }
+ResolutionTaskHolder@138 {
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
 }
 
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@145 }
+ResolutionTaskHolder@141 {
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
 }
 
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@149 }
+ResolutionTaskHolder@144 {
+    <name not found> = ArrayList@145[7] { ResolutionCandidate@146, ResolutionCandidate@147, ResolutionCandidate@148, ... }
 }
 
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[7] { ResolutionCandidate@153, ResolutionCandidate@154, ResolutionCandidate@155, ... }
-    <name not found> = ArrayList@156[7] { ResolutionCandidate@153, ResolutionCandidate@154, ResolutionCandidate@155, ... }
-}
-
-ResolutionTaskHolder@157 {
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
+ResolutionTaskHolder@149 {
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
@@ -267,9 +253,26 @@ ResolutionTaskHolder@157 {
     <name not found> = EmptyList@11[empty]
 }
 
-ResolutionTaskHolder@158 {
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
+ResolutionTaskHolder@150 {
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+}
+
+null {
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@128 }
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@131 }
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@143 }
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@140 }
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@125 }
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@134 }
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@137 }
+    <name not found> = ArrayList@158[7] { ResolutionCandidate@146, ResolutionCandidate@147, ResolutionCandidate@148, ... }
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
diff --git a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/mixedElvis.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/mixedElvis.lazy.log
index b0ba323b8b1..58b14693275 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/mixedElvis.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/mixedElvis.lazy.log
@@ -109,94 +109,94 @@ LazyJavaClassifierType@72['E'] {
     arguments = ArrayList@73[empty]
     classifier = JavaTypeParameterImpl@74['E']
     nullable = 'false': Boolean@42
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@75
+}
+
+LazyJavaClassifierType@76['E'] {
+    arguments = ArrayList@77[empty]
+    classifier = JavaTypeParameterImpl@78['E']
+    nullable = 'false': Boolean@42
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@79
+}
+
+LazyJavaClassifierType@80['E'] {
+    arguments = ArrayList@81[empty]
+    classifier = JavaTypeParameterImpl@82['E']
+    nullable = 'false': Boolean@42
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@71
 }
 
-LazyJavaClassifierType@75['E'] {
-    arguments = ArrayList@76[empty]
-    classifier = JavaTypeParameterImpl@77['E']
-    nullable = 'false': Boolean@42
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@78
-}
-
-LazyJavaClassifierType@79['E'] {
-    arguments = ArrayList@80[empty]
-    classifier = JavaTypeParameterImpl@81['E']
-    nullable = 'false': Boolean@42
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@82
-}
-
 LazyJavaClassifierType@83['E'] {
     arguments = ArrayList@84[empty]
     classifier = JavaTypeParameterImpl@85['E']
     nullable = 'false': Boolean@42
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@78
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@75
 }
 
 LazyJavaClassifierType@86['E'] {
     arguments = ArrayList@87[empty]
     classifier = JavaTypeParameterImpl@88['E']
     nullable = 'false': Boolean@42
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@78
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@71
 }
 
 LazyJavaClassifierType@89['E'] {
     arguments = ArrayList@90[empty]
     classifier = JavaTypeParameterImpl@91['E']
     nullable = 'false': Boolean@42
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@78
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@71
 }
 
 LazyJavaClassifierType@92['E'] {
     arguments = ArrayList@93[empty]
-    classifier = JavaTypeParameterImpl@70['E']
+    classifier = JavaTypeParameterImpl@88['E']
     nullable = 'true': Boolean@62
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@71
 }
 
 LazyJavaClassifierType@94['E'] {
     arguments = ArrayList@95[empty]
-    classifier = JavaTypeParameterImpl@77['E']
+    classifier = JavaTypeParameterImpl@85['E']
     nullable = 'true': Boolean@62
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@78
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@75
 }
 
 LazyJavaClassifierType@96['E'] {
     arguments = ArrayList@97[empty]
-    classifier = JavaTypeParameterImpl@88['E']
+    classifier = JavaTypeParameterImpl@70['E']
     nullable = 'true': Boolean@62
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@78
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@71
 }
 
 LazyJavaClassifierType@98['E'] {
     arguments = ArrayList@99[empty]
-    classifier = JavaTypeParameterImpl@91['E']
+    classifier = JavaTypeParameterImpl@82['E']
     nullable = 'true': Boolean@62
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@78
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@71
 }
 
 LazyJavaClassifierType@100['E'] {
     arguments = ArrayList@101[empty]
     classifier = JavaTypeParameterImpl@74['E']
     nullable = 'true': Boolean@62
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@71
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@75
 }
 
 LazyJavaClassifierType@102['E'] {
     arguments = ArrayList@103[empty]
-    classifier = JavaTypeParameterImpl@81['E']
+    classifier = JavaTypeParameterImpl@78['E']
     nullable = 'true': Boolean@62
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@82
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@79
 }
 
 LazyJavaClassifierType@104['E'] {
     arguments = ArrayList@105[empty]
-    classifier = JavaTypeParameterImpl@85['E']
+    classifier = JavaTypeParameterImpl@91['E']
     nullable = 'true': Boolean@62
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@78
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@71
 }
 
-LazyJavaClassifierType@26['List<E>'] {
+LazyJavaClassifierType@31['List<E>'] {
     arguments = ArrayList@106[1] { TypeProjectionImpl@107 }
     classifier = JavaClassImpl@108['List']
     memberScope = SubstitutingScope@109
@@ -204,7 +204,7 @@ LazyJavaClassifierType@26['List<E>'] {
     typeConstructor = DeserializedClassTypeConstructor@110
 }
 
-LazyJavaClassifierType@31['List<E>'] {
+LazyJavaClassifierType@26['List<E>'] {
     arguments = ArrayList@111[1] { TypeProjectionImpl@112 }
     classifier = JavaClassImpl@113['List']
     memberScope = SubstitutingScope@114
@@ -325,24 +325,24 @@ LazyJavaPackageFragment@151['util'] {
 
 LazyJavaTypeParameterDescriptor@28['E'] {
     defaultType = JetTypeImpl@196['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@78
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@71
     upperBounds = LinkedHashSet@197[1] { NullableType@198 }
 }
 
-LazyJavaTypeParameterDescriptor@19['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@82
+LazyJavaTypeParameterDescriptor@23['E'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@75
 }
 
-LazyJavaTypeParameterDescriptor@23['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@71
+LazyJavaTypeParameterDescriptor@19['E'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@79
 }
 
 LazyJavaTypeParameterResolver@199 {
-    resolve(JavaTypeParameterImpl@200['E']) = LazyJavaTypeParameterDescriptor@23['E']
+    resolve(JavaTypeParameterImpl@200['E']) = LazyJavaTypeParameterDescriptor@28['E']
 }
 
 LazyJavaTypeParameterResolver@201 {
-    resolve(JavaTypeParameterImpl@202['E']) = LazyJavaTypeParameterDescriptor@28['E']
+    resolve(JavaTypeParameterImpl@202['E']) = LazyJavaTypeParameterDescriptor@23['E']
 }
 
 LazyJavaTypeParameterResolver@203 {
@@ -351,49 +351,52 @@ LazyJavaTypeParameterResolver@203 {
 
 ResolutionTaskHolder@205 {
     <name not found> = ArrayList@206[1] { ResolutionCandidate@207 }
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@207 }
 }
 
-ResolutionTaskHolder@209 {
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@211 }
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@211 }
+ResolutionTaskHolder@208 {
+    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
 }
 
-ResolutionTaskHolder@213 {
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@215 }
+ResolutionTaskHolder@211 {
+    <name not found> = ArrayList@212[1] { ResolutionCandidate@213 }
+}
+
+ResolutionTaskHolder@214 {
+    <name not found> = ArrayList@215[1] { ResolutionCandidate@216 }
 }
 
 ResolutionTaskHolder@217 {
     <name not found> = ArrayList@218[1] { ResolutionCandidate@219 }
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@219 }
 }
 
-ResolutionTaskHolder@221 {
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@223 }
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@223 }
+ResolutionTaskHolder@220 {
+    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
 }
 
-ResolutionTaskHolder@225 {
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@227 }
+ResolutionTaskHolder@223 {
+    <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
+}
+
+ResolutionTaskHolder@226 {
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
 }
 
 ResolutionTaskHolder@229 {
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@231 }
+    <name not found> = ArrayList@230[3] { ResolutionCandidate@231, ResolutionCandidate@232, ResolutionCandidate@233 }
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
 }
 
-ResolutionTaskHolder@233 {
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@235 }
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@235 }
-}
-
-ResolutionTaskHolder@237 {
-    <name not found> = ArrayList@238[3] { ResolutionCandidate@239, ResolutionCandidate@240, ResolutionCandidate@241 }
-    <name not found> = ArrayList@242[3] { ResolutionCandidate@239, ResolutionCandidate@240, ResolutionCandidate@241 }
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
+null {
+    <name not found> = ArrayList@234[1] { ResolutionCandidate@213 }
+    <name not found> = ArrayList@235[1] { ResolutionCandidate@228 }
+    <name not found> = ArrayList@236[1] { ResolutionCandidate@210 }
+    <name not found> = ArrayList@237[1] { ResolutionCandidate@216 }
+    <name not found> = ArrayList@238[1] { ResolutionCandidate@225 }
+    <name not found> = ArrayList@239[1] { ResolutionCandidate@207 }
+    <name not found> = ArrayList@240[1] { ResolutionCandidate@219 }
+    <name not found> = ArrayList@241[1] { ResolutionCandidate@222 }
+    <name not found> = ArrayList@242[3] { ResolutionCandidate@231, ResolutionCandidate@232, ResolutionCandidate@233 }
     <name not found> = EmptyList@180[empty]
     <name not found> = EmptyList@180[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/mixedIf.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/mixedIf.lazy.log
index 678c2a3bcd3..e02cfbeca76 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/mixedIf.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/mixedIf.lazy.log
@@ -141,36 +141,27 @@ LazyJavaTypeParameterResolver@96 {
 
 ResolutionTaskHolder@98 {
     <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
 }
 
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
+}
+
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
 }
 
 ResolutionTaskHolder@110 {
     <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
 }
 
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
+ResolutionTaskHolder@113 {
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
@@ -180,3 +171,15 @@ ResolutionTaskHolder@118 {
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
 }
+
+null {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@109 }
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/recursiveGeneric.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/recursiveGeneric.lazy.log
index a45e92d3228..9a9380d3ca4 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/recursiveGeneric.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/recursiveGeneric.lazy.log
@@ -130,40 +130,43 @@ LazyJavaTypeParameterResolver@78 {
 
 ResolutionTaskHolder@80 {
     <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
 }
 
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
 }
 
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
+}
+
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
 }
 
 ResolutionTaskHolder@92 {
     <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
 }
 
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
 }
 
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
 }
 
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
+null {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@82 }
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/stringOrNull.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/stringOrNull.lazy.log
index f03247cb182..04991b14708 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/stringOrNull.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/stringOrNull.lazy.log
@@ -104,40 +104,29 @@ LazyJavaPackageFragment@50['p'] {
 
 ResolutionTaskHolder@73 {
     <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
     <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
 }
 
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
+}
+
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
 }
 
 ResolutionTaskHolder@85 {
     <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
+ResolutionTaskHolder@88 {
     <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
@@ -147,3 +136,17 @@ ResolutionTaskHolder@93 {
     <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
 }
+
+null {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@78 }
+    <name not found> = EmptyList@8[empty]
+    <name not found> = EmptyList@8[empty]
+    <name not found> = EmptyList@8[empty]
+    <name not found> = EmptyList@8[empty]
+    <name not found> = EmptyList@8[empty]
+    <name not found> = EmptyList@8[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/typeOfElvis.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/typeOfElvis.lazy.log
index cf089e229b5..46d999a4471 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/typeOfElvis.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/typeOfElvis.lazy.log
@@ -98,40 +98,29 @@ LazyJavaPackageFragment@48['p'] {
 
 ResolutionTaskHolder@70 {
     <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
+}
+
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
 }
 
 ResolutionTaskHolder@82 {
     <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
 }
 
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
+ResolutionTaskHolder@85 {
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
@@ -141,3 +130,17 @@ ResolutionTaskHolder@90 {
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
 }
+
+null {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@81 }
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/withNothing.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/withNothing.lazy.log
index 24b72912cc3..c82796f0b3c 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/withNothing.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/withNothing.lazy.log
@@ -140,95 +140,98 @@ LazyJavaPackageFragment@59['p'] {
 
 ResolutionTaskHolder@98 {
     <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
+}
+
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
 }
 
 ResolutionTaskHolder@110 {
     <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
+ResolutionTaskHolder@113 {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
 }
 
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
+}
+
+ResolutionTaskHolder@119 {
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
 }
 
 ResolutionTaskHolder@122 {
     <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
 }
 
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
+ResolutionTaskHolder@125 {
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
 }
 
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@132 }
+ResolutionTaskHolder@128 {
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
+}
+
+ResolutionTaskHolder@131 {
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
 }
 
 ResolutionTaskHolder@134 {
     <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@136 }
 }
 
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@140 }
+ResolutionTaskHolder@137 {
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
 }
 
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@144 }
+ResolutionTaskHolder@140 {
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@146 {
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@148 }
-}
-
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@152 }
-}
-
-ResolutionTaskHolder@154 {
+null {
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@124 }
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@133 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@127 }
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@139 }
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@136 }
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@115 }
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
diff --git a/compiler/testData/diagnostics/tests/platformTypes/dereference.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/dereference.lazy.log
index 5dae1f7d80d..8fb150f3575 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/dereference.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/dereference.lazy.log
@@ -101,115 +101,118 @@ LazyJavaTypeParameterResolver@70 {
 
 ResolutionTaskHolder@72 {
     <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
 }
 
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
+}
+
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
 }
 
 ResolutionTaskHolder@84 {
     <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
 }
 
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
+}
+
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
 }
 
 ResolutionTaskHolder@96 {
     <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
 }
 
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
+}
+
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
 }
 
 ResolutionTaskHolder@108 {
     <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
 }
 
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
+ResolutionTaskHolder@111 {
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
 }
 
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
+}
+
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
 }
 
 ResolutionTaskHolder@120 {
     <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
 }
 
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@126 }
+ResolutionTaskHolder@123 {
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
 }
 
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
+ResolutionTaskHolder@126 {
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
+}
+
+ResolutionTaskHolder@129 {
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
 }
 
 ResolutionTaskHolder@132 {
     <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
 }
 
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
+ResolutionTaskHolder@135 {
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
 }
 
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
+ResolutionTaskHolder@138 {
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
 }
 
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
-}
-
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
-}
-
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
-}
-
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
-}
-
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@162 }
+null {
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@125 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@113 }
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@128 }
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@137 }
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@131 }
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@122 }
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@134 }
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@140 }
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@101 }
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/elvis.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/elvis.lazy.log
index 27b5c89de32..edd46e1cc96 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/elvis.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/elvis.lazy.log
@@ -70,20 +70,23 @@ LazyJavaPackageFragment@40['p'] {
 
 ResolutionTaskHolder@55 {
     <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
 }
 
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
+}
+
+null {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@66 }
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleNoPackage.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleNoPackage.lazy.log
index 525a19ec2f0..f54628f03c5 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleNoPackage.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleNoPackage.lazy.log
@@ -66,43 +66,46 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@55 {
     <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
     <name not found> = EmptyList@45[empty]
     <name not found> = EmptyList@45[empty]
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
     <name not found> = EmptyList@45[empty]
     <name not found> = EmptyList@45[empty]
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
+}
+
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
 }
 
 ResolutionTaskHolder@67 {
     <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
 }
 
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
 }
 
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
 }
 
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
+null {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@72 }
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleWithPackage.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleWithPackage.lazy.log
index 9c518c49071..6bd1a1eb645 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleWithPackage.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleWithPackage.lazy.log
@@ -56,43 +56,46 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@50 {
     <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
     <name not found> = EmptyList@45[empty]
     <name not found> = EmptyList@45[empty]
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
     <name not found> = EmptyList@45[empty]
     <name not found> = EmptyList@45[empty]
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+}
+
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
 }
 
 ResolutionTaskHolder@62 {
     <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
+null {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@70 }
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/getParentOfType.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/getParentOfType.lazy.log
index f0e7209909f..61352db5b6e 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/getParentOfType.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/getParentOfType.lazy.log
@@ -231,14 +231,14 @@ LazyJavaClassifierType@104['T'] {
 
 LazyJavaClassifierType@106['T'] {
     arguments = ArrayList@107[empty]
-    classifier = JavaTypeParameterImpl@103['T']
+    classifier = JavaTypeParameterImpl@96['T']
     nullable = 'true': Boolean@58
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@108['T'] {
     arguments = ArrayList@109[empty]
-    classifier = JavaTypeParameterImpl@96['T']
+    classifier = JavaTypeParameterImpl@103['T']
     nullable = 'true': Boolean@58
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
@@ -278,7 +278,7 @@ LazyJavaPackageFragmentProvider@111 {
     topLevelClasses(JavaClassImpl@143['Class']) = LazyJavaClassDescriptor@2['Class']
     topLevelClasses(JavaClassImpl@59['GenericDeclaration']) = LazyJavaClassDescriptor@4['GenericDeclaration']
     topLevelClasses(JavaClassImpl@144['JetExpression']) = LazyJavaClassDescriptor@6['JetExpression']
-    topLevelClasses(JavaClassImpl@82['PsiElement']) = LazyJavaClassDescriptor@8['PsiElement']
+    topLevelClasses(JavaClassImpl@86['PsiElement']) = LazyJavaClassDescriptor@8['PsiElement']
     topLevelClasses(JavaClassImpl@93['Serializable']) = LazyJavaClassDescriptor@10['Serializable']
     topLevelClasses(JavaClassImpl@110['Type']) = LazyJavaClassDescriptor@12['Type']
     topLevelClasses(JavaClassImpl@145['Util']) = LazyJavaClassDescriptor@14['Util']
@@ -332,63 +332,48 @@ LazyJavaTypeParameterDescriptor@32['T'] {
 }
 
 LazyJavaTypeParameterResolver@169 {
-    resolve(JavaTypeParameterImpl@170['T']) = LazyJavaTypeParameterDescriptor@32['T']
+    resolve(JavaTypeParameterImpl@170['T']) = LazyJavaTypeParameterDescriptor@163['T']
 }
 
 LazyJavaTypeParameterResolver@171 {
-    resolve(JavaTypeParameterImpl@172['T']) = LazyJavaTypeParameterDescriptor@163['T']
+    resolve(JavaTypeParameterImpl@172['T']) = LazyJavaTypeParameterDescriptor@32['T']
 }
 
 ResolutionTaskHolder@173 {
     <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@175 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@177 {
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@179 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@176 {
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@181 {
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@183 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@179 {
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
+ResolutionTaskHolder@182 {
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
+}
+
 ResolutionTaskHolder@185 {
     <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@187 }
 }
 
-ResolutionTaskHolder@189 {
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@191 }
+ResolutionTaskHolder@188 {
+    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
 }
 
-ResolutionTaskHolder@193 {
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@195 }
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@195 }
+ResolutionTaskHolder@191 {
+    <name not found> = ArrayList@192[1] { ResolutionCandidate@193 }
 }
 
-ResolutionTaskHolder@197 {
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@199 }
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@199 }
-}
-
-ResolutionTaskHolder@201 {
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@194 {
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
@@ -399,7 +384,25 @@ ResolutionTaskHolder@201 {
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@202 {
+ResolutionTaskHolder@195 {
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+}
+
+null {
+    <name not found> = ArrayList@196[1] { ResolutionCandidate@184 }
+    <name not found> = ArrayList@197[1] { ResolutionCandidate@175 }
+    <name not found> = ArrayList@198[1] { ResolutionCandidate@178 }
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@187 }
+    <name not found> = ArrayList@200[1] { ResolutionCandidate@193 }
+    <name not found> = ArrayList@201[1] { ResolutionCandidate@181 }
+    <name not found> = ArrayList@202[1] { ResolutionCandidate@190 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
diff --git a/compiler/testData/diagnostics/tests/platformTypes/inference.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/inference.lazy.log
index b9c1c39d5c2..37d318afe7d 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/inference.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/inference.lazy.log
@@ -127,21 +127,21 @@ LazyJavaClassifierType@66['Throwable'] {
 
 LazyJavaClassifierType@69['Throwable'] {
     arguments = ArrayList@70[empty]
-    classifier = JavaClassImpl@61['Throwable']
+    classifier = JavaClassImpl@65['Throwable']
     nullable = 'true': Boolean@48
     typeConstructor = DeserializedClassTypeConstructor@62
 }
 
 LazyJavaClassifierType@71['Throwable'] {
     arguments = ArrayList@72[empty]
-    classifier = JavaClassImpl@65['Throwable']
+    classifier = JavaClassImpl@68['Throwable']
     nullable = 'true': Boolean@48
     typeConstructor = DeserializedClassTypeConstructor@62
 }
 
 LazyJavaClassifierType@73['Throwable'] {
     arguments = ArrayList@74[empty]
-    classifier = JavaClassImpl@68['Throwable']
+    classifier = JavaClassImpl@61['Throwable']
     nullable = 'true': Boolean@48
     typeConstructor = DeserializedClassTypeConstructor@62
 }
@@ -257,19 +257,15 @@ LazyJavaTypeParameterDescriptor@18['T'] {
 }
 
 LazyJavaTypeParameterResolver@149 {
-    resolve(JavaTypeParameterImpl@150['T']) = LazyJavaTypeParameterDescriptor@18['T']
+    resolve(JavaTypeParameterImpl@150['T']) = LazyJavaTypeParameterDescriptor@25['T']
 }
 
 LazyJavaTypeParameterResolver@151 {
-    resolve(JavaTypeParameterImpl@152['T']) = LazyJavaTypeParameterDescriptor@25['T']
+    resolve(JavaTypeParameterImpl@152['T']) = LazyJavaTypeParameterDescriptor@18['T']
 }
 
 ResolutionTaskHolder@153 {
     <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@155 }
-    <name not found> = EmptyList@126[empty]
-    <name not found> = EmptyList@126[empty]
-    <name not found> = EmptyList@126[empty]
     <name not found> = EmptyList@126[empty]
     <name not found> = EmptyList@126[empty]
     <name not found> = EmptyList@126[empty]
@@ -287,38 +283,45 @@ ResolutionTaskHolder@153 {
     <name not found> = EmptyList@126[empty]
 }
 
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@159 }
-    <name not found> = EmptyList@126[empty]
-    <name not found> = EmptyList@126[empty]
+ResolutionTaskHolder@156 {
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
     <name not found> = EmptyList@126[empty]
     <name not found> = EmptyList@126[empty]
 }
 
-ResolutionTaskHolder@161 {
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@163 }
+ResolutionTaskHolder@159 {
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
+}
+
+ResolutionTaskHolder@162 {
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
 }
 
 ResolutionTaskHolder@165 {
     <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@167 }
 }
 
-ResolutionTaskHolder@169 {
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@171 }
+ResolutionTaskHolder@168 {
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
 }
 
-ResolutionTaskHolder@173 {
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@175 }
+ResolutionTaskHolder@171 {
+    <name not found> = ArrayList@172[4] { ResolutionCandidate@173, ResolutionCandidate@174, ResolutionCandidate@175, ... }
+    <name not found> = EmptyList@126[empty]
+    <name not found> = EmptyList@126[empty]
 }
 
-ResolutionTaskHolder@177 {
-    <name not found> = ArrayList@178[4] { ResolutionCandidate@179, ResolutionCandidate@180, ResolutionCandidate@181, ... }
-    <name not found> = ArrayList@182[5] { ResolutionCandidate@179, ResolutionCandidate@180, ResolutionCandidate@181, ... }
+null {
+    <name not found> = ArrayList@176[1] { ResolutionCandidate@164 }
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@167 }
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@161 }
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@155 }
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@170 }
+    <name not found> = ArrayList@182[5] { ResolutionCandidate@173, ResolutionCandidate@174, ResolutionCandidate@175, ... }
+    <name not found> = EmptyList@126[empty]
+    <name not found> = EmptyList@126[empty]
+    <name not found> = EmptyList@126[empty]
     <name not found> = EmptyList@126[empty]
     <name not found> = EmptyList@126[empty]
     <name not found> = EmptyList@126[empty]
diff --git a/compiler/testData/diagnostics/tests/platformTypes/intVsIntegerAmbiguity.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/intVsIntegerAmbiguity.lazy.log
index 1b43cdb4d3a..1ca2f1cee84 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/intVsIntegerAmbiguity.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/intVsIntegerAmbiguity.lazy.log
@@ -89,14 +89,14 @@ LazyJavaClassifierType@47['Integer'] {
 
 LazyJavaClassifierType@50['Integer'] {
     arguments = ArrayList@51[empty]
-    classifier = JavaClassImpl@45['Integer']
+    classifier = JavaClassImpl@49['Integer']
     nullable = 'true': Boolean@37
     typeConstructor = DeserializedClassTypeConstructor@46
 }
 
 LazyJavaClassifierType@52['Integer'] {
     arguments = ArrayList@53[empty]
-    classifier = JavaClassImpl@49['Integer']
+    classifier = JavaClassImpl@45['Integer']
     nullable = 'true': Boolean@37
     typeConstructor = DeserializedClassTypeConstructor@46
 }
@@ -176,99 +176,69 @@ LazyJavaPackageFragment@81['p'] {
 
 ResolutionTaskHolder@101 {
     <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
 }
 
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
 }
 
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
+}
+
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
 }
 
 ResolutionTaskHolder@113 {
     <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
 }
 
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
 }
 
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[2] { ResolutionCandidate@127, ResolutionCandidate@128 }
-    <name not found> = ArrayList@129[2] { ResolutionCandidate@127, ResolutionCandidate@128 }
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
+ResolutionTaskHolder@119 {
+    <name not found> = ArrayList@120[2] { ResolutionCandidate@121, ResolutionCandidate@122 }
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
 }
 
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[2] { ResolutionCandidate@132, ResolutionCandidate@133 }
-    <name not found> = ArrayList@134[2] { ResolutionCandidate@132, ResolutionCandidate@133 }
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
+ResolutionTaskHolder@123 {
+    <name not found> = ArrayList@124[2] { ResolutionCandidate@125, ResolutionCandidate@126 }
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
 }
 
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[3] { ResolutionCandidate@137, ResolutionCandidate@138, ResolutionCandidate@139 }
-    <name not found> = ArrayList@140[3] { ResolutionCandidate@137, ResolutionCandidate@138, ResolutionCandidate@139 }
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
+ResolutionTaskHolder@127 {
+    <name not found> = ArrayList@128[3] { ResolutionCandidate@129, ResolutionCandidate@130, ResolutionCandidate@131 }
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
 }
 
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[3] { ResolutionCandidate@143, ResolutionCandidate@144, ResolutionCandidate@145 }
-    <name not found> = ArrayList@146[3] { ResolutionCandidate@143, ResolutionCandidate@144, ResolutionCandidate@145 }
+ResolutionTaskHolder@132 {
+    <name not found> = ArrayList@133[3] { ResolutionCandidate@134, ResolutionCandidate@135, ResolutionCandidate@136 }
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
+}
+
+ResolutionTaskHolder@137 {
+    <name not found> = ArrayList@138[3] { ResolutionCandidate@139, ResolutionCandidate@140, ResolutionCandidate@141 }
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+}
+
+ResolutionTaskHolder@142 {
+    <name not found> = ArrayList@143[3] { ResolutionCandidate@144, ResolutionCandidate@145, ResolutionCandidate@146 }
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
 }
 
 ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[3] { ResolutionCandidate@149, ResolutionCandidate@150, ResolutionCandidate@151 }
-    <name not found> = ArrayList@152[3] { ResolutionCandidate@149, ResolutionCandidate@150, ResolutionCandidate@151 }
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
-
-ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[3] { ResolutionCandidate@155, ResolutionCandidate@156, ResolutionCandidate@157 }
-    <name not found> = ArrayList@158[3] { ResolutionCandidate@155, ResolutionCandidate@156, ResolutionCandidate@157 }
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
-
-ResolutionTaskHolder@159 {
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
@@ -279,9 +249,7 @@ ResolutionTaskHolder@159 {
     <name not found> = EmptyList@12[empty]
 }
 
-ResolutionTaskHolder@160 {
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
+ResolutionTaskHolder@148 {
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
@@ -292,9 +260,7 @@ ResolutionTaskHolder@160 {
     <name not found> = EmptyList@12[empty]
 }
 
-ResolutionTaskHolder@161 {
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
+ResolutionTaskHolder@149 {
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
@@ -305,7 +271,44 @@ ResolutionTaskHolder@161 {
     <name not found> = EmptyList@12[empty]
 }
 
-ResolutionTaskHolder@162 {
+ResolutionTaskHolder@150 {
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+}
+
+null {
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@157[2] { ResolutionCandidate@121, ResolutionCandidate@122 }
+    <name not found> = ArrayList@158[2] { ResolutionCandidate@125, ResolutionCandidate@126 }
+    <name not found> = ArrayList@159[3] { ResolutionCandidate@139, ResolutionCandidate@140, ResolutionCandidate@141 }
+    <name not found> = ArrayList@160[3] { ResolutionCandidate@129, ResolutionCandidate@130, ResolutionCandidate@131 }
+    <name not found> = ArrayList@161[3] { ResolutionCandidate@134, ResolutionCandidate@135, ResolutionCandidate@136 }
+    <name not found> = ArrayList@162[3] { ResolutionCandidate@144, ResolutionCandidate@145, ResolutionCandidate@146 }
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/entrySet.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/methodCall/entrySet.lazy.log
index 4aa637fe6f3..2729f19220e 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/entrySet.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/methodCall/entrySet.lazy.log
@@ -34,7 +34,7 @@ LazyJavaClassifierType@25['Collection<V>'] {
 
 LazyJavaClassifierType@30['Collection<V>'] {
     arguments = ArrayList@31[1] { TypeProjectionImpl@32 }
-    classifier = JavaClassImpl@28['Collection']
+    classifier = JavaClassImpl@21['Collection']
     memberScope = SubstitutingScope@33
     nullable = 'true': Boolean@34
     typeConstructor = DeserializedClassTypeConstructor@35
@@ -42,7 +42,7 @@ LazyJavaClassifierType@30['Collection<V>'] {
 
 LazyJavaClassifierType@36['Collection<V>'] {
     arguments = ArrayList@37[1] { TypeProjectionImpl@38 }
-    classifier = JavaClassImpl@21['Collection']
+    classifier = JavaClassImpl@28['Collection']
     memberScope = SubstitutingScope@39
     nullable = 'true': Boolean@34
     typeConstructor = DeserializedClassTypeConstructor@35
@@ -99,14 +99,14 @@ LazyJavaClassifierType@64['V'] {
 
 LazyJavaClassifierType@67['V'] {
     arguments = ArrayList@68[empty]
-    classifier = JavaTypeParameterImpl@63['V']
+    classifier = JavaTypeParameterImpl@66['V']
     nullable = 'true': Boolean@34
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
 }
 
 LazyJavaClassifierType@69['V'] {
     arguments = ArrayList@70[empty]
-    classifier = JavaTypeParameterImpl@66['V']
+    classifier = JavaTypeParameterImpl@56['V']
     nullable = 'true': Boolean@34
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
 }
@@ -120,7 +120,7 @@ LazyJavaClassifierType@71['V'] {
 
 LazyJavaClassifierType@73['V'] {
     arguments = ArrayList@74[empty]
-    classifier = JavaTypeParameterImpl@56['V']
+    classifier = JavaTypeParameterImpl@63['V']
     nullable = 'true': Boolean@34
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
 }
@@ -196,59 +196,62 @@ LazyJavaTypeParameterResolver@120 {
 }
 
 LazyJavaTypeParameterResolver@123 {
-    resolve(JavaTypeParameterImpl@66['V']) = null
+    resolve(JavaTypeParameterImpl@60['V']) = null
 }
 
 ResolutionTaskHolder@124 {
     <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@126 }
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
     <name not found> = EmptyList@102[empty]
     <name not found> = EmptyList@102[empty]
 }
 
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
+ResolutionTaskHolder@127 {
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
 }
 
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
+ResolutionTaskHolder@130 {
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
+}
+
+ResolutionTaskHolder@133 {
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
 }
 
 ResolutionTaskHolder@136 {
     <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
 }
 
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
+ResolutionTaskHolder@139 {
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
 }
 
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
+ResolutionTaskHolder@142 {
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
+}
+
+ResolutionTaskHolder@145 {
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
 }
 
 ResolutionTaskHolder@148 {
     <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
 }
 
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
+ResolutionTaskHolder@151 {
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
 }
 
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
-}
-
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@162 }
+null {
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@126 }
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@153 }
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@132 }
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@129 }
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@135 }
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@147 }
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@141 }
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/genericsAndArrays.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/methodCall/genericsAndArrays.lazy.log
index 947304eee89..ea95425cc09 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/genericsAndArrays.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/methodCall/genericsAndArrays.lazy.log
@@ -119,16 +119,16 @@ LazyJavaClassifierType@71['T'] {
 
 LazyJavaClassifierType@73['T'] {
     arguments = ArrayList@74[empty]
-    classifier = JavaTypeParameterImpl@65['T']
+    classifier = JavaTypeParameterImpl@68['T']
     nullable = 'true': Boolean@45
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@58
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@62
 }
 
 LazyJavaClassifierType@75['T'] {
     arguments = ArrayList@76[empty]
-    classifier = JavaTypeParameterImpl@68['T']
+    classifier = JavaTypeParameterImpl@65['T']
     nullable = 'true': Boolean@45
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@62
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@58
 }
 
 LazyJavaPackageFragmentProvider@77 {
@@ -191,12 +191,12 @@ LazyJavaPackageFragment@100['p'] {
 
 LazyJavaTypeParameterDescriptor@24['T'] {
     defaultType = JetTypeImpl@122['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@58
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@62
     upperBounds = LinkedHashSet@123[1] { NullableType@124 }
 }
 
 LazyJavaTypeParameterDescriptor@125['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@62
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@58
     upperBounds = LinkedHashSet@126[1] { NullableType@127 }
 }
 
@@ -205,48 +205,40 @@ LazyJavaTypeParameterDescriptor@28['T'] {
 }
 
 LazyJavaTypeParameterResolver@129 {
-    resolve(JavaTypeParameterImpl@130['T']) = LazyJavaTypeParameterDescriptor@24['T']
+    resolve(JavaTypeParameterImpl@130['T']) = LazyJavaTypeParameterDescriptor@28['T']
 }
 
 LazyJavaTypeParameterResolver@131 {
-    resolve(JavaTypeParameterImpl@132['T']) = LazyJavaTypeParameterDescriptor@28['T']
+    resolve(JavaTypeParameterImpl@132['T']) = LazyJavaTypeParameterDescriptor@125['T']
 }
 
 LazyJavaTypeParameterResolver@133 {
-    resolve(JavaTypeParameterImpl@134['T']) = LazyJavaTypeParameterDescriptor@125['T']
+    resolve(JavaTypeParameterImpl@134['T']) = LazyJavaTypeParameterDescriptor@24['T']
 }
 
 LazyJavaTypeParameterResolver@135 {
-    resolve(JavaTypeParameterImpl@57['T']) = null
+    resolve(JavaTypeParameterImpl@61['T']) = null
 }
 
 ResolutionTaskHolder@136 {
     <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
 }
 
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
+ResolutionTaskHolder@139 {
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
 }
 
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
+ResolutionTaskHolder@142 {
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
+}
+
+ResolutionTaskHolder@145 {
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
 }
 
 ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
-}
-
-ResolutionTaskHolder@152 {
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
@@ -256,3 +248,14 @@ ResolutionTaskHolder@152 {
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
 }
+
+null {
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@141 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@147 }
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/int.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/methodCall/int.lazy.log
index 5496389b966..4f3f4e74a56 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/int.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/methodCall/int.lazy.log
@@ -71,12 +71,6 @@ LazyJavaPackageFragment@32['p'] {
 
 ResolutionTaskHolder@48 {
     <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
@@ -102,25 +96,34 @@ ResolutionTaskHolder@48 {
     <name not found> = EmptyList@12[empty]
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
+}
+
+null {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@50 }
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/intArray.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/methodCall/intArray.lazy.log
index 49cf567187d..adca4ccb6cb 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/intArray.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/methodCall/intArray.lazy.log
@@ -70,33 +70,36 @@ LazyJavaPackageFragment@33['p'] {
 
 ResolutionTaskHolder@52 {
     <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
+}
+
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
 }
 
 ResolutionTaskHolder@64 {
     <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+null {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@66 }
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/javaCollectionToKotlin.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/methodCall/javaCollectionToKotlin.lazy.log
index f7f01c35f8c..6124dbab26f 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/javaCollectionToKotlin.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/methodCall/javaCollectionToKotlin.lazy.log
@@ -49,21 +49,21 @@ LazyJavaClassifierType@37['K'] {
     arguments = ArrayList@38[empty]
     classifier = JavaTypeParameterImpl@39['K']
     nullable = 'false': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@40
 }
 
-LazyJavaClassifierType@40['K'] {
-    arguments = ArrayList@41[empty]
-    classifier = JavaTypeParameterImpl@42['K']
+LazyJavaClassifierType@41['K'] {
+    arguments = ArrayList@42[empty]
+    classifier = JavaTypeParameterImpl@43['K']
     nullable = 'false': Boolean@35
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
 }
 
-LazyJavaClassifierType@43['K'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaTypeParameterImpl@45['K']
+LazyJavaClassifierType@44['K'] {
+    arguments = ArrayList@45[empty]
+    classifier = JavaTypeParameterImpl@46['K']
     nullable = 'false': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@46
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
 }
 
 LazyJavaClassifierType@47['K'] {
@@ -75,21 +75,21 @@ LazyJavaClassifierType@47['K'] {
 
 LazyJavaClassifierType@50['K'] {
     arguments = ArrayList@51[empty]
-    classifier = JavaTypeParameterImpl@45['K']
-    nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@46
-}
-
-LazyJavaClassifierType@52['K'] {
-    arguments = ArrayList@53[empty]
-    classifier = JavaTypeParameterImpl@42['K']
+    classifier = JavaTypeParameterImpl@46['K']
     nullable = 'true': Boolean@49
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
 }
 
+LazyJavaClassifierType@52['K'] {
+    arguments = ArrayList@53[empty]
+    classifier = JavaTypeParameterImpl@39['K']
+    nullable = 'true': Boolean@49
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@40
+}
+
 LazyJavaClassifierType@54['K'] {
     arguments = ArrayList@55[empty]
-    classifier = JavaTypeParameterImpl@39['K']
+    classifier = JavaTypeParameterImpl@43['K']
     nullable = 'true': Boolean@49
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
 }
@@ -154,40 +154,40 @@ LazyJavaClassifierType@88['V'] {
     arguments = ArrayList@89[empty]
     classifier = JavaTypeParameterImpl@90['V']
     nullable = 'false': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@91
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
 }
 
-LazyJavaClassifierType@92['V'] {
-    arguments = ArrayList@93[empty]
-    classifier = JavaTypeParameterImpl@94['V']
+LazyJavaClassifierType@91['V'] {
+    arguments = ArrayList@92[empty]
+    classifier = JavaTypeParameterImpl@93['V']
     nullable = 'false': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@94
 }
 
 LazyJavaClassifierType@95['V'] {
     arguments = ArrayList@96[empty]
-    classifier = JavaTypeParameterImpl@83['V']
+    classifier = JavaTypeParameterImpl@87['V']
     nullable = 'true': Boolean@49
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
 }
 
 LazyJavaClassifierType@97['V'] {
     arguments = ArrayList@98[empty]
-    classifier = JavaTypeParameterImpl@94['V']
+    classifier = JavaTypeParameterImpl@93['V']
     nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@94
 }
 
 LazyJavaClassifierType@99['V'] {
     arguments = ArrayList@100[empty]
-    classifier = JavaTypeParameterImpl@90['V']
+    classifier = JavaTypeParameterImpl@83['V']
     nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@91
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
 }
 
 LazyJavaClassifierType@101['V'] {
     arguments = ArrayList@102[empty]
-    classifier = JavaTypeParameterImpl@87['V']
+    classifier = JavaTypeParameterImpl@90['V']
     nullable = 'true': Boolean@49
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
 }
@@ -264,7 +264,7 @@ LazyJavaTypeParameterDescriptor@18['K'] {
 }
 
 LazyJavaTypeParameterDescriptor@13['K'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@46
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@40
 }
 
 LazyJavaTypeParameterDescriptor@19['V'] {
@@ -274,31 +274,34 @@ LazyJavaTypeParameterDescriptor@19['V'] {
 }
 
 LazyJavaTypeParameterDescriptor@14['V'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@91
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@94
 }
 
 LazyJavaTypeParameterResolver@154 {
-    resolve(JavaTypeParameterImpl@155['K']) = LazyJavaTypeParameterDescriptor@18['K']
-    resolve(JavaTypeParameterImpl@156['V']) = LazyJavaTypeParameterDescriptor@19['V']
+    resolve(JavaTypeParameterImpl@39['K']) = LazyJavaTypeParameterDescriptor@13['K']
+    resolve(JavaTypeParameterImpl@93['V']) = LazyJavaTypeParameterDescriptor@14['V']
 }
 
-LazyJavaTypeParameterResolver@157 {
-    resolve(JavaTypeParameterImpl@45['K']) = LazyJavaTypeParameterDescriptor@13['K']
-    resolve(JavaTypeParameterImpl@90['V']) = LazyJavaTypeParameterDescriptor@14['V']
+LazyJavaTypeParameterResolver@155 {
+    resolve(JavaTypeParameterImpl@156['K']) = LazyJavaTypeParameterDescriptor@18['K']
+    resolve(JavaTypeParameterImpl@157['V']) = LazyJavaTypeParameterDescriptor@19['V']
 }
 
 ResolutionTaskHolder@158 {
     <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@160 }
-    <name not found> = EmptyList@135[empty]
-    <name not found> = EmptyList@135[empty]
     <name not found> = EmptyList@135[empty]
     <name not found> = EmptyList@135[empty]
 }
 
-ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[4] { ResolutionCandidate@164, ResolutionCandidate@165, ResolutionCandidate@166, ... }
-    <name not found> = ArrayList@167[4] { ResolutionCandidate@164, ResolutionCandidate@165, ResolutionCandidate@166, ... }
+ResolutionTaskHolder@161 {
+    <name not found> = ArrayList@162[4] { ResolutionCandidate@163, ResolutionCandidate@164, ResolutionCandidate@165, ... }
+    <name not found> = EmptyList@135[empty]
+    <name not found> = EmptyList@135[empty]
+}
+
+null {
+    <name not found> = ArrayList@166[1] { ResolutionCandidate@160 }
+    <name not found> = ArrayList@167[4] { ResolutionCandidate@163, ResolutionCandidate@164, ResolutionCandidate@165, ... }
     <name not found> = EmptyList@135[empty]
     <name not found> = EmptyList@135[empty]
     <name not found> = EmptyList@135[empty]
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/javaToJava.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/methodCall/javaToJava.lazy.log
index 9fcce5c97aa..d3ff3a48690 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/javaToJava.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/methodCall/javaToJava.lazy.log
@@ -88,14 +88,14 @@ LazyJavaClassifierType@55['ArrayList<String>'] {
 
 LazyJavaClassifierType@59['ArrayList<String>'] {
     arguments = ArrayList@60[1] { TypeProjectionImpl@61 }
-    classifier = JavaClassImpl@53['ArrayList']
+    classifier = JavaClassImpl@58['ArrayList']
     nullable = 'true': Boolean@62
     typeConstructor = LazyJavaClassTypeConstructor@5['ArrayList']
 }
 
 LazyJavaClassifierType@63['ArrayList<String>'] {
     arguments = ArrayList@64[1] { TypeProjectionImpl@65 }
-    classifier = JavaClassImpl@58['ArrayList']
+    classifier = JavaClassImpl@53['ArrayList']
     nullable = 'true': Boolean@62
     typeConstructor = LazyJavaClassTypeConstructor@5['ArrayList']
 }
@@ -153,12 +153,12 @@ LazyJavaClassifierType@89['E'] {
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
 }
 
-LazyJavaClassifierType@32['List<E>'] {
+LazyJavaClassifierType@37['List<E>'] {
     classifier = JavaClassImpl@91['List']
     typeConstructor = DeserializedClassTypeConstructor@92
 }
 
-LazyJavaClassifierType@37['List<E>'] {
+LazyJavaClassifierType@32['List<E>'] {
     classifier = JavaClassImpl@93['List']
     typeConstructor = DeserializedClassTypeConstructor@92
 }
@@ -223,7 +223,7 @@ LazyJavaClassifierType@116['String'] {
 
 LazyJavaClassifierType@119['String'] {
     arguments = ArrayList@120[empty]
-    classifier = JavaClassImpl@112['String']
+    classifier = JavaClassImpl@115['String']
     nullable = 'true': Boolean@62
     typeConstructor = DeserializedClassTypeConstructor@109
 }
@@ -237,14 +237,14 @@ LazyJavaClassifierType@121['String'] {
 
 LazyJavaClassifierType@123['String'] {
     arguments = ArrayList@124[empty]
-    classifier = JavaClassImpl@115['String']
+    classifier = JavaClassImpl@118['String']
     nullable = 'true': Boolean@62
     typeConstructor = DeserializedClassTypeConstructor@109
 }
 
 LazyJavaClassifierType@125['String'] {
     arguments = ArrayList@126[empty]
-    classifier = JavaClassImpl@118['String']
+    classifier = JavaClassImpl@112['String']
     nullable = 'true': Boolean@62
     typeConstructor = DeserializedClassTypeConstructor@109
 }
@@ -265,7 +265,7 @@ LazyJavaPackageFragmentProvider@127 {
     packageFragments('p.J': FqName@146) = null
     topLevelClasses(JavaClassImpl@46['AbstractCollection']) = LazyJavaClassDescriptor@0['AbstractCollection']
     topLevelClasses(JavaClassImpl@49['AbstractList']) = LazyJavaClassDescriptor@2['AbstractList']
-    topLevelClasses(JavaClassImpl@58['ArrayList']) = LazyJavaClassDescriptor@4['ArrayList']
+    topLevelClasses(JavaClassImpl@53['ArrayList']) = LazyJavaClassDescriptor@4['ArrayList']
     topLevelClasses(JavaClassImpl@147['J']) = LazyJavaClassDescriptor@6['J']
     topLevelClasses(JavaClassImpl@103['RandomAccess']) = LazyJavaClassDescriptor@20['RandomAccess']
     topLevelClasses(JavaClassImpl@105['Serializable']) = LazyJavaClassDescriptor@22['Serializable']
@@ -290,71 +290,74 @@ LazyJavaPackageFragment@145['p'] {
     classes('J': Name@148) = LazyJavaClassDescriptor@6['J'] // through LazyPackageFragmentScopeForJavaPackage@159
 }
 
+LazyJavaTypeParameterDescriptor@29['E'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
+}
+
+LazyJavaTypeParameterDescriptor@25['E'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@76
+}
+
 LazyJavaTypeParameterDescriptor@34['E'] {
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
 }
 
-LazyJavaTypeParameterDescriptor@25['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
-}
-
-LazyJavaTypeParameterDescriptor@29['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@76
-}
-
 LazyJavaTypeParameterResolver@160 {
-    resolve(JavaTypeParameterImpl@161['E']) = LazyJavaTypeParameterDescriptor@34['E']
+    resolve(JavaTypeParameterImpl@79['E']) = LazyJavaTypeParameterDescriptor@29['E']
 }
 
-LazyJavaTypeParameterResolver@162 {
-    resolve(JavaTypeParameterImpl@75['E']) = LazyJavaTypeParameterDescriptor@29['E']
+LazyJavaTypeParameterResolver@161 {
+    resolve(JavaTypeParameterImpl@162['E']) = LazyJavaTypeParameterDescriptor@34['E']
 }
 
 LazyJavaTypeParameterResolver@163 {
-    resolve(JavaTypeParameterImpl@79['E']) = LazyJavaTypeParameterDescriptor@25['E']
+    resolve(JavaTypeParameterImpl@75['E']) = LazyJavaTypeParameterDescriptor@25['E']
 }
 
 ResolutionTaskHolder@164 {
     <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@166 }
 }
 
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@170 }
+ResolutionTaskHolder@167 {
+    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
 }
 
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@174 }
+ResolutionTaskHolder@170 {
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
+}
+
+ResolutionTaskHolder@173 {
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
 }
 
 ResolutionTaskHolder@176 {
     <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@178 }
 }
 
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@182 }
+ResolutionTaskHolder@179 {
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
 }
 
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@186 }
+ResolutionTaskHolder@182 {
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
+}
+
+ResolutionTaskHolder@185 {
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
 }
 
 ResolutionTaskHolder@188 {
     <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
+}
+
+null {
     <name not found> = ArrayList@191[1] { ResolutionCandidate@190 }
-}
-
-ResolutionTaskHolder@192 {
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@194 }
-}
-
-ResolutionTaskHolder@196 {
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@198 }
+    <name not found> = ArrayList@192[1] { ResolutionCandidate@187 }
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@184 }
+    <name not found> = ArrayList@194[1] { ResolutionCandidate@175 }
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@169 }
+    <name not found> = ArrayList@196[1] { ResolutionCandidate@178 }
+    <name not found> = ArrayList@197[1] { ResolutionCandidate@181 }
+    <name not found> = ArrayList@198[1] { ResolutionCandidate@166 }
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@172 }
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/javaToKotlin.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/methodCall/javaToKotlin.lazy.log
index 0e4312a0ad0..830ccd3bf5c 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/javaToKotlin.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/methodCall/javaToKotlin.lazy.log
@@ -88,23 +88,26 @@ LazyJavaPackageFragment@40['p'] {
 
 ResolutionTaskHolder@60 {
     <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
+}
+
+null {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@62 }
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/kotlinCollectionToJava.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/methodCall/kotlinCollectionToJava.lazy.log
index b7b0ea7b038..00089dbf658 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/kotlinCollectionToJava.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/methodCall/kotlinCollectionToJava.lazy.log
@@ -25,14 +25,14 @@ LazyJavaClassifierType@16['K'] {
 
 LazyJavaClassifierType@19['K'] {
     arguments = ArrayList@20[empty]
-    classifier = JavaTypeParameterImpl@13['K']
+    classifier = JavaTypeParameterImpl@18['K']
     nullable = 'true': Boolean@21
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@15
 }
 
 LazyJavaClassifierType@22['K'] {
     arguments = ArrayList@23[empty]
-    classifier = JavaTypeParameterImpl@18['K']
+    classifier = JavaTypeParameterImpl@13['K']
     nullable = 'true': Boolean@21
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@15
 }
@@ -156,14 +156,17 @@ LazyJavaTypeParameterResolver@96 {
 
 ResolutionTaskHolder@99 {
     <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
 }
 
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[4] { ResolutionCandidate@105, ResolutionCandidate@106, ResolutionCandidate@107, ... }
-    <name not found> = ArrayList@108[4] { ResolutionCandidate@105, ResolutionCandidate@106, ResolutionCandidate@107, ... }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[4] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+}
+
+null {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@108[4] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/list.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/methodCall/list.lazy.log
index 3eae2ad3f86..b90e4a74030 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/list.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/methodCall/list.lazy.log
@@ -124,76 +124,79 @@ LazyJavaPackageFragment@61['p'] {
 
 ResolutionTaskHolder@84 {
     <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
 }
 
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
     <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
     <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
+}
+
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
     <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
 }
 
 ResolutionTaskHolder@96 {
     <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
 }
 
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
+}
+
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
 }
 
 ResolutionTaskHolder@108 {
     <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
 }
 
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
+ResolutionTaskHolder@111 {
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
 }
 
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
 }
 
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
 }
 
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@126 }
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
+null {
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@113 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@119 }
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/multipleExactBounds.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/methodCall/multipleExactBounds.lazy.log
index bcc1d18bb99..e7d6c73f575 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/multipleExactBounds.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/methodCall/multipleExactBounds.lazy.log
@@ -49,49 +49,49 @@ LazyJavaClassifierType@37['K'] {
     arguments = ArrayList@38[empty]
     classifier = JavaTypeParameterImpl@39['K']
     nullable = 'false': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
 }
 
-LazyJavaClassifierType@41['K'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaTypeParameterImpl@43['K']
+LazyJavaClassifierType@40['K'] {
+    arguments = ArrayList@41[empty]
+    classifier = JavaTypeParameterImpl@42['K']
     nullable = 'false': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
 }
 
-LazyJavaClassifierType@44['K'] {
-    arguments = ArrayList@45[empty]
-    classifier = JavaTypeParameterImpl@46['K']
+LazyJavaClassifierType@43['K'] {
+    arguments = ArrayList@44[empty]
+    classifier = JavaTypeParameterImpl@45['K']
     nullable = 'false': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@46
 }
 
 LazyJavaClassifierType@47['K'] {
     arguments = ArrayList@48[empty]
-    classifier = JavaTypeParameterImpl@46['K']
+    classifier = JavaTypeParameterImpl@34['K']
     nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
 }
 
 LazyJavaClassifierType@50['K'] {
     arguments = ArrayList@51[empty]
-    classifier = JavaTypeParameterImpl@34['K']
+    classifier = JavaTypeParameterImpl@42['K']
     nullable = 'true': Boolean@49
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
 }
 
 LazyJavaClassifierType@52['K'] {
     arguments = ArrayList@53[empty]
-    classifier = JavaTypeParameterImpl@43['K']
+    classifier = JavaTypeParameterImpl@45['K']
     nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@46
 }
 
 LazyJavaClassifierType@54['K'] {
     arguments = ArrayList@55[empty]
     classifier = JavaTypeParameterImpl@39['K']
     nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
 }
 
 LazyJavaClassifierType@56['Map<? extends K, ? extends V>'] {
@@ -166,21 +166,21 @@ LazyJavaClassifierType@92['V'] {
 
 LazyJavaClassifierType@95['V'] {
     arguments = ArrayList@96[empty]
-    classifier = JavaTypeParameterImpl@94['V']
+    classifier = JavaTypeParameterImpl@91['V']
     nullable = 'true': Boolean@49
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
 }
 
 LazyJavaClassifierType@97['V'] {
     arguments = ArrayList@98[empty]
-    classifier = JavaTypeParameterImpl@91['V']
+    classifier = JavaTypeParameterImpl@83['V']
     nullable = 'true': Boolean@49
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
 }
 
 LazyJavaClassifierType@99['V'] {
     arguments = ArrayList@100[empty]
-    classifier = JavaTypeParameterImpl@83['V']
+    classifier = JavaTypeParameterImpl@94['V']
     nullable = 'true': Boolean@49
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
 }
@@ -274,12 +274,12 @@ LazyJavaPackageFragment@132['util'] {
 
 LazyJavaTypeParameterDescriptor@18['K'] {
     defaultType = JetTypeImpl@169['K']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
     upperBounds = LinkedHashSet@170[1] { NullableType@171 }
 }
 
 LazyJavaTypeParameterDescriptor@13['K'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@46
 }
 
 LazyJavaTypeParameterDescriptor@19['V'] {
@@ -293,37 +293,40 @@ LazyJavaTypeParameterDescriptor@14['V'] {
 }
 
 LazyJavaTypeParameterResolver@175 {
-    resolve(JavaTypeParameterImpl@34['K']) = LazyJavaTypeParameterDescriptor@13['K']
-    resolve(JavaTypeParameterImpl@87['V']) = LazyJavaTypeParameterDescriptor@14['V']
+    resolve(JavaTypeParameterImpl@176['K']) = LazyJavaTypeParameterDescriptor@18['K']
+    resolve(JavaTypeParameterImpl@177['V']) = LazyJavaTypeParameterDescriptor@19['V']
 }
 
-LazyJavaTypeParameterResolver@176 {
-    resolve(JavaTypeParameterImpl@177['K']) = LazyJavaTypeParameterDescriptor@18['K']
-    resolve(JavaTypeParameterImpl@178['V']) = LazyJavaTypeParameterDescriptor@19['V']
+LazyJavaTypeParameterResolver@178 {
+    resolve(JavaTypeParameterImpl@45['K']) = LazyJavaTypeParameterDescriptor@13['K']
+    resolve(JavaTypeParameterImpl@87['V']) = LazyJavaTypeParameterDescriptor@14['V']
 }
 
 ResolutionTaskHolder@179 {
     <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@181 }
-    <name not found> = EmptyList@154[empty]
-    <name not found> = EmptyList@154[empty]
     <name not found> = EmptyList@154[empty]
     <name not found> = EmptyList@154[empty]
 }
 
-ResolutionTaskHolder@183 {
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@185 }
+ResolutionTaskHolder@182 {
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
 }
 
-ResolutionTaskHolder@187 {
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@189 }
+ResolutionTaskHolder@185 {
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
 }
 
-ResolutionTaskHolder@191 {
-    <name not found> = ArrayList@192[4] { ResolutionCandidate@193, ResolutionCandidate@194, ResolutionCandidate@195, ... }
-    <name not found> = ArrayList@196[4] { ResolutionCandidate@193, ResolutionCandidate@194, ResolutionCandidate@195, ... }
+ResolutionTaskHolder@188 {
+    <name not found> = ArrayList@189[4] { ResolutionCandidate@190, ResolutionCandidate@191, ResolutionCandidate@192, ... }
+    <name not found> = EmptyList@154[empty]
+    <name not found> = EmptyList@154[empty]
+}
+
+null {
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@184 }
+    <name not found> = ArrayList@194[1] { ResolutionCandidate@187 }
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@181 }
+    <name not found> = ArrayList@196[4] { ResolutionCandidate@190, ResolutionCandidate@191, ResolutionCandidate@192, ... }
     <name not found> = EmptyList@154[empty]
     <name not found> = EmptyList@154[empty]
     <name not found> = EmptyList@154[empty]
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/multipleExactBoundsNullable.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/methodCall/multipleExactBoundsNullable.lazy.log
index 00e14368ab2..31c667df54a 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/multipleExactBoundsNullable.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/methodCall/multipleExactBoundsNullable.lazy.log
@@ -82,16 +82,16 @@ LazyJavaClassifierType@50['K'] {
 
 LazyJavaClassifierType@52['K'] {
     arguments = ArrayList@53[empty]
-    classifier = JavaTypeParameterImpl@34['K']
+    classifier = JavaTypeParameterImpl@39['K']
     nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@40
 }
 
 LazyJavaClassifierType@54['K'] {
     arguments = ArrayList@55[empty]
-    classifier = JavaTypeParameterImpl@39['K']
+    classifier = JavaTypeParameterImpl@34['K']
     nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
 }
 
 LazyJavaClassifierType@56['Map<? extends K, ? extends V>'] {
@@ -147,47 +147,47 @@ LazyJavaClassifierType@85['V'] {
     arguments = ArrayList@86[empty]
     classifier = JavaTypeParameterImpl@87['V']
     nullable = 'false': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@88
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
 }
 
-LazyJavaClassifierType@89['V'] {
-    arguments = ArrayList@90[empty]
-    classifier = JavaTypeParameterImpl@91['V']
+LazyJavaClassifierType@88['V'] {
+    arguments = ArrayList@89[empty]
+    classifier = JavaTypeParameterImpl@90['V']
     nullable = 'false': Boolean@35
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
 }
 
-LazyJavaClassifierType@92['V'] {
-    arguments = ArrayList@93[empty]
-    classifier = JavaTypeParameterImpl@94['V']
+LazyJavaClassifierType@91['V'] {
+    arguments = ArrayList@92[empty]
+    classifier = JavaTypeParameterImpl@93['V']
     nullable = 'false': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@94
 }
 
 LazyJavaClassifierType@95['V'] {
     arguments = ArrayList@96[empty]
-    classifier = JavaTypeParameterImpl@87['V']
+    classifier = JavaTypeParameterImpl@83['V']
     nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@88
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
 }
 
 LazyJavaClassifierType@97['V'] {
     arguments = ArrayList@98[empty]
-    classifier = JavaTypeParameterImpl@91['V']
+    classifier = JavaTypeParameterImpl@90['V']
     nullable = 'true': Boolean@49
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
 }
 
 LazyJavaClassifierType@99['V'] {
     arguments = ArrayList@100[empty]
-    classifier = JavaTypeParameterImpl@94['V']
+    classifier = JavaTypeParameterImpl@93['V']
     nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@94
 }
 
 LazyJavaClassifierType@101['V'] {
     arguments = ArrayList@102[empty]
-    classifier = JavaTypeParameterImpl@83['V']
+    classifier = JavaTypeParameterImpl@87['V']
     nullable = 'true': Boolean@49
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
 }
@@ -284,95 +284,98 @@ LazyJavaTypeParameterDescriptor@19['V'] {
 }
 
 LazyJavaTypeParameterDescriptor@14['V'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@88
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@94
 }
 
 LazyJavaTypeParameterResolver@170 {
-    resolve(JavaTypeParameterImpl@171['K']) = LazyJavaTypeParameterDescriptor@18['K']
-    resolve(JavaTypeParameterImpl@172['V']) = LazyJavaTypeParameterDescriptor@19['V']
+    resolve(JavaTypeParameterImpl@39['K']) = LazyJavaTypeParameterDescriptor@13['K']
+    resolve(JavaTypeParameterImpl@93['V']) = LazyJavaTypeParameterDescriptor@14['V']
 }
 
-LazyJavaTypeParameterResolver@173 {
-    resolve(JavaTypeParameterImpl@39['K']) = LazyJavaTypeParameterDescriptor@13['K']
-    resolve(JavaTypeParameterImpl@87['V']) = LazyJavaTypeParameterDescriptor@14['V']
+LazyJavaTypeParameterResolver@171 {
+    resolve(JavaTypeParameterImpl@172['K']) = LazyJavaTypeParameterDescriptor@18['K']
+    resolve(JavaTypeParameterImpl@173['V']) = LazyJavaTypeParameterDescriptor@19['V']
 }
 
 ResolutionTaskHolder@174 {
     <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@176 }
-    <name not found> = EmptyList@149[empty]
-    <name not found> = EmptyList@149[empty]
     <name not found> = EmptyList@149[empty]
     <name not found> = EmptyList@149[empty]
 }
 
-ResolutionTaskHolder@178 {
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@180 }
-    <name not found> = EmptyList@149[empty]
-    <name not found> = EmptyList@149[empty]
+ResolutionTaskHolder@177 {
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
     <name not found> = EmptyList@149[empty]
     <name not found> = EmptyList@149[empty]
 }
 
-ResolutionTaskHolder@182 {
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@184 }
+ResolutionTaskHolder@180 {
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
+}
+
+ResolutionTaskHolder@183 {
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
 }
 
 ResolutionTaskHolder@186 {
     <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@188 }
 }
 
-ResolutionTaskHolder@190 {
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@192 }
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@192 }
+ResolutionTaskHolder@189 {
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
 }
 
-ResolutionTaskHolder@194 {
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@196 }
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@196 }
+ResolutionTaskHolder@192 {
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
+}
+
+ResolutionTaskHolder@195 {
+    <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
 }
 
 ResolutionTaskHolder@198 {
     <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@200 }
 }
 
-ResolutionTaskHolder@202 {
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@204 }
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@204 }
+ResolutionTaskHolder@201 {
+    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
 }
 
-ResolutionTaskHolder@206 {
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@208 }
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@208 }
+ResolutionTaskHolder@204 {
+    <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
+}
+
+ResolutionTaskHolder@207 {
+    <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
 }
 
 ResolutionTaskHolder@210 {
     <name not found> = ArrayList@211[1] { ResolutionCandidate@212 }
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@212 }
 }
 
-ResolutionTaskHolder@214 {
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@216 }
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@216 }
+ResolutionTaskHolder@213 {
+    <name not found> = ArrayList@214[4] { ResolutionCandidate@215, ResolutionCandidate@216, ResolutionCandidate@217, ... }
+    <name not found> = EmptyList@149[empty]
+    <name not found> = EmptyList@149[empty]
 }
 
-ResolutionTaskHolder@218 {
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@220 }
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@220 }
-}
-
-ResolutionTaskHolder@222 {
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@224 }
-}
-
-ResolutionTaskHolder@226 {
-    <name not found> = ArrayList@227[4] { ResolutionCandidate@228, ResolutionCandidate@229, ResolutionCandidate@230, ... }
-    <name not found> = ArrayList@231[4] { ResolutionCandidate@228, ResolutionCandidate@229, ResolutionCandidate@230, ... }
+null {
+    <name not found> = ArrayList@218[1] { ResolutionCandidate@209 }
+    <name not found> = ArrayList@219[1] { ResolutionCandidate@197 }
+    <name not found> = ArrayList@220[1] { ResolutionCandidate@182 }
+    <name not found> = ArrayList@221[1] { ResolutionCandidate@179 }
+    <name not found> = ArrayList@222[1] { ResolutionCandidate@206 }
+    <name not found> = ArrayList@223[1] { ResolutionCandidate@188 }
+    <name not found> = ArrayList@224[1] { ResolutionCandidate@185 }
+    <name not found> = ArrayList@225[1] { ResolutionCandidate@200 }
+    <name not found> = ArrayList@226[1] { ResolutionCandidate@212 }
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@194 }
+    <name not found> = ArrayList@228[1] { ResolutionCandidate@203 }
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@191 }
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@176 }
+    <name not found> = ArrayList@231[4] { ResolutionCandidate@215, ResolutionCandidate@216, ResolutionCandidate@217, ... }
+    <name not found> = EmptyList@149[empty]
+    <name not found> = EmptyList@149[empty]
     <name not found> = EmptyList@149[empty]
     <name not found> = EmptyList@149[empty]
     <name not found> = EmptyList@149[empty]
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/objectArray.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/methodCall/objectArray.lazy.log
index 6de914e9836..73bf0c06643 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/objectArray.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/methodCall/objectArray.lazy.log
@@ -96,71 +96,74 @@ LazyJavaPackageFragment@46['p'] {
 
 ResolutionTaskHolder@69 {
     <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
     <name not found> = EmptyList@58[empty]
     <name not found> = EmptyList@58[empty]
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
     <name not found> = EmptyList@58[empty]
     <name not found> = EmptyList@58[empty]
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
     <name not found> = EmptyList@58[empty]
     <name not found> = EmptyList@58[empty]
+}
+
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
     <name not found> = EmptyList@58[empty]
     <name not found> = EmptyList@58[empty]
 }
 
 ResolutionTaskHolder@81 {
     <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
 }
 
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
+}
+
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
 }
 
 ResolutionTaskHolder@93 {
     <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
 }
 
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
 }
 
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
 }
 
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
+null {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@95 }
+    <name not found> = EmptyList@58[empty]
+    <name not found> = EmptyList@58[empty]
+    <name not found> = EmptyList@58[empty]
+    <name not found> = EmptyList@58[empty]
+    <name not found> = EmptyList@58[empty]
+    <name not found> = EmptyList@58[empty]
+    <name not found> = EmptyList@58[empty]
+    <name not found> = EmptyList@58[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/overloadingForSubclass.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/methodCall/overloadingForSubclass.lazy.log
index d2b63921495..59f23c560e2 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/overloadingForSubclass.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/methodCall/overloadingForSubclass.lazy.log
@@ -186,24 +186,27 @@ LazyJavaPackageFragment@97['p'] {
 
 ResolutionTaskHolder@123 {
     <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@125 }
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
 }
 
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@129 }
+ResolutionTaskHolder@126 {
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
 }
 
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@133 }
+ResolutionTaskHolder@129 {
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
 }
 
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[2] { ResolutionCandidate@137, ResolutionCandidate@138 }
-    <name not found> = ArrayList@139[2] { ResolutionCandidate@137, ResolutionCandidate@138 }
+ResolutionTaskHolder@132 {
+    <name not found> = ArrayList@133[2] { ResolutionCandidate@134, ResolutionCandidate@135 }
+}
+
+null {
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@131 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@125 }
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@128 }
+    <name not found> = ArrayList@139[2] { ResolutionCandidate@134, ResolutionCandidate@135 }
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/sam.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/methodCall/sam.lazy.log
index 7fee9c14e3d..3c065be9e48 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/sam.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/methodCall/sam.lazy.log
@@ -157,7 +157,14 @@ LazyJavaTypeParameterResolver@88 {
 ResolutionTaskHolder@89 {
     <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
     <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[2] { ResolutionCandidate@91, ResolutionCandidate@93 }
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+}
+
+ResolutionTaskHolder@94 {
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
@@ -168,12 +175,8 @@ ResolutionTaskHolder@89 {
     <name not found> = EmptyList@12[empty]
 }
 
-ResolutionTaskHolder@95 {
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
+null {
+    <name not found> = ArrayList@95[2] { ResolutionCandidate@91, ResolutionCandidate@93 }
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/singleton.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/methodCall/singleton.lazy.log
index 61b91b65db1..242f66530c3 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/singleton.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/methodCall/singleton.lazy.log
@@ -59,14 +59,14 @@ LazyJavaClassifierType@37['T'] {
 
 LazyJavaClassifierType@40['T'] {
     arguments = ArrayList@41[empty]
-    classifier = JavaTypeParameterImpl@39['T']
+    classifier = JavaTypeParameterImpl@32['T']
     nullable = 'true': Boolean@28
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@33
 }
 
 LazyJavaClassifierType@42['T'] {
     arguments = ArrayList@43[empty]
-    classifier = JavaTypeParameterImpl@32['T']
+    classifier = JavaTypeParameterImpl@39['T']
     nullable = 'true': Boolean@28
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@33
 }
@@ -132,35 +132,81 @@ LazyJavaTypeParameterResolver@81 {
 
 ResolutionTaskHolder@83 {
     <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
 }
 
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
 }
 
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
+}
+
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
 }
 
 ResolutionTaskHolder@95 {
     <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
+}
+
+ResolutionTaskHolder@98 {
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
 }
 
 ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+}
+
+ResolutionTaskHolder@100 {
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+}
+
+ResolutionTaskHolder@101 {
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+}
+
+ResolutionTaskHolder@102 {
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
 }
 
 ResolutionTaskHolder@103 {
@@ -172,63 +218,20 @@ ResolutionTaskHolder@103 {
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
-
-ResolutionTaskHolder@108 {
+null {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@85 }
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/string.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/methodCall/string.lazy.log
index d452cd13d0a..2878dba765d 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/string.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/methodCall/string.lazy.log
@@ -78,37 +78,40 @@ LazyJavaPackageFragment@37['p'] {
 
 ResolutionTaskHolder@54 {
     <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
 }
 
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
+}
+
 ResolutionTaskHolder@66 {
     <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+null {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@65 }
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/visitor.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/methodCall/visitor.lazy.log
index da48808fd52..72d2846ff11 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/visitor.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/methodCall/visitor.lazy.log
@@ -47,14 +47,14 @@ LazyJavaClassifierType@27['D'] {
 
 LazyJavaClassifierType@30['D'] {
     arguments = ArrayList@31[empty]
-    classifier = JavaTypeParameterImpl@29['D']
+    classifier = JavaTypeParameterImpl@21['D']
     nullable = 'true': Boolean@32
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@23
 }
 
 LazyJavaClassifierType@33['D'] {
     arguments = ArrayList@34[empty]
-    classifier = JavaTypeParameterImpl@21['D']
+    classifier = JavaTypeParameterImpl@29['D']
     nullable = 'true': Boolean@32
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@23
 }
@@ -152,13 +152,13 @@ LazyJavaPackageFragment@76['p'] {
     classes('Visitor': Name@85) = LazyJavaClassDescriptor@11['Visitor'] // through LazyPackageFragmentScopeForJavaPackage@95
 }
 
-LazyJavaTypeParameterDescriptor@17['D'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@96
+LazyJavaTypeParameterDescriptor@96['D'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@23
     upperBounds = LinkedHashSet@97[1] { NullableType@98 }
 }
 
-LazyJavaTypeParameterDescriptor@99['D'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@23
+LazyJavaTypeParameterDescriptor@17['D'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
     upperBounds = LinkedHashSet@100[1] { NullableType@101 }
 }
 
@@ -167,20 +167,23 @@ LazyJavaTypeParameterResolver@102 {
 }
 
 LazyJavaTypeParameterResolver@104 {
-    resolve(JavaTypeParameterImpl@105['D']) = LazyJavaTypeParameterDescriptor@99['D']
+    resolve(JavaTypeParameterImpl@105['D']) = LazyJavaTypeParameterDescriptor@96['D']
 }
 
 ResolutionTaskHolder@106 {
     <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
 }
 
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
 }
 
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
+}
+
+null {
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@108 }
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullableTypeArgument.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/nullableTypeArgument.lazy.log
index 6b2b287e25e..3111c09e1a1 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullableTypeArgument.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullableTypeArgument.lazy.log
@@ -140,35 +140,35 @@ LazyJavaClassifierType@106['E'] {
     arguments = ArrayList@107[empty]
     classifier = JavaTypeParameterImpl@108['E']
     nullable = 'false': Boolean@80
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@109
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
 }
 
-LazyJavaClassifierType@110['E'] {
-    arguments = ArrayList@111[empty]
-    classifier = JavaTypeParameterImpl@112['E']
+LazyJavaClassifierType@109['E'] {
+    arguments = ArrayList@110[empty]
+    classifier = JavaTypeParameterImpl@111['E']
     nullable = 'false': Boolean@80
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
 }
 
-LazyJavaClassifierType@113['E'] {
-    arguments = ArrayList@114[empty]
-    classifier = JavaTypeParameterImpl@115['E']
+LazyJavaClassifierType@112['E'] {
+    arguments = ArrayList@113[empty]
+    classifier = JavaTypeParameterImpl@114['E']
     nullable = 'false': Boolean@80
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@109
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@115
 }
 
 LazyJavaClassifierType@116['E'] {
     arguments = ArrayList@117[empty]
     classifier = JavaTypeParameterImpl@118['E']
     nullable = 'false': Boolean@80
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@115
 }
 
 LazyJavaClassifierType@119['E'] {
     arguments = ArrayList@120[empty]
     classifier = JavaTypeParameterImpl@121['E']
     nullable = 'false': Boolean@80
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@109
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@115
 }
 
 LazyJavaClassifierType@122['E'] {
@@ -196,7 +196,7 @@ LazyJavaClassifierType@131['E'] {
     arguments = ArrayList@132[empty]
     classifier = JavaTypeParameterImpl@133['E']
     nullable = 'false': Boolean@80
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
 }
 
 LazyJavaClassifierType@134['E'] {
@@ -208,86 +208,86 @@ LazyJavaClassifierType@134['E'] {
 
 LazyJavaClassifierType@136['E'] {
     arguments = ArrayList@137[empty]
-    classifier = JavaTypeParameterImpl@108['E']
+    classifier = JavaTypeParameterImpl@118['E']
     nullable = 'true': Boolean@86
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@109
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@115
 }
 
 LazyJavaClassifierType@138['E'] {
     arguments = ArrayList@139[empty]
-    classifier = JavaTypeParameterImpl@118['E']
+    classifier = JavaTypeParameterImpl@102['E']
     nullable = 'true': Boolean@86
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
 }
 
 LazyJavaClassifierType@140['E'] {
     arguments = ArrayList@141[empty]
-    classifier = JavaTypeParameterImpl@105['E']
+    classifier = JavaTypeParameterImpl@133['E']
     nullable = 'true': Boolean@86
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
 }
 
 LazyJavaClassifierType@142['E'] {
     arguments = ArrayList@143[empty]
-    classifier = JavaTypeParameterImpl@112['E']
+    classifier = JavaTypeParameterImpl@111['E']
     nullable = 'true': Boolean@86
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
 }
 
 LazyJavaClassifierType@144['E'] {
     arguments = ArrayList@145[empty]
-    classifier = JavaTypeParameterImpl@124['E']
-    nullable = 'true': Boolean@86
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
-}
-
-LazyJavaClassifierType@146['E'] {
-    arguments = ArrayList@147[empty]
-    classifier = JavaTypeParameterImpl@133['E']
-    nullable = 'true': Boolean@86
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
-}
-
-LazyJavaClassifierType@148['E'] {
-    arguments = ArrayList@149[empty]
-    classifier = JavaTypeParameterImpl@115['E']
-    nullable = 'true': Boolean@86
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@109
-}
-
-LazyJavaClassifierType@150['E'] {
-    arguments = ArrayList@151[empty]
-    classifier = JavaTypeParameterImpl@102['E']
-    nullable = 'true': Boolean@86
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
-}
-
-LazyJavaClassifierType@152['E'] {
-    arguments = ArrayList@153[empty]
     classifier = JavaTypeParameterImpl@130['E']
     nullable = 'true': Boolean@86
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
 }
 
-LazyJavaClassifierType@154['E'] {
-    arguments = ArrayList@155[empty]
+LazyJavaClassifierType@146['E'] {
+    arguments = ArrayList@147[empty]
+    classifier = JavaTypeParameterImpl@114['E']
+    nullable = 'true': Boolean@86
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@115
+}
+
+LazyJavaClassifierType@148['E'] {
+    arguments = ArrayList@149[empty]
     classifier = JavaTypeParameterImpl@94['E']
     nullable = 'true': Boolean@86
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
 }
 
-LazyJavaClassifierType@156['E'] {
-    arguments = ArrayList@157[empty]
+LazyJavaClassifierType@150['E'] {
+    arguments = ArrayList@151[empty]
     classifier = JavaTypeParameterImpl@121['E']
     nullable = 'true': Boolean@86
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@109
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@115
+}
+
+LazyJavaClassifierType@152['E'] {
+    arguments = ArrayList@153[empty]
+    classifier = JavaTypeParameterImpl@124['E']
+    nullable = 'true': Boolean@86
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
+}
+
+LazyJavaClassifierType@154['E'] {
+    arguments = ArrayList@155[empty]
+    classifier = JavaTypeParameterImpl@108['E']
+    nullable = 'true': Boolean@86
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
+}
+
+LazyJavaClassifierType@156['E'] {
+    arguments = ArrayList@157[empty]
+    classifier = JavaTypeParameterImpl@98['E']
+    nullable = 'true': Boolean@86
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
 }
 
 LazyJavaClassifierType@158['E'] {
     arguments = ArrayList@159[empty]
-    classifier = JavaTypeParameterImpl@98['E']
+    classifier = JavaTypeParameterImpl@105['E']
     nullable = 'true': Boolean@86
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
 }
 
 LazyJavaClassifierType@160['Iterator<E>'] {
@@ -316,7 +316,7 @@ LazyJavaClassifierType@171['Iterator<E>'] {
 
 LazyJavaClassifierType@176['Iterator<E>'] {
     arguments = ArrayList@177[1] { TypeProjectionImpl@178 }
-    classifier = JavaClassImpl@174['Iterator']
+    classifier = JavaClassImpl@169['Iterator']
     memberScope = SubstitutingScope@179
     nullable = 'true': Boolean@86
     typeConstructor = DeserializedClassTypeConstructor@180
@@ -324,7 +324,7 @@ LazyJavaClassifierType@176['Iterator<E>'] {
 
 LazyJavaClassifierType@181['Iterator<E>'] {
     arguments = ArrayList@182[1] { TypeProjectionImpl@183 }
-    classifier = JavaClassImpl@163['Iterator']
+    classifier = JavaClassImpl@174['Iterator']
     memberScope = SubstitutingScope@184
     nullable = 'true': Boolean@86
     typeConstructor = DeserializedClassTypeConstructor@180
@@ -332,7 +332,7 @@ LazyJavaClassifierType@181['Iterator<E>'] {
 
 LazyJavaClassifierType@185['Iterator<E>'] {
     arguments = ArrayList@186[1] { TypeProjectionImpl@187 }
-    classifier = JavaClassImpl@169['Iterator']
+    classifier = JavaClassImpl@163['Iterator']
     memberScope = SubstitutingScope@188
     nullable = 'true': Boolean@86
     typeConstructor = DeserializedClassTypeConstructor@180
@@ -434,16 +434,16 @@ LazyJavaPackageFragment@222['util'] {
     memberIndex = computeMemberIndex$1@248 // through LazyPackageFragmentScopeForJavaPackage@246
 }
 
-LazyJavaTypeParameterDescriptor@47['E'] {
+LazyJavaTypeParameterDescriptor@43['E'] {
     defaultType = JetTypeImpl@249['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@115
     upperBounds = LinkedHashSet@250[1] { NullableType@251 }
     upperBoundsAsType = NullableType@251
 }
 
-LazyJavaTypeParameterDescriptor@43['E'] {
+LazyJavaTypeParameterDescriptor@47['E'] {
     defaultType = JetTypeImpl@252['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@109
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
     upperBounds = LinkedHashSet@253[1] { NullableType@254 }
     upperBoundsAsType = NullableType@254
 }
@@ -459,11 +459,11 @@ LazyJavaTypeParameterResolver@258 {
 }
 
 LazyJavaTypeParameterResolver@260 {
-    resolve(JavaTypeParameterImpl@261['E']) = LazyJavaTypeParameterDescriptor@47['E']
+    resolve(JavaTypeParameterImpl@261['E']) = LazyJavaTypeParameterDescriptor@52['E']
 }
 
 LazyJavaTypeParameterResolver@262 {
-    resolve(JavaTypeParameterImpl@263['E']) = LazyJavaTypeParameterDescriptor@52['E']
+    resolve(JavaTypeParameterImpl@263['E']) = LazyJavaTypeParameterDescriptor@47['E']
 }
 
 LazyJavaTypeParameterResolver@264 {
@@ -471,7 +471,7 @@ LazyJavaTypeParameterResolver@264 {
 }
 
 LazyJavaTypeParameterResolver@265 {
-    resolve(JavaTypeParameterImpl@127['E']) = null
+    resolve(JavaTypeParameterImpl@124['E']) = null
 }
 
 LazyJavaTypeParameterResolver@266 {
@@ -480,9 +480,6 @@ LazyJavaTypeParameterResolver@266 {
 
 ResolutionTaskHolder@267 {
     <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
-    <name not found> = ArrayList@270[1] { ResolutionCandidate@269 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
@@ -496,34 +493,40 @@ ResolutionTaskHolder@267 {
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@271 {
-    <name not found> = ArrayList@272[1] { ResolutionCandidate@273 }
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@273 }
+ResolutionTaskHolder@270 {
+    <name not found> = ArrayList@271[1] { ResolutionCandidate@272 }
 }
 
-ResolutionTaskHolder@275 {
-    <name not found> = ArrayList@276[1] { ResolutionCandidate@277 }
-    <name not found> = ArrayList@278[1] { ResolutionCandidate@277 }
+ResolutionTaskHolder@273 {
+    <name not found> = ArrayList@274[1] { ResolutionCandidate@275 }
+}
+
+ResolutionTaskHolder@276 {
+    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
 }
 
 ResolutionTaskHolder@279 {
     <name not found> = ArrayList@280[1] { ResolutionCandidate@281 }
-    <name not found> = ArrayList@282[1] { ResolutionCandidate@281 }
 }
 
-ResolutionTaskHolder@283 {
-    <name not found> = ArrayList@284[1] { ResolutionCandidate@285 }
-    <name not found> = ArrayList@286[1] { ResolutionCandidate@285 }
+ResolutionTaskHolder@282 {
+    <name not found> = ArrayList@283[1] { ResolutionCandidate@284 }
 }
 
-ResolutionTaskHolder@287 {
-    <name not found> = ArrayList@288[1] { ResolutionCandidate@289 }
-    <name not found> = ArrayList@290[1] { ResolutionCandidate@289 }
+ResolutionTaskHolder@285 {
+    <name not found> = ArrayList@286[3] { ResolutionCandidate@287, ResolutionCandidate@288, ResolutionCandidate@289 }
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@291 {
-    <name not found> = ArrayList@292[3] { ResolutionCandidate@293, ResolutionCandidate@294, ResolutionCandidate@295 }
-    <name not found> = ArrayList@296[3] { ResolutionCandidate@293, ResolutionCandidate@294, ResolutionCandidate@295 }
+null {
+    <name not found> = ArrayList@290[1] { ResolutionCandidate@275 }
+    <name not found> = ArrayList@291[1] { ResolutionCandidate@272 }
+    <name not found> = ArrayList@292[1] { ResolutionCandidate@278 }
+    <name not found> = ArrayList@293[1] { ResolutionCandidate@284 }
+    <name not found> = ArrayList@294[1] { ResolutionCandidate@281 }
+    <name not found> = ArrayList@295[1] { ResolutionCandidate@269 }
+    <name not found> = ArrayList@296[3] { ResolutionCandidate@287, ResolutionCandidate@288, ResolutionCandidate@289 }
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
diff --git a/compiler/testData/diagnostics/tests/platformTypes/override.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/override.lazy.log
index 4799841f9b9..36dc1216d5e 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/override.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/override.lazy.log
@@ -67,14 +67,14 @@ LazyJavaClassifierType@42['String'] {
 
 LazyJavaClassifierType@45['String'] {
     arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@44['String']
+    classifier = JavaClassImpl@38['String']
     nullable = 'true': Boolean@47
     typeConstructor = DeserializedClassTypeConstructor@41
 }
 
 LazyJavaClassifierType@48['String'] {
     arguments = ArrayList@49[empty]
-    classifier = JavaClassImpl@38['String']
+    classifier = JavaClassImpl@44['String']
     nullable = 'true': Boolean@47
     typeConstructor = DeserializedClassTypeConstructor@41
 }
@@ -123,39 +123,42 @@ LazyJavaPackageFragment@61['p'] {
 
 ResolutionTaskHolder@78 {
     <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
 }
 
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
 }
 
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
+}
+
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
 }
 
 ResolutionTaskHolder@90 {
     <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
 }
 
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
 }
 
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
+null {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@86 }
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/safeCall.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/safeCall.lazy.log
index 8049121b9ae..21741c2f01b 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/safeCall.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/safeCall.lazy.log
@@ -114,34 +114,37 @@ LazyJavaPackageFragment@54['p'] {
 
 ResolutionTaskHolder@86 {
     <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
     <name not found> = EmptyList@74[empty]
     <name not found> = EmptyList@74[empty]
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
+}
+
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
 }
 
 ResolutionTaskHolder@98 {
     <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
 }
 
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
 }
 
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
+null {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@100 }
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/samConstructor.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/samConstructor.lazy.log
index a6d59c07614..01ae7e7a077 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/samConstructor.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/samConstructor.lazy.log
@@ -74,14 +74,14 @@ LazyJavaClassifierType@62['Integer'] {
 
 LazyJavaClassifierType@65['Integer'] {
     arguments = ArrayList@66[empty]
-    classifier = JavaClassImpl@64['Integer']
+    classifier = JavaClassImpl@59['Integer']
     nullable = 'true': Boolean@56
     typeConstructor = DeserializedClassTypeConstructor@61
 }
 
 LazyJavaClassifierType@67['Integer'] {
     arguments = ArrayList@68[empty]
-    classifier = JavaClassImpl@59['Integer']
+    classifier = JavaClassImpl@64['Integer']
     nullable = 'true': Boolean@56
     typeConstructor = DeserializedClassTypeConstructor@61
 }
@@ -228,15 +228,11 @@ LazyJavaTypeParameterResolver@143 {
 }
 
 LazyJavaTypeParameterResolver@144 {
-    resolve(JavaTypeParameterImpl@83['T']) = null
+    resolve(JavaTypeParameterImpl@80['T']) = null
 }
 
 ResolutionTaskHolder@145 {
     <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@147 }
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
@@ -245,33 +241,25 @@ ResolutionTaskHolder@145 {
     <name not found> = EmptyList@12[empty]
 }
 
-ResolutionTaskHolder@149 {
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@151 }
+ResolutionTaskHolder@148 {
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
 }
 
-ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@155 }
+ResolutionTaskHolder@151 {
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
+}
+
+ResolutionTaskHolder@154 {
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
 }
 
 ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@160[2] { ResolutionCandidate@159, ResolutionCandidate@161 }
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
+    <name not found> = ArrayList@158[8] { ResolutionCandidate@159, ResolutionCandidate@160, ResolutionCandidate@161, ... }
 }
 
 ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[8] { ResolutionCandidate@164, ResolutionCandidate@165, ResolutionCandidate@166, ... }
-    <name not found> = ArrayList@167[8] { ResolutionCandidate@164, ResolutionCandidate@165, ResolutionCandidate@166, ... }
-}
-
-ResolutionTaskHolder@168 {
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
@@ -281,3 +269,18 @@ ResolutionTaskHolder@168 {
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
 }
+
+null {
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@147 }
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@156 }
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@153 }
+    <name not found> = ArrayList@166[2] { ResolutionCandidate@150, ResolutionCandidate@167 }
+    <name not found> = ArrayList@168[8] { ResolutionCandidate@159, ResolutionCandidate@160, ResolutionCandidate@161, ... }
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/supertypeTypeArguments.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/supertypeTypeArguments.lazy.log
index 1bbe4c3e0a0..42965029d4d 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/supertypeTypeArguments.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/supertypeTypeArguments.lazy.log
@@ -452,7 +452,7 @@ LazyJavaClassifierType@424['Entry<K, V>'] {
 
 LazyJavaClassifierType@430['Entry<K, V>'] {
     arguments = ArrayList@431[2] { TypeProjectionImpl@432, TypeProjectionImpl@433 }
-    classifier = JavaClassImpl@392['Entry']
+    classifier = JavaClassImpl@349['Entry']
     memberScope = SubstitutingScope@434
     nullable = 'true': Boolean@324
     typeConstructor = DeserializedClassTypeConstructor@435
@@ -460,7 +460,7 @@ LazyJavaClassifierType@430['Entry<K, V>'] {
 
 LazyJavaClassifierType@436['Entry<K, V>'] {
     arguments = ArrayList@437[2] { TypeProjectionImpl@438, TypeProjectionImpl@439 }
-    classifier = JavaClassImpl@368['Entry']
+    classifier = JavaClassImpl@356['Entry']
     memberScope = SubstitutingScope@440
     nullable = 'true': Boolean@324
     typeConstructor = DeserializedClassTypeConstructor@435
@@ -468,7 +468,7 @@ LazyJavaClassifierType@436['Entry<K, V>'] {
 
 LazyJavaClassifierType@441['Entry<K, V>'] {
     arguments = ArrayList@442[2] { TypeProjectionImpl@443, TypeProjectionImpl@444 }
-    classifier = JavaClassImpl@356['Entry']
+    classifier = JavaClassImpl@398['Entry']
     memberScope = SubstitutingScope@445
     nullable = 'true': Boolean@324
     typeConstructor = DeserializedClassTypeConstructor@435
@@ -476,7 +476,7 @@ LazyJavaClassifierType@441['Entry<K, V>'] {
 
 LazyJavaClassifierType@446['Entry<K, V>'] {
     arguments = ArrayList@447[2] { TypeProjectionImpl@448, TypeProjectionImpl@449 }
-    classifier = JavaClassImpl@380['Entry']
+    classifier = JavaClassImpl@362['Entry']
     memberScope = SubstitutingScope@450
     nullable = 'true': Boolean@324
     typeConstructor = DeserializedClassTypeConstructor@435
@@ -492,7 +492,7 @@ LazyJavaClassifierType@451['Entry<K, V>'] {
 
 LazyJavaClassifierType@456['Entry<K, V>'] {
     arguments = ArrayList@457[2] { TypeProjectionImpl@458, TypeProjectionImpl@459 }
-    classifier = JavaClassImpl@349['Entry']
+    classifier = JavaClassImpl@380['Entry']
     memberScope = SubstitutingScope@460
     nullable = 'true': Boolean@324
     typeConstructor = DeserializedClassTypeConstructor@435
@@ -500,7 +500,7 @@ LazyJavaClassifierType@456['Entry<K, V>'] {
 
 LazyJavaClassifierType@461['Entry<K, V>'] {
     arguments = ArrayList@462[2] { TypeProjectionImpl@463, TypeProjectionImpl@464 }
-    classifier = JavaClassImpl@404['Entry']
+    classifier = JavaClassImpl@386['Entry']
     memberScope = SubstitutingScope@465
     nullable = 'true': Boolean@324
     typeConstructor = DeserializedClassTypeConstructor@435
@@ -508,7 +508,7 @@ LazyJavaClassifierType@461['Entry<K, V>'] {
 
 LazyJavaClassifierType@466['Entry<K, V>'] {
     arguments = ArrayList@467[2] { TypeProjectionImpl@468, TypeProjectionImpl@469 }
-    classifier = JavaClassImpl@398['Entry']
+    classifier = JavaClassImpl@368['Entry']
     memberScope = SubstitutingScope@470
     nullable = 'true': Boolean@324
     typeConstructor = DeserializedClassTypeConstructor@435
@@ -516,7 +516,7 @@ LazyJavaClassifierType@466['Entry<K, V>'] {
 
 LazyJavaClassifierType@471['Entry<K, V>'] {
     arguments = ArrayList@472[2] { TypeProjectionImpl@473, TypeProjectionImpl@474 }
-    classifier = JavaClassImpl@362['Entry']
+    classifier = JavaClassImpl@404['Entry']
     memberScope = SubstitutingScope@475
     nullable = 'true': Boolean@324
     typeConstructor = DeserializedClassTypeConstructor@435
@@ -524,7 +524,7 @@ LazyJavaClassifierType@471['Entry<K, V>'] {
 
 LazyJavaClassifierType@476['Entry<K, V>'] {
     arguments = ArrayList@477[2] { TypeProjectionImpl@478, TypeProjectionImpl@479 }
-    classifier = JavaClassImpl@386['Entry']
+    classifier = JavaClassImpl@392['Entry']
     memberScope = SubstitutingScope@480
     nullable = 'true': Boolean@324
     typeConstructor = DeserializedClassTypeConstructor@435
@@ -532,7 +532,7 @@ LazyJavaClassifierType@476['Entry<K, V>'] {
 
 LazyJavaClassifierType@481['Entry<K, V>'] {
     arguments = ArrayList@482[2] { TypeProjectionImpl@483, TypeProjectionImpl@484 }
-    classifier = JavaClassImpl@428['Entry']
+    classifier = JavaClassImpl@416['Entry']
     memberScope = SubstitutingScope@485
     nullable = 'true': Boolean@324
     typeConstructor = LazyJavaClassTypeConstructor@106['Entry']
@@ -540,7 +540,7 @@ LazyJavaClassifierType@481['Entry<K, V>'] {
 
 LazyJavaClassifierType@486['Entry<K, V>'] {
     arguments = ArrayList@487[2] { TypeProjectionImpl@488, TypeProjectionImpl@489 }
-    classifier = JavaClassImpl@416['Entry']
+    classifier = JavaClassImpl@410['Entry']
     memberScope = SubstitutingScope@490
     nullable = 'true': Boolean@324
     typeConstructor = LazyJavaClassTypeConstructor@106['Entry']
@@ -548,7 +548,7 @@ LazyJavaClassifierType@486['Entry<K, V>'] {
 
 LazyJavaClassifierType@491['Entry<K, V>'] {
     arguments = ArrayList@492[2] { TypeProjectionImpl@493, TypeProjectionImpl@494 }
-    classifier = JavaClassImpl@422['Entry']
+    classifier = JavaClassImpl@428['Entry']
     memberScope = SubstitutingScope@495
     nullable = 'true': Boolean@324
     typeConstructor = LazyJavaClassTypeConstructor@106['Entry']
@@ -556,7 +556,7 @@ LazyJavaClassifierType@491['Entry<K, V>'] {
 
 LazyJavaClassifierType@496['Entry<K, V>'] {
     arguments = ArrayList@497[2] { TypeProjectionImpl@498, TypeProjectionImpl@499 }
-    classifier = JavaClassImpl@410['Entry']
+    classifier = JavaClassImpl@422['Entry']
     memberScope = SubstitutingScope@500
     nullable = 'true': Boolean@324
     typeConstructor = LazyJavaClassTypeConstructor@106['Entry']
@@ -621,35 +621,35 @@ LazyJavaClassifierType@534['K'] {
     arguments = ArrayList@535[empty]
     classifier = JavaTypeParameterImpl@536['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
-LazyJavaClassifierType@537['K'] {
-    arguments = ArrayList@538[empty]
-    classifier = JavaTypeParameterImpl@539['K']
+LazyJavaClassifierType@538['K'] {
+    arguments = ArrayList@539[empty]
+    classifier = JavaTypeParameterImpl@540['K']
     nullable = 'false': Boolean@299
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
-LazyJavaClassifierType@540['K'] {
-    arguments = ArrayList@541[empty]
-    classifier = JavaTypeParameterImpl@542['K']
+LazyJavaClassifierType@541['K'] {
+    arguments = ArrayList@542[empty]
+    classifier = JavaTypeParameterImpl@543['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@543
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@544['K'] {
     arguments = ArrayList@545[empty]
     classifier = JavaTypeParameterImpl@546['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@543
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@547['K'] {
     arguments = ArrayList@548[empty]
     classifier = JavaTypeParameterImpl@549['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@550['K'] {
@@ -663,63 +663,63 @@ LazyJavaClassifierType@553['K'] {
     arguments = ArrayList@554[empty]
     classifier = JavaTypeParameterImpl@555['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@556['K'] {
     arguments = ArrayList@557[empty]
     classifier = JavaTypeParameterImpl@558['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@559['K'] {
     arguments = ArrayList@560[empty]
     classifier = JavaTypeParameterImpl@561['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@562['K'] {
     arguments = ArrayList@563[empty]
     classifier = JavaTypeParameterImpl@564['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@565['K'] {
     arguments = ArrayList@566[empty]
     classifier = JavaTypeParameterImpl@567['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@543
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@568['K'] {
     arguments = ArrayList@569[empty]
     classifier = JavaTypeParameterImpl@570['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@571['K'] {
     arguments = ArrayList@572[empty]
     classifier = JavaTypeParameterImpl@573['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@543
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@574['K'] {
     arguments = ArrayList@575[empty]
     classifier = JavaTypeParameterImpl@576['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@577['K'] {
     arguments = ArrayList@578[empty]
     classifier = JavaTypeParameterImpl@579['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@580['K'] {
@@ -733,28 +733,28 @@ LazyJavaClassifierType@583['K'] {
     arguments = ArrayList@584[empty]
     classifier = JavaTypeParameterImpl@585['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@543
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@586['K'] {
     arguments = ArrayList@587[empty]
     classifier = JavaTypeParameterImpl@588['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@589['K'] {
     arguments = ArrayList@590[empty]
     classifier = JavaTypeParameterImpl@591['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@592['K'] {
     arguments = ArrayList@593[empty]
     classifier = JavaTypeParameterImpl@594['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@595['K'] {
@@ -768,21 +768,21 @@ LazyJavaClassifierType@598['K'] {
     arguments = ArrayList@599[empty]
     classifier = JavaTypeParameterImpl@600['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@601['K'] {
     arguments = ArrayList@602[empty]
     classifier = JavaTypeParameterImpl@603['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@604['K'] {
     arguments = ArrayList@605[empty]
     classifier = JavaTypeParameterImpl@606['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@607['K'] {
@@ -796,77 +796,77 @@ LazyJavaClassifierType@610['K'] {
     arguments = ArrayList@611[empty]
     classifier = JavaTypeParameterImpl@612['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@543
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
 LazyJavaClassifierType@613['K'] {
     arguments = ArrayList@614[empty]
     classifier = JavaTypeParameterImpl@615['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@543
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@616['K'] {
     arguments = ArrayList@617[empty]
     classifier = JavaTypeParameterImpl@618['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@543
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
 LazyJavaClassifierType@619['K'] {
     arguments = ArrayList@620[empty]
     classifier = JavaTypeParameterImpl@621['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@622['K'] {
     arguments = ArrayList@623[empty]
     classifier = JavaTypeParameterImpl@624['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@625['K'] {
     arguments = ArrayList@626[empty]
     classifier = JavaTypeParameterImpl@627['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@543
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
 LazyJavaClassifierType@628['K'] {
     arguments = ArrayList@629[empty]
     classifier = JavaTypeParameterImpl@630['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@543
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
 LazyJavaClassifierType@631['K'] {
     arguments = ArrayList@632[empty]
     classifier = JavaTypeParameterImpl@633['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@634['K'] {
     arguments = ArrayList@635[empty]
     classifier = JavaTypeParameterImpl@636['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@637['K'] {
     arguments = ArrayList@638[empty]
     classifier = JavaTypeParameterImpl@639['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@640['K'] {
     arguments = ArrayList@641[empty]
     classifier = JavaTypeParameterImpl@642['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@643['K'] {
@@ -880,91 +880,91 @@ LazyJavaClassifierType@646['K'] {
     arguments = ArrayList@647[empty]
     classifier = JavaTypeParameterImpl@648['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@649['K'] {
     arguments = ArrayList@650[empty]
     classifier = JavaTypeParameterImpl@651['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@543
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@652['K'] {
     arguments = ArrayList@653[empty]
     classifier = JavaTypeParameterImpl@654['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@655['K'] {
     arguments = ArrayList@656[empty]
     classifier = JavaTypeParameterImpl@657['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@543
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@658['K'] {
     arguments = ArrayList@659[empty]
     classifier = JavaTypeParameterImpl@660['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@661['K'] {
     arguments = ArrayList@662[empty]
     classifier = JavaTypeParameterImpl@663['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@664['K'] {
     arguments = ArrayList@665[empty]
     classifier = JavaTypeParameterImpl@666['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@667['K'] {
     arguments = ArrayList@668[empty]
     classifier = JavaTypeParameterImpl@669['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@670['K'] {
     arguments = ArrayList@671[empty]
     classifier = JavaTypeParameterImpl@672['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@673['K'] {
     arguments = ArrayList@674[empty]
     classifier = JavaTypeParameterImpl@675['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@676['K'] {
     arguments = ArrayList@677[empty]
     classifier = JavaTypeParameterImpl@678['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@679['K'] {
     arguments = ArrayList@680[empty]
     classifier = JavaTypeParameterImpl@681['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@682['K'] {
     arguments = ArrayList@683[empty]
     classifier = JavaTypeParameterImpl@684['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@685['K'] {
@@ -976,196 +976,196 @@ LazyJavaClassifierType@685['K'] {
 
 LazyJavaClassifierType@688['K'] {
     arguments = ArrayList@689[empty]
-    classifier = JavaTypeParameterImpl@576['K']
+    classifier = JavaTypeParameterImpl@606['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@690['K'] {
     arguments = ArrayList@691[empty]
-    classifier = JavaTypeParameterImpl@684['K']
+    classifier = JavaTypeParameterImpl@573['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@692['K'] {
     arguments = ArrayList@693[empty]
-    classifier = JavaTypeParameterImpl@552['K']
+    classifier = JavaTypeParameterImpl@582['K']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
 LazyJavaClassifierType@694['K'] {
     arguments = ArrayList@695[empty]
-    classifier = JavaTypeParameterImpl@579['K']
+    classifier = JavaTypeParameterImpl@651['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@696['K'] {
     arguments = ArrayList@697[empty]
-    classifier = JavaTypeParameterImpl@591['K']
+    classifier = JavaTypeParameterImpl@657['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@698['K'] {
     arguments = ArrayList@699[empty]
-    classifier = JavaTypeParameterImpl@612['K']
+    classifier = JavaTypeParameterImpl@579['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@543
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@700['K'] {
     arguments = ArrayList@701[empty]
-    classifier = JavaTypeParameterImpl@549['K']
+    classifier = JavaTypeParameterImpl@536['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@702['K'] {
     arguments = ArrayList@703[empty]
-    classifier = JavaTypeParameterImpl@627['K']
+    classifier = JavaTypeParameterImpl@585['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@543
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@704['K'] {
     arguments = ArrayList@705[empty]
-    classifier = JavaTypeParameterImpl@615['K']
+    classifier = JavaTypeParameterImpl@588['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@543
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@706['K'] {
     arguments = ArrayList@707[empty]
-    classifier = JavaTypeParameterImpl@585['K']
+    classifier = JavaTypeParameterImpl@561['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@543
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@708['K'] {
     arguments = ArrayList@709[empty]
-    classifier = JavaTypeParameterImpl@645['K']
+    classifier = JavaTypeParameterImpl@591['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@710['K'] {
     arguments = ArrayList@711[empty]
-    classifier = JavaTypeParameterImpl@630['K']
+    classifier = JavaTypeParameterImpl@639['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@543
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@712['K'] {
     arguments = ArrayList@713[empty]
-    classifier = JavaTypeParameterImpl@666['K']
+    classifier = JavaTypeParameterImpl@570['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@714['K'] {
     arguments = ArrayList@715[empty]
-    classifier = JavaTypeParameterImpl@558['K']
+    classifier = JavaTypeParameterImpl@633['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@716['K'] {
     arguments = ArrayList@717[empty]
-    classifier = JavaTypeParameterImpl@570['K']
+    classifier = JavaTypeParameterImpl@597['K']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
 LazyJavaClassifierType@718['K'] {
     arguments = ArrayList@719[empty]
-    classifier = JavaTypeParameterImpl@654['K']
+    classifier = JavaTypeParameterImpl@648['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@720['K'] {
     arguments = ArrayList@721[empty]
-    classifier = JavaTypeParameterImpl@651['K']
+    classifier = JavaTypeParameterImpl@663['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@543
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@722['K'] {
     arguments = ArrayList@723[empty]
-    classifier = JavaTypeParameterImpl@603['K']
+    classifier = JavaTypeParameterImpl@624['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@724['K'] {
     arguments = ArrayList@725[empty]
-    classifier = JavaTypeParameterImpl@663['K']
+    classifier = JavaTypeParameterImpl@681['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@726['K'] {
     arguments = ArrayList@727[empty]
-    classifier = JavaTypeParameterImpl@624['K']
+    classifier = JavaTypeParameterImpl@552['K']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
 LazyJavaClassifierType@728['K'] {
     arguments = ArrayList@729[empty]
-    classifier = JavaTypeParameterImpl@546['K']
+    classifier = JavaTypeParameterImpl@600['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@543
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@730['K'] {
     arguments = ArrayList@731[empty]
-    classifier = JavaTypeParameterImpl@588['K']
+    classifier = JavaTypeParameterImpl@636['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@732['K'] {
     arguments = ArrayList@733[empty]
-    classifier = JavaTypeParameterImpl@567['K']
+    classifier = JavaTypeParameterImpl@532['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@543
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
 LazyJavaClassifierType@734['K'] {
     arguments = ArrayList@735[empty]
-    classifier = JavaTypeParameterImpl@633['K']
+    classifier = JavaTypeParameterImpl@642['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@736['K'] {
     arguments = ArrayList@737[empty]
-    classifier = JavaTypeParameterImpl@669['K']
+    classifier = JavaTypeParameterImpl@654['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@738['K'] {
     arguments = ArrayList@739[empty]
-    classifier = JavaTypeParameterImpl@582['K']
+    classifier = JavaTypeParameterImpl@594['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@740['K'] {
     arguments = ArrayList@741[empty]
-    classifier = JavaTypeParameterImpl@564['K']
+    classifier = JavaTypeParameterImpl@666['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@742['K'] {
     arguments = ArrayList@743[empty]
-    classifier = JavaTypeParameterImpl@621['K']
+    classifier = JavaTypeParameterImpl@687['K']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
@@ -1174,168 +1174,168 @@ LazyJavaClassifierType@744['K'] {
     arguments = ArrayList@745[empty]
     classifier = JavaTypeParameterImpl@555['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@746['K'] {
     arguments = ArrayList@747[empty]
-    classifier = JavaTypeParameterImpl@678['K']
+    classifier = JavaTypeParameterImpl@540['K']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
 LazyJavaClassifierType@748['K'] {
     arguments = ArrayList@749[empty]
-    classifier = JavaTypeParameterImpl@681['K']
+    classifier = JavaTypeParameterImpl@684['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@750['K'] {
     arguments = ArrayList@751[empty]
-    classifier = JavaTypeParameterImpl@594['K']
+    classifier = JavaTypeParameterImpl@612['K']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
 LazyJavaClassifierType@752['K'] {
     arguments = ArrayList@753[empty]
-    classifier = JavaTypeParameterImpl@648['K']
+    classifier = JavaTypeParameterImpl@660['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@754['K'] {
     arguments = ArrayList@755[empty]
-    classifier = JavaTypeParameterImpl@600['K']
+    classifier = JavaTypeParameterImpl@615['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@756['K'] {
     arguments = ArrayList@757[empty]
-    classifier = JavaTypeParameterImpl@606['K']
+    classifier = JavaTypeParameterImpl@546['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@758['K'] {
     arguments = ArrayList@759[empty]
-    classifier = JavaTypeParameterImpl@642['K']
+    classifier = JavaTypeParameterImpl@603['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@760['K'] {
     arguments = ArrayList@761[empty]
-    classifier = JavaTypeParameterImpl@660['K']
+    classifier = JavaTypeParameterImpl@549['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@762['K'] {
     arguments = ArrayList@763[empty]
-    classifier = JavaTypeParameterImpl@687['K']
+    classifier = JavaTypeParameterImpl@576['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@764['K'] {
     arguments = ArrayList@765[empty]
-    classifier = JavaTypeParameterImpl@539['K']
+    classifier = JavaTypeParameterImpl@567['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@766['K'] {
     arguments = ArrayList@767[empty]
-    classifier = JavaTypeParameterImpl@542['K']
+    classifier = JavaTypeParameterImpl@645['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@543
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
 LazyJavaClassifierType@768['K'] {
     arguments = ArrayList@769[empty]
-    classifier = JavaTypeParameterImpl@675['K']
+    classifier = JavaTypeParameterImpl@678['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@770['K'] {
     arguments = ArrayList@771[empty]
-    classifier = JavaTypeParameterImpl@609['K']
+    classifier = JavaTypeParameterImpl@558['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@772['K'] {
     arguments = ArrayList@773[empty]
-    classifier = JavaTypeParameterImpl@657['K']
+    classifier = JavaTypeParameterImpl@543['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@543
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@774['K'] {
     arguments = ArrayList@775[empty]
-    classifier = JavaTypeParameterImpl@618['K']
+    classifier = JavaTypeParameterImpl@672['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@543
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@776['K'] {
     arguments = ArrayList@777[empty]
-    classifier = JavaTypeParameterImpl@639['K']
+    classifier = JavaTypeParameterImpl@618['K']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
 LazyJavaClassifierType@778['K'] {
     arguments = ArrayList@779[empty]
-    classifier = JavaTypeParameterImpl@536['K']
+    classifier = JavaTypeParameterImpl@621['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@780['K'] {
     arguments = ArrayList@781[empty]
-    classifier = JavaTypeParameterImpl@561['K']
+    classifier = JavaTypeParameterImpl@609['K']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
 LazyJavaClassifierType@782['K'] {
     arguments = ArrayList@783[empty]
-    classifier = JavaTypeParameterImpl@672['K']
+    classifier = JavaTypeParameterImpl@564['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@784['K'] {
     arguments = ArrayList@785[empty]
-    classifier = JavaTypeParameterImpl@636['K']
+    classifier = JavaTypeParameterImpl@630['K']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
 LazyJavaClassifierType@786['K'] {
     arguments = ArrayList@787[empty]
-    classifier = JavaTypeParameterImpl@532['K']
+    classifier = JavaTypeParameterImpl@669['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@788['K'] {
     arguments = ArrayList@789[empty]
-    classifier = JavaTypeParameterImpl@573['K']
+    classifier = JavaTypeParameterImpl@627['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@543
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
 LazyJavaClassifierType@790['K'] {
     arguments = ArrayList@791[empty]
-    classifier = JavaTypeParameterImpl@597['K']
+    classifier = JavaTypeParameterImpl@675['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
 }
 
 LazyJavaClassifierType@792['Map<? extends K, ? extends V>'] {
@@ -1372,7 +1372,7 @@ LazyJavaClassifierType@811['Map<? extends K, ? extends V>'] {
 
 LazyJavaClassifierType@817['Map<? extends K, ? extends V>'] {
     arguments = ArrayList@818[2] { TypeProjectionImpl@819, TypeProjectionImpl@820 }
-    classifier = JavaClassImpl@815['Map']
+    classifier = JavaClassImpl@796['Map']
     memberScope = SubstitutingScope@821
     nullable = 'true': Boolean@324
     typeConstructor = DeserializedClassTypeConstructor@822
@@ -1388,7 +1388,7 @@ LazyJavaClassifierType@823['Map<? extends K, ? extends V>'] {
 
 LazyJavaClassifierType@828['Map<? extends K, ? extends V>'] {
     arguments = ArrayList@829[2] { TypeProjectionImpl@830, TypeProjectionImpl@831 }
-    classifier = JavaClassImpl@796['Map']
+    classifier = JavaClassImpl@815['Map']
     memberScope = SubstitutingScope@832
     nullable = 'true': Boolean@324
     typeConstructor = DeserializedClassTypeConstructor@822
@@ -1402,7 +1402,7 @@ LazyJavaClassifierType@833['Map<? extends K, ? extends V>'] {
     typeConstructor = DeserializedClassTypeConstructor@822
 }
 
-LazyJavaClassifierType@287['Map<K, V>'] {
+LazyJavaClassifierType@278['Map<K, V>'] {
     arguments = ArrayList@838[2] { TypeProjectionImpl@839, TypeProjectionImpl@840 }
     classifier = JavaClassImpl@841['Map']
     memberScope = SubstitutingScope@842
@@ -1410,7 +1410,7 @@ LazyJavaClassifierType@287['Map<K, V>'] {
     typeConstructor = DeserializedClassTypeConstructor@798
 }
 
-LazyJavaClassifierType@278['Map<K, V>'] {
+LazyJavaClassifierType@287['Map<K, V>'] {
     arguments = ArrayList@843[2] { TypeProjectionImpl@844, TypeProjectionImpl@845 }
     classifier = JavaClassImpl@846['Map']
     memberScope = SubstitutingScope@847
@@ -1540,7 +1540,7 @@ LazyJavaClassifierType@892['Object'] {
 
 LazyJavaClassifierType@895['Object'] {
     arguments = ArrayList@896[empty]
-    classifier = JavaClassImpl@870['Object']
+    classifier = JavaClassImpl@850['Object']
     memberScope = DeserializedClassMemberScope@851
     nullable = 'true': Boolean@324
     typeConstructor = DeserializedClassTypeConstructor@852
@@ -1548,7 +1548,7 @@ LazyJavaClassifierType@895['Object'] {
 
 LazyJavaClassifierType@897['Object'] {
     arguments = ArrayList@898[empty]
-    classifier = JavaClassImpl@861['Object']
+    classifier = JavaClassImpl@867['Object']
     memberScope = DeserializedClassMemberScope@851
     nullable = 'true': Boolean@324
     typeConstructor = DeserializedClassTypeConstructor@852
@@ -1556,7 +1556,7 @@ LazyJavaClassifierType@897['Object'] {
 
 LazyJavaClassifierType@899['Object'] {
     arguments = ArrayList@900[empty]
-    classifier = JavaClassImpl@867['Object']
+    classifier = JavaClassImpl@861['Object']
     memberScope = DeserializedClassMemberScope@851
     nullable = 'true': Boolean@324
     typeConstructor = DeserializedClassTypeConstructor@852
@@ -1564,7 +1564,7 @@ LazyJavaClassifierType@899['Object'] {
 
 LazyJavaClassifierType@901['Object'] {
     arguments = ArrayList@902[empty]
-    classifier = JavaClassImpl@885['Object']
+    classifier = JavaClassImpl@876['Object']
     memberScope = DeserializedClassMemberScope@851
     nullable = 'true': Boolean@324
     typeConstructor = DeserializedClassTypeConstructor@852
@@ -1572,7 +1572,7 @@ LazyJavaClassifierType@901['Object'] {
 
 LazyJavaClassifierType@903['Object'] {
     arguments = ArrayList@904[empty]
-    classifier = JavaClassImpl@882['Object']
+    classifier = JavaClassImpl@870['Object']
     memberScope = DeserializedClassMemberScope@851
     nullable = 'true': Boolean@324
     typeConstructor = DeserializedClassTypeConstructor@852
@@ -1580,7 +1580,7 @@ LazyJavaClassifierType@903['Object'] {
 
 LazyJavaClassifierType@905['Object'] {
     arguments = ArrayList@906[empty]
-    classifier = JavaClassImpl@873['Object']
+    classifier = JavaClassImpl@855['Object']
     memberScope = DeserializedClassMemberScope@851
     nullable = 'true': Boolean@324
     typeConstructor = DeserializedClassTypeConstructor@852
@@ -1588,7 +1588,7 @@ LazyJavaClassifierType@905['Object'] {
 
 LazyJavaClassifierType@907['Object'] {
     arguments = ArrayList@908[empty]
-    classifier = JavaClassImpl@864['Object']
+    classifier = JavaClassImpl@888['Object']
     memberScope = DeserializedClassMemberScope@851
     nullable = 'true': Boolean@324
     typeConstructor = DeserializedClassTypeConstructor@852
@@ -1596,7 +1596,7 @@ LazyJavaClassifierType@907['Object'] {
 
 LazyJavaClassifierType@909['Object'] {
     arguments = ArrayList@910[empty]
-    classifier = JavaClassImpl@850['Object']
+    classifier = JavaClassImpl@864['Object']
     memberScope = DeserializedClassMemberScope@851
     nullable = 'true': Boolean@324
     typeConstructor = DeserializedClassTypeConstructor@852
@@ -1604,7 +1604,7 @@ LazyJavaClassifierType@909['Object'] {
 
 LazyJavaClassifierType@911['Object'] {
     arguments = ArrayList@912[empty]
-    classifier = JavaClassImpl@891['Object']
+    classifier = JavaClassImpl@894['Object']
     memberScope = DeserializedClassMemberScope@851
     nullable = 'true': Boolean@324
     typeConstructor = DeserializedClassTypeConstructor@852
@@ -1612,7 +1612,7 @@ LazyJavaClassifierType@911['Object'] {
 
 LazyJavaClassifierType@913['Object'] {
     arguments = ArrayList@914[empty]
-    classifier = JavaClassImpl@858['Object']
+    classifier = JavaClassImpl@879['Object']
     memberScope = DeserializedClassMemberScope@851
     nullable = 'true': Boolean@324
     typeConstructor = DeserializedClassTypeConstructor@852
@@ -1620,7 +1620,7 @@ LazyJavaClassifierType@913['Object'] {
 
 LazyJavaClassifierType@915['Object'] {
     arguments = ArrayList@916[empty]
-    classifier = JavaClassImpl@879['Object']
+    classifier = JavaClassImpl@882['Object']
     memberScope = DeserializedClassMemberScope@851
     nullable = 'true': Boolean@324
     typeConstructor = DeserializedClassTypeConstructor@852
@@ -1628,7 +1628,7 @@ LazyJavaClassifierType@915['Object'] {
 
 LazyJavaClassifierType@917['Object'] {
     arguments = ArrayList@918[empty]
-    classifier = JavaClassImpl@876['Object']
+    classifier = JavaClassImpl@891['Object']
     memberScope = DeserializedClassMemberScope@851
     nullable = 'true': Boolean@324
     typeConstructor = DeserializedClassTypeConstructor@852
@@ -1636,7 +1636,7 @@ LazyJavaClassifierType@917['Object'] {
 
 LazyJavaClassifierType@919['Object'] {
     arguments = ArrayList@920[empty]
-    classifier = JavaClassImpl@888['Object']
+    classifier = JavaClassImpl@885['Object']
     memberScope = DeserializedClassMemberScope@851
     nullable = 'true': Boolean@324
     typeConstructor = DeserializedClassTypeConstructor@852
@@ -1644,7 +1644,7 @@ LazyJavaClassifierType@919['Object'] {
 
 LazyJavaClassifierType@921['Object'] {
     arguments = ArrayList@922[empty]
-    classifier = JavaClassImpl@855['Object']
+    classifier = JavaClassImpl@873['Object']
     memberScope = DeserializedClassMemberScope@851
     nullable = 'true': Boolean@324
     typeConstructor = DeserializedClassTypeConstructor@852
@@ -1652,7 +1652,7 @@ LazyJavaClassifierType@921['Object'] {
 
 LazyJavaClassifierType@923['Object'] {
     arguments = ArrayList@924[empty]
-    classifier = JavaClassImpl@894['Object']
+    classifier = JavaClassImpl@858['Object']
     memberScope = DeserializedClassMemberScope@851
     nullable = 'true': Boolean@324
     typeConstructor = DeserializedClassTypeConstructor@852
@@ -1742,7 +1742,7 @@ LazyJavaClassifierType@960['Set<Entry<K, V>>'] {
 
 LazyJavaClassifierType@965['Set<Entry<K, V>>'] {
     arguments = ArrayList@966[1] { TypeProjectionImpl@967 }
-    classifier = JavaClassImpl@953['Set']
+    classifier = JavaClassImpl@963['Set']
     memberScope = SubstitutingScope@968
     nullable = 'true': Boolean@324
     typeConstructor = DeserializedClassTypeConstructor@969
@@ -1750,7 +1750,7 @@ LazyJavaClassifierType@965['Set<Entry<K, V>>'] {
 
 LazyJavaClassifierType@970['Set<Entry<K, V>>'] {
     arguments = ArrayList@971[1] { TypeProjectionImpl@972 }
-    classifier = JavaClassImpl@947['Set']
+    classifier = JavaClassImpl@953['Set']
     memberScope = SubstitutingScope@973
     nullable = 'true': Boolean@324
     typeConstructor = DeserializedClassTypeConstructor@969
@@ -1758,7 +1758,7 @@ LazyJavaClassifierType@970['Set<Entry<K, V>>'] {
 
 LazyJavaClassifierType@974['Set<Entry<K, V>>'] {
     arguments = ArrayList@975[1] { TypeProjectionImpl@976 }
-    classifier = JavaClassImpl@963['Set']
+    classifier = JavaClassImpl@958['Set']
     memberScope = SubstitutingScope@977
     nullable = 'true': Boolean@324
     typeConstructor = DeserializedClassTypeConstructor@969
@@ -1766,7 +1766,7 @@ LazyJavaClassifierType@974['Set<Entry<K, V>>'] {
 
 LazyJavaClassifierType@978['Set<Entry<K, V>>'] {
     arguments = ArrayList@979[1] { TypeProjectionImpl@980 }
-    classifier = JavaClassImpl@958['Set']
+    classifier = JavaClassImpl@947['Set']
     memberScope = SubstitutingScope@981
     nullable = 'true': Boolean@324
     typeConstructor = DeserializedClassTypeConstructor@969
@@ -1798,7 +1798,7 @@ LazyJavaClassifierType@992['Set<K>'] {
 
 LazyJavaClassifierType@997['Set<K>'] {
     arguments = ArrayList@998[1] { TypeProjectionImpl@999 }
-    classifier = JavaClassImpl@985['Set']
+    classifier = JavaClassImpl@990['Set']
     memberScope = SubstitutingScope@1000
     nullable = 'true': Boolean@324
     typeConstructor = DeserializedClassTypeConstructor@969
@@ -1806,7 +1806,7 @@ LazyJavaClassifierType@997['Set<K>'] {
 
 LazyJavaClassifierType@1001['Set<K>'] {
     arguments = ArrayList@1002[1] { TypeProjectionImpl@1003 }
-    classifier = JavaClassImpl@990['Set']
+    classifier = JavaClassImpl@985['Set']
     memberScope = SubstitutingScope@1004
     nullable = 'true': Boolean@324
     typeConstructor = DeserializedClassTypeConstructor@969
@@ -1854,14 +1854,14 @@ LazyJavaClassifierType@1023['V'] {
     arguments = ArrayList@1024[empty]
     classifier = JavaTypeParameterImpl@1025['V']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
 }
 
-LazyJavaClassifierType@1026['V'] {
-    arguments = ArrayList@1027[empty]
-    classifier = JavaTypeParameterImpl@1028['V']
+LazyJavaClassifierType@1027['V'] {
+    arguments = ArrayList@1028[empty]
+    classifier = JavaTypeParameterImpl@1029['V']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1030['V'] {
@@ -1875,21 +1875,21 @@ LazyJavaClassifierType@1033['V'] {
     arguments = ArrayList@1034[empty]
     classifier = JavaTypeParameterImpl@1035['V']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1036['V'] {
     arguments = ArrayList@1037[empty]
     classifier = JavaTypeParameterImpl@1038['V']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
 }
 
 LazyJavaClassifierType@1039['V'] {
     arguments = ArrayList@1040[empty]
     classifier = JavaTypeParameterImpl@1041['V']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1042['V'] {
@@ -1910,7 +1910,7 @@ LazyJavaClassifierType@1048['V'] {
     arguments = ArrayList@1049[empty]
     classifier = JavaTypeParameterImpl@1050['V']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
 }
 
 LazyJavaClassifierType@1051['V'] {
@@ -1924,14 +1924,14 @@ LazyJavaClassifierType@1054['V'] {
     arguments = ArrayList@1055[empty]
     classifier = JavaTypeParameterImpl@1056['V']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1057['V'] {
     arguments = ArrayList@1058[empty]
     classifier = JavaTypeParameterImpl@1059['V']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1060['V'] {
@@ -1980,28 +1980,28 @@ LazyJavaClassifierType@1078['V'] {
     arguments = ArrayList@1079[empty]
     classifier = JavaTypeParameterImpl@1080['V']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
 }
 
 LazyJavaClassifierType@1081['V'] {
     arguments = ArrayList@1082[empty]
     classifier = JavaTypeParameterImpl@1083['V']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
 }
 
 LazyJavaClassifierType@1084['V'] {
     arguments = ArrayList@1085[empty]
     classifier = JavaTypeParameterImpl@1086['V']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
 }
 
 LazyJavaClassifierType@1087['V'] {
     arguments = ArrayList@1088[empty]
     classifier = JavaTypeParameterImpl@1089['V']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1090['V'] {
@@ -2022,7 +2022,7 @@ LazyJavaClassifierType@1096['V'] {
     arguments = ArrayList@1097[empty]
     classifier = JavaTypeParameterImpl@1098['V']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
 }
 
 LazyJavaClassifierType@1099['V'] {
@@ -2036,7 +2036,7 @@ LazyJavaClassifierType@1102['V'] {
     arguments = ArrayList@1103[empty]
     classifier = JavaTypeParameterImpl@1104['V']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
 }
 
 LazyJavaClassifierType@1105['V'] {
@@ -2064,14 +2064,14 @@ LazyJavaClassifierType@1114['V'] {
     arguments = ArrayList@1115[empty]
     classifier = JavaTypeParameterImpl@1116['V']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1117['V'] {
     arguments = ArrayList@1118[empty]
     classifier = JavaTypeParameterImpl@1119['V']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
 }
 
 LazyJavaClassifierType@1120['V'] {
@@ -2092,14 +2092,14 @@ LazyJavaClassifierType@1126['V'] {
     arguments = ArrayList@1127[empty]
     classifier = JavaTypeParameterImpl@1128['V']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1129['V'] {
     arguments = ArrayList@1130[empty]
     classifier = JavaTypeParameterImpl@1131['V']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1132['V'] {
@@ -2120,28 +2120,28 @@ LazyJavaClassifierType@1138['V'] {
     arguments = ArrayList@1139[empty]
     classifier = JavaTypeParameterImpl@1140['V']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
 }
 
 LazyJavaClassifierType@1141['V'] {
     arguments = ArrayList@1142[empty]
     classifier = JavaTypeParameterImpl@1143['V']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
 }
 
 LazyJavaClassifierType@1144['V'] {
     arguments = ArrayList@1145[empty]
     classifier = JavaTypeParameterImpl@1146['V']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
 }
 
 LazyJavaClassifierType@1147['V'] {
     arguments = ArrayList@1148[empty]
     classifier = JavaTypeParameterImpl@1149['V']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
 }
 
 LazyJavaClassifierType@1150['V'] {
@@ -2169,14 +2169,14 @@ LazyJavaClassifierType@1159['V'] {
     arguments = ArrayList@1160[empty]
     classifier = JavaTypeParameterImpl@1161['V']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
 }
 
 LazyJavaClassifierType@1162['V'] {
     arguments = ArrayList@1163[empty]
     classifier = JavaTypeParameterImpl@1164['V']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1165['V'] {
@@ -2211,14 +2211,14 @@ LazyJavaClassifierType@1177['V'] {
     arguments = ArrayList@1178[empty]
     classifier = JavaTypeParameterImpl@1179['V']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
 }
 
 LazyJavaClassifierType@1180['V'] {
     arguments = ArrayList@1181[empty]
     classifier = JavaTypeParameterImpl@1182['V']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1183['V'] {
@@ -2265,427 +2265,427 @@ LazyJavaClassifierType@1198['V'] {
 
 LazyJavaClassifierType@1201['V'] {
     arguments = ArrayList@1202[empty]
-    classifier = JavaTypeParameterImpl@1125['V']
+    classifier = JavaTypeParameterImpl@1074['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1203['V'] {
     arguments = ArrayList@1204[empty]
-    classifier = JavaTypeParameterImpl@1083['V']
+    classifier = JavaTypeParameterImpl@1182['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1205['V'] {
     arguments = ArrayList@1206[empty]
-    classifier = JavaTypeParameterImpl@1025['V']
+    classifier = JavaTypeParameterImpl@1065['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1207['V'] {
     arguments = ArrayList@1208[empty]
-    classifier = JavaTypeParameterImpl@1089['V']
+    classifier = JavaTypeParameterImpl@1035['V']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1209['V'] {
     arguments = ArrayList@1210[empty]
-    classifier = JavaTypeParameterImpl@1028['V']
+    classifier = JavaTypeParameterImpl@1137['V']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1211['V'] {
     arguments = ArrayList@1212[empty]
-    classifier = JavaTypeParameterImpl@1191['V']
+    classifier = JavaTypeParameterImpl@1022['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1213['V'] {
     arguments = ArrayList@1214[empty]
-    classifier = JavaTypeParameterImpl@1134['V']
+    classifier = JavaTypeParameterImpl@1200['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1215['V'] {
     arguments = ArrayList@1216[empty]
-    classifier = JavaTypeParameterImpl@1161['V']
+    classifier = JavaTypeParameterImpl@1086['V']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
 }
 
 LazyJavaClassifierType@1217['V'] {
     arguments = ArrayList@1218[empty]
-    classifier = JavaTypeParameterImpl@1128['V']
+    classifier = JavaTypeParameterImpl@1140['V']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
 }
 
 LazyJavaClassifierType@1219['V'] {
     arguments = ArrayList@1220[empty]
-    classifier = JavaTypeParameterImpl@1197['V']
+    classifier = JavaTypeParameterImpl@1077['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1221['V'] {
     arguments = ArrayList@1222[empty]
-    classifier = JavaTypeParameterImpl@1041['V']
+    classifier = JavaTypeParameterImpl@1146['V']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
 }
 
 LazyJavaClassifierType@1223['V'] {
     arguments = ArrayList@1224[empty]
-    classifier = JavaTypeParameterImpl@1035['V']
+    classifier = JavaTypeParameterImpl@1104['V']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
 }
 
 LazyJavaClassifierType@1225['V'] {
     arguments = ArrayList@1226[empty]
-    classifier = JavaTypeParameterImpl@1155['V']
+    classifier = JavaTypeParameterImpl@1194['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1227['V'] {
     arguments = ArrayList@1228[empty]
-    classifier = JavaTypeParameterImpl@1143['V']
+    classifier = JavaTypeParameterImpl@1164['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1229['V'] {
     arguments = ArrayList@1230[empty]
-    classifier = JavaTypeParameterImpl@1116['V']
+    classifier = JavaTypeParameterImpl@1185['V']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1231['V'] {
     arguments = ArrayList@1232[empty]
-    classifier = JavaTypeParameterImpl@1101['V']
+    classifier = JavaTypeParameterImpl@1110['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1233['V'] {
     arguments = ArrayList@1234[empty]
-    classifier = JavaTypeParameterImpl@1122['V']
+    classifier = JavaTypeParameterImpl@1062['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1235['V'] {
     arguments = ArrayList@1236[empty]
-    classifier = JavaTypeParameterImpl@1164['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
-}
-
-LazyJavaClassifierType@1237['V'] {
-    arguments = ArrayList@1238[empty]
-    classifier = JavaTypeParameterImpl@1104['V']
+    classifier = JavaTypeParameterImpl@1125['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
+LazyJavaClassifierType@1237['V'] {
+    arguments = ArrayList@1238[empty]
+    classifier = JavaTypeParameterImpl@1161['V']
+    nullable = 'true': Boolean@324
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
+}
+
 LazyJavaClassifierType@1239['V'] {
     arguments = ArrayList@1240[empty]
-    classifier = JavaTypeParameterImpl@1149['V']
+    classifier = JavaTypeParameterImpl@1197['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1241['V'] {
     arguments = ArrayList@1242[empty]
-    classifier = JavaTypeParameterImpl@1131['V']
+    classifier = JavaTypeParameterImpl@1032['V']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1243['V'] {
     arguments = ArrayList@1244[empty]
-    classifier = JavaTypeParameterImpl@1059['V']
+    classifier = JavaTypeParameterImpl@1047['V']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1245['V'] {
     arguments = ArrayList@1246[empty]
-    classifier = JavaTypeParameterImpl@1062['V']
+    classifier = JavaTypeParameterImpl@1191['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1247['V'] {
     arguments = ArrayList@1248[empty]
-    classifier = JavaTypeParameterImpl@1068['V']
+    classifier = JavaTypeParameterImpl@1128['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1249['V'] {
     arguments = ArrayList@1250[empty]
-    classifier = JavaTypeParameterImpl@1086['V']
+    classifier = JavaTypeParameterImpl@1173['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1251['V'] {
     arguments = ArrayList@1252[empty]
-    classifier = JavaTypeParameterImpl@1119['V']
+    classifier = JavaTypeParameterImpl@1149['V']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
 }
 
 LazyJavaClassifierType@1253['V'] {
     arguments = ArrayList@1254[empty]
-    classifier = JavaTypeParameterImpl@1022['V']
+    classifier = JavaTypeParameterImpl@1131['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1255['V'] {
     arguments = ArrayList@1256[empty]
-    classifier = JavaTypeParameterImpl@1185['V']
+    classifier = JavaTypeParameterImpl@1071['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1257['V'] {
     arguments = ArrayList@1258[empty]
-    classifier = JavaTypeParameterImpl@1137['V']
+    classifier = JavaTypeParameterImpl@1092['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1259['V'] {
     arguments = ArrayList@1260[empty]
-    classifier = JavaTypeParameterImpl@1092['V']
+    classifier = JavaTypeParameterImpl@1089['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1261['V'] {
     arguments = ArrayList@1262[empty]
-    classifier = JavaTypeParameterImpl@1080['V']
+    classifier = JavaTypeParameterImpl@1044['V']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1263['V'] {
     arguments = ArrayList@1264[empty]
-    classifier = JavaTypeParameterImpl@1056['V']
+    classifier = JavaTypeParameterImpl@1095['V']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1265['V'] {
     arguments = ArrayList@1266[empty]
-    classifier = JavaTypeParameterImpl@1074['V']
+    classifier = JavaTypeParameterImpl@1155['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1267['V'] {
     arguments = ArrayList@1268[empty]
-    classifier = JavaTypeParameterImpl@1095['V']
+    classifier = JavaTypeParameterImpl@1080['V']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
 }
 
 LazyJavaClassifierType@1269['V'] {
     arguments = ArrayList@1270[empty]
-    classifier = JavaTypeParameterImpl@1071['V']
+    classifier = JavaTypeParameterImpl@1158['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1271['V'] {
     arguments = ArrayList@1272[empty]
-    classifier = JavaTypeParameterImpl@1065['V']
+    classifier = JavaTypeParameterImpl@1083['V']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
 }
 
 LazyJavaClassifierType@1273['V'] {
     arguments = ArrayList@1274[empty]
-    classifier = JavaTypeParameterImpl@1110['V']
+    classifier = JavaTypeParameterImpl@1025['V']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
 }
 
 LazyJavaClassifierType@1275['V'] {
     arguments = ArrayList@1276[empty]
-    classifier = JavaTypeParameterImpl@1113['V']
+    classifier = JavaTypeParameterImpl@1050['V']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
 }
 
 LazyJavaClassifierType@1277['V'] {
     arguments = ArrayList@1278[empty]
-    classifier = JavaTypeParameterImpl@1107['V']
+    classifier = JavaTypeParameterImpl@1119['V']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
 }
 
 LazyJavaClassifierType@1279['V'] {
     arguments = ArrayList@1280[empty]
-    classifier = JavaTypeParameterImpl@1182['V']
+    classifier = JavaTypeParameterImpl@1152['V']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1281['V'] {
     arguments = ArrayList@1282[empty]
-    classifier = JavaTypeParameterImpl@1140['V']
+    classifier = JavaTypeParameterImpl@1113['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1283['V'] {
     arguments = ArrayList@1284[empty]
-    classifier = JavaTypeParameterImpl@1200['V']
+    classifier = JavaTypeParameterImpl@1018['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1285['V'] {
     arguments = ArrayList@1286[empty]
-    classifier = JavaTypeParameterImpl@1047['V']
+    classifier = JavaTypeParameterImpl@1188['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1287['V'] {
     arguments = ArrayList@1288[empty]
-    classifier = JavaTypeParameterImpl@1158['V']
+    classifier = JavaTypeParameterImpl@1029['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1289['V'] {
     arguments = ArrayList@1290[empty]
-    classifier = JavaTypeParameterImpl@1176['V']
+    classifier = JavaTypeParameterImpl@1068['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1291['V'] {
     arguments = ArrayList@1292[empty]
-    classifier = JavaTypeParameterImpl@1173['V']
+    classifier = JavaTypeParameterImpl@1059['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1293['V'] {
     arguments = ArrayList@1294[empty]
-    classifier = JavaTypeParameterImpl@1053['V']
+    classifier = JavaTypeParameterImpl@1176['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1295['V'] {
     arguments = ArrayList@1296[empty]
-    classifier = JavaTypeParameterImpl@1146['V']
+    classifier = JavaTypeParameterImpl@1116['V']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1297['V'] {
     arguments = ArrayList@1298[empty]
-    classifier = JavaTypeParameterImpl@1167['V']
+    classifier = JavaTypeParameterImpl@1098['V']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
 }
 
 LazyJavaClassifierType@1299['V'] {
     arguments = ArrayList@1300[empty]
-    classifier = JavaTypeParameterImpl@1170['V']
+    classifier = JavaTypeParameterImpl@1143['V']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
 }
 
 LazyJavaClassifierType@1301['V'] {
     arguments = ArrayList@1302[empty]
-    classifier = JavaTypeParameterImpl@1044['V']
+    classifier = JavaTypeParameterImpl@1101['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1303['V'] {
     arguments = ArrayList@1304[empty]
-    classifier = JavaTypeParameterImpl@1018['V']
+    classifier = JavaTypeParameterImpl@1167['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1305['V'] {
     arguments = ArrayList@1306[empty]
-    classifier = JavaTypeParameterImpl@1194['V']
+    classifier = JavaTypeParameterImpl@1170['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1307['V'] {
     arguments = ArrayList@1308[empty]
-    classifier = JavaTypeParameterImpl@1098['V']
+    classifier = JavaTypeParameterImpl@1134['V']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1309['V'] {
     arguments = ArrayList@1310[empty]
-    classifier = JavaTypeParameterImpl@1188['V']
+    classifier = JavaTypeParameterImpl@1107['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1311['V'] {
     arguments = ArrayList@1312[empty]
-    classifier = JavaTypeParameterImpl@1077['V']
+    classifier = JavaTypeParameterImpl@1179['V']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
 }
 
 LazyJavaClassifierType@1313['V'] {
     arguments = ArrayList@1314[empty]
-    classifier = JavaTypeParameterImpl@1050['V']
+    classifier = JavaTypeParameterImpl@1041['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1315['V'] {
     arguments = ArrayList@1316[empty]
-    classifier = JavaTypeParameterImpl@1038['V']
+    classifier = JavaTypeParameterImpl@1053['V']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1317['V'] {
     arguments = ArrayList@1318[empty]
-    classifier = JavaTypeParameterImpl@1152['V']
+    classifier = JavaTypeParameterImpl@1056['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1319['V'] {
     arguments = ArrayList@1320[empty]
-    classifier = JavaTypeParameterImpl@1179['V']
+    classifier = JavaTypeParameterImpl@1038['V']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
 }
 
 LazyJavaClassifierType@1321['V'] {
     arguments = ArrayList@1322[empty]
-    classifier = JavaTypeParameterImpl@1032['V']
+    classifier = JavaTypeParameterImpl@1122['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
@@ -2743,14 +2743,14 @@ LazyJavaPackageFragment@1342['util'] {
 
 LazyJavaTypeParameterDescriptor@283['K'] {
     defaultType = JetTypeImpl@1364['K']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
     upperBounds = LinkedHashSet@1365[1] { NullableType@1366 }
     upperBoundsAsType = NullableType@1366
 }
 
 LazyJavaTypeParameterDescriptor@275['K'] {
     defaultType = JetTypeImpl@1367['K']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@543
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
     upperBounds = LinkedHashSet@1368[1] { NullableType@1369 }
     upperBoundsAsType = NullableType@1369
 }
@@ -2761,16 +2761,16 @@ LazyJavaTypeParameterDescriptor@280['K'] {
     upperBoundsAsType = NullableType@1372
 }
 
-LazyJavaTypeParameterDescriptor@284['V'] {
+LazyJavaTypeParameterDescriptor@276['V'] {
     defaultType = JetTypeImpl@1373['V']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
     upperBounds = LinkedHashSet@1374[1] { NullableType@1375 }
     upperBoundsAsType = NullableType@1375
 }
 
-LazyJavaTypeParameterDescriptor@276['V'] {
+LazyJavaTypeParameterDescriptor@284['V'] {
     defaultType = JetTypeImpl@1376['V']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
     upperBounds = LinkedHashSet@1377[1] { NullableType@1378 }
     upperBoundsAsType = NullableType@1378
 }
@@ -2797,129 +2797,132 @@ LazyJavaTypeParameterResolver@1388 {
 }
 
 LazyJavaTypeParameterResolver@1391 {
-    resolve(JavaTypeParameterImpl@687['K']) = null
-    resolve(JavaTypeParameterImpl@1140['V']) = null
+    resolve(JavaTypeParameterImpl@540['K']) = null
+    resolve(JavaTypeParameterImpl@1080['V']) = null
 }
 
 LazyJavaTypeParameterResolver@1392 {
-    resolve(JavaTypeParameterImpl@567['K']) = null
-    resolve(JavaTypeParameterImpl@1056['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1393 {
-    resolve(JavaTypeParameterImpl@627['K']) = null
-    resolve(JavaTypeParameterImpl@1028['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1394 {
-    resolve(JavaTypeParameterImpl@624['K']) = null
-    resolve(JavaTypeParameterImpl@1077['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1395 {
-    resolve(JavaTypeParameterImpl@648['K']) = null
-    resolve(JavaTypeParameterImpl@1032['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1396 {
-    resolve(JavaTypeParameterImpl@576['K']) = null
-    resolve(JavaTypeParameterImpl@1047['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1397 {
-    resolve(JavaTypeParameterImpl@542['K']) = null
+    resolve(JavaTypeParameterImpl@669['K']) = null
     resolve(JavaTypeParameterImpl@1041['V']) = null
 }
 
-LazyJavaTypeParameterResolver@1398 {
-    resolve(JavaTypeParameterImpl@558['K']) = null
-    resolve(JavaTypeParameterImpl@1068['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1399 {
-    resolve(JavaTypeParameterImpl@539['K']) = null
-    resolve(JavaTypeParameterImpl@1167['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1400 {
-    resolve(JavaTypeParameterImpl@642['K']) = null
-    resolve(JavaTypeParameterImpl@1119['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1401 {
-    resolve(JavaTypeParameterImpl@672['K']) = null
-    resolve(JavaTypeParameterImpl@1200['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1402 {
-    resolve(JavaTypeParameterImpl@681['K']) = null
-    resolve(JavaTypeParameterImpl@1188['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1403 {
-    resolve(JavaTypeParameterImpl@654['K']) = null
-    resolve(JavaTypeParameterImpl@1107['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1404 {
-    resolve(JavaTypeParameterImpl@570['K']) = null
-    resolve(JavaTypeParameterImpl@1149['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1405 {
-    resolve(JavaTypeParameterImpl@579['K']) = null
-    resolve(JavaTypeParameterImpl@1053['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1406 {
-    resolve(JavaTypeParameterImpl@552['K']) = null
-}
-
-LazyJavaTypeParameterResolver@1407 {
-    resolve(JavaTypeParameterImpl@591['K']) = null
-}
-
-LazyJavaTypeParameterResolver@1408 {
-    resolve(JavaTypeParameterImpl@573['K']) = null
-}
-
-LazyJavaTypeParameterResolver@1409 {
-    resolve(JavaTypeParameterImpl@1062['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1410 {
-    resolve(JavaTypeParameterImpl@1116['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1411 {
-    resolve(JavaTypeParameterImpl@1179['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1412 {
-    resolve(JavaTypeParameterImpl@1059['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1413 {
-    resolve(JavaTypeParameterImpl@1086['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1414 {
-    resolve(JavaTypeParameterImpl@1134['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1415 {
-    resolve(JavaTypeParameterImpl@1146['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1416 {
+LazyJavaTypeParameterResolver@1393 {
+    resolve(JavaTypeParameterImpl@546['K']) = null
     resolve(JavaTypeParameterImpl@1197['V']) = null
 }
 
-LazyJavaTypeParameterResolver@1417 {
+LazyJavaTypeParameterResolver@1394 {
+    resolve(JavaTypeParameterImpl@536['K']) = null
+    resolve(JavaTypeParameterImpl@1022['V']) = null
+}
+
+LazyJavaTypeParameterResolver@1395 {
+    resolve(JavaTypeParameterImpl@582['K']) = null
+    resolve(JavaTypeParameterImpl@1140['V']) = null
+}
+
+LazyJavaTypeParameterResolver@1396 {
+    resolve(JavaTypeParameterImpl@570['K']) = null
+    resolve(JavaTypeParameterImpl@1200['V']) = null
+}
+
+LazyJavaTypeParameterResolver@1397 {
+    resolve(JavaTypeParameterImpl@648['K']) = null
+    resolve(JavaTypeParameterImpl@1053['V']) = null
+}
+
+LazyJavaTypeParameterResolver@1398 {
+    resolve(JavaTypeParameterImpl@600['K']) = null
+    resolve(JavaTypeParameterImpl@1035['V']) = null
+}
+
+LazyJavaTypeParameterResolver@1399 {
+    resolve(JavaTypeParameterImpl@552['K']) = null
+    resolve(JavaTypeParameterImpl@1038['V']) = null
+}
+
+LazyJavaTypeParameterResolver@1400 {
+    resolve(JavaTypeParameterImpl@654['K']) = null
+    resolve(JavaTypeParameterImpl@1128['V']) = null
+}
+
+LazyJavaTypeParameterResolver@1401 {
+    resolve(JavaTypeParameterImpl@555['K']) = null
+    resolve(JavaTypeParameterImpl@1101['V']) = null
+}
+
+LazyJavaTypeParameterResolver@1402 {
+    resolve(JavaTypeParameterImpl@579['K']) = null
+    resolve(JavaTypeParameterImpl@1044['V']) = null
+}
+
+LazyJavaTypeParameterResolver@1403 {
+    resolve(JavaTypeParameterImpl@663['K']) = null
+    resolve(JavaTypeParameterImpl@1164['V']) = null
+}
+
+LazyJavaTypeParameterResolver@1404 {
+    resolve(JavaTypeParameterImpl@639['K']) = null
     resolve(JavaTypeParameterImpl@1176['V']) = null
 }
 
+LazyJavaTypeParameterResolver@1405 {
+    resolve(JavaTypeParameterImpl@606['K']) = null
+    resolve(JavaTypeParameterImpl@1137['V']) = null
+}
+
+LazyJavaTypeParameterResolver@1406 {
+    resolve(JavaTypeParameterImpl@675['K']) = null
+}
+
+LazyJavaTypeParameterResolver@1407 {
+    resolve(JavaTypeParameterImpl@543['K']) = null
+}
+
+LazyJavaTypeParameterResolver@1408 {
+    resolve(JavaTypeParameterImpl@597['K']) = null
+}
+
+LazyJavaTypeParameterResolver@1409 {
+    resolve(JavaTypeParameterImpl@1143['V']) = null
+}
+
+LazyJavaTypeParameterResolver@1410 {
+    resolve(JavaTypeParameterImpl@1104['V']) = null
+}
+
+LazyJavaTypeParameterResolver@1411 {
+    resolve(JavaTypeParameterImpl@1131['V']) = null
+}
+
+LazyJavaTypeParameterResolver@1412 {
+    resolve(JavaTypeParameterImpl@1167['V']) = null
+}
+
+LazyJavaTypeParameterResolver@1413 {
+    resolve(JavaTypeParameterImpl@1170['V']) = null
+}
+
+LazyJavaTypeParameterResolver@1414 {
+    resolve(JavaTypeParameterImpl@1025['V']) = null
+}
+
+LazyJavaTypeParameterResolver@1415 {
+    resolve(JavaTypeParameterImpl@1191['V']) = null
+}
+
+LazyJavaTypeParameterResolver@1416 {
+    resolve(JavaTypeParameterImpl@1152['V']) = null
+}
+
+LazyJavaTypeParameterResolver@1417 {
+    resolve(JavaTypeParameterImpl@1047['V']) = null
+}
+
 ResolutionTaskHolder@1418 {
     <name not found> = ArrayList@1419[4] { ResolutionCandidate@1420, ResolutionCandidate@1421, ResolutionCandidate@1422, ... }
+}
+
+null {
     <name not found> = ArrayList@1423[4] { ResolutionCandidate@1420, ResolutionCandidate@1421, ResolutionCandidate@1422, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/recovery/absentLeftHandSide.lazy.log b/compiler/testData/diagnostics/tests/recovery/absentLeftHandSide.lazy.log
index 7c1bb40f915..fb4b28b9c49 100644
--- a/compiler/testData/diagnostics/tests/recovery/absentLeftHandSide.lazy.log
+++ b/compiler/testData/diagnostics/tests/recovery/absentLeftHandSide.lazy.log
@@ -48,62 +48,41 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@32 {
     <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@44 {
     <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[8] { ResolutionCandidate@52, ResolutionCandidate@53, ResolutionCandidate@54, ... }
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[8] { ResolutionCandidate@58, ResolutionCandidate@59, ResolutionCandidate@60, ... }
-    <name not found> = ArrayList@61[8] { ResolutionCandidate@58, ResolutionCandidate@59, ResolutionCandidate@60, ... }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@55 {
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
@@ -130,13 +109,7 @@ ResolutionTaskHolder@62 {
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@56 {
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
@@ -163,13 +136,7 @@ ResolutionTaskHolder@63 {
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@57 {
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
@@ -196,9 +163,7 @@ ResolutionTaskHolder@64 {
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@58 {
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
@@ -209,9 +174,7 @@ ResolutionTaskHolder@65 {
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@59 {
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
@@ -222,9 +185,7 @@ ResolutionTaskHolder@66 {
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@67 {
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@60 {
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
@@ -235,7 +196,49 @@ ResolutionTaskHolder@67 {
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@68 {
+ResolutionTaskHolder@61 {
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+}
+
+null {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@68[8] { ResolutionCandidate@52, ResolutionCandidate@53, ResolutionCandidate@54, ... }
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
diff --git a/compiler/testData/diagnostics/tests/recovery/namelessInJava.lazy.log b/compiler/testData/diagnostics/tests/recovery/namelessInJava.lazy.log
index c3824f811cd..a16ff13580f 100644
--- a/compiler/testData/diagnostics/tests/recovery/namelessInJava.lazy.log
+++ b/compiler/testData/diagnostics/tests/recovery/namelessInJava.lazy.log
@@ -74,8 +74,11 @@ LazyJavaPackageFragment@52['p'] {
 
 ResolutionTaskHolder@68 {
     <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
 }
+
+null {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+}
diff --git a/compiler/testData/diagnostics/tests/redeclarations/SingletonAndFunctionSameName.lazy.log b/compiler/testData/diagnostics/tests/redeclarations/SingletonAndFunctionSameName.lazy.log
index 1951beb0249..02247ba64a8 100644
--- a/compiler/testData/diagnostics/tests/redeclarations/SingletonAndFunctionSameName.lazy.log
+++ b/compiler/testData/diagnostics/tests/redeclarations/SingletonAndFunctionSameName.lazy.log
@@ -40,9 +40,12 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+}
+
+null {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/AmbiguityOnLazyTypeComputation.lazy.log b/compiler/testData/diagnostics/tests/regressions/AmbiguityOnLazyTypeComputation.lazy.log
index ef464b1abf8..54912aa4aa8 100644
--- a/compiler/testData/diagnostics/tests/regressions/AmbiguityOnLazyTypeComputation.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/AmbiguityOnLazyTypeComputation.lazy.log
@@ -48,21 +48,24 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@41 {
     <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@35[empty]
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
     <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[2] { ResolutionCandidate@51, ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[2] { ResolutionCandidate@51, ResolutionCandidate@52 }
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[2] { ResolutionCandidate@49, ResolutionCandidate@50 }
+}
+
+null {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@53[2] { ResolutionCandidate@49, ResolutionCandidate@50 }
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/AssignmentsUnderOperators.lazy.log b/compiler/testData/diagnostics/tests/regressions/AssignmentsUnderOperators.lazy.log
index 23483efc67f..5d31596c84e 100644
--- a/compiler/testData/diagnostics/tests/regressions/AssignmentsUnderOperators.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/AssignmentsUnderOperators.lazy.log
@@ -23,25 +23,28 @@ LazyJavaPackageFragment@5['java'] {
 
 ResolutionTaskHolder@21 {
     <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@23 }
 }
 
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
+ResolutionTaskHolder@24 {
+    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+ResolutionTaskHolder@27 {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
+}
+
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
 }
 
 ResolutionTaskHolder@33 {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+null {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@26 }
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@23 }
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@35 }
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/CoercionToUnit.lazy.log b/compiler/testData/diagnostics/tests/regressions/CoercionToUnit.lazy.log
index 60577a19490..593b9a60326 100644
--- a/compiler/testData/diagnostics/tests/regressions/CoercionToUnit.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/CoercionToUnit.lazy.log
@@ -38,10 +38,6 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@29 {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
@@ -59,12 +55,8 @@ ResolutionTaskHolder@29 {
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
@@ -81,3 +73,14 @@ ResolutionTaskHolder@33 {
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
+
+null {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@34 }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/regressions/DoubleDefine.lazy.log b/compiler/testData/diagnostics/tests/regressions/DoubleDefine.lazy.log
index 28d24de64d2..409017a88c8 100644
--- a/compiler/testData/diagnostics/tests/regressions/DoubleDefine.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/DoubleDefine.lazy.log
@@ -458,49 +458,49 @@ LazyJavaClassifierType@353['AbstractStringBuilder'] {
 
 LazyJavaClassifierType@356['AbstractStringBuilder'] {
     arguments = ArrayList@357[empty]
-    classifier = JavaClassImpl@349['AbstractStringBuilder']
+    classifier = JavaClassImpl@343['AbstractStringBuilder']
     nullable = 'true': Boolean@358
     typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@359['AbstractStringBuilder'] {
     arguments = ArrayList@360[empty]
-    classifier = JavaClassImpl@337['AbstractStringBuilder']
+    classifier = JavaClassImpl@355['AbstractStringBuilder']
     nullable = 'true': Boolean@358
     typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@361['AbstractStringBuilder'] {
     arguments = ArrayList@362[empty]
-    classifier = JavaClassImpl@352['AbstractStringBuilder']
+    classifier = JavaClassImpl@331['AbstractStringBuilder']
     nullable = 'true': Boolean@358
     typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@363['AbstractStringBuilder'] {
     arguments = ArrayList@364[empty]
-    classifier = JavaClassImpl@334['AbstractStringBuilder']
+    classifier = JavaClassImpl@328['AbstractStringBuilder']
     nullable = 'true': Boolean@358
     typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@365['AbstractStringBuilder'] {
     arguments = ArrayList@366[empty]
-    classifier = JavaClassImpl@316['AbstractStringBuilder']
+    classifier = JavaClassImpl@340['AbstractStringBuilder']
     nullable = 'true': Boolean@358
     typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@367['AbstractStringBuilder'] {
     arguments = ArrayList@368[empty]
-    classifier = JavaClassImpl@331['AbstractStringBuilder']
+    classifier = JavaClassImpl@337['AbstractStringBuilder']
     nullable = 'true': Boolean@358
     typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@369['AbstractStringBuilder'] {
     arguments = ArrayList@370[empty]
-    classifier = JavaClassImpl@322['AbstractStringBuilder']
+    classifier = JavaClassImpl@352['AbstractStringBuilder']
     nullable = 'true': Boolean@358
     typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
 }
@@ -514,7 +514,7 @@ LazyJavaClassifierType@371['AbstractStringBuilder'] {
 
 LazyJavaClassifierType@373['AbstractStringBuilder'] {
     arguments = ArrayList@374[empty]
-    classifier = JavaClassImpl@355['AbstractStringBuilder']
+    classifier = JavaClassImpl@349['AbstractStringBuilder']
     nullable = 'true': Boolean@358
     typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
 }
@@ -528,28 +528,28 @@ LazyJavaClassifierType@375['AbstractStringBuilder'] {
 
 LazyJavaClassifierType@377['AbstractStringBuilder'] {
     arguments = ArrayList@378[empty]
-    classifier = JavaClassImpl@328['AbstractStringBuilder']
+    classifier = JavaClassImpl@346['AbstractStringBuilder']
     nullable = 'true': Boolean@358
     typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@379['AbstractStringBuilder'] {
     arguments = ArrayList@380[empty]
-    classifier = JavaClassImpl@346['AbstractStringBuilder']
+    classifier = JavaClassImpl@322['AbstractStringBuilder']
     nullable = 'true': Boolean@358
     typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@381['AbstractStringBuilder'] {
     arguments = ArrayList@382[empty]
-    classifier = JavaClassImpl@340['AbstractStringBuilder']
+    classifier = JavaClassImpl@316['AbstractStringBuilder']
     nullable = 'true': Boolean@358
     typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@383['AbstractStringBuilder'] {
     arguments = ArrayList@384[empty]
-    classifier = JavaClassImpl@343['AbstractStringBuilder']
+    classifier = JavaClassImpl@334['AbstractStringBuilder']
     nullable = 'true': Boolean@358
     typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
 }
@@ -597,21 +597,21 @@ LazyJavaClassifierType@397['Appendable'] {
 
 LazyJavaClassifierType@400['Appendable'] {
     arguments = ArrayList@401[empty]
-    classifier = JavaClassImpl@396['Appendable']
+    classifier = JavaClassImpl@399['Appendable']
     nullable = 'true': Boolean@358
     typeConstructor = LazyJavaClassTypeConstructor@67['Appendable']
 }
 
 LazyJavaClassifierType@402['Appendable'] {
     arguments = ArrayList@403[empty]
-    classifier = JavaClassImpl@393['Appendable']
+    classifier = JavaClassImpl@396['Appendable']
     nullable = 'true': Boolean@358
     typeConstructor = LazyJavaClassTypeConstructor@67['Appendable']
 }
 
 LazyJavaClassifierType@404['Appendable'] {
     arguments = ArrayList@405[empty]
-    classifier = JavaClassImpl@399['Appendable']
+    classifier = JavaClassImpl@393['Appendable']
     nullable = 'true': Boolean@358
     typeConstructor = LazyJavaClassTypeConstructor@67['Appendable']
 }
@@ -623,14 +623,14 @@ LazyJavaClassifierType@258['AutoCloseable'] {
     typeConstructor = LazyJavaClassTypeConstructor@95['AutoCloseable']
 }
 
-LazyJavaClassifierType@301['CharSequence'] {
+LazyJavaClassifierType@240['CharSequence'] {
     arguments = ArrayList@408[empty]
     classifier = JavaClassImpl@409['CharSequence']
     memberScope = DeserializedClassMemberScope@410
     typeConstructor = DeserializedClassTypeConstructor@411
 }
 
-LazyJavaClassifierType@240['CharSequence'] {
+LazyJavaClassifierType@301['CharSequence'] {
     arguments = ArrayList@412[empty]
     classifier = JavaClassImpl@413['CharSequence']
     memberScope = DeserializedClassMemberScope@410
@@ -688,49 +688,49 @@ LazyJavaClassifierType@432['CharSequence'] {
 
 LazyJavaClassifierType@435['CharSequence'] {
     arguments = ArrayList@436[empty]
-    classifier = JavaClassImpl@428['CharSequence']
+    classifier = JavaClassImpl@416['CharSequence']
     nullable = 'true': Boolean@358
     typeConstructor = DeserializedClassTypeConstructor@411
 }
 
 LazyJavaClassifierType@437['CharSequence'] {
     arguments = ArrayList@438[empty]
-    classifier = JavaClassImpl@434['CharSequence']
+    classifier = JavaClassImpl@419['CharSequence']
     nullable = 'true': Boolean@358
     typeConstructor = DeserializedClassTypeConstructor@411
 }
 
 LazyJavaClassifierType@439['CharSequence'] {
     arguments = ArrayList@440[empty]
-    classifier = JavaClassImpl@416['CharSequence']
+    classifier = JavaClassImpl@425['CharSequence']
     nullable = 'true': Boolean@358
     typeConstructor = DeserializedClassTypeConstructor@411
 }
 
 LazyJavaClassifierType@441['CharSequence'] {
     arguments = ArrayList@442[empty]
-    classifier = JavaClassImpl@431['CharSequence']
+    classifier = JavaClassImpl@422['CharSequence']
     nullable = 'true': Boolean@358
     typeConstructor = DeserializedClassTypeConstructor@411
 }
 
 LazyJavaClassifierType@443['CharSequence'] {
     arguments = ArrayList@444[empty]
-    classifier = JavaClassImpl@425['CharSequence']
+    classifier = JavaClassImpl@434['CharSequence']
     nullable = 'true': Boolean@358
     typeConstructor = DeserializedClassTypeConstructor@411
 }
 
 LazyJavaClassifierType@445['CharSequence'] {
     arguments = ArrayList@446[empty]
-    classifier = JavaClassImpl@422['CharSequence']
+    classifier = JavaClassImpl@428['CharSequence']
     nullable = 'true': Boolean@358
     typeConstructor = DeserializedClassTypeConstructor@411
 }
 
 LazyJavaClassifierType@447['CharSequence'] {
     arguments = ArrayList@448[empty]
-    classifier = JavaClassImpl@419['CharSequence']
+    classifier = JavaClassImpl@431['CharSequence']
     nullable = 'true': Boolean@358
     typeConstructor = DeserializedClassTypeConstructor@411
 }
@@ -832,14 +832,14 @@ LazyJavaClassifierType@490['E'] {
     arguments = ArrayList@491[empty]
     classifier = JavaTypeParameterImpl@492['E']
     nullable = 'false': Boolean@307
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@489
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@493
 }
 
-LazyJavaClassifierType@493['E'] {
-    arguments = ArrayList@494[empty]
-    classifier = JavaTypeParameterImpl@495['E']
+LazyJavaClassifierType@494['E'] {
+    arguments = ArrayList@495[empty]
+    classifier = JavaTypeParameterImpl@496['E']
     nullable = 'false': Boolean@307
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@489
 }
 
 LazyJavaClassifierType@497['E'] {
@@ -853,63 +853,63 @@ LazyJavaClassifierType@500['E'] {
     arguments = ArrayList@501[empty]
     classifier = JavaTypeParameterImpl@502['E']
     nullable = 'false': Boolean@307
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@493
 }
 
 LazyJavaClassifierType@503['E'] {
     arguments = ArrayList@504[empty]
     classifier = JavaTypeParameterImpl@505['E']
     nullable = 'false': Boolean@307
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@506
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@493
 }
 
-LazyJavaClassifierType@507['E'] {
-    arguments = ArrayList@508[empty]
-    classifier = JavaTypeParameterImpl@509['E']
+LazyJavaClassifierType@506['E'] {
+    arguments = ArrayList@507[empty]
+    classifier = JavaTypeParameterImpl@508['E']
     nullable = 'false': Boolean@307
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@506
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@509
 }
 
 LazyJavaClassifierType@510['E'] {
     arguments = ArrayList@511[empty]
     classifier = JavaTypeParameterImpl@512['E']
     nullable = 'false': Boolean@307
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@493
 }
 
 LazyJavaClassifierType@513['E'] {
     arguments = ArrayList@514[empty]
     classifier = JavaTypeParameterImpl@515['E']
     nullable = 'false': Boolean@307
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@489
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@493
 }
 
 LazyJavaClassifierType@516['E'] {
     arguments = ArrayList@517[empty]
     classifier = JavaTypeParameterImpl@518['E']
     nullable = 'false': Boolean@307
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@489
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@493
 }
 
 LazyJavaClassifierType@519['E'] {
     arguments = ArrayList@520[empty]
     classifier = JavaTypeParameterImpl@521['E']
     nullable = 'false': Boolean@307
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@489
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@509
 }
 
 LazyJavaClassifierType@522['E'] {
     arguments = ArrayList@523[empty]
     classifier = JavaTypeParameterImpl@524['E']
     nullable = 'false': Boolean@307
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@489
 }
 
 LazyJavaClassifierType@525['E'] {
     arguments = ArrayList@526[empty]
     classifier = JavaTypeParameterImpl@527['E']
     nullable = 'false': Boolean@307
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@493
 }
 
 LazyJavaClassifierType@528['E'] {
@@ -921,30 +921,30 @@ LazyJavaClassifierType@528['E'] {
 
 LazyJavaClassifierType@531['E'] {
     arguments = ArrayList@532[empty]
-    classifier = JavaTypeParameterImpl@515['E']
+    classifier = JavaTypeParameterImpl@518['E']
     nullable = 'true': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@489
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@493
 }
 
 LazyJavaClassifierType@533['E'] {
     arguments = ArrayList@534[empty]
-    classifier = JavaTypeParameterImpl@509['E']
+    classifier = JavaTypeParameterImpl@496['E']
     nullable = 'true': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@506
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@489
 }
 
 LazyJavaClassifierType@535['E'] {
     arguments = ArrayList@536[empty]
     classifier = JavaTypeParameterImpl@512['E']
     nullable = 'true': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@493
 }
 
 LazyJavaClassifierType@537['E'] {
     arguments = ArrayList@538[empty]
-    classifier = JavaTypeParameterImpl@505['E']
+    classifier = JavaTypeParameterImpl@508['E']
     nullable = 'true': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@506
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@509
 }
 
 LazyJavaClassifierType@539['E'] {
@@ -956,42 +956,42 @@ LazyJavaClassifierType@539['E'] {
 
 LazyJavaClassifierType@541['E'] {
     arguments = ArrayList@542[empty]
-    classifier = JavaTypeParameterImpl@527['E']
+    classifier = JavaTypeParameterImpl@515['E']
     nullable = 'true': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@493
 }
 
 LazyJavaClassifierType@543['E'] {
     arguments = ArrayList@544[empty]
-    classifier = JavaTypeParameterImpl@518['E']
+    classifier = JavaTypeParameterImpl@492['E']
     nullable = 'true': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@489
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@493
 }
 
 LazyJavaClassifierType@545['E'] {
     arguments = ArrayList@546[empty]
-    classifier = JavaTypeParameterImpl@495['E']
+    classifier = JavaTypeParameterImpl@521['E']
     nullable = 'true': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@509
 }
 
 LazyJavaClassifierType@547['E'] {
     arguments = ArrayList@548[empty]
-    classifier = JavaTypeParameterImpl@530['E']
+    classifier = JavaTypeParameterImpl@505['E']
     nullable = 'true': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@489
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@493
 }
 
 LazyJavaClassifierType@549['E'] {
     arguments = ArrayList@550[empty]
-    classifier = JavaTypeParameterImpl@492['E']
+    classifier = JavaTypeParameterImpl@524['E']
     nullable = 'true': Boolean@358
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@489
 }
 
 LazyJavaClassifierType@551['E'] {
     arguments = ArrayList@552[empty]
-    classifier = JavaTypeParameterImpl@521['E']
+    classifier = JavaTypeParameterImpl@530['E']
     nullable = 'true': Boolean@358
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@489
 }
@@ -1005,16 +1005,16 @@ LazyJavaClassifierType@553['E'] {
 
 LazyJavaClassifierType@555['E'] {
     arguments = ArrayList@556[empty]
-    classifier = JavaTypeParameterImpl@524['E']
+    classifier = JavaTypeParameterImpl@527['E']
     nullable = 'true': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@493
 }
 
 LazyJavaClassifierType@557['E'] {
     arguments = ArrayList@558[empty]
     classifier = JavaTypeParameterImpl@502['E']
     nullable = 'true': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@493
 }
 
 LazyJavaClassifierType@276['FilterOutputStream'] {
@@ -1066,35 +1066,35 @@ LazyJavaClassifierType@575['InputStream'] {
 
 LazyJavaClassifierType@578['InputStream'] {
     arguments = ArrayList@579[empty]
-    classifier = JavaClassImpl@568['InputStream']
+    classifier = JavaClassImpl@571['InputStream']
     nullable = 'true': Boolean@358
     typeConstructor = LazyJavaClassTypeConstructor@130['InputStream']
 }
 
 LazyJavaClassifierType@580['InputStream'] {
     arguments = ArrayList@581[empty]
-    classifier = JavaClassImpl@577['InputStream']
+    classifier = JavaClassImpl@568['InputStream']
     nullable = 'true': Boolean@358
     typeConstructor = LazyJavaClassTypeConstructor@130['InputStream']
 }
 
 LazyJavaClassifierType@582['InputStream'] {
     arguments = ArrayList@583[empty]
-    classifier = JavaClassImpl@565['InputStream']
+    classifier = JavaClassImpl@574['InputStream']
     nullable = 'true': Boolean@358
     typeConstructor = LazyJavaClassTypeConstructor@130['InputStream']
 }
 
 LazyJavaClassifierType@584['InputStream'] {
     arguments = ArrayList@585[empty]
-    classifier = JavaClassImpl@574['InputStream']
+    classifier = JavaClassImpl@577['InputStream']
     nullable = 'true': Boolean@358
     typeConstructor = LazyJavaClassTypeConstructor@130['InputStream']
 }
 
 LazyJavaClassifierType@586['InputStream'] {
     arguments = ArrayList@587[empty]
-    classifier = JavaClassImpl@571['InputStream']
+    classifier = JavaClassImpl@565['InputStream']
     nullable = 'true': Boolean@358
     typeConstructor = LazyJavaClassTypeConstructor@130['InputStream']
 }
@@ -1148,7 +1148,7 @@ LazyJavaClassifierType@608['Object'] {
 
 LazyJavaClassifierType@611['Object'] {
     arguments = ArrayList@612[empty]
-    classifier = JavaClassImpl@599['Object']
+    classifier = JavaClassImpl@610['Object']
     memberScope = DeserializedClassMemberScope@600
     nullable = 'true': Boolean@358
     typeConstructor = DeserializedClassTypeConstructor@601
@@ -1156,7 +1156,7 @@ LazyJavaClassifierType@611['Object'] {
 
 LazyJavaClassifierType@613['Object'] {
     arguments = ArrayList@614[empty]
-    classifier = JavaClassImpl@610['Object']
+    classifier = JavaClassImpl@604['Object']
     memberScope = DeserializedClassMemberScope@600
     nullable = 'true': Boolean@358
     typeConstructor = DeserializedClassTypeConstructor@601
@@ -1164,7 +1164,7 @@ LazyJavaClassifierType@613['Object'] {
 
 LazyJavaClassifierType@615['Object'] {
     arguments = ArrayList@616[empty]
-    classifier = JavaClassImpl@604['Object']
+    classifier = JavaClassImpl@607['Object']
     memberScope = DeserializedClassMemberScope@600
     nullable = 'true': Boolean@358
     typeConstructor = DeserializedClassTypeConstructor@601
@@ -1172,7 +1172,7 @@ LazyJavaClassifierType@615['Object'] {
 
 LazyJavaClassifierType@617['Object'] {
     arguments = ArrayList@618[empty]
-    classifier = JavaClassImpl@607['Object']
+    classifier = JavaClassImpl@599['Object']
     memberScope = DeserializedClassMemberScope@600
     nullable = 'true': Boolean@358
     typeConstructor = DeserializedClassTypeConstructor@601
@@ -1201,21 +1201,21 @@ LazyJavaClassifierType@625['Object'] {
 
 LazyJavaClassifierType@628['Object'] {
     arguments = ArrayList@629[empty]
-    classifier = JavaClassImpl@627['Object']
+    classifier = JavaClassImpl@624['Object']
     nullable = 'true': Boolean@358
     typeConstructor = DeserializedClassTypeConstructor@601
 }
 
 LazyJavaClassifierType@630['Object'] {
     arguments = ArrayList@631[empty]
-    classifier = JavaClassImpl@621['Object']
+    classifier = JavaClassImpl@627['Object']
     nullable = 'true': Boolean@358
     typeConstructor = DeserializedClassTypeConstructor@601
 }
 
 LazyJavaClassifierType@632['Object'] {
     arguments = ArrayList@633[empty]
-    classifier = JavaClassImpl@624['Object']
+    classifier = JavaClassImpl@621['Object']
     nullable = 'true': Boolean@358
     typeConstructor = DeserializedClassTypeConstructor@601
 }
@@ -1339,14 +1339,14 @@ LazyJavaClassifierType@674['Reader'] {
 
 LazyJavaClassifierType@677['Reader'] {
     arguments = ArrayList@678[empty]
-    classifier = JavaClassImpl@676['Reader']
+    classifier = JavaClassImpl@673['Reader']
     nullable = 'true': Boolean@358
     typeConstructor = LazyJavaClassTypeConstructor@182['Reader']
 }
 
 LazyJavaClassifierType@679['Reader'] {
     arguments = ArrayList@680[empty]
-    classifier = JavaClassImpl@673['Reader']
+    classifier = JavaClassImpl@676['Reader']
     nullable = 'true': Boolean@358
     typeConstructor = LazyJavaClassTypeConstructor@182['Reader']
 }
@@ -1357,21 +1357,21 @@ LazyJavaClassifierType@270['Reader'] {
     typeConstructor = LazyJavaClassTypeConstructor@182['Reader']
 }
 
-LazyJavaClassifierType@683['Serializable'] {
-    arguments = ArrayList@684[empty]
-    classifier = JavaClassImpl@685['Serializable']
-    memberScope = LazyJavaClassMemberScope@184
-    typeConstructor = LazyJavaClassTypeConstructor@187['Serializable']
-}
-
 LazyJavaClassifierType@281['Serializable'] {
-    arguments = ArrayList@686[empty]
-    classifier = JavaClassImpl@687['Serializable']
+    arguments = ArrayList@683[empty]
+    classifier = JavaClassImpl@684['Serializable']
     memberScope = LazyJavaClassMemberScope@184
     typeConstructor = LazyJavaClassTypeConstructor@187['Serializable']
 }
 
 LazyJavaClassifierType@300['Serializable'] {
+    arguments = ArrayList@685[empty]
+    classifier = JavaClassImpl@686['Serializable']
+    memberScope = LazyJavaClassMemberScope@184
+    typeConstructor = LazyJavaClassTypeConstructor@187['Serializable']
+}
+
+LazyJavaClassifierType@687['Serializable'] {
     arguments = ArrayList@688[empty]
     classifier = JavaClassImpl@689['Serializable']
     memberScope = LazyJavaClassMemberScope@184
@@ -1455,28 +1455,28 @@ LazyJavaClassifierType@719['String'] {
 
 LazyJavaClassifierType@722['String'] {
     arguments = ArrayList@723[empty]
-    classifier = JavaClassImpl@715['String']
+    classifier = JavaClassImpl@693['String']
     nullable = 'true': Boolean@358
     typeConstructor = DeserializedClassTypeConstructor@694
 }
 
 LazyJavaClassifierType@724['String'] {
     arguments = ArrayList@725[empty]
-    classifier = JavaClassImpl@703['String']
+    classifier = JavaClassImpl@718['String']
     nullable = 'true': Boolean@358
     typeConstructor = DeserializedClassTypeConstructor@694
 }
 
 LazyJavaClassifierType@726['String'] {
     arguments = ArrayList@727[empty]
-    classifier = JavaClassImpl@697['String']
+    classifier = JavaClassImpl@721['String']
     nullable = 'true': Boolean@358
     typeConstructor = DeserializedClassTypeConstructor@694
 }
 
 LazyJavaClassifierType@728['String'] {
     arguments = ArrayList@729[empty]
-    classifier = JavaClassImpl@706['String']
+    classifier = JavaClassImpl@703['String']
     nullable = 'true': Boolean@358
     typeConstructor = DeserializedClassTypeConstructor@694
 }
@@ -1490,7 +1490,7 @@ LazyJavaClassifierType@730['String'] {
 
 LazyJavaClassifierType@732['String'] {
     arguments = ArrayList@733[empty]
-    classifier = JavaClassImpl@718['String']
+    classifier = JavaClassImpl@715['String']
     nullable = 'true': Boolean@358
     typeConstructor = DeserializedClassTypeConstructor@694
 }
@@ -1504,21 +1504,21 @@ LazyJavaClassifierType@734['String'] {
 
 LazyJavaClassifierType@736['String'] {
     arguments = ArrayList@737[empty]
-    classifier = JavaClassImpl@693['String']
+    classifier = JavaClassImpl@706['String']
     nullable = 'true': Boolean@358
     typeConstructor = DeserializedClassTypeConstructor@694
 }
 
 LazyJavaClassifierType@738['String'] {
     arguments = ArrayList@739[empty]
-    classifier = JavaClassImpl@700['String']
+    classifier = JavaClassImpl@697['String']
     nullable = 'true': Boolean@358
     typeConstructor = DeserializedClassTypeConstructor@694
 }
 
 LazyJavaClassifierType@740['String'] {
     arguments = ArrayList@741[empty]
-    classifier = JavaClassImpl@721['String']
+    classifier = JavaClassImpl@700['String']
     nullable = 'true': Boolean@358
     typeConstructor = DeserializedClassTypeConstructor@694
 }
@@ -1665,77 +1665,77 @@ LazyJavaClassifierType@797['StringBuilder'] {
 
 LazyJavaClassifierType@800['StringBuilder'] {
     arguments = ArrayList@801[empty]
-    classifier = JavaClassImpl@775['StringBuilder']
+    classifier = JavaClassImpl@790['StringBuilder']
     nullable = 'true': Boolean@358
     typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
 }
 
 LazyJavaClassifierType@802['StringBuilder'] {
     arguments = ArrayList@803[empty]
-    classifier = JavaClassImpl@796['StringBuilder']
+    classifier = JavaClassImpl@799['StringBuilder']
     nullable = 'true': Boolean@358
     typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
 }
 
 LazyJavaClassifierType@804['StringBuilder'] {
     arguments = ArrayList@805[empty]
-    classifier = JavaClassImpl@799['StringBuilder']
+    classifier = JavaClassImpl@778['StringBuilder']
     nullable = 'true': Boolean@358
     typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
 }
 
 LazyJavaClassifierType@806['StringBuilder'] {
     arguments = ArrayList@807[empty]
-    classifier = JavaClassImpl@763['StringBuilder']
+    classifier = JavaClassImpl@793['StringBuilder']
     nullable = 'true': Boolean@358
     typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
 }
 
 LazyJavaClassifierType@808['StringBuilder'] {
     arguments = ArrayList@809[empty]
-    classifier = JavaClassImpl@772['StringBuilder']
+    classifier = JavaClassImpl@763['StringBuilder']
     nullable = 'true': Boolean@358
     typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
 }
 
 LazyJavaClassifierType@810['StringBuilder'] {
     arguments = ArrayList@811[empty]
-    classifier = JavaClassImpl@793['StringBuilder']
+    classifier = JavaClassImpl@775['StringBuilder']
     nullable = 'true': Boolean@358
     typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
 }
 
 LazyJavaClassifierType@812['StringBuilder'] {
     arguments = ArrayList@813[empty]
-    classifier = JavaClassImpl@760['StringBuilder']
+    classifier = JavaClassImpl@787['StringBuilder']
     nullable = 'true': Boolean@358
     typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
 }
 
 LazyJavaClassifierType@814['StringBuilder'] {
     arguments = ArrayList@815[empty]
-    classifier = JavaClassImpl@754['StringBuilder']
+    classifier = JavaClassImpl@772['StringBuilder']
     nullable = 'true': Boolean@358
     typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
 }
 
 LazyJavaClassifierType@816['StringBuilder'] {
     arguments = ArrayList@817[empty]
-    classifier = JavaClassImpl@778['StringBuilder']
+    classifier = JavaClassImpl@796['StringBuilder']
     nullable = 'true': Boolean@358
     typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
 }
 
 LazyJavaClassifierType@818['StringBuilder'] {
     arguments = ArrayList@819[empty]
-    classifier = JavaClassImpl@784['StringBuilder']
+    classifier = JavaClassImpl@781['StringBuilder']
     nullable = 'true': Boolean@358
     typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
 }
 
 LazyJavaClassifierType@820['StringBuilder'] {
     arguments = ArrayList@821[empty]
-    classifier = JavaClassImpl@766['StringBuilder']
+    classifier = JavaClassImpl@754['StringBuilder']
     nullable = 'true': Boolean@358
     typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
 }
@@ -1749,28 +1749,28 @@ LazyJavaClassifierType@822['StringBuilder'] {
 
 LazyJavaClassifierType@824['StringBuilder'] {
     arguments = ArrayList@825[empty]
-    classifier = JavaClassImpl@787['StringBuilder']
+    classifier = JavaClassImpl@784['StringBuilder']
     nullable = 'true': Boolean@358
     typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
 }
 
 LazyJavaClassifierType@826['StringBuilder'] {
     arguments = ArrayList@827[empty]
-    classifier = JavaClassImpl@781['StringBuilder']
+    classifier = JavaClassImpl@760['StringBuilder']
     nullable = 'true': Boolean@358
     typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
 }
 
 LazyJavaClassifierType@828['StringBuilder'] {
     arguments = ArrayList@829[empty]
-    classifier = JavaClassImpl@757['StringBuilder']
+    classifier = JavaClassImpl@766['StringBuilder']
     nullable = 'true': Boolean@358
     typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
 }
 
 LazyJavaClassifierType@830['StringBuilder'] {
     arguments = ArrayList@831[empty]
-    classifier = JavaClassImpl@790['StringBuilder']
+    classifier = JavaClassImpl@757['StringBuilder']
     nullable = 'true': Boolean@358
     typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
 }
@@ -1889,7 +1889,7 @@ LazyJavaPackageFragmentProvider@850 {
     topLevelClasses(JavaClassImpl@464['Closeable']) = LazyJavaClassDescriptor@113['Closeable']
     topLevelClasses(JavaClassImpl@913['Exception']) = LazyJavaClassDescriptor@117['Exception']
     topLevelClasses(JavaClassImpl@560['FilterOutputStream']) = LazyJavaClassDescriptor@125['FilterOutputStream']
-    topLevelClasses(JavaClassImpl@565['InputStream']) = LazyJavaClassDescriptor@129['InputStream']
+    topLevelClasses(JavaClassImpl@577['InputStream']) = LazyJavaClassDescriptor@129['InputStream']
     topLevelClasses(JavaClassImpl@914['InputStreamReader']) = LazyJavaClassDescriptor@131['InputStreamReader']
     topLevelClasses(JavaClassImpl@659['OutputStream']) = LazyJavaClassDescriptor@139['OutputStream']
     topLevelClasses(JavaClassImpl@662['PrintStream']) = LazyJavaClassDescriptor@143['PrintStream']
@@ -1897,8 +1897,8 @@ LazyJavaPackageFragmentProvider@850 {
     topLevelClasses(JavaClassImpl@666['RandomAccess']) = LazyJavaClassDescriptor@171['RandomAccess']
     topLevelClasses(JavaClassImpl@668['Readable']) = LazyJavaClassDescriptor@175['Readable']
     topLevelClasses(JavaClassImpl@673['Reader']) = LazyJavaClassDescriptor@179['Reader']
-    topLevelClasses(JavaClassImpl@689['Serializable']) = LazyJavaClassDescriptor@183['Serializable']
-    topLevelClasses(JavaClassImpl@747['StringBuffer']) = LazyJavaClassDescriptor@188['StringBuffer']
+    topLevelClasses(JavaClassImpl@686['Serializable']) = LazyJavaClassDescriptor@183['Serializable']
+    topLevelClasses(JavaClassImpl@744['StringBuffer']) = LazyJavaClassDescriptor@188['StringBuffer']
     topLevelClasses(JavaClassImpl@916['StringBuilder']) = LazyJavaClassDescriptor@190['StringBuilder']
     topLevelClasses(JavaClassImpl@917['System']) = LazyJavaClassDescriptor@214['System']
 }
@@ -2040,111 +2040,99 @@ LazyJavaPackageFragment@889['util'] {
 
 LazyJavaTypeParameterDescriptor@245['E'] {
     defaultType = JetTypeImpl@956['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@489
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@493
     upperBounds = LinkedHashSet@957[1] { NullableType@958 }
     upperBoundsAsType = NullableType@958
 }
 
-LazyJavaTypeParameterDescriptor@229['E'] {
+LazyJavaTypeParameterDescriptor@233['E'] {
     defaultType = JetTypeImpl@959['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@506
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@489
     upperBounds = LinkedHashSet@960[1] { NullableType@961 }
     upperBoundsAsType = NullableType@961
 }
 
-LazyJavaTypeParameterDescriptor@233['E'] {
+LazyJavaTypeParameterDescriptor@229['E'] {
     defaultType = JetTypeImpl@962['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@509
     upperBounds = LinkedHashSet@963[1] { NullableType@964 }
     upperBoundsAsType = NullableType@964
 }
 
 LazyJavaTypeParameterResolver@965 {
-    resolve(JavaTypeParameterImpl@966['E']) = LazyJavaTypeParameterDescriptor@233['E']
+    resolve(JavaTypeParameterImpl@966['E']) = LazyJavaTypeParameterDescriptor@245['E']
 }
 
 LazyJavaTypeParameterResolver@967 {
-    resolve(JavaTypeParameterImpl@968['E']) = LazyJavaTypeParameterDescriptor@229['E']
+    resolve(JavaTypeParameterImpl@968['E']) = LazyJavaTypeParameterDescriptor@233['E']
 }
 
 LazyJavaTypeParameterResolver@969 {
-    resolve(JavaTypeParameterImpl@970['E']) = LazyJavaTypeParameterDescriptor@245['E']
+    resolve(JavaTypeParameterImpl@970['E']) = LazyJavaTypeParameterDescriptor@229['E']
 }
 
 LazyJavaTypeParameterResolver@971 {
-    resolve(JavaTypeParameterImpl@521['E']) = null
-}
-
-LazyJavaTypeParameterResolver@972 {
-    resolve(JavaTypeParameterImpl@492['E']) = null
-}
-
-LazyJavaTypeParameterResolver@973 {
-    resolve(JavaTypeParameterImpl@527['E']) = null
-}
-
-LazyJavaTypeParameterResolver@974 {
-    resolve(JavaTypeParameterImpl@512['E']) = null
-}
-
-LazyJavaTypeParameterResolver@975 {
     resolve(JavaTypeParameterImpl@524['E']) = null
 }
 
+LazyJavaTypeParameterResolver@972 {
+    resolve(JavaTypeParameterImpl@508['E']) = null
+}
+
+LazyJavaTypeParameterResolver@973 {
+    resolve(JavaTypeParameterImpl@505['E']) = null
+}
+
+LazyJavaTypeParameterResolver@974 {
+    resolve(JavaTypeParameterImpl@515['E']) = null
+}
+
+LazyJavaTypeParameterResolver@975 {
+    resolve(JavaTypeParameterImpl@527['E']) = null
+}
+
 LazyJavaTypeParameterResolver@976 {
-    resolve(JavaTypeParameterImpl@518['E']) = null
+    resolve(JavaTypeParameterImpl@499['E']) = null
 }
 
 LazyJavaTypeParameterResolver@977 {
-    resolve(JavaTypeParameterImpl@509['E']) = null
+    resolve(JavaTypeParameterImpl@530['E']) = null
 }
 
 ResolutionTaskHolder@978 {
     <name not found> = ArrayList@979[10] { ResolutionCandidate@980, ResolutionCandidate@981, ResolutionCandidate@982, ... }
-    <name not found> = ArrayList@983[10] { ResolutionCandidate@980, ResolutionCandidate@981, ResolutionCandidate@982, ... }
 }
 
-ResolutionTaskHolder@984 {
-    <name not found> = ArrayList@985[10] { ResolutionCandidate@986, ResolutionCandidate@987, ResolutionCandidate@988, ... }
-    <name not found> = ArrayList@989[10] { ResolutionCandidate@986, ResolutionCandidate@987, ResolutionCandidate@988, ... }
+ResolutionTaskHolder@983 {
+    <name not found> = ArrayList@984[10] { ResolutionCandidate@985, ResolutionCandidate@986, ResolutionCandidate@987, ... }
 }
 
-ResolutionTaskHolder@990 {
-    <name not found> = ArrayList@991[10] { ResolutionCandidate@992, ResolutionCandidate@993, ResolutionCandidate@994, ... }
-    <name not found> = ArrayList@995[10] { ResolutionCandidate@992, ResolutionCandidate@993, ResolutionCandidate@994, ... }
+ResolutionTaskHolder@988 {
+    <name not found> = ArrayList@989[10] { ResolutionCandidate@990, ResolutionCandidate@991, ResolutionCandidate@992, ... }
 }
 
-ResolutionTaskHolder@996 {
-    <name not found> = ArrayList@997[10] { ResolutionCandidate@998, ResolutionCandidate@999, ResolutionCandidate@1000, ... }
-    <name not found> = ArrayList@1001[10] { ResolutionCandidate@998, ResolutionCandidate@999, ResolutionCandidate@1000, ... }
+ResolutionTaskHolder@993 {
+    <name not found> = ArrayList@994[10] { ResolutionCandidate@995, ResolutionCandidate@996, ResolutionCandidate@997, ... }
 }
 
-ResolutionTaskHolder@1002 {
-    <name not found> = ArrayList@1003[10] { ResolutionCandidate@1004, ResolutionCandidate@1005, ResolutionCandidate@1006, ... }
-    <name not found> = ArrayList@1007[10] { ResolutionCandidate@1004, ResolutionCandidate@1005, ResolutionCandidate@1006, ... }
+ResolutionTaskHolder@998 {
+    <name not found> = ArrayList@999[10] { ResolutionCandidate@1000, ResolutionCandidate@1001, ResolutionCandidate@1002, ... }
+}
+
+ResolutionTaskHolder@1003 {
+    <name not found> = ArrayList@1004[10] { ResolutionCandidate@1005, ResolutionCandidate@1006, ResolutionCandidate@1007, ... }
 }
 
 ResolutionTaskHolder@1008 {
-    <name not found> = ArrayList@1009[10] { ResolutionCandidate@1010, ResolutionCandidate@1011, ResolutionCandidate@1012, ... }
-    <name not found> = ArrayList@1013[10] { ResolutionCandidate@1010, ResolutionCandidate@1011, ResolutionCandidate@1012, ... }
+    <name not found> = ArrayList@1009[13] { ResolutionCandidate@1010, ResolutionCandidate@1011, ResolutionCandidate@1012, ... }
 }
 
-ResolutionTaskHolder@1014 {
-    <name not found> = ArrayList@1015[13] { ResolutionCandidate@1016, ResolutionCandidate@1017, ResolutionCandidate@1018, ... }
-    <name not found> = ArrayList@1019[14] { ResolutionCandidate@1016, ResolutionCandidate@1017, ResolutionCandidate@1020, ... }
+ResolutionTaskHolder@1013 {
+    <name not found> = ArrayList@1014[13] { ResolutionCandidate@1015, ResolutionCandidate@1016, ResolutionCandidate@1017, ... }
 }
 
-ResolutionTaskHolder@1021 {
-    <name not found> = ArrayList@1022[13] { ResolutionCandidate@1023, ResolutionCandidate@1024, ResolutionCandidate@1025, ... }
-    <name not found> = ArrayList@1026[14] { ResolutionCandidate@1023, ResolutionCandidate@1024, ResolutionCandidate@1027, ... }
-}
-
-ResolutionTaskHolder@1028 {
-    <name not found> = ArrayList@1029[1] { ResolutionCandidate@1030 }
-    <name not found> = ArrayList@1031[1] { ResolutionCandidate@1030 }
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
+ResolutionTaskHolder@1018 {
+    <name not found> = ArrayList@1019[1] { ResolutionCandidate@1020 }
     <name not found> = EmptyList@61[empty]
     <name not found> = EmptyList@61[empty]
     <name not found> = EmptyList@61[empty]
@@ -2162,526 +2150,424 @@ ResolutionTaskHolder@1028 {
     <name not found> = EmptyList@61[empty]
 }
 
-ResolutionTaskHolder@1032 {
-    <name not found> = ArrayList@1033[1] { ResolutionCandidate@1034 }
-    <name not found> = ArrayList@1035[1] { ResolutionCandidate@1034 }
+ResolutionTaskHolder@1021 {
+    <name not found> = ArrayList@1022[1] { ResolutionCandidate@1023 }
     <name not found> = EmptyList@61[empty]
     <name not found> = EmptyList@61[empty]
+}
+
+ResolutionTaskHolder@1024 {
+    <name not found> = ArrayList@1025[1] { ResolutionCandidate@1026 }
     <name not found> = EmptyList@61[empty]
     <name not found> = EmptyList@61[empty]
 }
 
+ResolutionTaskHolder@1027 {
+    <name not found> = ArrayList@1028[1] { ResolutionCandidate@1029 }
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+}
+
+ResolutionTaskHolder@1030 {
+    <name not found> = ArrayList@1031[1] { ResolutionCandidate@1032 }
+    <name not found> = EmptyList@61[empty]
+}
+
+ResolutionTaskHolder@1033 {
+    <name not found> = ArrayList@1034[1] { ResolutionCandidate@1035 }
+    <name not found> = EmptyList@61[empty]
+}
+
 ResolutionTaskHolder@1036 {
     <name not found> = ArrayList@1037[1] { ResolutionCandidate@1038 }
-    <name not found> = ArrayList@1039[1] { ResolutionCandidate@1038 }
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
     <name not found> = EmptyList@61[empty]
 }
 
-ResolutionTaskHolder@1040 {
-    <name not found> = ArrayList@1041[1] { ResolutionCandidate@1042 }
-    <name not found> = ArrayList@1043[1] { ResolutionCandidate@1042 }
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
+ResolutionTaskHolder@1039 {
+    <name not found> = ArrayList@1040[1] { ResolutionCandidate@1041 }
     <name not found> = EmptyList@61[empty]
 }
 
-ResolutionTaskHolder@1044 {
-    <name not found> = ArrayList@1045[1] { ResolutionCandidate@1046 }
-    <name not found> = ArrayList@1047[1] { ResolutionCandidate@1046 }
+ResolutionTaskHolder@1042 {
+    <name not found> = ArrayList@1043[1] { ResolutionCandidate@1044 }
     <name not found> = EmptyList@61[empty]
+}
+
+ResolutionTaskHolder@1045 {
+    <name not found> = ArrayList@1046[1] { ResolutionCandidate@1047 }
     <name not found> = EmptyList@61[empty]
 }
 
 ResolutionTaskHolder@1048 {
     <name not found> = ArrayList@1049[1] { ResolutionCandidate@1050 }
-    <name not found> = ArrayList@1051[1] { ResolutionCandidate@1050 }
-    <name not found> = EmptyList@61[empty]
     <name not found> = EmptyList@61[empty]
 }
 
-ResolutionTaskHolder@1052 {
-    <name not found> = ArrayList@1053[1] { ResolutionCandidate@1054 }
-    <name not found> = ArrayList@1055[1] { ResolutionCandidate@1054 }
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
+ResolutionTaskHolder@1051 {
+    <name not found> = ArrayList@1052[1] { ResolutionCandidate@1053 }
 }
 
-ResolutionTaskHolder@1056 {
-    <name not found> = ArrayList@1057[1] { ResolutionCandidate@1058 }
-    <name not found> = ArrayList@1059[1] { ResolutionCandidate@1058 }
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
+ResolutionTaskHolder@1054 {
+    <name not found> = ArrayList@1055[1] { ResolutionCandidate@1056 }
+}
+
+ResolutionTaskHolder@1057 {
+    <name not found> = ArrayList@1058[1] { ResolutionCandidate@1059 }
 }
 
 ResolutionTaskHolder@1060 {
     <name not found> = ArrayList@1061[1] { ResolutionCandidate@1062 }
-    <name not found> = ArrayList@1063[1] { ResolutionCandidate@1062 }
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
 }
 
-ResolutionTaskHolder@1064 {
-    <name not found> = ArrayList@1065[1] { ResolutionCandidate@1066 }
-    <name not found> = ArrayList@1067[1] { ResolutionCandidate@1066 }
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
+ResolutionTaskHolder@1063 {
+    <name not found> = ArrayList@1064[1] { ResolutionCandidate@1065 }
 }
 
-ResolutionTaskHolder@1068 {
-    <name not found> = ArrayList@1069[1] { ResolutionCandidate@1070 }
-    <name not found> = ArrayList@1071[1] { ResolutionCandidate@1070 }
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
+ResolutionTaskHolder@1066 {
+    <name not found> = ArrayList@1067[1] { ResolutionCandidate@1068 }
+}
+
+ResolutionTaskHolder@1069 {
+    <name not found> = ArrayList@1070[1] { ResolutionCandidate@1071 }
 }
 
 ResolutionTaskHolder@1072 {
     <name not found> = ArrayList@1073[1] { ResolutionCandidate@1074 }
-    <name not found> = ArrayList@1075[1] { ResolutionCandidate@1074 }
 }
 
-ResolutionTaskHolder@1076 {
-    <name not found> = ArrayList@1077[1] { ResolutionCandidate@1078 }
-    <name not found> = ArrayList@1079[1] { ResolutionCandidate@1078 }
+ResolutionTaskHolder@1075 {
+    <name not found> = ArrayList@1076[1] { ResolutionCandidate@1077 }
 }
 
-ResolutionTaskHolder@1080 {
-    <name not found> = ArrayList@1081[1] { ResolutionCandidate@1082 }
-    <name not found> = ArrayList@1083[1] { ResolutionCandidate@1082 }
+ResolutionTaskHolder@1078 {
+    <name not found> = ArrayList@1079[1] { ResolutionCandidate@1080 }
+}
+
+ResolutionTaskHolder@1081 {
+    <name not found> = ArrayList@1082[1] { ResolutionCandidate@1083 }
 }
 
 ResolutionTaskHolder@1084 {
     <name not found> = ArrayList@1085[1] { ResolutionCandidate@1086 }
-    <name not found> = ArrayList@1087[1] { ResolutionCandidate@1086 }
 }
 
-ResolutionTaskHolder@1088 {
-    <name not found> = ArrayList@1089[1] { ResolutionCandidate@1090 }
-    <name not found> = ArrayList@1091[1] { ResolutionCandidate@1090 }
+ResolutionTaskHolder@1087 {
+    <name not found> = ArrayList@1088[1] { ResolutionCandidate@1089 }
 }
 
-ResolutionTaskHolder@1092 {
-    <name not found> = ArrayList@1093[1] { ResolutionCandidate@1094 }
-    <name not found> = ArrayList@1095[1] { ResolutionCandidate@1094 }
+ResolutionTaskHolder@1090 {
+    <name not found> = ArrayList@1091[1] { ResolutionCandidate@1092 }
+}
+
+ResolutionTaskHolder@1093 {
+    <name not found> = ArrayList@1094[1] { ResolutionCandidate@1095 }
 }
 
 ResolutionTaskHolder@1096 {
     <name not found> = ArrayList@1097[1] { ResolutionCandidate@1098 }
-    <name not found> = ArrayList@1099[1] { ResolutionCandidate@1098 }
 }
 
-ResolutionTaskHolder@1100 {
-    <name not found> = ArrayList@1101[1] { ResolutionCandidate@1102 }
-    <name not found> = ArrayList@1103[1] { ResolutionCandidate@1102 }
+ResolutionTaskHolder@1099 {
+    <name not found> = ArrayList@1100[1] { ResolutionCandidate@1101 }
 }
 
-ResolutionTaskHolder@1104 {
-    <name not found> = ArrayList@1105[1] { ResolutionCandidate@1106 }
-    <name not found> = ArrayList@1107[1] { ResolutionCandidate@1106 }
+ResolutionTaskHolder@1102 {
+    <name not found> = ArrayList@1103[1] { ResolutionCandidate@1104 }
+}
+
+ResolutionTaskHolder@1105 {
+    <name not found> = ArrayList@1106[1] { ResolutionCandidate@1107 }
 }
 
 ResolutionTaskHolder@1108 {
     <name not found> = ArrayList@1109[1] { ResolutionCandidate@1110 }
-    <name not found> = ArrayList@1111[1] { ResolutionCandidate@1110 }
 }
 
-ResolutionTaskHolder@1112 {
-    <name not found> = ArrayList@1113[1] { ResolutionCandidate@1114 }
-    <name not found> = ArrayList@1115[1] { ResolutionCandidate@1114 }
+ResolutionTaskHolder@1111 {
+    <name not found> = ArrayList@1112[1] { ResolutionCandidate@1113 }
 }
 
-ResolutionTaskHolder@1116 {
-    <name not found> = ArrayList@1117[1] { ResolutionCandidate@1118 }
-    <name not found> = ArrayList@1119[1] { ResolutionCandidate@1118 }
+ResolutionTaskHolder@1114 {
+    <name not found> = ArrayList@1115[1] { ResolutionCandidate@1116 }
+}
+
+ResolutionTaskHolder@1117 {
+    <name not found> = ArrayList@1118[1] { ResolutionCandidate@1119 }
 }
 
 ResolutionTaskHolder@1120 {
     <name not found> = ArrayList@1121[1] { ResolutionCandidate@1122 }
-    <name not found> = ArrayList@1123[1] { ResolutionCandidate@1122 }
 }
 
-ResolutionTaskHolder@1124 {
-    <name not found> = ArrayList@1125[1] { ResolutionCandidate@1126 }
-    <name not found> = ArrayList@1127[1] { ResolutionCandidate@1126 }
+ResolutionTaskHolder@1123 {
+    <name not found> = ArrayList@1124[1] { ResolutionCandidate@1125 }
 }
 
-ResolutionTaskHolder@1128 {
-    <name not found> = ArrayList@1129[1] { ResolutionCandidate@1130 }
-    <name not found> = ArrayList@1131[1] { ResolutionCandidate@1130 }
+ResolutionTaskHolder@1126 {
+    <name not found> = ArrayList@1127[1] { ResolutionCandidate@1128 }
+}
+
+ResolutionTaskHolder@1129 {
+    <name not found> = ArrayList@1130[1] { ResolutionCandidate@1131 }
 }
 
 ResolutionTaskHolder@1132 {
     <name not found> = ArrayList@1133[1] { ResolutionCandidate@1134 }
-    <name not found> = ArrayList@1135[1] { ResolutionCandidate@1134 }
 }
 
-ResolutionTaskHolder@1136 {
-    <name not found> = ArrayList@1137[1] { ResolutionCandidate@1138 }
-    <name not found> = ArrayList@1139[1] { ResolutionCandidate@1138 }
+ResolutionTaskHolder@1135 {
+    <name not found> = ArrayList@1136[1] { ResolutionCandidate@1137 }
 }
 
-ResolutionTaskHolder@1140 {
-    <name not found> = ArrayList@1141[1] { ResolutionCandidate@1142 }
-    <name not found> = ArrayList@1143[1] { ResolutionCandidate@1142 }
+ResolutionTaskHolder@1138 {
+    <name not found> = ArrayList@1139[1] { ResolutionCandidate@1140 }
+}
+
+ResolutionTaskHolder@1141 {
+    <name not found> = ArrayList@1142[1] { ResolutionCandidate@1143 }
 }
 
 ResolutionTaskHolder@1144 {
     <name not found> = ArrayList@1145[1] { ResolutionCandidate@1146 }
-    <name not found> = ArrayList@1147[1] { ResolutionCandidate@1146 }
 }
 
-ResolutionTaskHolder@1148 {
-    <name not found> = ArrayList@1149[1] { ResolutionCandidate@1150 }
-    <name not found> = ArrayList@1151[1] { ResolutionCandidate@1150 }
+ResolutionTaskHolder@1147 {
+    <name not found> = ArrayList@1148[1] { ResolutionCandidate@1149 }
 }
 
-ResolutionTaskHolder@1152 {
-    <name not found> = ArrayList@1153[1] { ResolutionCandidate@1154 }
-    <name not found> = ArrayList@1155[1] { ResolutionCandidate@1154 }
+ResolutionTaskHolder@1150 {
+    <name not found> = ArrayList@1151[1] { ResolutionCandidate@1152 }
+}
+
+ResolutionTaskHolder@1153 {
+    <name not found> = ArrayList@1154[1] { ResolutionCandidate@1155 }
 }
 
 ResolutionTaskHolder@1156 {
     <name not found> = ArrayList@1157[1] { ResolutionCandidate@1158 }
-    <name not found> = ArrayList@1159[1] { ResolutionCandidate@1158 }
 }
 
-ResolutionTaskHolder@1160 {
-    <name not found> = ArrayList@1161[1] { ResolutionCandidate@1162 }
-    <name not found> = ArrayList@1163[1] { ResolutionCandidate@1162 }
+ResolutionTaskHolder@1159 {
+    <name not found> = ArrayList@1160[1] { ResolutionCandidate@1161 }
 }
 
-ResolutionTaskHolder@1164 {
-    <name not found> = ArrayList@1165[1] { ResolutionCandidate@1166 }
-    <name not found> = ArrayList@1167[1] { ResolutionCandidate@1166 }
+ResolutionTaskHolder@1162 {
+    <name not found> = ArrayList@1163[1] { ResolutionCandidate@1164 }
+}
+
+ResolutionTaskHolder@1165 {
+    <name not found> = ArrayList@1166[1] { ResolutionCandidate@1167 }
 }
 
 ResolutionTaskHolder@1168 {
     <name not found> = ArrayList@1169[1] { ResolutionCandidate@1170 }
-    <name not found> = ArrayList@1171[1] { ResolutionCandidate@1170 }
 }
 
-ResolutionTaskHolder@1172 {
-    <name not found> = ArrayList@1173[1] { ResolutionCandidate@1174 }
-    <name not found> = ArrayList@1175[1] { ResolutionCandidate@1174 }
+ResolutionTaskHolder@1171 {
+    <name not found> = ArrayList@1172[1] { ResolutionCandidate@1173 }
 }
 
-ResolutionTaskHolder@1176 {
-    <name not found> = ArrayList@1177[1] { ResolutionCandidate@1178 }
-    <name not found> = ArrayList@1179[1] { ResolutionCandidate@1178 }
+ResolutionTaskHolder@1174 {
+    <name not found> = ArrayList@1175[1] { ResolutionCandidate@1176 }
+}
+
+ResolutionTaskHolder@1177 {
+    <name not found> = ArrayList@1178[1] { ResolutionCandidate@1179 }
 }
 
 ResolutionTaskHolder@1180 {
     <name not found> = ArrayList@1181[1] { ResolutionCandidate@1182 }
-    <name not found> = ArrayList@1183[1] { ResolutionCandidate@1182 }
 }
 
-ResolutionTaskHolder@1184 {
-    <name not found> = ArrayList@1185[1] { ResolutionCandidate@1186 }
-    <name not found> = ArrayList@1187[1] { ResolutionCandidate@1186 }
+ResolutionTaskHolder@1183 {
+    <name not found> = ArrayList@1184[1] { ResolutionCandidate@1185 }
 }
 
-ResolutionTaskHolder@1188 {
-    <name not found> = ArrayList@1189[1] { ResolutionCandidate@1190 }
-    <name not found> = ArrayList@1191[1] { ResolutionCandidate@1190 }
+ResolutionTaskHolder@1186 {
+    <name not found> = ArrayList@1187[1] { ResolutionCandidate@1188 }
+}
+
+ResolutionTaskHolder@1189 {
+    <name not found> = ArrayList@1190[1] { ResolutionCandidate@1191 }
 }
 
 ResolutionTaskHolder@1192 {
     <name not found> = ArrayList@1193[1] { ResolutionCandidate@1194 }
-    <name not found> = ArrayList@1195[1] { ResolutionCandidate@1194 }
 }
 
-ResolutionTaskHolder@1196 {
-    <name not found> = ArrayList@1197[1] { ResolutionCandidate@1198 }
-    <name not found> = ArrayList@1199[1] { ResolutionCandidate@1198 }
+ResolutionTaskHolder@1195 {
+    <name not found> = ArrayList@1196[1] { ResolutionCandidate@1197 }
 }
 
-ResolutionTaskHolder@1200 {
-    <name not found> = ArrayList@1201[1] { ResolutionCandidate@1202 }
-    <name not found> = ArrayList@1203[1] { ResolutionCandidate@1202 }
+ResolutionTaskHolder@1198 {
+    <name not found> = ArrayList@1199[1] { ResolutionCandidate@1200 }
+}
+
+ResolutionTaskHolder@1201 {
+    <name not found> = ArrayList@1202[1] { ResolutionCandidate@1203 }
 }
 
 ResolutionTaskHolder@1204 {
     <name not found> = ArrayList@1205[1] { ResolutionCandidate@1206 }
-    <name not found> = ArrayList@1207[1] { ResolutionCandidate@1206 }
 }
 
-ResolutionTaskHolder@1208 {
-    <name not found> = ArrayList@1209[1] { ResolutionCandidate@1210 }
-    <name not found> = ArrayList@1211[1] { ResolutionCandidate@1210 }
+ResolutionTaskHolder@1207 {
+    <name not found> = ArrayList@1208[1] { ResolutionCandidate@1209 }
 }
 
-ResolutionTaskHolder@1212 {
-    <name not found> = ArrayList@1213[1] { ResolutionCandidate@1214 }
-    <name not found> = ArrayList@1215[1] { ResolutionCandidate@1214 }
+ResolutionTaskHolder@1210 {
+    <name not found> = ArrayList@1211[1] { ResolutionCandidate@1212 }
+}
+
+ResolutionTaskHolder@1213 {
+    <name not found> = ArrayList@1214[1] { ResolutionCandidate@1215 }
 }
 
 ResolutionTaskHolder@1216 {
     <name not found> = ArrayList@1217[1] { ResolutionCandidate@1218 }
-    <name not found> = ArrayList@1219[1] { ResolutionCandidate@1218 }
 }
 
-ResolutionTaskHolder@1220 {
-    <name not found> = ArrayList@1221[1] { ResolutionCandidate@1222 }
-    <name not found> = ArrayList@1223[1] { ResolutionCandidate@1222 }
+ResolutionTaskHolder@1219 {
+    <name not found> = ArrayList@1220[1] { ResolutionCandidate@1221 }
 }
 
-ResolutionTaskHolder@1224 {
-    <name not found> = ArrayList@1225[1] { ResolutionCandidate@1226 }
-    <name not found> = ArrayList@1227[1] { ResolutionCandidate@1226 }
+ResolutionTaskHolder@1222 {
+    <name not found> = ArrayList@1223[1] { ResolutionCandidate@1224 }
+}
+
+ResolutionTaskHolder@1225 {
+    <name not found> = ArrayList@1226[1] { ResolutionCandidate@1227 }
 }
 
 ResolutionTaskHolder@1228 {
     <name not found> = ArrayList@1229[1] { ResolutionCandidate@1230 }
-    <name not found> = ArrayList@1231[1] { ResolutionCandidate@1230 }
 }
 
-ResolutionTaskHolder@1232 {
-    <name not found> = ArrayList@1233[1] { ResolutionCandidate@1234 }
-    <name not found> = ArrayList@1235[1] { ResolutionCandidate@1234 }
+ResolutionTaskHolder@1231 {
+    <name not found> = ArrayList@1232[1] { ResolutionCandidate@1233 }
 }
 
-ResolutionTaskHolder@1236 {
-    <name not found> = ArrayList@1237[1] { ResolutionCandidate@1238 }
-    <name not found> = ArrayList@1239[1] { ResolutionCandidate@1238 }
+ResolutionTaskHolder@1234 {
+    <name not found> = ArrayList@1235[2] { ResolutionCandidate@1236, ResolutionCandidate@1237 }
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
 }
 
-ResolutionTaskHolder@1240 {
-    <name not found> = ArrayList@1241[1] { ResolutionCandidate@1242 }
-    <name not found> = ArrayList@1243[1] { ResolutionCandidate@1242 }
+ResolutionTaskHolder@1238 {
+    <name not found> = ArrayList@1239[2] { ResolutionCandidate@1240, ResolutionCandidate@1241 }
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
 }
 
-ResolutionTaskHolder@1244 {
-    <name not found> = ArrayList@1245[1] { ResolutionCandidate@1246 }
-    <name not found> = ArrayList@1247[1] { ResolutionCandidate@1246 }
+ResolutionTaskHolder@1242 {
+    <name not found> = ArrayList@1243[2] { ResolutionCandidate@1244, ResolutionCandidate@1245 }
 }
 
-ResolutionTaskHolder@1248 {
-    <name not found> = ArrayList@1249[1] { ResolutionCandidate@1250 }
-    <name not found> = ArrayList@1251[1] { ResolutionCandidate@1250 }
+ResolutionTaskHolder@1246 {
+    <name not found> = ArrayList@1247[2] { ResolutionCandidate@1248, ResolutionCandidate@1249 }
 }
 
-ResolutionTaskHolder@1252 {
-    <name not found> = ArrayList@1253[1] { ResolutionCandidate@1254 }
-    <name not found> = ArrayList@1255[1] { ResolutionCandidate@1254 }
+ResolutionTaskHolder@1250 {
+    <name not found> = ArrayList@1251[2] { ResolutionCandidate@1252, ResolutionCandidate@1253 }
 }
 
-ResolutionTaskHolder@1256 {
-    <name not found> = ArrayList@1257[1] { ResolutionCandidate@1258 }
-    <name not found> = ArrayList@1259[1] { ResolutionCandidate@1258 }
+ResolutionTaskHolder@1254 {
+    <name not found> = ArrayList@1255[3] { ResolutionCandidate@1256, ResolutionCandidate@1257, ResolutionCandidate@1258 }
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
 }
 
-ResolutionTaskHolder@1260 {
-    <name not found> = ArrayList@1261[1] { ResolutionCandidate@1262 }
-    <name not found> = ArrayList@1263[1] { ResolutionCandidate@1262 }
+ResolutionTaskHolder@1259 {
+    <name not found> = ArrayList@1260[4] { ResolutionCandidate@1261, ResolutionCandidate@1262, ResolutionCandidate@1263, ... }
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
 }
 
 ResolutionTaskHolder@1264 {
-    <name not found> = ArrayList@1265[1] { ResolutionCandidate@1266 }
-    <name not found> = ArrayList@1267[1] { ResolutionCandidate@1266 }
+    <name not found> = ArrayList@1265[4] { ResolutionCandidate@1266, ResolutionCandidate@1267, ResolutionCandidate@1268, ... }
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
 }
 
-ResolutionTaskHolder@1268 {
-    <name not found> = ArrayList@1269[1] { ResolutionCandidate@1270 }
-    <name not found> = ArrayList@1271[1] { ResolutionCandidate@1270 }
+ResolutionTaskHolder@1269 {
+    <name not found> = ArrayList@1270[4] { ResolutionCandidate@1271, ResolutionCandidate@1272, ResolutionCandidate@1273, ... }
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
 }
 
-ResolutionTaskHolder@1272 {
-    <name not found> = ArrayList@1273[1] { ResolutionCandidate@1274 }
-    <name not found> = ArrayList@1275[1] { ResolutionCandidate@1274 }
+ResolutionTaskHolder@1274 {
+    <name not found> = ArrayList@1275[4] { ResolutionCandidate@1276, ResolutionCandidate@1277, ResolutionCandidate@1278, ... }
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
 }
 
-ResolutionTaskHolder@1276 {
-    <name not found> = ArrayList@1277[1] { ResolutionCandidate@1278 }
-    <name not found> = ArrayList@1279[1] { ResolutionCandidate@1278 }
-}
-
-ResolutionTaskHolder@1280 {
-    <name not found> = ArrayList@1281[1] { ResolutionCandidate@1282 }
-    <name not found> = ArrayList@1283[1] { ResolutionCandidate@1282 }
+ResolutionTaskHolder@1279 {
+    <name not found> = ArrayList@1280[4] { ResolutionCandidate@1281, ResolutionCandidate@1282, ResolutionCandidate@1283, ... }
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
 }
 
 ResolutionTaskHolder@1284 {
-    <name not found> = ArrayList@1285[1] { ResolutionCandidate@1286 }
-    <name not found> = ArrayList@1287[1] { ResolutionCandidate@1286 }
+    <name not found> = ArrayList@1285[4] { ResolutionCandidate@1286, ResolutionCandidate@1287, ResolutionCandidate@1288, ... }
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
 }
 
-ResolutionTaskHolder@1288 {
-    <name not found> = ArrayList@1289[1] { ResolutionCandidate@1290 }
-    <name not found> = ArrayList@1291[1] { ResolutionCandidate@1290 }
+ResolutionTaskHolder@1289 {
+    <name not found> = ArrayList@1290[7] { ResolutionCandidate@1291, ResolutionCandidate@1292, ResolutionCandidate@1293, ... }
 }
 
-ResolutionTaskHolder@1292 {
-    <name not found> = ArrayList@1293[1] { ResolutionCandidate@1294 }
-    <name not found> = ArrayList@1295[1] { ResolutionCandidate@1294 }
+ResolutionTaskHolder@1294 {
+    <name not found> = ArrayList@1295[7] { ResolutionCandidate@1296, ResolutionCandidate@1297, ResolutionCandidate@1298, ... }
 }
 
-ResolutionTaskHolder@1296 {
-    <name not found> = ArrayList@1297[1] { ResolutionCandidate@1298 }
-    <name not found> = ArrayList@1299[1] { ResolutionCandidate@1298 }
-}
-
-ResolutionTaskHolder@1300 {
-    <name not found> = ArrayList@1301[1] { ResolutionCandidate@1302 }
-    <name not found> = ArrayList@1303[1] { ResolutionCandidate@1302 }
+ResolutionTaskHolder@1299 {
+    <name not found> = ArrayList@1300[7] { ResolutionCandidate@1301, ResolutionCandidate@1302, ResolutionCandidate@1303, ... }
 }
 
 ResolutionTaskHolder@1304 {
-    <name not found> = ArrayList@1305[1] { ResolutionCandidate@1306 }
-    <name not found> = ArrayList@1307[1] { ResolutionCandidate@1306 }
+    <name not found> = ArrayList@1305[7] { ResolutionCandidate@1306, ResolutionCandidate@1307, ResolutionCandidate@1308, ... }
 }
 
-ResolutionTaskHolder@1308 {
-    <name not found> = ArrayList@1309[1] { ResolutionCandidate@1310 }
-    <name not found> = ArrayList@1311[1] { ResolutionCandidate@1310 }
+ResolutionTaskHolder@1309 {
+    <name not found> = ArrayList@1310[7] { ResolutionCandidate@1311, ResolutionCandidate@1312, ResolutionCandidate@1313, ... }
 }
 
-ResolutionTaskHolder@1312 {
-    <name not found> = ArrayList@1313[1] { ResolutionCandidate@1314 }
-    <name not found> = ArrayList@1315[2] { ResolutionCandidate@1316, ResolutionCandidate@1314 }
+ResolutionTaskHolder@1314 {
+    <name not found> = ArrayList@1315[7] { ResolutionCandidate@1316, ResolutionCandidate@1317, ResolutionCandidate@1318, ... }
 }
 
-ResolutionTaskHolder@1317 {
-    <name not found> = ArrayList@1318[2] { ResolutionCandidate@1319, ResolutionCandidate@1320 }
-    <name not found> = ArrayList@1321[2] { ResolutionCandidate@1319, ResolutionCandidate@1320 }
+ResolutionTaskHolder@1319 {
+    <name not found> = ArrayList@1320[8] { ResolutionCandidate@1321, ResolutionCandidate@1322, ResolutionCandidate@1323, ... }
+}
+
+ResolutionTaskHolder@1324 {
+    <name not found> = ArrayList@1325[8] { ResolutionCandidate@1326, ResolutionCandidate@1327, ResolutionCandidate@1328, ... }
+}
+
+ResolutionTaskHolder@1329 {
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
     <name not found> = EmptyList@61[empty]
     <name not found> = EmptyList@61[empty]
     <name not found> = EmptyList@61[empty]
     <name not found> = EmptyList@61[empty]
 }
 
-ResolutionTaskHolder@1322 {
-    <name not found> = ArrayList@1323[2] { ResolutionCandidate@1324, ResolutionCandidate@1325 }
-    <name not found> = ArrayList@1326[2] { ResolutionCandidate@1324, ResolutionCandidate@1325 }
+ResolutionTaskHolder@1330 {
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
     <name not found> = EmptyList@61[empty]
     <name not found> = EmptyList@61[empty]
     <name not found> = EmptyList@61[empty]
     <name not found> = EmptyList@61[empty]
 }
 
-ResolutionTaskHolder@1327 {
-    <name not found> = ArrayList@1328[2] { ResolutionCandidate@1329, ResolutionCandidate@1330 }
-    <name not found> = ArrayList@1331[2] { ResolutionCandidate@1329, ResolutionCandidate@1330 }
-}
-
-ResolutionTaskHolder@1332 {
-    <name not found> = ArrayList@1333[2] { ResolutionCandidate@1334, ResolutionCandidate@1335 }
-    <name not found> = ArrayList@1336[2] { ResolutionCandidate@1334, ResolutionCandidate@1335 }
-}
-
-ResolutionTaskHolder@1337 {
-    <name not found> = ArrayList@1338[2] { ResolutionCandidate@1339, ResolutionCandidate@1340 }
-    <name not found> = ArrayList@1341[2] { ResolutionCandidate@1339, ResolutionCandidate@1340 }
-}
-
-ResolutionTaskHolder@1342 {
-    <name not found> = ArrayList@1343[3] { ResolutionCandidate@1344, ResolutionCandidate@1345, ResolutionCandidate@1346 }
-    <name not found> = ArrayList@1347[3] { ResolutionCandidate@1344, ResolutionCandidate@1345, ResolutionCandidate@1346 }
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-}
-
-ResolutionTaskHolder@1348 {
-    <name not found> = ArrayList@1349[4] { ResolutionCandidate@1350, ResolutionCandidate@1351, ResolutionCandidate@1352, ... }
-    <name not found> = ArrayList@1353[4] { ResolutionCandidate@1350, ResolutionCandidate@1351, ResolutionCandidate@1352, ... }
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-}
-
-ResolutionTaskHolder@1354 {
-    <name not found> = ArrayList@1355[4] { ResolutionCandidate@1356, ResolutionCandidate@1357, ResolutionCandidate@1358, ... }
-    <name not found> = ArrayList@1359[4] { ResolutionCandidate@1356, ResolutionCandidate@1357, ResolutionCandidate@1358, ... }
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-}
-
-ResolutionTaskHolder@1360 {
-    <name not found> = ArrayList@1361[4] { ResolutionCandidate@1362, ResolutionCandidate@1363, ResolutionCandidate@1364, ... }
-    <name not found> = ArrayList@1365[4] { ResolutionCandidate@1362, ResolutionCandidate@1363, ResolutionCandidate@1364, ... }
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-}
-
-ResolutionTaskHolder@1366 {
-    <name not found> = ArrayList@1367[4] { ResolutionCandidate@1368, ResolutionCandidate@1369, ResolutionCandidate@1370, ... }
-    <name not found> = ArrayList@1371[5] { ResolutionCandidate@1368, ResolutionCandidate@1369, ResolutionCandidate@1370, ... }
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-}
-
-ResolutionTaskHolder@1372 {
-    <name not found> = ArrayList@1373[4] { ResolutionCandidate@1374, ResolutionCandidate@1375, ResolutionCandidate@1376, ... }
-    <name not found> = ArrayList@1377[5] { ResolutionCandidate@1374, ResolutionCandidate@1375, ResolutionCandidate@1376, ... }
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-}
-
-ResolutionTaskHolder@1378 {
-    <name not found> = ArrayList@1379[4] { ResolutionCandidate@1380, ResolutionCandidate@1381, ResolutionCandidate@1382, ... }
-    <name not found> = ArrayList@1383[5] { ResolutionCandidate@1380, ResolutionCandidate@1381, ResolutionCandidate@1382, ... }
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-}
-
-ResolutionTaskHolder@1384 {
-    <name not found> = ArrayList@1385[7] { ResolutionCandidate@1386, ResolutionCandidate@1387, ResolutionCandidate@1388, ... }
-    <name not found> = ArrayList@1389[7] { ResolutionCandidate@1386, ResolutionCandidate@1387, ResolutionCandidate@1388, ... }
-}
-
-ResolutionTaskHolder@1390 {
-    <name not found> = ArrayList@1391[7] { ResolutionCandidate@1392, ResolutionCandidate@1393, ResolutionCandidate@1394, ... }
-    <name not found> = ArrayList@1395[7] { ResolutionCandidate@1392, ResolutionCandidate@1393, ResolutionCandidate@1394, ... }
-}
-
-ResolutionTaskHolder@1396 {
-    <name not found> = ArrayList@1397[7] { ResolutionCandidate@1398, ResolutionCandidate@1399, ResolutionCandidate@1400, ... }
-    <name not found> = ArrayList@1401[7] { ResolutionCandidate@1398, ResolutionCandidate@1399, ResolutionCandidate@1400, ... }
-}
-
-ResolutionTaskHolder@1402 {
-    <name not found> = ArrayList@1403[7] { ResolutionCandidate@1404, ResolutionCandidate@1405, ResolutionCandidate@1406, ... }
-    <name not found> = ArrayList@1407[7] { ResolutionCandidate@1404, ResolutionCandidate@1405, ResolutionCandidate@1406, ... }
-}
-
-ResolutionTaskHolder@1408 {
-    <name not found> = ArrayList@1409[7] { ResolutionCandidate@1410, ResolutionCandidate@1411, ResolutionCandidate@1412, ... }
-    <name not found> = ArrayList@1413[7] { ResolutionCandidate@1410, ResolutionCandidate@1411, ResolutionCandidate@1412, ... }
-}
-
-ResolutionTaskHolder@1414 {
-    <name not found> = ArrayList@1415[7] { ResolutionCandidate@1416, ResolutionCandidate@1417, ResolutionCandidate@1418, ... }
-    <name not found> = ArrayList@1419[7] { ResolutionCandidate@1416, ResolutionCandidate@1417, ResolutionCandidate@1418, ... }
-}
-
-ResolutionTaskHolder@1420 {
-    <name not found> = ArrayList@1421[8] { ResolutionCandidate@1422, ResolutionCandidate@1423, ResolutionCandidate@1424, ... }
-    <name not found> = ArrayList@1425[8] { ResolutionCandidate@1422, ResolutionCandidate@1423, ResolutionCandidate@1424, ... }
-}
-
-ResolutionTaskHolder@1426 {
-    <name not found> = ArrayList@1427[8] { ResolutionCandidate@1428, ResolutionCandidate@1429, ResolutionCandidate@1430, ... }
-    <name not found> = ArrayList@1431[8] { ResolutionCandidate@1428, ResolutionCandidate@1429, ResolutionCandidate@1430, ... }
-}
-
-ResolutionTaskHolder@1432 {
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
+ResolutionTaskHolder@1331 {
     <name not found> = EmptyList@61[empty]
     <name not found> = EmptyList@61[empty]
     <name not found> = EmptyList@61[empty]
@@ -2692,9 +2578,7 @@ ResolutionTaskHolder@1432 {
     <name not found> = EmptyList@61[empty]
 }
 
-ResolutionTaskHolder@1433 {
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
+ResolutionTaskHolder@1332 {
     <name not found> = EmptyList@61[empty]
     <name not found> = EmptyList@61[empty]
     <name not found> = EmptyList@61[empty]
@@ -2705,9 +2589,7 @@ ResolutionTaskHolder@1433 {
     <name not found> = EmptyList@61[empty]
 }
 
-ResolutionTaskHolder@1434 {
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
+ResolutionTaskHolder@1333 {
     <name not found> = EmptyList@61[empty]
     <name not found> = EmptyList@61[empty]
     <name not found> = EmptyList@61[empty]
@@ -2718,9 +2600,7 @@ ResolutionTaskHolder@1434 {
     <name not found> = EmptyList@61[empty]
 }
 
-ResolutionTaskHolder@1435 {
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
+ResolutionTaskHolder@1334 {
     <name not found> = EmptyList@61[empty]
     <name not found> = EmptyList@61[empty]
     <name not found> = EmptyList@61[empty]
@@ -2731,9 +2611,7 @@ ResolutionTaskHolder@1435 {
     <name not found> = EmptyList@61[empty]
 }
 
-ResolutionTaskHolder@1436 {
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
+ResolutionTaskHolder@1335 {
     <name not found> = EmptyList@61[empty]
     <name not found> = EmptyList@61[empty]
     <name not found> = EmptyList@61[empty]
@@ -2744,20 +2622,145 @@ ResolutionTaskHolder@1436 {
     <name not found> = EmptyList@61[empty]
 }
 
-ResolutionTaskHolder@1437 {
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-}
-
-ResolutionTaskHolder@1438 {
+null {
+    <name not found> = ArrayList@1336[10] { ResolutionCandidate@995, ResolutionCandidate@996, ResolutionCandidate@997, ... }
+    <name not found> = ArrayList@1337[10] { ResolutionCandidate@1005, ResolutionCandidate@1006, ResolutionCandidate@1007, ... }
+    <name not found> = ArrayList@1338[10] { ResolutionCandidate@985, ResolutionCandidate@986, ResolutionCandidate@987, ... }
+    <name not found> = ArrayList@1339[10] { ResolutionCandidate@990, ResolutionCandidate@991, ResolutionCandidate@992, ... }
+    <name not found> = ArrayList@1340[10] { ResolutionCandidate@980, ResolutionCandidate@981, ResolutionCandidate@982, ... }
+    <name not found> = ArrayList@1341[10] { ResolutionCandidate@1000, ResolutionCandidate@1001, ResolutionCandidate@1002, ... }
+    <name not found> = ArrayList@1342[14] { ResolutionCandidate@1010, ResolutionCandidate@1011, ResolutionCandidate@1343, ... }
+    <name not found> = ArrayList@1344[14] { ResolutionCandidate@1015, ResolutionCandidate@1016, ResolutionCandidate@1345, ... }
+    <name not found> = ArrayList@1346[1] { ResolutionCandidate@1194 }
+    <name not found> = ArrayList@1347[1] { ResolutionCandidate@1173 }
+    <name not found> = ArrayList@1348[1] { ResolutionCandidate@1101 }
+    <name not found> = ArrayList@1349[1] { ResolutionCandidate@1068 }
+    <name not found> = ArrayList@1350[1] { ResolutionCandidate@1092 }
+    <name not found> = ArrayList@1351[1] { ResolutionCandidate@1053 }
+    <name not found> = ArrayList@1352[1] { ResolutionCandidate@1077 }
+    <name not found> = ArrayList@1353[1] { ResolutionCandidate@1170 }
+    <name not found> = ArrayList@1354[1] { ResolutionCandidate@1164 }
+    <name not found> = ArrayList@1355[1] { ResolutionCandidate@1020 }
+    <name not found> = ArrayList@1356[1] { ResolutionCandidate@1206 }
+    <name not found> = ArrayList@1357[1] { ResolutionCandidate@1215 }
+    <name not found> = ArrayList@1358[1] { ResolutionCandidate@1146 }
+    <name not found> = ArrayList@1359[1] { ResolutionCandidate@1089 }
+    <name not found> = ArrayList@1360[1] { ResolutionCandidate@1113 }
+    <name not found> = ArrayList@1361[1] { ResolutionCandidate@1185 }
+    <name not found> = ArrayList@1362[1] { ResolutionCandidate@1098 }
+    <name not found> = ArrayList@1363[1] { ResolutionCandidate@1200 }
+    <name not found> = ArrayList@1364[1] { ResolutionCandidate@1149 }
+    <name not found> = ArrayList@1365[1] { ResolutionCandidate@1161 }
+    <name not found> = ArrayList@1366[1] { ResolutionCandidate@1167 }
+    <name not found> = ArrayList@1367[1] { ResolutionCandidate@1134 }
+    <name not found> = ArrayList@1368[1] { ResolutionCandidate@1188 }
+    <name not found> = ArrayList@1369[1] { ResolutionCandidate@1176 }
+    <name not found> = ArrayList@1370[1] { ResolutionCandidate@1056 }
+    <name not found> = ArrayList@1371[1] { ResolutionCandidate@1095 }
+    <name not found> = ArrayList@1372[1] { ResolutionCandidate@1023 }
+    <name not found> = ArrayList@1373[1] { ResolutionCandidate@1221 }
+    <name not found> = ArrayList@1374[1] { ResolutionCandidate@1212 }
+    <name not found> = ArrayList@1375[1] { ResolutionCandidate@1122 }
+    <name not found> = ArrayList@1376[1] { ResolutionCandidate@1107 }
+    <name not found> = ArrayList@1377[1] { ResolutionCandidate@1230 }
+    <name not found> = ArrayList@1378[1] { ResolutionCandidate@1029 }
+    <name not found> = ArrayList@1379[1] { ResolutionCandidate@1083 }
+    <name not found> = ArrayList@1380[1] { ResolutionCandidate@1071 }
+    <name not found> = ArrayList@1381[1] { ResolutionCandidate@1143 }
+    <name not found> = ArrayList@1382[1] { ResolutionCandidate@1080 }
+    <name not found> = ArrayList@1383[1] { ResolutionCandidate@1104 }
+    <name not found> = ArrayList@1384[1] { ResolutionCandidate@1197 }
+    <name not found> = ArrayList@1385[1] { ResolutionCandidate@1227 }
+    <name not found> = ArrayList@1386[1] { ResolutionCandidate@1044 }
+    <name not found> = ArrayList@1387[1] { ResolutionCandidate@1155 }
+    <name not found> = ArrayList@1388[1] { ResolutionCandidate@1128 }
+    <name not found> = ArrayList@1389[1] { ResolutionCandidate@1233 }
+    <name not found> = ArrayList@1390[1] { ResolutionCandidate@1131 }
+    <name not found> = ArrayList@1391[1] { ResolutionCandidate@1062 }
+    <name not found> = ArrayList@1392[1] { ResolutionCandidate@1203 }
+    <name not found> = ArrayList@1393[1] { ResolutionCandidate@1125 }
+    <name not found> = ArrayList@1394[1] { ResolutionCandidate@1119 }
+    <name not found> = ArrayList@1395[1] { ResolutionCandidate@1224 }
+    <name not found> = ArrayList@1396[1] { ResolutionCandidate@1158 }
+    <name not found> = ArrayList@1397[1] { ResolutionCandidate@1050 }
+    <name not found> = ArrayList@1398[1] { ResolutionCandidate@1179 }
+    <name not found> = ArrayList@1399[1] { ResolutionCandidate@1218 }
+    <name not found> = ArrayList@1400[1] { ResolutionCandidate@1035 }
+    <name not found> = ArrayList@1401[1] { ResolutionCandidate@1041 }
+    <name not found> = ArrayList@1402[1] { ResolutionCandidate@1209 }
+    <name not found> = ArrayList@1403[1] { ResolutionCandidate@1182 }
+    <name not found> = ArrayList@1404[1] { ResolutionCandidate@1047 }
+    <name not found> = ArrayList@1405[1] { ResolutionCandidate@1065 }
+    <name not found> = ArrayList@1406[1] { ResolutionCandidate@1074 }
+    <name not found> = ArrayList@1407[1] { ResolutionCandidate@1110 }
+    <name not found> = ArrayList@1408[1] { ResolutionCandidate@1140 }
+    <name not found> = ArrayList@1409[1] { ResolutionCandidate@1026 }
+    <name not found> = ArrayList@1410[1] { ResolutionCandidate@1059 }
+    <name not found> = ArrayList@1411[1] { ResolutionCandidate@1137 }
+    <name not found> = ArrayList@1412[1] { ResolutionCandidate@1032 }
+    <name not found> = ArrayList@1413[1] { ResolutionCandidate@1152 }
+    <name not found> = ArrayList@1414[1] { ResolutionCandidate@1191 }
+    <name not found> = ArrayList@1415[1] { ResolutionCandidate@1038 }
+    <name not found> = ArrayList@1416[1] { ResolutionCandidate@1116 }
+    <name not found> = ArrayList@1417[2] { ResolutionCandidate@1248, ResolutionCandidate@1249 }
+    <name not found> = ArrayList@1418[2] { ResolutionCandidate@1240, ResolutionCandidate@1241 }
+    <name not found> = ArrayList@1419[2] { ResolutionCandidate@1244, ResolutionCandidate@1245 }
+    <name not found> = ArrayList@1420[2] { ResolutionCandidate@1252, ResolutionCandidate@1253 }
+    <name not found> = ArrayList@1421[2] { ResolutionCandidate@1236, ResolutionCandidate@1237 }
+    <name not found> = ArrayList@1422[2] { ResolutionCandidate@1423, ResolutionCandidate@1086 }
+    <name not found> = ArrayList@1424[3] { ResolutionCandidate@1256, ResolutionCandidate@1257, ResolutionCandidate@1258 }
+    <name not found> = ArrayList@1425[4] { ResolutionCandidate@1261, ResolutionCandidate@1262, ResolutionCandidate@1263, ... }
+    <name not found> = ArrayList@1426[4] { ResolutionCandidate@1286, ResolutionCandidate@1287, ResolutionCandidate@1288, ... }
+    <name not found> = ArrayList@1427[4] { ResolutionCandidate@1276, ResolutionCandidate@1277, ResolutionCandidate@1278, ... }
+    <name not found> = ArrayList@1428[5] { ResolutionCandidate@1266, ResolutionCandidate@1267, ResolutionCandidate@1268, ... }
+    <name not found> = ArrayList@1429[5] { ResolutionCandidate@1271, ResolutionCandidate@1272, ResolutionCandidate@1273, ... }
+    <name not found> = ArrayList@1430[5] { ResolutionCandidate@1281, ResolutionCandidate@1282, ResolutionCandidate@1283, ... }
+    <name not found> = ArrayList@1431[7] { ResolutionCandidate@1301, ResolutionCandidate@1302, ResolutionCandidate@1303, ... }
+    <name not found> = ArrayList@1432[7] { ResolutionCandidate@1306, ResolutionCandidate@1307, ResolutionCandidate@1308, ... }
+    <name not found> = ArrayList@1433[7] { ResolutionCandidate@1316, ResolutionCandidate@1317, ResolutionCandidate@1318, ... }
+    <name not found> = ArrayList@1434[7] { ResolutionCandidate@1291, ResolutionCandidate@1292, ResolutionCandidate@1293, ... }
+    <name not found> = ArrayList@1435[7] { ResolutionCandidate@1296, ResolutionCandidate@1297, ResolutionCandidate@1298, ... }
+    <name not found> = ArrayList@1436[7] { ResolutionCandidate@1311, ResolutionCandidate@1312, ResolutionCandidate@1313, ... }
+    <name not found> = ArrayList@1437[8] { ResolutionCandidate@1321, ResolutionCandidate@1322, ResolutionCandidate@1323, ... }
+    <name not found> = ArrayList@1438[8] { ResolutionCandidate@1326, ResolutionCandidate@1327, ResolutionCandidate@1328, ... }
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
     <name not found> = EmptyList@61[empty]
     <name not found> = EmptyList@61[empty]
     <name not found> = EmptyList@61[empty]
diff --git a/compiler/testData/diagnostics/tests/regressions/ErrorsOnIbjectExpressionsAsParameters.lazy.log b/compiler/testData/diagnostics/tests/regressions/ErrorsOnIbjectExpressionsAsParameters.lazy.log
index 7bba66bc911..d86bb77c1aa 100644
--- a/compiler/testData/diagnostics/tests/regressions/ErrorsOnIbjectExpressionsAsParameters.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/ErrorsOnIbjectExpressionsAsParameters.lazy.log
@@ -38,9 +38,12 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@27 {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+}
+
+null {
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/Jet11.lazy.log b/compiler/testData/diagnostics/tests/regressions/Jet11.lazy.log
index 93471b7de2a..dd07b179c6b 100644
--- a/compiler/testData/diagnostics/tests/regressions/Jet11.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/Jet11.lazy.log
@@ -20,5 +20,8 @@ LazyJavaPackageFragment@6['java'] {
 
 ResolutionTaskHolder@20 {
     <name not found> = ArrayList@21[1] { ResolutionCandidate@22 }
+}
+
+null {
     <name not found> = ArrayList@23[1] { ResolutionCandidate@22 }
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/Jet121.lazy.log b/compiler/testData/diagnostics/tests/regressions/Jet121.lazy.log
index e43030a76d8..fcfd467f7f9 100644
--- a/compiler/testData/diagnostics/tests/regressions/Jet121.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/Jet121.lazy.log
@@ -43,8 +43,6 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@33 {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -54,63 +52,68 @@ ResolutionTaskHolder@33 {
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
+}
+
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
 }
 
 ResolutionTaskHolder@45 {
     <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
+}
+
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
 }
 
 ResolutionTaskHolder@57 {
     <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+null {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@59 }
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/Jet124.lazy.log b/compiler/testData/diagnostics/tests/regressions/Jet124.lazy.log
index ccc8fccc085..b7fa3e75f30 100644
--- a/compiler/testData/diagnostics/tests/regressions/Jet124.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/Jet124.lazy.log
@@ -42,38 +42,41 @@ LazyJavaPackageFragment@7['lang'] {
 
 ResolutionTaskHolder@27 {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
 }
 
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@19[empty]
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
     <name not found> = EmptyList@19[empty]
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@19[empty]
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
     <name not found> = EmptyList@19[empty]
 }
 
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+}
+
 ResolutionTaskHolder@39 {
     <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+null {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@38 }
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/Jet169.lazy.log b/compiler/testData/diagnostics/tests/regressions/Jet169.lazy.log
index 23614539dc5..d77b24df5d3 100644
--- a/compiler/testData/diagnostics/tests/regressions/Jet169.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/Jet169.lazy.log
@@ -42,39 +42,42 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@23[empty]
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
     <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+}
+
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
 }
 
 ResolutionTaskHolder@42 {
     <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[2] { ResolutionCandidate@50, ResolutionCandidate@51 }
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[2] { ResolutionCandidate@56, ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[2] { ResolutionCandidate@56, ResolutionCandidate@57 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[2] { ResolutionCandidate@54, ResolutionCandidate@55 }
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[2] { ResolutionCandidate@61, ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[2] { ResolutionCandidate@61, ResolutionCandidate@62 }
+null {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@62[2] { ResolutionCandidate@54, ResolutionCandidate@55 }
+    <name not found> = ArrayList@63[2] { ResolutionCandidate@50, ResolutionCandidate@51 }
+    <name not found> = EmptyList@23[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/Jet17.lazy.log b/compiler/testData/diagnostics/tests/regressions/Jet17.lazy.log
index 004e949683b..c43e480f441 100644
--- a/compiler/testData/diagnostics/tests/regressions/Jet17.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/Jet17.lazy.log
@@ -34,7 +34,10 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@24 {
     <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
-    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+}
+
+null {
+    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
     <name not found> = EmptyList@21[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/Jet183-1.lazy.log b/compiler/testData/diagnostics/tests/regressions/Jet183-1.lazy.log
index 238ded416c6..8e94811a117 100644
--- a/compiler/testData/diagnostics/tests/regressions/Jet183-1.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/Jet183-1.lazy.log
@@ -36,182 +36,236 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@27 {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
     <name not found> = EmptyList@24[empty]
+}
+
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
     <name not found> = EmptyList@24[empty]
 }
 
 ResolutionTaskHolder@39 {
     <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
 }
 
 ResolutionTaskHolder@51 {
     <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
 }
 
 ResolutionTaskHolder@63 {
     <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
 }
 
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
 }
 
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
 }
 
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
+ResolutionTaskHolder@72 {
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
+ResolutionTaskHolder@73 {
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@74 {
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -222,99 +276,7 @@ ResolutionTaskHolder@87 {
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@88 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@75 {
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -325,9 +287,7 @@ ResolutionTaskHolder@88 {
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@76 {
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -338,20 +298,63 @@ ResolutionTaskHolder@89 {
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@91 {
+null {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@44 }
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
diff --git a/compiler/testData/diagnostics/tests/regressions/Jet183.lazy.log b/compiler/testData/diagnostics/tests/regressions/Jet183.lazy.log
index 98214764fd2..8e534256828 100644
--- a/compiler/testData/diagnostics/tests/regressions/Jet183.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/Jet183.lazy.log
@@ -32,46 +32,20 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@23 {
     <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@25 }
-    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@26 {
+    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@29 {
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@32 {
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
@@ -154,27 +128,7 @@ ResolutionTaskHolder@35 {
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@36 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@33 {
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
@@ -257,7 +211,56 @@ ResolutionTaskHolder@36 {
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@37 {
+ResolutionTaskHolder@34 {
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+}
+
+null {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@25 }
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@28 }
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@31 }
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
diff --git a/compiler/testData/diagnostics/tests/regressions/Jet53.lazy.log b/compiler/testData/diagnostics/tests/regressions/Jet53.lazy.log
index 34bd0c63949..31ffbf9e181 100644
--- a/compiler/testData/diagnostics/tests/regressions/Jet53.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/Jet53.lazy.log
@@ -134,20 +134,23 @@ LazyJavaTypeParameterResolver@89 {
 
 ResolutionTaskHolder@91 {
     <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+}
+
+ResolutionTaskHolder@94 {
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@95 {
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
+null {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@93 }
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
diff --git a/compiler/testData/diagnostics/tests/regressions/Jet68.lazy.log b/compiler/testData/diagnostics/tests/regressions/Jet68.lazy.log
index 794ee60ccdd..a1c87f1db7e 100644
--- a/compiler/testData/diagnostics/tests/regressions/Jet68.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/Jet68.lazy.log
@@ -33,28 +33,31 @@ LazyJavaPackageFragment@7['lang'] {
 
 ResolutionTaskHolder@24 {
     <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@16[empty]
+    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
     <name not found> = EmptyList@16[empty]
 }
 
-ResolutionTaskHolder@31 {
+ResolutionTaskHolder@29 {
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
+    <name not found> = EmptyList@16[empty]
+}
+
+ResolutionTaskHolder@34 {
     <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
+}
+
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
+}
+
+null {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@26 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@28 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@33 }
     <name not found> = EmptyList@16[empty]
     <name not found> = EmptyList@16[empty]
 }
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/Jet69.lazy.log b/compiler/testData/diagnostics/tests/regressions/Jet69.lazy.log
index c89b287add3..5443ca9999a 100644
--- a/compiler/testData/diagnostics/tests/regressions/Jet69.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/Jet69.lazy.log
@@ -53,28 +53,31 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@41 {
     <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@45[2] { ResolutionCandidate@46, ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[2] { ResolutionCandidate@46, ResolutionCandidate@47 }
+    <name not found> = ArrayList@44[2] { ResolutionCandidate@45, ResolutionCandidate@46 }
+    <name not found> = EmptyList@33[empty]
+}
+
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
 }
 
 ResolutionTaskHolder@53 {
     <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+null {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@60[2] { ResolutionCandidate@45, ResolutionCandidate@46 }
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/Jet72.lazy.log b/compiler/testData/diagnostics/tests/regressions/Jet72.lazy.log
index 63cc0c8c89e..0882dff757a 100644
--- a/compiler/testData/diagnostics/tests/regressions/Jet72.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/Jet72.lazy.log
@@ -194,14 +194,14 @@ LazyJavaClassifierType@142['Cloneable'] {
     typeConstructor = DeserializedClassTypeConstructor@146
 }
 
-LazyJavaClassifierType@124['Closeable'] {
+LazyJavaClassifierType@119['Closeable'] {
     arguments = ArrayList@147[empty]
     classifier = JavaClassImpl@148['Closeable']
     memberScope = LazyJavaClassMemberScope@44
     typeConstructor = LazyJavaClassTypeConstructor@46['Closeable']
 }
 
-LazyJavaClassifierType@119['Closeable'] {
+LazyJavaClassifierType@124['Closeable'] {
     arguments = ArrayList@149[empty]
     classifier = JavaClassImpl@150['Closeable']
     memberScope = LazyJavaClassMemberScope@44
@@ -256,14 +256,14 @@ LazyJavaClassifierType@179['E'] {
     arguments = ArrayList@180[empty]
     classifier = JavaTypeParameterImpl@181['E']
     nullable = 'false': Boolean@156
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@171
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@182
 }
 
-LazyJavaClassifierType@182['E'] {
-    arguments = ArrayList@183[empty]
-    classifier = JavaTypeParameterImpl@184['E']
+LazyJavaClassifierType@183['E'] {
+    arguments = ArrayList@184[empty]
+    classifier = JavaTypeParameterImpl@185['E']
     nullable = 'false': Boolean@156
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@185
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@178
 }
 
 LazyJavaClassifierType@186['E'] {
@@ -277,21 +277,21 @@ LazyJavaClassifierType@189['E'] {
     arguments = ArrayList@190[empty]
     classifier = JavaTypeParameterImpl@191['E']
     nullable = 'false': Boolean@156
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@171
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@178
 }
 
 LazyJavaClassifierType@192['E'] {
     arguments = ArrayList@193[empty]
     classifier = JavaTypeParameterImpl@194['E']
     nullable = 'false': Boolean@156
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@178
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@182
 }
 
 LazyJavaClassifierType@195['E'] {
     arguments = ArrayList@196[empty]
     classifier = JavaTypeParameterImpl@197['E']
     nullable = 'false': Boolean@156
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@171
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@178
 }
 
 LazyJavaClassifierType@198['E'] {
@@ -305,112 +305,112 @@ LazyJavaClassifierType@201['E'] {
     arguments = ArrayList@202[empty]
     classifier = JavaTypeParameterImpl@203['E']
     nullable = 'false': Boolean@156
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@185
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@171
 }
 
 LazyJavaClassifierType@204['E'] {
     arguments = ArrayList@205[empty]
     classifier = JavaTypeParameterImpl@206['E']
     nullable = 'false': Boolean@156
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@185
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@178
 }
 
 LazyJavaClassifierType@207['E'] {
     arguments = ArrayList@208[empty]
     classifier = JavaTypeParameterImpl@209['E']
     nullable = 'false': Boolean@156
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@185
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@182
 }
 
 LazyJavaClassifierType@210['E'] {
     arguments = ArrayList@211[empty]
-    classifier = JavaTypeParameterImpl@209['E']
+    classifier = JavaTypeParameterImpl@185['E']
     nullable = 'true': Boolean@162
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@185
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@178
 }
 
 LazyJavaClassifierType@212['E'] {
     arguments = ArrayList@213[empty]
-    classifier = JavaTypeParameterImpl@188['E']
+    classifier = JavaTypeParameterImpl@170['E']
     nullable = 'true': Boolean@162
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@171
 }
 
 LazyJavaClassifierType@214['E'] {
     arguments = ArrayList@215[empty]
-    classifier = JavaTypeParameterImpl@197['E']
+    classifier = JavaTypeParameterImpl@181['E']
     nullable = 'true': Boolean@162
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@171
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@182
 }
 
 LazyJavaClassifierType@216['E'] {
     arguments = ArrayList@217[empty]
-    classifier = JavaTypeParameterImpl@200['E']
+    classifier = JavaTypeParameterImpl@188['E']
     nullable = 'true': Boolean@162
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@178
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@171
 }
 
 LazyJavaClassifierType@218['E'] {
     arguments = ArrayList@219[empty]
-    classifier = JavaTypeParameterImpl@184['E']
+    classifier = JavaTypeParameterImpl@191['E']
     nullable = 'true': Boolean@162
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@185
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@178
 }
 
 LazyJavaClassifierType@220['E'] {
     arguments = ArrayList@221[empty]
-    classifier = JavaTypeParameterImpl@194['E']
+    classifier = JavaTypeParameterImpl@177['E']
     nullable = 'true': Boolean@162
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@178
 }
 
 LazyJavaClassifierType@222['E'] {
     arguments = ArrayList@223[empty]
-    classifier = JavaTypeParameterImpl@191['E']
+    classifier = JavaTypeParameterImpl@203['E']
     nullable = 'true': Boolean@162
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@171
 }
 
 LazyJavaClassifierType@224['E'] {
     arguments = ArrayList@225[empty]
-    classifier = JavaTypeParameterImpl@177['E']
-    nullable = 'true': Boolean@162
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@178
-}
-
-LazyJavaClassifierType@226['E'] {
-    arguments = ArrayList@227[empty]
-    classifier = JavaTypeParameterImpl@206['E']
-    nullable = 'true': Boolean@162
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@185
-}
-
-LazyJavaClassifierType@228['E'] {
-    arguments = ArrayList@229[empty]
     classifier = JavaTypeParameterImpl@174['E']
     nullable = 'true': Boolean@162
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@171
 }
 
+LazyJavaClassifierType@226['E'] {
+    arguments = ArrayList@227[empty]
+    classifier = JavaTypeParameterImpl@209['E']
+    nullable = 'true': Boolean@162
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@182
+}
+
+LazyJavaClassifierType@228['E'] {
+    arguments = ArrayList@229[empty]
+    classifier = JavaTypeParameterImpl@200['E']
+    nullable = 'true': Boolean@162
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@178
+}
+
 LazyJavaClassifierType@230['E'] {
     arguments = ArrayList@231[empty]
-    classifier = JavaTypeParameterImpl@170['E']
+    classifier = JavaTypeParameterImpl@194['E']
     nullable = 'true': Boolean@162
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@171
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@182
 }
 
 LazyJavaClassifierType@232['E'] {
     arguments = ArrayList@233[empty]
-    classifier = JavaTypeParameterImpl@181['E']
+    classifier = JavaTypeParameterImpl@197['E']
     nullable = 'true': Boolean@162
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@171
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@178
 }
 
 LazyJavaClassifierType@234['E'] {
     arguments = ArrayList@235[empty]
-    classifier = JavaTypeParameterImpl@203['E']
+    classifier = JavaTypeParameterImpl@206['E']
     nullable = 'true': Boolean@162
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@185
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@178
 }
 
 LazyJavaClassifierType@122['FilterOutputStream'] {
@@ -451,7 +451,7 @@ LazyJavaClassifierType@251['Iterator<E>'] {
 
 LazyJavaClassifierType@256['Iterator<E>'] {
     arguments = ArrayList@257[1] { TypeProjectionImpl@258 }
-    classifier = JavaClassImpl@249['Iterator']
+    classifier = JavaClassImpl@243['Iterator']
     memberScope = SubstitutingScope@259
     nullable = 'true': Boolean@162
     typeConstructor = DeserializedClassTypeConstructor@260
@@ -459,7 +459,7 @@ LazyJavaClassifierType@256['Iterator<E>'] {
 
 LazyJavaClassifierType@261['Iterator<E>'] {
     arguments = ArrayList@262[1] { TypeProjectionImpl@263 }
-    classifier = JavaClassImpl@243['Iterator']
+    classifier = JavaClassImpl@249['Iterator']
     memberScope = SubstitutingScope@264
     nullable = 'true': Boolean@162
     typeConstructor = DeserializedClassTypeConstructor@260
@@ -473,14 +473,14 @@ LazyJavaClassifierType@265['Iterator<E>'] {
     typeConstructor = DeserializedClassTypeConstructor@260
 }
 
-LazyJavaClassifierType@105['List<E>'] {
+LazyJavaClassifierType@97['List<E>'] {
     arguments = ArrayList@269[1] { TypeProjectionImpl@270 }
     classifier = JavaClassImpl@271['List']
     memberScope = SubstitutingScope@272
     typeConstructor = DeserializedClassTypeConstructor@273
 }
 
-LazyJavaClassifierType@97['List<E>'] {
+LazyJavaClassifierType@105['List<E>'] {
     arguments = ArrayList@274[1] { TypeProjectionImpl@275 }
     classifier = JavaClassImpl@276['List']
     memberScope = SubstitutingScope@277
@@ -617,7 +617,7 @@ LazyJavaPackageFragmentProvider@316 {
     topLevelClasses(JavaClassImpl@139['Appendable']) = LazyJavaClassDescriptor@18['Appendable']
     topLevelClasses(JavaClassImpl@347['ArrayList']) = LazyJavaClassDescriptor@24['ArrayList']
     topLevelClasses(JavaClassImpl@141['AutoCloseable']) = LazyJavaClassDescriptor@39['AutoCloseable']
-    topLevelClasses(JavaClassImpl@148['Closeable']) = LazyJavaClassDescriptor@43['Closeable']
+    topLevelClasses(JavaClassImpl@150['Closeable']) = LazyJavaClassDescriptor@43['Closeable']
     topLevelClasses(JavaClassImpl@237['FilterOutputStream']) = LazyJavaClassDescriptor@47['FilterOutputStream']
     topLevelClasses(JavaClassImpl@348['Object']) = LazyJavaClassDescriptor@51['Object']
     topLevelClasses(JavaClassImpl@299['OutputStream']) = LazyJavaClassDescriptor@53['OutputStream']
@@ -668,126 +668,129 @@ LazyJavaPackageFragment@337['util'] {
 
 LazyJavaTypeParameterDescriptor@90['E'] {
     defaultType = JetTypeImpl@373['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@178
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@182
     upperBounds = LinkedHashSet@374[1] { NullableType@375 }
     upperBoundsAsType = NullableType@375
 }
 
 LazyJavaTypeParameterDescriptor@94['E'] {
     defaultType = JetTypeImpl@376['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@185
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@171
     upperBounds = LinkedHashSet@377[1] { NullableType@378 }
     upperBoundsAsType = NullableType@378
 }
 
 LazyJavaTypeParameterDescriptor@102['E'] {
     defaultType = JetTypeImpl@379['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@171
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@178
     upperBounds = LinkedHashSet@380[1] { NullableType@381 }
 }
 
 LazyJavaTypeParameterResolver@382 {
-    resolve(JavaTypeParameterImpl@383['E']) = LazyJavaTypeParameterDescriptor@90['E']
+    resolve(JavaTypeParameterImpl@383['E']) = LazyJavaTypeParameterDescriptor@94['E']
 }
 
 LazyJavaTypeParameterResolver@384 {
-    resolve(JavaTypeParameterImpl@385['E']) = LazyJavaTypeParameterDescriptor@102['E']
+    resolve(JavaTypeParameterImpl@385['E']) = LazyJavaTypeParameterDescriptor@90['E']
 }
 
 LazyJavaTypeParameterResolver@386 {
-    resolve(JavaTypeParameterImpl@387['E']) = LazyJavaTypeParameterDescriptor@94['E']
+    resolve(JavaTypeParameterImpl@387['E']) = LazyJavaTypeParameterDescriptor@102['E']
 }
 
 LazyJavaTypeParameterResolver@388 {
-    resolve(JavaTypeParameterImpl@209['E']) = null
+    resolve(JavaTypeParameterImpl@194['E']) = null
 }
 
 LazyJavaTypeParameterResolver@389 {
-    resolve(JavaTypeParameterImpl@177['E']) = null
+    resolve(JavaTypeParameterImpl@200['E']) = null
 }
 
 LazyJavaTypeParameterResolver@390 {
-    resolve(JavaTypeParameterImpl@191['E']) = null
+    resolve(JavaTypeParameterImpl@170['E']) = null
 }
 
 ResolutionTaskHolder@391 {
     <name not found> = ArrayList@392[10] { ResolutionCandidate@393, ResolutionCandidate@394, ResolutionCandidate@395, ... }
-    <name not found> = ArrayList@396[10] { ResolutionCandidate@393, ResolutionCandidate@394, ResolutionCandidate@395, ... }
 }
 
-ResolutionTaskHolder@397 {
-    <name not found> = ArrayList@398[1] { ResolutionCandidate@399 }
-    <name not found> = ArrayList@400[1] { ResolutionCandidate@399 }
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@396 {
+    <name not found> = ArrayList@397[1] { ResolutionCandidate@398 }
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@401 {
-    <name not found> = ArrayList@402[1] { ResolutionCandidate@403 }
-    <name not found> = ArrayList@404[1] { ResolutionCandidate@403 }
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@399 {
+    <name not found> = ArrayList@400[1] { ResolutionCandidate@401 }
     <name not found> = EmptyList@20[empty]
 }
 
+ResolutionTaskHolder@402 {
+    <name not found> = ArrayList@403[1] { ResolutionCandidate@404 }
+}
+
 ResolutionTaskHolder@405 {
     <name not found> = ArrayList@406[1] { ResolutionCandidate@407 }
-    <name not found> = ArrayList@408[1] { ResolutionCandidate@407 }
 }
 
-ResolutionTaskHolder@409 {
-    <name not found> = ArrayList@410[1] { ResolutionCandidate@411 }
-    <name not found> = ArrayList@412[1] { ResolutionCandidate@411 }
+ResolutionTaskHolder@408 {
+    <name not found> = ArrayList@409[1] { ResolutionCandidate@410 }
 }
 
-ResolutionTaskHolder@413 {
-    <name not found> = ArrayList@414[1] { ResolutionCandidate@415 }
-    <name not found> = ArrayList@416[1] { ResolutionCandidate@415 }
+ResolutionTaskHolder@411 {
+    <name not found> = ArrayList@412[1] { ResolutionCandidate@413 }
+}
+
+ResolutionTaskHolder@414 {
+    <name not found> = ArrayList@415[1] { ResolutionCandidate@416 }
 }
 
 ResolutionTaskHolder@417 {
     <name not found> = ArrayList@418[1] { ResolutionCandidate@419 }
-    <name not found> = ArrayList@420[1] { ResolutionCandidate@419 }
 }
 
-ResolutionTaskHolder@421 {
-    <name not found> = ArrayList@422[1] { ResolutionCandidate@423 }
-    <name not found> = ArrayList@424[1] { ResolutionCandidate@423 }
+ResolutionTaskHolder@420 {
+    <name not found> = ArrayList@421[1] { ResolutionCandidate@422 }
 }
 
-ResolutionTaskHolder@425 {
-    <name not found> = ArrayList@426[1] { ResolutionCandidate@427 }
-    <name not found> = ArrayList@428[1] { ResolutionCandidate@427 }
+ResolutionTaskHolder@423 {
+    <name not found> = ArrayList@424[1] { ResolutionCandidate@425 }
+}
+
+ResolutionTaskHolder@426 {
+    <name not found> = ArrayList@427[1] { ResolutionCandidate@428 }
 }
 
 ResolutionTaskHolder@429 {
-    <name not found> = ArrayList@430[1] { ResolutionCandidate@431 }
-    <name not found> = ArrayList@432[1] { ResolutionCandidate@431 }
+    <name not found> = ArrayList@430[3] { ResolutionCandidate@431, ResolutionCandidate@432, ResolutionCandidate@433 }
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@433 {
-    <name not found> = ArrayList@434[1] { ResolutionCandidate@435 }
-    <name not found> = ArrayList@436[1] { ResolutionCandidate@435 }
-}
-
-ResolutionTaskHolder@437 {
-    <name not found> = ArrayList@438[1] { ResolutionCandidate@439 }
-    <name not found> = ArrayList@440[1] { ResolutionCandidate@439 }
-}
-
-ResolutionTaskHolder@441 {
-    <name not found> = ArrayList@442[3] { ResolutionCandidate@443, ResolutionCandidate@444, ResolutionCandidate@445 }
-    <name not found> = ArrayList@446[3] { ResolutionCandidate@443, ResolutionCandidate@444, ResolutionCandidate@445 }
+ResolutionTaskHolder@434 {
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@447 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+null {
+    <name not found> = ArrayList@435[10] { ResolutionCandidate@393, ResolutionCandidate@394, ResolutionCandidate@395, ... }
+    <name not found> = ArrayList@436[1] { ResolutionCandidate@398 }
+    <name not found> = ArrayList@437[1] { ResolutionCandidate@416 }
+    <name not found> = ArrayList@438[1] { ResolutionCandidate@410 }
+    <name not found> = ArrayList@439[1] { ResolutionCandidate@428 }
+    <name not found> = ArrayList@440[1] { ResolutionCandidate@425 }
+    <name not found> = ArrayList@441[1] { ResolutionCandidate@404 }
+    <name not found> = ArrayList@442[1] { ResolutionCandidate@413 }
+    <name not found> = ArrayList@443[1] { ResolutionCandidate@401 }
+    <name not found> = ArrayList@444[1] { ResolutionCandidate@419 }
+    <name not found> = ArrayList@445[1] { ResolutionCandidate@422 }
+    <name not found> = ArrayList@446[1] { ResolutionCandidate@407 }
+    <name not found> = ArrayList@447[3] { ResolutionCandidate@431, ResolutionCandidate@432, ResolutionCandidate@433 }
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
diff --git a/compiler/testData/diagnostics/tests/regressions/Jet81.lazy.log b/compiler/testData/diagnostics/tests/regressions/Jet81.lazy.log
index dff7dd66e26..3368ebd5240 100644
--- a/compiler/testData/diagnostics/tests/regressions/Jet81.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/Jet81.lazy.log
@@ -63,26 +63,36 @@ LazyJavaPackageFragment@24['lang'] {
 
 ResolutionTaskHolder@39 {
     <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+}
+
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
     <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
@@ -91,81 +101,74 @@ ResolutionTaskHolder@49 {
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
     <name not found> = EmptyList@36[empty]
+}
+
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
     <name not found> = EmptyList@36[empty]
 }
 
 ResolutionTaskHolder@69 {
     <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
+}
+
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
 }
 
 ResolutionTaskHolder@81 {
     <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
+}
+
+null {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@62 }
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
 }
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/OutProjections.lazy.log b/compiler/testData/diagnostics/tests/regressions/OutProjections.lazy.log
index e21e970bfa4..3b7e42e7f85 100644
--- a/compiler/testData/diagnostics/tests/regressions/OutProjections.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/OutProjections.lazy.log
@@ -58,64 +58,67 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@37 {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
 ResolutionTaskHolder@49 {
     <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+null {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@48 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/OverrideResolution.lazy.log b/compiler/testData/diagnostics/tests/regressions/OverrideResolution.lazy.log
index 8123e6e1437..24e65f8aeed 100644
--- a/compiler/testData/diagnostics/tests/regressions/OverrideResolution.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/OverrideResolution.lazy.log
@@ -25,25 +25,28 @@ LazyJavaPackageFragment@7['java'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+}
+
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
 }
 
 ResolutionTaskHolder@37 {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+null {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@27 }
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@39 }
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/SpecififcityByReceiver.lazy.log b/compiler/testData/diagnostics/tests/regressions/SpecififcityByReceiver.lazy.log
index 7bcbc963550..8008dbff2a5 100644
--- a/compiler/testData/diagnostics/tests/regressions/SpecififcityByReceiver.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/SpecififcityByReceiver.lazy.log
@@ -39,20 +39,23 @@ LazyJavaPackageFragment@10['java'] {
 
 ResolutionTaskHolder@35 {
     <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+}
+
+null {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@46 }
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/TypeMismatchOnUnaryOperations.lazy.log b/compiler/testData/diagnostics/tests/regressions/TypeMismatchOnUnaryOperations.lazy.log
index 301404235d5..206ac4d3413 100644
--- a/compiler/testData/diagnostics/tests/regressions/TypeMismatchOnUnaryOperations.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/TypeMismatchOnUnaryOperations.lazy.log
@@ -31,70 +31,73 @@ LazyJavaPackageFragment@7['java'] {
 
 ResolutionTaskHolder@29 {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+}
+
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
 }
 
 ResolutionTaskHolder@41 {
     <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
+}
+
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
 }
 
 ResolutionTaskHolder@53 {
     <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
+}
+
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
 }
 
 ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@66[8] { ResolutionCandidate@67, ResolutionCandidate@68, ResolutionCandidate@69, ... }
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[8] { ResolutionCandidate@72, ResolutionCandidate@73, ResolutionCandidate@74, ... }
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[8] { ResolutionCandidate@79, ResolutionCandidate@80, ResolutionCandidate@81, ... }
-    <name not found> = ArrayList@82[8] { ResolutionCandidate@79, ResolutionCandidate@80, ResolutionCandidate@81, ... }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[8] { ResolutionCandidate@85, ResolutionCandidate@86, ResolutionCandidate@87, ... }
-    <name not found> = ArrayList@88[8] { ResolutionCandidate@85, ResolutionCandidate@86, ResolutionCandidate@87, ... }
+null {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@87[8] { ResolutionCandidate@67, ResolutionCandidate@68, ResolutionCandidate@69, ... }
+    <name not found> = ArrayList@88[8] { ResolutionCandidate@72, ResolutionCandidate@73, ResolutionCandidate@74, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/UnavaliableQualifiedThis.lazy.log b/compiler/testData/diagnostics/tests/regressions/UnavaliableQualifiedThis.lazy.log
index 3e08e36637f..b30054e654c 100644
--- a/compiler/testData/diagnostics/tests/regressions/UnavaliableQualifiedThis.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/UnavaliableQualifiedThis.lazy.log
@@ -47,22 +47,25 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@36 {
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+}
+
+null {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@44 }
+    <name not found> = EmptyList@28[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/WrongTraceInCallResolver.lazy.log b/compiler/testData/diagnostics/tests/regressions/WrongTraceInCallResolver.lazy.log
index bf2685845ba..c8f9acd2c57 100644
--- a/compiler/testData/diagnostics/tests/regressions/WrongTraceInCallResolver.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/WrongTraceInCallResolver.lazy.log
@@ -48,9 +48,12 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@39 {
     <name not found> = ArrayList@40[2] { ResolutionCandidate@41, ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[2] { ResolutionCandidate@41, ResolutionCandidate@42 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+}
+
+null {
+    <name not found> = ArrayList@43[2] { ResolutionCandidate@41, ResolutionCandidate@42 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/ea40964.lazy.log b/compiler/testData/diagnostics/tests/regressions/ea40964.lazy.log
index 465a630e950..2de7874d842 100644
--- a/compiler/testData/diagnostics/tests/regressions/ea40964.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/ea40964.lazy.log
@@ -108,7 +108,7 @@ LazyJavaClassifierType@74['K'] {
 
 LazyJavaClassifierType@76['K'] {
     arguments = ArrayList@77[empty]
-    classifier = JavaTypeParameterImpl@55['K']
+    classifier = JavaTypeParameterImpl@70['K']
     nullable = 'true': Boolean@73
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
 }
@@ -122,7 +122,7 @@ LazyJavaClassifierType@78['K'] {
 
 LazyJavaClassifierType@80['K'] {
     arguments = ArrayList@81[empty]
-    classifier = JavaTypeParameterImpl@70['K']
+    classifier = JavaTypeParameterImpl@55['K']
     nullable = 'true': Boolean@73
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
 }
@@ -143,14 +143,14 @@ LazyJavaClassifierType@89['Map<? extends K, ? extends V>'] {
     typeConstructor = DeserializedClassTypeConstructor@94
 }
 
-LazyJavaClassifierType@33['Map<K, V>'] {
+LazyJavaClassifierType@39['Map<K, V>'] {
     arguments = ArrayList@95[2] { TypeProjectionImpl@96, TypeProjectionImpl@97 }
     classifier = JavaClassImpl@98['Map']
     memberScope = SubstitutingScope@99
     typeConstructor = DeserializedClassTypeConstructor@88
 }
 
-LazyJavaClassifierType@39['Map<K, V>'] {
+LazyJavaClassifierType@33['Map<K, V>'] {
     arguments = ArrayList@100[2] { TypeProjectionImpl@101, TypeProjectionImpl@102 }
     classifier = JavaClassImpl@103['Map']
     memberScope = SubstitutingScope@104
@@ -175,7 +175,7 @@ LazyJavaClassifierType@110['Object'] {
 
 LazyJavaClassifierType@113['Object'] {
     arguments = ArrayList@114[empty]
-    classifier = JavaClassImpl@107['Object']
+    classifier = JavaClassImpl@112['Object']
     memberScope = DeserializedClassMemberScope@108
     nullable = 'true': Boolean@73
     typeConstructor = DeserializedClassTypeConstructor@109
@@ -183,7 +183,7 @@ LazyJavaClassifierType@113['Object'] {
 
 LazyJavaClassifierType@115['Object'] {
     arguments = ArrayList@116[empty]
-    classifier = JavaClassImpl@112['Object']
+    classifier = JavaClassImpl@107['Object']
     memberScope = DeserializedClassMemberScope@108
     nullable = 'true': Boolean@73
     typeConstructor = DeserializedClassTypeConstructor@109
@@ -217,35 +217,35 @@ LazyJavaClassifierType@128['V'] {
     arguments = ArrayList@129[empty]
     classifier = JavaTypeParameterImpl@130['V']
     nullable = 'false': Boolean@56
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
 
-LazyJavaClassifierType@132['V'] {
-    arguments = ArrayList@133[empty]
-    classifier = JavaTypeParameterImpl@134['V']
+LazyJavaClassifierType@131['V'] {
+    arguments = ArrayList@132[empty]
+    classifier = JavaTypeParameterImpl@133['V']
     nullable = 'false': Boolean@56
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
 
-LazyJavaClassifierType@135['V'] {
-    arguments = ArrayList@136[empty]
-    classifier = JavaTypeParameterImpl@137['V']
+LazyJavaClassifierType@134['V'] {
+    arguments = ArrayList@135[empty]
+    classifier = JavaTypeParameterImpl@136['V']
     nullable = 'false': Boolean@56
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
 
-LazyJavaClassifierType@138['V'] {
-    arguments = ArrayList@139[empty]
-    classifier = JavaTypeParameterImpl@140['V']
+LazyJavaClassifierType@137['V'] {
+    arguments = ArrayList@138[empty]
+    classifier = JavaTypeParameterImpl@139['V']
     nullable = 'false': Boolean@56
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@140
 }
 
 LazyJavaClassifierType@141['V'] {
     arguments = ArrayList@142[empty]
     classifier = JavaTypeParameterImpl@143['V']
     nullable = 'false': Boolean@56
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@140
 }
 
 LazyJavaClassifierType@144['V'] {
@@ -257,16 +257,16 @@ LazyJavaClassifierType@144['V'] {
 
 LazyJavaClassifierType@147['V'] {
     arguments = ArrayList@148[empty]
-    classifier = JavaTypeParameterImpl@134['V']
+    classifier = JavaTypeParameterImpl@133['V']
     nullable = 'true': Boolean@73
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
 
 LazyJavaClassifierType@149['V'] {
     arguments = ArrayList@150[empty]
-    classifier = JavaTypeParameterImpl@143['V']
+    classifier = JavaTypeParameterImpl@130['V']
     nullable = 'true': Boolean@73
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
 
 LazyJavaClassifierType@151['V'] {
@@ -278,30 +278,30 @@ LazyJavaClassifierType@151['V'] {
 
 LazyJavaClassifierType@153['V'] {
     arguments = ArrayList@154[empty]
-    classifier = JavaTypeParameterImpl@130['V']
+    classifier = JavaTypeParameterImpl@136['V']
     nullable = 'true': Boolean@73
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
 
 LazyJavaClassifierType@155['V'] {
     arguments = ArrayList@156[empty]
-    classifier = JavaTypeParameterImpl@140['V']
+    classifier = JavaTypeParameterImpl@146['V']
     nullable = 'true': Boolean@73
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
 
 LazyJavaClassifierType@157['V'] {
     arguments = ArrayList@158[empty]
-    classifier = JavaTypeParameterImpl@146['V']
+    classifier = JavaTypeParameterImpl@143['V']
     nullable = 'true': Boolean@73
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@140
 }
 
 LazyJavaClassifierType@159['V'] {
     arguments = ArrayList@160[empty]
-    classifier = JavaTypeParameterImpl@137['V']
+    classifier = JavaTypeParameterImpl@139['V']
     nullable = 'true': Boolean@73
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@140
 }
 
 LazyJavaPackageFragmentProvider@161 {
@@ -372,36 +372,30 @@ LazyJavaTypeParameterDescriptor@36['V'] {
 
 LazyJavaTypeParameterDescriptor@31['V'] {
     defaultType = JetTypeImpl@207['V']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@140
     upperBounds = LinkedHashSet@208[1] { NullableType@209 }
 }
 
 LazyJavaTypeParameterResolver@210 {
-    resolve(JavaTypeParameterImpl@211['K']) = LazyJavaTypeParameterDescriptor@30['K']
-    resolve(JavaTypeParameterImpl@212['V']) = LazyJavaTypeParameterDescriptor@31['V']
+    resolve(JavaTypeParameterImpl@211['K']) = LazyJavaTypeParameterDescriptor@35['K']
+    resolve(JavaTypeParameterImpl@212['V']) = LazyJavaTypeParameterDescriptor@36['V']
 }
 
 LazyJavaTypeParameterResolver@213 {
-    resolve(JavaTypeParameterImpl@214['K']) = LazyJavaTypeParameterDescriptor@35['K']
-    resolve(JavaTypeParameterImpl@215['V']) = LazyJavaTypeParameterDescriptor@36['V']
+    resolve(JavaTypeParameterImpl@214['K']) = LazyJavaTypeParameterDescriptor@30['K']
+    resolve(JavaTypeParameterImpl@215['V']) = LazyJavaTypeParameterDescriptor@31['V']
 }
 
 LazyJavaTypeParameterResolver@216 {
-    resolve(JavaTypeParameterImpl@143['V']) = null
+    resolve(JavaTypeParameterImpl@139['V']) = null
 }
 
 LazyJavaTypeParameterResolver@217 {
-    resolve(JavaTypeParameterImpl@140['V']) = null
+    resolve(JavaTypeParameterImpl@133['V']) = null
 }
 
 ResolutionTaskHolder@218 {
     <name not found> = ArrayList@219[1] { ResolutionCandidate@220 }
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@220 }
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
@@ -427,14 +421,23 @@ ResolutionTaskHolder@218 {
     <name not found> = EmptyList@8[empty]
 }
 
-ResolutionTaskHolder@222 {
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@224 }
+ResolutionTaskHolder@221 {
+    <name not found> = ArrayList@222[1] { ResolutionCandidate@223 }
 }
 
-ResolutionTaskHolder@226 {
-    <name not found> = ArrayList@227[4] { ResolutionCandidate@228, ResolutionCandidate@229, ResolutionCandidate@230, ... }
-    <name not found> = ArrayList@231[4] { ResolutionCandidate@228, ResolutionCandidate@229, ResolutionCandidate@230, ... }
+ResolutionTaskHolder@224 {
+    <name not found> = ArrayList@225[4] { ResolutionCandidate@226, ResolutionCandidate@227, ResolutionCandidate@228, ... }
+    <name not found> = EmptyList@8[empty]
+    <name not found> = EmptyList@8[empty]
+}
+
+null {
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@223 }
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@220 }
+    <name not found> = ArrayList@231[4] { ResolutionCandidate@226, ResolutionCandidate@227, ResolutionCandidate@228, ... }
+    <name not found> = EmptyList@8[empty]
+    <name not found> = EmptyList@8[empty]
+    <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
diff --git a/compiler/testData/diagnostics/tests/regressions/ea53340.lazy.log b/compiler/testData/diagnostics/tests/regressions/ea53340.lazy.log
index bdd0c780952..d0bc697d39d 100644
--- a/compiler/testData/diagnostics/tests/regressions/ea53340.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/ea53340.lazy.log
@@ -47,14 +47,17 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@38 {
     <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
+}
+
+null {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@43 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt127.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt127.lazy.log
index 8b92b4945af..91188b10fbb 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt127.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt127.lazy.log
@@ -49,14 +49,17 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@44[2] { ResolutionCandidate@45, ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[2] { ResolutionCandidate@45, ResolutionCandidate@46 }
-    <name not found> = EmptyList@32[empty]
+    <name not found> = ArrayList@43[2] { ResolutionCandidate@44, ResolutionCandidate@45 }
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+}
+
+null {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@51[2] { ResolutionCandidate@44, ResolutionCandidate@45 }
+    <name not found> = EmptyList@32[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt128.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt128.lazy.log
index 04f0b5ee0f5..bfe251c499d 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt128.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt128.lazy.log
@@ -38,16 +38,19 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@29 {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+}
+
+null {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@31 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
diff --git a/compiler/testData/diagnostics/tests/regressions/kt1489_1728.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt1489_1728.lazy.log
index 3ddcc60a41d..b0e28437bb4 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt1489_1728.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt1489_1728.lazy.log
@@ -61,14 +61,14 @@ LazyJavaClassifierType@32['String'] {
 
 LazyJavaClassifierType@35['String'] {
     arguments = ArrayList@36[empty]
-    classifier = JavaClassImpl@29['String']
+    classifier = JavaClassImpl@34['String']
     nullable = 'true': Boolean@37
     typeConstructor = DeserializedClassTypeConstructor@31
 }
 
 LazyJavaClassifierType@38['String'] {
     arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@34['String']
+    classifier = JavaClassImpl@29['String']
     nullable = 'true': Boolean@37
     typeConstructor = DeserializedClassTypeConstructor@31
 }
@@ -165,19 +165,7 @@ LazyJavaPackageFragment@64['lang'] {
 
 ResolutionTaskHolder@100 {
     <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
     <name not found> = EmptyList@92[empty]
     <name not found> = EmptyList@92[empty]
     <name not found> = EmptyList@92[empty]
@@ -226,52 +214,25 @@ ResolutionTaskHolder@100 {
     <name not found> = EmptyList@92[empty]
 }
 
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
-    <name not found> = EmptyList@92[empty]
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
     <name not found> = EmptyList@92[empty]
     <name not found> = EmptyList@92[empty]
     <name not found> = EmptyList@92[empty]
+}
+
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
     <name not found> = EmptyList@92[empty]
     <name not found> = EmptyList@92[empty]
 }
 
 ResolutionTaskHolder@111 {
     <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@113 }
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
 }
 
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@117 }
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[4] { ResolutionCandidate@121, ResolutionCandidate@122, ResolutionCandidate@123, ... }
-    <name not found> = ArrayList@124[4] { ResolutionCandidate@121, ResolutionCandidate@122, ResolutionCandidate@123, ... }
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[4] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
     <name not found> = EmptyList@92[empty]
     <name not found> = EmptyList@92[empty]
     <name not found> = EmptyList@92[empty]
@@ -292,7 +253,49 @@ ResolutionTaskHolder@119 {
     <name not found> = EmptyList@92[empty]
 }
 
-ResolutionTaskHolder@125 {
+ResolutionTaskHolder@119 {
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+}
+
+null {
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@113 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@125[4] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
     <name not found> = EmptyList@92[empty]
     <name not found> = EmptyList@92[empty]
     <name not found> = EmptyList@92[empty]
diff --git a/compiler/testData/diagnostics/tests/regressions/kt1550.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt1550.lazy.log
index 3307f19df4c..c626e4f5992 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt1550.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt1550.lazy.log
@@ -191,14 +191,14 @@ LazyJavaClassifierType@147['Cloneable'] {
     typeConstructor = DeserializedClassTypeConstructor@151
 }
 
-LazyJavaClassifierType@124['Closeable'] {
+LazyJavaClassifierType@129['Closeable'] {
     arguments = ArrayList@152[empty]
     classifier = JavaClassImpl@153['Closeable']
     memberScope = LazyJavaClassMemberScope@53
     typeConstructor = LazyJavaClassTypeConstructor@55['Closeable']
 }
 
-LazyJavaClassifierType@129['Closeable'] {
+LazyJavaClassifierType@124['Closeable'] {
     arguments = ArrayList@154[empty]
     classifier = JavaClassImpl@155['Closeable']
     memberScope = LazyJavaClassMemberScope@53
@@ -239,77 +239,77 @@ LazyJavaClassifierType@177['E'] {
     arguments = ArrayList@178[empty]
     classifier = JavaTypeParameterImpl@179['E']
     nullable = 'false': Boolean@161
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@180
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
 }
 
-LazyJavaClassifierType@181['E'] {
-    arguments = ArrayList@182[empty]
-    classifier = JavaTypeParameterImpl@183['E']
+LazyJavaClassifierType@180['E'] {
+    arguments = ArrayList@181[empty]
+    classifier = JavaTypeParameterImpl@182['E']
     nullable = 'false': Boolean@161
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@183
 }
 
 LazyJavaClassifierType@184['E'] {
     arguments = ArrayList@185[empty]
     classifier = JavaTypeParameterImpl@186['E']
     nullable = 'false': Boolean@161
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@183
 }
 
 LazyJavaClassifierType@187['E'] {
     arguments = ArrayList@188[empty]
     classifier = JavaTypeParameterImpl@189['E']
     nullable = 'false': Boolean@161
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@190
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@183
 }
 
-LazyJavaClassifierType@191['E'] {
-    arguments = ArrayList@192[empty]
-    classifier = JavaTypeParameterImpl@193['E']
+LazyJavaClassifierType@190['E'] {
+    arguments = ArrayList@191[empty]
+    classifier = JavaTypeParameterImpl@192['E']
     nullable = 'false': Boolean@161
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@193
 }
 
 LazyJavaClassifierType@194['E'] {
     arguments = ArrayList@195[empty]
     classifier = JavaTypeParameterImpl@196['E']
     nullable = 'false': Boolean@161
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@193
 }
 
 LazyJavaClassifierType@197['E'] {
     arguments = ArrayList@198[empty]
     classifier = JavaTypeParameterImpl@199['E']
     nullable = 'false': Boolean@161
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@180
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
 }
 
 LazyJavaClassifierType@200['E'] {
     arguments = ArrayList@201[empty]
     classifier = JavaTypeParameterImpl@202['E']
     nullable = 'false': Boolean@161
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@180
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@183
 }
 
 LazyJavaClassifierType@203['E'] {
     arguments = ArrayList@204[empty]
     classifier = JavaTypeParameterImpl@205['E']
     nullable = 'false': Boolean@161
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@180
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@183
 }
 
 LazyJavaClassifierType@206['E'] {
     arguments = ArrayList@207[empty]
     classifier = JavaTypeParameterImpl@208['E']
     nullable = 'false': Boolean@161
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@183
 }
 
 LazyJavaClassifierType@209['E'] {
     arguments = ArrayList@210[empty]
     classifier = JavaTypeParameterImpl@211['E']
     nullable = 'false': Boolean@161
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@190
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
 }
 
 LazyJavaClassifierType@212['E'] {
@@ -323,105 +323,105 @@ LazyJavaClassifierType@215['E'] {
     arguments = ArrayList@216[empty]
     classifier = JavaTypeParameterImpl@217['E']
     nullable = 'false': Boolean@161
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@180
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@183
 }
 
 LazyJavaClassifierType@218['E'] {
     arguments = ArrayList@219[empty]
-    classifier = JavaTypeParameterImpl@193['E']
+    classifier = JavaTypeParameterImpl@182['E']
     nullable = 'true': Boolean@167
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@183
 }
 
 LazyJavaClassifierType@220['E'] {
     arguments = ArrayList@221[empty]
-    classifier = JavaTypeParameterImpl@205['E']
+    classifier = JavaTypeParameterImpl@214['E']
     nullable = 'true': Boolean@167
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@180
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
 }
 
 LazyJavaClassifierType@222['E'] {
     arguments = ArrayList@223[empty]
-    classifier = JavaTypeParameterImpl@214['E']
+    classifier = JavaTypeParameterImpl@179['E']
     nullable = 'true': Boolean@167
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
 }
 
 LazyJavaClassifierType@224['E'] {
     arguments = ArrayList@225[empty]
-    classifier = JavaTypeParameterImpl@211['E']
+    classifier = JavaTypeParameterImpl@196['E']
     nullable = 'true': Boolean@167
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@190
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@193
 }
 
 LazyJavaClassifierType@226['E'] {
     arguments = ArrayList@227[empty]
-    classifier = JavaTypeParameterImpl@179['E']
-    nullable = 'true': Boolean@167
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@180
-}
-
-LazyJavaClassifierType@228['E'] {
-    arguments = ArrayList@229[empty]
-    classifier = JavaTypeParameterImpl@183['E']
+    classifier = JavaTypeParameterImpl@199['E']
     nullable = 'true': Boolean@167
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
 }
 
+LazyJavaClassifierType@228['E'] {
+    arguments = ArrayList@229[empty]
+    classifier = JavaTypeParameterImpl@186['E']
+    nullable = 'true': Boolean@167
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@183
+}
+
 LazyJavaClassifierType@230['E'] {
     arguments = ArrayList@231[empty]
-    classifier = JavaTypeParameterImpl@189['E']
+    classifier = JavaTypeParameterImpl@211['E']
     nullable = 'true': Boolean@167
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@190
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
 }
 
 LazyJavaClassifierType@232['E'] {
     arguments = ArrayList@233[empty]
     classifier = JavaTypeParameterImpl@202['E']
     nullable = 'true': Boolean@167
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@180
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@183
 }
 
 LazyJavaClassifierType@234['E'] {
     arguments = ArrayList@235[empty]
-    classifier = JavaTypeParameterImpl@196['E']
+    classifier = JavaTypeParameterImpl@175['E']
     nullable = 'true': Boolean@167
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
 }
 
 LazyJavaClassifierType@236['E'] {
     arguments = ArrayList@237[empty]
-    classifier = JavaTypeParameterImpl@208['E']
+    classifier = JavaTypeParameterImpl@189['E']
     nullable = 'true': Boolean@167
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@183
 }
 
 LazyJavaClassifierType@238['E'] {
     arguments = ArrayList@239[empty]
-    classifier = JavaTypeParameterImpl@175['E']
+    classifier = JavaTypeParameterImpl@217['E']
     nullable = 'true': Boolean@167
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@183
 }
 
 LazyJavaClassifierType@240['E'] {
     arguments = ArrayList@241[empty]
-    classifier = JavaTypeParameterImpl@186['E']
+    classifier = JavaTypeParameterImpl@205['E']
     nullable = 'true': Boolean@167
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@183
 }
 
 LazyJavaClassifierType@242['E'] {
     arguments = ArrayList@243[empty]
-    classifier = JavaTypeParameterImpl@217['E']
+    classifier = JavaTypeParameterImpl@208['E']
     nullable = 'true': Boolean@167
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@180
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@183
 }
 
 LazyJavaClassifierType@244['E'] {
     arguments = ArrayList@245[empty]
-    classifier = JavaTypeParameterImpl@199['E']
+    classifier = JavaTypeParameterImpl@192['E']
     nullable = 'true': Boolean@167
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@180
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@193
 }
 
 LazyJavaClassifierType@127['FilterOutputStream'] {
@@ -584,7 +584,7 @@ LazyJavaPackageFragmentProvider@297 {
     topLevelClasses(JavaClassImpl@144['Appendable']) = LazyJavaClassDescriptor@24['Appendable']
     topLevelClasses(JavaClassImpl@332['ArrayList']) = LazyJavaClassDescriptor@29['ArrayList']
     topLevelClasses(JavaClassImpl@146['AutoCloseable']) = LazyJavaClassDescriptor@48['AutoCloseable']
-    topLevelClasses(JavaClassImpl@155['Closeable']) = LazyJavaClassDescriptor@52['Closeable']
+    topLevelClasses(JavaClassImpl@153['Closeable']) = LazyJavaClassDescriptor@52['Closeable']
     topLevelClasses(JavaClassImpl@247['FilterOutputStream']) = LazyJavaClassDescriptor@56['FilterOutputStream']
     topLevelClasses(JavaClassImpl@280['OutputStream']) = LazyJavaClassDescriptor@60['OutputStream']
     topLevelClasses(JavaClassImpl@283['PrintStream']) = LazyJavaClassDescriptor@64['PrintStream']
@@ -621,170 +621,145 @@ LazyJavaPackageFragment@320['util'] {
     memberIndex = computeMemberIndex$1@349 // through LazyPackageFragmentScopeForJavaPackage@346
 }
 
-LazyJavaTypeParameterDescriptor@97['E'] {
+LazyJavaTypeParameterDescriptor@101['E'] {
     defaultType = JetTypeImpl@350['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@190
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
     upperBounds = LinkedHashSet@351[1] { NullableType@352 }
     upperBoundsAsType = NullableType@352
 }
 
-LazyJavaTypeParameterDescriptor@101['E'] {
+LazyJavaTypeParameterDescriptor@109['E'] {
     defaultType = JetTypeImpl@353['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@180
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@183
     upperBounds = LinkedHashSet@354[1] { NullableType@355 }
     upperBoundsAsType = NullableType@355
 }
 
-LazyJavaTypeParameterDescriptor@109['E'] {
+LazyJavaTypeParameterDescriptor@97['E'] {
     defaultType = JetTypeImpl@356['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@193
     upperBounds = LinkedHashSet@357[1] { NullableType@358 }
     upperBoundsAsType = NullableType@358
 }
 
 LazyJavaTypeParameterResolver@359 {
-    resolve(JavaTypeParameterImpl@360['E']) = LazyJavaTypeParameterDescriptor@97['E']
+    resolve(JavaTypeParameterImpl@360['E']) = LazyJavaTypeParameterDescriptor@109['E']
 }
 
 LazyJavaTypeParameterResolver@361 {
-    resolve(JavaTypeParameterImpl@362['E']) = LazyJavaTypeParameterDescriptor@101['E']
+    resolve(JavaTypeParameterImpl@362['E']) = LazyJavaTypeParameterDescriptor@97['E']
 }
 
 LazyJavaTypeParameterResolver@363 {
-    resolve(JavaTypeParameterImpl@364['E']) = LazyJavaTypeParameterDescriptor@109['E']
+    resolve(JavaTypeParameterImpl@364['E']) = LazyJavaTypeParameterDescriptor@101['E']
 }
 
 LazyJavaTypeParameterResolver@365 {
-    resolve(JavaTypeParameterImpl@208['E']) = null
+    resolve(JavaTypeParameterImpl@199['E']) = null
 }
 
 LazyJavaTypeParameterResolver@366 {
-    resolve(JavaTypeParameterImpl@175['E']) = null
+    resolve(JavaTypeParameterImpl@186['E']) = null
 }
 
 LazyJavaTypeParameterResolver@367 {
-    resolve(JavaTypeParameterImpl@202['E']) = null
+    resolve(JavaTypeParameterImpl@214['E']) = null
 }
 
 LazyJavaTypeParameterResolver@368 {
-    resolve(JavaTypeParameterImpl@205['E']) = null
+    resolve(JavaTypeParameterImpl@175['E']) = null
 }
 
 LazyJavaTypeParameterResolver@369 {
-    resolve(JavaTypeParameterImpl@179['E']) = null
+    resolve(JavaTypeParameterImpl@205['E']) = null
 }
 
 LazyJavaTypeParameterResolver@370 {
-    resolve(JavaTypeParameterImpl@211['E']) = null
+    resolve(JavaTypeParameterImpl@192['E']) = null
 }
 
 LazyJavaTypeParameterResolver@371 {
-    resolve(JavaTypeParameterImpl@183['E']) = null
+    resolve(JavaTypeParameterImpl@217['E']) = null
 }
 
 ResolutionTaskHolder@372 {
     <name not found> = ArrayList@373[10] { ResolutionCandidate@374, ResolutionCandidate@375, ResolutionCandidate@376, ... }
-    <name not found> = ArrayList@377[10] { ResolutionCandidate@374, ResolutionCandidate@375, ResolutionCandidate@376, ... }
 }
 
-ResolutionTaskHolder@378 {
-    <name not found> = ArrayList@379[10] { ResolutionCandidate@380, ResolutionCandidate@381, ResolutionCandidate@382, ... }
-    <name not found> = ArrayList@383[10] { ResolutionCandidate@380, ResolutionCandidate@381, ResolutionCandidate@382, ... }
+ResolutionTaskHolder@377 {
+    <name not found> = ArrayList@378[10] { ResolutionCandidate@379, ResolutionCandidate@380, ResolutionCandidate@381, ... }
 }
 
-ResolutionTaskHolder@384 {
-    <name not found> = ArrayList@385[10] { ResolutionCandidate@386, ResolutionCandidate@387, ResolutionCandidate@388, ... }
-    <name not found> = ArrayList@389[10] { ResolutionCandidate@386, ResolutionCandidate@387, ResolutionCandidate@388, ... }
+ResolutionTaskHolder@382 {
+    <name not found> = ArrayList@383[10] { ResolutionCandidate@384, ResolutionCandidate@385, ResolutionCandidate@386, ... }
+}
+
+ResolutionTaskHolder@387 {
+    <name not found> = ArrayList@388[1] { ResolutionCandidate@389 }
+    <name not found> = EmptyList@7[empty]
 }
 
 ResolutionTaskHolder@390 {
     <name not found> = ArrayList@391[1] { ResolutionCandidate@392 }
-    <name not found> = ArrayList@393[1] { ResolutionCandidate@392 }
-    <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
 }
 
-ResolutionTaskHolder@394 {
-    <name not found> = ArrayList@395[1] { ResolutionCandidate@396 }
-    <name not found> = ArrayList@397[1] { ResolutionCandidate@396 }
-    <name not found> = EmptyList@7[empty]
+ResolutionTaskHolder@393 {
+    <name not found> = ArrayList@394[1] { ResolutionCandidate@395 }
     <name not found> = EmptyList@7[empty]
 }
 
-ResolutionTaskHolder@398 {
-    <name not found> = ArrayList@399[1] { ResolutionCandidate@400 }
-    <name not found> = ArrayList@401[1] { ResolutionCandidate@400 }
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
+ResolutionTaskHolder@396 {
+    <name not found> = ArrayList@397[1] { ResolutionCandidate@398 }
+}
+
+ResolutionTaskHolder@399 {
+    <name not found> = ArrayList@400[1] { ResolutionCandidate@401 }
 }
 
 ResolutionTaskHolder@402 {
     <name not found> = ArrayList@403[1] { ResolutionCandidate@404 }
-    <name not found> = ArrayList@405[1] { ResolutionCandidate@404 }
 }
 
-ResolutionTaskHolder@406 {
-    <name not found> = ArrayList@407[1] { ResolutionCandidate@408 }
-    <name not found> = ArrayList@409[1] { ResolutionCandidate@408 }
+ResolutionTaskHolder@405 {
+    <name not found> = ArrayList@406[1] { ResolutionCandidate@407 }
 }
 
-ResolutionTaskHolder@410 {
-    <name not found> = ArrayList@411[1] { ResolutionCandidate@412 }
-    <name not found> = ArrayList@413[1] { ResolutionCandidate@412 }
+ResolutionTaskHolder@408 {
+    <name not found> = ArrayList@409[1] { ResolutionCandidate@410 }
+}
+
+ResolutionTaskHolder@411 {
+    <name not found> = ArrayList@412[1] { ResolutionCandidate@413 }
 }
 
 ResolutionTaskHolder@414 {
     <name not found> = ArrayList@415[1] { ResolutionCandidate@416 }
-    <name not found> = ArrayList@417[1] { ResolutionCandidate@416 }
 }
 
-ResolutionTaskHolder@418 {
-    <name not found> = ArrayList@419[1] { ResolutionCandidate@420 }
-    <name not found> = ArrayList@421[1] { ResolutionCandidate@420 }
+ResolutionTaskHolder@417 {
+    <name not found> = ArrayList@418[1] { ResolutionCandidate@419 }
 }
 
-ResolutionTaskHolder@422 {
-    <name not found> = ArrayList@423[1] { ResolutionCandidate@424 }
-    <name not found> = ArrayList@425[1] { ResolutionCandidate@424 }
+ResolutionTaskHolder@420 {
+    <name not found> = ArrayList@421[1] { ResolutionCandidate@422 }
 }
 
-ResolutionTaskHolder@426 {
-    <name not found> = ArrayList@427[1] { ResolutionCandidate@428 }
-    <name not found> = ArrayList@429[1] { ResolutionCandidate@428 }
+ResolutionTaskHolder@423 {
+    <name not found> = ArrayList@424[2] { ResolutionCandidate@425, ResolutionCandidate@426 }
 }
 
-ResolutionTaskHolder@430 {
-    <name not found> = ArrayList@431[1] { ResolutionCandidate@432 }
-    <name not found> = ArrayList@433[1] { ResolutionCandidate@432 }
-}
-
-ResolutionTaskHolder@434 {
-    <name not found> = ArrayList@435[1] { ResolutionCandidate@436 }
-    <name not found> = ArrayList@437[1] { ResolutionCandidate@436 }
-}
-
-ResolutionTaskHolder@438 {
-    <name not found> = ArrayList@439[2] { ResolutionCandidate@440, ResolutionCandidate@441 }
-    <name not found> = ArrayList@442[2] { ResolutionCandidate@440, ResolutionCandidate@441 }
-}
-
-ResolutionTaskHolder@443 {
-    <name not found> = ArrayList@444[3] { ResolutionCandidate@445, ResolutionCandidate@446, ResolutionCandidate@447 }
-    <name not found> = ArrayList@448[3] { ResolutionCandidate@445, ResolutionCandidate@446, ResolutionCandidate@447 }
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
+ResolutionTaskHolder@427 {
+    <name not found> = ArrayList@428[3] { ResolutionCandidate@429, ResolutionCandidate@430, ResolutionCandidate@431 }
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
 }
 
-ResolutionTaskHolder@449 {
-    <name not found> = ArrayList@450[8] { ResolutionCandidate@451, ResolutionCandidate@452, ResolutionCandidate@453, ... }
-    <name not found> = ArrayList@454[8] { ResolutionCandidate@451, ResolutionCandidate@452, ResolutionCandidate@453, ... }
+ResolutionTaskHolder@432 {
+    <name not found> = ArrayList@433[8] { ResolutionCandidate@434, ResolutionCandidate@435, ResolutionCandidate@436, ... }
 }
 
-ResolutionTaskHolder@455 {
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
+ResolutionTaskHolder@437 {
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
@@ -795,9 +770,7 @@ ResolutionTaskHolder@455 {
     <name not found> = EmptyList@7[empty]
 }
 
-ResolutionTaskHolder@456 {
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
+ResolutionTaskHolder@438 {
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
@@ -808,7 +781,37 @@ ResolutionTaskHolder@456 {
     <name not found> = EmptyList@7[empty]
 }
 
-ResolutionTaskHolder@457 {
+ResolutionTaskHolder@439 {
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+}
+
+null {
+    <name not found> = ArrayList@440[10] { ResolutionCandidate@374, ResolutionCandidate@375, ResolutionCandidate@376, ... }
+    <name not found> = ArrayList@441[10] { ResolutionCandidate@384, ResolutionCandidate@385, ResolutionCandidate@386, ... }
+    <name not found> = ArrayList@442[10] { ResolutionCandidate@379, ResolutionCandidate@380, ResolutionCandidate@381, ... }
+    <name not found> = ArrayList@443[1] { ResolutionCandidate@416 }
+    <name not found> = ArrayList@444[1] { ResolutionCandidate@395 }
+    <name not found> = ArrayList@445[1] { ResolutionCandidate@401 }
+    <name not found> = ArrayList@446[1] { ResolutionCandidate@422 }
+    <name not found> = ArrayList@447[1] { ResolutionCandidate@410 }
+    <name not found> = ArrayList@448[1] { ResolutionCandidate@389 }
+    <name not found> = ArrayList@449[1] { ResolutionCandidate@407 }
+    <name not found> = ArrayList@450[1] { ResolutionCandidate@419 }
+    <name not found> = ArrayList@451[1] { ResolutionCandidate@404 }
+    <name not found> = ArrayList@452[1] { ResolutionCandidate@392 }
+    <name not found> = ArrayList@453[1] { ResolutionCandidate@398 }
+    <name not found> = ArrayList@454[1] { ResolutionCandidate@413 }
+    <name not found> = ArrayList@455[2] { ResolutionCandidate@425, ResolutionCandidate@426 }
+    <name not found> = ArrayList@456[3] { ResolutionCandidate@429, ResolutionCandidate@430, ResolutionCandidate@431 }
+    <name not found> = ArrayList@457[8] { ResolutionCandidate@434, ResolutionCandidate@435, ResolutionCandidate@436, ... }
+    <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
diff --git a/compiler/testData/diagnostics/tests/regressions/kt1639-JFrame.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt1639-JFrame.lazy.log
index 28cc4e6904a..d6684d9d9b5 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt1639-JFrame.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt1639-JFrame.lazy.log
@@ -4047,84 +4047,84 @@ LazyJavaClassifierType@6643['AWTKeyStroke'] {
 
 LazyJavaClassifierType@6646['AWTKeyStroke'] {
     arguments = ArrayList@6647[empty]
-    classifier = JavaClassImpl@6639['AWTKeyStroke']
+    classifier = JavaClassImpl@6627['AWTKeyStroke']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1['AWTKeyStroke']
 }
 
 LazyJavaClassifierType@6648['AWTKeyStroke'] {
     arguments = ArrayList@6649[empty]
-    classifier = JavaClassImpl@6612['AWTKeyStroke']
+    classifier = JavaClassImpl@6621['AWTKeyStroke']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1['AWTKeyStroke']
 }
 
 LazyJavaClassifierType@6650['AWTKeyStroke'] {
     arguments = ArrayList@6651[empty]
-    classifier = JavaClassImpl@6627['AWTKeyStroke']
+    classifier = JavaClassImpl@6618['AWTKeyStroke']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1['AWTKeyStroke']
 }
 
 LazyJavaClassifierType@6652['AWTKeyStroke'] {
     arguments = ArrayList@6653[empty]
-    classifier = JavaClassImpl@6630['AWTKeyStroke']
+    classifier = JavaClassImpl@6612['AWTKeyStroke']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1['AWTKeyStroke']
 }
 
 LazyJavaClassifierType@6654['AWTKeyStroke'] {
     arguments = ArrayList@6655[empty]
-    classifier = JavaClassImpl@6621['AWTKeyStroke']
+    classifier = JavaClassImpl@6642['AWTKeyStroke']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1['AWTKeyStroke']
 }
 
 LazyJavaClassifierType@6656['AWTKeyStroke'] {
     arguments = ArrayList@6657[empty]
-    classifier = JavaClassImpl@6618['AWTKeyStroke']
+    classifier = JavaClassImpl@6630['AWTKeyStroke']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1['AWTKeyStroke']
 }
 
 LazyJavaClassifierType@6658['AWTKeyStroke'] {
     arguments = ArrayList@6659[empty]
-    classifier = JavaClassImpl@6636['AWTKeyStroke']
+    classifier = JavaClassImpl@6633['AWTKeyStroke']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1['AWTKeyStroke']
 }
 
 LazyJavaClassifierType@6660['AWTKeyStroke'] {
     arguments = ArrayList@6661[empty]
-    classifier = JavaClassImpl@6642['AWTKeyStroke']
+    classifier = JavaClassImpl@6645['AWTKeyStroke']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1['AWTKeyStroke']
 }
 
 LazyJavaClassifierType@6662['AWTKeyStroke'] {
     arguments = ArrayList@6663[empty]
-    classifier = JavaClassImpl@6645['AWTKeyStroke']
+    classifier = JavaClassImpl@6624['AWTKeyStroke']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1['AWTKeyStroke']
 }
 
 LazyJavaClassifierType@6664['AWTKeyStroke'] {
     arguments = ArrayList@6665[empty]
-    classifier = JavaClassImpl@6633['AWTKeyStroke']
+    classifier = JavaClassImpl@6615['AWTKeyStroke']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1['AWTKeyStroke']
 }
 
 LazyJavaClassifierType@6666['AWTKeyStroke'] {
     arguments = ArrayList@6667[empty]
-    classifier = JavaClassImpl@6615['AWTKeyStroke']
+    classifier = JavaClassImpl@6636['AWTKeyStroke']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1['AWTKeyStroke']
 }
 
 LazyJavaClassifierType@6668['AWTKeyStroke'] {
     arguments = ArrayList@6669[empty]
-    classifier = JavaClassImpl@6624['AWTKeyStroke']
+    classifier = JavaClassImpl@6639['AWTKeyStroke']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1['AWTKeyStroke']
 }
@@ -5016,7 +5016,7 @@ LazyJavaClassifierType@7011['Component'] {
 
 LazyJavaClassifierType@7014['Component'] {
     arguments = ArrayList@7015[empty]
-    classifier = JavaClassImpl@6830['Component']
+    classifier = JavaClassImpl@6851['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
@@ -5030,427 +5030,427 @@ LazyJavaClassifierType@7016['Component'] {
 
 LazyJavaClassifierType@7018['Component'] {
     arguments = ArrayList@7019[empty]
-    classifier = JavaClassImpl@6962['Component']
+    classifier = JavaClassImpl@6830['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7020['Component'] {
     arguments = ArrayList@7021[empty]
-    classifier = JavaClassImpl@6956['Component']
+    classifier = JavaClassImpl@6917['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7022['Component'] {
     arguments = ArrayList@7023[empty]
-    classifier = JavaClassImpl@6854['Component']
+    classifier = JavaClassImpl@6884['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7024['Component'] {
     arguments = ArrayList@7025[empty]
-    classifier = JavaClassImpl@6944['Component']
+    classifier = JavaClassImpl@6920['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7026['Component'] {
     arguments = ArrayList@7027[empty]
-    classifier = JavaClassImpl@7001['Component']
+    classifier = JavaClassImpl@6866['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7028['Component'] {
     arguments = ArrayList@7029[empty]
-    classifier = JavaClassImpl@6992['Component']
+    classifier = JavaClassImpl@6887['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7030['Component'] {
     arguments = ArrayList@7031[empty]
-    classifier = JavaClassImpl@6878['Component']
+    classifier = JavaClassImpl@6986['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7032['Component'] {
     arguments = ArrayList@7033[empty]
-    classifier = JavaClassImpl@6911['Component']
+    classifier = JavaClassImpl@6893['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7034['Component'] {
     arguments = ArrayList@7035[empty]
-    classifier = JavaClassImpl@6959['Component']
+    classifier = JavaClassImpl@6905['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7036['Component'] {
     arguments = ArrayList@7037[empty]
-    classifier = JavaClassImpl@7010['Component']
+    classifier = JavaClassImpl@6959['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7038['Component'] {
     arguments = ArrayList@7039[empty]
-    classifier = JavaClassImpl@6890['Component']
+    classifier = JavaClassImpl@6926['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7040['Component'] {
     arguments = ArrayList@7041[empty]
-    classifier = JavaClassImpl@6986['Component']
+    classifier = JavaClassImpl@6950['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7042['Component'] {
     arguments = ArrayList@7043[empty]
-    classifier = JavaClassImpl@6836['Component']
+    classifier = JavaClassImpl@6923['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7044['Component'] {
     arguments = ArrayList@7045[empty]
-    classifier = JavaClassImpl@6965['Component']
+    classifier = JavaClassImpl@6896['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7046['Component'] {
     arguments = ArrayList@7047[empty]
-    classifier = JavaClassImpl@6887['Component']
+    classifier = JavaClassImpl@6974['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7048['Component'] {
     arguments = ArrayList@7049[empty]
-    classifier = JavaClassImpl@6833['Component']
+    classifier = JavaClassImpl@6929['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7050['Component'] {
     arguments = ArrayList@7051[empty]
-    classifier = JavaClassImpl@6923['Component']
+    classifier = JavaClassImpl@6965['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7052['Component'] {
     arguments = ArrayList@7053[empty]
-    classifier = JavaClassImpl@6863['Component']
+    classifier = JavaClassImpl@7001['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7054['Component'] {
     arguments = ArrayList@7055[empty]
-    classifier = JavaClassImpl@6983['Component']
+    classifier = JavaClassImpl@6845['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7056['Component'] {
     arguments = ArrayList@7057[empty]
-    classifier = JavaClassImpl@6917['Component']
+    classifier = JavaClassImpl@6992['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7058['Component'] {
     arguments = ArrayList@7059[empty]
-    classifier = JavaClassImpl@6926['Component']
+    classifier = JavaClassImpl@6854['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7060['Component'] {
     arguments = ArrayList@7061[empty]
-    classifier = JavaClassImpl@6974['Component']
+    classifier = JavaClassImpl@6998['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7062['Component'] {
     arguments = ArrayList@7063[empty]
-    classifier = JavaClassImpl@6869['Component']
+    classifier = JavaClassImpl@6881['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7064['Component'] {
     arguments = ArrayList@7065[empty]
-    classifier = JavaClassImpl@7013['Component']
+    classifier = JavaClassImpl@6833['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7066['Component'] {
     arguments = ArrayList@7067[empty]
-    classifier = JavaClassImpl@6977['Component']
+    classifier = JavaClassImpl@6962['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7068['Component'] {
     arguments = ArrayList@7069[empty]
-    classifier = JavaClassImpl@6884['Component']
+    classifier = JavaClassImpl@6902['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7070['Component'] {
     arguments = ArrayList@7071[empty]
-    classifier = JavaClassImpl@6896['Component']
+    classifier = JavaClassImpl@6980['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7072['Component'] {
     arguments = ArrayList@7073[empty]
-    classifier = JavaClassImpl@6839['Component']
+    classifier = JavaClassImpl@7004['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7074['Component'] {
     arguments = ArrayList@7075[empty]
-    classifier = JavaClassImpl@6971['Component']
+    classifier = JavaClassImpl@6890['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7076['Component'] {
     arguments = ArrayList@7077[empty]
-    classifier = JavaClassImpl@6848['Component']
+    classifier = JavaClassImpl@6899['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7078['Component'] {
     arguments = ArrayList@7079[empty]
-    classifier = JavaClassImpl@6908['Component']
+    classifier = JavaClassImpl@6848['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7080['Component'] {
     arguments = ArrayList@7081[empty]
-    classifier = JavaClassImpl@6899['Component']
+    classifier = JavaClassImpl@6836['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7082['Component'] {
     arguments = ArrayList@7083[empty]
-    classifier = JavaClassImpl@6827['Component']
+    classifier = JavaClassImpl@6857['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7084['Component'] {
     arguments = ArrayList@7085[empty]
-    classifier = JavaClassImpl@6989['Component']
+    classifier = JavaClassImpl@6878['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7086['Component'] {
     arguments = ArrayList@7087[empty]
-    classifier = JavaClassImpl@6995['Component']
+    classifier = JavaClassImpl@6842['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7088['Component'] {
     arguments = ArrayList@7089[empty]
-    classifier = JavaClassImpl@6950['Component']
+    classifier = JavaClassImpl@7010['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7090['Component'] {
     arguments = ArrayList@7091[empty]
-    classifier = JavaClassImpl@6914['Component']
+    classifier = JavaClassImpl@6968['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7092['Component'] {
     arguments = ArrayList@7093[empty]
-    classifier = JavaClassImpl@6935['Component']
+    classifier = JavaClassImpl@6938['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7094['Component'] {
     arguments = ArrayList@7095[empty]
-    classifier = JavaClassImpl@6998['Component']
+    classifier = JavaClassImpl@6827['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7096['Component'] {
     arguments = ArrayList@7097[empty]
-    classifier = JavaClassImpl@6845['Component']
+    classifier = JavaClassImpl@7013['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7098['Component'] {
     arguments = ArrayList@7099[empty]
-    classifier = JavaClassImpl@6860['Component']
+    classifier = JavaClassImpl@6869['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7100['Component'] {
     arguments = ArrayList@7101[empty]
-    classifier = JavaClassImpl@6941['Component']
+    classifier = JavaClassImpl@6872['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7102['Component'] {
     arguments = ArrayList@7103[empty]
-    classifier = JavaClassImpl@6866['Component']
+    classifier = JavaClassImpl@6956['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7104['Component'] {
     arguments = ArrayList@7105[empty]
-    classifier = JavaClassImpl@7007['Component']
+    classifier = JavaClassImpl@6911['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7106['Component'] {
     arguments = ArrayList@7107[empty]
-    classifier = JavaClassImpl@6980['Component']
+    classifier = JavaClassImpl@6989['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7108['Component'] {
     arguments = ArrayList@7109[empty]
-    classifier = JavaClassImpl@6929['Component']
+    classifier = JavaClassImpl@6971['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7110['Component'] {
     arguments = ArrayList@7111[empty]
-    classifier = JavaClassImpl@6842['Component']
+    classifier = JavaClassImpl@6977['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7112['Component'] {
     arguments = ArrayList@7113[empty]
-    classifier = JavaClassImpl@6893['Component']
+    classifier = JavaClassImpl@6860['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7114['Component'] {
     arguments = ArrayList@7115[empty]
-    classifier = JavaClassImpl@6902['Component']
+    classifier = JavaClassImpl@6875['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7116['Component'] {
     arguments = ArrayList@7117[empty]
-    classifier = JavaClassImpl@6932['Component']
+    classifier = JavaClassImpl@6953['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7118['Component'] {
     arguments = ArrayList@7119[empty]
-    classifier = JavaClassImpl@6851['Component']
+    classifier = JavaClassImpl@7007['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7120['Component'] {
     arguments = ArrayList@7121[empty]
-    classifier = JavaClassImpl@6857['Component']
+    classifier = JavaClassImpl@6944['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7122['Component'] {
     arguments = ArrayList@7123[empty]
-    classifier = JavaClassImpl@6872['Component']
+    classifier = JavaClassImpl@6995['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7124['Component'] {
     arguments = ArrayList@7125[empty]
-    classifier = JavaClassImpl@6881['Component']
+    classifier = JavaClassImpl@6863['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7126['Component'] {
     arguments = ArrayList@7127[empty]
-    classifier = JavaClassImpl@6938['Component']
+    classifier = JavaClassImpl@6914['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7128['Component'] {
     arguments = ArrayList@7129[empty]
-    classifier = JavaClassImpl@6953['Component']
+    classifier = JavaClassImpl@6935['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7130['Component'] {
     arguments = ArrayList@7131[empty]
-    classifier = JavaClassImpl@7004['Component']
+    classifier = JavaClassImpl@6932['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7132['Component'] {
     arguments = ArrayList@7133[empty]
-    classifier = JavaClassImpl@6905['Component']
+    classifier = JavaClassImpl@6983['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7134['Component'] {
     arguments = ArrayList@7135[empty]
-    classifier = JavaClassImpl@6875['Component']
+    classifier = JavaClassImpl@6908['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7136['Component'] {
     arguments = ArrayList@7137[empty]
-    classifier = JavaClassImpl@6968['Component']
+    classifier = JavaClassImpl@6941['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7138['Component'] {
     arguments = ArrayList@7139[empty]
-    classifier = JavaClassImpl@6920['Component']
+    classifier = JavaClassImpl@6839['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
@@ -5748,147 +5748,147 @@ LazyJavaClassifierType@7246['Container'] {
 
 LazyJavaClassifierType@7249['Container'] {
     arguments = ArrayList@7250[empty]
-    classifier = JavaClassImpl@7245['Container']
+    classifier = JavaClassImpl@7239['Container']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
 }
 
 LazyJavaClassifierType@7251['Container'] {
     arguments = ArrayList@7252[empty]
-    classifier = JavaClassImpl@7191['Container']
+    classifier = JavaClassImpl@7230['Container']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
 }
 
 LazyJavaClassifierType@7253['Container'] {
     arguments = ArrayList@7254[empty]
-    classifier = JavaClassImpl@7239['Container']
+    classifier = JavaClassImpl@7200['Container']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
 }
 
 LazyJavaClassifierType@7255['Container'] {
     arguments = ArrayList@7256[empty]
-    classifier = JavaClassImpl@7188['Container']
+    classifier = JavaClassImpl@7209['Container']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
 }
 
 LazyJavaClassifierType@7257['Container'] {
     arguments = ArrayList@7258[empty]
-    classifier = JavaClassImpl@7212['Container']
+    classifier = JavaClassImpl@7224['Container']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
 }
 
 LazyJavaClassifierType@7259['Container'] {
     arguments = ArrayList@7260[empty]
-    classifier = JavaClassImpl@7215['Container']
+    classifier = JavaClassImpl@7218['Container']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
 }
 
 LazyJavaClassifierType@7261['Container'] {
     arguments = ArrayList@7262[empty]
-    classifier = JavaClassImpl@7197['Container']
+    classifier = JavaClassImpl@7191['Container']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
 }
 
 LazyJavaClassifierType@7263['Container'] {
     arguments = ArrayList@7264[empty]
-    classifier = JavaClassImpl@7242['Container']
+    classifier = JavaClassImpl@7206['Container']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
 }
 
 LazyJavaClassifierType@7265['Container'] {
     arguments = ArrayList@7266[empty]
-    classifier = JavaClassImpl@7209['Container']
+    classifier = JavaClassImpl@7236['Container']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
 }
 
 LazyJavaClassifierType@7267['Container'] {
     arguments = ArrayList@7268[empty]
-    classifier = JavaClassImpl@7203['Container']
+    classifier = JavaClassImpl@7227['Container']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
 }
 
 LazyJavaClassifierType@7269['Container'] {
     arguments = ArrayList@7270[empty]
-    classifier = JavaClassImpl@7194['Container']
+    classifier = JavaClassImpl@7245['Container']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
 }
 
 LazyJavaClassifierType@7271['Container'] {
     arguments = ArrayList@7272[empty]
-    classifier = JavaClassImpl@7224['Container']
+    classifier = JavaClassImpl@7203['Container']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
 }
 
 LazyJavaClassifierType@7273['Container'] {
     arguments = ArrayList@7274[empty]
-    classifier = JavaClassImpl@7227['Container']
+    classifier = JavaClassImpl@7248['Container']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
 }
 
 LazyJavaClassifierType@7275['Container'] {
     arguments = ArrayList@7276[empty]
-    classifier = JavaClassImpl@7221['Container']
+    classifier = JavaClassImpl@7233['Container']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
 }
 
 LazyJavaClassifierType@7277['Container'] {
     arguments = ArrayList@7278[empty]
-    classifier = JavaClassImpl@7206['Container']
+    classifier = JavaClassImpl@7212['Container']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
 }
 
 LazyJavaClassifierType@7279['Container'] {
     arguments = ArrayList@7280[empty]
-    classifier = JavaClassImpl@7248['Container']
+    classifier = JavaClassImpl@7215['Container']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
 }
 
 LazyJavaClassifierType@7281['Container'] {
     arguments = ArrayList@7282[empty]
-    classifier = JavaClassImpl@7200['Container']
+    classifier = JavaClassImpl@7197['Container']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
 }
 
 LazyJavaClassifierType@7283['Container'] {
     arguments = ArrayList@7284[empty]
-    classifier = JavaClassImpl@7236['Container']
+    classifier = JavaClassImpl@7194['Container']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
 }
 
 LazyJavaClassifierType@7285['Container'] {
     arguments = ArrayList@7286[empty]
-    classifier = JavaClassImpl@7233['Container']
+    classifier = JavaClassImpl@7242['Container']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
 }
 
 LazyJavaClassifierType@7287['Container'] {
     arguments = ArrayList@7288[empty]
-    classifier = JavaClassImpl@7218['Container']
+    classifier = JavaClassImpl@7221['Container']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
 }
 
 LazyJavaClassifierType@7289['Container'] {
     arguments = ArrayList@7290[empty]
-    classifier = JavaClassImpl@7230['Container']
+    classifier = JavaClassImpl@7188['Container']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
 }
@@ -6211,140 +6211,140 @@ LazyJavaClassifierType@7408['Dimension'] {
 
 LazyJavaClassifierType@7411['Dimension'] {
     arguments = ArrayList@7412[empty]
-    classifier = JavaClassImpl@7359['Dimension']
+    classifier = JavaClassImpl@7380['Dimension']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
 }
 
 LazyJavaClassifierType@7413['Dimension'] {
     arguments = ArrayList@7414[empty]
-    classifier = JavaClassImpl@7401['Dimension']
+    classifier = JavaClassImpl@7398['Dimension']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
 }
 
 LazyJavaClassifierType@7415['Dimension'] {
     arguments = ArrayList@7416[empty]
-    classifier = JavaClassImpl@7350['Dimension']
+    classifier = JavaClassImpl@7347['Dimension']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
 }
 
 LazyJavaClassifierType@7417['Dimension'] {
     arguments = ArrayList@7418[empty]
-    classifier = JavaClassImpl@7362['Dimension']
+    classifier = JavaClassImpl@7359['Dimension']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
 }
 
 LazyJavaClassifierType@7419['Dimension'] {
     arguments = ArrayList@7420[empty]
-    classifier = JavaClassImpl@7404['Dimension']
+    classifier = JavaClassImpl@7365['Dimension']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
 }
 
 LazyJavaClassifierType@7421['Dimension'] {
     arguments = ArrayList@7422[empty]
-    classifier = JavaClassImpl@7341['Dimension']
+    classifier = JavaClassImpl@7350['Dimension']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
 }
 
 LazyJavaClassifierType@7423['Dimension'] {
     arguments = ArrayList@7424[empty]
-    classifier = JavaClassImpl@7392['Dimension']
+    classifier = JavaClassImpl@7377['Dimension']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
 }
 
 LazyJavaClassifierType@7425['Dimension'] {
     arguments = ArrayList@7426[empty]
-    classifier = JavaClassImpl@7407['Dimension']
+    classifier = JavaClassImpl@7392['Dimension']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
 }
 
 LazyJavaClassifierType@7427['Dimension'] {
     arguments = ArrayList@7428[empty]
-    classifier = JavaClassImpl@7365['Dimension']
+    classifier = JavaClassImpl@7353['Dimension']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
 }
 
 LazyJavaClassifierType@7429['Dimension'] {
     arguments = ArrayList@7430[empty]
-    classifier = JavaClassImpl@7368['Dimension']
+    classifier = JavaClassImpl@7362['Dimension']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
 }
 
 LazyJavaClassifierType@7431['Dimension'] {
     arguments = ArrayList@7432[empty]
-    classifier = JavaClassImpl@7398['Dimension']
+    classifier = JavaClassImpl@7344['Dimension']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
 }
 
 LazyJavaClassifierType@7433['Dimension'] {
     arguments = ArrayList@7434[empty]
-    classifier = JavaClassImpl@7377['Dimension']
+    classifier = JavaClassImpl@7383['Dimension']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
 }
 
 LazyJavaClassifierType@7435['Dimension'] {
     arguments = ArrayList@7436[empty]
-    classifier = JavaClassImpl@7389['Dimension']
+    classifier = JavaClassImpl@7386['Dimension']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
 }
 
 LazyJavaClassifierType@7437['Dimension'] {
     arguments = ArrayList@7438[empty]
-    classifier = JavaClassImpl@7395['Dimension']
+    classifier = JavaClassImpl@7371['Dimension']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
 }
 
 LazyJavaClassifierType@7439['Dimension'] {
     arguments = ArrayList@7440[empty]
-    classifier = JavaClassImpl@7344['Dimension']
+    classifier = JavaClassImpl@7389['Dimension']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
 }
 
 LazyJavaClassifierType@7441['Dimension'] {
     arguments = ArrayList@7442[empty]
-    classifier = JavaClassImpl@7347['Dimension']
+    classifier = JavaClassImpl@7404['Dimension']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
 }
 
 LazyJavaClassifierType@7443['Dimension'] {
     arguments = ArrayList@7444[empty]
-    classifier = JavaClassImpl@7374['Dimension']
+    classifier = JavaClassImpl@7395['Dimension']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
 }
 
 LazyJavaClassifierType@7445['Dimension'] {
     arguments = ArrayList@7446[empty]
-    classifier = JavaClassImpl@7380['Dimension']
+    classifier = JavaClassImpl@7407['Dimension']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
 }
 
 LazyJavaClassifierType@7447['Dimension'] {
     arguments = ArrayList@7448[empty]
-    classifier = JavaClassImpl@7386['Dimension']
+    classifier = JavaClassImpl@7410['Dimension']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
 }
 
 LazyJavaClassifierType@7449['Dimension'] {
     arguments = ArrayList@7450[empty]
-    classifier = JavaClassImpl@7371['Dimension']
+    classifier = JavaClassImpl@7368['Dimension']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
 }
@@ -6358,21 +6358,21 @@ LazyJavaClassifierType@7451['Dimension'] {
 
 LazyJavaClassifierType@7453['Dimension'] {
     arguments = ArrayList@7454[empty]
-    classifier = JavaClassImpl@7410['Dimension']
+    classifier = JavaClassImpl@7374['Dimension']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
 }
 
 LazyJavaClassifierType@7455['Dimension'] {
     arguments = ArrayList@7456[empty]
-    classifier = JavaClassImpl@7383['Dimension']
+    classifier = JavaClassImpl@7341['Dimension']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
 }
 
 LazyJavaClassifierType@7457['Dimension'] {
     arguments = ArrayList@7458[empty]
-    classifier = JavaClassImpl@7353['Dimension']
+    classifier = JavaClassImpl@7401['Dimension']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
 }
@@ -6640,14 +6640,14 @@ LazyJavaClassifierType@7540['EventTargetFilter'] {
 
 LazyJavaClassifierType@7543['EventTargetFilter'] {
     arguments = ArrayList@7544[empty]
-    classifier = JavaClassImpl@7539['EventTargetFilter']
+    classifier = JavaClassImpl@7542['EventTargetFilter']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2415['EventTargetFilter']
 }
 
 LazyJavaClassifierType@7545['EventTargetFilter'] {
     arguments = ArrayList@7546[empty]
-    classifier = JavaClassImpl@7542['EventTargetFilter']
+    classifier = JavaClassImpl@7539['EventTargetFilter']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2415['EventTargetFilter']
 }
@@ -7975,14 +7975,14 @@ LazyJavaClassifierType@7975['List<Image>'] {
 
 LazyJavaClassifierType@7979['List<Image>'] {
     arguments = ArrayList@7980[1] { TypeProjectionImpl@7981 }
-    classifier = JavaClassImpl@7974['List']
+    classifier = JavaClassImpl@7978['List']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@7963
 }
 
 LazyJavaClassifierType@7982['List<Image>'] {
     arguments = ArrayList@7983[1] { TypeProjectionImpl@7984 }
-    classifier = JavaClassImpl@7978['List']
+    classifier = JavaClassImpl@7974['List']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@7963
 }
@@ -8017,28 +8017,28 @@ LazyJavaClassifierType@7994['Locale'] {
 
 LazyJavaClassifierType@7997['Locale'] {
     arguments = ArrayList@7998[empty]
-    classifier = JavaClassImpl@7993['Locale']
+    classifier = JavaClassImpl@7996['Locale']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@5057['Locale']
 }
 
 LazyJavaClassifierType@7999['Locale'] {
     arguments = ArrayList@8000[empty]
-    classifier = JavaClassImpl@7996['Locale']
+    classifier = JavaClassImpl@7987['Locale']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@5057['Locale']
 }
 
 LazyJavaClassifierType@8001['Locale'] {
     arguments = ArrayList@8002[empty]
-    classifier = JavaClassImpl@7990['Locale']
+    classifier = JavaClassImpl@7993['Locale']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@5057['Locale']
 }
 
 LazyJavaClassifierType@8003['Locale'] {
     arguments = ArrayList@8004[empty]
-    classifier = JavaClassImpl@7987['Locale']
+    classifier = JavaClassImpl@7990['Locale']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@5057['Locale']
 }
@@ -8462,42 +8462,42 @@ LazyJavaClassifierType@8148['Object'] {
 
 LazyJavaClassifierType@8150['Object'] {
     arguments = ArrayList@8151[empty]
-    classifier = JavaClassImpl@8109['Object']
+    classifier = JavaClassImpl@8136['Object']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8106
 }
 
 LazyJavaClassifierType@8152['Object'] {
     arguments = ArrayList@8153[empty]
-    classifier = JavaClassImpl@8133['Object']
+    classifier = JavaClassImpl@8121['Object']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8106
 }
 
 LazyJavaClassifierType@8154['Object'] {
     arguments = ArrayList@8155[empty]
-    classifier = JavaClassImpl@8124['Object']
+    classifier = JavaClassImpl@8127['Object']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8106
 }
 
 LazyJavaClassifierType@8156['Object'] {
     arguments = ArrayList@8157[empty]
-    classifier = JavaClassImpl@8115['Object']
+    classifier = JavaClassImpl@8124['Object']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8106
 }
 
 LazyJavaClassifierType@8158['Object'] {
     arguments = ArrayList@8159[empty]
-    classifier = JavaClassImpl@8127['Object']
+    classifier = JavaClassImpl@8145['Object']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8106
 }
 
 LazyJavaClassifierType@8160['Object'] {
     arguments = ArrayList@8161[empty]
-    classifier = JavaClassImpl@8112['Object']
+    classifier = JavaClassImpl@8133['Object']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8106
 }
@@ -8511,35 +8511,35 @@ LazyJavaClassifierType@8162['Object'] {
 
 LazyJavaClassifierType@8164['Object'] {
     arguments = ArrayList@8165[empty]
-    classifier = JavaClassImpl@8136['Object']
+    classifier = JavaClassImpl@8115['Object']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8106
 }
 
 LazyJavaClassifierType@8166['Object'] {
     arguments = ArrayList@8167[empty]
-    classifier = JavaClassImpl@8105['Object']
+    classifier = JavaClassImpl@8139['Object']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8106
 }
 
 LazyJavaClassifierType@8168['Object'] {
     arguments = ArrayList@8169[empty]
-    classifier = JavaClassImpl@8145['Object']
+    classifier = JavaClassImpl@8109['Object']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8106
 }
 
 LazyJavaClassifierType@8170['Object'] {
     arguments = ArrayList@8171[empty]
-    classifier = JavaClassImpl@8139['Object']
+    classifier = JavaClassImpl@8112['Object']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8106
 }
 
 LazyJavaClassifierType@8172['Object'] {
     arguments = ArrayList@8173[empty]
-    classifier = JavaClassImpl@8121['Object']
+    classifier = JavaClassImpl@8105['Object']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8106
 }
@@ -8596,7 +8596,7 @@ LazyJavaClassifierType@8192['ObjectInputStream'] {
 
 LazyJavaClassifierType@8195['ObjectInputStream'] {
     arguments = ArrayList@8196[empty]
-    classifier = JavaClassImpl@8185['ObjectInputStream']
+    classifier = JavaClassImpl@8182['ObjectInputStream']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@5059['ObjectInputStream']
 }
@@ -8610,21 +8610,21 @@ LazyJavaClassifierType@8197['ObjectInputStream'] {
 
 LazyJavaClassifierType@8199['ObjectInputStream'] {
     arguments = ArrayList@8200[empty]
-    classifier = JavaClassImpl@8194['ObjectInputStream']
+    classifier = JavaClassImpl@8185['ObjectInputStream']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@5059['ObjectInputStream']
 }
 
 LazyJavaClassifierType@8201['ObjectInputStream'] {
     arguments = ArrayList@8202[empty]
-    classifier = JavaClassImpl@8182['ObjectInputStream']
+    classifier = JavaClassImpl@8188['ObjectInputStream']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@5059['ObjectInputStream']
 }
 
 LazyJavaClassifierType@8203['ObjectInputStream'] {
     arguments = ArrayList@8204[empty]
-    classifier = JavaClassImpl@8188['ObjectInputStream']
+    classifier = JavaClassImpl@8194['ObjectInputStream']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@5059['ObjectInputStream']
 }
@@ -8666,21 +8666,21 @@ LazyJavaClassifierType@8217['ObjectOutputStream'] {
 
 LazyJavaClassifierType@8219['ObjectOutputStream'] {
     arguments = ArrayList@8220[empty]
-    classifier = JavaClassImpl@8207['ObjectOutputStream']
+    classifier = JavaClassImpl@8213['ObjectOutputStream']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@5061['ObjectOutputStream']
 }
 
 LazyJavaClassifierType@8221['ObjectOutputStream'] {
     arguments = ArrayList@8222[empty]
-    classifier = JavaClassImpl@8213['ObjectOutputStream']
+    classifier = JavaClassImpl@8216['ObjectOutputStream']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@5061['ObjectOutputStream']
 }
 
 LazyJavaClassifierType@8223['ObjectOutputStream'] {
     arguments = ArrayList@8224[empty]
-    classifier = JavaClassImpl@8216['ObjectOutputStream']
+    classifier = JavaClassImpl@8207['ObjectOutputStream']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@5061['ObjectOutputStream']
 }
@@ -8960,7 +8960,7 @@ LazyJavaClassifierType@8315['PrintStream'] {
 
 LazyJavaClassifierType@8318['PrintStream'] {
     arguments = ArrayList@8319[empty]
-    classifier = JavaClassImpl@8311['PrintStream']
+    classifier = JavaClassImpl@8314['PrintStream']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@5063['PrintStream']
 }
@@ -8974,7 +8974,7 @@ LazyJavaClassifierType@8320['PrintStream'] {
 
 LazyJavaClassifierType@8322['PrintStream'] {
     arguments = ArrayList@8323[empty]
-    classifier = JavaClassImpl@8314['PrintStream']
+    classifier = JavaClassImpl@8311['PrintStream']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@5063['PrintStream']
 }
@@ -9414,21 +9414,21 @@ LazyJavaClassifierType@8466['Set'] {
 
 LazyJavaClassifierType@8470['Set'] {
     arguments = ArrayList@8471[1] { LazyStarProjection@8472 }
-    classifier = JavaClassImpl@8460['Set']
+    classifier = JavaClassImpl@8465['Set']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8473
 }
 
 LazyJavaClassifierType@8474['Set'] {
     arguments = ArrayList@8475[1] { LazyStarProjection@8476 }
-    classifier = JavaClassImpl@8465['Set']
+    classifier = JavaClassImpl@8469['Set']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8473
 }
 
 LazyJavaClassifierType@8477['Set'] {
     arguments = ArrayList@8478[1] { LazyStarProjection@8479 }
-    classifier = JavaClassImpl@8469['Set']
+    classifier = JavaClassImpl@8460['Set']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8473
 }
@@ -9456,14 +9456,14 @@ LazyJavaClassifierType@8488['Set<? extends AWTKeyStroke>'] {
 
 LazyJavaClassifierType@8492['Set<? extends AWTKeyStroke>'] {
     arguments = ArrayList@8493[1] { TypeProjectionImpl@8494 }
-    classifier = JavaClassImpl@8491['Set']
+    classifier = JavaClassImpl@8487['Set']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8473
 }
 
 LazyJavaClassifierType@8495['Set<? extends AWTKeyStroke>'] {
     arguments = ArrayList@8496[1] { TypeProjectionImpl@8497 }
-    classifier = JavaClassImpl@8487['Set']
+    classifier = JavaClassImpl@8491['Set']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8473
 }
@@ -9498,21 +9498,21 @@ LazyJavaClassifierType@8509['Set<AWTKeyStroke>'] {
 
 LazyJavaClassifierType@8513['Set<AWTKeyStroke>'] {
     arguments = ArrayList@8514[1] { TypeProjectionImpl@8515 }
-    classifier = JavaClassImpl@8504['Set']
+    classifier = JavaClassImpl@8512['Set']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8473
 }
 
 LazyJavaClassifierType@8516['Set<AWTKeyStroke>'] {
     arguments = ArrayList@8517[1] { TypeProjectionImpl@8518 }
-    classifier = JavaClassImpl@8508['Set']
+    classifier = JavaClassImpl@8504['Set']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8473
 }
 
 LazyJavaClassifierType@8519['Set<AWTKeyStroke>'] {
     arguments = ArrayList@8520[1] { TypeProjectionImpl@8521 }
-    classifier = JavaClassImpl@8512['Set']
+    classifier = JavaClassImpl@8508['Set']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8473
 }
@@ -9819,224 +9819,224 @@ LazyJavaClassifierType@8644['String'] {
 
 LazyJavaClassifierType@8647['String'] {
     arguments = ArrayList@8648[empty]
-    classifier = JavaClassImpl@8628['String']
+    classifier = JavaClassImpl@8631['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8649['String'] {
     arguments = ArrayList@8650[empty]
-    classifier = JavaClassImpl@8598['String']
+    classifier = JavaClassImpl@8643['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8651['String'] {
     arguments = ArrayList@8652[empty]
-    classifier = JavaClassImpl@8580['String']
+    classifier = JavaClassImpl@8598['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8653['String'] {
     arguments = ArrayList@8654[empty]
-    classifier = JavaClassImpl@8547['String']
+    classifier = JavaClassImpl@8619['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8655['String'] {
     arguments = ArrayList@8656[empty]
-    classifier = JavaClassImpl@8583['String']
+    classifier = JavaClassImpl@8568['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8657['String'] {
     arguments = ArrayList@8658[empty]
-    classifier = JavaClassImpl@8553['String']
+    classifier = JavaClassImpl@8601['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8659['String'] {
     arguments = ArrayList@8660[empty]
-    classifier = JavaClassImpl@8616['String']
+    classifier = JavaClassImpl@8625['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8661['String'] {
     arguments = ArrayList@8662[empty]
-    classifier = JavaClassImpl@8622['String']
+    classifier = JavaClassImpl@8580['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8663['String'] {
     arguments = ArrayList@8664[empty]
-    classifier = JavaClassImpl@8595['String']
+    classifier = JavaClassImpl@8556['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8665['String'] {
     arguments = ArrayList@8666[empty]
-    classifier = JavaClassImpl@8556['String']
+    classifier = JavaClassImpl@8559['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8667['String'] {
     arguments = ArrayList@8668[empty]
-    classifier = JavaClassImpl@8565['String']
+    classifier = JavaClassImpl@8544['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8669['String'] {
     arguments = ArrayList@8670[empty]
-    classifier = JavaClassImpl@8634['String']
+    classifier = JavaClassImpl@8595['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8671['String'] {
     arguments = ArrayList@8672[empty]
-    classifier = JavaClassImpl@8568['String']
+    classifier = JavaClassImpl@8616['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8673['String'] {
     arguments = ArrayList@8674[empty]
-    classifier = JavaClassImpl@8571['String']
+    classifier = JavaClassImpl@8562['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8675['String'] {
     arguments = ArrayList@8676[empty]
-    classifier = JavaClassImpl@8577['String']
+    classifier = JavaClassImpl@8646['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8677['String'] {
     arguments = ArrayList@8678[empty]
-    classifier = JavaClassImpl@8574['String']
+    classifier = JavaClassImpl@8634['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8679['String'] {
     arguments = ArrayList@8680[empty]
-    classifier = JavaClassImpl@8610['String']
+    classifier = JavaClassImpl@8577['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8681['String'] {
     arguments = ArrayList@8682[empty]
-    classifier = JavaClassImpl@8592['String']
+    classifier = JavaClassImpl@8628['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8683['String'] {
     arguments = ArrayList@8684[empty]
-    classifier = JavaClassImpl@8607['String']
+    classifier = JavaClassImpl@8637['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8685['String'] {
     arguments = ArrayList@8686[empty]
-    classifier = JavaClassImpl@8601['String']
+    classifier = JavaClassImpl@8583['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8687['String'] {
     arguments = ArrayList@8688[empty]
-    classifier = JavaClassImpl@8613['String']
+    classifier = JavaClassImpl@8541['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8689['String'] {
     arguments = ArrayList@8690[empty]
-    classifier = JavaClassImpl@8537['String']
+    classifier = JavaClassImpl@8592['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8691['String'] {
     arguments = ArrayList@8692[empty]
-    classifier = JavaClassImpl@8619['String']
+    classifier = JavaClassImpl@8640['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8693['String'] {
     arguments = ArrayList@8694[empty]
-    classifier = JavaClassImpl@8589['String']
+    classifier = JavaClassImpl@8622['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8695['String'] {
     arguments = ArrayList@8696[empty]
-    classifier = JavaClassImpl@8640['String']
+    classifier = JavaClassImpl@8553['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8697['String'] {
     arguments = ArrayList@8698[empty]
-    classifier = JavaClassImpl@8541['String']
+    classifier = JavaClassImpl@8537['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8699['String'] {
     arguments = ArrayList@8700[empty]
-    classifier = JavaClassImpl@8631['String']
+    classifier = JavaClassImpl@8574['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8701['String'] {
     arguments = ArrayList@8702[empty]
-    classifier = JavaClassImpl@8637['String']
+    classifier = JavaClassImpl@8565['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8703['String'] {
     arguments = ArrayList@8704[empty]
-    classifier = JavaClassImpl@8550['String']
+    classifier = JavaClassImpl@8610['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8705['String'] {
     arguments = ArrayList@8706[empty]
-    classifier = JavaClassImpl@8646['String']
+    classifier = JavaClassImpl@8571['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8707['String'] {
     arguments = ArrayList@8708[empty]
-    classifier = JavaClassImpl@8643['String']
+    classifier = JavaClassImpl@8589['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8709['String'] {
     arguments = ArrayList@8710[empty]
-    classifier = JavaClassImpl@8625['String']
+    classifier = JavaClassImpl@8547['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
@@ -10050,21 +10050,21 @@ LazyJavaClassifierType@8711['String'] {
 
 LazyJavaClassifierType@8713['String'] {
     arguments = ArrayList@8714[empty]
-    classifier = JavaClassImpl@8559['String']
+    classifier = JavaClassImpl@8550['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8715['String'] {
     arguments = ArrayList@8716[empty]
-    classifier = JavaClassImpl@8544['String']
+    classifier = JavaClassImpl@8613['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8717['String'] {
     arguments = ArrayList@8718[empty]
-    classifier = JavaClassImpl@8562['String']
+    classifier = JavaClassImpl@8607['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
@@ -10087,14 +10087,14 @@ LazyJavaClassifierType@8725['T'] {
     arguments = ArrayList@8726[empty]
     classifier = JavaTypeParameterImpl@8727['T']
     nullable = 'false': Boolean@6567
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8728
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8724
 }
 
-LazyJavaClassifierType@8729['T'] {
-    arguments = ArrayList@8730[empty]
-    classifier = JavaTypeParameterImpl@8731['T']
+LazyJavaClassifierType@8728['T'] {
+    arguments = ArrayList@8729[empty]
+    classifier = JavaTypeParameterImpl@8730['T']
     nullable = 'false': Boolean@6567
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8724
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8731
 }
 
 LazyJavaClassifierType@8732['T'] {
@@ -10108,7 +10108,7 @@ LazyJavaClassifierType@8736['T'] {
     arguments = ArrayList@8737[empty]
     classifier = JavaTypeParameterImpl@8738['T']
     nullable = 'false': Boolean@6567
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8735
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8731
 }
 
 LazyJavaClassifierType@8739['T'] {
@@ -10122,84 +10122,84 @@ LazyJavaClassifierType@8742['T'] {
     arguments = ArrayList@8743[empty]
     classifier = JavaTypeParameterImpl@8744['T']
     nullable = 'false': Boolean@6567
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8728
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8724
 }
 
 LazyJavaClassifierType@8745['T'] {
     arguments = ArrayList@8746[empty]
     classifier = JavaTypeParameterImpl@8747['T']
     nullable = 'false': Boolean@6567
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8728
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8735
 }
 
 LazyJavaClassifierType@8748['T'] {
     arguments = ArrayList@8749[empty]
     classifier = JavaTypeParameterImpl@8750['T']
     nullable = 'false': Boolean@6567
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8724
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8731
 }
 
 LazyJavaClassifierType@8751['T'] {
     arguments = ArrayList@8752[empty]
-    classifier = JavaTypeParameterImpl@8738['T']
-    nullable = 'true': Boolean@6596
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8735
-}
-
-LazyJavaClassifierType@8753['T'] {
-    arguments = ArrayList@8754[empty]
-    classifier = JavaTypeParameterImpl@8747['T']
-    nullable = 'true': Boolean@6596
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8728
-}
-
-LazyJavaClassifierType@8755['T'] {
-    arguments = ArrayList@8756[empty]
-    classifier = JavaTypeParameterImpl@8723['T']
+    classifier = JavaTypeParameterImpl@8727['T']
     nullable = 'true': Boolean@6596
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@8724
 }
 
-LazyJavaClassifierType@8757['T'] {
-    arguments = ArrayList@8758[empty]
-    classifier = JavaTypeParameterImpl@8741['T']
-    nullable = 'true': Boolean@6596
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8735
-}
-
-LazyJavaClassifierType@8759['T'] {
-    arguments = ArrayList@8760[empty]
+LazyJavaClassifierType@8753['T'] {
+    arguments = ArrayList@8754[empty]
     classifier = JavaTypeParameterImpl@8734['T']
     nullable = 'true': Boolean@6596
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@8735
 }
 
+LazyJavaClassifierType@8755['T'] {
+    arguments = ArrayList@8756[empty]
+    classifier = JavaTypeParameterImpl@8741['T']
+    nullable = 'true': Boolean@6596
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8735
+}
+
+LazyJavaClassifierType@8757['T'] {
+    arguments = ArrayList@8758[empty]
+    classifier = JavaTypeParameterImpl@8738['T']
+    nullable = 'true': Boolean@6596
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8731
+}
+
+LazyJavaClassifierType@8759['T'] {
+    arguments = ArrayList@8760[empty]
+    classifier = JavaTypeParameterImpl@8730['T']
+    nullable = 'true': Boolean@6596
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8731
+}
+
 LazyJavaClassifierType@8761['T'] {
     arguments = ArrayList@8762[empty]
-    classifier = JavaTypeParameterImpl@8750['T']
+    classifier = JavaTypeParameterImpl@8723['T']
     nullable = 'true': Boolean@6596
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@8724
 }
 
 LazyJavaClassifierType@8763['T'] {
     arguments = ArrayList@8764[empty]
-    classifier = JavaTypeParameterImpl@8744['T']
+    classifier = JavaTypeParameterImpl@8747['T']
     nullable = 'true': Boolean@6596
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8728
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8735
 }
 
 LazyJavaClassifierType@8765['T'] {
     arguments = ArrayList@8766[empty]
-    classifier = JavaTypeParameterImpl@8731['T']
+    classifier = JavaTypeParameterImpl@8744['T']
     nullable = 'true': Boolean@6596
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@8724
 }
 
 LazyJavaClassifierType@8767['T'] {
     arguments = ArrayList@8768[empty]
-    classifier = JavaTypeParameterImpl@8727['T']
+    classifier = JavaTypeParameterImpl@8750['T']
     nullable = 'true': Boolean@6596
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8728
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8731
 }
 
 LazyJavaClassifierType@8769['Toolkit'] {
@@ -10456,42 +10456,42 @@ LazyJavaClassifierType@8855['Window'] {
 
 LazyJavaClassifierType@8858['Window'] {
     arguments = ArrayList@8859[empty]
-    classifier = JavaClassImpl@8836['Window']
+    classifier = JavaClassImpl@8845['Window']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@6532['Window']
 }
 
 LazyJavaClassifierType@8860['Window'] {
     arguments = ArrayList@8861[empty]
-    classifier = JavaClassImpl@8848['Window']
+    classifier = JavaClassImpl@8839['Window']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@6532['Window']
 }
 
 LazyJavaClassifierType@8862['Window'] {
     arguments = ArrayList@8863[empty]
-    classifier = JavaClassImpl@8851['Window']
+    classifier = JavaClassImpl@8836['Window']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@6532['Window']
 }
 
 LazyJavaClassifierType@8864['Window'] {
     arguments = ArrayList@8865[empty]
-    classifier = JavaClassImpl@8854['Window']
+    classifier = JavaClassImpl@8857['Window']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@6532['Window']
 }
 
 LazyJavaClassifierType@8866['Window'] {
     arguments = ArrayList@8867[empty]
-    classifier = JavaClassImpl@8857['Window']
+    classifier = JavaClassImpl@8854['Window']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@6532['Window']
 }
 
 LazyJavaClassifierType@8868['Window'] {
     arguments = ArrayList@8869[empty]
-    classifier = JavaClassImpl@8845['Window']
+    classifier = JavaClassImpl@8851['Window']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@6532['Window']
 }
@@ -10505,7 +10505,7 @@ LazyJavaClassifierType@8870['Window'] {
 
 LazyJavaClassifierType@8872['Window'] {
     arguments = ArrayList@8873[empty]
-    classifier = JavaClassImpl@8839['Window']
+    classifier = JavaClassImpl@8848['Window']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@6532['Window']
 }
@@ -10703,17 +10703,17 @@ LazyJavaPackageFragmentProvider@8930 {
     packageFragments('test': FqName@8954) = null
     packageFragments('test.JFrame': FqName@8955) = null
     packageFragments('test.KFrame': FqName@8956) = null
-    topLevelClasses(JavaClassImpl@6639['AWTKeyStroke']) = LazyJavaClassDescriptor@0['AWTKeyStroke']
+    topLevelClasses(JavaClassImpl@6627['AWTKeyStroke']) = LazyJavaClassDescriptor@0['AWTKeyStroke']
     topLevelClasses(JavaClassImpl@6766['Class']) = LazyJavaClassDescriptor@4['Class']
     topLevelClasses(JavaClassImpl@6824['Component']) = LazyJavaClassDescriptor@6['Component']
     topLevelClasses(JavaClassImpl@7185['Container']) = LazyJavaClassDescriptor@1344['Container']
-    topLevelClasses(JavaClassImpl@7353['Dimension']) = LazyJavaClassDescriptor@2409['Dimension']
+    topLevelClasses(JavaClassImpl@7377['Dimension']) = LazyJavaClassDescriptor@2409['Dimension']
     topLevelClasses(JavaClassImpl@7519['EventListener']) = LazyJavaClassDescriptor@2411['EventListener']
     topLevelClasses(JavaClassImpl@7605['Frame']) = LazyJavaClassDescriptor@2416['Frame']
     topLevelClasses(JavaClassImpl@8957['JFrame']) = LazyJavaClassDescriptor@3770['JFrame']
-    topLevelClasses(JavaClassImpl@7987['Locale']) = LazyJavaClassDescriptor@5056['Locale']
-    topLevelClasses(JavaClassImpl@8182['ObjectInputStream']) = LazyJavaClassDescriptor@5058['ObjectInputStream']
-    topLevelClasses(JavaClassImpl@8216['ObjectOutputStream']) = LazyJavaClassDescriptor@5060['ObjectOutputStream']
+    topLevelClasses(JavaClassImpl@7996['Locale']) = LazyJavaClassDescriptor@5056['Locale']
+    topLevelClasses(JavaClassImpl@8188['ObjectInputStream']) = LazyJavaClassDescriptor@5058['ObjectInputStream']
+    topLevelClasses(JavaClassImpl@8210['ObjectOutputStream']) = LazyJavaClassDescriptor@5060['ObjectOutputStream']
     topLevelClasses(JavaClassImpl@8311['PrintStream']) = LazyJavaClassDescriptor@5062['PrintStream']
     topLevelClasses(JavaClassImpl@8452['RuntimeException']) = LazyJavaClassDescriptor@5064['RuntimeException']
     topLevelClasses(JavaClassImpl@8456['Serializable']) = LazyJavaClassDescriptor@5066['Serializable']
@@ -10743,14 +10743,14 @@ LazyJavaPackageFragment@8948['swing'] {
 
 LazyJavaTypeParameterDescriptor@8971['T'] {
     defaultType = JetTypeImpl@8972['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8735
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8731
     upperBounds = LinkedHashSet@8973[1] { DelegatingFlexibleType@8974 }
     upperBoundsAsType = DelegatingFlexibleType@8974
 }
 
 LazyJavaTypeParameterDescriptor@8975['T'] {
     defaultType = JetTypeImpl@8976['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8728
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8735
     upperBounds = LinkedHashSet@8977[1] { DelegatingFlexibleType@8978 }
     upperBoundsAsType = DelegatingFlexibleType@8978
 }
@@ -10766,27 +10766,30 @@ LazyJavaTypeParameterDescriptor@6536['T'] {
 }
 
 LazyJavaTypeParameterResolver@8983 {
-    resolve(JavaTypeParameterImpl@8984['T']) = LazyJavaTypeParameterDescriptor@6536['T']
+    resolve(JavaTypeParameterImpl@8984['T']) = LazyJavaTypeParameterDescriptor@8971['T']
 }
 
 LazyJavaTypeParameterResolver@8985 {
-    resolve(JavaTypeParameterImpl@8986['T']) = LazyJavaTypeParameterDescriptor@8975['T']
+    resolve(JavaTypeParameterImpl@8986['T']) = LazyJavaTypeParameterDescriptor@8979['T']
 }
 
 LazyJavaTypeParameterResolver@8987 {
-    resolve(JavaTypeParameterImpl@8988['T']) = LazyJavaTypeParameterDescriptor@8979['T']
+    resolve(JavaTypeParameterImpl@8988['T']) = LazyJavaTypeParameterDescriptor@8975['T']
 }
 
 LazyJavaTypeParameterResolver@8989 {
-    resolve(JavaTypeParameterImpl@8990['T']) = LazyJavaTypeParameterDescriptor@8971['T']
+    resolve(JavaTypeParameterImpl@8990['T']) = LazyJavaTypeParameterDescriptor@6536['T']
 }
 
 ResolutionTaskHolder@8991 {
     <name not found> = ArrayList@8992[1] { ResolutionCandidate@8993 }
-    <name not found> = ArrayList@8994[1] { ResolutionCandidate@8993 }
 }
 
-ResolutionTaskHolder@8995 {
-    <name not found> = ArrayList@8996[4] { ResolutionCandidate@8997, ResolutionCandidate@8998, ResolutionCandidate@8999, ... }
-    <name not found> = ArrayList@9000[4] { ResolutionCandidate@8997, ResolutionCandidate@8998, ResolutionCandidate@8999, ... }
+ResolutionTaskHolder@8994 {
+    <name not found> = ArrayList@8995[4] { ResolutionCandidate@8996, ResolutionCandidate@8997, ResolutionCandidate@8998, ... }
+}
+
+null {
+    <name not found> = ArrayList@8999[1] { ResolutionCandidate@8993 }
+    <name not found> = ArrayList@9000[4] { ResolutionCandidate@8996, ResolutionCandidate@8997, ResolutionCandidate@8998, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt1647.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt1647.lazy.log
index 50f3ee69520..0cb43aab547 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt1647.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt1647.lazy.log
@@ -32,10 +32,13 @@ LazyJavaPackageFragment@8['java'] {
 
 ResolutionTaskHolder@30 {
     <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
 }
 
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
+}
+
+null {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@35 }
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt1736.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt1736.lazy.log
index c5bdc033ff3..b0f235d59ba 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt1736.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt1736.lazy.log
@@ -33,16 +33,6 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@27 {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
@@ -84,9 +74,22 @@ ResolutionTaskHolder@27 {
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
+    <name not found> = EmptyList@22[empty]
+}
+
+null {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@29 }
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt174.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt174.lazy.log
index e9158027d97..4a4250ead1f 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt174.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt174.lazy.log
@@ -75,14 +75,14 @@ LazyJavaClassifierType@36['Throwable'] {
 
 LazyJavaClassifierType@39['Throwable'] {
     arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@35['Throwable']
+    classifier = JavaClassImpl@31['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@31['Throwable']
+    classifier = JavaClassImpl@35['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
@@ -140,15 +140,18 @@ LazyJavaPackageFragment@55['lang'] {
 
 ResolutionTaskHolder@76 {
     <name not found> = ArrayList@77[4] { ResolutionCandidate@78, ResolutionCandidate@79, ResolutionCandidate@80, ... }
-    <name not found> = ArrayList@81[5] { ResolutionCandidate@78, ResolutionCandidate@79, ResolutionCandidate@80, ... }
-    <name not found> = EmptyList@68[empty]
-    <name not found> = EmptyList@68[empty]
-    <name not found> = EmptyList@68[empty]
-    <name not found> = EmptyList@68[empty]
-    <name not found> = EmptyList@68[empty]
-    <name not found> = EmptyList@68[empty]
-    <name not found> = EmptyList@68[empty]
-    <name not found> = EmptyList@68[empty]
+    <name not found> = EmptyList@68[empty]
+    <name not found> = EmptyList@68[empty]
+    <name not found> = EmptyList@68[empty]
+    <name not found> = EmptyList@68[empty]
+    <name not found> = EmptyList@68[empty]
+    <name not found> = EmptyList@68[empty]
+    <name not found> = EmptyList@68[empty]
+    <name not found> = EmptyList@68[empty]
+}
+
+null {
+    <name not found> = ArrayList@81[5] { ResolutionCandidate@78, ResolutionCandidate@79, ResolutionCandidate@80, ... }
     <name not found> = EmptyList@68[empty]
     <name not found> = EmptyList@68[empty]
     <name not found> = EmptyList@68[empty]
diff --git a/compiler/testData/diagnostics/tests/regressions/kt201.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt201.lazy.log
index 1fe9363c957..4a5b4deca7f 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt201.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt201.lazy.log
@@ -118,41 +118,44 @@ LazyJavaPackageFragment@46['lang'] {
 
 ResolutionTaskHolder@72 {
     <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
 }
 
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
 }
 
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
+}
+
 ResolutionTaskHolder@83 {
     <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
 }
 
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[2] { ResolutionCandidate@88, ResolutionCandidate@89 }
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
 }
 
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[2] { ResolutionCandidate@93, ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[2] { ResolutionCandidate@93, ResolutionCandidate@94 }
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
+null {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@95[2] { ResolutionCandidate@88, ResolutionCandidate@89 }
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
diff --git a/compiler/testData/diagnostics/tests/regressions/kt235.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt235.lazy.log
index 90a6e0a2a7a..463d515f8c7 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt235.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt235.lazy.log
@@ -48,15 +48,6 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@41 {
     <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
@@ -67,105 +58,77 @@ ResolutionTaskHolder@41 {
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
+}
+
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
 ResolutionTaskHolder@53 {
     <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
+}
+
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
 }
 
 ResolutionTaskHolder@65 {
     <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
+}
+
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
 }
 
 ResolutionTaskHolder@77 {
     <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
 }
 
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
 }
 
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[8] { ResolutionCandidate@88, ResolutionCandidate@89, ResolutionCandidate@90, ... }
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[8] { ResolutionCandidate@93, ResolutionCandidate@94, ResolutionCandidate@95, ... }
 }
 
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[8] { ResolutionCandidate@103, ResolutionCandidate@104, ResolutionCandidate@105, ... }
-    <name not found> = ArrayList@106[8] { ResolutionCandidate@103, ResolutionCandidate@104, ResolutionCandidate@105, ... }
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[8] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111, ... }
-    <name not found> = ArrayList@112[8] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111, ... }
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@96 {
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
@@ -192,7 +155,7 @@ ResolutionTaskHolder@113 {
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@114 {
+ResolutionTaskHolder@97 {
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
@@ -217,6 +180,46 @@ ResolutionTaskHolder@114 {
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
+}
+
+null {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@113[8] { ResolutionCandidate@93, ResolutionCandidate@94, ResolutionCandidate@95, ... }
+    <name not found> = ArrayList@114[8] { ResolutionCandidate@88, ResolutionCandidate@89, ResolutionCandidate@90, ... }
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
diff --git a/compiler/testData/diagnostics/tests/regressions/kt2376.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt2376.lazy.log
index 079aa1856d9..c1a0086be5f 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt2376.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt2376.lazy.log
@@ -76,19 +76,22 @@ LazyJavaPackageFragment@35['lang'] {
 
 ResolutionTaskHolder@57 {
     <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
+}
+
+null {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@65 }
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt251.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt251.lazy.log
index 6bd6cdfcd36..0d41120ce3a 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt251.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt251.lazy.log
@@ -52,38 +52,41 @@ LazyJavaPackageFragment@14['lang'] {
 
 ResolutionTaskHolder@39 {
     <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@36[empty]
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
     <name not found> = EmptyList@36[empty]
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
     <name not found> = EmptyList@36[empty]
 }
 
 ResolutionTaskHolder@51 {
     <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+}
+
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+}
+
+null {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@47 }
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
 }
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt258.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt258.lazy.log
index d2fc7575143..337afb0fd8a 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt258.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt258.lazy.log
@@ -65,21 +65,21 @@ LazyJavaClassifierType@50['K'] {
     arguments = ArrayList@51[empty]
     classifier = JavaTypeParameterImpl@52['K']
     nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
 }
 
-LazyJavaClassifierType@53['K'] {
-    arguments = ArrayList@54[empty]
-    classifier = JavaTypeParameterImpl@55['K']
+LazyJavaClassifierType@54['K'] {
+    arguments = ArrayList@55[empty]
+    classifier = JavaTypeParameterImpl@56['K']
     nullable = 'false': Boolean@48
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
 }
 
-LazyJavaClassifierType@56['K'] {
-    arguments = ArrayList@57[empty]
-    classifier = JavaTypeParameterImpl@58['K']
+LazyJavaClassifierType@57['K'] {
+    arguments = ArrayList@58[empty]
+    classifier = JavaTypeParameterImpl@59['K']
     nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
 }
 
 LazyJavaClassifierType@60['K'] {
@@ -93,33 +93,33 @@ LazyJavaClassifierType@63['K'] {
     arguments = ArrayList@64[empty]
     classifier = JavaTypeParameterImpl@52['K']
     nullable = 'true': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
 }
 
 LazyJavaClassifierType@66['K'] {
     arguments = ArrayList@67[empty]
-    classifier = JavaTypeParameterImpl@58['K']
+    classifier = JavaTypeParameterImpl@62['K']
     nullable = 'true': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
 }
 
 LazyJavaClassifierType@68['K'] {
     arguments = ArrayList@69[empty]
-    classifier = JavaTypeParameterImpl@47['K']
+    classifier = JavaTypeParameterImpl@59['K']
     nullable = 'true': Boolean@65
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
 }
 
 LazyJavaClassifierType@70['K'] {
     arguments = ArrayList@71[empty]
-    classifier = JavaTypeParameterImpl@55['K']
+    classifier = JavaTypeParameterImpl@56['K']
     nullable = 'true': Boolean@65
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
 }
 
 LazyJavaClassifierType@72['K'] {
     arguments = ArrayList@73[empty]
-    classifier = JavaTypeParameterImpl@62['K']
+    classifier = JavaTypeParameterImpl@47['K']
     nullable = 'true': Boolean@65
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
 }
@@ -209,28 +209,28 @@ LazyJavaClassifierType@118['V'] {
 
 LazyJavaClassifierType@122['V'] {
     arguments = ArrayList@123[empty]
-    classifier = JavaTypeParameterImpl@114['V']
+    classifier = JavaTypeParameterImpl@117['V']
     nullable = 'true': Boolean@65
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 LazyJavaClassifierType@124['V'] {
     arguments = ArrayList@125[empty]
-    classifier = JavaTypeParameterImpl@117['V']
+    classifier = JavaTypeParameterImpl@114['V']
     nullable = 'true': Boolean@65
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 LazyJavaClassifierType@126['V'] {
     arguments = ArrayList@127[empty]
-    classifier = JavaTypeParameterImpl@107['V']
+    classifier = JavaTypeParameterImpl@111['V']
     nullable = 'true': Boolean@65
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 LazyJavaClassifierType@128['V'] {
     arguments = ArrayList@129[empty]
-    classifier = JavaTypeParameterImpl@111['V']
+    classifier = JavaTypeParameterImpl@107['V']
     nullable = 'true': Boolean@65
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
@@ -325,7 +325,7 @@ LazyJavaTypeParameterDescriptor@27['K'] {
 }
 
 LazyJavaTypeParameterDescriptor@22['K'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
 }
 
 LazyJavaTypeParameterDescriptor@28['V'] {
@@ -339,32 +339,35 @@ LazyJavaTypeParameterDescriptor@23['V'] {
 }
 
 LazyJavaTypeParameterResolver@192 {
-    resolve(JavaTypeParameterImpl@193['K']) = LazyJavaTypeParameterDescriptor@27['K']
-    resolve(JavaTypeParameterImpl@194['V']) = LazyJavaTypeParameterDescriptor@28['V']
+    resolve(JavaTypeParameterImpl@193['K']) = LazyJavaTypeParameterDescriptor@22['K']
+    resolve(JavaTypeParameterImpl@194['V']) = LazyJavaTypeParameterDescriptor@23['V']
 }
 
 LazyJavaTypeParameterResolver@195 {
-    resolve(JavaTypeParameterImpl@196['K']) = LazyJavaTypeParameterDescriptor@22['K']
-    resolve(JavaTypeParameterImpl@197['V']) = LazyJavaTypeParameterDescriptor@23['V']
+    resolve(JavaTypeParameterImpl@196['K']) = LazyJavaTypeParameterDescriptor@27['K']
+    resolve(JavaTypeParameterImpl@197['V']) = LazyJavaTypeParameterDescriptor@28['V']
 }
 
 ResolutionTaskHolder@198 {
     <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@200 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
 }
 
-ResolutionTaskHolder@202 {
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@204 }
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@204 }
+ResolutionTaskHolder@201 {
+    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
 }
 
-ResolutionTaskHolder@206 {
-    <name not found> = ArrayList@207[4] { ResolutionCandidate@208, ResolutionCandidate@209, ResolutionCandidate@210, ... }
-    <name not found> = ArrayList@211[4] { ResolutionCandidate@208, ResolutionCandidate@209, ResolutionCandidate@210, ... }
+ResolutionTaskHolder@204 {
+    <name not found> = ArrayList@205[4] { ResolutionCandidate@206, ResolutionCandidate@207, ResolutionCandidate@208, ... }
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+}
+
+null {
+    <name not found> = ArrayList@209[1] { ResolutionCandidate@203 }
+    <name not found> = ArrayList@210[1] { ResolutionCandidate@200 }
+    <name not found> = ArrayList@211[4] { ResolutionCandidate@206, ResolutionCandidate@207, ResolutionCandidate@208, ... }
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
diff --git a/compiler/testData/diagnostics/tests/regressions/kt2768.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt2768.lazy.log
index 77e7a8ce0be..ce47a0911c9 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt2768.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt2768.lazy.log
@@ -150,171 +150,174 @@ LazyJavaPackageFragment@61['lang'] {
 }
 
 ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[10] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
-    <name not found> = ArrayList@97[9] { ResolutionCandidate@94, ResolutionCandidate@96, ResolutionCandidate@98, ... }
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
     <name not found> = EmptyList@84[empty]
     <name not found> = EmptyList@84[empty]
 }
 
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
     <name not found> = EmptyList@84[empty]
     <name not found> = EmptyList@84[empty]
 }
 
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
     <name not found> = EmptyList@84[empty]
     <name not found> = EmptyList@84[empty]
+}
+
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
     <name not found> = EmptyList@84[empty]
     <name not found> = EmptyList@84[empty]
 }
 
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
+}
+
 ResolutionTaskHolder@107 {
     <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
 }
 
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@113 }
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
 }
 
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@117 }
+ResolutionTaskHolder@113 {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
+}
+
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
 }
 
 ResolutionTaskHolder@119 {
     <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@121 }
 }
 
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@125 }
+ResolutionTaskHolder@122 {
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
 }
 
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@129 }
+ResolutionTaskHolder@125 {
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
+}
+
+ResolutionTaskHolder@128 {
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
 }
 
 ResolutionTaskHolder@131 {
     <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@133 }
 }
 
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@137 }
+ResolutionTaskHolder@134 {
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
 }
 
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@141 }
+ResolutionTaskHolder@137 {
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
+}
+
+ResolutionTaskHolder@140 {
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
 }
 
 ResolutionTaskHolder@143 {
     <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@145 }
 }
 
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@149 }
+ResolutionTaskHolder@146 {
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
 }
 
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@153 }
+ResolutionTaskHolder@149 {
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
+}
+
+ResolutionTaskHolder@152 {
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
 }
 
 ResolutionTaskHolder@155 {
     <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@157 }
 }
 
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@161 }
+ResolutionTaskHolder@158 {
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
 }
 
-ResolutionTaskHolder@163 {
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@165 }
+ResolutionTaskHolder@161 {
+    <name not found> = ArrayList@162[8] { ResolutionCandidate@163, ResolutionCandidate@164, ResolutionCandidate@165, ... }
 }
 
-ResolutionTaskHolder@167 {
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@169 }
+ResolutionTaskHolder@166 {
+    <name not found> = ArrayList@167[8] { ResolutionCandidate@168, ResolutionCandidate@169, ResolutionCandidate@170, ... }
 }
 
 ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@173 }
+    <name not found> = ArrayList@172[8] { ResolutionCandidate@173, ResolutionCandidate@174, ResolutionCandidate@175, ... }
 }
 
-ResolutionTaskHolder@175 {
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@177 }
+ResolutionTaskHolder@176 {
+    <name not found> = ArrayList@177[8] { ResolutionCandidate@178, ResolutionCandidate@179, ResolutionCandidate@180, ... }
 }
 
-ResolutionTaskHolder@179 {
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@181 }
+ResolutionTaskHolder@181 {
+    <name not found> = ArrayList@182[8] { ResolutionCandidate@183, ResolutionCandidate@184, ResolutionCandidate@185, ... }
 }
 
-ResolutionTaskHolder@183 {
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@185 }
-}
-
-ResolutionTaskHolder@187 {
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@189 }
+ResolutionTaskHolder@186 {
+    <name not found> = ArrayList@187[8] { ResolutionCandidate@188, ResolutionCandidate@189, ResolutionCandidate@190, ... }
 }
 
 ResolutionTaskHolder@191 {
-    <name not found> = ArrayList@192[8] { ResolutionCandidate@193, ResolutionCandidate@194, ResolutionCandidate@195, ... }
-    <name not found> = ArrayList@196[8] { ResolutionCandidate@193, ResolutionCandidate@194, ResolutionCandidate@195, ... }
+    <name not found> = ArrayList@192[9] { ResolutionCandidate@193, ResolutionCandidate@194, ResolutionCandidate@195, ... }
+    <name not found> = EmptyList@84[empty]
+    <name not found> = EmptyList@84[empty]
 }
 
-ResolutionTaskHolder@197 {
-    <name not found> = ArrayList@198[8] { ResolutionCandidate@199, ResolutionCandidate@200, ResolutionCandidate@201, ... }
-    <name not found> = ArrayList@202[8] { ResolutionCandidate@199, ResolutionCandidate@200, ResolutionCandidate@201, ... }
-}
-
-ResolutionTaskHolder@203 {
-    <name not found> = ArrayList@204[8] { ResolutionCandidate@205, ResolutionCandidate@206, ResolutionCandidate@207, ... }
-    <name not found> = ArrayList@208[8] { ResolutionCandidate@205, ResolutionCandidate@206, ResolutionCandidate@207, ... }
-}
-
-ResolutionTaskHolder@209 {
-    <name not found> = ArrayList@210[8] { ResolutionCandidate@211, ResolutionCandidate@212, ResolutionCandidate@213, ... }
-    <name not found> = ArrayList@214[8] { ResolutionCandidate@211, ResolutionCandidate@212, ResolutionCandidate@213, ... }
-}
-
-ResolutionTaskHolder@215 {
-    <name not found> = ArrayList@216[8] { ResolutionCandidate@217, ResolutionCandidate@218, ResolutionCandidate@219, ... }
-    <name not found> = ArrayList@220[8] { ResolutionCandidate@217, ResolutionCandidate@218, ResolutionCandidate@219, ... }
-}
-
-ResolutionTaskHolder@221 {
-    <name not found> = ArrayList@222[8] { ResolutionCandidate@223, ResolutionCandidate@224, ResolutionCandidate@225, ... }
-    <name not found> = ArrayList@226[8] { ResolutionCandidate@223, ResolutionCandidate@224, ResolutionCandidate@225, ... }
+null {
+    <name not found> = ArrayList@196[10] { ResolutionCandidate@193, ResolutionCandidate@197, ResolutionCandidate@194, ... }
+    <name not found> = ArrayList@198[1] { ResolutionCandidate@124 }
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@200[1] { ResolutionCandidate@142 }
+    <name not found> = ArrayList@201[1] { ResolutionCandidate@136 }
+    <name not found> = ArrayList@202[1] { ResolutionCandidate@145 }
+    <name not found> = ArrayList@203[1] { ResolutionCandidate@127 }
+    <name not found> = ArrayList@204[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@205[1] { ResolutionCandidate@148 }
+    <name not found> = ArrayList@206[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@207[1] { ResolutionCandidate@139 }
+    <name not found> = ArrayList@208[1] { ResolutionCandidate@154 }
+    <name not found> = ArrayList@209[1] { ResolutionCandidate@151 }
+    <name not found> = ArrayList@210[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@211[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@212[1] { ResolutionCandidate@157 }
+    <name not found> = ArrayList@213[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@214[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@215[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@216[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@217[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@218[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@219[1] { ResolutionCandidate@160 }
+    <name not found> = ArrayList@220[1] { ResolutionCandidate@133 }
+    <name not found> = ArrayList@221[8] { ResolutionCandidate@188, ResolutionCandidate@189, ResolutionCandidate@190, ... }
+    <name not found> = ArrayList@222[8] { ResolutionCandidate@173, ResolutionCandidate@174, ResolutionCandidate@175, ... }
+    <name not found> = ArrayList@223[8] { ResolutionCandidate@163, ResolutionCandidate@164, ResolutionCandidate@165, ... }
+    <name not found> = ArrayList@224[8] { ResolutionCandidate@178, ResolutionCandidate@179, ResolutionCandidate@180, ... }
+    <name not found> = ArrayList@225[8] { ResolutionCandidate@183, ResolutionCandidate@184, ResolutionCandidate@185, ... }
+    <name not found> = ArrayList@226[8] { ResolutionCandidate@168, ResolutionCandidate@169, ResolutionCandidate@170, ... }
+    <name not found> = EmptyList@84[empty]
+    <name not found> = EmptyList@84[empty]
+    <name not found> = EmptyList@84[empty]
+    <name not found> = EmptyList@84[empty]
+    <name not found> = EmptyList@84[empty]
+    <name not found> = EmptyList@84[empty]
+    <name not found> = EmptyList@84[empty]
+    <name not found> = EmptyList@84[empty]
+    <name not found> = EmptyList@84[empty]
+    <name not found> = EmptyList@84[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt282.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt282.lazy.log
index 7394d1904b4..b42165174f2 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt282.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt282.lazy.log
@@ -53,13 +53,7 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@39 {
     <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
@@ -84,39 +78,27 @@ ResolutionTaskHolder@39 {
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
+}
+
 ResolutionTaskHolder@50 {
     <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[2] { ResolutionCandidate@64, ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[2] { ResolutionCandidate@64, ResolutionCandidate@65 }
-    <name not found> = ArrayList@67[8] { ResolutionCandidate@68, ResolutionCandidate@69, ResolutionCandidate@70, ... }
-    <name not found> = ArrayList@71[8] { ResolutionCandidate@68, ResolutionCandidate@69, ResolutionCandidate@70, ... }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[2] { ResolutionCandidate@58, ResolutionCandidate@59 }
+    <name not found> = ArrayList@60[8] { ResolutionCandidate@61, ResolutionCandidate@62, ResolutionCandidate@63, ... }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
@@ -141,9 +123,30 @@ ResolutionTaskHolder@62 {
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[2] { ResolutionCandidate@74, ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[2] { ResolutionCandidate@74, ResolutionCandidate@75 }
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[2] { ResolutionCandidate@66, ResolutionCandidate@67 }
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+}
+
+null {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@74[2] { ResolutionCandidate@58, ResolutionCandidate@59 }
+    <name not found> = ArrayList@75[2] { ResolutionCandidate@66, ResolutionCandidate@67 }
+    <name not found> = ArrayList@76[8] { ResolutionCandidate@61, ResolutionCandidate@62, ResolutionCandidate@63, ... }
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
diff --git a/compiler/testData/diagnostics/tests/regressions/kt287.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt287.lazy.log
index 4b6611c3f84..d52fc65b87d 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt287.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt287.lazy.log
@@ -49,26 +49,26 @@ LazyJavaClassifierType@37['K'] {
     arguments = ArrayList@38[empty]
     classifier = JavaTypeParameterImpl@39['K']
     nullable = 'false': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
 }
 
-LazyJavaClassifierType@41['K'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaTypeParameterImpl@43['K']
+LazyJavaClassifierType@40['K'] {
+    arguments = ArrayList@41[empty]
+    classifier = JavaTypeParameterImpl@42['K']
     nullable = 'false': Boolean@35
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
 }
 
-LazyJavaClassifierType@44['K'] {
-    arguments = ArrayList@45[empty]
-    classifier = JavaTypeParameterImpl@46['K']
+LazyJavaClassifierType@43['K'] {
+    arguments = ArrayList@44[empty]
+    classifier = JavaTypeParameterImpl@45['K']
     nullable = 'false': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@46
 }
 
 LazyJavaClassifierType@47['K'] {
     arguments = ArrayList@48[empty]
-    classifier = JavaTypeParameterImpl@46['K']
+    classifier = JavaTypeParameterImpl@39['K']
     nullable = 'true': Boolean@49
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
 }
@@ -82,14 +82,14 @@ LazyJavaClassifierType@50['K'] {
 
 LazyJavaClassifierType@52['K'] {
     arguments = ArrayList@53[empty]
-    classifier = JavaTypeParameterImpl@39['K']
+    classifier = JavaTypeParameterImpl@45['K']
     nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@46
 }
 
 LazyJavaClassifierType@54['K'] {
     arguments = ArrayList@55[empty]
-    classifier = JavaTypeParameterImpl@43['K']
+    classifier = JavaTypeParameterImpl@42['K']
     nullable = 'true': Boolean@49
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
 }
@@ -154,40 +154,40 @@ LazyJavaClassifierType@89['V'] {
     arguments = ArrayList@90[empty]
     classifier = JavaTypeParameterImpl@91['V']
     nullable = 'false': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@88
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
 }
 
 LazyJavaClassifierType@92['V'] {
     arguments = ArrayList@93[empty]
     classifier = JavaTypeParameterImpl@94['V']
     nullable = 'false': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@88
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
 }
 
 LazyJavaClassifierType@95['V'] {
     arguments = ArrayList@96[empty]
-    classifier = JavaTypeParameterImpl@91['V']
+    classifier = JavaTypeParameterImpl@83['V']
     nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@88
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
 }
 
 LazyJavaClassifierType@97['V'] {
     arguments = ArrayList@98[empty]
-    classifier = JavaTypeParameterImpl@94['V']
+    classifier = JavaTypeParameterImpl@87['V']
     nullable = 'true': Boolean@49
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@88
 }
 
 LazyJavaClassifierType@99['V'] {
     arguments = ArrayList@100[empty]
-    classifier = JavaTypeParameterImpl@87['V']
+    classifier = JavaTypeParameterImpl@94['V']
     nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@88
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
 }
 
 LazyJavaClassifierType@101['V'] {
     arguments = ArrayList@102[empty]
-    classifier = JavaTypeParameterImpl@83['V']
+    classifier = JavaTypeParameterImpl@91['V']
     nullable = 'true': Boolean@49
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
 }
@@ -265,17 +265,17 @@ LazyJavaTypeParameterDescriptor@18['K'] {
 }
 
 LazyJavaTypeParameterDescriptor@13['K'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@46
 }
 
 LazyJavaTypeParameterDescriptor@19['V'] {
     defaultType = JetTypeImpl@152['V']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@88
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
     upperBounds = LinkedHashSet@153[1] { NullableType@154 }
 }
 
 LazyJavaTypeParameterDescriptor@14['V'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@88
 }
 
 LazyJavaTypeParameterResolver@155 {
@@ -284,40 +284,43 @@ LazyJavaTypeParameterResolver@155 {
 }
 
 LazyJavaTypeParameterResolver@158 {
-    resolve(JavaTypeParameterImpl@39['K']) = LazyJavaTypeParameterDescriptor@13['K']
-    resolve(JavaTypeParameterImpl@83['V']) = LazyJavaTypeParameterDescriptor@14['V']
+    resolve(JavaTypeParameterImpl@45['K']) = LazyJavaTypeParameterDescriptor@13['K']
+    resolve(JavaTypeParameterImpl@87['V']) = LazyJavaTypeParameterDescriptor@14['V']
 }
 
 ResolutionTaskHolder@159 {
     <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@161 }
-    <name not found> = EmptyList@136[empty]
-    <name not found> = EmptyList@136[empty]
     <name not found> = EmptyList@136[empty]
     <name not found> = EmptyList@136[empty]
 }
 
-ResolutionTaskHolder@163 {
-    <name not found> = ArrayList@164[4] { ResolutionCandidate@165, ResolutionCandidate@166, ResolutionCandidate@167, ... }
-    <name not found> = ArrayList@168[4] { ResolutionCandidate@165, ResolutionCandidate@166, ResolutionCandidate@167, ... }
-    <name not found> = EmptyList@136[empty]
-    <name not found> = EmptyList@136[empty]
+ResolutionTaskHolder@162 {
+    <name not found> = ArrayList@163[4] { ResolutionCandidate@164, ResolutionCandidate@165, ResolutionCandidate@166, ... }
     <name not found> = EmptyList@136[empty]
     <name not found> = EmptyList@136[empty]
 }
 
-ResolutionTaskHolder@169 {
-    <name not found> = ArrayList@170[4] { ResolutionCandidate@171, ResolutionCandidate@172, ResolutionCandidate@173, ... }
-    <name not found> = ArrayList@174[4] { ResolutionCandidate@171, ResolutionCandidate@172, ResolutionCandidate@173, ... }
-    <name not found> = EmptyList@136[empty]
-    <name not found> = EmptyList@136[empty]
+ResolutionTaskHolder@167 {
+    <name not found> = ArrayList@168[4] { ResolutionCandidate@169, ResolutionCandidate@170, ResolutionCandidate@171, ... }
     <name not found> = EmptyList@136[empty]
     <name not found> = EmptyList@136[empty]
 }
 
-ResolutionTaskHolder@175 {
-    <name not found> = ArrayList@176[4] { ResolutionCandidate@177, ResolutionCandidate@178, ResolutionCandidate@179, ... }
-    <name not found> = ArrayList@180[4] { ResolutionCandidate@177, ResolutionCandidate@178, ResolutionCandidate@179, ... }
+ResolutionTaskHolder@172 {
+    <name not found> = ArrayList@173[4] { ResolutionCandidate@174, ResolutionCandidate@175, ResolutionCandidate@176, ... }
+    <name not found> = EmptyList@136[empty]
+    <name not found> = EmptyList@136[empty]
+}
+
+null {
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@161 }
+    <name not found> = ArrayList@178[4] { ResolutionCandidate@169, ResolutionCandidate@170, ResolutionCandidate@171, ... }
+    <name not found> = ArrayList@179[4] { ResolutionCandidate@164, ResolutionCandidate@165, ResolutionCandidate@166, ... }
+    <name not found> = ArrayList@180[4] { ResolutionCandidate@174, ResolutionCandidate@175, ResolutionCandidate@176, ... }
+    <name not found> = EmptyList@136[empty]
+    <name not found> = EmptyList@136[empty]
+    <name not found> = EmptyList@136[empty]
+    <name not found> = EmptyList@136[empty]
     <name not found> = EmptyList@136[empty]
     <name not found> = EmptyList@136[empty]
     <name not found> = EmptyList@136[empty]
diff --git a/compiler/testData/diagnostics/tests/regressions/kt2956.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt2956.lazy.log
index 9ef3a9a7510..e7bb98f2831 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt2956.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt2956.lazy.log
@@ -44,6 +44,9 @@ ResolutionTaskHolder@28 {
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
+}
+
+null {
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt306.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt306.lazy.log
index dbbd5c88a19..b40b9050b3a 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt306.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt306.lazy.log
@@ -36,32 +36,35 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@27 {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
 }
 
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+}
+
+null {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@35 }
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt307.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt307.lazy.log
index a45f5c2edab..22f68f72385 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt307.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt307.lazy.log
@@ -45,29 +45,32 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@36 {
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
+}
+
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
 }
 
 ResolutionTaskHolder@48 {
     <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+null {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@47 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt312.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt312.lazy.log
index 95087345665..9fb161957c0 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt312.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt312.lazy.log
@@ -62,75 +62,78 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@43 {
     <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
 }
 
 ResolutionTaskHolder@55 {
     <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@35[empty]
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
     <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
+}
+
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
 }
 
 ResolutionTaskHolder@67 {
     <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
 }
 
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
 }
 
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[7] { ResolutionCandidate@75, ResolutionCandidate@76, ResolutionCandidate@77, ... }
 }
 
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[7] { ResolutionCandidate@85, ResolutionCandidate@86, ResolutionCandidate@87, ... }
-    <name not found> = ArrayList@88[7] { ResolutionCandidate@85, ResolutionCandidate@86, ResolutionCandidate@87, ... }
+null {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@88[7] { ResolutionCandidate@75, ResolutionCandidate@76, ResolutionCandidate@77, ... }
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt313.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt313.lazy.log
index cd76908d61c..d5b57c009a7 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt313.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt313.lazy.log
@@ -118,37 +118,40 @@ LazyJavaPackageFragment@45['lang'] {
 
 ResolutionTaskHolder@74 {
     <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
     <name not found> = EmptyList@66[empty]
     <name not found> = EmptyList@66[empty]
+}
+
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
+    <name not found> = EmptyList@66[empty]
     <name not found> = EmptyList@66[empty]
     <name not found> = EmptyList@66[empty]
 }
 
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
 }
 
 ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@86[2] { ResolutionCandidate@87, ResolutionCandidate@88 }
+    <name not found> = EmptyList@66[empty]
+    <name not found> = EmptyList@66[empty]
+    <name not found> = EmptyList@66[empty]
+    <name not found> = EmptyList@66[empty]
+    <name not found> = EmptyList@66[empty]
+    <name not found> = EmptyList@66[empty]
+    <name not found> = EmptyList@66[empty]
+    <name not found> = EmptyList@66[empty]
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[2] { ResolutionCandidate@91, ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[2] { ResolutionCandidate@91, ResolutionCandidate@92 }
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
+null {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@93[2] { ResolutionCandidate@87, ResolutionCandidate@88 }
     <name not found> = EmptyList@66[empty]
     <name not found> = EmptyList@66[empty]
     <name not found> = EmptyList@66[empty]
diff --git a/compiler/testData/diagnostics/tests/regressions/kt328.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt328.lazy.log
index 0bf29aa2fa6..4dbcce0bea6 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt328.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt328.lazy.log
@@ -76,87 +76,59 @@ LazyJavaPackageFragment@17['lang'] {
 
 ResolutionTaskHolder@46 {
     <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
 ResolutionTaskHolder@58 {
     <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
     <name not found> = EmptyList@38[empty]
+}
+
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
     <name not found> = EmptyList@38[empty]
 }
 
 ResolutionTaskHolder@70 {
     <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
+ResolutionTaskHolder@76 {
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
@@ -175,7 +147,38 @@ ResolutionTaskHolder@86 {
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@87 {
+ResolutionTaskHolder@77 {
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+}
+
+null {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@54 }
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
diff --git a/compiler/testData/diagnostics/tests/regressions/kt334.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt334.lazy.log
index d0763ef0e24..76bc50e4dcd 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt334.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt334.lazy.log
@@ -46,14 +46,14 @@ LazyJavaClassifierType@42['T'] {
 
 LazyJavaClassifierType@45['T'] {
     arguments = ArrayList@46[empty]
-    classifier = JavaTypeParameterImpl@39['T']
+    classifier = JavaTypeParameterImpl@44['T']
     nullable = 'true': Boolean@47
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@41
 }
 
 LazyJavaClassifierType@48['T'] {
     arguments = ArrayList@49[empty]
-    classifier = JavaTypeParameterImpl@44['T']
+    classifier = JavaTypeParameterImpl@39['T']
     nullable = 'true': Boolean@47
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@41
 }
@@ -108,19 +108,22 @@ LazyJavaTypeParameterResolver@85 {
 }
 
 LazyJavaTypeParameterResolver@87 {
-    resolve(JavaTypeParameterImpl@44['T']) = null
+    resolve(JavaTypeParameterImpl@39['T']) = null
 }
 
 LazyJavaTypeParameterResolver@88 {
-    resolve(JavaTypeParameterImpl@39['T']) = null
+    resolve(JavaTypeParameterImpl@44['T']) = null
 }
 
 ResolutionTaskHolder@89 {
     <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
+}
+
+null {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@94 }
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt335.336.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt335.336.lazy.log
index bb569f07720..134be148559 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt335.336.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt335.336.lazy.log
@@ -143,21 +143,21 @@ LazyJavaClassifierType@96['E'] {
     arguments = ArrayList@97[empty]
     classifier = JavaTypeParameterImpl@98['E']
     nullable = 'false': Boolean@64
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
 }
 
-LazyJavaClassifierType@100['E'] {
-    arguments = ArrayList@101[empty]
-    classifier = JavaTypeParameterImpl@102['E']
+LazyJavaClassifierType@99['E'] {
+    arguments = ArrayList@100[empty]
+    classifier = JavaTypeParameterImpl@101['E']
     nullable = 'false': Boolean@64
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
 }
 
-LazyJavaClassifierType@103['E'] {
-    arguments = ArrayList@104[empty]
-    classifier = JavaTypeParameterImpl@105['E']
+LazyJavaClassifierType@102['E'] {
+    arguments = ArrayList@103[empty]
+    classifier = JavaTypeParameterImpl@104['E']
     nullable = 'false': Boolean@64
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@105
 }
 
 LazyJavaClassifierType@106['E'] {
@@ -169,23 +169,23 @@ LazyJavaClassifierType@106['E'] {
 
 LazyJavaClassifierType@108['E'] {
     arguments = ArrayList@109[empty]
-    classifier = JavaTypeParameterImpl@105['E']
+    classifier = JavaTypeParameterImpl@104['E']
     nullable = 'true': Boolean@70
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@105
 }
 
 LazyJavaClassifierType@110['E'] {
     arguments = ArrayList@111[empty]
-    classifier = JavaTypeParameterImpl@102['E']
+    classifier = JavaTypeParameterImpl@98['E']
     nullable = 'true': Boolean@70
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
 }
 
 LazyJavaClassifierType@112['E'] {
     arguments = ArrayList@113[empty]
-    classifier = JavaTypeParameterImpl@98['E']
+    classifier = JavaTypeParameterImpl@101['E']
     nullable = 'true': Boolean@70
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
 }
 
 LazyJavaClassifierType@40['List<E>'] {
@@ -267,35 +267,35 @@ LazyJavaClassifierType@152['T'] {
     arguments = ArrayList@153[empty]
     classifier = JavaTypeParameterImpl@154['T']
     nullable = 'false': Boolean@64
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@155
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@151
 }
 
-LazyJavaClassifierType@156['T'] {
-    arguments = ArrayList@157[empty]
-    classifier = JavaTypeParameterImpl@158['T']
+LazyJavaClassifierType@155['T'] {
+    arguments = ArrayList@156[empty]
+    classifier = JavaTypeParameterImpl@157['T']
     nullable = 'false': Boolean@64
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@151
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@158
 }
 
 LazyJavaClassifierType@159['T'] {
     arguments = ArrayList@160[empty]
     classifier = JavaTypeParameterImpl@161['T']
     nullable = 'false': Boolean@64
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@155
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@151
 }
 
 LazyJavaClassifierType@162['T'] {
     arguments = ArrayList@163[empty]
     classifier = JavaTypeParameterImpl@164['T']
     nullable = 'false': Boolean@64
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@165
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@158
 }
 
-LazyJavaClassifierType@166['T'] {
-    arguments = ArrayList@167[empty]
-    classifier = JavaTypeParameterImpl@168['T']
+LazyJavaClassifierType@165['T'] {
+    arguments = ArrayList@166[empty]
+    classifier = JavaTypeParameterImpl@167['T']
     nullable = 'false': Boolean@64
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@151
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@168
 }
 
 LazyJavaClassifierType@169['T'] {
@@ -309,63 +309,63 @@ LazyJavaClassifierType@172['T'] {
     arguments = ArrayList@173[empty]
     classifier = JavaTypeParameterImpl@174['T']
     nullable = 'false': Boolean@64
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@165
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@168
 }
 
 LazyJavaClassifierType@175['T'] {
     arguments = ArrayList@176[empty]
     classifier = JavaTypeParameterImpl@177['T']
     nullable = 'false': Boolean@64
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@165
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@168
 }
 
 LazyJavaClassifierType@178['T'] {
     arguments = ArrayList@179[empty]
     classifier = JavaTypeParameterImpl@180['T']
     nullable = 'false': Boolean@64
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@165
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@168
 }
 
 LazyJavaClassifierType@181['T'] {
     arguments = ArrayList@182[empty]
-    classifier = JavaTypeParameterImpl@150['T']
+    classifier = JavaTypeParameterImpl@157['T']
     nullable = 'true': Boolean@70
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@151
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@158
 }
 
 LazyJavaClassifierType@183['T'] {
     arguments = ArrayList@184[empty]
-    classifier = JavaTypeParameterImpl@154['T']
+    classifier = JavaTypeParameterImpl@150['T']
     nullable = 'true': Boolean@70
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@155
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@151
 }
 
 LazyJavaClassifierType@185['T'] {
     arguments = ArrayList@186[empty]
     classifier = JavaTypeParameterImpl@164['T']
     nullable = 'true': Boolean@70
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@165
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@158
 }
 
 LazyJavaClassifierType@187['T'] {
     arguments = ArrayList@188[empty]
-    classifier = JavaTypeParameterImpl@174['T']
+    classifier = JavaTypeParameterImpl@161['T']
     nullable = 'true': Boolean@70
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@165
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@151
 }
 
 LazyJavaClassifierType@189['T'] {
     arguments = ArrayList@190[empty]
-    classifier = JavaTypeParameterImpl@161['T']
+    classifier = JavaTypeParameterImpl@177['T']
     nullable = 'true': Boolean@70
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@155
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@168
 }
 
 LazyJavaClassifierType@191['T'] {
     arguments = ArrayList@192[empty]
     classifier = JavaTypeParameterImpl@180['T']
     nullable = 'true': Boolean@70
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@165
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@168
 }
 
 LazyJavaClassifierType@193['T'] {
@@ -377,23 +377,23 @@ LazyJavaClassifierType@193['T'] {
 
 LazyJavaClassifierType@195['T'] {
     arguments = ArrayList@196[empty]
-    classifier = JavaTypeParameterImpl@168['T']
+    classifier = JavaTypeParameterImpl@174['T']
     nullable = 'true': Boolean@70
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@151
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@168
 }
 
 LazyJavaClassifierType@197['T'] {
     arguments = ArrayList@198[empty]
-    classifier = JavaTypeParameterImpl@158['T']
+    classifier = JavaTypeParameterImpl@167['T']
     nullable = 'true': Boolean@70
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@151
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@168
 }
 
 LazyJavaClassifierType@199['T'] {
     arguments = ArrayList@200[empty]
-    classifier = JavaTypeParameterImpl@177['T']
+    classifier = JavaTypeParameterImpl@154['T']
     nullable = 'true': Boolean@70
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@165
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@151
 }
 
 LazyJavaPackageFragmentProvider@201 {
@@ -477,34 +477,34 @@ LazyJavaPackageFragment@221['util'] {
 
 LazyJavaTypeParameterDescriptor@42['E'] {
     defaultType = JetTypeImpl@259['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
     upperBounds = LinkedHashSet@260[1] { NullableType@261 }
 }
 
 LazyJavaTypeParameterDescriptor@37['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@105
 }
 
 LazyJavaTypeParameterDescriptor@262['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@165
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@151
     upperBounds = LinkedHashSet@263[1] { DelegatingFlexibleType@264 }
     upperBoundsAsType = DelegatingFlexibleType@264
 }
 
 LazyJavaTypeParameterDescriptor@265['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@151
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@168
     upperBounds = LinkedHashSet@266[1] { NullableType@267 }
     upperBoundsAsType = NullableType@267
 }
 
 LazyJavaTypeParameterDescriptor@50['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@155
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@158
     upperBounds = LinkedHashSet@268[1] { NullableType@269 }
     upperBoundsAsType = NullableType@269
 }
 
 LazyJavaTypeParameterResolver@270 {
-    resolve(JavaTypeParameterImpl@94['E']) = LazyJavaTypeParameterDescriptor@37['E']
+    resolve(JavaTypeParameterImpl@104['E']) = LazyJavaTypeParameterDescriptor@37['E']
 }
 
 LazyJavaTypeParameterResolver@271 {
@@ -512,38 +512,52 @@ LazyJavaTypeParameterResolver@271 {
 }
 
 LazyJavaTypeParameterResolver@273 {
-    resolve(JavaTypeParameterImpl@274['T']) = LazyJavaTypeParameterDescriptor@262['T']
+    resolve(JavaTypeParameterImpl@274['T']) = LazyJavaTypeParameterDescriptor@50['T']
 }
 
 LazyJavaTypeParameterResolver@275 {
-    resolve(JavaTypeParameterImpl@276['T']) = LazyJavaTypeParameterDescriptor@50['T']
+    resolve(JavaTypeParameterImpl@276['T']) = LazyJavaTypeParameterDescriptor@265['T']
 }
 
 LazyJavaTypeParameterResolver@277 {
-    resolve(JavaTypeParameterImpl@278['T']) = LazyJavaTypeParameterDescriptor@265['T']
+    resolve(JavaTypeParameterImpl@278['T']) = LazyJavaTypeParameterDescriptor@262['T']
 }
 
 LazyJavaTypeParameterResolver@279 {
-    resolve(JavaTypeParameterImpl@161['T']) = null
+    resolve(JavaTypeParameterImpl@157['T']) = null
 }
 
 ResolutionTaskHolder@280 {
     <name not found> = ArrayList@281[1] { ResolutionCandidate@282 }
-    <name not found> = ArrayList@283[1] { ResolutionCandidate@282 }
 }
 
-ResolutionTaskHolder@284 {
-    <name not found> = ArrayList@285[2] { ResolutionCandidate@286, ResolutionCandidate@287 }
-    <name not found> = ArrayList@288[3] { ResolutionCandidate@286, ResolutionCandidate@287, ResolutionCandidate@289 }
+ResolutionTaskHolder@283 {
+    <name not found> = ArrayList@284[2] { ResolutionCandidate@285, ResolutionCandidate@286 }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+}
+
+ResolutionTaskHolder@287 {
+    <name not found> = ArrayList@288[3] { ResolutionCandidate@289, ResolutionCandidate@290, ResolutionCandidate@291 }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@290 {
-    <name not found> = ArrayList@291[3] { ResolutionCandidate@292, ResolutionCandidate@293, ResolutionCandidate@294 }
-    <name not found> = ArrayList@295[3] { ResolutionCandidate@292, ResolutionCandidate@293, ResolutionCandidate@294 }
+ResolutionTaskHolder@292 {
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
@@ -562,21 +576,10 @@ ResolutionTaskHolder@290 {
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@296 {
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
+null {
+    <name not found> = ArrayList@293[1] { ResolutionCandidate@282 }
+    <name not found> = ArrayList@294[3] { ResolutionCandidate@285, ResolutionCandidate@286, ResolutionCandidate@295 }
+    <name not found> = ArrayList@296[3] { ResolutionCandidate@289, ResolutionCandidate@290, ResolutionCandidate@291 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
diff --git a/compiler/testData/diagnostics/tests/regressions/kt337.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt337.lazy.log
index 0be6a626c6c..4d811a4d253 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt337.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt337.lazy.log
@@ -31,19 +31,22 @@ LazyJavaPackageFragment@7['lang'] {
 
 ResolutionTaskHolder@22 {
     <name not found> = ArrayList@23[1] { ResolutionCandidate@24 }
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@24 }
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
     <name not found> = EmptyList@14[empty]
     <name not found> = EmptyList@14[empty]
 }
 
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
+ResolutionTaskHolder@25 {
+    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
 }
 
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
+}
+
+null {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@24 }
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@27 }
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@30 }
+    <name not found> = EmptyList@14[empty]
+    <name not found> = EmptyList@14[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt352.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt352.lazy.log
index 612bb5470b4..55f3e47ee47 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt352.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt352.lazy.log
@@ -45,26 +45,29 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@41 {
     <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[2] { ResolutionCandidate@51, ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[2] { ResolutionCandidate@51, ResolutionCandidate@52 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[2] { ResolutionCandidate@49, ResolutionCandidate@50 }
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[2] { ResolutionCandidate@56, ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[2] { ResolutionCandidate@56, ResolutionCandidate@57 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[2] { ResolutionCandidate@53, ResolutionCandidate@54 }
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+}
+
+null {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@57[2] { ResolutionCandidate@49, ResolutionCandidate@50 }
+    <name not found> = ArrayList@58[2] { ResolutionCandidate@53, ResolutionCandidate@54 }
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
diff --git a/compiler/testData/diagnostics/tests/regressions/kt353.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt353.lazy.log
index 16f99e2a59c..b1866fac31e 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt353.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt353.lazy.log
@@ -38,72 +38,75 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@32 {
     <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
+}
+
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
 }
 
 ResolutionTaskHolder@44 {
     <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
+}
+
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
 }
 
 ResolutionTaskHolder@56 {
     <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
+}
+
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
 }
 
 ResolutionTaskHolder@68 {
     <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
 }
 
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+null {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@37 }
+    <name not found> = EmptyList@29[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt3535.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt3535.lazy.log
index 7c1eba5a383..5698c968a46 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt3535.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt3535.lazy.log
@@ -35,16 +35,19 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@26 {
     <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
 }
 
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
+ResolutionTaskHolder@29 {
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
+}
+
+null {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@28 }
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@31 }
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt3647.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt3647.lazy.log
index 85bbc6e2289..0dc021ee345 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt3647.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt3647.lazy.log
@@ -41,25 +41,6 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@29 {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
@@ -80,14 +61,36 @@ ResolutionTaskHolder@29 {
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+}
+
+null {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@31 }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt3731.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt3731.lazy.log
index 3214ecaef71..713f036db88 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt3731.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt3731.lazy.log
@@ -54,78 +54,81 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@34 {
     <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+}
+
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
 ResolutionTaskHolder@45 {
     <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+}
+
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
+}
+
+null {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@38 }
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt385.109.441.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt385.109.441.lazy.log
index 82cd7503e61..83493452d50 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt385.109.441.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt385.109.441.lazy.log
@@ -366,217 +366,155 @@ LazyJavaPackageFragment@141['util'] {
 
 ResolutionTaskHolder@202 {
     <name not found> = ArrayList@203[10] { ResolutionCandidate@204, ResolutionCandidate@205, ResolutionCandidate@206, ... }
-    <name not found> = ArrayList@207[10] { ResolutionCandidate@204, ResolutionCandidate@205, ResolutionCandidate@206, ... }
 }
 
-ResolutionTaskHolder@208 {
-    <name not found> = ArrayList@209[10] { ResolutionCandidate@210, ResolutionCandidate@211, ResolutionCandidate@212, ... }
-    <name not found> = ArrayList@213[10] { ResolutionCandidate@210, ResolutionCandidate@211, ResolutionCandidate@212, ... }
+ResolutionTaskHolder@207 {
+    <name not found> = ArrayList@208[10] { ResolutionCandidate@209, ResolutionCandidate@210, ResolutionCandidate@211, ... }
 }
 
-ResolutionTaskHolder@214 {
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@216 }
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@216 }
+ResolutionTaskHolder@212 {
+    <name not found> = ArrayList@213[1] { ResolutionCandidate@214 }
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
+}
+
+ResolutionTaskHolder@215 {
+    <name not found> = ArrayList@216[1] { ResolutionCandidate@217 }
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
 }
 
 ResolutionTaskHolder@218 {
     <name not found> = ArrayList@219[1] { ResolutionCandidate@220 }
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@220 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
 }
 
-ResolutionTaskHolder@222 {
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@224 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
+ResolutionTaskHolder@221 {
+    <name not found> = ArrayList@222[1] { ResolutionCandidate@223 }
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
 }
 
-ResolutionTaskHolder@226 {
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@228 }
+ResolutionTaskHolder@224 {
+    <name not found> = ArrayList@225[1] { ResolutionCandidate@226 }
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
+}
+
+ResolutionTaskHolder@227 {
+    <name not found> = ArrayList@228[1] { ResolutionCandidate@229 }
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
 }
 
 ResolutionTaskHolder@230 {
     <name not found> = ArrayList@231[1] { ResolutionCandidate@232 }
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@232 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
 }
 
-ResolutionTaskHolder@234 {
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@236 }
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@236 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
+ResolutionTaskHolder@233 {
+    <name not found> = ArrayList@234[1] { ResolutionCandidate@235 }
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
 }
 
-ResolutionTaskHolder@238 {
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@240 }
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@240 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
+ResolutionTaskHolder@236 {
+    <name not found> = ArrayList@237[1] { ResolutionCandidate@238 }
     <name not found> = EmptyList@6[empty]
+}
+
+ResolutionTaskHolder@239 {
+    <name not found> = ArrayList@240[1] { ResolutionCandidate@241 }
     <name not found> = EmptyList@6[empty]
 }
 
 ResolutionTaskHolder@242 {
     <name not found> = ArrayList@243[1] { ResolutionCandidate@244 }
-    <name not found> = ArrayList@245[1] { ResolutionCandidate@244 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
 }
 
-ResolutionTaskHolder@246 {
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@248 }
-    <name not found> = ArrayList@249[1] { ResolutionCandidate@248 }
-    <name not found> = EmptyList@6[empty]
+ResolutionTaskHolder@245 {
+    <name not found> = ArrayList@246[1] { ResolutionCandidate@247 }
     <name not found> = EmptyList@6[empty]
 }
 
-ResolutionTaskHolder@250 {
-    <name not found> = ArrayList@251[1] { ResolutionCandidate@252 }
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@252 }
+ResolutionTaskHolder@248 {
+    <name not found> = ArrayList@249[1] { ResolutionCandidate@250 }
     <name not found> = EmptyList@6[empty]
+}
+
+ResolutionTaskHolder@251 {
+    <name not found> = ArrayList@252[1] { ResolutionCandidate@253 }
     <name not found> = EmptyList@6[empty]
 }
 
 ResolutionTaskHolder@254 {
     <name not found> = ArrayList@255[1] { ResolutionCandidate@256 }
-    <name not found> = ArrayList@257[1] { ResolutionCandidate@256 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
 }
 
-ResolutionTaskHolder@258 {
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@260 }
-    <name not found> = ArrayList@261[1] { ResolutionCandidate@260 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
+ResolutionTaskHolder@257 {
+    <name not found> = ArrayList@258[1] { ResolutionCandidate@259 }
 }
 
-ResolutionTaskHolder@262 {
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@264 }
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@264 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
+ResolutionTaskHolder@260 {
+    <name not found> = ArrayList@261[1] { ResolutionCandidate@262 }
+}
+
+ResolutionTaskHolder@263 {
+    <name not found> = ArrayList@264[1] { ResolutionCandidate@265 }
 }
 
 ResolutionTaskHolder@266 {
     <name not found> = ArrayList@267[1] { ResolutionCandidate@268 }
-    <name not found> = ArrayList@269[1] { ResolutionCandidate@268 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
 }
 
-ResolutionTaskHolder@270 {
-    <name not found> = ArrayList@271[1] { ResolutionCandidate@272 }
-    <name not found> = ArrayList@273[1] { ResolutionCandidate@272 }
+ResolutionTaskHolder@269 {
+    <name not found> = ArrayList@270[1] { ResolutionCandidate@271 }
 }
 
-ResolutionTaskHolder@274 {
-    <name not found> = ArrayList@275[1] { ResolutionCandidate@276 }
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@276 }
+ResolutionTaskHolder@272 {
+    <name not found> = ArrayList@273[1] { ResolutionCandidate@274 }
+}
+
+ResolutionTaskHolder@275 {
+    <name not found> = ArrayList@276[1] { ResolutionCandidate@277 }
 }
 
 ResolutionTaskHolder@278 {
     <name not found> = ArrayList@279[1] { ResolutionCandidate@280 }
-    <name not found> = ArrayList@281[1] { ResolutionCandidate@280 }
 }
 
-ResolutionTaskHolder@282 {
-    <name not found> = ArrayList@283[1] { ResolutionCandidate@284 }
-    <name not found> = ArrayList@285[1] { ResolutionCandidate@284 }
+ResolutionTaskHolder@281 {
+    <name not found> = ArrayList@282[1] { ResolutionCandidate@283 }
 }
 
-ResolutionTaskHolder@286 {
-    <name not found> = ArrayList@287[1] { ResolutionCandidate@288 }
-    <name not found> = ArrayList@289[1] { ResolutionCandidate@288 }
+ResolutionTaskHolder@284 {
+    <name not found> = ArrayList@285[1] { ResolutionCandidate@286 }
 }
 
-ResolutionTaskHolder@290 {
-    <name not found> = ArrayList@291[1] { ResolutionCandidate@292 }
-    <name not found> = ArrayList@293[1] { ResolutionCandidate@292 }
-}
-
-ResolutionTaskHolder@294 {
-    <name not found> = ArrayList@295[1] { ResolutionCandidate@296 }
-    <name not found> = ArrayList@297[1] { ResolutionCandidate@296 }
-}
-
-ResolutionTaskHolder@298 {
-    <name not found> = ArrayList@299[1] { ResolutionCandidate@300 }
-    <name not found> = ArrayList@301[1] { ResolutionCandidate@300 }
-}
-
-ResolutionTaskHolder@302 {
-    <name not found> = ArrayList@303[1] { ResolutionCandidate@304 }
-    <name not found> = ArrayList@305[1] { ResolutionCandidate@304 }
-}
-
-ResolutionTaskHolder@306 {
-    <name not found> = ArrayList@307[1] { ResolutionCandidate@308 }
-    <name not found> = ArrayList@309[1] { ResolutionCandidate@308 }
-}
-
-ResolutionTaskHolder@310 {
-    <name not found> = ArrayList@311[1] { ResolutionCandidate@312 }
-    <name not found> = ArrayList@313[1] { ResolutionCandidate@312 }
-}
-
-ResolutionTaskHolder@314 {
-    <name not found> = ArrayList@315[2] { ResolutionCandidate@316, ResolutionCandidate@317 }
-    <name not found> = ArrayList@318[2] { ResolutionCandidate@316, ResolutionCandidate@317 }
+ResolutionTaskHolder@287 {
+    <name not found> = ArrayList@288[2] { ResolutionCandidate@289, ResolutionCandidate@290 }
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
+}
+
+ResolutionTaskHolder@291 {
+    <name not found> = ArrayList@292[4] { ResolutionCandidate@293, ResolutionCandidate@294, ResolutionCandidate@295, ... }
+    <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
 }
 
-ResolutionTaskHolder@319 {
-    <name not found> = ArrayList@320[4] { ResolutionCandidate@321, ResolutionCandidate@322, ResolutionCandidate@323, ... }
-    <name not found> = ArrayList@324[4] { ResolutionCandidate@321, ResolutionCandidate@322, ResolutionCandidate@323, ... }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
+ResolutionTaskHolder@296 {
+    <name not found> = ArrayList@297[4] { ResolutionCandidate@298, ResolutionCandidate@299, ResolutionCandidate@300, ... }
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
 }
 
-ResolutionTaskHolder@325 {
-    <name not found> = ArrayList@326[4] { ResolutionCandidate@327, ResolutionCandidate@328, ResolutionCandidate@329, ... }
-    <name not found> = ArrayList@330[4] { ResolutionCandidate@327, ResolutionCandidate@328, ResolutionCandidate@329, ... }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@331 {
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
+ResolutionTaskHolder@301 {
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
@@ -587,7 +525,72 @@ ResolutionTaskHolder@331 {
     <name not found> = EmptyList@6[empty]
 }
 
-ResolutionTaskHolder@332 {
+ResolutionTaskHolder@302 {
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+}
+
+null {
+    <name not found> = ArrayList@303[10] { ResolutionCandidate@204, ResolutionCandidate@205, ResolutionCandidate@206, ... }
+    <name not found> = ArrayList@304[10] { ResolutionCandidate@209, ResolutionCandidate@210, ResolutionCandidate@211, ... }
+    <name not found> = ArrayList@305[1] { ResolutionCandidate@277 }
+    <name not found> = ArrayList@306[1] { ResolutionCandidate@229 }
+    <name not found> = ArrayList@307[1] { ResolutionCandidate@232 }
+    <name not found> = ArrayList@308[1] { ResolutionCandidate@238 }
+    <name not found> = ArrayList@309[1] { ResolutionCandidate@262 }
+    <name not found> = ArrayList@310[1] { ResolutionCandidate@235 }
+    <name not found> = ArrayList@311[1] { ResolutionCandidate@259 }
+    <name not found> = ArrayList@312[1] { ResolutionCandidate@256 }
+    <name not found> = ArrayList@313[1] { ResolutionCandidate@220 }
+    <name not found> = ArrayList@314[1] { ResolutionCandidate@253 }
+    <name not found> = ArrayList@315[1] { ResolutionCandidate@265 }
+    <name not found> = ArrayList@316[1] { ResolutionCandidate@226 }
+    <name not found> = ArrayList@317[1] { ResolutionCandidate@271 }
+    <name not found> = ArrayList@318[1] { ResolutionCandidate@214 }
+    <name not found> = ArrayList@319[1] { ResolutionCandidate@283 }
+    <name not found> = ArrayList@320[1] { ResolutionCandidate@223 }
+    <name not found> = ArrayList@321[1] { ResolutionCandidate@241 }
+    <name not found> = ArrayList@322[1] { ResolutionCandidate@286 }
+    <name not found> = ArrayList@323[1] { ResolutionCandidate@244 }
+    <name not found> = ArrayList@324[1] { ResolutionCandidate@280 }
+    <name not found> = ArrayList@325[1] { ResolutionCandidate@250 }
+    <name not found> = ArrayList@326[1] { ResolutionCandidate@274 }
+    <name not found> = ArrayList@327[1] { ResolutionCandidate@247 }
+    <name not found> = ArrayList@328[1] { ResolutionCandidate@268 }
+    <name not found> = ArrayList@329[1] { ResolutionCandidate@217 }
+    <name not found> = ArrayList@330[2] { ResolutionCandidate@289, ResolutionCandidate@290 }
+    <name not found> = ArrayList@331[4] { ResolutionCandidate@293, ResolutionCandidate@294, ResolutionCandidate@295, ... }
+    <name not found> = ArrayList@332[4] { ResolutionCandidate@298, ResolutionCandidate@299, ResolutionCandidate@300, ... }
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
diff --git a/compiler/testData/diagnostics/tests/regressions/kt394.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt394.lazy.log
index b0bfb0ec44b..3cbec9e210b 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt394.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt394.lazy.log
@@ -34,25 +34,28 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@26 {
     <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+}
+
+null {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
diff --git a/compiler/testData/diagnostics/tests/regressions/kt398.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt398.lazy.log
index c3d28b03a2f..e304b489fb6 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt398.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt398.lazy.log
@@ -46,52 +46,55 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@35 {
     <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
     <name not found> = EmptyList@27[empty]
+}
+
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
     <name not found> = EmptyList@27[empty]
 }
 
 ResolutionTaskHolder@47 {
     <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+}
+
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
+}
+
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
+}
+
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+}
+
+null {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@58 }
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt399.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt399.lazy.log
index 2e5554d3352..ce4263eb948 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt399.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt399.lazy.log
@@ -49,38 +49,41 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
 }
 
 ResolutionTaskHolder@52 {
     <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+null {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@54 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt402.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt402.lazy.log
index 52011ef64e8..5625e6bad2b 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt402.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt402.lazy.log
@@ -37,10 +37,13 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@35 {
     <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
+}
+
+null {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@40 }
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt41.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt41.lazy.log
index 046a5ff095d..aa657d5241d 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt41.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt41.lazy.log
@@ -30,36 +30,39 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@23 {
     <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@25 }
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+}
+
+ResolutionTaskHolder@26 {
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@27 {
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
+null {
+    <name not found> = ArrayList@27[1] { ResolutionCandidate@25 }
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
diff --git a/compiler/testData/diagnostics/tests/regressions/kt411.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt411.lazy.log
index ce6e0bd3aae..b1aba235f7a 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt411.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt411.lazy.log
@@ -32,41 +32,44 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
+}
+
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
 }
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+null {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@39 }
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt439.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt439.lazy.log
index a70ebca4f2c..bbaadc5ba8b 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt439.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt439.lazy.log
@@ -55,26 +55,29 @@ LazyJavaPackageFragment@14['lang'] {
 
 ResolutionTaskHolder@41 {
     <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
+}
+
+null {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@43 }
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt442.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt442.lazy.log
index c572623dc27..65b66c08dcb 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt442.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt442.lazy.log
@@ -77,95 +77,98 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@47 {
     <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
 ResolutionTaskHolder@58 {
     <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
     <name not found> = EmptyList@39[empty]
+}
+
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
     <name not found> = EmptyList@39[empty]
 }
 
 ResolutionTaskHolder@70 {
     <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
+}
+
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
 }
 
 ResolutionTaskHolder@82 {
     <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
 }
 
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[8] { ResolutionCandidate@87, ResolutionCandidate@88, ResolutionCandidate@89, ... }
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[8] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102, ... }
-    <name not found> = ArrayList@103[8] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102, ... }
+null {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@103[8] { ResolutionCandidate@87, ResolutionCandidate@88, ResolutionCandidate@89, ... }
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
diff --git a/compiler/testData/diagnostics/tests/regressions/kt443.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt443.lazy.log
index 517c5fd0038..dcf36c9765a 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt443.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt443.lazy.log
@@ -39,42 +39,45 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@29 {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+}
+
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
 }
 
 ResolutionTaskHolder@41 {
     <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[8] { ResolutionCandidate@46, ResolutionCandidate@47, ResolutionCandidate@48, ... }
 }
 
 ResolutionTaskHolder@49 {
     <name not found> = ArrayList@50[8] { ResolutionCandidate@51, ResolutionCandidate@52, ResolutionCandidate@53, ... }
-    <name not found> = ArrayList@54[8] { ResolutionCandidate@51, ResolutionCandidate@52, ResolutionCandidate@53, ... }
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[8] { ResolutionCandidate@57, ResolutionCandidate@58, ResolutionCandidate@59, ... }
-    <name not found> = ArrayList@60[8] { ResolutionCandidate@57, ResolutionCandidate@58, ResolutionCandidate@59, ... }
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[8] { ResolutionCandidate@56, ResolutionCandidate@57, ResolutionCandidate@58, ... }
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[8] { ResolutionCandidate@63, ResolutionCandidate@64, ResolutionCandidate@65, ... }
-    <name not found> = ArrayList@66[8] { ResolutionCandidate@63, ResolutionCandidate@64, ResolutionCandidate@65, ... }
+null {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@64[8] { ResolutionCandidate@56, ResolutionCandidate@57, ResolutionCandidate@58, ... }
+    <name not found> = ArrayList@65[8] { ResolutionCandidate@46, ResolutionCandidate@47, ResolutionCandidate@48, ... }
+    <name not found> = ArrayList@66[8] { ResolutionCandidate@51, ResolutionCandidate@52, ResolutionCandidate@53, ... }
+    <name not found> = EmptyList@26[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt455.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt455.lazy.log
index 1e624fc2503..39e1c2438ca 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt455.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt455.lazy.log
@@ -28,28 +28,31 @@ LazyJavaPackageFragment@7['lang'] {
 
 ResolutionTaskHolder@24 {
     <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
 }
 
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
+ResolutionTaskHolder@27 {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
 }
 
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
 }
 
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
+}
+
+null {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@26 }
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt456.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt456.lazy.log
index 583589e251c..00a4c884a64 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt456.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt456.lazy.log
@@ -31,15 +31,6 @@ LazyJavaPackageFragment@7['lang'] {
 
 ResolutionTaskHolder@27 {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
@@ -50,9 +41,21 @@ ResolutionTaskHolder@27 {
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+}
+
+null {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@32 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
diff --git a/compiler/testData/diagnostics/tests/regressions/kt459.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt459.lazy.log
index 0c58232e616..053872f4daf 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt459.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt459.lazy.log
@@ -91,28 +91,28 @@ LazyJavaClassifierType@60['K'] {
 
 LazyJavaClassifierType@63['K'] {
     arguments = ArrayList@64[empty]
-    classifier = JavaTypeParameterImpl@47['K']
+    classifier = JavaTypeParameterImpl@59['K']
     nullable = 'true': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
 }
 
 LazyJavaClassifierType@66['K'] {
     arguments = ArrayList@67[empty]
-    classifier = JavaTypeParameterImpl@62['K']
+    classifier = JavaTypeParameterImpl@52['K']
     nullable = 'true': Boolean@65
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
 }
 
 LazyJavaClassifierType@68['K'] {
     arguments = ArrayList@69[empty]
-    classifier = JavaTypeParameterImpl@59['K']
+    classifier = JavaTypeParameterImpl@47['K']
     nullable = 'true': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
 }
 
 LazyJavaClassifierType@70['K'] {
     arguments = ArrayList@71[empty]
-    classifier = JavaTypeParameterImpl@52['K']
+    classifier = JavaTypeParameterImpl@62['K']
     nullable = 'true': Boolean@65
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
 }
@@ -189,14 +189,14 @@ LazyJavaClassifierType@112['V'] {
     arguments = ArrayList@113[empty]
     classifier = JavaTypeParameterImpl@114['V']
     nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@115
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
-LazyJavaClassifierType@116['V'] {
-    arguments = ArrayList@117[empty]
-    classifier = JavaTypeParameterImpl@118['V']
+LazyJavaClassifierType@115['V'] {
+    arguments = ArrayList@116[empty]
+    classifier = JavaTypeParameterImpl@117['V']
     nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@118
 }
 
 LazyJavaClassifierType@119['V'] {
@@ -208,35 +208,35 @@ LazyJavaClassifierType@119['V'] {
 
 LazyJavaClassifierType@122['V'] {
     arguments = ArrayList@123[empty]
-    classifier = JavaTypeParameterImpl@121['V']
+    classifier = JavaTypeParameterImpl@111['V']
     nullable = 'true': Boolean@65
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 LazyJavaClassifierType@124['V'] {
     arguments = ArrayList@125[empty]
-    classifier = JavaTypeParameterImpl@114['V']
-    nullable = 'true': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@115
-}
-
-LazyJavaClassifierType@126['V'] {
-    arguments = ArrayList@127[empty]
-    classifier = JavaTypeParameterImpl@118['V']
+    classifier = JavaTypeParameterImpl@107['V']
     nullable = 'true': Boolean@65
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
+LazyJavaClassifierType@126['V'] {
+    arguments = ArrayList@127[empty]
+    classifier = JavaTypeParameterImpl@117['V']
+    nullable = 'true': Boolean@65
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@118
+}
+
 LazyJavaClassifierType@128['V'] {
     arguments = ArrayList@129[empty]
-    classifier = JavaTypeParameterImpl@107['V']
+    classifier = JavaTypeParameterImpl@114['V']
     nullable = 'true': Boolean@65
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 LazyJavaClassifierType@130['V'] {
     arguments = ArrayList@131[empty]
-    classifier = JavaTypeParameterImpl@111['V']
+    classifier = JavaTypeParameterImpl@121['V']
     nullable = 'true': Boolean@65
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
@@ -318,45 +318,36 @@ LazyJavaTypeParameterDescriptor@28['V'] {
 }
 
 LazyJavaTypeParameterDescriptor@23['V'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@115
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@118
 }
 
 LazyJavaTypeParameterResolver@183 {
-    resolve(JavaTypeParameterImpl@184['K']) = LazyJavaTypeParameterDescriptor@27['K']
-    resolve(JavaTypeParameterImpl@185['V']) = LazyJavaTypeParameterDescriptor@28['V']
+    resolve(JavaTypeParameterImpl@184['K']) = LazyJavaTypeParameterDescriptor@22['K']
+    resolve(JavaTypeParameterImpl@185['V']) = LazyJavaTypeParameterDescriptor@23['V']
 }
 
 LazyJavaTypeParameterResolver@186 {
-    resolve(JavaTypeParameterImpl@187['K']) = LazyJavaTypeParameterDescriptor@22['K']
-    resolve(JavaTypeParameterImpl@188['V']) = LazyJavaTypeParameterDescriptor@23['V']
+    resolve(JavaTypeParameterImpl@187['K']) = LazyJavaTypeParameterDescriptor@27['K']
+    resolve(JavaTypeParameterImpl@188['V']) = LazyJavaTypeParameterDescriptor@28['V']
 }
 
 ResolutionTaskHolder@189 {
     <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@191 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
 }
 
-ResolutionTaskHolder@193 {
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@195 }
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@195 }
+ResolutionTaskHolder@192 {
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
 }
 
-ResolutionTaskHolder@197 {
-    <name not found> = ArrayList@198[4] { ResolutionCandidate@199, ResolutionCandidate@200, ResolutionCandidate@201, ... }
-    <name not found> = ArrayList@202[4] { ResolutionCandidate@199, ResolutionCandidate@200, ResolutionCandidate@201, ... }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
+ResolutionTaskHolder@195 {
+    <name not found> = ArrayList@196[4] { ResolutionCandidate@197, ResolutionCandidate@198, ResolutionCandidate@199, ... }
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
 }
 
-ResolutionTaskHolder@203 {
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
+ResolutionTaskHolder@200 {
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
@@ -367,9 +358,21 @@ ResolutionTaskHolder@203 {
     <name not found> = EmptyList@2[empty]
 }
 
-ResolutionTaskHolder@204 {
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
+ResolutionTaskHolder@201 {
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+}
+
+null {
+    <name not found> = ArrayList@202[1] { ResolutionCandidate@194 }
+    <name not found> = ArrayList@203[1] { ResolutionCandidate@191 }
+    <name not found> = ArrayList@204[4] { ResolutionCandidate@197, ResolutionCandidate@198, ResolutionCandidate@199, ... }
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
diff --git a/compiler/testData/diagnostics/tests/regressions/kt469.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt469.lazy.log
index 1bd312f9620..aaa4fd27c59 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt469.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt469.lazy.log
@@ -98,14 +98,14 @@ LazyJavaClassifierType@53['AutoCloseable'] {
     typeConstructor = LazyJavaClassTypeConstructor@9['AutoCloseable']
 }
 
-LazyJavaClassifierType@59['Closeable'] {
+LazyJavaClassifierType@64['Closeable'] {
     arguments = ArrayList@70[empty]
     classifier = JavaClassImpl@71['Closeable']
     memberScope = LazyJavaClassMemberScope@11
     typeConstructor = LazyJavaClassTypeConstructor@13['Closeable']
 }
 
-LazyJavaClassifierType@64['Closeable'] {
+LazyJavaClassifierType@59['Closeable'] {
     arguments = ArrayList@72[empty]
     classifier = JavaClassImpl@73['Closeable']
     memberScope = LazyJavaClassMemberScope@11
@@ -231,7 +231,7 @@ LazyJavaPackageFragmentProvider@107 {
     packageFragments('kt469.T': FqName@146) = null
     topLevelClasses(JavaClassImpl@67['Appendable']) = LazyJavaClassDescriptor@0['Appendable']
     topLevelClasses(JavaClassImpl@69['AutoCloseable']) = LazyJavaClassDescriptor@6['AutoCloseable']
-    topLevelClasses(JavaClassImpl@73['Closeable']) = LazyJavaClassDescriptor@10['Closeable']
+    topLevelClasses(JavaClassImpl@71['Closeable']) = LazyJavaClassDescriptor@10['Closeable']
     topLevelClasses(JavaClassImpl@75['FilterOutputStream']) = LazyJavaClassDescriptor@14['FilterOutputStream']
     topLevelClasses(JavaClassImpl@95['OutputStream']) = LazyJavaClassDescriptor@18['OutputStream']
     topLevelClasses(JavaClassImpl@98['PrintStream']) = LazyJavaClassDescriptor@22['PrintStream']
@@ -289,17 +289,10 @@ LazyJavaPackageFragment@127['util'] {
 
 ResolutionTaskHolder@169 {
     <name not found> = ArrayList@170[10] { ResolutionCandidate@171, ResolutionCandidate@172, ResolutionCandidate@173, ... }
-    <name not found> = ArrayList@174[10] { ResolutionCandidate@171, ResolutionCandidate@172, ResolutionCandidate@173, ... }
 }
 
-ResolutionTaskHolder@175 {
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@177 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
+ResolutionTaskHolder@174 {
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
@@ -325,154 +318,111 @@ ResolutionTaskHolder@175 {
     <name not found> = EmptyList@2[empty]
 }
 
-ResolutionTaskHolder@179 {
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@181 }
+ResolutionTaskHolder@177 {
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
+}
+
+ResolutionTaskHolder@180 {
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
 }
 
 ResolutionTaskHolder@183 {
     <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@185 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
 }
 
-ResolutionTaskHolder@187 {
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@189 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
+ResolutionTaskHolder@186 {
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
 }
 
-ResolutionTaskHolder@191 {
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@193 }
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@193 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
+ResolutionTaskHolder@189 {
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
     <name not found> = EmptyList@2[empty]
+}
+
+ResolutionTaskHolder@192 {
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
     <name not found> = EmptyList@2[empty]
 }
 
 ResolutionTaskHolder@195 {
     <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@197 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
 }
 
-ResolutionTaskHolder@199 {
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@201 }
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@201 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
+ResolutionTaskHolder@198 {
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
 }
 
-ResolutionTaskHolder@203 {
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@205 }
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@205 }
+ResolutionTaskHolder@201 {
+    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
+}
+
+ResolutionTaskHolder@204 {
+    <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
 }
 
 ResolutionTaskHolder@207 {
     <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@209 }
 }
 
-ResolutionTaskHolder@211 {
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@213 }
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@213 }
+ResolutionTaskHolder@210 {
+    <name not found> = ArrayList@211[1] { ResolutionCandidate@212 }
 }
 
-ResolutionTaskHolder@215 {
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@217 }
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@217 }
+ResolutionTaskHolder@213 {
+    <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
+}
+
+ResolutionTaskHolder@216 {
+    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
 }
 
 ResolutionTaskHolder@219 {
     <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@221 }
 }
 
-ResolutionTaskHolder@223 {
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@225 }
+ResolutionTaskHolder@222 {
+    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
 }
 
-ResolutionTaskHolder@227 {
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@229 }
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@229 }
+ResolutionTaskHolder@225 {
+    <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
+}
+
+ResolutionTaskHolder@228 {
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
 }
 
 ResolutionTaskHolder@231 {
     <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@233 }
 }
 
-ResolutionTaskHolder@235 {
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@237 }
+ResolutionTaskHolder@234 {
+    <name not found> = ArrayList@235[1] { ResolutionCandidate@236 }
 }
 
-ResolutionTaskHolder@239 {
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@241 }
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@241 }
+ResolutionTaskHolder@237 {
+    <name not found> = ArrayList@238[2] { ResolutionCandidate@239, ResolutionCandidate@240 }
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
 }
 
-ResolutionTaskHolder@243 {
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@245 }
+ResolutionTaskHolder@241 {
+    <name not found> = ArrayList@242[7] { ResolutionCandidate@243, ResolutionCandidate@244, ResolutionCandidate@245, ... }
 }
 
-ResolutionTaskHolder@247 {
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@249 }
+ResolutionTaskHolder@246 {
+    <name not found> = ArrayList@247[8] { ResolutionCandidate@248, ResolutionCandidate@249, ResolutionCandidate@250, ... }
 }
 
 ResolutionTaskHolder@251 {
-    <name not found> = ArrayList@252[1] { ResolutionCandidate@253 }
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@253 }
-}
-
-ResolutionTaskHolder@255 {
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
-    <name not found> = ArrayList@258[1] { ResolutionCandidate@257 }
-}
-
-ResolutionTaskHolder@259 {
-    <name not found> = ArrayList@260[2] { ResolutionCandidate@261, ResolutionCandidate@262 }
-    <name not found> = ArrayList@263[2] { ResolutionCandidate@261, ResolutionCandidate@262 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
-
-ResolutionTaskHolder@264 {
-    <name not found> = ArrayList@265[7] { ResolutionCandidate@266, ResolutionCandidate@267, ResolutionCandidate@268, ... }
-    <name not found> = ArrayList@269[7] { ResolutionCandidate@266, ResolutionCandidate@267, ResolutionCandidate@268, ... }
-}
-
-ResolutionTaskHolder@270 {
-    <name not found> = ArrayList@271[8] { ResolutionCandidate@272, ResolutionCandidate@273, ResolutionCandidate@274, ... }
-    <name not found> = ArrayList@275[8] { ResolutionCandidate@272, ResolutionCandidate@273, ResolutionCandidate@274, ... }
-}
-
-ResolutionTaskHolder@276 {
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
@@ -507,13 +457,7 @@ ResolutionTaskHolder@276 {
     <name not found> = EmptyList@2[empty]
 }
 
-ResolutionTaskHolder@277 {
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
+ResolutionTaskHolder@252 {
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
@@ -540,7 +484,66 @@ ResolutionTaskHolder@277 {
     <name not found> = EmptyList@2[empty]
 }
 
-ResolutionTaskHolder@278 {
+ResolutionTaskHolder@253 {
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+}
+
+null {
+    <name not found> = ArrayList@254[10] { ResolutionCandidate@171, ResolutionCandidate@172, ResolutionCandidate@173, ... }
+    <name not found> = ArrayList@255[1] { ResolutionCandidate@230 }
+    <name not found> = ArrayList@256[1] { ResolutionCandidate@215 }
+    <name not found> = ArrayList@257[1] { ResolutionCandidate@218 }
+    <name not found> = ArrayList@258[1] { ResolutionCandidate@212 }
+    <name not found> = ArrayList@259[1] { ResolutionCandidate@197 }
+    <name not found> = ArrayList@260[1] { ResolutionCandidate@179 }
+    <name not found> = ArrayList@261[1] { ResolutionCandidate@206 }
+    <name not found> = ArrayList@262[1] { ResolutionCandidate@176 }
+    <name not found> = ArrayList@263[1] { ResolutionCandidate@194 }
+    <name not found> = ArrayList@264[1] { ResolutionCandidate@200 }
+    <name not found> = ArrayList@265[1] { ResolutionCandidate@224 }
+    <name not found> = ArrayList@266[1] { ResolutionCandidate@185 }
+    <name not found> = ArrayList@267[1] { ResolutionCandidate@203 }
+    <name not found> = ArrayList@268[1] { ResolutionCandidate@182 }
+    <name not found> = ArrayList@269[1] { ResolutionCandidate@221 }
+    <name not found> = ArrayList@270[1] { ResolutionCandidate@188 }
+    <name not found> = ArrayList@271[1] { ResolutionCandidate@191 }
+    <name not found> = ArrayList@272[1] { ResolutionCandidate@209 }
+    <name not found> = ArrayList@273[1] { ResolutionCandidate@233 }
+    <name not found> = ArrayList@274[1] { ResolutionCandidate@236 }
+    <name not found> = ArrayList@275[1] { ResolutionCandidate@227 }
+    <name not found> = ArrayList@276[2] { ResolutionCandidate@239, ResolutionCandidate@240 }
+    <name not found> = ArrayList@277[7] { ResolutionCandidate@243, ResolutionCandidate@244, ResolutionCandidate@245, ... }
+    <name not found> = ArrayList@278[8] { ResolutionCandidate@248, ResolutionCandidate@249, ResolutionCandidate@250, ... }
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
diff --git a/compiler/testData/diagnostics/tests/regressions/kt4827.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt4827.lazy.log
index d2d45982abe..803d9d105a8 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt4827.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt4827.lazy.log
@@ -51,10 +51,6 @@ ResolutionTaskHolder@27 {
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
 }
 
 ResolutionTaskHolder@28 {
@@ -74,10 +70,6 @@ ResolutionTaskHolder@28 {
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
 }
 
 ResolutionTaskHolder@29 {
@@ -89,8 +81,6 @@ ResolutionTaskHolder@29 {
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
 }
 
 ResolutionTaskHolder@30 {
@@ -102,8 +92,6 @@ ResolutionTaskHolder@30 {
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
 }
 
 ResolutionTaskHolder@31 {
@@ -115,6 +103,21 @@ ResolutionTaskHolder@31 {
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
+}
+
+null {
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt498.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt498.lazy.log
index ac5fed202b7..0c152da9497 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt498.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt498.lazy.log
@@ -178,14 +178,14 @@ LazyJavaClassifierType@124['String'] {
 
 LazyJavaClassifierType@127['String'] {
     arguments = ArrayList@128[empty]
-    classifier = JavaClassImpl@119['String']
+    classifier = JavaClassImpl@123['String']
     nullable = 'true': Boolean@103
     typeConstructor = DeserializedClassTypeConstructor@120
 }
 
 LazyJavaClassifierType@129['String'] {
     arguments = ArrayList@130[empty]
-    classifier = JavaClassImpl@123['String']
+    classifier = JavaClassImpl@119['String']
     nullable = 'true': Boolean@103
     typeConstructor = DeserializedClassTypeConstructor@120
 }
@@ -228,7 +228,7 @@ LazyJavaClassifierType@143['Throwable'] {
 
 LazyJavaClassifierType@146['Throwable'] {
     arguments = ArrayList@147[empty]
-    classifier = JavaClassImpl@139['Throwable']
+    classifier = JavaClassImpl@145['Throwable']
     nullable = 'true': Boolean@103
     typeConstructor = DeserializedClassTypeConstructor@136
 }
@@ -242,7 +242,7 @@ LazyJavaClassifierType@148['Throwable'] {
 
 LazyJavaClassifierType@150['Throwable'] {
     arguments = ArrayList@151[empty]
-    classifier = JavaClassImpl@145['Throwable']
+    classifier = JavaClassImpl@139['Throwable']
     nullable = 'true': Boolean@103
     typeConstructor = DeserializedClassTypeConstructor@136
 }
@@ -319,10 +319,13 @@ LazyJavaTypeParameterResolver@201 {
 
 ResolutionTaskHolder@203 {
     <name not found> = ArrayList@204[1] { ResolutionCandidate@205 }
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@205 }
 }
 
-ResolutionTaskHolder@207 {
-    <name not found> = ArrayList@208[5] { ResolutionCandidate@209, ResolutionCandidate@210, ResolutionCandidate@211, ... }
-    <name not found> = ArrayList@212[5] { ResolutionCandidate@209, ResolutionCandidate@210, ResolutionCandidate@211, ... }
+ResolutionTaskHolder@206 {
+    <name not found> = ArrayList@207[5] { ResolutionCandidate@208, ResolutionCandidate@209, ResolutionCandidate@210, ... }
+}
+
+null {
+    <name not found> = ArrayList@211[1] { ResolutionCandidate@205 }
+    <name not found> = ArrayList@212[5] { ResolutionCandidate@208, ResolutionCandidate@209, ResolutionCandidate@210, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt524.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt524.lazy.log
index 959928bba76..85d4936a3b0 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt524.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt524.lazy.log
@@ -202,63 +202,63 @@ LazyJavaClassifierType@125['AbstractStringBuilder'] {
 
 LazyJavaClassifierType@128['AbstractStringBuilder'] {
     arguments = ArrayList@129[empty]
-    classifier = JavaClassImpl@124['AbstractStringBuilder']
+    classifier = JavaClassImpl@118['AbstractStringBuilder']
     nullable = 'true': Boolean@130
     typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@131['AbstractStringBuilder'] {
     arguments = ArrayList@132[empty]
-    classifier = JavaClassImpl@97['AbstractStringBuilder']
+    classifier = JavaClassImpl@127['AbstractStringBuilder']
     nullable = 'true': Boolean@130
     typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@133['AbstractStringBuilder'] {
     arguments = ArrayList@134[empty]
-    classifier = JavaClassImpl@94['AbstractStringBuilder']
+    classifier = JavaClassImpl@90['AbstractStringBuilder']
     nullable = 'true': Boolean@130
     typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@135['AbstractStringBuilder'] {
     arguments = ArrayList@136[empty]
-    classifier = JavaClassImpl@90['AbstractStringBuilder']
+    classifier = JavaClassImpl@121['AbstractStringBuilder']
     nullable = 'true': Boolean@130
     typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@137['AbstractStringBuilder'] {
     arguments = ArrayList@138[empty]
-    classifier = JavaClassImpl@106['AbstractStringBuilder']
+    classifier = JavaClassImpl@94['AbstractStringBuilder']
     nullable = 'true': Boolean@130
     typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@139['AbstractStringBuilder'] {
     arguments = ArrayList@140[empty]
-    classifier = JavaClassImpl@112['AbstractStringBuilder']
+    classifier = JavaClassImpl@97['AbstractStringBuilder']
     nullable = 'true': Boolean@130
     typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@141['AbstractStringBuilder'] {
     arguments = ArrayList@142[empty]
-    classifier = JavaClassImpl@118['AbstractStringBuilder']
+    classifier = JavaClassImpl@109['AbstractStringBuilder']
     nullable = 'true': Boolean@130
     typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@143['AbstractStringBuilder'] {
     arguments = ArrayList@144[empty]
-    classifier = JavaClassImpl@109['AbstractStringBuilder']
+    classifier = JavaClassImpl@100['AbstractStringBuilder']
     nullable = 'true': Boolean@130
     typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@145['AbstractStringBuilder'] {
     arguments = ArrayList@146[empty]
-    classifier = JavaClassImpl@100['AbstractStringBuilder']
+    classifier = JavaClassImpl@112['AbstractStringBuilder']
     nullable = 'true': Boolean@130
     typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
 }
@@ -272,7 +272,7 @@ LazyJavaClassifierType@147['AbstractStringBuilder'] {
 
 LazyJavaClassifierType@149['AbstractStringBuilder'] {
     arguments = ArrayList@150[empty]
-    classifier = JavaClassImpl@127['AbstractStringBuilder']
+    classifier = JavaClassImpl@124['AbstractStringBuilder']
     nullable = 'true': Boolean@130
     typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
 }
@@ -286,7 +286,7 @@ LazyJavaClassifierType@151['AbstractStringBuilder'] {
 
 LazyJavaClassifierType@153['AbstractStringBuilder'] {
     arguments = ArrayList@154[empty]
-    classifier = JavaClassImpl@121['AbstractStringBuilder']
+    classifier = JavaClassImpl@106['AbstractStringBuilder']
     nullable = 'true': Boolean@130
     typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
 }
@@ -334,14 +334,14 @@ LazyJavaClassifierType@168['Appendable'] {
 
 LazyJavaClassifierType@170['Appendable'] {
     arguments = ArrayList@171[empty]
-    classifier = JavaClassImpl@167['Appendable']
+    classifier = JavaClassImpl@161['Appendable']
     nullable = 'true': Boolean@130
     typeConstructor = LazyJavaClassTypeConstructor@23['Appendable']
 }
 
 LazyJavaClassifierType@172['Appendable'] {
     arguments = ArrayList@173[empty]
-    classifier = JavaClassImpl@161['Appendable']
+    classifier = JavaClassImpl@167['Appendable']
     nullable = 'true': Boolean@130
     typeConstructor = LazyJavaClassTypeConstructor@23['Appendable']
 }
@@ -411,49 +411,49 @@ LazyJavaClassifierType@198['CharSequence'] {
 
 LazyJavaClassifierType@201['CharSequence'] {
     arguments = ArrayList@202[empty]
-    classifier = JavaClassImpl@185['CharSequence']
+    classifier = JavaClassImpl@182['CharSequence']
     nullable = 'true': Boolean@130
     typeConstructor = DeserializedClassTypeConstructor@177
 }
 
 LazyJavaClassifierType@203['CharSequence'] {
     arguments = ArrayList@204[empty]
-    classifier = JavaClassImpl@182['CharSequence']
+    classifier = JavaClassImpl@191['CharSequence']
     nullable = 'true': Boolean@130
     typeConstructor = DeserializedClassTypeConstructor@177
 }
 
 LazyJavaClassifierType@205['CharSequence'] {
     arguments = ArrayList@206[empty]
-    classifier = JavaClassImpl@200['CharSequence']
+    classifier = JavaClassImpl@194['CharSequence']
     nullable = 'true': Boolean@130
     typeConstructor = DeserializedClassTypeConstructor@177
 }
 
 LazyJavaClassifierType@207['CharSequence'] {
     arguments = ArrayList@208[empty]
-    classifier = JavaClassImpl@194['CharSequence']
+    classifier = JavaClassImpl@197['CharSequence']
     nullable = 'true': Boolean@130
     typeConstructor = DeserializedClassTypeConstructor@177
 }
 
 LazyJavaClassifierType@209['CharSequence'] {
     arguments = ArrayList@210[empty]
-    classifier = JavaClassImpl@197['CharSequence']
+    classifier = JavaClassImpl@188['CharSequence']
     nullable = 'true': Boolean@130
     typeConstructor = DeserializedClassTypeConstructor@177
 }
 
 LazyJavaClassifierType@211['CharSequence'] {
     arguments = ArrayList@212[empty]
-    classifier = JavaClassImpl@188['CharSequence']
+    classifier = JavaClassImpl@200['CharSequence']
     nullable = 'true': Boolean@130
     typeConstructor = DeserializedClassTypeConstructor@177
 }
 
 LazyJavaClassifierType@213['CharSequence'] {
     arguments = ArrayList@214[empty]
-    classifier = JavaClassImpl@191['CharSequence']
+    classifier = JavaClassImpl@185['CharSequence']
     nullable = 'true': Boolean@130
     typeConstructor = DeserializedClassTypeConstructor@177
 }
@@ -485,14 +485,14 @@ LazyJavaClassifierType@222['Object'] {
 
 LazyJavaClassifierType@225['Object'] {
     arguments = ArrayList@226[empty]
-    classifier = JavaClassImpl@220['Object']
+    classifier = JavaClassImpl@224['Object']
     nullable = 'true': Boolean@130
     typeConstructor = DeserializedClassTypeConstructor@221
 }
 
 LazyJavaClassifierType@227['Object'] {
     arguments = ArrayList@228[empty]
-    classifier = JavaClassImpl@224['Object']
+    classifier = JavaClassImpl@220['Object']
     nullable = 'true': Boolean@130
     typeConstructor = DeserializedClassTypeConstructor@221
 }
@@ -567,21 +567,21 @@ LazyJavaClassifierType@253['String'] {
 
 LazyJavaClassifierType@255['String'] {
     arguments = ArrayList@256[empty]
-    classifier = JavaClassImpl@242['String']
+    classifier = JavaClassImpl@246['String']
     nullable = 'true': Boolean@130
     typeConstructor = DeserializedClassTypeConstructor@243
 }
 
 LazyJavaClassifierType@257['String'] {
     arguments = ArrayList@258[empty]
-    classifier = JavaClassImpl@246['String']
+    classifier = JavaClassImpl@249['String']
     nullable = 'true': Boolean@130
     typeConstructor = DeserializedClassTypeConstructor@243
 }
 
 LazyJavaClassifierType@259['String'] {
     arguments = ArrayList@260[empty]
-    classifier = JavaClassImpl@249['String']
+    classifier = JavaClassImpl@242['String']
     nullable = 'true': Boolean@130
     typeConstructor = DeserializedClassTypeConstructor@243
 }
@@ -602,14 +602,14 @@ LazyJavaClassifierType@264['StringBuffer'] {
 
 LazyJavaClassifierType@267['StringBuffer'] {
     arguments = ArrayList@268[empty]
-    classifier = JavaClassImpl@263['StringBuffer']
+    classifier = JavaClassImpl@266['StringBuffer']
     nullable = 'true': Boolean@130
     typeConstructor = LazyJavaClassTypeConstructor@40['StringBuffer']
 }
 
 LazyJavaClassifierType@269['StringBuffer'] {
     arguments = ArrayList@270[empty]
-    classifier = JavaClassImpl@266['StringBuffer']
+    classifier = JavaClassImpl@263['StringBuffer']
     nullable = 'true': Boolean@130
     typeConstructor = LazyJavaClassTypeConstructor@40['StringBuffer']
 }
@@ -722,105 +722,105 @@ LazyJavaClassifierType@313['StringBuilder'] {
 
 LazyJavaClassifierType@316['StringBuilder'] {
     arguments = ArrayList@317[empty]
-    classifier = JavaClassImpl@273['StringBuilder']
+    classifier = JavaClassImpl@312['StringBuilder']
     nullable = 'true': Boolean@130
     typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
 }
 
 LazyJavaClassifierType@318['StringBuilder'] {
     arguments = ArrayList@319[empty]
-    classifier = JavaClassImpl@309['StringBuilder']
+    classifier = JavaClassImpl@276['StringBuilder']
     nullable = 'true': Boolean@130
     typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
 }
 
 LazyJavaClassifierType@320['StringBuilder'] {
     arguments = ArrayList@321[empty]
-    classifier = JavaClassImpl@288['StringBuilder']
+    classifier = JavaClassImpl@273['StringBuilder']
     nullable = 'true': Boolean@130
     typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
 }
 
 LazyJavaClassifierType@322['StringBuilder'] {
     arguments = ArrayList@323[empty]
-    classifier = JavaClassImpl@294['StringBuilder']
+    classifier = JavaClassImpl@297['StringBuilder']
     nullable = 'true': Boolean@130
     typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
 }
 
 LazyJavaClassifierType@324['StringBuilder'] {
     arguments = ArrayList@325[empty]
-    classifier = JavaClassImpl@297['StringBuilder']
+    classifier = JavaClassImpl@279['StringBuilder']
     nullable = 'true': Boolean@130
     typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
 }
 
 LazyJavaClassifierType@326['StringBuilder'] {
     arguments = ArrayList@327[empty]
-    classifier = JavaClassImpl@300['StringBuilder']
+    classifier = JavaClassImpl@303['StringBuilder']
     nullable = 'true': Boolean@130
     typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
 }
 
 LazyJavaClassifierType@328['StringBuilder'] {
     arguments = ArrayList@329[empty]
-    classifier = JavaClassImpl@303['StringBuilder']
+    classifier = JavaClassImpl@306['StringBuilder']
     nullable = 'true': Boolean@130
     typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
 }
 
 LazyJavaClassifierType@330['StringBuilder'] {
     arguments = ArrayList@331[empty]
-    classifier = JavaClassImpl@279['StringBuilder']
+    classifier = JavaClassImpl@294['StringBuilder']
     nullable = 'true': Boolean@130
     typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
 }
 
 LazyJavaClassifierType@332['StringBuilder'] {
     arguments = ArrayList@333[empty]
-    classifier = JavaClassImpl@276['StringBuilder']
+    classifier = JavaClassImpl@285['StringBuilder']
     nullable = 'true': Boolean@130
     typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
 }
 
 LazyJavaClassifierType@334['StringBuilder'] {
     arguments = ArrayList@335[empty]
-    classifier = JavaClassImpl@315['StringBuilder']
+    classifier = JavaClassImpl@291['StringBuilder']
     nullable = 'true': Boolean@130
     typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
 }
 
 LazyJavaClassifierType@336['StringBuilder'] {
     arguments = ArrayList@337[empty]
-    classifier = JavaClassImpl@285['StringBuilder']
+    classifier = JavaClassImpl@282['StringBuilder']
     nullable = 'true': Boolean@130
     typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
 }
 
 LazyJavaClassifierType@338['StringBuilder'] {
     arguments = ArrayList@339[empty]
-    classifier = JavaClassImpl@306['StringBuilder']
+    classifier = JavaClassImpl@288['StringBuilder']
     nullable = 'true': Boolean@130
     typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
 }
 
 LazyJavaClassifierType@340['StringBuilder'] {
     arguments = ArrayList@341[empty]
-    classifier = JavaClassImpl@282['StringBuilder']
+    classifier = JavaClassImpl@300['StringBuilder']
     nullable = 'true': Boolean@130
     typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
 }
 
 LazyJavaClassifierType@342['StringBuilder'] {
     arguments = ArrayList@343[empty]
-    classifier = JavaClassImpl@312['StringBuilder']
+    classifier = JavaClassImpl@315['StringBuilder']
     nullable = 'true': Boolean@130
     typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
 }
 
 LazyJavaClassifierType@344['StringBuilder'] {
     arguments = ArrayList@345[empty]
-    classifier = JavaClassImpl@291['StringBuilder']
+    classifier = JavaClassImpl@309['StringBuilder']
     nullable = 'true': Boolean@130
     typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
 }
@@ -868,7 +868,7 @@ LazyJavaPackageFragmentProvider@349 {
     topLevelClasses(JavaClassImpl@384['NullPointerException']) = LazyJavaClassDescriptor@26['NullPointerException']
     topLevelClasses(JavaClassImpl@236['RuntimeException']) = LazyJavaClassDescriptor@33['RuntimeException']
     topLevelClasses(JavaClassImpl@238['Serializable']) = LazyJavaClassDescriptor@35['Serializable']
-    topLevelClasses(JavaClassImpl@266['StringBuffer']) = LazyJavaClassDescriptor@39['StringBuffer']
+    topLevelClasses(JavaClassImpl@263['StringBuffer']) = LazyJavaClassDescriptor@39['StringBuffer']
     topLevelClasses(JavaClassImpl@385['StringBuilder']) = LazyJavaClassDescriptor@41['StringBuilder']
 }
 
@@ -894,57 +894,48 @@ LazyJavaPackageFragment@370['lang'] {
 
 ResolutionTaskHolder@397 {
     <name not found> = ArrayList@398[13] { ResolutionCandidate@399, ResolutionCandidate@400, ResolutionCandidate@401, ... }
-    <name not found> = ArrayList@402[14] { ResolutionCandidate@399, ResolutionCandidate@400, ResolutionCandidate@403, ... }
 }
 
-ResolutionTaskHolder@404 {
+ResolutionTaskHolder@402 {
+    <name not found> = ArrayList@403[1] { ResolutionCandidate@404 }
     <name not found> = ArrayList@405[1] { ResolutionCandidate@406 }
-    <name not found> = ArrayList@407[1] { ResolutionCandidate@406 }
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+}
+
+ResolutionTaskHolder@407 {
     <name not found> = ArrayList@408[1] { ResolutionCandidate@409 }
-    <name not found> = ArrayList@410[1] { ResolutionCandidate@409 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@411 {
-    <name not found> = ArrayList@412[1] { ResolutionCandidate@413 }
-    <name not found> = ArrayList@414[1] { ResolutionCandidate@413 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@415 {
-    <name not found> = ArrayList@416[1] { ResolutionCandidate@417 }
-    <name not found> = ArrayList@418[1] { ResolutionCandidate@417 }
+ResolutionTaskHolder@410 {
+    <name not found> = ArrayList@411[1] { ResolutionCandidate@412 }
+}
+
+ResolutionTaskHolder@413 {
+    <name not found> = ArrayList@414[1] { ResolutionCandidate@415 }
+}
+
+ResolutionTaskHolder@416 {
+    <name not found> = ArrayList@417[1] { ResolutionCandidate@418 }
 }
 
 ResolutionTaskHolder@419 {
-    <name not found> = ArrayList@420[1] { ResolutionCandidate@421 }
-    <name not found> = ArrayList@422[1] { ResolutionCandidate@421 }
+    <name not found> = ArrayList@420[2] { ResolutionCandidate@421, ResolutionCandidate@422 }
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
 }
 
 ResolutionTaskHolder@423 {
-    <name not found> = ArrayList@424[1] { ResolutionCandidate@425 }
-    <name not found> = ArrayList@426[1] { ResolutionCandidate@425 }
-}
-
-ResolutionTaskHolder@427 {
-    <name not found> = ArrayList@428[2] { ResolutionCandidate@429, ResolutionCandidate@430 }
-    <name not found> = ArrayList@431[2] { ResolutionCandidate@429, ResolutionCandidate@430 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
+    <name not found> = ArrayList@424[4] { ResolutionCandidate@425, ResolutionCandidate@426, ResolutionCandidate@427, ... }
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
@@ -955,9 +946,21 @@ ResolutionTaskHolder@427 {
     <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@432 {
-    <name not found> = ArrayList@433[4] { ResolutionCandidate@434, ResolutionCandidate@435, ResolutionCandidate@436, ... }
-    <name not found> = ArrayList@437[4] { ResolutionCandidate@434, ResolutionCandidate@435, ResolutionCandidate@436, ... }
+null {
+    <name not found> = ArrayList@428[14] { ResolutionCandidate@399, ResolutionCandidate@400, ResolutionCandidate@429, ... }
+    <name not found> = ArrayList@430[1] { ResolutionCandidate@418 }
+    <name not found> = ArrayList@431[1] { ResolutionCandidate@412 }
+    <name not found> = ArrayList@432[1] { ResolutionCandidate@409 }
+    <name not found> = ArrayList@433[1] { ResolutionCandidate@404 }
+    <name not found> = ArrayList@434[1] { ResolutionCandidate@406 }
+    <name not found> = ArrayList@435[1] { ResolutionCandidate@415 }
+    <name not found> = ArrayList@436[2] { ResolutionCandidate@421, ResolutionCandidate@422 }
+    <name not found> = ArrayList@437[4] { ResolutionCandidate@425, ResolutionCandidate@426, ResolutionCandidate@427, ... }
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
diff --git a/compiler/testData/diagnostics/tests/regressions/kt526UnresolvedReferenceInnerStatic.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt526UnresolvedReferenceInnerStatic.lazy.log
index 51ce710030e..e55f63d9f4f 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt526UnresolvedReferenceInnerStatic.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt526UnresolvedReferenceInnerStatic.lazy.log
@@ -30,20 +30,23 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@27 {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+}
+
+null {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@32 }
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
diff --git a/compiler/testData/diagnostics/tests/regressions/kt549.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt549.lazy.log
index 75bea8ca62b..6634ffda3fd 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt549.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt549.lazy.log
@@ -185,14 +185,14 @@ LazyJavaClassifierType@140['Cloneable'] {
     typeConstructor = DeserializedClassTypeConstructor@144
 }
 
-LazyJavaClassifierType@122['Closeable'] {
+LazyJavaClassifierType@117['Closeable'] {
     arguments = ArrayList@145[empty]
     classifier = JavaClassImpl@146['Closeable']
     memberScope = LazyJavaClassMemberScope@46
     typeConstructor = LazyJavaClassTypeConstructor@48['Closeable']
 }
 
-LazyJavaClassifierType@117['Closeable'] {
+LazyJavaClassifierType@122['Closeable'] {
     arguments = ArrayList@147[empty]
     classifier = JavaClassImpl@148['Closeable']
     memberScope = LazyJavaClassMemberScope@46
@@ -233,49 +233,49 @@ LazyJavaClassifierType@170['E'] {
     arguments = ArrayList@171[empty]
     classifier = JavaTypeParameterImpl@172['E']
     nullable = 'false': Boolean@154
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@169
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@173
 }
 
-LazyJavaClassifierType@173['E'] {
-    arguments = ArrayList@174[empty]
-    classifier = JavaTypeParameterImpl@175['E']
+LazyJavaClassifierType@174['E'] {
+    arguments = ArrayList@175[empty]
+    classifier = JavaTypeParameterImpl@176['E']
+    nullable = 'false': Boolean@154
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@177
+}
+
+LazyJavaClassifierType@178['E'] {
+    arguments = ArrayList@179[empty]
+    classifier = JavaTypeParameterImpl@180['E']
+    nullable = 'false': Boolean@154
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@173
+}
+
+LazyJavaClassifierType@181['E'] {
+    arguments = ArrayList@182[empty]
+    classifier = JavaTypeParameterImpl@183['E']
+    nullable = 'false': Boolean@154
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@173
+}
+
+LazyJavaClassifierType@184['E'] {
+    arguments = ArrayList@185[empty]
+    classifier = JavaTypeParameterImpl@186['E']
     nullable = 'false': Boolean@154
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@169
 }
 
-LazyJavaClassifierType@176['E'] {
-    arguments = ArrayList@177[empty]
-    classifier = JavaTypeParameterImpl@178['E']
-    nullable = 'false': Boolean@154
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@169
-}
-
-LazyJavaClassifierType@179['E'] {
-    arguments = ArrayList@180[empty]
-    classifier = JavaTypeParameterImpl@181['E']
-    nullable = 'false': Boolean@154
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@182
-}
-
-LazyJavaClassifierType@183['E'] {
-    arguments = ArrayList@184[empty]
-    classifier = JavaTypeParameterImpl@185['E']
-    nullable = 'false': Boolean@154
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@186
-}
-
 LazyJavaClassifierType@187['E'] {
     arguments = ArrayList@188[empty]
     classifier = JavaTypeParameterImpl@189['E']
     nullable = 'false': Boolean@154
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@186
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@169
 }
 
 LazyJavaClassifierType@190['E'] {
     arguments = ArrayList@191[empty]
     classifier = JavaTypeParameterImpl@192['E']
     nullable = 'false': Boolean@154
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@182
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@169
 }
 
 LazyJavaClassifierType@193['E'] {
@@ -289,7 +289,7 @@ LazyJavaClassifierType@196['E'] {
     arguments = ArrayList@197[empty]
     classifier = JavaTypeParameterImpl@198['E']
     nullable = 'false': Boolean@154
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@182
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@177
 }
 
 LazyJavaClassifierType@199['E'] {
@@ -303,89 +303,89 @@ LazyJavaClassifierType@202['E'] {
     arguments = ArrayList@203[empty]
     classifier = JavaTypeParameterImpl@204['E']
     nullable = 'false': Boolean@154
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@182
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@173
 }
 
 LazyJavaClassifierType@205['E'] {
     arguments = ArrayList@206[empty]
-    classifier = JavaTypeParameterImpl@189['E']
+    classifier = JavaTypeParameterImpl@176['E']
     nullable = 'true': Boolean@160
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@186
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@177
 }
 
 LazyJavaClassifierType@207['E'] {
     arguments = ArrayList@208[empty]
-    classifier = JavaTypeParameterImpl@175['E']
+    classifier = JavaTypeParameterImpl@204['E']
     nullable = 'true': Boolean@160
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@169
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@173
 }
 
 LazyJavaClassifierType@209['E'] {
     arguments = ArrayList@210[empty]
-    classifier = JavaTypeParameterImpl@181['E']
+    classifier = JavaTypeParameterImpl@180['E']
     nullable = 'true': Boolean@160
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@182
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@173
 }
 
 LazyJavaClassifierType@211['E'] {
     arguments = ArrayList@212[empty]
-    classifier = JavaTypeParameterImpl@168['E']
+    classifier = JavaTypeParameterImpl@192['E']
     nullable = 'true': Boolean@160
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@169
 }
 
 LazyJavaClassifierType@213['E'] {
     arguments = ArrayList@214[empty]
-    classifier = JavaTypeParameterImpl@178['E']
+    classifier = JavaTypeParameterImpl@189['E']
     nullable = 'true': Boolean@160
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@169
 }
 
 LazyJavaClassifierType@215['E'] {
     arguments = ArrayList@216[empty]
-    classifier = JavaTypeParameterImpl@185['E']
-    nullable = 'true': Boolean@160
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@186
-}
-
-LazyJavaClassifierType@217['E'] {
-    arguments = ArrayList@218[empty]
-    classifier = JavaTypeParameterImpl@192['E']
-    nullable = 'true': Boolean@160
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@182
-}
-
-LazyJavaClassifierType@219['E'] {
-    arguments = ArrayList@220[empty]
     classifier = JavaTypeParameterImpl@201['E']
     nullable = 'true': Boolean@160
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@169
 }
 
-LazyJavaClassifierType@221['E'] {
-    arguments = ArrayList@222[empty]
+LazyJavaClassifierType@217['E'] {
+    arguments = ArrayList@218[empty]
+    classifier = JavaTypeParameterImpl@186['E']
+    nullable = 'true': Boolean@160
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@169
+}
+
+LazyJavaClassifierType@219['E'] {
+    arguments = ArrayList@220[empty]
     classifier = JavaTypeParameterImpl@198['E']
     nullable = 'true': Boolean@160
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@182
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@177
+}
+
+LazyJavaClassifierType@221['E'] {
+    arguments = ArrayList@222[empty]
+    classifier = JavaTypeParameterImpl@172['E']
+    nullable = 'true': Boolean@160
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@173
 }
 
 LazyJavaClassifierType@223['E'] {
     arguments = ArrayList@224[empty]
-    classifier = JavaTypeParameterImpl@204['E']
+    classifier = JavaTypeParameterImpl@183['E']
     nullable = 'true': Boolean@160
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@182
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@173
 }
 
 LazyJavaClassifierType@225['E'] {
     arguments = ArrayList@226[empty]
-    classifier = JavaTypeParameterImpl@195['E']
+    classifier = JavaTypeParameterImpl@168['E']
     nullable = 'true': Boolean@160
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@169
 }
 
 LazyJavaClassifierType@227['E'] {
     arguments = ArrayList@228[empty]
-    classifier = JavaTypeParameterImpl@172['E']
+    classifier = JavaTypeParameterImpl@195['E']
     nullable = 'true': Boolean@160
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@169
 }
@@ -402,14 +402,14 @@ LazyJavaClassifierType@231['Flushable'] {
     typeConstructor = TypeConstructorImpl$1@232
 }
 
-LazyJavaClassifierType@97['List<E>'] {
+LazyJavaClassifierType@105['List<E>'] {
     arguments = ArrayList@233[1] { TypeProjectionImpl@234 }
     classifier = JavaClassImpl@235['List']
     memberScope = SubstitutingScope@236
     typeConstructor = DeserializedClassTypeConstructor@237
 }
 
-LazyJavaClassifierType@105['List<E>'] {
+LazyJavaClassifierType@97['List<E>'] {
     arguments = ArrayList@238[1] { TypeProjectionImpl@239 }
     classifier = JavaClassImpl@240['List']
     memberScope = SubstitutingScope@241
@@ -555,7 +555,7 @@ LazyJavaPackageFragmentProvider@280 {
     topLevelClasses(JavaClassImpl@137['Appendable']) = LazyJavaClassDescriptor@19['Appendable']
     topLevelClasses(JavaClassImpl@320['ArrayList']) = LazyJavaClassDescriptor@25['ArrayList']
     topLevelClasses(JavaClassImpl@139['AutoCloseable']) = LazyJavaClassDescriptor@41['AutoCloseable']
-    topLevelClasses(JavaClassImpl@146['Closeable']) = LazyJavaClassDescriptor@45['Closeable']
+    topLevelClasses(JavaClassImpl@148['Closeable']) = LazyJavaClassDescriptor@45['Closeable']
     topLevelClasses(JavaClassImpl@230['FilterOutputStream']) = LazyJavaClassDescriptor@49['FilterOutputStream']
     topLevelClasses(JavaClassImpl@263['OutputStream']) = LazyJavaClassDescriptor@53['OutputStream']
     topLevelClasses(JavaClassImpl@266['PrintStream']) = LazyJavaClassDescriptor@57['PrintStream']
@@ -588,189 +588,169 @@ LazyJavaPackageFragment@310['util'] {
     memberIndex = computeMemberIndex$1@335 // through LazyPackageFragmentScopeForJavaPackage@334
 }
 
-LazyJavaTypeParameterDescriptor@102['E'] {
+LazyJavaTypeParameterDescriptor@90['E'] {
     defaultType = JetTypeImpl@336['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@169
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@177
     upperBounds = LinkedHashSet@337[1] { NullableType@338 }
     upperBoundsAsType = NullableType@338
 }
 
-LazyJavaTypeParameterDescriptor@90['E'] {
+LazyJavaTypeParameterDescriptor@94['E'] {
     defaultType = JetTypeImpl@339['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@186
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@173
     upperBounds = LinkedHashSet@340[1] { NullableType@341 }
     upperBoundsAsType = NullableType@341
 }
 
-LazyJavaTypeParameterDescriptor@94['E'] {
+LazyJavaTypeParameterDescriptor@102['E'] {
     defaultType = JetTypeImpl@342['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@182
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@169
     upperBounds = LinkedHashSet@343[1] { NullableType@344 }
     upperBoundsAsType = NullableType@344
 }
 
 LazyJavaTypeParameterResolver@345 {
-    resolve(JavaTypeParameterImpl@346['E']) = LazyJavaTypeParameterDescriptor@90['E']
+    resolve(JavaTypeParameterImpl@346['E']) = LazyJavaTypeParameterDescriptor@94['E']
 }
 
 LazyJavaTypeParameterResolver@347 {
-    resolve(JavaTypeParameterImpl@348['E']) = LazyJavaTypeParameterDescriptor@94['E']
+    resolve(JavaTypeParameterImpl@348['E']) = LazyJavaTypeParameterDescriptor@102['E']
 }
 
 LazyJavaTypeParameterResolver@349 {
-    resolve(JavaTypeParameterImpl@350['E']) = LazyJavaTypeParameterDescriptor@102['E']
+    resolve(JavaTypeParameterImpl@350['E']) = LazyJavaTypeParameterDescriptor@90['E']
 }
 
 LazyJavaTypeParameterResolver@351 {
-    resolve(JavaTypeParameterImpl@195['E']) = null
-}
-
-LazyJavaTypeParameterResolver@352 {
-    resolve(JavaTypeParameterImpl@181['E']) = null
-}
-
-LazyJavaTypeParameterResolver@353 {
-    resolve(JavaTypeParameterImpl@175['E']) = null
-}
-
-LazyJavaTypeParameterResolver@354 {
     resolve(JavaTypeParameterImpl@192['E']) = null
 }
 
+LazyJavaTypeParameterResolver@352 {
+    resolve(JavaTypeParameterImpl@183['E']) = null
+}
+
+LazyJavaTypeParameterResolver@353 {
+    resolve(JavaTypeParameterImpl@180['E']) = null
+}
+
+LazyJavaTypeParameterResolver@354 {
+    resolve(JavaTypeParameterImpl@176['E']) = null
+}
+
 LazyJavaTypeParameterResolver@355 {
-    resolve(JavaTypeParameterImpl@189['E']) = null
+    resolve(JavaTypeParameterImpl@168['E']) = null
 }
 
 ResolutionTaskHolder@356 {
     <name not found> = ArrayList@357[10] { ResolutionCandidate@358, ResolutionCandidate@359, ResolutionCandidate@360, ... }
-    <name not found> = ArrayList@361[10] { ResolutionCandidate@358, ResolutionCandidate@359, ResolutionCandidate@360, ... }
 }
 
-ResolutionTaskHolder@362 {
-    <name not found> = ArrayList@363[1] { ResolutionCandidate@364 }
-    <name not found> = ArrayList@365[1] { ResolutionCandidate@364 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@361 {
+    <name not found> = ArrayList@362[1] { ResolutionCandidate@363 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@366 {
-    <name not found> = ArrayList@367[1] { ResolutionCandidate@368 }
-    <name not found> = ArrayList@369[1] { ResolutionCandidate@368 }
+ResolutionTaskHolder@364 {
+    <name not found> = ArrayList@365[1] { ResolutionCandidate@366 }
     <name not found> = EmptyList@21[empty]
+}
+
+ResolutionTaskHolder@367 {
+    <name not found> = ArrayList@368[1] { ResolutionCandidate@369 }
     <name not found> = EmptyList@21[empty]
 }
 
 ResolutionTaskHolder@370 {
     <name not found> = ArrayList@371[1] { ResolutionCandidate@372 }
-    <name not found> = ArrayList@373[1] { ResolutionCandidate@372 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@374 {
-    <name not found> = ArrayList@375[1] { ResolutionCandidate@376 }
-    <name not found> = ArrayList@377[1] { ResolutionCandidate@376 }
+ResolutionTaskHolder@373 {
+    <name not found> = ArrayList@374[1] { ResolutionCandidate@375 }
 }
 
-ResolutionTaskHolder@378 {
-    <name not found> = ArrayList@379[1] { ResolutionCandidate@380 }
-    <name not found> = ArrayList@381[1] { ResolutionCandidate@380 }
+ResolutionTaskHolder@376 {
+    <name not found> = ArrayList@377[1] { ResolutionCandidate@378 }
+}
+
+ResolutionTaskHolder@379 {
+    <name not found> = ArrayList@380[1] { ResolutionCandidate@381 }
 }
 
 ResolutionTaskHolder@382 {
     <name not found> = ArrayList@383[1] { ResolutionCandidate@384 }
-    <name not found> = ArrayList@385[1] { ResolutionCandidate@384 }
 }
 
-ResolutionTaskHolder@386 {
-    <name not found> = ArrayList@387[1] { ResolutionCandidate@388 }
-    <name not found> = ArrayList@389[1] { ResolutionCandidate@388 }
+ResolutionTaskHolder@385 {
+    <name not found> = ArrayList@386[1] { ResolutionCandidate@387 }
 }
 
-ResolutionTaskHolder@390 {
-    <name not found> = ArrayList@391[1] { ResolutionCandidate@392 }
-    <name not found> = ArrayList@393[1] { ResolutionCandidate@392 }
+ResolutionTaskHolder@388 {
+    <name not found> = ArrayList@389[1] { ResolutionCandidate@390 }
+}
+
+ResolutionTaskHolder@391 {
+    <name not found> = ArrayList@392[1] { ResolutionCandidate@393 }
 }
 
 ResolutionTaskHolder@394 {
     <name not found> = ArrayList@395[1] { ResolutionCandidate@396 }
-    <name not found> = ArrayList@397[1] { ResolutionCandidate@396 }
 }
 
-ResolutionTaskHolder@398 {
-    <name not found> = ArrayList@399[1] { ResolutionCandidate@400 }
-    <name not found> = ArrayList@401[1] { ResolutionCandidate@400 }
+ResolutionTaskHolder@397 {
+    <name not found> = ArrayList@398[1] { ResolutionCandidate@399 }
 }
 
-ResolutionTaskHolder@402 {
-    <name not found> = ArrayList@403[1] { ResolutionCandidate@404 }
-    <name not found> = ArrayList@405[1] { ResolutionCandidate@404 }
+ResolutionTaskHolder@400 {
+    <name not found> = ArrayList@401[1] { ResolutionCandidate@402 }
+}
+
+ResolutionTaskHolder@403 {
+    <name not found> = ArrayList@404[1] { ResolutionCandidate@405 }
 }
 
 ResolutionTaskHolder@406 {
     <name not found> = ArrayList@407[1] { ResolutionCandidate@408 }
-    <name not found> = ArrayList@409[1] { ResolutionCandidate@408 }
 }
 
-ResolutionTaskHolder@410 {
-    <name not found> = ArrayList@411[1] { ResolutionCandidate@412 }
-    <name not found> = ArrayList@413[1] { ResolutionCandidate@412 }
+ResolutionTaskHolder@409 {
+    <name not found> = ArrayList@410[1] { ResolutionCandidate@411 }
 }
 
-ResolutionTaskHolder@414 {
-    <name not found> = ArrayList@415[1] { ResolutionCandidate@416 }
-    <name not found> = ArrayList@417[1] { ResolutionCandidate@416 }
+ResolutionTaskHolder@412 {
+    <name not found> = ArrayList@413[1] { ResolutionCandidate@414 }
+}
+
+ResolutionTaskHolder@415 {
+    <name not found> = ArrayList@416[1] { ResolutionCandidate@417 }
 }
 
 ResolutionTaskHolder@418 {
-    <name not found> = ArrayList@419[1] { ResolutionCandidate@420 }
-    <name not found> = ArrayList@421[1] { ResolutionCandidate@420 }
+    <name not found> = ArrayList@419[2] { ResolutionCandidate@420, ResolutionCandidate@421 }
 }
 
 ResolutionTaskHolder@422 {
-    <name not found> = ArrayList@423[1] { ResolutionCandidate@424 }
-    <name not found> = ArrayList@425[1] { ResolutionCandidate@424 }
+    <name not found> = ArrayList@423[3] { ResolutionCandidate@424, ResolutionCandidate@425, ResolutionCandidate@426 }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@426 {
-    <name not found> = ArrayList@427[1] { ResolutionCandidate@428 }
-    <name not found> = ArrayList@429[1] { ResolutionCandidate@428 }
+ResolutionTaskHolder@427 {
+    <name not found> = ArrayList@428[7] { ResolutionCandidate@429, ResolutionCandidate@430, ResolutionCandidate@431, ... }
 }
 
-ResolutionTaskHolder@430 {
-    <name not found> = ArrayList@431[1] { ResolutionCandidate@432 }
-    <name not found> = ArrayList@433[1] { ResolutionCandidate@432 }
-}
-
-ResolutionTaskHolder@434 {
-    <name not found> = ArrayList@435[1] { ResolutionCandidate@436 }
-    <name not found> = ArrayList@437[1] { ResolutionCandidate@436 }
-}
-
-ResolutionTaskHolder@438 {
-    <name not found> = ArrayList@439[2] { ResolutionCandidate@440, ResolutionCandidate@441 }
-    <name not found> = ArrayList@442[2] { ResolutionCandidate@440, ResolutionCandidate@441 }
-}
-
-ResolutionTaskHolder@443 {
-    <name not found> = ArrayList@444[3] { ResolutionCandidate@445, ResolutionCandidate@446, ResolutionCandidate@447 }
-    <name not found> = ArrayList@448[3] { ResolutionCandidate@445, ResolutionCandidate@446, ResolutionCandidate@447 }
+ResolutionTaskHolder@432 {
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@449 {
-    <name not found> = ArrayList@450[7] { ResolutionCandidate@451, ResolutionCandidate@452, ResolutionCandidate@453, ... }
-    <name not found> = ArrayList@454[7] { ResolutionCandidate@451, ResolutionCandidate@452, ResolutionCandidate@453, ... }
-}
-
-ResolutionTaskHolder@455 {
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@433 {
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
@@ -781,9 +761,7 @@ ResolutionTaskHolder@455 {
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@456 {
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@434 {
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
@@ -794,7 +772,32 @@ ResolutionTaskHolder@456 {
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@457 {
+null {
+    <name not found> = ArrayList@435[10] { ResolutionCandidate@358, ResolutionCandidate@359, ResolutionCandidate@360, ... }
+    <name not found> = ArrayList@436[1] { ResolutionCandidate@390 }
+    <name not found> = ArrayList@437[1] { ResolutionCandidate@408 }
+    <name not found> = ArrayList@438[1] { ResolutionCandidate@399 }
+    <name not found> = ArrayList@439[1] { ResolutionCandidate@384 }
+    <name not found> = ArrayList@440[1] { ResolutionCandidate@414 }
+    <name not found> = ArrayList@441[1] { ResolutionCandidate@369 }
+    <name not found> = ArrayList@442[1] { ResolutionCandidate@402 }
+    <name not found> = ArrayList@443[1] { ResolutionCandidate@372 }
+    <name not found> = ArrayList@444[1] { ResolutionCandidate@387 }
+    <name not found> = ArrayList@445[1] { ResolutionCandidate@411 }
+    <name not found> = ArrayList@446[1] { ResolutionCandidate@417 }
+    <name not found> = ArrayList@447[1] { ResolutionCandidate@363 }
+    <name not found> = ArrayList@448[1] { ResolutionCandidate@375 }
+    <name not found> = ArrayList@449[1] { ResolutionCandidate@405 }
+    <name not found> = ArrayList@450[1] { ResolutionCandidate@393 }
+    <name not found> = ArrayList@451[1] { ResolutionCandidate@381 }
+    <name not found> = ArrayList@452[1] { ResolutionCandidate@396 }
+    <name not found> = ArrayList@453[1] { ResolutionCandidate@366 }
+    <name not found> = ArrayList@454[1] { ResolutionCandidate@378 }
+    <name not found> = ArrayList@455[2] { ResolutionCandidate@420, ResolutionCandidate@421 }
+    <name not found> = ArrayList@456[3] { ResolutionCandidate@424, ResolutionCandidate@425, ResolutionCandidate@426 }
+    <name not found> = ArrayList@457[7] { ResolutionCandidate@429, ResolutionCandidate@430, ResolutionCandidate@431, ... }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
diff --git a/compiler/testData/diagnostics/tests/regressions/kt557.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt557.lazy.log
index 1b2bee76bd2..fbdf8b79608 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt557.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt557.lazy.log
@@ -53,12 +53,6 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@41 {
     <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
@@ -84,21 +78,30 @@ ResolutionTaskHolder@41 {
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
+}
+
+null {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@43 }
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt571.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt571.lazy.log
index a801888a936..807f0cf319b 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt571.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt571.lazy.log
@@ -48,66 +48,69 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@34 {
     <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@26[empty]
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+}
+
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
 }
 
 ResolutionTaskHolder@46 {
     <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[7] { ResolutionCandidate@57, ResolutionCandidate@58, ResolutionCandidate@59, ... }
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[7] { ResolutionCandidate@64, ResolutionCandidate@65, ResolutionCandidate@66, ... }
-    <name not found> = ArrayList@67[7] { ResolutionCandidate@64, ResolutionCandidate@65, ResolutionCandidate@66, ... }
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[7] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64, ... }
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[7] { ResolutionCandidate@70, ResolutionCandidate@71, ResolutionCandidate@72, ... }
-    <name not found> = ArrayList@73[7] { ResolutionCandidate@70, ResolutionCandidate@71, ResolutionCandidate@72, ... }
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[7] { ResolutionCandidate@67, ResolutionCandidate@68, ResolutionCandidate@69, ... }
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[7] { ResolutionCandidate@76, ResolutionCandidate@77, ResolutionCandidate@78, ... }
-    <name not found> = ArrayList@79[7] { ResolutionCandidate@76, ResolutionCandidate@77, ResolutionCandidate@78, ... }
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[7] { ResolutionCandidate@72, ResolutionCandidate@73, ResolutionCandidate@74, ... }
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[7] { ResolutionCandidate@82, ResolutionCandidate@83, ResolutionCandidate@84, ... }
-    <name not found> = ArrayList@85[7] { ResolutionCandidate@82, ResolutionCandidate@83, ResolutionCandidate@84, ... }
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[8] { ResolutionCandidate@77, ResolutionCandidate@78, ResolutionCandidate@79, ... }
 }
 
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[8] { ResolutionCandidate@88, ResolutionCandidate@89, ResolutionCandidate@90, ... }
-    <name not found> = ArrayList@91[8] { ResolutionCandidate@88, ResolutionCandidate@89, ResolutionCandidate@90, ... }
+null {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@87[7] { ResolutionCandidate@67, ResolutionCandidate@68, ResolutionCandidate@69, ... }
+    <name not found> = ArrayList@88[7] { ResolutionCandidate@57, ResolutionCandidate@58, ResolutionCandidate@59, ... }
+    <name not found> = ArrayList@89[7] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64, ... }
+    <name not found> = ArrayList@90[7] { ResolutionCandidate@72, ResolutionCandidate@73, ResolutionCandidate@74, ... }
+    <name not found> = ArrayList@91[8] { ResolutionCandidate@77, ResolutionCandidate@78, ResolutionCandidate@79, ... }
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt575.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt575.lazy.log
index f5ae0242693..b9f50fa991c 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt575.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt575.lazy.log
@@ -38,9 +38,21 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@34 {
     <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+}
+
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -59,36 +71,8 @@ ResolutionTaskHolder@34 {
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -102,75 +86,94 @@ ResolutionTaskHolder@41 {
 
 ResolutionTaskHolder@45 {
     <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
     <name not found> = EmptyList@27[empty]
+}
+
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
     <name not found> = EmptyList@27[empty]
 }
 
 ResolutionTaskHolder@57 {
     <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
+}
+
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
+}
+
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
+}
+
+null {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@56 }
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt58.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt58.lazy.log
index 022c33bdc5d..4d1541c8ad5 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt58.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt58.lazy.log
@@ -143,95 +143,98 @@ LazyJavaPackageFragment@58['util'] {
 
 ResolutionTaskHolder@103 {
     <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
 }
 
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
 }
 
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@113 }
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
+}
+
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
 }
 
 ResolutionTaskHolder@115 {
     <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@117 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
 }
 
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@121 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
+ResolutionTaskHolder@118 {
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
 }
 
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@125 }
-    <name not found> = EmptyList@82[empty]
+ResolutionTaskHolder@121 {
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
+}
+
+ResolutionTaskHolder@124 {
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
     <name not found> = EmptyList@82[empty]
 }
 
 ResolutionTaskHolder@127 {
     <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@129 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
 }
 
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@133 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
+ResolutionTaskHolder@130 {
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
 }
 
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@137 }
+ResolutionTaskHolder@133 {
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
+}
+
+ResolutionTaskHolder@136 {
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
 }
 
 ResolutionTaskHolder@139 {
     <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@141 }
 }
 
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@145 }
-}
-
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@149 }
-}
-
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@153 }
+null {
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@129 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@135 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@132 }
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@141 }
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@126 }
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@105 }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt580.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt580.lazy.log
index 84ca0b9021e..23d8d6615a0 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt580.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt580.lazy.log
@@ -138,42 +138,42 @@ LazyJavaClassifierType@108['E'] {
     arguments = ArrayList@109[empty]
     classifier = JavaTypeParameterImpl@110['E']
     nullable = 'false': Boolean@85
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@111
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@107
 }
 
-LazyJavaClassifierType@112['E'] {
-    arguments = ArrayList@113[empty]
-    classifier = JavaTypeParameterImpl@114['E']
+LazyJavaClassifierType@111['E'] {
+    arguments = ArrayList@112[empty]
+    classifier = JavaTypeParameterImpl@113['E']
     nullable = 'false': Boolean@85
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
 }
 
-LazyJavaClassifierType@115['E'] {
-    arguments = ArrayList@116[empty]
-    classifier = JavaTypeParameterImpl@117['E']
+LazyJavaClassifierType@114['E'] {
+    arguments = ArrayList@115[empty]
+    classifier = JavaTypeParameterImpl@116['E']
     nullable = 'false': Boolean@85
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@107
 }
 
-LazyJavaClassifierType@118['E'] {
-    arguments = ArrayList@119[empty]
-    classifier = JavaTypeParameterImpl@120['E']
+LazyJavaClassifierType@117['E'] {
+    arguments = ArrayList@118[empty]
+    classifier = JavaTypeParameterImpl@119['E']
+    nullable = 'false': Boolean@85
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@107
+}
+
+LazyJavaClassifierType@120['E'] {
+    arguments = ArrayList@121[empty]
+    classifier = JavaTypeParameterImpl@122['E']
     nullable = 'false': Boolean@85
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
 }
 
-LazyJavaClassifierType@121['E'] {
-    arguments = ArrayList@122[empty]
-    classifier = JavaTypeParameterImpl@123['E']
+LazyJavaClassifierType@123['E'] {
+    arguments = ArrayList@124[empty]
+    classifier = JavaTypeParameterImpl@125['E']
     nullable = 'false': Boolean@85
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@107
-}
-
-LazyJavaClassifierType@124['E'] {
-    arguments = ArrayList@125[empty]
-    classifier = JavaTypeParameterImpl@126['E']
-    nullable = 'false': Boolean@85
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@107
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
 }
 
 LazyJavaClassifierType@127['E'] {
@@ -194,89 +194,89 @@ LazyJavaClassifierType@133['E'] {
     arguments = ArrayList@134[empty]
     classifier = JavaTypeParameterImpl@135['E']
     nullable = 'false': Boolean@85
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@111
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
 }
 
 LazyJavaClassifierType@136['E'] {
     arguments = ArrayList@137[empty]
     classifier = JavaTypeParameterImpl@135['E']
     nullable = 'true': Boolean@91
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@111
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
 }
 
 LazyJavaClassifierType@138['E'] {
     arguments = ArrayList@139[empty]
-    classifier = JavaTypeParameterImpl@123['E']
+    classifier = JavaTypeParameterImpl@132['E']
     nullable = 'true': Boolean@91
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@107
 }
 
 LazyJavaClassifierType@140['E'] {
     arguments = ArrayList@141[empty]
-    classifier = JavaTypeParameterImpl@120['E']
-    nullable = 'true': Boolean@91
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
-}
-
-LazyJavaClassifierType@142['E'] {
-    arguments = ArrayList@143[empty]
     classifier = JavaTypeParameterImpl@129['E']
     nullable = 'true': Boolean@91
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@107
 }
 
+LazyJavaClassifierType@142['E'] {
+    arguments = ArrayList@143[empty]
+    classifier = JavaTypeParameterImpl@122['E']
+    nullable = 'true': Boolean@91
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
+}
+
 LazyJavaClassifierType@144['E'] {
     arguments = ArrayList@145[empty]
-    classifier = JavaTypeParameterImpl@106['E']
+    classifier = JavaTypeParameterImpl@110['E']
     nullable = 'true': Boolean@91
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@107
 }
 
 LazyJavaClassifierType@146['E'] {
     arguments = ArrayList@147[empty]
-    classifier = JavaTypeParameterImpl@114['E']
+    classifier = JavaTypeParameterImpl@116['E']
     nullable = 'true': Boolean@91
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@107
 }
 
 LazyJavaClassifierType@148['E'] {
     arguments = ArrayList@149[empty]
-    classifier = JavaTypeParameterImpl@99['E']
+    classifier = JavaTypeParameterImpl@113['E']
     nullable = 'true': Boolean@91
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
 }
 
 LazyJavaClassifierType@150['E'] {
     arguments = ArrayList@151[empty]
-    classifier = JavaTypeParameterImpl@110['E']
+    classifier = JavaTypeParameterImpl@125['E']
     nullable = 'true': Boolean@91
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@111
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
 }
 
 LazyJavaClassifierType@152['E'] {
     arguments = ArrayList@153[empty]
+    classifier = JavaTypeParameterImpl@106['E']
+    nullable = 'true': Boolean@91
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@107
+}
+
+LazyJavaClassifierType@154['E'] {
+    arguments = ArrayList@155[empty]
     classifier = JavaTypeParameterImpl@103['E']
     nullable = 'true': Boolean@91
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
 }
 
-LazyJavaClassifierType@154['E'] {
-    arguments = ArrayList@155[empty]
-    classifier = JavaTypeParameterImpl@132['E']
-    nullable = 'true': Boolean@91
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@107
-}
-
 LazyJavaClassifierType@156['E'] {
     arguments = ArrayList@157[empty]
-    classifier = JavaTypeParameterImpl@117['E']
+    classifier = JavaTypeParameterImpl@99['E']
     nullable = 'true': Boolean@91
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@107
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
 }
 
 LazyJavaClassifierType@158['E'] {
     arguments = ArrayList@159[empty]
-    classifier = JavaTypeParameterImpl@126['E']
+    classifier = JavaTypeParameterImpl@119['E']
     nullable = 'true': Boolean@91
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@107
 }
@@ -412,16 +412,16 @@ LazyJavaPackageFragment@201['util'] {
     memberIndex = computeMemberIndex$1@246 // through LazyPackageFragmentScopeForJavaPackage@242
 }
 
-LazyJavaTypeParameterDescriptor@57['E'] {
+LazyJavaTypeParameterDescriptor@48['E'] {
     defaultType = JetTypeImpl@247['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@107
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
     upperBounds = LinkedHashSet@248[1] { NullableType@249 }
     upperBoundsAsType = NullableType@249
 }
 
-LazyJavaTypeParameterDescriptor@48['E'] {
+LazyJavaTypeParameterDescriptor@57['E'] {
     defaultType = JetTypeImpl@250['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@111
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@107
     upperBounds = LinkedHashSet@251[1] { NullableType@252 }
     upperBoundsAsType = NullableType@252
 }
@@ -434,48 +434,39 @@ LazyJavaTypeParameterDescriptor@52['E'] {
 }
 
 LazyJavaTypeParameterResolver@256 {
-    resolve(JavaTypeParameterImpl@257['E']) = LazyJavaTypeParameterDescriptor@57['E']
+    resolve(JavaTypeParameterImpl@257['E']) = LazyJavaTypeParameterDescriptor@48['E']
 }
 
 LazyJavaTypeParameterResolver@258 {
-    resolve(JavaTypeParameterImpl@259['E']) = LazyJavaTypeParameterDescriptor@48['E']
+    resolve(JavaTypeParameterImpl@259['E']) = LazyJavaTypeParameterDescriptor@52['E']
 }
 
 LazyJavaTypeParameterResolver@260 {
-    resolve(JavaTypeParameterImpl@261['E']) = LazyJavaTypeParameterDescriptor@52['E']
+    resolve(JavaTypeParameterImpl@261['E']) = LazyJavaTypeParameterDescriptor@57['E']
 }
 
 LazyJavaTypeParameterResolver@262 {
-    resolve(JavaTypeParameterImpl@103['E']) = null
+    resolve(JavaTypeParameterImpl@125['E']) = null
 }
 
 LazyJavaTypeParameterResolver@263 {
-    resolve(JavaTypeParameterImpl@129['E']) = null
+    resolve(JavaTypeParameterImpl@113['E']) = null
 }
 
 LazyJavaTypeParameterResolver@264 {
-    resolve(JavaTypeParameterImpl@132['E']) = null
+    resolve(JavaTypeParameterImpl@129['E']) = null
 }
 
 LazyJavaTypeParameterResolver@265 {
-    resolve(JavaTypeParameterImpl@110['E']) = null
+    resolve(JavaTypeParameterImpl@99['E']) = null
 }
 
 LazyJavaTypeParameterResolver@266 {
-    resolve(JavaTypeParameterImpl@99['E']) = null
+    resolve(JavaTypeParameterImpl@132['E']) = null
 }
 
 ResolutionTaskHolder@267 {
     <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
-    <name not found> = ArrayList@270[1] { ResolutionCandidate@269 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
@@ -486,277 +477,289 @@ ResolutionTaskHolder@267 {
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@271 {
-    <name not found> = ArrayList@272[1] { ResolutionCandidate@273 }
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@273 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@270 {
+    <name not found> = ArrayList@271[1] { ResolutionCandidate@272 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@275 {
-    <name not found> = ArrayList@276[1] { ResolutionCandidate@277 }
-    <name not found> = ArrayList@278[1] { ResolutionCandidate@277 }
+ResolutionTaskHolder@273 {
+    <name not found> = ArrayList@274[1] { ResolutionCandidate@275 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
+}
+
+ResolutionTaskHolder@276 {
+    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
 ResolutionTaskHolder@279 {
     <name not found> = ArrayList@280[1] { ResolutionCandidate@281 }
-    <name not found> = ArrayList@282[1] { ResolutionCandidate@281 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@283 {
-    <name not found> = ArrayList@284[1] { ResolutionCandidate@285 }
-    <name not found> = ArrayList@286[1] { ResolutionCandidate@285 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@282 {
+    <name not found> = ArrayList@283[1] { ResolutionCandidate@284 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@287 {
-    <name not found> = ArrayList@288[1] { ResolutionCandidate@289 }
-    <name not found> = ArrayList@290[1] { ResolutionCandidate@289 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@285 {
+    <name not found> = ArrayList@286[1] { ResolutionCandidate@287 }
     <name not found> = EmptyList@39[empty]
+}
+
+ResolutionTaskHolder@288 {
+    <name not found> = ArrayList@289[1] { ResolutionCandidate@290 }
     <name not found> = EmptyList@39[empty]
 }
 
 ResolutionTaskHolder@291 {
     <name not found> = ArrayList@292[1] { ResolutionCandidate@293 }
-    <name not found> = ArrayList@294[1] { ResolutionCandidate@293 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@295 {
-    <name not found> = ArrayList@296[1] { ResolutionCandidate@297 }
-    <name not found> = ArrayList@298[1] { ResolutionCandidate@297 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@294 {
+    <name not found> = ArrayList@295[1] { ResolutionCandidate@296 }
 }
 
-ResolutionTaskHolder@299 {
-    <name not found> = ArrayList@300[1] { ResolutionCandidate@301 }
-    <name not found> = ArrayList@302[1] { ResolutionCandidate@301 }
+ResolutionTaskHolder@297 {
+    <name not found> = ArrayList@298[1] { ResolutionCandidate@299 }
+}
+
+ResolutionTaskHolder@300 {
+    <name not found> = ArrayList@301[1] { ResolutionCandidate@302 }
 }
 
 ResolutionTaskHolder@303 {
     <name not found> = ArrayList@304[1] { ResolutionCandidate@305 }
-    <name not found> = ArrayList@306[1] { ResolutionCandidate@305 }
 }
 
-ResolutionTaskHolder@307 {
-    <name not found> = ArrayList@308[1] { ResolutionCandidate@309 }
-    <name not found> = ArrayList@310[1] { ResolutionCandidate@309 }
+ResolutionTaskHolder@306 {
+    <name not found> = ArrayList@307[1] { ResolutionCandidate@308 }
 }
 
-ResolutionTaskHolder@311 {
-    <name not found> = ArrayList@312[1] { ResolutionCandidate@313 }
-    <name not found> = ArrayList@314[1] { ResolutionCandidate@313 }
+ResolutionTaskHolder@309 {
+    <name not found> = ArrayList@310[1] { ResolutionCandidate@311 }
+}
+
+ResolutionTaskHolder@312 {
+    <name not found> = ArrayList@313[1] { ResolutionCandidate@314 }
 }
 
 ResolutionTaskHolder@315 {
     <name not found> = ArrayList@316[1] { ResolutionCandidate@317 }
-    <name not found> = ArrayList@318[1] { ResolutionCandidate@317 }
 }
 
-ResolutionTaskHolder@319 {
-    <name not found> = ArrayList@320[1] { ResolutionCandidate@321 }
-    <name not found> = ArrayList@322[1] { ResolutionCandidate@321 }
+ResolutionTaskHolder@318 {
+    <name not found> = ArrayList@319[1] { ResolutionCandidate@320 }
 }
 
-ResolutionTaskHolder@323 {
-    <name not found> = ArrayList@324[1] { ResolutionCandidate@325 }
-    <name not found> = ArrayList@326[1] { ResolutionCandidate@325 }
+ResolutionTaskHolder@321 {
+    <name not found> = ArrayList@322[1] { ResolutionCandidate@323 }
+}
+
+ResolutionTaskHolder@324 {
+    <name not found> = ArrayList@325[1] { ResolutionCandidate@326 }
 }
 
 ResolutionTaskHolder@327 {
     <name not found> = ArrayList@328[1] { ResolutionCandidate@329 }
-    <name not found> = ArrayList@330[1] { ResolutionCandidate@329 }
 }
 
-ResolutionTaskHolder@331 {
-    <name not found> = ArrayList@332[1] { ResolutionCandidate@333 }
-    <name not found> = ArrayList@334[1] { ResolutionCandidate@333 }
+ResolutionTaskHolder@330 {
+    <name not found> = ArrayList@331[1] { ResolutionCandidate@332 }
 }
 
-ResolutionTaskHolder@335 {
-    <name not found> = ArrayList@336[1] { ResolutionCandidate@337 }
-    <name not found> = ArrayList@338[1] { ResolutionCandidate@337 }
+ResolutionTaskHolder@333 {
+    <name not found> = ArrayList@334[1] { ResolutionCandidate@335 }
+}
+
+ResolutionTaskHolder@336 {
+    <name not found> = ArrayList@337[1] { ResolutionCandidate@338 }
 }
 
 ResolutionTaskHolder@339 {
     <name not found> = ArrayList@340[1] { ResolutionCandidate@341 }
-    <name not found> = ArrayList@342[1] { ResolutionCandidate@341 }
 }
 
-ResolutionTaskHolder@343 {
-    <name not found> = ArrayList@344[1] { ResolutionCandidate@345 }
-    <name not found> = ArrayList@346[1] { ResolutionCandidate@345 }
+ResolutionTaskHolder@342 {
+    <name not found> = ArrayList@343[1] { ResolutionCandidate@344 }
 }
 
-ResolutionTaskHolder@347 {
-    <name not found> = ArrayList@348[1] { ResolutionCandidate@349 }
-    <name not found> = ArrayList@350[1] { ResolutionCandidate@349 }
+ResolutionTaskHolder@345 {
+    <name not found> = ArrayList@346[1] { ResolutionCandidate@347 }
+}
+
+ResolutionTaskHolder@348 {
+    <name not found> = ArrayList@349[1] { ResolutionCandidate@350 }
 }
 
 ResolutionTaskHolder@351 {
     <name not found> = ArrayList@352[1] { ResolutionCandidate@353 }
-    <name not found> = ArrayList@354[1] { ResolutionCandidate@353 }
 }
 
-ResolutionTaskHolder@355 {
-    <name not found> = ArrayList@356[1] { ResolutionCandidate@357 }
-    <name not found> = ArrayList@358[1] { ResolutionCandidate@357 }
+ResolutionTaskHolder@354 {
+    <name not found> = ArrayList@355[1] { ResolutionCandidate@356 }
 }
 
-ResolutionTaskHolder@359 {
-    <name not found> = ArrayList@360[1] { ResolutionCandidate@361 }
-    <name not found> = ArrayList@362[1] { ResolutionCandidate@361 }
+ResolutionTaskHolder@357 {
+    <name not found> = ArrayList@358[1] { ResolutionCandidate@359 }
+}
+
+ResolutionTaskHolder@360 {
+    <name not found> = ArrayList@361[1] { ResolutionCandidate@362 }
 }
 
 ResolutionTaskHolder@363 {
     <name not found> = ArrayList@364[1] { ResolutionCandidate@365 }
-    <name not found> = ArrayList@366[1] { ResolutionCandidate@365 }
 }
 
-ResolutionTaskHolder@367 {
-    <name not found> = ArrayList@368[1] { ResolutionCandidate@369 }
-    <name not found> = ArrayList@370[1] { ResolutionCandidate@369 }
+ResolutionTaskHolder@366 {
+    <name not found> = ArrayList@367[1] { ResolutionCandidate@368 }
 }
 
-ResolutionTaskHolder@371 {
-    <name not found> = ArrayList@372[1] { ResolutionCandidate@373 }
-    <name not found> = ArrayList@374[1] { ResolutionCandidate@373 }
+ResolutionTaskHolder@369 {
+    <name not found> = ArrayList@370[1] { ResolutionCandidate@371 }
+}
+
+ResolutionTaskHolder@372 {
+    <name not found> = ArrayList@373[1] { ResolutionCandidate@374 }
 }
 
 ResolutionTaskHolder@375 {
     <name not found> = ArrayList@376[1] { ResolutionCandidate@377 }
-    <name not found> = ArrayList@378[1] { ResolutionCandidate@377 }
 }
 
-ResolutionTaskHolder@379 {
-    <name not found> = ArrayList@380[1] { ResolutionCandidate@381 }
-    <name not found> = ArrayList@382[1] { ResolutionCandidate@381 }
+ResolutionTaskHolder@378 {
+    <name not found> = ArrayList@379[1] { ResolutionCandidate@380 }
 }
 
-ResolutionTaskHolder@383 {
-    <name not found> = ArrayList@384[1] { ResolutionCandidate@385 }
-    <name not found> = ArrayList@386[1] { ResolutionCandidate@385 }
+ResolutionTaskHolder@381 {
+    <name not found> = ArrayList@382[1] { ResolutionCandidate@383 }
+}
+
+ResolutionTaskHolder@384 {
+    <name not found> = ArrayList@385[1] { ResolutionCandidate@386 }
 }
 
 ResolutionTaskHolder@387 {
     <name not found> = ArrayList@388[1] { ResolutionCandidate@389 }
-    <name not found> = ArrayList@390[1] { ResolutionCandidate@389 }
 }
 
-ResolutionTaskHolder@391 {
-    <name not found> = ArrayList@392[1] { ResolutionCandidate@393 }
-    <name not found> = ArrayList@394[1] { ResolutionCandidate@393 }
+ResolutionTaskHolder@390 {
+    <name not found> = ArrayList@391[2] { ResolutionCandidate@392, ResolutionCandidate@393 }
 }
 
-ResolutionTaskHolder@395 {
-    <name not found> = ArrayList@396[1] { ResolutionCandidate@397 }
-    <name not found> = ArrayList@398[1] { ResolutionCandidate@397 }
+ResolutionTaskHolder@394 {
+    <name not found> = ArrayList@395[2] { ResolutionCandidate@396, ResolutionCandidate@397 }
 }
 
-ResolutionTaskHolder@399 {
-    <name not found> = ArrayList@400[1] { ResolutionCandidate@401 }
-    <name not found> = ArrayList@402[1] { ResolutionCandidate@401 }
+ResolutionTaskHolder@398 {
+    <name not found> = ArrayList@399[3] { ResolutionCandidate@400, ResolutionCandidate@401, ResolutionCandidate@402 }
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
 }
 
 ResolutionTaskHolder@403 {
-    <name not found> = ArrayList@404[1] { ResolutionCandidate@405 }
-    <name not found> = ArrayList@406[1] { ResolutionCandidate@405 }
+    <name not found> = ArrayList@404[7] { ResolutionCandidate@405, ResolutionCandidate@406, ResolutionCandidate@407, ... }
 }
 
-ResolutionTaskHolder@407 {
-    <name not found> = ArrayList@408[1] { ResolutionCandidate@409 }
-    <name not found> = ArrayList@410[1] { ResolutionCandidate@409 }
+ResolutionTaskHolder@408 {
+    <name not found> = ArrayList@409[7] { ResolutionCandidate@410, ResolutionCandidate@411, ResolutionCandidate@412, ... }
 }
 
-ResolutionTaskHolder@411 {
-    <name not found> = ArrayList@412[1] { ResolutionCandidate@413 }
-    <name not found> = ArrayList@414[1] { ResolutionCandidate@413 }
+ResolutionTaskHolder@413 {
+    <name not found> = ArrayList@414[8] { ResolutionCandidate@415, ResolutionCandidate@416, ResolutionCandidate@417, ... }
 }
 
-ResolutionTaskHolder@415 {
-    <name not found> = ArrayList@416[1] { ResolutionCandidate@417 }
-    <name not found> = ArrayList@418[1] { ResolutionCandidate@417 }
-}
-
-ResolutionTaskHolder@419 {
-    <name not found> = ArrayList@420[1] { ResolutionCandidate@421 }
-    <name not found> = ArrayList@422[1] { ResolutionCandidate@421 }
+ResolutionTaskHolder@418 {
+    <name not found> = ArrayList@419[8] { ResolutionCandidate@420, ResolutionCandidate@421, ResolutionCandidate@422, ... }
 }
 
 ResolutionTaskHolder@423 {
-    <name not found> = ArrayList@424[1] { ResolutionCandidate@425 }
-    <name not found> = ArrayList@426[1] { ResolutionCandidate@425 }
+    <name not found> = ArrayList@424[8] { ResolutionCandidate@425, ResolutionCandidate@426, ResolutionCandidate@427, ... }
 }
 
-ResolutionTaskHolder@427 {
-    <name not found> = ArrayList@428[1] { ResolutionCandidate@429 }
-    <name not found> = ArrayList@430[1] { ResolutionCandidate@429 }
+ResolutionTaskHolder@428 {
+    <name not found> = ArrayList@429[8] { ResolutionCandidate@430, ResolutionCandidate@431, ResolutionCandidate@432, ... }
 }
 
-ResolutionTaskHolder@431 {
-    <name not found> = ArrayList@432[2] { ResolutionCandidate@433, ResolutionCandidate@434 }
-    <name not found> = ArrayList@435[2] { ResolutionCandidate@433, ResolutionCandidate@434 }
-}
-
-ResolutionTaskHolder@436 {
-    <name not found> = ArrayList@437[2] { ResolutionCandidate@438, ResolutionCandidate@439 }
-    <name not found> = ArrayList@440[2] { ResolutionCandidate@438, ResolutionCandidate@439 }
-}
-
-ResolutionTaskHolder@441 {
-    <name not found> = ArrayList@442[3] { ResolutionCandidate@443, ResolutionCandidate@444, ResolutionCandidate@445 }
-    <name not found> = ArrayList@446[3] { ResolutionCandidate@443, ResolutionCandidate@444, ResolutionCandidate@445 }
+null {
+    <name not found> = ArrayList@433[1] { ResolutionCandidate@281 }
+    <name not found> = ArrayList@434[1] { ResolutionCandidate@272 }
+    <name not found> = ArrayList@435[1] { ResolutionCandidate@269 }
+    <name not found> = ArrayList@436[1] { ResolutionCandidate@353 }
+    <name not found> = ArrayList@437[1] { ResolutionCandidate@275 }
+    <name not found> = ArrayList@438[1] { ResolutionCandidate@341 }
+    <name not found> = ArrayList@439[1] { ResolutionCandidate@290 }
+    <name not found> = ArrayList@440[1] { ResolutionCandidate@359 }
+    <name not found> = ArrayList@441[1] { ResolutionCandidate@332 }
+    <name not found> = ArrayList@442[1] { ResolutionCandidate@317 }
+    <name not found> = ArrayList@443[1] { ResolutionCandidate@293 }
+    <name not found> = ArrayList@444[1] { ResolutionCandidate@320 }
+    <name not found> = ArrayList@445[1] { ResolutionCandidate@278 }
+    <name not found> = ArrayList@446[1] { ResolutionCandidate@284 }
+    <name not found> = ArrayList@447[1] { ResolutionCandidate@344 }
+    <name not found> = ArrayList@448[1] { ResolutionCandidate@374 }
+    <name not found> = ArrayList@449[1] { ResolutionCandidate@368 }
+    <name not found> = ArrayList@450[1] { ResolutionCandidate@338 }
+    <name not found> = ArrayList@451[1] { ResolutionCandidate@356 }
+    <name not found> = ArrayList@452[1] { ResolutionCandidate@311 }
+    <name not found> = ArrayList@453[1] { ResolutionCandidate@326 }
+    <name not found> = ArrayList@454[1] { ResolutionCandidate@296 }
+    <name not found> = ArrayList@455[1] { ResolutionCandidate@380 }
+    <name not found> = ArrayList@456[1] { ResolutionCandidate@329 }
+    <name not found> = ArrayList@457[1] { ResolutionCandidate@386 }
+    <name not found> = ArrayList@458[1] { ResolutionCandidate@302 }
+    <name not found> = ArrayList@459[1] { ResolutionCandidate@305 }
+    <name not found> = ArrayList@460[1] { ResolutionCandidate@365 }
+    <name not found> = ArrayList@461[1] { ResolutionCandidate@287 }
+    <name not found> = ArrayList@462[1] { ResolutionCandidate@350 }
+    <name not found> = ArrayList@463[1] { ResolutionCandidate@371 }
+    <name not found> = ArrayList@464[1] { ResolutionCandidate@383 }
+    <name not found> = ArrayList@465[1] { ResolutionCandidate@335 }
+    <name not found> = ArrayList@466[1] { ResolutionCandidate@389 }
+    <name not found> = ArrayList@467[1] { ResolutionCandidate@314 }
+    <name not found> = ArrayList@468[1] { ResolutionCandidate@377 }
+    <name not found> = ArrayList@469[1] { ResolutionCandidate@308 }
+    <name not found> = ArrayList@470[1] { ResolutionCandidate@362 }
+    <name not found> = ArrayList@471[1] { ResolutionCandidate@323 }
+    <name not found> = ArrayList@472[1] { ResolutionCandidate@347 }
+    <name not found> = ArrayList@473[1] { ResolutionCandidate@299 }
+    <name not found> = ArrayList@474[2] { ResolutionCandidate@392, ResolutionCandidate@393 }
+    <name not found> = ArrayList@475[2] { ResolutionCandidate@396, ResolutionCandidate@397 }
+    <name not found> = ArrayList@476[3] { ResolutionCandidate@400, ResolutionCandidate@401, ResolutionCandidate@402 }
+    <name not found> = ArrayList@477[7] { ResolutionCandidate@405, ResolutionCandidate@406, ResolutionCandidate@407, ... }
+    <name not found> = ArrayList@478[7] { ResolutionCandidate@410, ResolutionCandidate@411, ResolutionCandidate@412, ... }
+    <name not found> = ArrayList@479[8] { ResolutionCandidate@430, ResolutionCandidate@431, ResolutionCandidate@432, ... }
+    <name not found> = ArrayList@480[8] { ResolutionCandidate@420, ResolutionCandidate@421, ResolutionCandidate@422, ... }
+    <name not found> = ArrayList@481[8] { ResolutionCandidate@425, ResolutionCandidate@426, ResolutionCandidate@427, ... }
+    <name not found> = ArrayList@482[8] { ResolutionCandidate@415, ResolutionCandidate@416, ResolutionCandidate@417, ... }
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@447 {
-    <name not found> = ArrayList@448[7] { ResolutionCandidate@449, ResolutionCandidate@450, ResolutionCandidate@451, ... }
-    <name not found> = ArrayList@452[7] { ResolutionCandidate@449, ResolutionCandidate@450, ResolutionCandidate@451, ... }
-}
-
-ResolutionTaskHolder@453 {
-    <name not found> = ArrayList@454[7] { ResolutionCandidate@455, ResolutionCandidate@456, ResolutionCandidate@457, ... }
-    <name not found> = ArrayList@458[7] { ResolutionCandidate@455, ResolutionCandidate@456, ResolutionCandidate@457, ... }
-}
-
-ResolutionTaskHolder@459 {
-    <name not found> = ArrayList@460[8] { ResolutionCandidate@461, ResolutionCandidate@462, ResolutionCandidate@463, ... }
-    <name not found> = ArrayList@464[8] { ResolutionCandidate@461, ResolutionCandidate@462, ResolutionCandidate@463, ... }
-}
-
-ResolutionTaskHolder@465 {
-    <name not found> = ArrayList@466[8] { ResolutionCandidate@467, ResolutionCandidate@468, ResolutionCandidate@469, ... }
-    <name not found> = ArrayList@470[8] { ResolutionCandidate@467, ResolutionCandidate@468, ResolutionCandidate@469, ... }
-}
-
-ResolutionTaskHolder@471 {
-    <name not found> = ArrayList@472[8] { ResolutionCandidate@473, ResolutionCandidate@474, ResolutionCandidate@475, ... }
-    <name not found> = ArrayList@476[8] { ResolutionCandidate@473, ResolutionCandidate@474, ResolutionCandidate@475, ... }
-}
-
-ResolutionTaskHolder@477 {
-    <name not found> = ArrayList@478[8] { ResolutionCandidate@479, ResolutionCandidate@480, ResolutionCandidate@481, ... }
-    <name not found> = ArrayList@482[8] { ResolutionCandidate@479, ResolutionCandidate@480, ResolutionCandidate@481, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt588.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt588.lazy.log
index 40e9a43caee..707a49074a2 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt588.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt588.lazy.log
@@ -247,21 +247,21 @@ LazyJavaClassifierType@307['ClassLoader'] {
 
 LazyJavaClassifierType@310['ClassLoader'] {
     arguments = ArrayList@311[empty]
-    classifier = JavaClassImpl@309['ClassLoader']
+    classifier = JavaClassImpl@303['ClassLoader']
     nullable = 'true': Boolean@300
     typeConstructor = LazyJavaClassTypeConstructor@1['ClassLoader']
 }
 
 LazyJavaClassifierType@312['ClassLoader'] {
     arguments = ArrayList@313[empty]
-    classifier = JavaClassImpl@303['ClassLoader']
+    classifier = JavaClassImpl@306['ClassLoader']
     nullable = 'true': Boolean@300
     typeConstructor = LazyJavaClassTypeConstructor@1['ClassLoader']
 }
 
 LazyJavaClassifierType@314['ClassLoader'] {
     arguments = ArrayList@315[empty]
-    classifier = JavaClassImpl@306['ClassLoader']
+    classifier = JavaClassImpl@309['ClassLoader']
     nullable = 'true': Boolean@300
     typeConstructor = LazyJavaClassTypeConstructor@1['ClassLoader']
 }
@@ -416,7 +416,7 @@ LazyJavaClassifierType@369['Runnable'] {
 
 LazyJavaClassifierType@372['Runnable'] {
     arguments = ArrayList@373[empty]
-    classifier = JavaClassImpl@365['Runnable']
+    classifier = JavaClassImpl@356['Runnable']
     nullable = 'true': Boolean@300
     typeConstructor = LazyJavaClassTypeConstructor@88['Runnable']
 }
@@ -437,28 +437,28 @@ LazyJavaClassifierType@376['Runnable'] {
 
 LazyJavaClassifierType@378['Runnable'] {
     arguments = ArrayList@379[empty]
-    classifier = JavaClassImpl@371['Runnable']
+    classifier = JavaClassImpl@362['Runnable']
     nullable = 'true': Boolean@300
     typeConstructor = LazyJavaClassTypeConstructor@88['Runnable']
 }
 
 LazyJavaClassifierType@380['Runnable'] {
     arguments = ArrayList@381[empty]
-    classifier = JavaClassImpl@356['Runnable']
+    classifier = JavaClassImpl@365['Runnable']
     nullable = 'true': Boolean@300
     typeConstructor = LazyJavaClassTypeConstructor@88['Runnable']
 }
 
 LazyJavaClassifierType@382['Runnable'] {
     arguments = ArrayList@383[empty]
-    classifier = JavaClassImpl@368['Runnable']
+    classifier = JavaClassImpl@371['Runnable']
     nullable = 'true': Boolean@300
     typeConstructor = LazyJavaClassTypeConstructor@88['Runnable']
 }
 
 LazyJavaClassifierType@384['Runnable'] {
     arguments = ArrayList@385[empty]
-    classifier = JavaClassImpl@362['Runnable']
+    classifier = JavaClassImpl@368['Runnable']
     nullable = 'true': Boolean@300
     typeConstructor = LazyJavaClassTypeConstructor@88['Runnable']
 }
@@ -562,70 +562,70 @@ LazyJavaClassifierType@424['String'] {
 
 LazyJavaClassifierType@427['String'] {
     arguments = ArrayList@428[empty]
-    classifier = JavaClassImpl@423['String']
+    classifier = JavaClassImpl@408['String']
     nullable = 'true': Boolean@300
     typeConstructor = DeserializedClassTypeConstructor@399
 }
 
 LazyJavaClassifierType@429['String'] {
     arguments = ArrayList@430[empty]
-    classifier = JavaClassImpl@398['String']
+    classifier = JavaClassImpl@414['String']
     nullable = 'true': Boolean@300
     typeConstructor = DeserializedClassTypeConstructor@399
 }
 
 LazyJavaClassifierType@431['String'] {
     arguments = ArrayList@432[empty]
-    classifier = JavaClassImpl@420['String']
+    classifier = JavaClassImpl@411['String']
     nullable = 'true': Boolean@300
     typeConstructor = DeserializedClassTypeConstructor@399
 }
 
 LazyJavaClassifierType@433['String'] {
     arguments = ArrayList@434[empty]
-    classifier = JavaClassImpl@414['String']
+    classifier = JavaClassImpl@420['String']
     nullable = 'true': Boolean@300
     typeConstructor = DeserializedClassTypeConstructor@399
 }
 
 LazyJavaClassifierType@435['String'] {
     arguments = ArrayList@436[empty]
-    classifier = JavaClassImpl@411['String']
+    classifier = JavaClassImpl@398['String']
     nullable = 'true': Boolean@300
     typeConstructor = DeserializedClassTypeConstructor@399
 }
 
 LazyJavaClassifierType@437['String'] {
     arguments = ArrayList@438[empty]
-    classifier = JavaClassImpl@408['String']
+    classifier = JavaClassImpl@402['String']
     nullable = 'true': Boolean@300
     typeConstructor = DeserializedClassTypeConstructor@399
 }
 
 LazyJavaClassifierType@439['String'] {
     arguments = ArrayList@440[empty]
-    classifier = JavaClassImpl@417['String']
+    classifier = JavaClassImpl@426['String']
     nullable = 'true': Boolean@300
     typeConstructor = DeserializedClassTypeConstructor@399
 }
 
 LazyJavaClassifierType@441['String'] {
     arguments = ArrayList@442[empty]
-    classifier = JavaClassImpl@405['String']
+    classifier = JavaClassImpl@417['String']
     nullable = 'true': Boolean@300
     typeConstructor = DeserializedClassTypeConstructor@399
 }
 
 LazyJavaClassifierType@443['String'] {
     arguments = ArrayList@444[empty]
-    classifier = JavaClassImpl@402['String']
+    classifier = JavaClassImpl@405['String']
     nullable = 'true': Boolean@300
     typeConstructor = DeserializedClassTypeConstructor@399
 }
 
 LazyJavaClassifierType@445['String'] {
     arguments = ArrayList@446[empty]
-    classifier = JavaClassImpl@426['String']
+    classifier = JavaClassImpl@423['String']
     nullable = 'true': Boolean@300
     typeConstructor = DeserializedClassTypeConstructor@399
 }
@@ -796,21 +796,21 @@ LazyJavaClassifierType@508['Throwable'] {
 
 LazyJavaClassifierType@511['Throwable'] {
     arguments = ArrayList@512[empty]
-    classifier = JavaClassImpl@503['Throwable']
+    classifier = JavaClassImpl@507['Throwable']
     nullable = 'true': Boolean@300
     typeConstructor = DeserializedClassTypeConstructor@504
 }
 
 LazyJavaClassifierType@513['Throwable'] {
     arguments = ArrayList@514[empty]
-    classifier = JavaClassImpl@507['Throwable']
+    classifier = JavaClassImpl@510['Throwable']
     nullable = 'true': Boolean@300
     typeConstructor = DeserializedClassTypeConstructor@504
 }
 
 LazyJavaClassifierType@515['Throwable'] {
     arguments = ArrayList@516[empty]
-    classifier = JavaClassImpl@510['Throwable']
+    classifier = JavaClassImpl@503['Throwable']
     nullable = 'true': Boolean@300
     typeConstructor = DeserializedClassTypeConstructor@504
 }
@@ -838,7 +838,7 @@ LazyJavaClassifierType@523['UncaughtExceptionHandler'] {
 
 LazyJavaClassifierType@526['UncaughtExceptionHandler'] {
     arguments = ArrayList@527[empty]
-    classifier = JavaClassImpl@522['UncaughtExceptionHandler']
+    classifier = JavaClassImpl@525['UncaughtExceptionHandler']
     nullable = 'true': Boolean@300
     typeConstructor = LazyJavaClassTypeConstructor@284['UncaughtExceptionHandler']
 }
@@ -852,7 +852,7 @@ LazyJavaClassifierType@528['UncaughtExceptionHandler'] {
 
 LazyJavaClassifierType@530['UncaughtExceptionHandler'] {
     arguments = ArrayList@531[empty]
-    classifier = JavaClassImpl@525['UncaughtExceptionHandler']
+    classifier = JavaClassImpl@522['UncaughtExceptionHandler']
     nullable = 'true': Boolean@300
     typeConstructor = LazyJavaClassTypeConstructor@284['UncaughtExceptionHandler']
 }
@@ -870,7 +870,7 @@ LazyJavaPackageFragmentProvider@532 {
     packageFragments('kotlin.Thread': FqName@545) = null
     packageFragments('kotlin.io': FqName@546) = null
     packageFragments('kotlin.jvm': FqName@547) = null
-    topLevelClasses(JavaClassImpl@303['ClassLoader']) = LazyJavaClassDescriptor@0['ClassLoader']
+    topLevelClasses(JavaClassImpl@306['ClassLoader']) = LazyJavaClassDescriptor@0['ClassLoader']
     topLevelClasses(JavaClassImpl@350['Runnable']) = LazyJavaClassDescriptor@2['Runnable']
     topLevelClasses(JavaClassImpl@548['Thread']) = LazyJavaClassDescriptor@91['Thread']
     topLevelClasses(JavaClassImpl@549['ThreadLocal']) = LazyJavaClassDescriptor@276['ThreadLocal']
@@ -900,23 +900,7 @@ LazyJavaPackageFragment@540['lang'] {
 }
 
 ResolutionTaskHolder@561 {
-    <name not found> = ArrayList@562[13] { ResolutionCandidate@563, ResolutionCandidate@564, ResolutionCandidate@565, ... }
-    <name not found> = ArrayList@566[8] { ResolutionCandidate@563, ResolutionCandidate@564, ResolutionCandidate@567, ... }
-}
-
-ResolutionTaskHolder@568 {
-    <name not found> = ArrayList@569[1] { ResolutionCandidate@570 }
-    <name not found> = ArrayList@571[1] { ResolutionCandidate@570 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
+    <name not found> = ArrayList@562[1] { ResolutionCandidate@563 }
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
@@ -929,18 +913,8 @@ ResolutionTaskHolder@568 {
     <name not found> = EmptyList@6[empty]
 }
 
-ResolutionTaskHolder@572 {
-    <name not found> = ArrayList@573[1] { ResolutionCandidate@574 }
-    <name not found> = ArrayList@575[1] { ResolutionCandidate@574 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
+ResolutionTaskHolder@564 {
+    <name not found> = ArrayList@565[1] { ResolutionCandidate@566 }
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
@@ -952,9 +926,38 @@ ResolutionTaskHolder@572 {
     <name not found> = EmptyList@6[empty]
 }
 
-ResolutionTaskHolder@576 {
-    <name not found> = ArrayList@577[1] { ResolutionCandidate@578 }
-    <name not found> = ArrayList@579[1] { ResolutionCandidate@578 }
+ResolutionTaskHolder@567 {
+    <name not found> = ArrayList@568[1] { ResolutionCandidate@569 }
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+}
+
+ResolutionTaskHolder@570 {
+    <name not found> = ArrayList@571[8] { ResolutionCandidate@572, ResolutionCandidate@573, ResolutionCandidate@574, ... }
+}
+
+null {
+    <name not found> = ArrayList@575[13] { ResolutionCandidate@572, ResolutionCandidate@573, ResolutionCandidate@576, ... }
+    <name not found> = ArrayList@577[1] { ResolutionCandidate@563 }
+    <name not found> = ArrayList@578[1] { ResolutionCandidate@566 }
+    <name not found> = ArrayList@579[1] { ResolutionCandidate@569 }
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
diff --git a/compiler/testData/diagnostics/tests/regressions/kt597.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt597.lazy.log
index e3156a9f320..ff597472d45 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt597.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt597.lazy.log
@@ -114,66 +114,42 @@ LazyJavaPackageFragment@44['lang'] {
 
 ResolutionTaskHolder@70 {
     <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
 }
 
-ResolutionTaskHolder@77 {
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
     <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
 }
 
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
-    <name not found> = EmptyList@62[empty]
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
     <name not found> = EmptyList@62[empty]
 }
 
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
+}
+
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
+}
+
 ResolutionTaskHolder@91 {
     <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
 }
 
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
 }
 
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[2] { ResolutionCandidate@109, ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[2] { ResolutionCandidate@109, ResolutionCandidate@110 }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[2] { ResolutionCandidate@99, ResolutionCandidate@100 }
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
@@ -184,17 +160,8 @@ ResolutionTaskHolder@107 {
     <name not found> = EmptyList@62[empty]
 }
 
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[2] { ResolutionCandidate@114, ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[2] { ResolutionCandidate@114, ResolutionCandidate@115 }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[2] { ResolutionCandidate@103, ResolutionCandidate@104 }
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
     <name not found> = EmptyList@62[empty]
@@ -205,12 +172,48 @@ ResolutionTaskHolder@112 {
     <name not found> = EmptyList@62[empty]
 }
 
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[2] { ResolutionCandidate@119, ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[2] { ResolutionCandidate@119, ResolutionCandidate@120 }
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[2] { ResolutionCandidate@107, ResolutionCandidate@108 }
 }
 
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[2] { ResolutionCandidate@124, ResolutionCandidate@125 }
-    <name not found> = ArrayList@126[2] { ResolutionCandidate@124, ResolutionCandidate@125 }
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[2] { ResolutionCandidate@111, ResolutionCandidate@112 }
+}
+
+null {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@123[2] { ResolutionCandidate@107, ResolutionCandidate@108 }
+    <name not found> = ArrayList@124[2] { ResolutionCandidate@99, ResolutionCandidate@100 }
+    <name not found> = ArrayList@125[2] { ResolutionCandidate@111, ResolutionCandidate@112 }
+    <name not found> = ArrayList@126[2] { ResolutionCandidate@103, ResolutionCandidate@104 }
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt600.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt600.lazy.log
index 86389859288..6a2f3b1277a 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt600.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt600.lazy.log
@@ -118,41 +118,44 @@ LazyJavaPackageFragment@46['lang'] {
 
 ResolutionTaskHolder@72 {
     <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
 }
 
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
 }
 
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
+}
+
 ResolutionTaskHolder@83 {
     <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
 }
 
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[2] { ResolutionCandidate@88, ResolutionCandidate@89 }
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
 }
 
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[2] { ResolutionCandidate@93, ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[2] { ResolutionCandidate@93, ResolutionCandidate@94 }
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
+null {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@95[2] { ResolutionCandidate@88, ResolutionCandidate@89 }
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
     <name not found> = EmptyList@64[empty]
diff --git a/compiler/testData/diagnostics/tests/regressions/kt604.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt604.lazy.log
index 1d5ad8626e5..dd3e958e4f2 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt604.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt604.lazy.log
@@ -50,11 +50,7 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@35 {
     <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -71,13 +67,8 @@ ResolutionTaskHolder@35 {
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -86,6 +77,10 @@ ResolutionTaskHolder@42 {
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
+}
+
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -94,28 +89,36 @@ ResolutionTaskHolder@42 {
 
 ResolutionTaskHolder@46 {
     <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
+null {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@51 }
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt618.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt618.lazy.log
index 0627ffda1fa..28040229fe9 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt618.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt618.lazy.log
@@ -46,12 +46,6 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@37 {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -77,156 +71,113 @@ ResolutionTaskHolder@37 {
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
+}
+
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
 
 ResolutionTaskHolder@49 {
     <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
+}
+
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
 
 ResolutionTaskHolder@61 {
     <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
+}
+
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
 
 ResolutionTaskHolder@73 {
     <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
 }
 
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
+}
+
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
 }
 
 ResolutionTaskHolder@85 {
     <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
+}
+
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
 }
 
 ResolutionTaskHolder@97 {
     <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
 }
 
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
 }
 
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
-}
-
-ResolutionTaskHolder@125 {
+ResolutionTaskHolder@103 {
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -251,6 +202,27 @@ ResolutionTaskHolder@125 {
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
+}
+
+ResolutionTaskHolder@104 {
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -259,13 +231,7 @@ ResolutionTaskHolder@125 {
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@126 {
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@105 {
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -292,13 +258,7 @@ ResolutionTaskHolder@126 {
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@127 {
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@106 {
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -325,7 +285,50 @@ ResolutionTaskHolder@127 {
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@128 {
+null {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@63 }
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
diff --git a/compiler/testData/diagnostics/tests/regressions/kt629.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt629.lazy.log
index 1b681f1f322..f005ecbe550 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt629.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt629.lazy.log
@@ -38,15 +38,6 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
@@ -57,99 +48,71 @@ ResolutionTaskHolder@31 {
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
 
 ResolutionTaskHolder@43 {
     <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
 }
 
 ResolutionTaskHolder@55 {
     <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
+}
+
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
 }
 
 ResolutionTaskHolder@67 {
     <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
 }
 
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
 }
 
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
 }
 
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@76 {
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
@@ -175,3 +138,43 @@ ResolutionTaskHolder@91 {
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
+
+null {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@33 }
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt630.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt630.lazy.log
index e29fc472d59..511de412297 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt630.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt630.lazy.log
@@ -51,21 +51,24 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@37 {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+}
+
+null {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@45 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt688.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt688.lazy.log
index 7cafdf225ee..dc68571be08 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt688.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt688.lazy.log
@@ -48,15 +48,6 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@33 {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
@@ -67,17 +58,8 @@ ResolutionTaskHolder@33 {
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
@@ -88,55 +70,76 @@ ResolutionTaskHolder@37 {
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
+}
+
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
     <name not found> = EmptyList@25[empty]
 }
 
 ResolutionTaskHolder@45 {
     <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
+}
+
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
 }
 
 ResolutionTaskHolder@57 {
     <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+null {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@53 }
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt701.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt701.lazy.log
index 73a5ad1ef2d..c01c8a9d0f2 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt701.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt701.lazy.log
@@ -300,9 +300,26 @@ LazyJavaTypeParameterResolver@168 {
 
 ResolutionTaskHolder@169 {
     <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@171 }
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@174 }
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+}
+
+ResolutionTaskHolder@174 {
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
@@ -311,27 +328,8 @@ ResolutionTaskHolder@169 {
     <name not found> = EmptyList@2[empty]
 }
 
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@178 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
+ResolutionTaskHolder@177 {
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
@@ -354,114 +352,119 @@ ResolutionTaskHolder@176 {
 
 ResolutionTaskHolder@180 {
     <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@182 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
 }
 
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@186 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
+ResolutionTaskHolder@183 {
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
 }
 
-ResolutionTaskHolder@188 {
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@190 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
+ResolutionTaskHolder@186 {
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
+}
+
+ResolutionTaskHolder@189 {
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
 }
 
 ResolutionTaskHolder@192 {
     <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@194 }
 }
 
-ResolutionTaskHolder@196 {
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@198 }
+ResolutionTaskHolder@195 {
+    <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
 }
 
-ResolutionTaskHolder@200 {
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@202 }
+ResolutionTaskHolder@198 {
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
+}
+
+ResolutionTaskHolder@201 {
+    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
 }
 
 ResolutionTaskHolder@204 {
     <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@206 }
 }
 
-ResolutionTaskHolder@208 {
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@210 }
+ResolutionTaskHolder@207 {
+    <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
 }
 
-ResolutionTaskHolder@212 {
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@214 }
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@214 }
+ResolutionTaskHolder@210 {
+    <name not found> = ArrayList@211[1] { ResolutionCandidate@212 }
+}
+
+ResolutionTaskHolder@213 {
+    <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
 }
 
 ResolutionTaskHolder@216 {
     <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@218 }
 }
 
-ResolutionTaskHolder@220 {
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@222 }
-}
-
-ResolutionTaskHolder@224 {
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@226 }
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@226 }
-}
-
-ResolutionTaskHolder@228 {
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@230 }
-}
-
-ResolutionTaskHolder@232 {
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@234 }
+null {
+    <name not found> = ArrayList@219[1] { ResolutionCandidate@191 }
+    <name not found> = ArrayList@220[1] { ResolutionCandidate@171 }
+    <name not found> = ArrayList@221[1] { ResolutionCandidate@173 }
+    <name not found> = ArrayList@222[1] { ResolutionCandidate@209 }
+    <name not found> = ArrayList@223[1] { ResolutionCandidate@212 }
+    <name not found> = ArrayList@224[1] { ResolutionCandidate@194 }
+    <name not found> = ArrayList@225[1] { ResolutionCandidate@206 }
+    <name not found> = ArrayList@226[1] { ResolutionCandidate@215 }
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@203 }
+    <name not found> = ArrayList@228[1] { ResolutionCandidate@218 }
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@188 }
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@197 }
+    <name not found> = ArrayList@231[1] { ResolutionCandidate@176 }
+    <name not found> = ArrayList@232[1] { ResolutionCandidate@185 }
+    <name not found> = ArrayList@233[1] { ResolutionCandidate@200 }
+    <name not found> = ArrayList@234[1] { ResolutionCandidate@179 }
+    <name not found> = ArrayList@235[1] { ResolutionCandidate@182 }
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt716.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt716.lazy.log
index 450f39840d4..7b33ab386a3 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt716.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt716.lazy.log
@@ -180,14 +180,14 @@ LazyJavaClassifierType@114['Class<?>'] {
     typeConstructor = LazyJavaClassTypeConstructor@16['Class']
 }
 
-LazyJavaClassifierType@93['Closeable'] {
+LazyJavaClassifierType@98['Closeable'] {
     arguments = ArrayList@118[empty]
     classifier = JavaClassImpl@119['Closeable']
     memberScope = LazyJavaClassMemberScope@18
     typeConstructor = LazyJavaClassTypeConstructor@20['Closeable']
 }
 
-LazyJavaClassifierType@98['Closeable'] {
+LazyJavaClassifierType@93['Closeable'] {
     arguments = ArrayList@120[empty]
     classifier = JavaClassImpl@121['Closeable']
     memberScope = LazyJavaClassMemberScope@18
@@ -347,7 +347,7 @@ LazyJavaPackageFragmentProvider@167 {
     topLevelClasses(JavaClassImpl@106['Appendable']) = LazyJavaClassDescriptor@4['Appendable']
     topLevelClasses(JavaClassImpl@108['AutoCloseable']) = LazyJavaClassDescriptor@10['AutoCloseable']
     topLevelClasses(JavaClassImpl@198['Class']) = LazyJavaClassDescriptor@14['Class']
-    topLevelClasses(JavaClassImpl@121['Closeable']) = LazyJavaClassDescriptor@17['Closeable']
+    topLevelClasses(JavaClassImpl@119['Closeable']) = LazyJavaClassDescriptor@17['Closeable']
     topLevelClasses(JavaClassImpl@123['FilterOutputStream']) = LazyJavaClassDescriptor@21['FilterOutputStream']
     topLevelClasses(JavaClassImpl@126['GenericDeclaration']) = LazyJavaClassDescriptor@25['GenericDeclaration']
     topLevelClasses(JavaClassImpl@199['Object']) = LazyJavaClassDescriptor@27['Object']
@@ -404,55 +404,58 @@ LazyJavaTypeParameterResolver@222 {
 
 ResolutionTaskHolder@224 {
     <name not found> = ArrayList@225[10] { ResolutionCandidate@226, ResolutionCandidate@227, ResolutionCandidate@228, ... }
-    <name not found> = ArrayList@229[10] { ResolutionCandidate@226, ResolutionCandidate@227, ResolutionCandidate@228, ... }
 }
 
-ResolutionTaskHolder@230 {
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@232 }
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@232 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
+ResolutionTaskHolder@229 {
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
 }
 
-ResolutionTaskHolder@234 {
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@236 }
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@236 }
+ResolutionTaskHolder@232 {
+    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
+}
+
+ResolutionTaskHolder@235 {
+    <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
 }
 
 ResolutionTaskHolder@238 {
     <name not found> = ArrayList@239[1] { ResolutionCandidate@240 }
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@240 }
+    <name not found> = EmptyList@6[empty]
+}
+
+ResolutionTaskHolder@241 {
+    <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
+}
+
+ResolutionTaskHolder@244 {
+    <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
+}
+
+ResolutionTaskHolder@247 {
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
 }
 
-ResolutionTaskHolder@242 {
-    <name not found> = ArrayList@243[1] { ResolutionCandidate@244 }
-    <name not found> = ArrayList@245[1] { ResolutionCandidate@244 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@246 {
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@248 }
-    <name not found> = ArrayList@249[1] { ResolutionCandidate@248 }
-}
-
-ResolutionTaskHolder@250 {
-    <name not found> = ArrayList@251[1] { ResolutionCandidate@252 }
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@252 }
-}
-
-ResolutionTaskHolder@254 {
-    <name not found> = EmptyList@6[empty]
+null {
+    <name not found> = ArrayList@248[10] { ResolutionCandidate@226, ResolutionCandidate@227, ResolutionCandidate@228, ... }
+    <name not found> = ArrayList@249[1] { ResolutionCandidate@243 }
+    <name not found> = ArrayList@250[1] { ResolutionCandidate@246 }
+    <name not found> = ArrayList@251[1] { ResolutionCandidate@234 }
+    <name not found> = ArrayList@252[1] { ResolutionCandidate@237 }
+    <name not found> = ArrayList@253[1] { ResolutionCandidate@240 }
+    <name not found> = ArrayList@254[1] { ResolutionCandidate@231 }
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
diff --git a/compiler/testData/diagnostics/tests/regressions/kt743.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt743.lazy.log
index 5605e3eb8f5..fb4696ec818 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt743.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt743.lazy.log
@@ -53,53 +53,56 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@37 {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
     <name not found> = EmptyList@29[empty]
 }
 
 ResolutionTaskHolder@49 {
     <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
+}
+
+null {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@45 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt750.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt750.lazy.log
index 9f1ea0d26fd..6ee83e6698c 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt750.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt750.lazy.log
@@ -115,14 +115,14 @@ LazyJavaClassifierType@66['AutoCloseable'] {
     typeConstructor = LazyJavaClassTypeConstructor@9['AutoCloseable']
 }
 
-LazyJavaClassifierType@80['Closeable'] {
+LazyJavaClassifierType@75['Closeable'] {
     arguments = ArrayList@86[empty]
     classifier = JavaClassImpl@87['Closeable']
     memberScope = LazyJavaClassMemberScope@11
     typeConstructor = LazyJavaClassTypeConstructor@13['Closeable']
 }
 
-LazyJavaClassifierType@75['Closeable'] {
+LazyJavaClassifierType@80['Closeable'] {
     arguments = ArrayList@88[empty]
     classifier = JavaClassImpl@89['Closeable']
     memberScope = LazyJavaClassMemberScope@11
@@ -178,7 +178,7 @@ LazyJavaClassifierType@110['Integer'] {
 
 LazyJavaClassifierType@113['Integer'] {
     arguments = ArrayList@114[empty]
-    classifier = JavaClassImpl@101['Integer']
+    classifier = JavaClassImpl@106['Integer']
     nullable = 'true': Boolean@115
     typeConstructor = DeserializedClassTypeConstructor@103
 }
@@ -192,14 +192,14 @@ LazyJavaClassifierType@116['Integer'] {
 
 LazyJavaClassifierType@118['Integer'] {
     arguments = ArrayList@119[empty]
-    classifier = JavaClassImpl@112['Integer']
+    classifier = JavaClassImpl@101['Integer']
     nullable = 'true': Boolean@115
     typeConstructor = DeserializedClassTypeConstructor@103
 }
 
 LazyJavaClassifierType@120['Integer'] {
     arguments = ArrayList@121[empty]
-    classifier = JavaClassImpl@106['Integer']
+    classifier = JavaClassImpl@112['Integer']
     nullable = 'true': Boolean@115
     typeConstructor = DeserializedClassTypeConstructor@103
 }
@@ -290,14 +290,14 @@ LazyJavaClassifierType@154['String'] {
 
 LazyJavaClassifierType@157['String'] {
     arguments = ArrayList@158[empty]
-    classifier = JavaClassImpl@149['String']
+    classifier = JavaClassImpl@153['String']
     nullable = 'true': Boolean@115
     typeConstructor = DeserializedClassTypeConstructor@150
 }
 
 LazyJavaClassifierType@159['String'] {
     arguments = ArrayList@160[empty]
-    classifier = JavaClassImpl@153['String']
+    classifier = JavaClassImpl@149['String']
     nullable = 'true': Boolean@115
     typeConstructor = DeserializedClassTypeConstructor@150
 }
@@ -340,7 +340,7 @@ LazyJavaPackageFragmentProvider@163 {
     packageFragments('kotlin.jvm': FqName@195) = null
     topLevelClasses(JavaClassImpl@83['Appendable']) = LazyJavaClassDescriptor@0['Appendable']
     topLevelClasses(JavaClassImpl@85['AutoCloseable']) = LazyJavaClassDescriptor@6['AutoCloseable']
-    topLevelClasses(JavaClassImpl@87['Closeable']) = LazyJavaClassDescriptor@10['Closeable']
+    topLevelClasses(JavaClassImpl@89['Closeable']) = LazyJavaClassDescriptor@10['Closeable']
     topLevelClasses(JavaClassImpl@96['FilterOutputStream']) = LazyJavaClassDescriptor@14['FilterOutputStream']
     topLevelClasses(JavaClassImpl@196['Integer']) = LazyJavaClassDescriptor@18['Integer']
     topLevelClasses(JavaClassImpl@141['OutputStream']) = LazyJavaClassDescriptor@31['OutputStream']
@@ -379,80 +379,58 @@ LazyJavaPackageFragment@178['lang'] {
 
 ResolutionTaskHolder@214 {
     <name not found> = ArrayList@215[10] { ResolutionCandidate@216, ResolutionCandidate@217, ResolutionCandidate@218, ... }
-    <name not found> = ArrayList@219[10] { ResolutionCandidate@216, ResolutionCandidate@217, ResolutionCandidate@218, ... }
 }
 
-ResolutionTaskHolder@220 {
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@222 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
+ResolutionTaskHolder@219 {
+    <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
 }
 
-ResolutionTaskHolder@224 {
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@226 }
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@226 }
-    <name not found> = EmptyList@2[empty]
+ResolutionTaskHolder@222 {
+    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
+}
+
+ResolutionTaskHolder@225 {
+    <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
     <name not found> = EmptyList@2[empty]
 }
 
 ResolutionTaskHolder@228 {
     <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@230 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
 }
 
-ResolutionTaskHolder@232 {
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@234 }
+ResolutionTaskHolder@231 {
+    <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
 }
 
-ResolutionTaskHolder@236 {
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@238 }
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@238 }
+ResolutionTaskHolder@234 {
+    <name not found> = ArrayList@235[1] { ResolutionCandidate@236 }
+}
+
+ResolutionTaskHolder@237 {
+    <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
 }
 
 ResolutionTaskHolder@240 {
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
-    <name not found> = ArrayList@243[1] { ResolutionCandidate@242 }
-}
-
-ResolutionTaskHolder@244 {
-    <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@246 }
-}
-
-ResolutionTaskHolder@248 {
-    <name not found> = ArrayList@249[3] { ResolutionCandidate@250, ResolutionCandidate@251, ResolutionCandidate@252 }
-    <name not found> = ArrayList@253[3] { ResolutionCandidate@250, ResolutionCandidate@251, ResolutionCandidate@252 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
+    <name not found> = ArrayList@241[3] { ResolutionCandidate@242, ResolutionCandidate@243, ResolutionCandidate@244 }
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
 }
 
-ResolutionTaskHolder@254 {
-    <name not found> = ArrayList@255[3] { ResolutionCandidate@256, ResolutionCandidate@257, ResolutionCandidate@258 }
-    <name not found> = ArrayList@259[3] { ResolutionCandidate@256, ResolutionCandidate@257, ResolutionCandidate@258 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
+ResolutionTaskHolder@245 {
+    <name not found> = ArrayList@246[3] { ResolutionCandidate@247, ResolutionCandidate@248, ResolutionCandidate@249 }
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
 }
 
-ResolutionTaskHolder@260 {
-    <name not found> = ArrayList@261[8] { ResolutionCandidate@262, ResolutionCandidate@263, ResolutionCandidate@264, ... }
-    <name not found> = ArrayList@265[8] { ResolutionCandidate@262, ResolutionCandidate@263, ResolutionCandidate@264, ... }
+ResolutionTaskHolder@250 {
+    <name not found> = ArrayList@251[8] { ResolutionCandidate@252, ResolutionCandidate@253, ResolutionCandidate@254, ... }
 }
 
-ResolutionTaskHolder@266 {
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
+ResolutionTaskHolder@255 {
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
@@ -463,9 +441,7 @@ ResolutionTaskHolder@266 {
     <name not found> = EmptyList@2[empty]
 }
 
-ResolutionTaskHolder@267 {
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
+ResolutionTaskHolder@256 {
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
@@ -476,7 +452,34 @@ ResolutionTaskHolder@267 {
     <name not found> = EmptyList@2[empty]
 }
 
-ResolutionTaskHolder@268 {
+ResolutionTaskHolder@257 {
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+}
+
+null {
+    <name not found> = ArrayList@258[10] { ResolutionCandidate@216, ResolutionCandidate@217, ResolutionCandidate@218, ... }
+    <name not found> = ArrayList@259[1] { ResolutionCandidate@230 }
+    <name not found> = ArrayList@260[1] { ResolutionCandidate@224 }
+    <name not found> = ArrayList@261[1] { ResolutionCandidate@239 }
+    <name not found> = ArrayList@262[1] { ResolutionCandidate@221 }
+    <name not found> = ArrayList@263[1] { ResolutionCandidate@227 }
+    <name not found> = ArrayList@264[1] { ResolutionCandidate@233 }
+    <name not found> = ArrayList@265[1] { ResolutionCandidate@236 }
+    <name not found> = ArrayList@266[3] { ResolutionCandidate@242, ResolutionCandidate@243, ResolutionCandidate@244 }
+    <name not found> = ArrayList@267[3] { ResolutionCandidate@247, ResolutionCandidate@248, ResolutionCandidate@249 }
+    <name not found> = ArrayList@268[8] { ResolutionCandidate@252, ResolutionCandidate@253, ResolutionCandidate@254, ... }
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
diff --git a/compiler/testData/diagnostics/tests/regressions/kt847.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt847.lazy.log
index daf42297216..8c21a96acdd 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt847.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt847.lazy.log
@@ -19,5 +19,8 @@ LazyJavaPackageFragment@5['java'] {
 
 ResolutionTaskHolder@19 {
     <name not found> = ArrayList@20[1] { ResolutionCandidate@21 }
+}
+
+null {
     <name not found> = ArrayList@22[1] { ResolutionCandidate@21 }
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt860.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt860.lazy.log
index 298fb817195..37bca5fb81b 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt860.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt860.lazy.log
@@ -107,14 +107,14 @@ LazyJavaClassifierType@70['E'] {
     arguments = ArrayList@71[empty]
     classifier = JavaTypeParameterImpl@72['E']
     nullable = 'false': Boolean@50
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
 }
 
-LazyJavaClassifierType@74['E'] {
-    arguments = ArrayList@75[empty]
-    classifier = JavaTypeParameterImpl@76['E']
+LazyJavaClassifierType@73['E'] {
+    arguments = ArrayList@74[empty]
+    classifier = JavaTypeParameterImpl@75['E']
     nullable = 'false': Boolean@50
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@76
 }
 
 LazyJavaClassifierType@77['E'] {
@@ -126,39 +126,39 @@ LazyJavaClassifierType@77['E'] {
 
 LazyJavaClassifierType@80['E'] {
     arguments = ArrayList@81[empty]
-    classifier = JavaTypeParameterImpl@68['E']
+    classifier = JavaTypeParameterImpl@79['E']
     nullable = 'true': Boolean@56
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
 }
 
 LazyJavaClassifierType@82['E'] {
     arguments = ArrayList@83[empty]
-    classifier = JavaTypeParameterImpl@79['E']
+    classifier = JavaTypeParameterImpl@72['E']
     nullable = 'true': Boolean@56
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
 }
 
 LazyJavaClassifierType@84['E'] {
     arguments = ArrayList@85[empty]
-    classifier = JavaTypeParameterImpl@72['E']
-    nullable = 'true': Boolean@56
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
-}
-
-LazyJavaClassifierType@86['E'] {
-    arguments = ArrayList@87[empty]
-    classifier = JavaTypeParameterImpl@76['E']
+    classifier = JavaTypeParameterImpl@68['E']
     nullable = 'true': Boolean@56
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
 }
 
-LazyJavaClassifierType@88['E'] {
-    arguments = ArrayList@89[empty]
+LazyJavaClassifierType@86['E'] {
+    arguments = ArrayList@87[empty]
     classifier = JavaTypeParameterImpl@64['E']
     nullable = 'true': Boolean@56
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@65
 }
 
+LazyJavaClassifierType@88['E'] {
+    arguments = ArrayList@89[empty]
+    classifier = JavaTypeParameterImpl@75['E']
+    nullable = 'true': Boolean@56
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@76
+}
+
 LazyJavaClassifierType@31['List<E>'] {
     classifier = JavaClassImpl@90['List']
     typeConstructor = DeserializedClassTypeConstructor@91
@@ -275,34 +275,28 @@ LazyJavaTypeParameterDescriptor@28['E'] {
     upperBounds = LinkedHashSet@160[1] { NullableType@161 }
 }
 
+LazyJavaTypeParameterDescriptor@19['E'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@76
+}
+
 LazyJavaTypeParameterDescriptor@23['E'] {
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@65
 }
 
-LazyJavaTypeParameterDescriptor@19['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
-}
-
 LazyJavaTypeParameterResolver@162 {
-    resolve(JavaTypeParameterImpl@163['E']) = LazyJavaTypeParameterDescriptor@19['E']
-}
-
-LazyJavaTypeParameterResolver@164 {
     resolve(JavaTypeParameterImpl@64['E']) = LazyJavaTypeParameterDescriptor@23['E']
 }
 
+LazyJavaTypeParameterResolver@163 {
+    resolve(JavaTypeParameterImpl@164['E']) = LazyJavaTypeParameterDescriptor@28['E']
+}
+
 LazyJavaTypeParameterResolver@165 {
-    resolve(JavaTypeParameterImpl@166['E']) = LazyJavaTypeParameterDescriptor@28['E']
+    resolve(JavaTypeParameterImpl@166['E']) = LazyJavaTypeParameterDescriptor@19['E']
 }
 
 ResolutionTaskHolder@167 {
     <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@169 }
-    <name not found> = EmptyList@146[empty]
-    <name not found> = EmptyList@146[empty]
-    <name not found> = EmptyList@146[empty]
-    <name not found> = EmptyList@146[empty]
-    <name not found> = EmptyList@146[empty]
     <name not found> = EmptyList@146[empty]
     <name not found> = EmptyList@146[empty]
     <name not found> = EmptyList@146[empty]
@@ -310,42 +304,51 @@ ResolutionTaskHolder@167 {
     <name not found> = EmptyList@146[empty]
 }
 
-ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@173 }
-    <name not found> = EmptyList@146[empty]
-    <name not found> = EmptyList@146[empty]
+ResolutionTaskHolder@170 {
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
     <name not found> = EmptyList@146[empty]
     <name not found> = EmptyList@146[empty]
 }
 
-ResolutionTaskHolder@175 {
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@177 }
-    <name not found> = EmptyList@146[empty]
-    <name not found> = EmptyList@146[empty]
+ResolutionTaskHolder@173 {
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
     <name not found> = EmptyList@146[empty]
     <name not found> = EmptyList@146[empty]
 }
 
+ResolutionTaskHolder@176 {
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
+}
+
 ResolutionTaskHolder@179 {
     <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@181 }
 }
 
-ResolutionTaskHolder@183 {
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@185 }
+ResolutionTaskHolder@182 {
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
 }
 
-ResolutionTaskHolder@187 {
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@189 }
+ResolutionTaskHolder@185 {
+    <name not found> = ArrayList@186[3] { ResolutionCandidate@187, ResolutionCandidate@188, ResolutionCandidate@189 }
+    <name not found> = EmptyList@146[empty]
+    <name not found> = EmptyList@146[empty]
+    <name not found> = EmptyList@146[empty]
+    <name not found> = EmptyList@146[empty]
+    <name not found> = EmptyList@146[empty]
+    <name not found> = EmptyList@146[empty]
+    <name not found> = EmptyList@146[empty]
+    <name not found> = EmptyList@146[empty]
 }
 
-ResolutionTaskHolder@191 {
-    <name not found> = ArrayList@192[3] { ResolutionCandidate@193, ResolutionCandidate@194, ResolutionCandidate@195 }
-    <name not found> = ArrayList@196[3] { ResolutionCandidate@193, ResolutionCandidate@194, ResolutionCandidate@195 }
+null {
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@172 }
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@178 }
+    <name not found> = ArrayList@192[1] { ResolutionCandidate@175 }
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@184 }
+    <name not found> = ArrayList@194[1] { ResolutionCandidate@181 }
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@169 }
+    <name not found> = ArrayList@196[3] { ResolutionCandidate@187, ResolutionCandidate@188, ResolutionCandidate@189 }
+    <name not found> = EmptyList@146[empty]
     <name not found> = EmptyList@146[empty]
     <name not found> = EmptyList@146[empty]
     <name not found> = EmptyList@146[empty]
diff --git a/compiler/testData/diagnostics/tests/regressions/resolveSubclassOfList.lazy.log b/compiler/testData/diagnostics/tests/regressions/resolveSubclassOfList.lazy.log
index 999350d72e2..69ce912ac2a 100644
--- a/compiler/testData/diagnostics/tests/regressions/resolveSubclassOfList.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/resolveSubclassOfList.lazy.log
@@ -117,14 +117,14 @@ LazyJavaClassifierType@97['Collection<? extends E>'] {
     typeConstructor = DeserializedClassTypeConstructor@102
 }
 
-LazyJavaClassifierType@71['Collection<E>'] {
+LazyJavaClassifierType@56['Collection<E>'] {
     arguments = ArrayList@103[1] { TypeProjectionImpl@104 }
     classifier = JavaClassImpl@105['Collection']
     memberScope = SubstitutingScope@106
     typeConstructor = DeserializedClassTypeConstructor@96
 }
 
-LazyJavaClassifierType@56['Collection<E>'] {
+LazyJavaClassifierType@71['Collection<E>'] {
     arguments = ArrayList@107[1] { TypeProjectionImpl@108 }
     classifier = JavaClassImpl@109['Collection']
     memberScope = SubstitutingScope@110
@@ -149,210 +149,210 @@ LazyJavaClassifierType@119['E'] {
     arguments = ArrayList@120[empty]
     classifier = JavaTypeParameterImpl@121['E']
     nullable = 'false': Boolean@95
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@122
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@118
 }
 
-LazyJavaClassifierType@123['E'] {
-    arguments = ArrayList@124[empty]
-    classifier = JavaTypeParameterImpl@125['E']
-    nullable = 'false': Boolean@95
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
-}
-
-LazyJavaClassifierType@127['E'] {
-    arguments = ArrayList@128[empty]
-    classifier = JavaTypeParameterImpl@129['E']
-    nullable = 'false': Boolean@95
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
-}
-
-LazyJavaClassifierType@130['E'] {
-    arguments = ArrayList@131[empty]
-    classifier = JavaTypeParameterImpl@132['E']
-    nullable = 'false': Boolean@95
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@122
-}
-
-LazyJavaClassifierType@133['E'] {
-    arguments = ArrayList@134[empty]
-    classifier = JavaTypeParameterImpl@135['E']
-    nullable = 'false': Boolean@95
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@122
-}
-
-LazyJavaClassifierType@136['E'] {
-    arguments = ArrayList@137[empty]
-    classifier = JavaTypeParameterImpl@138['E']
+LazyJavaClassifierType@122['E'] {
+    arguments = ArrayList@123[empty]
+    classifier = JavaTypeParameterImpl@124['E']
     nullable = 'false': Boolean@95
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@118
 }
 
-LazyJavaClassifierType@139['E'] {
-    arguments = ArrayList@140[empty]
-    classifier = JavaTypeParameterImpl@141['E']
+LazyJavaClassifierType@125['E'] {
+    arguments = ArrayList@126[empty]
+    classifier = JavaTypeParameterImpl@127['E']
     nullable = 'false': Boolean@95
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@122
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
 }
 
-LazyJavaClassifierType@142['E'] {
-    arguments = ArrayList@143[empty]
-    classifier = JavaTypeParameterImpl@144['E']
+LazyJavaClassifierType@128['E'] {
+    arguments = ArrayList@129[empty]
+    classifier = JavaTypeParameterImpl@130['E']
     nullable = 'false': Boolean@95
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
 }
 
-LazyJavaClassifierType@145['E'] {
-    arguments = ArrayList@146[empty]
-    classifier = JavaTypeParameterImpl@147['E']
+LazyJavaClassifierType@132['E'] {
+    arguments = ArrayList@133[empty]
+    classifier = JavaTypeParameterImpl@134['E']
     nullable = 'false': Boolean@95
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@118
+}
+
+LazyJavaClassifierType@135['E'] {
+    arguments = ArrayList@136[empty]
+    classifier = JavaTypeParameterImpl@137['E']
+    nullable = 'false': Boolean@95
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@118
+}
+
+LazyJavaClassifierType@138['E'] {
+    arguments = ArrayList@139[empty]
+    classifier = JavaTypeParameterImpl@140['E']
+    nullable = 'false': Boolean@95
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
+}
+
+LazyJavaClassifierType@141['E'] {
+    arguments = ArrayList@142[empty]
+    classifier = JavaTypeParameterImpl@143['E']
+    nullable = 'false': Boolean@95
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
+}
+
+LazyJavaClassifierType@144['E'] {
+    arguments = ArrayList@145[empty]
+    classifier = JavaTypeParameterImpl@146['E']
+    nullable = 'false': Boolean@95
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@147
 }
 
 LazyJavaClassifierType@148['E'] {
     arguments = ArrayList@149[empty]
     classifier = JavaTypeParameterImpl@150['E']
     nullable = 'false': Boolean@95
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@122
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
 }
 
 LazyJavaClassifierType@151['E'] {
     arguments = ArrayList@152[empty]
     classifier = JavaTypeParameterImpl@153['E']
     nullable = 'false': Boolean@95
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@118
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
 }
 
 LazyJavaClassifierType@154['E'] {
     arguments = ArrayList@155[empty]
     classifier = JavaTypeParameterImpl@156['E']
     nullable = 'false': Boolean@95
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@147
 }
 
 LazyJavaClassifierType@157['E'] {
     arguments = ArrayList@158[empty]
     classifier = JavaTypeParameterImpl@159['E']
     nullable = 'false': Boolean@95
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@122
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@147
 }
 
 LazyJavaClassifierType@160['E'] {
     arguments = ArrayList@161[empty]
     classifier = JavaTypeParameterImpl@162['E']
     nullable = 'false': Boolean@95
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@118
 }
 
 LazyJavaClassifierType@163['E'] {
     arguments = ArrayList@164[empty]
-    classifier = JavaTypeParameterImpl@117['E']
+    classifier = JavaTypeParameterImpl@146['E']
     nullable = 'true': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@118
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@147
 }
 
 LazyJavaClassifierType@165['E'] {
     arguments = ArrayList@166[empty]
-    classifier = JavaTypeParameterImpl@162['E']
+    classifier = JavaTypeParameterImpl@137['E']
     nullable = 'true': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@118
 }
 
 LazyJavaClassifierType@167['E'] {
     arguments = ArrayList@168[empty]
-    classifier = JavaTypeParameterImpl@153['E']
+    classifier = JavaTypeParameterImpl@162['E']
     nullable = 'true': Boolean@101
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@118
 }
 
 LazyJavaClassifierType@169['E'] {
     arguments = ArrayList@170[empty]
-    classifier = JavaTypeParameterImpl@129['E']
+    classifier = JavaTypeParameterImpl@150['E']
     nullable = 'true': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
 }
 
 LazyJavaClassifierType@171['E'] {
     arguments = ArrayList@172[empty]
-    classifier = JavaTypeParameterImpl@113['E']
+    classifier = JavaTypeParameterImpl@140['E']
     nullable = 'true': Boolean@101
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
 }
 
 LazyJavaClassifierType@173['E'] {
     arguments = ArrayList@174[empty]
-    classifier = JavaTypeParameterImpl@150['E']
+    classifier = JavaTypeParameterImpl@130['E']
     nullable = 'true': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@122
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
 }
 
 LazyJavaClassifierType@175['E'] {
     arguments = ArrayList@176[empty]
     classifier = JavaTypeParameterImpl@159['E']
     nullable = 'true': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@122
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@147
 }
 
 LazyJavaClassifierType@177['E'] {
     arguments = ArrayList@178[empty]
-    classifier = JavaTypeParameterImpl@144['E']
-    nullable = 'true': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
-}
-
-LazyJavaClassifierType@179['E'] {
-    arguments = ArrayList@180[empty]
-    classifier = JavaTypeParameterImpl@132['E']
-    nullable = 'true': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@122
-}
-
-LazyJavaClassifierType@181['E'] {
-    arguments = ArrayList@182[empty]
-    classifier = JavaTypeParameterImpl@156['E']
-    nullable = 'true': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
-}
-
-LazyJavaClassifierType@183['E'] {
-    arguments = ArrayList@184[empty]
-    classifier = JavaTypeParameterImpl@138['E']
+    classifier = JavaTypeParameterImpl@124['E']
     nullable = 'true': Boolean@101
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@118
 }
 
+LazyJavaClassifierType@179['E'] {
+    arguments = ArrayList@180[empty]
+    classifier = JavaTypeParameterImpl@117['E']
+    nullable = 'true': Boolean@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@118
+}
+
+LazyJavaClassifierType@181['E'] {
+    arguments = ArrayList@182[empty]
+    classifier = JavaTypeParameterImpl@121['E']
+    nullable = 'true': Boolean@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@118
+}
+
+LazyJavaClassifierType@183['E'] {
+    arguments = ArrayList@184[empty]
+    classifier = JavaTypeParameterImpl@156['E']
+    nullable = 'true': Boolean@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@147
+}
+
 LazyJavaClassifierType@185['E'] {
     arguments = ArrayList@186[empty]
-    classifier = JavaTypeParameterImpl@141['E']
+    classifier = JavaTypeParameterImpl@143['E']
     nullable = 'true': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@122
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
 }
 
 LazyJavaClassifierType@187['E'] {
     arguments = ArrayList@188[empty]
-    classifier = JavaTypeParameterImpl@125['E']
+    classifier = JavaTypeParameterImpl@127['E']
     nullable = 'true': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
 }
 
 LazyJavaClassifierType@189['E'] {
     arguments = ArrayList@190[empty]
-    classifier = JavaTypeParameterImpl@135['E']
+    classifier = JavaTypeParameterImpl@153['E']
     nullable = 'true': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@122
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
 }
 
 LazyJavaClassifierType@191['E'] {
     arguments = ArrayList@192[empty]
-    classifier = JavaTypeParameterImpl@147['E']
+    classifier = JavaTypeParameterImpl@134['E']
     nullable = 'true': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@118
 }
 
 LazyJavaClassifierType@193['E'] {
     arguments = ArrayList@194[empty]
-    classifier = JavaTypeParameterImpl@121['E']
+    classifier = JavaTypeParameterImpl@113['E']
     nullable = 'true': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@122
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
 }
 
 LazyJavaClassifierType@195['Iterator<E>'] {
@@ -397,7 +397,7 @@ LazyJavaClassifierType@216['Iterator<E>'] {
 
 LazyJavaClassifierType@221['Iterator<E>'] {
     arguments = ArrayList@222[1] { TypeProjectionImpl@223 }
-    classifier = JavaClassImpl@214['Iterator']
+    classifier = JavaClassImpl@209['Iterator']
     memberScope = SubstitutingScope@224
     nullable = 'true': Boolean@101
     typeConstructor = DeserializedClassTypeConstructor@220
@@ -413,20 +413,20 @@ LazyJavaClassifierType@225['Iterator<E>'] {
 
 LazyJavaClassifierType@229['Iterator<E>'] {
     arguments = ArrayList@230[1] { TypeProjectionImpl@231 }
-    classifier = JavaClassImpl@209['Iterator']
+    classifier = JavaClassImpl@214['Iterator']
     memberScope = SubstitutingScope@232
     nullable = 'true': Boolean@101
     typeConstructor = DeserializedClassTypeConstructor@220
 }
 
-LazyJavaClassifierType@61['List<E>'] {
+LazyJavaClassifierType@66['List<E>'] {
     arguments = ArrayList@233[1] { TypeProjectionImpl@234 }
     classifier = JavaClassImpl@235['List']
     memberScope = SubstitutingScope@236
     typeConstructor = DeserializedClassTypeConstructor@237
 }
 
-LazyJavaClassifierType@66['List<E>'] {
+LazyJavaClassifierType@61['List<E>'] {
     arguments = ArrayList@238[1] { TypeProjectionImpl@239 }
     classifier = JavaClassImpl@240['List']
     memberScope = SubstitutingScope@241
@@ -519,35 +519,35 @@ LazyJavaPackageFragment@266['util'] {
     memberIndex = computeMemberIndex$1@296 // through LazyPackageFragmentScopeForJavaPackage@293
 }
 
-LazyJavaTypeParameterDescriptor@54['E'] {
+LazyJavaTypeParameterDescriptor@58['E'] {
     defaultType = JetTypeImpl@297['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@118
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
     upperBounds = LinkedHashSet@298[1] { NullableType@299 }
     upperBoundsAsType = NullableType@299
 }
 
-LazyJavaTypeParameterDescriptor@58['E'] {
+LazyJavaTypeParameterDescriptor@69['E'] {
     defaultType = JetTypeImpl@300['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@147
     upperBounds = LinkedHashSet@301[1] { NullableType@302 }
     upperBoundsAsType = NullableType@302
 }
 
-LazyJavaTypeParameterDescriptor@69['E'] {
+LazyJavaTypeParameterDescriptor@54['E'] {
     defaultType = JetTypeImpl@303['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
     upperBounds = LinkedHashSet@304[1] { NullableType@305 }
     upperBoundsAsType = NullableType@305
 }
 
 LazyJavaTypeParameterDescriptor@63['E'] {
     defaultType = JetTypeImpl@306['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@122
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@118
     upperBounds = LinkedHashSet@307[1] { NullableType@308 }
 }
 
 LazyJavaTypeParameterResolver@309 {
-    resolve(JavaTypeParameterImpl@310['E']) = LazyJavaTypeParameterDescriptor@63['E']
+    resolve(JavaTypeParameterImpl@310['E']) = LazyJavaTypeParameterDescriptor@54['E']
 }
 
 LazyJavaTypeParameterResolver@311 {
@@ -555,11 +555,11 @@ LazyJavaTypeParameterResolver@311 {
 }
 
 LazyJavaTypeParameterResolver@313 {
-    resolve(JavaTypeParameterImpl@314['E']) = LazyJavaTypeParameterDescriptor@58['E']
+    resolve(JavaTypeParameterImpl@314['E']) = LazyJavaTypeParameterDescriptor@63['E']
 }
 
 LazyJavaTypeParameterResolver@315 {
-    resolve(JavaTypeParameterImpl@316['E']) = LazyJavaTypeParameterDescriptor@54['E']
+    resolve(JavaTypeParameterImpl@316['E']) = LazyJavaTypeParameterDescriptor@58['E']
 }
 
 LazyJavaTypeParameterResolver@317 {
@@ -567,37 +567,40 @@ LazyJavaTypeParameterResolver@317 {
 }
 
 LazyJavaTypeParameterResolver@318 {
-    resolve(JavaTypeParameterImpl@113['E']) = null
+    resolve(JavaTypeParameterImpl@156['E']) = null
 }
 
 LazyJavaTypeParameterResolver@319 {
-    resolve(JavaTypeParameterImpl@135['E']) = null
+    resolve(JavaTypeParameterImpl@127['E']) = null
 }
 
 LazyJavaTypeParameterResolver@320 {
-    resolve(JavaTypeParameterImpl@129['E']) = null
+    resolve(JavaTypeParameterImpl@117['E']) = null
 }
 
 ResolutionTaskHolder@321 {
     <name not found> = ArrayList@322[1] { ResolutionCandidate@323 }
-    <name not found> = ArrayList@324[1] { ResolutionCandidate@323 }
 }
 
-ResolutionTaskHolder@325 {
-    <name not found> = ArrayList@326[1] { ResolutionCandidate@327 }
-    <name not found> = ArrayList@328[1] { ResolutionCandidate@327 }
+ResolutionTaskHolder@324 {
+    <name not found> = ArrayList@325[1] { ResolutionCandidate@326 }
 }
 
-ResolutionTaskHolder@329 {
-    <name not found> = ArrayList@330[1] { ResolutionCandidate@331 }
-    <name not found> = ArrayList@332[1] { ResolutionCandidate@331 }
+ResolutionTaskHolder@327 {
+    <name not found> = ArrayList@328[1] { ResolutionCandidate@329 }
 }
 
-ResolutionTaskHolder@333 {
-    <name not found> = ArrayList@334[3] { ResolutionCandidate@335, ResolutionCandidate@336, ResolutionCandidate@337 }
-    <name not found> = ArrayList@338[3] { ResolutionCandidate@335, ResolutionCandidate@336, ResolutionCandidate@337 }
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
+ResolutionTaskHolder@330 {
+    <name not found> = ArrayList@331[3] { ResolutionCandidate@332, ResolutionCandidate@333, ResolutionCandidate@334 }
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+}
+
+null {
+    <name not found> = ArrayList@335[1] { ResolutionCandidate@329 }
+    <name not found> = ArrayList@336[1] { ResolutionCandidate@326 }
+    <name not found> = ArrayList@337[1] { ResolutionCandidate@323 }
+    <name not found> = ArrayList@338[3] { ResolutionCandidate@332, ResolutionCandidate@333, ResolutionCandidate@334 }
     <name not found> = EmptyList@45[empty]
     <name not found> = EmptyList@45[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/resolve/ambiguityOnPropertiesWithTheSamePackageName.lazy.log b/compiler/testData/diagnostics/tests/resolve/ambiguityOnPropertiesWithTheSamePackageName.lazy.log
index 162b8e5e9f5..4f7524d0b4b 100644
--- a/compiler/testData/diagnostics/tests/resolve/ambiguityOnPropertiesWithTheSamePackageName.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/ambiguityOnPropertiesWithTheSamePackageName.lazy.log
@@ -39,10 +39,13 @@ LazyJavaPackageFragment@20['lang'] {
 
 ResolutionTaskHolder@36 {
     <name not found> = ArrayList@37[2] { ResolutionCandidate@38, ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[2] { ResolutionCandidate@38, ResolutionCandidate@39 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+}
+
+null {
+    <name not found> = ArrayList@40[2] { ResolutionCandidate@38, ResolutionCandidate@39 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
diff --git a/compiler/testData/diagnostics/tests/resolve/incompleteConstructorInvocation.lazy.log b/compiler/testData/diagnostics/tests/resolve/incompleteConstructorInvocation.lazy.log
index a2345e192cd..776f89aed03 100644
--- a/compiler/testData/diagnostics/tests/resolve/incompleteConstructorInvocation.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/incompleteConstructorInvocation.lazy.log
@@ -42,18 +42,6 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@36 {
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
@@ -102,3 +90,18 @@ ResolutionTaskHolder@36 {
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
+
+null {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/KT-4372.lazy.log b/compiler/testData/diagnostics/tests/resolve/invoke/KT-4372.lazy.log
index a475e749d71..7bf7f8ecd7e 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/KT-4372.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/KT-4372.lazy.log
@@ -141,21 +141,21 @@ LazyJavaClassifierType@78['String'] {
 
 LazyJavaClassifierType@81['String'] {
     arguments = ArrayList@82[empty]
-    classifier = JavaClassImpl@72['String']
+    classifier = JavaClassImpl@80['String']
     nullable = 'true': Boolean@83
     typeConstructor = DeserializedClassTypeConstructor@74
 }
 
 LazyJavaClassifierType@84['String'] {
     arguments = ArrayList@85[empty]
-    classifier = JavaClassImpl@80['String']
+    classifier = JavaClassImpl@77['String']
     nullable = 'true': Boolean@83
     typeConstructor = DeserializedClassTypeConstructor@74
 }
 
 LazyJavaClassifierType@86['String'] {
     arguments = ArrayList@87[empty]
-    classifier = JavaClassImpl@77['String']
+    classifier = JavaClassImpl@72['String']
     nullable = 'true': Boolean@83
     typeConstructor = DeserializedClassTypeConstructor@74
 }
@@ -302,11 +302,8 @@ LazyJavaTypeParameterResolver@167 {
 
 ResolutionTaskHolder@169 {
     <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@171 }
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@177 }
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
@@ -323,6 +320,17 @@ ResolutionTaskHolder@169 {
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
+}
+
+ResolutionTaskHolder@176 {
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
@@ -343,12 +351,6 @@ ResolutionTaskHolder@169 {
 
 ResolutionTaskHolder@179 {
     <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@181 }
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
@@ -374,14 +376,8 @@ ResolutionTaskHolder@179 {
     <name not found> = EmptyList@4[empty]
 }
 
-ResolutionTaskHolder@183 {
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@185 }
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
+ResolutionTaskHolder@182 {
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
@@ -407,14 +403,8 @@ ResolutionTaskHolder@183 {
     <name not found> = EmptyList@4[empty]
 }
 
-ResolutionTaskHolder@187 {
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@189 }
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
+ResolutionTaskHolder@185 {
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
@@ -440,50 +430,8 @@ ResolutionTaskHolder@187 {
     <name not found> = EmptyList@4[empty]
 }
 
-ResolutionTaskHolder@191 {
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@193 }
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@193 }
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-}
-
-ResolutionTaskHolder@195 {
-    <name not found> = ArrayList@196[4] { ResolutionCandidate@197, ResolutionCandidate@198, ResolutionCandidate@199, ... }
-    <name not found> = ArrayList@200[5] { ResolutionCandidate@197, ResolutionCandidate@198, ResolutionCandidate@199, ... }
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
+ResolutionTaskHolder@188 {
+    <name not found> = ArrayList@189[4] { ResolutionCandidate@190, ResolutionCandidate@191, ResolutionCandidate@192, ... }
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
@@ -494,9 +442,64 @@ ResolutionTaskHolder@195 {
     <name not found> = EmptyList@4[empty]
 }
 
-ResolutionTaskHolder@201 {
-    <name not found> = ArrayList@202[4] { ResolutionCandidate@203, ResolutionCandidate@204, ResolutionCandidate@205, ... }
-    <name not found> = ArrayList@206[5] { ResolutionCandidate@203, ResolutionCandidate@204, ResolutionCandidate@205, ... }
+ResolutionTaskHolder@193 {
+    <name not found> = ArrayList@194[4] { ResolutionCandidate@195, ResolutionCandidate@196, ResolutionCandidate@197, ... }
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+}
+
+null {
+    <name not found> = ArrayList@198[1] { ResolutionCandidate@171 }
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@181 }
+    <name not found> = ArrayList@200[1] { ResolutionCandidate@184 }
+    <name not found> = ArrayList@201[1] { ResolutionCandidate@173 }
+    <name not found> = ArrayList@202[1] { ResolutionCandidate@178 }
+    <name not found> = ArrayList@203[1] { ResolutionCandidate@187 }
+    <name not found> = ArrayList@204[1] { ResolutionCandidate@175 }
+    <name not found> = ArrayList@205[5] { ResolutionCandidate@190, ResolutionCandidate@191, ResolutionCandidate@192, ... }
+    <name not found> = ArrayList@206[5] { ResolutionCandidate@195, ResolutionCandidate@196, ResolutionCandidate@197, ... }
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/errors/ambiguityForInvoke.lazy.log b/compiler/testData/diagnostics/tests/resolve/invoke/errors/ambiguityForInvoke.lazy.log
index 6feba7c5be7..60ac279fae7 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/errors/ambiguityForInvoke.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/errors/ambiguityForInvoke.lazy.log
@@ -42,21 +42,24 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@30 {
     <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[2] { ResolutionCandidate@36, ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[2] { ResolutionCandidate@36, ResolutionCandidate@37 }
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[2] { ResolutionCandidate@35, ResolutionCandidate@36 }
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[2] { ResolutionCandidate@41, ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[2] { ResolutionCandidate@41, ResolutionCandidate@42 }
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[2] { ResolutionCandidate@39, ResolutionCandidate@40 }
+    <name not found> = EmptyList@22[empty]
+}
+
+null {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@42[2] { ResolutionCandidate@39, ResolutionCandidate@40 }
+    <name not found> = ArrayList@43[2] { ResolutionCandidate@35, ResolutionCandidate@36 }
+    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/errors/invisibleInvoke.lazy.log b/compiler/testData/diagnostics/tests/resolve/invoke/errors/invisibleInvoke.lazy.log
index 8911b3f5603..46a7f03e4b0 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/errors/invisibleInvoke.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/errors/invisibleInvoke.lazy.log
@@ -45,19 +45,7 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@33 {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
@@ -106,9 +94,8 @@ ResolutionTaskHolder@33 {
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
@@ -124,6 +111,22 @@ ResolutionTaskHolder@40 {
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
+}
+
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
@@ -131,10 +134,6 @@ ResolutionTaskHolder@40 {
 
 ResolutionTaskHolder@44 {
     <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
@@ -152,12 +151,8 @@ ResolutionTaskHolder@44 {
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
@@ -175,9 +170,17 @@ ResolutionTaskHolder@48 {
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+null {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@43 }
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/errors/receiverPresenceErrorForInvoke.lazy.log b/compiler/testData/diagnostics/tests/resolve/invoke/errors/receiverPresenceErrorForInvoke.lazy.log
index 1fa0030a1f6..30b8a273abe 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/errors/receiverPresenceErrorForInvoke.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/errors/receiverPresenceErrorForInvoke.lazy.log
@@ -46,12 +46,6 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@34 {
     <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
@@ -77,12 +71,8 @@ ResolutionTaskHolder@34 {
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
@@ -100,9 +90,8 @@ ResolutionTaskHolder@38 {
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
@@ -114,14 +103,21 @@ ResolutionTaskHolder@42 {
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
+}
+
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
 ResolutionTaskHolder@46 {
     <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
@@ -131,43 +127,50 @@ ResolutionTaskHolder@46 {
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
 }
 
 ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@67 {
+ResolutionTaskHolder@59 {
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+}
+
+null {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@54 }
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/errors/typeInferenceErrorForInvoke.lazy.log b/compiler/testData/diagnostics/tests/resolve/invoke/errors/typeInferenceErrorForInvoke.lazy.log
index 73291e11706..3b0bbb3458b 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/errors/typeInferenceErrorForInvoke.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/errors/typeInferenceErrorForInvoke.lazy.log
@@ -48,10 +48,6 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@36 {
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
@@ -69,10 +65,8 @@ ResolutionTaskHolder@36 {
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@28[empty]
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
@@ -82,9 +76,8 @@ ResolutionTaskHolder@40 {
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
@@ -92,27 +85,37 @@ ResolutionTaskHolder@44 {
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
+}
+
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
     <name not found> = EmptyList@28[empty]
 }
 
 ResolutionTaskHolder@48 {
     <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+}
+
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
+}
+
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+}
+
+null {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@41 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
-}
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/errors/unresolvedInvoke.lazy.log b/compiler/testData/diagnostics/tests/resolve/invoke/errors/unresolvedInvoke.lazy.log
index b95ae248ef2..17f49e7a22b 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/errors/unresolvedInvoke.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/errors/unresolvedInvoke.lazy.log
@@ -38,10 +38,6 @@ LazyJavaPackageFragment@7['lang'] {
 
 ResolutionTaskHolder@26 {
     <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
@@ -59,14 +55,11 @@ ResolutionTaskHolder@26 {
     <name not found> = EmptyList@18[empty]
 }
 
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
+ResolutionTaskHolder@29 {
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
 }
 
-ResolutionTaskHolder@34 {
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
+ResolutionTaskHolder@32 {
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
@@ -77,9 +70,7 @@ ResolutionTaskHolder@34 {
     <name not found> = EmptyList@18[empty]
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
+ResolutionTaskHolder@33 {
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
@@ -89,3 +80,15 @@ ResolutionTaskHolder@35 {
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
 }
+
+null {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@28 }
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@31 }
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/errors/unsafeCallWithInvoke.lazy.log b/compiler/testData/diagnostics/tests/resolve/invoke/errors/unsafeCallWithInvoke.lazy.log
index e3a1ad95f4a..f22f1803cac 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/errors/unsafeCallWithInvoke.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/errors/unsafeCallWithInvoke.lazy.log
@@ -42,10 +42,6 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@30 {
     <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
@@ -63,10 +59,8 @@ ResolutionTaskHolder@30 {
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
@@ -76,10 +70,8 @@ ResolutionTaskHolder@34 {
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
@@ -89,12 +81,23 @@ ResolutionTaskHolder@38 {
     <name not found> = EmptyList@22[empty]
 }
 
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+}
+
 ResolutionTaskHolder@42 {
     <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+null {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@35 }
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverForInvokeOnExpression.lazy.log b/compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverForInvokeOnExpression.lazy.log
index 61a1518d461..0ff5da9660d 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverForInvokeOnExpression.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverForInvokeOnExpression.lazy.log
@@ -42,23 +42,27 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@33 {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+}
+
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
@@ -66,41 +70,40 @@ ResolutionTaskHolder@41 {
 
 ResolutionTaskHolder@45 {
     <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
+}
+
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
 }
 
 ResolutionTaskHolder@57 {
     <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+null {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@44 }
 }
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverTypeForInvoke.lazy.log b/compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverTypeForInvoke.lazy.log
index 8bda2c8b35f..3ce73078bfd 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverTypeForInvoke.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverTypeForInvoke.lazy.log
@@ -42,10 +42,6 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@30 {
     <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
@@ -63,10 +59,8 @@ ResolutionTaskHolder@30 {
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
@@ -76,10 +70,8 @@ ResolutionTaskHolder@34 {
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
@@ -88,3 +80,14 @@ ResolutionTaskHolder@38 {
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
+
+null {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@38 }
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/invokeAsExtension.lazy.log b/compiler/testData/diagnostics/tests/resolve/invoke/invokeAsExtension.lazy.log
index 64cead587ad..7a21eccbcbb 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/invokeAsExtension.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/invokeAsExtension.lazy.log
@@ -68,9 +68,7 @@ LazyJavaPackageFragment@14['lang'] {
 
 ResolutionTaskHolder@47 {
     <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
@@ -79,9 +77,8 @@ ResolutionTaskHolder@47 {
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
@@ -90,6 +87,10 @@ ResolutionTaskHolder@54 {
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
@@ -102,15 +103,6 @@ ResolutionTaskHolder@54 {
 
 ResolutionTaskHolder@58 {
     <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
@@ -121,17 +113,8 @@ ResolutionTaskHolder@58 {
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
@@ -142,10 +125,8 @@ ResolutionTaskHolder@62 {
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
@@ -154,6 +135,10 @@ ResolutionTaskHolder@66 {
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
+}
+
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
@@ -165,52 +150,29 @@ ResolutionTaskHolder@66 {
 
 ResolutionTaskHolder@70 {
     <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
+}
+
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
@@ -218,34 +180,27 @@ ResolutionTaskHolder@78 {
 
 ResolutionTaskHolder@82 {
     <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
+}
+
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+}
+
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
@@ -253,238 +208,286 @@ ResolutionTaskHolder@90 {
 
 ResolutionTaskHolder@94 {
     <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
+}
+
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
 ResolutionTaskHolder@106 {
     <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
+}
+
+ResolutionTaskHolder@115 {
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
 ResolutionTaskHolder@118 {
     <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@121 {
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@124 {
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
     <name not found> = EmptyList@39[empty]
+}
+
+ResolutionTaskHolder@127 {
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
     <name not found> = EmptyList@39[empty]
 }
 
 ResolutionTaskHolder@130 {
     <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@132 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@136 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@133 {
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@140 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@136 {
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
+}
+
+ResolutionTaskHolder@139 {
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
 }
 
 ResolutionTaskHolder@142 {
     <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@144 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@146 {
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@148 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@145 {
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
 }
 
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@152 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@148 {
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
+}
+
+ResolutionTaskHolder@151 {
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
 }
 
 ResolutionTaskHolder@154 {
     <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@156 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@158 {
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@160 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@157 {
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
 }
 
-ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@164 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@160 {
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
+}
+
+ResolutionTaskHolder@163 {
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
 }
 
 ResolutionTaskHolder@166 {
     <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@168 }
 }
 
-ResolutionTaskHolder@170 {
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@172 }
-}
-
-ResolutionTaskHolder@174 {
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@176 }
-}
-
-ResolutionTaskHolder@178 {
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@180 }
-}
-
-ResolutionTaskHolder@182 {
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@184 }
-}
-
-ResolutionTaskHolder@186 {
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@188 }
-}
-
-ResolutionTaskHolder@190 {
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@192 }
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@192 }
-}
-
-ResolutionTaskHolder@194 {
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@196 }
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@196 }
-}
-
-ResolutionTaskHolder@198 {
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@200 }
-}
-
-ResolutionTaskHolder@202 {
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@204 }
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@204 }
-}
-
-ResolutionTaskHolder@206 {
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@208 }
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@208 }
-}
-
-ResolutionTaskHolder@210 {
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@169 {
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@211 {
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@170 {
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@212 {
+ResolutionTaskHolder@171 {
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+}
+
+null {
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@129 }
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@156 }
+    <name not found> = ArrayList@176[1] { ResolutionCandidate@132 }
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@126 }
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@135 }
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@159 }
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@189[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@147 }
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@192[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@194[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@153 }
+    <name not found> = ArrayList@196[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@197[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@198[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@200[1] { ResolutionCandidate@141 }
+    <name not found> = ArrayList@201[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@202[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@203[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@204[1] { ResolutionCandidate@162 }
+    <name not found> = ArrayList@205[1] { ResolutionCandidate@168 }
+    <name not found> = ArrayList@206[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@207[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@208[1] { ResolutionCandidate@165 }
+    <name not found> = ArrayList@209[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@210[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@211[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@212[1] { ResolutionCandidate@90 }
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/invokeAsMember.lazy.log b/compiler/testData/diagnostics/tests/resolve/invoke/invokeAsMember.lazy.log
index f30f310815b..b18a5560487 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/invokeAsMember.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/invokeAsMember.lazy.log
@@ -68,15 +68,6 @@ LazyJavaPackageFragment@14['lang'] {
 
 ResolutionTaskHolder@47 {
     <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
@@ -87,17 +78,8 @@ ResolutionTaskHolder@47 {
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
@@ -108,9 +90,8 @@ ResolutionTaskHolder@51 {
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
@@ -119,6 +100,10 @@ ResolutionTaskHolder@55 {
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
+}
+
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
@@ -131,15 +116,6 @@ ResolutionTaskHolder@55 {
 
 ResolutionTaskHolder@59 {
     <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
@@ -150,18 +126,8 @@ ResolutionTaskHolder@59 {
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
@@ -171,12 +137,8 @@ ResolutionTaskHolder@63 {
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
@@ -184,6 +146,10 @@ ResolutionTaskHolder@67 {
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
+}
+
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
@@ -192,38 +158,28 @@ ResolutionTaskHolder@67 {
 
 ResolutionTaskHolder@71 {
     <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
+}
+
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
@@ -231,210 +187,257 @@ ResolutionTaskHolder@79 {
 
 ResolutionTaskHolder@83 {
     <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
+}
+
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
     <name not found> = EmptyList@39[empty]
 }
 
 ResolutionTaskHolder@95 {
     <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
 }
 
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
+}
+
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
 }
 
 ResolutionTaskHolder@107 {
     <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@113 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
 }
 
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@117 }
+ResolutionTaskHolder@113 {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
+}
+
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
 }
 
 ResolutionTaskHolder@119 {
     <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@121 }
 }
 
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@125 }
+ResolutionTaskHolder@122 {
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
 }
 
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@129 }
+ResolutionTaskHolder@125 {
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
+}
+
+ResolutionTaskHolder@128 {
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
 }
 
 ResolutionTaskHolder@131 {
     <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@133 }
 }
 
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@137 }
+ResolutionTaskHolder@134 {
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
 }
 
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@141 }
+ResolutionTaskHolder@137 {
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
+}
+
+ResolutionTaskHolder@140 {
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
 }
 
 ResolutionTaskHolder@143 {
     <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@145 }
 }
 
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@149 }
+ResolutionTaskHolder@146 {
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
 }
 
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@153 }
+ResolutionTaskHolder@149 {
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
+}
+
+ResolutionTaskHolder@152 {
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
 }
 
 ResolutionTaskHolder@155 {
     <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@157 }
 }
 
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@161 }
+ResolutionTaskHolder@158 {
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
 }
 
-ResolutionTaskHolder@163 {
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@165 }
+ResolutionTaskHolder@161 {
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
+}
+
+ResolutionTaskHolder@164 {
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
 }
 
 ResolutionTaskHolder@167 {
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@169 }
-}
-
-ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@173 }
-}
-
-ResolutionTaskHolder@175 {
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@177 }
-}
-
-ResolutionTaskHolder@179 {
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@181 }
-}
-
-ResolutionTaskHolder@183 {
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@185 }
-}
-
-ResolutionTaskHolder@187 {
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@189 }
-}
-
-ResolutionTaskHolder@191 {
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@193 }
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@193 }
-}
-
-ResolutionTaskHolder@195 {
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@197 }
-}
-
-ResolutionTaskHolder@199 {
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@201 }
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@201 }
-}
-
-ResolutionTaskHolder@203 {
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@205 }
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@205 }
-}
-
-ResolutionTaskHolder@207 {
-    <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@208 {
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@168 {
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@209 {
+ResolutionTaskHolder@169 {
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+}
+
+null {
+    <name not found> = ArrayList@170[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@136 }
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@124 }
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@176[1] { ResolutionCandidate@142 }
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@145 }
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@139 }
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@127 }
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@148 }
+    <name not found> = ArrayList@189[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@133 }
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@192[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@166 }
+    <name not found> = ArrayList@194[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@196[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@197[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@198[1] { ResolutionCandidate@154 }
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@200[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@201[1] { ResolutionCandidate@163 }
+    <name not found> = ArrayList@202[1] { ResolutionCandidate@160 }
+    <name not found> = ArrayList@203[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@204[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@205[1] { ResolutionCandidate@157 }
+    <name not found> = ArrayList@206[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@207[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@208[1] { ResolutionCandidate@151 }
+    <name not found> = ArrayList@209[1] { ResolutionCandidate@112 }
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/invokeAsMemberExtension.lazy.log b/compiler/testData/diagnostics/tests/resolve/invoke/invokeAsMemberExtension.lazy.log
index 1a8a5580689..dd0e1aa80a7 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/invokeAsMemberExtension.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/invokeAsMemberExtension.lazy.log
@@ -84,25 +84,6 @@ LazyJavaPackageFragment@20['lang'] {
 
 ResolutionTaskHolder@63 {
     <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
@@ -123,27 +104,8 @@ ResolutionTaskHolder@63 {
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
@@ -164,9 +126,8 @@ ResolutionTaskHolder@67 {
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
@@ -176,6 +137,10 @@ ResolutionTaskHolder@71 {
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
@@ -189,16 +154,6 @@ ResolutionTaskHolder@71 {
 
 ResolutionTaskHolder@75 {
     <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
@@ -210,18 +165,8 @@ ResolutionTaskHolder@75 {
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
@@ -233,11 +178,8 @@ ResolutionTaskHolder@79 {
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
@@ -246,6 +188,10 @@ ResolutionTaskHolder@83 {
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
@@ -258,15 +204,6 @@ ResolutionTaskHolder@83 {
 
 ResolutionTaskHolder@87 {
     <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
@@ -277,17 +214,8 @@ ResolutionTaskHolder@87 {
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
@@ -298,9 +226,8 @@ ResolutionTaskHolder@91 {
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
@@ -309,6 +236,10 @@ ResolutionTaskHolder@95 {
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
@@ -321,15 +252,6 @@ ResolutionTaskHolder@95 {
 
 ResolutionTaskHolder@99 {
     <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
@@ -340,17 +262,8 @@ ResolutionTaskHolder@99 {
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
@@ -361,9 +274,8 @@ ResolutionTaskHolder@103 {
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
@@ -372,6 +284,10 @@ ResolutionTaskHolder@107 {
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
@@ -384,16 +300,6 @@ ResolutionTaskHolder@107 {
 
 ResolutionTaskHolder@111 {
     <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@113 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
@@ -403,20 +309,8 @@ ResolutionTaskHolder@111 {
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@117 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
@@ -424,20 +318,17 @@ ResolutionTaskHolder@115 {
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@121 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@120 {
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
@@ -447,33 +338,6 @@ ResolutionTaskHolder@119 {
 
 ResolutionTaskHolder@123 {
     <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@125 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@129 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
@@ -481,59 +345,52 @@ ResolutionTaskHolder@127 {
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@133 }
+ResolutionTaskHolder@126 {
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@129 {
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@132 {
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
+    <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
 
 ResolutionTaskHolder@135 {
     <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@137 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@141 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@138 {
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@145 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@141 {
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@144 {
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
@@ -541,477 +398,623 @@ ResolutionTaskHolder@143 {
 
 ResolutionTaskHolder@147 {
     <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@149 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@153 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@150 {
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@155 {
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@157 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@153 {
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@156 {
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
 
 ResolutionTaskHolder@159 {
     <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@161 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@163 {
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@165 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@162 {
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@167 {
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@169 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@165 {
+    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@168 {
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
 
 ResolutionTaskHolder@171 {
     <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@173 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@175 {
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@177 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@174 {
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@179 {
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@181 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@177 {
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@180 {
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
 
 ResolutionTaskHolder@183 {
     <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@185 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@187 {
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@189 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@186 {
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@191 {
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@193 }
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@193 }
+ResolutionTaskHolder@189 {
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@192 {
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
 
 ResolutionTaskHolder@195 {
     <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@197 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@199 {
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@201 }
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@201 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@198 {
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@203 {
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@205 }
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@205 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@201 {
+    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
     <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@204 {
+    <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
     <name not found> = EmptyList@55[empty]
 }
 
 ResolutionTaskHolder@207 {
     <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@209 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@211 {
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@213 }
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@213 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@210 {
+    <name not found> = ArrayList@211[1] { ResolutionCandidate@212 }
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@215 {
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@217 }
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@217 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@213 {
+    <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
     <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@216 {
+    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
     <name not found> = EmptyList@55[empty]
 }
 
 ResolutionTaskHolder@219 {
     <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@221 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@223 {
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@225 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@222 {
+    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@227 {
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@229 }
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@229 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@225 {
+    <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
     <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@228 {
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
     <name not found> = EmptyList@55[empty]
 }
 
 ResolutionTaskHolder@231 {
     <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@233 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@235 {
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@237 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@234 {
+    <name not found> = ArrayList@235[1] { ResolutionCandidate@236 }
 }
 
-ResolutionTaskHolder@239 {
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@241 }
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@241 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@237 {
+    <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
+}
+
+ResolutionTaskHolder@240 {
+    <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
 }
 
 ResolutionTaskHolder@243 {
     <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@245 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@247 {
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@249 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@246 {
+    <name not found> = ArrayList@247[1] { ResolutionCandidate@248 }
 }
 
-ResolutionTaskHolder@251 {
-    <name not found> = ArrayList@252[1] { ResolutionCandidate@253 }
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@253 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@249 {
+    <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
+}
+
+ResolutionTaskHolder@252 {
+    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
 }
 
 ResolutionTaskHolder@255 {
     <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
-    <name not found> = ArrayList@258[1] { ResolutionCandidate@257 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@259 {
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@261 }
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@261 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@258 {
+    <name not found> = ArrayList@259[1] { ResolutionCandidate@260 }
 }
 
-ResolutionTaskHolder@263 {
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@265 }
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@265 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@261 {
+    <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
+}
+
+ResolutionTaskHolder@264 {
+    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
 }
 
 ResolutionTaskHolder@267 {
     <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
-    <name not found> = ArrayList@270[1] { ResolutionCandidate@269 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@271 {
-    <name not found> = ArrayList@272[1] { ResolutionCandidate@273 }
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@273 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@270 {
+    <name not found> = ArrayList@271[1] { ResolutionCandidate@272 }
 }
 
-ResolutionTaskHolder@275 {
-    <name not found> = ArrayList@276[1] { ResolutionCandidate@277 }
-    <name not found> = ArrayList@278[1] { ResolutionCandidate@277 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@273 {
+    <name not found> = ArrayList@274[1] { ResolutionCandidate@275 }
+}
+
+ResolutionTaskHolder@276 {
+    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
 }
 
 ResolutionTaskHolder@279 {
     <name not found> = ArrayList@280[1] { ResolutionCandidate@281 }
-    <name not found> = ArrayList@282[1] { ResolutionCandidate@281 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@283 {
-    <name not found> = ArrayList@284[1] { ResolutionCandidate@285 }
-    <name not found> = ArrayList@286[1] { ResolutionCandidate@285 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@282 {
+    <name not found> = ArrayList@283[1] { ResolutionCandidate@284 }
 }
 
-ResolutionTaskHolder@287 {
-    <name not found> = ArrayList@288[1] { ResolutionCandidate@289 }
-    <name not found> = ArrayList@290[1] { ResolutionCandidate@289 }
+ResolutionTaskHolder@285 {
+    <name not found> = ArrayList@286[1] { ResolutionCandidate@287 }
+}
+
+ResolutionTaskHolder@288 {
+    <name not found> = ArrayList@289[1] { ResolutionCandidate@290 }
 }
 
 ResolutionTaskHolder@291 {
     <name not found> = ArrayList@292[1] { ResolutionCandidate@293 }
-    <name not found> = ArrayList@294[1] { ResolutionCandidate@293 }
 }
 
-ResolutionTaskHolder@295 {
-    <name not found> = ArrayList@296[1] { ResolutionCandidate@297 }
-    <name not found> = ArrayList@298[1] { ResolutionCandidate@297 }
+ResolutionTaskHolder@294 {
+    <name not found> = ArrayList@295[1] { ResolutionCandidate@296 }
 }
 
-ResolutionTaskHolder@299 {
-    <name not found> = ArrayList@300[1] { ResolutionCandidate@301 }
-    <name not found> = ArrayList@302[1] { ResolutionCandidate@301 }
+ResolutionTaskHolder@297 {
+    <name not found> = ArrayList@298[1] { ResolutionCandidate@299 }
 }
 
-ResolutionTaskHolder@303 {
-    <name not found> = ArrayList@304[1] { ResolutionCandidate@305 }
-    <name not found> = ArrayList@306[1] { ResolutionCandidate@305 }
-}
-
-ResolutionTaskHolder@307 {
-    <name not found> = ArrayList@308[1] { ResolutionCandidate@309 }
-    <name not found> = ArrayList@310[1] { ResolutionCandidate@309 }
-}
-
-ResolutionTaskHolder@311 {
-    <name not found> = ArrayList@312[1] { ResolutionCandidate@313 }
-    <name not found> = ArrayList@314[1] { ResolutionCandidate@313 }
-}
-
-ResolutionTaskHolder@315 {
-    <name not found> = ArrayList@316[1] { ResolutionCandidate@317 }
-    <name not found> = ArrayList@318[1] { ResolutionCandidate@317 }
-}
-
-ResolutionTaskHolder@319 {
-    <name not found> = ArrayList@320[1] { ResolutionCandidate@321 }
-    <name not found> = ArrayList@322[1] { ResolutionCandidate@321 }
-}
-
-ResolutionTaskHolder@323 {
-    <name not found> = ArrayList@324[1] { ResolutionCandidate@325 }
-    <name not found> = ArrayList@326[1] { ResolutionCandidate@325 }
-}
-
-ResolutionTaskHolder@327 {
-    <name not found> = ArrayList@328[1] { ResolutionCandidate@329 }
-    <name not found> = ArrayList@330[1] { ResolutionCandidate@329 }
-}
-
-ResolutionTaskHolder@331 {
-    <name not found> = ArrayList@332[1] { ResolutionCandidate@333 }
-    <name not found> = ArrayList@334[1] { ResolutionCandidate@333 }
-}
-
-ResolutionTaskHolder@335 {
-    <name not found> = ArrayList@336[1] { ResolutionCandidate@337 }
-    <name not found> = ArrayList@338[1] { ResolutionCandidate@337 }
-}
-
-ResolutionTaskHolder@339 {
-    <name not found> = ArrayList@340[1] { ResolutionCandidate@341 }
-    <name not found> = ArrayList@342[1] { ResolutionCandidate@341 }
-}
-
-ResolutionTaskHolder@343 {
-    <name not found> = ArrayList@344[1] { ResolutionCandidate@345 }
-    <name not found> = ArrayList@346[1] { ResolutionCandidate@345 }
-}
-
-ResolutionTaskHolder@347 {
-    <name not found> = ArrayList@348[1] { ResolutionCandidate@349 }
-    <name not found> = ArrayList@350[1] { ResolutionCandidate@349 }
-}
-
-ResolutionTaskHolder@351 {
-    <name not found> = ArrayList@352[1] { ResolutionCandidate@353 }
-    <name not found> = ArrayList@354[1] { ResolutionCandidate@353 }
-}
-
-ResolutionTaskHolder@355 {
-    <name not found> = ArrayList@356[1] { ResolutionCandidate@357 }
-    <name not found> = ArrayList@358[1] { ResolutionCandidate@357 }
-}
-
-ResolutionTaskHolder@359 {
-    <name not found> = ArrayList@360[1] { ResolutionCandidate@361 }
-    <name not found> = ArrayList@362[1] { ResolutionCandidate@361 }
-}
-
-ResolutionTaskHolder@363 {
-    <name not found> = ArrayList@364[1] { ResolutionCandidate@365 }
-    <name not found> = ArrayList@366[1] { ResolutionCandidate@365 }
-}
-
-ResolutionTaskHolder@367 {
-    <name not found> = ArrayList@368[1] { ResolutionCandidate@369 }
-    <name not found> = ArrayList@370[1] { ResolutionCandidate@369 }
-}
-
-ResolutionTaskHolder@371 {
-    <name not found> = ArrayList@372[1] { ResolutionCandidate@373 }
-    <name not found> = ArrayList@374[1] { ResolutionCandidate@373 }
-}
-
-ResolutionTaskHolder@375 {
-    <name not found> = ArrayList@376[1] { ResolutionCandidate@377 }
-    <name not found> = ArrayList@378[1] { ResolutionCandidate@377 }
-}
-
-ResolutionTaskHolder@379 {
+ResolutionTaskHolder@300 {
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@301 {
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@302 {
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@380 {
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@303 {
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@381 {
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@304 {
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@382 {
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@305 {
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@383 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@384 {
+null {
+    <name not found> = ArrayList@306[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@307[1] { ResolutionCandidate@260 }
+    <name not found> = ArrayList@308[1] { ResolutionCandidate@182 }
+    <name not found> = ArrayList@309[1] { ResolutionCandidate@251 }
+    <name not found> = ArrayList@310[1] { ResolutionCandidate@227 }
+    <name not found> = ArrayList@311[1] { ResolutionCandidate@218 }
+    <name not found> = ArrayList@312[1] { ResolutionCandidate@266 }
+    <name not found> = ArrayList@313[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@314[1] { ResolutionCandidate@134 }
+    <name not found> = ArrayList@315[1] { ResolutionCandidate@170 }
+    <name not found> = ArrayList@316[1] { ResolutionCandidate@278 }
+    <name not found> = ArrayList@317[1] { ResolutionCandidate@179 }
+    <name not found> = ArrayList@318[1] { ResolutionCandidate@257 }
+    <name not found> = ArrayList@319[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@320[1] { ResolutionCandidate@206 }
+    <name not found> = ArrayList@321[1] { ResolutionCandidate@236 }
+    <name not found> = ArrayList@322[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@323[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@324[1] { ResolutionCandidate@173 }
+    <name not found> = ArrayList@325[1] { ResolutionCandidate@191 }
+    <name not found> = ArrayList@326[1] { ResolutionCandidate@242 }
+    <name not found> = ArrayList@327[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@328[1] { ResolutionCandidate@287 }
+    <name not found> = ArrayList@329[1] { ResolutionCandidate@128 }
+    <name not found> = ArrayList@330[1] { ResolutionCandidate@230 }
+    <name not found> = ArrayList@331[1] { ResolutionCandidate@233 }
+    <name not found> = ArrayList@332[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@333[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@334[1] { ResolutionCandidate@197 }
+    <name not found> = ArrayList@335[1] { ResolutionCandidate@188 }
+    <name not found> = ArrayList@336[1] { ResolutionCandidate@299 }
+    <name not found> = ArrayList@337[1] { ResolutionCandidate@167 }
+    <name not found> = ArrayList@338[1] { ResolutionCandidate@248 }
+    <name not found> = ArrayList@339[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@340[1] { ResolutionCandidate@239 }
+    <name not found> = ArrayList@341[1] { ResolutionCandidate@125 }
+    <name not found> = ArrayList@342[1] { ResolutionCandidate@155 }
+    <name not found> = ArrayList@343[1] { ResolutionCandidate@275 }
+    <name not found> = ArrayList@344[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@345[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@346[1] { ResolutionCandidate@137 }
+    <name not found> = ArrayList@347[1] { ResolutionCandidate@140 }
+    <name not found> = ArrayList@348[1] { ResolutionCandidate@245 }
+    <name not found> = ArrayList@349[1] { ResolutionCandidate@149 }
+    <name not found> = ArrayList@350[1] { ResolutionCandidate@113 }
+    <name not found> = ArrayList@351[1] { ResolutionCandidate@263 }
+    <name not found> = ArrayList@352[1] { ResolutionCandidate@209 }
+    <name not found> = ArrayList@353[1] { ResolutionCandidate@224 }
+    <name not found> = ArrayList@354[1] { ResolutionCandidate@254 }
+    <name not found> = ArrayList@355[1] { ResolutionCandidate@215 }
+    <name not found> = ArrayList@356[1] { ResolutionCandidate@203 }
+    <name not found> = ArrayList@357[1] { ResolutionCandidate@269 }
+    <name not found> = ArrayList@358[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@359[1] { ResolutionCandidate@143 }
+    <name not found> = ArrayList@360[1] { ResolutionCandidate@200 }
+    <name not found> = ArrayList@361[1] { ResolutionCandidate@296 }
+    <name not found> = ArrayList@362[1] { ResolutionCandidate@122 }
+    <name not found> = ArrayList@363[1] { ResolutionCandidate@221 }
+    <name not found> = ArrayList@364[1] { ResolutionCandidate@281 }
+    <name not found> = ArrayList@365[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@366[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@367[1] { ResolutionCandidate@185 }
+    <name not found> = ArrayList@368[1] { ResolutionCandidate@194 }
+    <name not found> = ArrayList@369[1] { ResolutionCandidate@290 }
+    <name not found> = ArrayList@370[1] { ResolutionCandidate@131 }
+    <name not found> = ArrayList@371[1] { ResolutionCandidate@212 }
+    <name not found> = ArrayList@372[1] { ResolutionCandidate@272 }
+    <name not found> = ArrayList@373[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@374[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@375[1] { ResolutionCandidate@176 }
+    <name not found> = ArrayList@376[1] { ResolutionCandidate@161 }
+    <name not found> = ArrayList@377[1] { ResolutionCandidate@284 }
+    <name not found> = ArrayList@378[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@379[1] { ResolutionCandidate@164 }
+    <name not found> = ArrayList@380[1] { ResolutionCandidate@293 }
+    <name not found> = ArrayList@381[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@382[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@383[1] { ResolutionCandidate@146 }
+    <name not found> = ArrayList@384[1] { ResolutionCandidate@152 }
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/invokeAsMemberExtensionToExplicitReceiver.lazy.log b/compiler/testData/diagnostics/tests/resolve/invoke/invokeAsMemberExtensionToExplicitReceiver.lazy.log
index 54bd43977a8..0240d4bc063 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/invokeAsMemberExtensionToExplicitReceiver.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/invokeAsMemberExtensionToExplicitReceiver.lazy.log
@@ -48,8 +48,6 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@36 {
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
@@ -59,10 +57,8 @@ ResolutionTaskHolder@36 {
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@28[empty]
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
@@ -72,12 +68,15 @@ ResolutionTaskHolder@40 {
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
+}
+
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
@@ -85,31 +84,35 @@ ResolutionTaskHolder@44 {
 
 ResolutionTaskHolder@48 {
     <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+null {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@50 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/kt3772.lazy.log b/compiler/testData/diagnostics/tests/resolve/invoke/kt3772.lazy.log
index 757981519e7..6ea642b4158 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/kt3772.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/kt3772.lazy.log
@@ -61,15 +61,6 @@ LazyJavaPackageFragment@22['lang'] {
 
 ResolutionTaskHolder@53 {
     <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
@@ -80,17 +71,8 @@ ResolutionTaskHolder@53 {
     <name not found> = EmptyList@44[empty]
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
     <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
@@ -101,79 +83,100 @@ ResolutionTaskHolder@57 {
     <name not found> = EmptyList@44[empty]
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@44[empty]
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
     <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
+}
+
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
     <name not found> = EmptyList@44[empty]
 }
 
 ResolutionTaskHolder@65 {
     <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
+}
+
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
 }
 
 ResolutionTaskHolder@77 {
     <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
 }
 
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
 }
 
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[2] { ResolutionCandidate@95, ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[2] { ResolutionCandidate@95, ResolutionCandidate@96 }
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[2] { ResolutionCandidate@85, ResolutionCandidate@86 }
     <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
+}
+
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[2] { ResolutionCandidate@89, ResolutionCandidate@90 }
+    <name not found> = EmptyList@44[empty]
+}
+
+ResolutionTaskHolder@91 {
+    <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
 }
 
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[2] { ResolutionCandidate@100, ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[2] { ResolutionCandidate@100, ResolutionCandidate@101 }
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = EmptyList@44[empty]
+ResolutionTaskHolder@92 {
     <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
 }
 
-ResolutionTaskHolder@104 {
+null {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@103[2] { ResolutionCandidate@85, ResolutionCandidate@86 }
+    <name not found> = ArrayList@104[2] { ResolutionCandidate@89, ResolutionCandidate@90 }
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
     <name not found> = EmptyList@44[empty]
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/kt3833-invokeInsideNestedClass.lazy.log b/compiler/testData/diagnostics/tests/resolve/invoke/kt3833-invokeInsideNestedClass.lazy.log
index 636871b811c..af0fb1bb307 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/kt3833-invokeInsideNestedClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/kt3833-invokeInsideNestedClass.lazy.log
@@ -42,25 +42,6 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@36 {
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -81,18 +62,8 @@ ResolutionTaskHolder@36 {
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -104,46 +75,78 @@ ResolutionTaskHolder@40 {
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
     <name not found> = EmptyList@29[empty]
 }
 
 ResolutionTaskHolder@48 {
     <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
+}
+
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+}
+
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
+}
+
+null {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@53 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
-}
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/kt4204-completeNestedCallsForInvoke.lazy.log b/compiler/testData/diagnostics/tests/resolve/invoke/kt4204-completeNestedCallsForInvoke.lazy.log
index c3f41cb1d80..c26ed030d49 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/kt4204-completeNestedCallsForInvoke.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/kt4204-completeNestedCallsForInvoke.lazy.log
@@ -45,63 +45,44 @@ LazyJavaPackageFragment@16['lang'] {
 
 ResolutionTaskHolder@39 {
     <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
+    <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
 ResolutionTaskHolder@50 {
     <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+}
+
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
 }
 
 ResolutionTaskHolder@62 {
     <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@65 {
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -119,3 +100,25 @@ ResolutionTaskHolder@74 {
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
+
+null {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@64 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/kt4321InvokeOnEnum.lazy.log b/compiler/testData/diagnostics/tests/resolve/invoke/kt4321InvokeOnEnum.lazy.log
index 9010234c66e..0ac53abd309 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/kt4321InvokeOnEnum.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/kt4321InvokeOnEnum.lazy.log
@@ -53,74 +53,52 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@41 {
     <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
     <name not found> = EmptyList@32[empty]
 }
 
 ResolutionTaskHolder@53 {
     <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
+}
+
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
 }
 
 ResolutionTaskHolder@65 {
     <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@68 {
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -131,9 +109,7 @@ ResolutionTaskHolder@77 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@69 {
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -144,7 +120,34 @@ ResolutionTaskHolder@78 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@79 {
+ResolutionTaskHolder@70 {
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+}
+
+null {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@58 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/valNamedInvoke.lazy.log b/compiler/testData/diagnostics/tests/resolve/invoke/valNamedInvoke.lazy.log
index 2a94f7dfa2b..fb6311b4cf8 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/valNamedInvoke.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/valNamedInvoke.lazy.log
@@ -41,8 +41,6 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@32 {
     <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -52,10 +50,8 @@ ResolutionTaskHolder@32 {
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -65,12 +61,15 @@ ResolutionTaskHolder@36 {
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
+}
+
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -78,31 +77,35 @@ ResolutionTaskHolder@40 {
 
 ResolutionTaskHolder@44 {
     <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+null {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@52 }
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/resolve/nestedCalls/analyzeArgsInFreeExpressionPosition.lazy.log b/compiler/testData/diagnostics/tests/resolve/nestedCalls/analyzeArgsInFreeExpressionPosition.lazy.log
index e7166b0a3d6..76c833af05c 100644
--- a/compiler/testData/diagnostics/tests/resolve/nestedCalls/analyzeArgsInFreeExpressionPosition.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/nestedCalls/analyzeArgsInFreeExpressionPosition.lazy.log
@@ -39,35 +39,38 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
     <name not found> = EmptyList@20[empty]
 }
 
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
+}
+
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+null {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@30 }
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/resolve/nestedCalls/analyzeUnmappedArguments.lazy.log b/compiler/testData/diagnostics/tests/resolve/nestedCalls/analyzeUnmappedArguments.lazy.log
index e2f09a8d49a..efc7b5da212 100644
--- a/compiler/testData/diagnostics/tests/resolve/nestedCalls/analyzeUnmappedArguments.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/nestedCalls/analyzeUnmappedArguments.lazy.log
@@ -46,18 +46,6 @@ LazyJavaPackageFragment@15['lang'] {
 
 ResolutionTaskHolder@37 {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -107,10 +95,8 @@ ResolutionTaskHolder@37 {
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -120,37 +106,54 @@ ResolutionTaskHolder@41 {
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
 ResolutionTaskHolder@49 {
     <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+null {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@57 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/resolve/nestedCalls/argumentsInParentheses.lazy.log b/compiler/testData/diagnostics/tests/resolve/nestedCalls/argumentsInParentheses.lazy.log
index 000435af5d2..48eda5eb98b 100644
--- a/compiler/testData/diagnostics/tests/resolve/nestedCalls/argumentsInParentheses.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/nestedCalls/argumentsInParentheses.lazy.log
@@ -38,21 +38,21 @@ LazyJavaClassifierType@22['String'] {
 
 LazyJavaClassifierType@25['String'] {
     arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@21['String']
+    classifier = JavaClassImpl@24['String']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@18
 }
 
 LazyJavaClassifierType@28['String'] {
     arguments = ArrayList@29[empty]
-    classifier = JavaClassImpl@24['String']
+    classifier = JavaClassImpl@16['String']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@18
 }
 
 LazyJavaClassifierType@30['String'] {
     arguments = ArrayList@31[empty]
-    classifier = JavaClassImpl@16['String']
+    classifier = JavaClassImpl@21['String']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@18
 }
@@ -87,14 +87,14 @@ LazyJavaClassifierType@42['Throwable'] {
 
 LazyJavaClassifierType@44['Throwable'] {
     arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@34['Throwable']
+    classifier = JavaClassImpl@41['Throwable']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@35
 }
 
 LazyJavaClassifierType@46['Throwable'] {
     arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@41['Throwable']
+    classifier = JavaClassImpl@34['Throwable']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@35
 }
@@ -166,15 +166,6 @@ LazyJavaPackageFragment@61['lang'] {
 
 ResolutionTaskHolder@91 {
     <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
@@ -185,169 +176,181 @@ ResolutionTaskHolder@91 {
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
-    <name not found> = EmptyList@83[empty]
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
+}
+
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
+    <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
 }
 
 ResolutionTaskHolder@103 {
     <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@113 }
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
+}
+
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
 }
 
 ResolutionTaskHolder@115 {
     <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@117 }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@121 }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
+ResolutionTaskHolder@118 {
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@125 }
+ResolutionTaskHolder@121 {
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
     <name not found> = EmptyList@83[empty]
+}
+
+ResolutionTaskHolder@124 {
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
     <name not found> = EmptyList@83[empty]
 }
 
 ResolutionTaskHolder@127 {
     <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@129 }
-    <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@133 }
-    <name not found> = EmptyList@83[empty]
+ResolutionTaskHolder@130 {
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@137 }
-    <name not found> = EmptyList@83[empty]
+ResolutionTaskHolder@133 {
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
     <name not found> = EmptyList@83[empty]
 }
 
+ResolutionTaskHolder@136 {
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
+}
+
 ResolutionTaskHolder@139 {
     <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@141 }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@145 }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
+ResolutionTaskHolder@142 {
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
 }
 
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@149 }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
+ResolutionTaskHolder@145 {
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
+}
+
+ResolutionTaskHolder@148 {
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
 }
 
 ResolutionTaskHolder@151 {
     <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@153 }
 }
 
-ResolutionTaskHolder@155 {
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@157 }
+ResolutionTaskHolder@154 {
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
 }
 
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@161 }
+ResolutionTaskHolder@157 {
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
+}
+
+ResolutionTaskHolder@160 {
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
 }
 
 ResolutionTaskHolder@163 {
     <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@165 }
 }
 
-ResolutionTaskHolder@167 {
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@169 }
+ResolutionTaskHolder@166 {
+    <name not found> = ArrayList@167[4] { ResolutionCandidate@168, ResolutionCandidate@169, ResolutionCandidate@170, ... }
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@173 }
-}
-
-ResolutionTaskHolder@175 {
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@177 }
-}
-
-ResolutionTaskHolder@179 {
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@181 }
-}
-
-ResolutionTaskHolder@183 {
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@185 }
-}
-
-ResolutionTaskHolder@187 {
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@189 }
-}
-
-ResolutionTaskHolder@191 {
-    <name not found> = ArrayList@192[4] { ResolutionCandidate@193, ResolutionCandidate@194, ResolutionCandidate@195, ... }
-    <name not found> = ArrayList@196[5] { ResolutionCandidate@193, ResolutionCandidate@194, ResolutionCandidate@195, ... }
+null {
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@153 }
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@132 }
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@165 }
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@176[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@162 }
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@135 }
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@141 }
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@159 }
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@129 }
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@189[1] { ResolutionCandidate@147 }
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@126 }
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@156 }
+    <name not found> = ArrayList@192[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@194[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@196[5] { ResolutionCandidate@168, ResolutionCandidate@169, ResolutionCandidate@170, ... }
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
diff --git a/compiler/testData/diagnostics/tests/resolve/nestedCalls/completeTypeInferenceForNestedInNoneApplicable.lazy.log b/compiler/testData/diagnostics/tests/resolve/nestedCalls/completeTypeInferenceForNestedInNoneApplicable.lazy.log
index 2fcff4500f9..1214480e07c 100644
--- a/compiler/testData/diagnostics/tests/resolve/nestedCalls/completeTypeInferenceForNestedInNoneApplicable.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/nestedCalls/completeTypeInferenceForNestedInNoneApplicable.lazy.log
@@ -38,21 +38,21 @@ LazyJavaClassifierType@22['String'] {
 
 LazyJavaClassifierType@25['String'] {
     arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@21['String']
+    classifier = JavaClassImpl@16['String']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@18
 }
 
 LazyJavaClassifierType@28['String'] {
     arguments = ArrayList@29[empty]
-    classifier = JavaClassImpl@24['String']
+    classifier = JavaClassImpl@21['String']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@18
 }
 
 LazyJavaClassifierType@30['String'] {
     arguments = ArrayList@31[empty]
-    classifier = JavaClassImpl@16['String']
+    classifier = JavaClassImpl@24['String']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@18
 }
@@ -80,14 +80,14 @@ LazyJavaClassifierType@39['Throwable'] {
 
 LazyJavaClassifierType@42['Throwable'] {
     arguments = ArrayList@43[empty]
-    classifier = JavaClassImpl@34['Throwable']
+    classifier = JavaClassImpl@41['Throwable']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@35
 }
 
 LazyJavaClassifierType@44['Throwable'] {
     arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@41['Throwable']
+    classifier = JavaClassImpl@34['Throwable']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@35
 }
@@ -152,29 +152,20 @@ LazyJavaPackageFragment@65['lang'] {
 
 ResolutionTaskHolder@89 {
     <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
 }
 
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
 }
 
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[2] { ResolutionCandidate@103, ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[2] { ResolutionCandidate@103, ResolutionCandidate@104 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[2] { ResolutionCandidate@100, ResolutionCandidate@101 }
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
@@ -192,9 +183,21 @@ ResolutionTaskHolder@101 {
     <name not found> = EmptyList@82[empty]
 }
 
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[4] { ResolutionCandidate@108, ResolutionCandidate@109, ResolutionCandidate@110, ... }
-    <name not found> = ArrayList@111[5] { ResolutionCandidate@108, ResolutionCandidate@109, ResolutionCandidate@110, ... }
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[4] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+}
+
+null {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@110[2] { ResolutionCandidate@100, ResolutionCandidate@101 }
+    <name not found> = ArrayList@111[5] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
diff --git a/compiler/testData/diagnostics/tests/resolve/nestedCalls/completeUnmappedArguments.lazy.log b/compiler/testData/diagnostics/tests/resolve/nestedCalls/completeUnmappedArguments.lazy.log
index a8a6a5c8c84..7dac128259d 100644
--- a/compiler/testData/diagnostics/tests/resolve/nestedCalls/completeUnmappedArguments.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/nestedCalls/completeUnmappedArguments.lazy.log
@@ -37,7 +37,7 @@ LazyJavaClassifierType@21['String'] {
 
 LazyJavaClassifierType@24['String'] {
     arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@15['String']
+    classifier = JavaClassImpl@23['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -51,7 +51,7 @@ LazyJavaClassifierType@27['String'] {
 
 LazyJavaClassifierType@29['String'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@23['String']
+    classifier = JavaClassImpl@15['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -79,14 +79,14 @@ LazyJavaClassifierType@38['Throwable'] {
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@33['Throwable']
+    classifier = JavaClassImpl@40['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@43['Throwable'] {
     arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@40['Throwable']
+    classifier = JavaClassImpl@33['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -141,10 +141,6 @@ LazyJavaPackageFragment@58['lang'] {
 
 ResolutionTaskHolder@77 {
     <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]
@@ -162,12 +158,8 @@ ResolutionTaskHolder@77 {
     <name not found> = EmptyList@69[empty]
 }
 
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
     <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]
@@ -185,10 +177,8 @@ ResolutionTaskHolder@81 {
     <name not found> = EmptyList@69[empty]
 }
 
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@69[empty]
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
     <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]
@@ -204,78 +194,91 @@ ResolutionTaskHolder@85 {
     <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]
+}
+
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
     <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]
 }
 
 ResolutionTaskHolder@89 {
     <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
 }
 
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
+}
+
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
 }
 
 ResolutionTaskHolder@101 {
     <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
 }
 
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
 }
 
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
+}
+
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
 }
 
 ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[4] { ResolutionCandidate@127, ResolutionCandidate@128, ResolutionCandidate@129, ... }
-    <name not found> = ArrayList@130[5] { ResolutionCandidate@127, ResolutionCandidate@128, ResolutionCandidate@129, ... }
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
+    <name not found> = ArrayList@114[4] { ResolutionCandidate@115, ResolutionCandidate@116, ResolutionCandidate@117, ... }
     <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]
 }
 
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[8] { ResolutionCandidate@133, ResolutionCandidate@134, ResolutionCandidate@135, ... }
-    <name not found> = ArrayList@136[8] { ResolutionCandidate@133, ResolutionCandidate@134, ResolutionCandidate@135, ... }
+ResolutionTaskHolder@118 {
+    <name not found> = ArrayList@119[8] { ResolutionCandidate@120, ResolutionCandidate@121, ResolutionCandidate@122, ... }
 }
 
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[8] { ResolutionCandidate@139, ResolutionCandidate@140, ResolutionCandidate@141, ... }
-    <name not found> = ArrayList@142[8] { ResolutionCandidate@139, ResolutionCandidate@140, ResolutionCandidate@141, ... }
+ResolutionTaskHolder@123 {
+    <name not found> = ArrayList@124[8] { ResolutionCandidate@125, ResolutionCandidate@126, ResolutionCandidate@127, ... }
+}
+
+null {
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@140[5] { ResolutionCandidate@115, ResolutionCandidate@116, ResolutionCandidate@117, ... }
+    <name not found> = ArrayList@141[8] { ResolutionCandidate@125, ResolutionCandidate@126, ResolutionCandidate@127, ... }
+    <name not found> = ArrayList@142[8] { ResolutionCandidate@120, ResolutionCandidate@121, ResolutionCandidate@122, ... }
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/resolve/nestedCalls/kt5971NestedSafeCall.lazy.log b/compiler/testData/diagnostics/tests/resolve/nestedCalls/kt5971NestedSafeCall.lazy.log
index 9e3ec0c7b2e..cc38f24f774 100644
--- a/compiler/testData/diagnostics/tests/resolve/nestedCalls/kt5971NestedSafeCall.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/nestedCalls/kt5971NestedSafeCall.lazy.log
@@ -38,10 +38,6 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@29 {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
@@ -59,12 +55,19 @@ ResolutionTaskHolder@29 {
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+}
+
+null {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@31 }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/resolve/resolveWithFunctionLiteralWithId.lazy.log b/compiler/testData/diagnostics/tests/resolve/resolveWithFunctionLiteralWithId.lazy.log
index 2dcb6954f95..39d1592750f 100644
--- a/compiler/testData/diagnostics/tests/resolve/resolveWithFunctionLiteralWithId.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/resolveWithFunctionLiteralWithId.lazy.log
@@ -71,296 +71,299 @@ LazyJavaPackageFragment@24['lang'] {
 
 ResolutionTaskHolder@54 {
     <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
+}
+
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
 }
 
 ResolutionTaskHolder@66 {
     <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
     <name not found> = EmptyList@46[empty]
+}
+
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
     <name not found> = EmptyList@46[empty]
 }
 
 ResolutionTaskHolder@78 {
     <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@46[empty]
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
     <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
     <name not found> = EmptyList@46[empty]
+}
+
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
     <name not found> = EmptyList@46[empty]
 }
 
 ResolutionTaskHolder@90 {
     <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
 }
 
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
+}
+
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
 }
 
 ResolutionTaskHolder@102 {
     <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
 }
 
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
+}
+
+ResolutionTaskHolder@111 {
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
 }
 
 ResolutionTaskHolder@114 {
     <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
 }
 
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
 }
 
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
+ResolutionTaskHolder@120 {
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
+}
+
+ResolutionTaskHolder@123 {
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
 }
 
 ResolutionTaskHolder@126 {
     <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
 }
 
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@132 }
+ResolutionTaskHolder@129 {
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
 }
 
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@136 }
+ResolutionTaskHolder@132 {
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
+}
+
+ResolutionTaskHolder@135 {
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
 }
 
 ResolutionTaskHolder@138 {
     <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@140 }
 }
 
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@144 }
+ResolutionTaskHolder@141 {
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
 }
 
-ResolutionTaskHolder@146 {
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@148 }
+ResolutionTaskHolder@144 {
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
+}
+
+ResolutionTaskHolder@147 {
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
 }
 
 ResolutionTaskHolder@150 {
     <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@152 }
 }
 
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@156 }
+ResolutionTaskHolder@153 {
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
 }
 
-ResolutionTaskHolder@158 {
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@160 }
+ResolutionTaskHolder@156 {
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
+}
+
+ResolutionTaskHolder@159 {
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
 }
 
 ResolutionTaskHolder@162 {
     <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@164 }
 }
 
-ResolutionTaskHolder@166 {
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@168 }
+ResolutionTaskHolder@165 {
+    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
 }
 
-ResolutionTaskHolder@170 {
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@172 }
+ResolutionTaskHolder@168 {
+    <name not found> = ArrayList@169[8] { ResolutionCandidate@170, ResolutionCandidate@171, ResolutionCandidate@172, ... }
 }
 
-ResolutionTaskHolder@174 {
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@176 }
+ResolutionTaskHolder@173 {
+    <name not found> = ArrayList@174[8] { ResolutionCandidate@175, ResolutionCandidate@176, ResolutionCandidate@177, ... }
 }
 
 ResolutionTaskHolder@178 {
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@180 }
+    <name not found> = ArrayList@179[8] { ResolutionCandidate@180, ResolutionCandidate@181, ResolutionCandidate@182, ... }
 }
 
-ResolutionTaskHolder@182 {
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@184 }
+ResolutionTaskHolder@183 {
+    <name not found> = ArrayList@184[8] { ResolutionCandidate@185, ResolutionCandidate@186, ResolutionCandidate@187, ... }
 }
 
-ResolutionTaskHolder@186 {
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@188 }
+ResolutionTaskHolder@188 {
+    <name not found> = ArrayList@189[8] { ResolutionCandidate@190, ResolutionCandidate@191, ResolutionCandidate@192, ... }
 }
 
-ResolutionTaskHolder@190 {
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@192 }
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@192 }
-}
-
-ResolutionTaskHolder@194 {
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@196 }
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@196 }
-}
-
-ResolutionTaskHolder@198 {
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@200 }
-}
-
-ResolutionTaskHolder@202 {
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@204 }
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@204 }
-}
-
-ResolutionTaskHolder@206 {
-    <name not found> = ArrayList@207[8] { ResolutionCandidate@208, ResolutionCandidate@209, ResolutionCandidate@210, ... }
-    <name not found> = ArrayList@211[8] { ResolutionCandidate@208, ResolutionCandidate@209, ResolutionCandidate@210, ... }
-}
-
-ResolutionTaskHolder@212 {
-    <name not found> = ArrayList@213[8] { ResolutionCandidate@214, ResolutionCandidate@215, ResolutionCandidate@216, ... }
-    <name not found> = ArrayList@217[8] { ResolutionCandidate@214, ResolutionCandidate@215, ResolutionCandidate@216, ... }
-}
-
-ResolutionTaskHolder@218 {
-    <name not found> = ArrayList@219[8] { ResolutionCandidate@220, ResolutionCandidate@221, ResolutionCandidate@222, ... }
-    <name not found> = ArrayList@223[8] { ResolutionCandidate@220, ResolutionCandidate@221, ResolutionCandidate@222, ... }
-}
-
-ResolutionTaskHolder@224 {
-    <name not found> = ArrayList@225[8] { ResolutionCandidate@226, ResolutionCandidate@227, ResolutionCandidate@228, ... }
-    <name not found> = ArrayList@229[8] { ResolutionCandidate@226, ResolutionCandidate@227, ResolutionCandidate@228, ... }
-}
-
-ResolutionTaskHolder@230 {
-    <name not found> = ArrayList@231[8] { ResolutionCandidate@232, ResolutionCandidate@233, ResolutionCandidate@234, ... }
-    <name not found> = ArrayList@235[8] { ResolutionCandidate@232, ResolutionCandidate@233, ResolutionCandidate@234, ... }
-}
-
-ResolutionTaskHolder@236 {
-    <name not found> = ArrayList@237[9] { ResolutionCandidate@238, ResolutionCandidate@239, ResolutionCandidate@240, ... }
-    <name not found> = ArrayList@241[9] { ResolutionCandidate@238, ResolutionCandidate@239, ResolutionCandidate@240, ... }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
+ResolutionTaskHolder@193 {
+    <name not found> = ArrayList@194[9] { ResolutionCandidate@195, ResolutionCandidate@196, ResolutionCandidate@197, ... }
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@242 {
-    <name not found> = ArrayList@243[9] { ResolutionCandidate@244, ResolutionCandidate@245, ResolutionCandidate@246, ... }
-    <name not found> = ArrayList@247[9] { ResolutionCandidate@244, ResolutionCandidate@245, ResolutionCandidate@246, ... }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
+ResolutionTaskHolder@198 {
+    <name not found> = ArrayList@199[9] { ResolutionCandidate@200, ResolutionCandidate@201, ResolutionCandidate@202, ... }
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@248 {
-    <name not found> = ArrayList@249[9] { ResolutionCandidate@250, ResolutionCandidate@251, ResolutionCandidate@252, ... }
-    <name not found> = ArrayList@253[9] { ResolutionCandidate@250, ResolutionCandidate@251, ResolutionCandidate@252, ... }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
+ResolutionTaskHolder@203 {
+    <name not found> = ArrayList@204[9] { ResolutionCandidate@205, ResolutionCandidate@206, ResolutionCandidate@207, ... }
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@254 {
-    <name not found> = ArrayList@255[9] { ResolutionCandidate@256, ResolutionCandidate@257, ResolutionCandidate@258, ... }
-    <name not found> = ArrayList@259[9] { ResolutionCandidate@256, ResolutionCandidate@257, ResolutionCandidate@258, ... }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
+ResolutionTaskHolder@208 {
+    <name not found> = ArrayList@209[9] { ResolutionCandidate@210, ResolutionCandidate@211, ResolutionCandidate@212, ... }
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@260 {
-    <name not found> = ArrayList@261[9] { ResolutionCandidate@262, ResolutionCandidate@263, ResolutionCandidate@264, ... }
-    <name not found> = ArrayList@265[9] { ResolutionCandidate@262, ResolutionCandidate@263, ResolutionCandidate@264, ... }
+ResolutionTaskHolder@213 {
+    <name not found> = ArrayList@214[9] { ResolutionCandidate@215, ResolutionCandidate@216, ResolutionCandidate@217, ... }
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+}
+
+null {
+    <name not found> = ArrayList@218[1] { ResolutionCandidate@122 }
+    <name not found> = ArrayList@219[1] { ResolutionCandidate@155 }
+    <name not found> = ArrayList@220[1] { ResolutionCandidate@152 }
+    <name not found> = ArrayList@221[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@222[1] { ResolutionCandidate@140 }
+    <name not found> = ArrayList@223[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@224[1] { ResolutionCandidate@146 }
+    <name not found> = ArrayList@225[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@226[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@167 }
+    <name not found> = ArrayList@228[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@149 }
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@231[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@232[1] { ResolutionCandidate@128 }
+    <name not found> = ArrayList@233[1] { ResolutionCandidate@125 }
+    <name not found> = ArrayList@234[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@235[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@236[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@237[1] { ResolutionCandidate@137 }
+    <name not found> = ArrayList@238[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@239[1] { ResolutionCandidate@113 }
+    <name not found> = ArrayList@240[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@241[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@242[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@243[1] { ResolutionCandidate@161 }
+    <name not found> = ArrayList@244[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@245[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@246[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@247[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@248[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@249[1] { ResolutionCandidate@143 }
+    <name not found> = ArrayList@250[1] { ResolutionCandidate@134 }
+    <name not found> = ArrayList@251[1] { ResolutionCandidate@131 }
+    <name not found> = ArrayList@252[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@253[1] { ResolutionCandidate@164 }
+    <name not found> = ArrayList@254[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@255[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@256[8] { ResolutionCandidate@190, ResolutionCandidate@191, ResolutionCandidate@192, ... }
+    <name not found> = ArrayList@257[8] { ResolutionCandidate@170, ResolutionCandidate@171, ResolutionCandidate@172, ... }
+    <name not found> = ArrayList@258[8] { ResolutionCandidate@185, ResolutionCandidate@186, ResolutionCandidate@187, ... }
+    <name not found> = ArrayList@259[8] { ResolutionCandidate@175, ResolutionCandidate@176, ResolutionCandidate@177, ... }
+    <name not found> = ArrayList@260[8] { ResolutionCandidate@180, ResolutionCandidate@181, ResolutionCandidate@182, ... }
+    <name not found> = ArrayList@261[9] { ResolutionCandidate@210, ResolutionCandidate@211, ResolutionCandidate@212, ... }
+    <name not found> = ArrayList@262[9] { ResolutionCandidate@200, ResolutionCandidate@201, ResolutionCandidate@202, ... }
+    <name not found> = ArrayList@263[9] { ResolutionCandidate@215, ResolutionCandidate@216, ResolutionCandidate@217, ... }
+    <name not found> = ArrayList@264[9] { ResolutionCandidate@205, ResolutionCandidate@206, ResolutionCandidate@207, ... }
+    <name not found> = ArrayList@265[9] { ResolutionCandidate@195, ResolutionCandidate@196, ResolutionCandidate@197, ... }
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
diff --git a/compiler/testData/diagnostics/tests/resolve/resolveWithFunctionLiterals.lazy.log b/compiler/testData/diagnostics/tests/resolve/resolveWithFunctionLiterals.lazy.log
index 16dca080cfc..7e7b2b9c4a2 100644
--- a/compiler/testData/diagnostics/tests/resolve/resolveWithFunctionLiterals.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/resolveWithFunctionLiterals.lazy.log
@@ -47,128 +47,131 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@33 {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
+}
+
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
 
 ResolutionTaskHolder@45 {
     <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
     <name not found> = EmptyList@25[empty]
+}
+
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
     <name not found> = EmptyList@25[empty]
 }
 
 ResolutionTaskHolder@57 {
     <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
+}
+
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
 }
 
 ResolutionTaskHolder@69 {
     <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
 }
 
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[8] { ResolutionCandidate@80, ResolutionCandidate@81, ResolutionCandidate@82, ... }
 }
 
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[8] { ResolutionCandidate@85, ResolutionCandidate@86, ResolutionCandidate@87, ... }
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[8] { ResolutionCandidate@90, ResolutionCandidate@91, ResolutionCandidate@92, ... }
 }
 
 ResolutionTaskHolder@93 {
     <name not found> = ArrayList@94[8] { ResolutionCandidate@95, ResolutionCandidate@96, ResolutionCandidate@97, ... }
-    <name not found> = ArrayList@98[8] { ResolutionCandidate@95, ResolutionCandidate@96, ResolutionCandidate@97, ... }
 }
 
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[8] { ResolutionCandidate@101, ResolutionCandidate@102, ResolutionCandidate@103, ... }
-    <name not found> = ArrayList@104[8] { ResolutionCandidate@101, ResolutionCandidate@102, ResolutionCandidate@103, ... }
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[8] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102, ... }
 }
 
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[8] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
-    <name not found> = ArrayList@110[8] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[8] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
-    <name not found> = ArrayList@116[8] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[8] { ResolutionCandidate@119, ResolutionCandidate@120, ResolutionCandidate@121, ... }
-    <name not found> = ArrayList@122[8] { ResolutionCandidate@119, ResolutionCandidate@120, ResolutionCandidate@121, ... }
+null {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@118[8] { ResolutionCandidate@80, ResolutionCandidate@81, ResolutionCandidate@82, ... }
+    <name not found> = ArrayList@119[8] { ResolutionCandidate@90, ResolutionCandidate@91, ResolutionCandidate@92, ... }
+    <name not found> = ArrayList@120[8] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102, ... }
+    <name not found> = ArrayList@121[8] { ResolutionCandidate@85, ResolutionCandidate@86, ResolutionCandidate@87, ... }
+    <name not found> = ArrayList@122[8] { ResolutionCandidate@95, ResolutionCandidate@96, ResolutionCandidate@97, ... }
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/resolve/resolveWithFunctionLiteralsOverload.lazy.log b/compiler/testData/diagnostics/tests/resolve/resolveWithFunctionLiteralsOverload.lazy.log
index 47c1c49c5e2..b667ac74a55 100644
--- a/compiler/testData/diagnostics/tests/resolve/resolveWithFunctionLiteralsOverload.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/resolveWithFunctionLiteralsOverload.lazy.log
@@ -64,268 +64,271 @@ LazyJavaPackageFragment@22['lang'] {
 
 ResolutionTaskHolder@49 {
     <name not found> = ArrayList@50[10] { ResolutionCandidate@51, ResolutionCandidate@52, ResolutionCandidate@53, ... }
-    <name not found> = ArrayList@54[10] { ResolutionCandidate@51, ResolutionCandidate@52, ResolutionCandidate@53, ... }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[10] { ResolutionCandidate@57, ResolutionCandidate@58, ResolutionCandidate@59, ... }
-    <name not found> = ArrayList@60[10] { ResolutionCandidate@57, ResolutionCandidate@58, ResolutionCandidate@59, ... }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[10] { ResolutionCandidate@56, ResolutionCandidate@57, ResolutionCandidate@58, ... }
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[10] { ResolutionCandidate@63, ResolutionCandidate@64, ResolutionCandidate@65, ... }
-    <name not found> = ArrayList@66[10] { ResolutionCandidate@63, ResolutionCandidate@64, ResolutionCandidate@65, ... }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[10] { ResolutionCandidate@61, ResolutionCandidate@62, ResolutionCandidate@63, ... }
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[10] { ResolutionCandidate@69, ResolutionCandidate@70, ResolutionCandidate@71, ... }
-    <name not found> = ArrayList@72[10] { ResolutionCandidate@69, ResolutionCandidate@70, ResolutionCandidate@71, ... }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[10] { ResolutionCandidate@66, ResolutionCandidate@67, ResolutionCandidate@68, ... }
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[10] { ResolutionCandidate@75, ResolutionCandidate@76, ResolutionCandidate@77, ... }
-    <name not found> = ArrayList@78[10] { ResolutionCandidate@75, ResolutionCandidate@76, ResolutionCandidate@77, ... }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[10] { ResolutionCandidate@71, ResolutionCandidate@72, ResolutionCandidate@73, ... }
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
+}
+
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
     <name not found> = EmptyList@41[empty]
+}
+
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
     <name not found> = EmptyList@41[empty]
 }
 
 ResolutionTaskHolder@83 {
     <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
-    <name not found> = EmptyList@41[empty]
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
     <name not found> = EmptyList@41[empty]
+}
+
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
     <name not found> = EmptyList@41[empty]
 }
 
 ResolutionTaskHolder@95 {
     <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
-    <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
 }
 
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
+}
+
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
 }
 
 ResolutionTaskHolder@107 {
     <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@113 }
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
 }
 
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@117 }
+ResolutionTaskHolder@113 {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
+}
+
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
 }
 
 ResolutionTaskHolder@119 {
     <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@121 }
 }
 
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@125 }
+ResolutionTaskHolder@122 {
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
 }
 
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@129 }
+ResolutionTaskHolder@125 {
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
+}
+
+ResolutionTaskHolder@128 {
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
 }
 
 ResolutionTaskHolder@131 {
     <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@133 }
 }
 
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@137 }
+ResolutionTaskHolder@134 {
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
 }
 
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@141 }
+ResolutionTaskHolder@137 {
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
+}
+
+ResolutionTaskHolder@140 {
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
 }
 
 ResolutionTaskHolder@143 {
     <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@145 }
 }
 
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@149 }
+ResolutionTaskHolder@146 {
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
 }
 
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@153 }
+ResolutionTaskHolder@149 {
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
+}
+
+ResolutionTaskHolder@152 {
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
 }
 
 ResolutionTaskHolder@155 {
     <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@157 }
 }
 
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@161 }
+ResolutionTaskHolder@158 {
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
 }
 
-ResolutionTaskHolder@163 {
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@165 }
+ResolutionTaskHolder@161 {
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
+}
+
+ResolutionTaskHolder@164 {
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
 }
 
 ResolutionTaskHolder@167 {
     <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@169 }
 }
 
-ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@173 }
+ResolutionTaskHolder@170 {
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
 }
 
-ResolutionTaskHolder@175 {
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@177 }
+ResolutionTaskHolder@173 {
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
+}
+
+ResolutionTaskHolder@176 {
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
 }
 
 ResolutionTaskHolder@179 {
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@181 }
+    <name not found> = ArrayList@180[8] { ResolutionCandidate@181, ResolutionCandidate@182, ResolutionCandidate@183, ... }
 }
 
-ResolutionTaskHolder@183 {
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@185 }
+ResolutionTaskHolder@184 {
+    <name not found> = ArrayList@185[8] { ResolutionCandidate@186, ResolutionCandidate@187, ResolutionCandidate@188, ... }
 }
 
-ResolutionTaskHolder@187 {
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@189 }
+ResolutionTaskHolder@189 {
+    <name not found> = ArrayList@190[8] { ResolutionCandidate@191, ResolutionCandidate@192, ResolutionCandidate@193, ... }
 }
 
-ResolutionTaskHolder@191 {
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@193 }
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@193 }
-}
-
-ResolutionTaskHolder@195 {
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@197 }
+ResolutionTaskHolder@194 {
+    <name not found> = ArrayList@195[8] { ResolutionCandidate@196, ResolutionCandidate@197, ResolutionCandidate@198, ... }
 }
 
 ResolutionTaskHolder@199 {
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@201 }
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@201 }
+    <name not found> = ArrayList@200[8] { ResolutionCandidate@201, ResolutionCandidate@202, ResolutionCandidate@203, ... }
 }
 
-ResolutionTaskHolder@203 {
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@205 }
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@205 }
+ResolutionTaskHolder@204 {
+    <name not found> = ArrayList@205[8] { ResolutionCandidate@206, ResolutionCandidate@207, ResolutionCandidate@208, ... }
 }
 
-ResolutionTaskHolder@207 {
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@209 }
-}
-
-ResolutionTaskHolder@211 {
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@213 }
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@213 }
-}
-
-ResolutionTaskHolder@215 {
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@217 }
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@217 }
-}
-
-ResolutionTaskHolder@219 {
-    <name not found> = ArrayList@220[8] { ResolutionCandidate@221, ResolutionCandidate@222, ResolutionCandidate@223, ... }
-    <name not found> = ArrayList@224[8] { ResolutionCandidate@221, ResolutionCandidate@222, ResolutionCandidate@223, ... }
-}
-
-ResolutionTaskHolder@225 {
-    <name not found> = ArrayList@226[8] { ResolutionCandidate@227, ResolutionCandidate@228, ResolutionCandidate@229, ... }
-    <name not found> = ArrayList@230[8] { ResolutionCandidate@227, ResolutionCandidate@228, ResolutionCandidate@229, ... }
-}
-
-ResolutionTaskHolder@231 {
-    <name not found> = ArrayList@232[8] { ResolutionCandidate@233, ResolutionCandidate@234, ResolutionCandidate@235, ... }
-    <name not found> = ArrayList@236[8] { ResolutionCandidate@233, ResolutionCandidate@234, ResolutionCandidate@235, ... }
-}
-
-ResolutionTaskHolder@237 {
-    <name not found> = ArrayList@238[8] { ResolutionCandidate@239, ResolutionCandidate@240, ResolutionCandidate@241, ... }
-    <name not found> = ArrayList@242[8] { ResolutionCandidate@239, ResolutionCandidate@240, ResolutionCandidate@241, ... }
-}
-
-ResolutionTaskHolder@243 {
-    <name not found> = ArrayList@244[8] { ResolutionCandidate@245, ResolutionCandidate@246, ResolutionCandidate@247, ... }
-    <name not found> = ArrayList@248[8] { ResolutionCandidate@245, ResolutionCandidate@246, ResolutionCandidate@247, ... }
-}
-
-ResolutionTaskHolder@249 {
-    <name not found> = ArrayList@250[8] { ResolutionCandidate@251, ResolutionCandidate@252, ResolutionCandidate@253, ... }
-    <name not found> = ArrayList@254[8] { ResolutionCandidate@251, ResolutionCandidate@252, ResolutionCandidate@253, ... }
+null {
+    <name not found> = ArrayList@209[10] { ResolutionCandidate@56, ResolutionCandidate@57, ResolutionCandidate@58, ... }
+    <name not found> = ArrayList@210[10] { ResolutionCandidate@61, ResolutionCandidate@62, ResolutionCandidate@63, ... }
+    <name not found> = ArrayList@211[10] { ResolutionCandidate@66, ResolutionCandidate@67, ResolutionCandidate@68, ... }
+    <name not found> = ArrayList@212[10] { ResolutionCandidate@71, ResolutionCandidate@72, ResolutionCandidate@73, ... }
+    <name not found> = ArrayList@213[10] { ResolutionCandidate@51, ResolutionCandidate@52, ResolutionCandidate@53, ... }
+    <name not found> = ArrayList@214[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@215[1] { ResolutionCandidate@163 }
+    <name not found> = ArrayList@216[1] { ResolutionCandidate@142 }
+    <name not found> = ArrayList@217[1] { ResolutionCandidate@145 }
+    <name not found> = ArrayList@218[1] { ResolutionCandidate@157 }
+    <name not found> = ArrayList@219[1] { ResolutionCandidate@169 }
+    <name not found> = ArrayList@220[1] { ResolutionCandidate@139 }
+    <name not found> = ArrayList@221[1] { ResolutionCandidate@127 }
+    <name not found> = ArrayList@222[1] { ResolutionCandidate@166 }
+    <name not found> = ArrayList@223[1] { ResolutionCandidate@172 }
+    <name not found> = ArrayList@224[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@225[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@226[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@228[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@148 }
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@175 }
+    <name not found> = ArrayList@231[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@232[1] { ResolutionCandidate@151 }
+    <name not found> = ArrayList@233[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@234[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@235[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@236[1] { ResolutionCandidate@154 }
+    <name not found> = ArrayList@237[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@238[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@239[1] { ResolutionCandidate@136 }
+    <name not found> = ArrayList@240[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@241[1] { ResolutionCandidate@178 }
+    <name not found> = ArrayList@242[1] { ResolutionCandidate@160 }
+    <name not found> = ArrayList@243[1] { ResolutionCandidate@124 }
+    <name not found> = ArrayList@244[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@245[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@246[1] { ResolutionCandidate@133 }
+    <name not found> = ArrayList@247[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@248[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@249[8] { ResolutionCandidate@196, ResolutionCandidate@197, ResolutionCandidate@198, ... }
+    <name not found> = ArrayList@250[8] { ResolutionCandidate@201, ResolutionCandidate@202, ResolutionCandidate@203, ... }
+    <name not found> = ArrayList@251[8] { ResolutionCandidate@206, ResolutionCandidate@207, ResolutionCandidate@208, ... }
+    <name not found> = ArrayList@252[8] { ResolutionCandidate@181, ResolutionCandidate@182, ResolutionCandidate@183, ... }
+    <name not found> = ArrayList@253[8] { ResolutionCandidate@186, ResolutionCandidate@187, ResolutionCandidate@188, ... }
+    <name not found> = ArrayList@254[8] { ResolutionCandidate@191, ResolutionCandidate@192, ResolutionCandidate@193, ... }
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/resolve/resolveWithGenerics.lazy.log b/compiler/testData/diagnostics/tests/resolve/resolveWithGenerics.lazy.log
index 9f618a4f954..ee3cf1bfb52 100644
--- a/compiler/testData/diagnostics/tests/resolve/resolveWithGenerics.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/resolveWithGenerics.lazy.log
@@ -54,15 +54,6 @@ LazyJavaPackageFragment@23['lang'] {
 
 ResolutionTaskHolder@47 {
     <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
@@ -73,91 +64,103 @@ ResolutionTaskHolder@47 {
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
+}
+
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
 }
 
 ResolutionTaskHolder@59 {
     <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
 }
 
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
+}
+
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
 }
 
 ResolutionTaskHolder@71 {
     <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
 }
 
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
 }
 
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
+}
+
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
 }
 
 ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[5] { ResolutionCandidate@97, ResolutionCandidate@98, ResolutionCandidate@99, ... }
-    <name not found> = ArrayList@100[5] { ResolutionCandidate@97, ResolutionCandidate@98, ResolutionCandidate@99, ... }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
+    <name not found> = ArrayList@84[5] { ResolutionCandidate@85, ResolutionCandidate@86, ResolutionCandidate@87, ... }
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[5] { ResolutionCandidate@103, ResolutionCandidate@104, ResolutionCandidate@105, ... }
-    <name not found> = ArrayList@106[5] { ResolutionCandidate@103, ResolutionCandidate@104, ResolutionCandidate@105, ... }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[5] { ResolutionCandidate@90, ResolutionCandidate@91, ResolutionCandidate@92, ... }
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[5] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111, ... }
-    <name not found> = ArrayList@112[5] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111, ... }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[5] { ResolutionCandidate@95, ResolutionCandidate@96, ResolutionCandidate@97, ... }
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[5] { ResolutionCandidate@115, ResolutionCandidate@116, ResolutionCandidate@117, ... }
-    <name not found> = ArrayList@118[5] { ResolutionCandidate@115, ResolutionCandidate@116, ResolutionCandidate@117, ... }
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[5] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102, ... }
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+}
+
+null {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@115[5] { ResolutionCandidate@95, ResolutionCandidate@96, ResolutionCandidate@97, ... }
+    <name not found> = ArrayList@116[5] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102, ... }
+    <name not found> = ArrayList@117[5] { ResolutionCandidate@90, ResolutionCandidate@91, ResolutionCandidate@92, ... }
+    <name not found> = ArrayList@118[5] { ResolutionCandidate@85, ResolutionCandidate@86, ResolutionCandidate@87, ... }
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
diff --git a/compiler/testData/diagnostics/tests/resolve/resolveWithRedeclarationError.lazy.log b/compiler/testData/diagnostics/tests/resolve/resolveWithRedeclarationError.lazy.log
index 93322efb653..b60401017b0 100644
--- a/compiler/testData/diagnostics/tests/resolve/resolveWithRedeclarationError.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/resolveWithRedeclarationError.lazy.log
@@ -59,1942 +59,1945 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@27 {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@39 {
     <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@51 {
     <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@63 {
     <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@75 {
     <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@87 {
     <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@99 {
     <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@111 {
     <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@113 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@117 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@121 }
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@120 {
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@123 {
     <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@125 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@129 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@126 {
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@133 }
+ResolutionTaskHolder@129 {
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@132 {
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@135 {
     <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@137 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@141 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@138 {
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@145 }
+ResolutionTaskHolder@141 {
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@144 {
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@147 {
     <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@149 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@153 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@150 {
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@155 {
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@157 }
+ResolutionTaskHolder@153 {
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@156 {
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@159 {
     <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@161 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@163 {
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@165 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@162 {
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@167 {
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@169 }
+ResolutionTaskHolder@165 {
+    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@168 {
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@171 {
     <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@173 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@175 {
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@177 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@174 {
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@179 {
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@181 }
+ResolutionTaskHolder@177 {
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@180 {
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@183 {
     <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@185 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@187 {
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@189 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@186 {
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@191 {
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@193 }
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@193 }
+ResolutionTaskHolder@189 {
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@192 {
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@195 {
     <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@197 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@199 {
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@201 }
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@201 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@198 {
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@203 {
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@205 }
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@205 }
+ResolutionTaskHolder@201 {
+    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@204 {
+    <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@207 {
     <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@209 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@211 {
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@213 }
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@213 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@210 {
+    <name not found> = ArrayList@211[1] { ResolutionCandidate@212 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@215 {
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@217 }
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@217 }
+ResolutionTaskHolder@213 {
+    <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@216 {
+    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@219 {
     <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@221 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@223 {
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@225 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@222 {
+    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@227 {
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@229 }
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@229 }
+ResolutionTaskHolder@225 {
+    <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@228 {
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@231 {
     <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@233 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@235 {
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@237 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@234 {
+    <name not found> = ArrayList@235[1] { ResolutionCandidate@236 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@239 {
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@241 }
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@241 }
+ResolutionTaskHolder@237 {
+    <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@240 {
+    <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@243 {
     <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@245 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@247 {
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@249 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@246 {
+    <name not found> = ArrayList@247[1] { ResolutionCandidate@248 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@251 {
-    <name not found> = ArrayList@252[1] { ResolutionCandidate@253 }
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@253 }
+ResolutionTaskHolder@249 {
+    <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@252 {
+    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@255 {
     <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
-    <name not found> = ArrayList@258[1] { ResolutionCandidate@257 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@259 {
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@261 }
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@261 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@258 {
+    <name not found> = ArrayList@259[1] { ResolutionCandidate@260 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@263 {
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@265 }
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@265 }
+ResolutionTaskHolder@261 {
+    <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@264 {
+    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@267 {
     <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
-    <name not found> = ArrayList@270[1] { ResolutionCandidate@269 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@271 {
-    <name not found> = ArrayList@272[1] { ResolutionCandidate@273 }
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@273 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@270 {
+    <name not found> = ArrayList@271[1] { ResolutionCandidate@272 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@275 {
-    <name not found> = ArrayList@276[1] { ResolutionCandidate@277 }
-    <name not found> = ArrayList@278[1] { ResolutionCandidate@277 }
+ResolutionTaskHolder@273 {
+    <name not found> = ArrayList@274[1] { ResolutionCandidate@275 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@276 {
+    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@279 {
     <name not found> = ArrayList@280[1] { ResolutionCandidate@281 }
-    <name not found> = ArrayList@282[1] { ResolutionCandidate@281 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@283 {
-    <name not found> = ArrayList@284[1] { ResolutionCandidate@285 }
-    <name not found> = ArrayList@286[1] { ResolutionCandidate@285 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@282 {
+    <name not found> = ArrayList@283[1] { ResolutionCandidate@284 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@287 {
-    <name not found> = ArrayList@288[1] { ResolutionCandidate@289 }
-    <name not found> = ArrayList@290[1] { ResolutionCandidate@289 }
+ResolutionTaskHolder@285 {
+    <name not found> = ArrayList@286[1] { ResolutionCandidate@287 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@288 {
+    <name not found> = ArrayList@289[1] { ResolutionCandidate@290 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@291 {
     <name not found> = ArrayList@292[1] { ResolutionCandidate@293 }
-    <name not found> = ArrayList@294[1] { ResolutionCandidate@293 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@295 {
-    <name not found> = ArrayList@296[1] { ResolutionCandidate@297 }
-    <name not found> = ArrayList@298[1] { ResolutionCandidate@297 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@294 {
+    <name not found> = ArrayList@295[1] { ResolutionCandidate@296 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@299 {
-    <name not found> = ArrayList@300[1] { ResolutionCandidate@301 }
-    <name not found> = ArrayList@302[1] { ResolutionCandidate@301 }
+ResolutionTaskHolder@297 {
+    <name not found> = ArrayList@298[1] { ResolutionCandidate@299 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@300 {
+    <name not found> = ArrayList@301[1] { ResolutionCandidate@302 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@303 {
     <name not found> = ArrayList@304[1] { ResolutionCandidate@305 }
-    <name not found> = ArrayList@306[1] { ResolutionCandidate@305 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@307 {
-    <name not found> = ArrayList@308[1] { ResolutionCandidate@309 }
-    <name not found> = ArrayList@310[1] { ResolutionCandidate@309 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@306 {
+    <name not found> = ArrayList@307[1] { ResolutionCandidate@308 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@311 {
-    <name not found> = ArrayList@312[1] { ResolutionCandidate@313 }
-    <name not found> = ArrayList@314[1] { ResolutionCandidate@313 }
+ResolutionTaskHolder@309 {
+    <name not found> = ArrayList@310[1] { ResolutionCandidate@311 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@312 {
+    <name not found> = ArrayList@313[1] { ResolutionCandidate@314 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@315 {
     <name not found> = ArrayList@316[1] { ResolutionCandidate@317 }
-    <name not found> = ArrayList@318[1] { ResolutionCandidate@317 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@319 {
-    <name not found> = ArrayList@320[1] { ResolutionCandidate@321 }
-    <name not found> = ArrayList@322[1] { ResolutionCandidate@321 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@318 {
+    <name not found> = ArrayList@319[1] { ResolutionCandidate@320 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@323 {
-    <name not found> = ArrayList@324[1] { ResolutionCandidate@325 }
-    <name not found> = ArrayList@326[1] { ResolutionCandidate@325 }
+ResolutionTaskHolder@321 {
+    <name not found> = ArrayList@322[1] { ResolutionCandidate@323 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@324 {
+    <name not found> = ArrayList@325[1] { ResolutionCandidate@326 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@327 {
     <name not found> = ArrayList@328[1] { ResolutionCandidate@329 }
-    <name not found> = ArrayList@330[1] { ResolutionCandidate@329 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@331 {
-    <name not found> = ArrayList@332[1] { ResolutionCandidate@333 }
-    <name not found> = ArrayList@334[1] { ResolutionCandidate@333 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@330 {
+    <name not found> = ArrayList@331[1] { ResolutionCandidate@332 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@335 {
-    <name not found> = ArrayList@336[1] { ResolutionCandidate@337 }
-    <name not found> = ArrayList@338[1] { ResolutionCandidate@337 }
+ResolutionTaskHolder@333 {
+    <name not found> = ArrayList@334[1] { ResolutionCandidate@335 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@336 {
+    <name not found> = ArrayList@337[1] { ResolutionCandidate@338 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@339 {
     <name not found> = ArrayList@340[1] { ResolutionCandidate@341 }
-    <name not found> = ArrayList@342[1] { ResolutionCandidate@341 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@343 {
-    <name not found> = ArrayList@344[1] { ResolutionCandidate@345 }
-    <name not found> = ArrayList@346[1] { ResolutionCandidate@345 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@342 {
+    <name not found> = ArrayList@343[1] { ResolutionCandidate@344 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@347 {
-    <name not found> = ArrayList@348[1] { ResolutionCandidate@349 }
-    <name not found> = ArrayList@350[1] { ResolutionCandidate@349 }
+ResolutionTaskHolder@345 {
+    <name not found> = ArrayList@346[1] { ResolutionCandidate@347 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@348 {
+    <name not found> = ArrayList@349[1] { ResolutionCandidate@350 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@351 {
     <name not found> = ArrayList@352[1] { ResolutionCandidate@353 }
-    <name not found> = ArrayList@354[1] { ResolutionCandidate@353 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@355 {
-    <name not found> = ArrayList@356[1] { ResolutionCandidate@357 }
-    <name not found> = ArrayList@358[1] { ResolutionCandidate@357 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@354 {
+    <name not found> = ArrayList@355[1] { ResolutionCandidate@356 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@359 {
-    <name not found> = ArrayList@360[1] { ResolutionCandidate@361 }
-    <name not found> = ArrayList@362[1] { ResolutionCandidate@361 }
+ResolutionTaskHolder@357 {
+    <name not found> = ArrayList@358[1] { ResolutionCandidate@359 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@360 {
+    <name not found> = ArrayList@361[1] { ResolutionCandidate@362 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@363 {
     <name not found> = ArrayList@364[1] { ResolutionCandidate@365 }
-    <name not found> = ArrayList@366[1] { ResolutionCandidate@365 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@367 {
-    <name not found> = ArrayList@368[1] { ResolutionCandidate@369 }
-    <name not found> = ArrayList@370[1] { ResolutionCandidate@369 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@366 {
+    <name not found> = ArrayList@367[1] { ResolutionCandidate@368 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@371 {
-    <name not found> = ArrayList@372[1] { ResolutionCandidate@373 }
-    <name not found> = ArrayList@374[1] { ResolutionCandidate@373 }
+ResolutionTaskHolder@369 {
+    <name not found> = ArrayList@370[1] { ResolutionCandidate@371 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@372 {
+    <name not found> = ArrayList@373[1] { ResolutionCandidate@374 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@375 {
     <name not found> = ArrayList@376[1] { ResolutionCandidate@377 }
-    <name not found> = ArrayList@378[1] { ResolutionCandidate@377 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@379 {
-    <name not found> = ArrayList@380[1] { ResolutionCandidate@381 }
-    <name not found> = ArrayList@382[1] { ResolutionCandidate@381 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@378 {
+    <name not found> = ArrayList@379[1] { ResolutionCandidate@380 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@383 {
-    <name not found> = ArrayList@384[1] { ResolutionCandidate@385 }
-    <name not found> = ArrayList@386[1] { ResolutionCandidate@385 }
+ResolutionTaskHolder@381 {
+    <name not found> = ArrayList@382[1] { ResolutionCandidate@383 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@384 {
+    <name not found> = ArrayList@385[1] { ResolutionCandidate@386 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@387 {
     <name not found> = ArrayList@388[1] { ResolutionCandidate@389 }
-    <name not found> = ArrayList@390[1] { ResolutionCandidate@389 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@391 {
-    <name not found> = ArrayList@392[1] { ResolutionCandidate@393 }
-    <name not found> = ArrayList@394[1] { ResolutionCandidate@393 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@390 {
+    <name not found> = ArrayList@391[1] { ResolutionCandidate@392 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@395 {
-    <name not found> = ArrayList@396[1] { ResolutionCandidate@397 }
-    <name not found> = ArrayList@398[1] { ResolutionCandidate@397 }
+ResolutionTaskHolder@393 {
+    <name not found> = ArrayList@394[1] { ResolutionCandidate@395 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@396 {
+    <name not found> = ArrayList@397[1] { ResolutionCandidate@398 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@399 {
     <name not found> = ArrayList@400[1] { ResolutionCandidate@401 }
-    <name not found> = ArrayList@402[1] { ResolutionCandidate@401 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@403 {
-    <name not found> = ArrayList@404[1] { ResolutionCandidate@405 }
-    <name not found> = ArrayList@406[1] { ResolutionCandidate@405 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@402 {
+    <name not found> = ArrayList@403[1] { ResolutionCandidate@404 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@407 {
-    <name not found> = ArrayList@408[1] { ResolutionCandidate@409 }
-    <name not found> = ArrayList@410[1] { ResolutionCandidate@409 }
+ResolutionTaskHolder@405 {
+    <name not found> = ArrayList@406[1] { ResolutionCandidate@407 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@408 {
+    <name not found> = ArrayList@409[1] { ResolutionCandidate@410 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@411 {
     <name not found> = ArrayList@412[1] { ResolutionCandidate@413 }
-    <name not found> = ArrayList@414[1] { ResolutionCandidate@413 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@415 {
-    <name not found> = ArrayList@416[1] { ResolutionCandidate@417 }
-    <name not found> = ArrayList@418[1] { ResolutionCandidate@417 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@414 {
+    <name not found> = ArrayList@415[1] { ResolutionCandidate@416 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@419 {
-    <name not found> = ArrayList@420[1] { ResolutionCandidate@421 }
-    <name not found> = ArrayList@422[1] { ResolutionCandidate@421 }
+ResolutionTaskHolder@417 {
+    <name not found> = ArrayList@418[1] { ResolutionCandidate@419 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@420 {
+    <name not found> = ArrayList@421[1] { ResolutionCandidate@422 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@423 {
     <name not found> = ArrayList@424[1] { ResolutionCandidate@425 }
-    <name not found> = ArrayList@426[1] { ResolutionCandidate@425 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@427 {
-    <name not found> = ArrayList@428[1] { ResolutionCandidate@429 }
-    <name not found> = ArrayList@430[1] { ResolutionCandidate@429 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@426 {
+    <name not found> = ArrayList@427[1] { ResolutionCandidate@428 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@431 {
-    <name not found> = ArrayList@432[1] { ResolutionCandidate@433 }
-    <name not found> = ArrayList@434[1] { ResolutionCandidate@433 }
+ResolutionTaskHolder@429 {
+    <name not found> = ArrayList@430[1] { ResolutionCandidate@431 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@432 {
+    <name not found> = ArrayList@433[1] { ResolutionCandidate@434 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@435 {
     <name not found> = ArrayList@436[1] { ResolutionCandidate@437 }
-    <name not found> = ArrayList@438[1] { ResolutionCandidate@437 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@439 {
-    <name not found> = ArrayList@440[1] { ResolutionCandidate@441 }
-    <name not found> = ArrayList@442[1] { ResolutionCandidate@441 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@438 {
+    <name not found> = ArrayList@439[1] { ResolutionCandidate@440 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@443 {
-    <name not found> = ArrayList@444[1] { ResolutionCandidate@445 }
-    <name not found> = ArrayList@446[1] { ResolutionCandidate@445 }
+ResolutionTaskHolder@441 {
+    <name not found> = ArrayList@442[1] { ResolutionCandidate@443 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@444 {
+    <name not found> = ArrayList@445[1] { ResolutionCandidate@446 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@447 {
     <name not found> = ArrayList@448[1] { ResolutionCandidate@449 }
-    <name not found> = ArrayList@450[1] { ResolutionCandidate@449 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@451 {
-    <name not found> = ArrayList@452[1] { ResolutionCandidate@453 }
-    <name not found> = ArrayList@454[1] { ResolutionCandidate@453 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@450 {
+    <name not found> = ArrayList@451[1] { ResolutionCandidate@452 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@455 {
-    <name not found> = ArrayList@456[1] { ResolutionCandidate@457 }
-    <name not found> = ArrayList@458[1] { ResolutionCandidate@457 }
+ResolutionTaskHolder@453 {
+    <name not found> = ArrayList@454[1] { ResolutionCandidate@455 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@456 {
+    <name not found> = ArrayList@457[1] { ResolutionCandidate@458 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@459 {
     <name not found> = ArrayList@460[1] { ResolutionCandidate@461 }
-    <name not found> = ArrayList@462[1] { ResolutionCandidate@461 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@463 {
-    <name not found> = ArrayList@464[1] { ResolutionCandidate@465 }
-    <name not found> = ArrayList@466[1] { ResolutionCandidate@465 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@462 {
+    <name not found> = ArrayList@463[1] { ResolutionCandidate@464 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@467 {
-    <name not found> = ArrayList@468[1] { ResolutionCandidate@469 }
-    <name not found> = ArrayList@470[1] { ResolutionCandidate@469 }
+ResolutionTaskHolder@465 {
+    <name not found> = ArrayList@466[1] { ResolutionCandidate@467 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@468 {
+    <name not found> = ArrayList@469[1] { ResolutionCandidate@470 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@471 {
     <name not found> = ArrayList@472[1] { ResolutionCandidate@473 }
-    <name not found> = ArrayList@474[1] { ResolutionCandidate@473 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@475 {
-    <name not found> = ArrayList@476[1] { ResolutionCandidate@477 }
-    <name not found> = ArrayList@478[1] { ResolutionCandidate@477 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@474 {
+    <name not found> = ArrayList@475[1] { ResolutionCandidate@476 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@479 {
-    <name not found> = ArrayList@480[1] { ResolutionCandidate@481 }
-    <name not found> = ArrayList@482[1] { ResolutionCandidate@481 }
+ResolutionTaskHolder@477 {
+    <name not found> = ArrayList@478[1] { ResolutionCandidate@479 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@480 {
+    <name not found> = ArrayList@481[1] { ResolutionCandidate@482 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@483 {
     <name not found> = ArrayList@484[1] { ResolutionCandidate@485 }
-    <name not found> = ArrayList@486[1] { ResolutionCandidate@485 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@487 {
-    <name not found> = ArrayList@488[1] { ResolutionCandidate@489 }
-    <name not found> = ArrayList@490[1] { ResolutionCandidate@489 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@486 {
+    <name not found> = ArrayList@487[1] { ResolutionCandidate@488 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@491 {
-    <name not found> = ArrayList@492[1] { ResolutionCandidate@493 }
-    <name not found> = ArrayList@494[1] { ResolutionCandidate@493 }
+ResolutionTaskHolder@489 {
+    <name not found> = ArrayList@490[1] { ResolutionCandidate@491 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@492 {
+    <name not found> = ArrayList@493[1] { ResolutionCandidate@494 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@495 {
     <name not found> = ArrayList@496[1] { ResolutionCandidate@497 }
-    <name not found> = ArrayList@498[1] { ResolutionCandidate@497 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@499 {
-    <name not found> = ArrayList@500[1] { ResolutionCandidate@501 }
-    <name not found> = ArrayList@502[1] { ResolutionCandidate@501 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@498 {
+    <name not found> = ArrayList@499[1] { ResolutionCandidate@500 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@503 {
-    <name not found> = ArrayList@504[1] { ResolutionCandidate@505 }
-    <name not found> = ArrayList@506[1] { ResolutionCandidate@505 }
+ResolutionTaskHolder@501 {
+    <name not found> = ArrayList@502[1] { ResolutionCandidate@503 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@504 {
+    <name not found> = ArrayList@505[1] { ResolutionCandidate@506 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@507 {
     <name not found> = ArrayList@508[1] { ResolutionCandidate@509 }
-    <name not found> = ArrayList@510[1] { ResolutionCandidate@509 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@511 {
-    <name not found> = ArrayList@512[1] { ResolutionCandidate@513 }
-    <name not found> = ArrayList@514[1] { ResolutionCandidate@513 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@510 {
+    <name not found> = ArrayList@511[1] { ResolutionCandidate@512 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@515 {
-    <name not found> = ArrayList@516[1] { ResolutionCandidate@517 }
-    <name not found> = ArrayList@518[1] { ResolutionCandidate@517 }
+ResolutionTaskHolder@513 {
+    <name not found> = ArrayList@514[1] { ResolutionCandidate@515 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@516 {
+    <name not found> = ArrayList@517[1] { ResolutionCandidate@518 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@519 {
     <name not found> = ArrayList@520[1] { ResolutionCandidate@521 }
-    <name not found> = ArrayList@522[1] { ResolutionCandidate@521 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@523 {
-    <name not found> = ArrayList@524[1] { ResolutionCandidate@525 }
-    <name not found> = ArrayList@526[1] { ResolutionCandidate@525 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@522 {
+    <name not found> = ArrayList@523[1] { ResolutionCandidate@524 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@527 {
-    <name not found> = ArrayList@528[1] { ResolutionCandidate@529 }
-    <name not found> = ArrayList@530[1] { ResolutionCandidate@529 }
+ResolutionTaskHolder@525 {
+    <name not found> = ArrayList@526[1] { ResolutionCandidate@527 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@528 {
+    <name not found> = ArrayList@529[1] { ResolutionCandidate@530 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@531 {
     <name not found> = ArrayList@532[1] { ResolutionCandidate@533 }
-    <name not found> = ArrayList@534[1] { ResolutionCandidate@533 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@535 {
-    <name not found> = ArrayList@536[1] { ResolutionCandidate@537 }
-    <name not found> = ArrayList@538[1] { ResolutionCandidate@537 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@534 {
+    <name not found> = ArrayList@535[1] { ResolutionCandidate@536 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@539 {
-    <name not found> = ArrayList@540[1] { ResolutionCandidate@541 }
-    <name not found> = ArrayList@542[1] { ResolutionCandidate@541 }
+ResolutionTaskHolder@537 {
+    <name not found> = ArrayList@538[1] { ResolutionCandidate@539 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@540 {
+    <name not found> = ArrayList@541[1] { ResolutionCandidate@542 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@543 {
     <name not found> = ArrayList@544[1] { ResolutionCandidate@545 }
-    <name not found> = ArrayList@546[1] { ResolutionCandidate@545 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@547 {
-    <name not found> = ArrayList@548[1] { ResolutionCandidate@549 }
-    <name not found> = ArrayList@550[1] { ResolutionCandidate@549 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@546 {
+    <name not found> = ArrayList@547[1] { ResolutionCandidate@548 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@551 {
-    <name not found> = ArrayList@552[1] { ResolutionCandidate@553 }
-    <name not found> = ArrayList@554[1] { ResolutionCandidate@553 }
+ResolutionTaskHolder@549 {
+    <name not found> = ArrayList@550[1] { ResolutionCandidate@551 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@552 {
+    <name not found> = ArrayList@553[1] { ResolutionCandidate@554 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@555 {
     <name not found> = ArrayList@556[1] { ResolutionCandidate@557 }
-    <name not found> = ArrayList@558[1] { ResolutionCandidate@557 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@559 {
-    <name not found> = ArrayList@560[1] { ResolutionCandidate@561 }
-    <name not found> = ArrayList@562[1] { ResolutionCandidate@561 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@558 {
+    <name not found> = ArrayList@559[1] { ResolutionCandidate@560 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@563 {
-    <name not found> = ArrayList@564[1] { ResolutionCandidate@565 }
-    <name not found> = ArrayList@566[1] { ResolutionCandidate@565 }
+ResolutionTaskHolder@561 {
+    <name not found> = ArrayList@562[1] { ResolutionCandidate@563 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@564 {
+    <name not found> = ArrayList@565[1] { ResolutionCandidate@566 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@567 {
     <name not found> = ArrayList@568[1] { ResolutionCandidate@569 }
-    <name not found> = ArrayList@570[1] { ResolutionCandidate@569 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@571 {
-    <name not found> = ArrayList@572[1] { ResolutionCandidate@573 }
-    <name not found> = ArrayList@574[1] { ResolutionCandidate@573 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@570 {
+    <name not found> = ArrayList@571[1] { ResolutionCandidate@572 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@575 {
-    <name not found> = ArrayList@576[1] { ResolutionCandidate@577 }
-    <name not found> = ArrayList@578[1] { ResolutionCandidate@577 }
+ResolutionTaskHolder@573 {
+    <name not found> = ArrayList@574[1] { ResolutionCandidate@575 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@576 {
+    <name not found> = ArrayList@577[1] { ResolutionCandidate@578 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@579 {
     <name not found> = ArrayList@580[1] { ResolutionCandidate@581 }
-    <name not found> = ArrayList@582[1] { ResolutionCandidate@581 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@583 {
-    <name not found> = ArrayList@584[1] { ResolutionCandidate@585 }
-    <name not found> = ArrayList@586[1] { ResolutionCandidate@585 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@582 {
+    <name not found> = ArrayList@583[1] { ResolutionCandidate@584 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@587 {
-    <name not found> = ArrayList@588[1] { ResolutionCandidate@589 }
-    <name not found> = ArrayList@590[1] { ResolutionCandidate@589 }
+ResolutionTaskHolder@585 {
+    <name not found> = ArrayList@586[1] { ResolutionCandidate@587 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@588 {
+    <name not found> = ArrayList@589[1] { ResolutionCandidate@590 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@591 {
     <name not found> = ArrayList@592[1] { ResolutionCandidate@593 }
-    <name not found> = ArrayList@594[1] { ResolutionCandidate@593 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@595 {
-    <name not found> = ArrayList@596[1] { ResolutionCandidate@597 }
-    <name not found> = ArrayList@598[1] { ResolutionCandidate@597 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@594 {
+    <name not found> = ArrayList@595[1] { ResolutionCandidate@596 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@599 {
-    <name not found> = ArrayList@600[1] { ResolutionCandidate@601 }
-    <name not found> = ArrayList@602[1] { ResolutionCandidate@601 }
+ResolutionTaskHolder@597 {
+    <name not found> = ArrayList@598[1] { ResolutionCandidate@599 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@600 {
+    <name not found> = ArrayList@601[1] { ResolutionCandidate@602 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@603 {
     <name not found> = ArrayList@604[1] { ResolutionCandidate@605 }
-    <name not found> = ArrayList@606[1] { ResolutionCandidate@605 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@607 {
-    <name not found> = ArrayList@608[1] { ResolutionCandidate@609 }
-    <name not found> = ArrayList@610[1] { ResolutionCandidate@609 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@606 {
+    <name not found> = ArrayList@607[1] { ResolutionCandidate@608 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@611 {
-    <name not found> = ArrayList@612[1] { ResolutionCandidate@613 }
-    <name not found> = ArrayList@614[1] { ResolutionCandidate@613 }
+ResolutionTaskHolder@609 {
+    <name not found> = ArrayList@610[1] { ResolutionCandidate@611 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@612 {
+    <name not found> = ArrayList@613[1] { ResolutionCandidate@614 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@615 {
     <name not found> = ArrayList@616[1] { ResolutionCandidate@617 }
-    <name not found> = ArrayList@618[1] { ResolutionCandidate@617 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@619 {
-    <name not found> = ArrayList@620[1] { ResolutionCandidate@621 }
-    <name not found> = ArrayList@622[1] { ResolutionCandidate@621 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@618 {
+    <name not found> = ArrayList@619[1] { ResolutionCandidate@620 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@623 {
-    <name not found> = ArrayList@624[1] { ResolutionCandidate@625 }
-    <name not found> = ArrayList@626[1] { ResolutionCandidate@625 }
+ResolutionTaskHolder@621 {
+    <name not found> = ArrayList@622[1] { ResolutionCandidate@623 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@624 {
+    <name not found> = ArrayList@625[1] { ResolutionCandidate@626 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@627 {
     <name not found> = ArrayList@628[1] { ResolutionCandidate@629 }
-    <name not found> = ArrayList@630[1] { ResolutionCandidate@629 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@631 {
-    <name not found> = ArrayList@632[1] { ResolutionCandidate@633 }
-    <name not found> = ArrayList@634[1] { ResolutionCandidate@633 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@630 {
+    <name not found> = ArrayList@631[1] { ResolutionCandidate@632 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@635 {
-    <name not found> = ArrayList@636[1] { ResolutionCandidate@637 }
-    <name not found> = ArrayList@638[1] { ResolutionCandidate@637 }
+ResolutionTaskHolder@633 {
+    <name not found> = ArrayList@634[1] { ResolutionCandidate@635 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@636 {
+    <name not found> = ArrayList@637[1] { ResolutionCandidate@638 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@639 {
     <name not found> = ArrayList@640[1] { ResolutionCandidate@641 }
-    <name not found> = ArrayList@642[1] { ResolutionCandidate@641 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@643 {
-    <name not found> = ArrayList@644[1] { ResolutionCandidate@645 }
-    <name not found> = ArrayList@646[1] { ResolutionCandidate@645 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@642 {
+    <name not found> = ArrayList@643[1] { ResolutionCandidate@644 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@647 {
-    <name not found> = ArrayList@648[1] { ResolutionCandidate@649 }
-    <name not found> = ArrayList@650[1] { ResolutionCandidate@649 }
+ResolutionTaskHolder@645 {
+    <name not found> = ArrayList@646[1] { ResolutionCandidate@647 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@648 {
+    <name not found> = ArrayList@649[1] { ResolutionCandidate@650 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@651 {
     <name not found> = ArrayList@652[1] { ResolutionCandidate@653 }
-    <name not found> = ArrayList@654[1] { ResolutionCandidate@653 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@655 {
-    <name not found> = ArrayList@656[1] { ResolutionCandidate@657 }
-    <name not found> = ArrayList@658[1] { ResolutionCandidate@657 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@654 {
+    <name not found> = ArrayList@655[1] { ResolutionCandidate@656 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@659 {
-    <name not found> = ArrayList@660[1] { ResolutionCandidate@661 }
-    <name not found> = ArrayList@662[1] { ResolutionCandidate@661 }
+ResolutionTaskHolder@657 {
+    <name not found> = ArrayList@658[1] { ResolutionCandidate@659 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@660 {
+    <name not found> = ArrayList@661[1] { ResolutionCandidate@662 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
 ResolutionTaskHolder@663 {
     <name not found> = ArrayList@664[1] { ResolutionCandidate@665 }
-    <name not found> = ArrayList@666[1] { ResolutionCandidate@665 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@667 {
-    <name not found> = ArrayList@668[1] { ResolutionCandidate@669 }
-    <name not found> = ArrayList@670[1] { ResolutionCandidate@669 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@666 {
+    <name not found> = ArrayList@667[1] { ResolutionCandidate@668 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@671 {
-    <name not found> = ArrayList@672[1] { ResolutionCandidate@673 }
-    <name not found> = ArrayList@674[1] { ResolutionCandidate@673 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@669 {
+    <name not found> = ArrayList@670[1] { ResolutionCandidate@671 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@675 {
-    <name not found> = ArrayList@676[1] { ResolutionCandidate@677 }
-    <name not found> = ArrayList@678[1] { ResolutionCandidate@677 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@672 {
+    <name not found> = ArrayList@673[1] { ResolutionCandidate@674 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@679 {
-    <name not found> = ArrayList@680[1] { ResolutionCandidate@681 }
-    <name not found> = ArrayList@682[1] { ResolutionCandidate@681 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@683 {
-    <name not found> = ArrayList@684[1] { ResolutionCandidate@685 }
-    <name not found> = ArrayList@686[1] { ResolutionCandidate@685 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@687 {
-    <name not found> = ArrayList@688[1] { ResolutionCandidate@689 }
-    <name not found> = ArrayList@690[1] { ResolutionCandidate@689 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@691 {
-    <name not found> = ArrayList@692[1] { ResolutionCandidate@693 }
-    <name not found> = ArrayList@694[1] { ResolutionCandidate@693 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@695 {
-    <name not found> = ArrayList@696[1] { ResolutionCandidate@697 }
-    <name not found> = ArrayList@698[1] { ResolutionCandidate@697 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@699 {
-    <name not found> = ArrayList@700[1] { ResolutionCandidate@701 }
-    <name not found> = ArrayList@702[1] { ResolutionCandidate@701 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@703 {
-    <name not found> = ArrayList@704[1] { ResolutionCandidate@705 }
-    <name not found> = ArrayList@706[1] { ResolutionCandidate@705 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@707 {
-    <name not found> = ArrayList@708[1] { ResolutionCandidate@709 }
-    <name not found> = ArrayList@710[1] { ResolutionCandidate@709 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@711 {
-    <name not found> = ArrayList@712[1] { ResolutionCandidate@713 }
-    <name not found> = ArrayList@714[1] { ResolutionCandidate@713 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@715 {
-    <name not found> = ArrayList@716[1] { ResolutionCandidate@717 }
-    <name not found> = ArrayList@718[1] { ResolutionCandidate@717 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@719 {
-    <name not found> = ArrayList@720[1] { ResolutionCandidate@721 }
-    <name not found> = ArrayList@722[1] { ResolutionCandidate@721 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@723 {
-    <name not found> = ArrayList@724[1] { ResolutionCandidate@725 }
-    <name not found> = ArrayList@726[1] { ResolutionCandidate@725 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@727 {
-    <name not found> = ArrayList@728[1] { ResolutionCandidate@729 }
-    <name not found> = ArrayList@730[1] { ResolutionCandidate@729 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@731 {
-    <name not found> = ArrayList@732[1] { ResolutionCandidate@733 }
-    <name not found> = ArrayList@734[1] { ResolutionCandidate@733 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@735 {
-    <name not found> = ArrayList@736[1] { ResolutionCandidate@737 }
-    <name not found> = ArrayList@738[1] { ResolutionCandidate@737 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@739 {
-    <name not found> = ArrayList@740[1] { ResolutionCandidate@741 }
-    <name not found> = ArrayList@742[1] { ResolutionCandidate@741 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@743 {
-    <name not found> = ArrayList@744[1] { ResolutionCandidate@745 }
-    <name not found> = ArrayList@746[1] { ResolutionCandidate@745 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@747 {
-    <name not found> = ArrayList@748[1] { ResolutionCandidate@749 }
-    <name not found> = ArrayList@750[1] { ResolutionCandidate@749 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@751 {
-    <name not found> = ArrayList@752[1] { ResolutionCandidate@753 }
-    <name not found> = ArrayList@754[1] { ResolutionCandidate@753 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@755 {
-    <name not found> = ArrayList@756[1] { ResolutionCandidate@757 }
-    <name not found> = ArrayList@758[1] { ResolutionCandidate@757 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@759 {
-    <name not found> = ArrayList@760[1] { ResolutionCandidate@761 }
-    <name not found> = ArrayList@762[1] { ResolutionCandidate@761 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@763 {
-    <name not found> = ArrayList@764[1] { ResolutionCandidate@765 }
-    <name not found> = ArrayList@766[1] { ResolutionCandidate@765 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@767 {
-    <name not found> = ArrayList@768[1] { ResolutionCandidate@769 }
-    <name not found> = ArrayList@770[1] { ResolutionCandidate@769 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@771 {
-    <name not found> = ArrayList@772[1] { ResolutionCandidate@773 }
-    <name not found> = ArrayList@774[1] { ResolutionCandidate@773 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@775 {
-    <name not found> = ArrayList@776[1] { ResolutionCandidate@777 }
-    <name not found> = ArrayList@778[1] { ResolutionCandidate@777 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@779 {
-    <name not found> = ArrayList@780[1] { ResolutionCandidate@781 }
-    <name not found> = ArrayList@782[1] { ResolutionCandidate@781 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@783 {
-    <name not found> = ArrayList@784[1] { ResolutionCandidate@785 }
-    <name not found> = ArrayList@786[1] { ResolutionCandidate@785 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@787 {
-    <name not found> = ArrayList@788[1] { ResolutionCandidate@789 }
-    <name not found> = ArrayList@790[1] { ResolutionCandidate@789 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@791 {
-    <name not found> = ArrayList@792[1] { ResolutionCandidate@793 }
-    <name not found> = ArrayList@794[1] { ResolutionCandidate@793 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@795 {
-    <name not found> = ArrayList@796[1] { ResolutionCandidate@797 }
-    <name not found> = ArrayList@798[1] { ResolutionCandidate@797 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@799 {
-    <name not found> = ArrayList@800[1] { ResolutionCandidate@801 }
-    <name not found> = ArrayList@802[1] { ResolutionCandidate@801 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@803 {
-    <name not found> = ArrayList@804[1] { ResolutionCandidate@805 }
-    <name not found> = ArrayList@806[1] { ResolutionCandidate@805 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@807 {
-    <name not found> = ArrayList@808[1] { ResolutionCandidate@809 }
-    <name not found> = ArrayList@810[1] { ResolutionCandidate@809 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@811 {
-    <name not found> = ArrayList@812[1] { ResolutionCandidate@813 }
-    <name not found> = ArrayList@814[1] { ResolutionCandidate@813 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@815 {
-    <name not found> = ArrayList@816[1] { ResolutionCandidate@817 }
-    <name not found> = ArrayList@818[1] { ResolutionCandidate@817 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@819 {
-    <name not found> = ArrayList@820[1] { ResolutionCandidate@821 }
-    <name not found> = ArrayList@822[1] { ResolutionCandidate@821 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@823 {
-    <name not found> = ArrayList@824[1] { ResolutionCandidate@825 }
-    <name not found> = ArrayList@826[1] { ResolutionCandidate@825 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@827 {
-    <name not found> = ArrayList@828[1] { ResolutionCandidate@829 }
-    <name not found> = ArrayList@830[1] { ResolutionCandidate@829 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@831 {
-    <name not found> = ArrayList@832[1] { ResolutionCandidate@833 }
-    <name not found> = ArrayList@834[1] { ResolutionCandidate@833 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@835 {
-    <name not found> = ArrayList@836[1] { ResolutionCandidate@837 }
-    <name not found> = ArrayList@838[1] { ResolutionCandidate@837 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@839 {
-    <name not found> = ArrayList@840[1] { ResolutionCandidate@841 }
-    <name not found> = ArrayList@842[1] { ResolutionCandidate@841 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@843 {
-    <name not found> = ArrayList@844[1] { ResolutionCandidate@845 }
-    <name not found> = ArrayList@846[1] { ResolutionCandidate@845 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@847 {
-    <name not found> = ArrayList@848[1] { ResolutionCandidate@849 }
-    <name not found> = ArrayList@850[1] { ResolutionCandidate@849 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@851 {
-    <name not found> = ArrayList@852[1] { ResolutionCandidate@853 }
-    <name not found> = ArrayList@854[1] { ResolutionCandidate@853 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@855 {
-    <name not found> = ArrayList@856[1] { ResolutionCandidate@857 }
-    <name not found> = ArrayList@858[1] { ResolutionCandidate@857 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@859 {
-    <name not found> = ArrayList@860[1] { ResolutionCandidate@861 }
-    <name not found> = ArrayList@862[1] { ResolutionCandidate@861 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@863 {
-    <name not found> = ArrayList@864[1] { ResolutionCandidate@865 }
-    <name not found> = ArrayList@866[1] { ResolutionCandidate@865 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@867 {
-    <name not found> = ArrayList@868[1] { ResolutionCandidate@869 }
-    <name not found> = ArrayList@870[1] { ResolutionCandidate@869 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@871 {
-    <name not found> = ArrayList@872[1] { ResolutionCandidate@873 }
-    <name not found> = ArrayList@874[1] { ResolutionCandidate@873 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@875 {
-    <name not found> = ArrayList@876[1] { ResolutionCandidate@877 }
-    <name not found> = ArrayList@878[1] { ResolutionCandidate@877 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@879 {
-    <name not found> = ArrayList@880[1] { ResolutionCandidate@881 }
-    <name not found> = ArrayList@882[1] { ResolutionCandidate@881 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@883 {
-    <name not found> = ArrayList@884[1] { ResolutionCandidate@885 }
-    <name not found> = ArrayList@886[1] { ResolutionCandidate@885 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@887 {
-    <name not found> = ArrayList@888[1] { ResolutionCandidate@889 }
-    <name not found> = ArrayList@890[1] { ResolutionCandidate@889 }
+null {
+    <name not found> = ArrayList@675[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@676[1] { ResolutionCandidate@647 }
+    <name not found> = ArrayList@677[1] { ResolutionCandidate@551 }
+    <name not found> = ArrayList@678[1] { ResolutionCandidate@266 }
+    <name not found> = ArrayList@679[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@680[1] { ResolutionCandidate@554 }
+    <name not found> = ArrayList@681[1] { ResolutionCandidate@608 }
+    <name not found> = ArrayList@682[1] { ResolutionCandidate@566 }
+    <name not found> = ArrayList@683[1] { ResolutionCandidate@668 }
+    <name not found> = ArrayList@684[1] { ResolutionCandidate@224 }
+    <name not found> = ArrayList@685[1] { ResolutionCandidate@125 }
+    <name not found> = ArrayList@686[1] { ResolutionCandidate@233 }
+    <name not found> = ArrayList@687[1] { ResolutionCandidate@398 }
+    <name not found> = ArrayList@688[1] { ResolutionCandidate@284 }
+    <name not found> = ArrayList@689[1] { ResolutionCandidate@371 }
+    <name not found> = ArrayList@690[1] { ResolutionCandidate@326 }
+    <name not found> = ArrayList@691[1] { ResolutionCandidate@413 }
+    <name not found> = ArrayList@692[1] { ResolutionCandidate@275 }
+    <name not found> = ArrayList@693[1] { ResolutionCandidate@269 }
+    <name not found> = ArrayList@694[1] { ResolutionCandidate@620 }
+    <name not found> = ArrayList@695[1] { ResolutionCandidate@443 }
+    <name not found> = ArrayList@696[1] { ResolutionCandidate@497 }
+    <name not found> = ArrayList@697[1] { ResolutionCandidate@389 }
+    <name not found> = ArrayList@698[1] { ResolutionCandidate@467 }
+    <name not found> = ArrayList@699[1] { ResolutionCandidate@143 }
+    <name not found> = ArrayList@700[1] { ResolutionCandidate@530 }
+    <name not found> = ArrayList@701[1] { ResolutionCandidate@176 }
+    <name not found> = ArrayList@702[1] { ResolutionCandidate@152 }
+    <name not found> = ArrayList@703[1] { ResolutionCandidate@560 }
+    <name not found> = ArrayList@704[1] { ResolutionCandidate@482 }
+    <name not found> = ArrayList@705[1] { ResolutionCandidate@461 }
+    <name not found> = ArrayList@706[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@707[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@708[1] { ResolutionCandidate@161 }
+    <name not found> = ArrayList@709[1] { ResolutionCandidate@287 }
+    <name not found> = ArrayList@710[1] { ResolutionCandidate@341 }
+    <name not found> = ArrayList@711[1] { ResolutionCandidate@599 }
+    <name not found> = ArrayList@712[1] { ResolutionCandidate@425 }
+    <name not found> = ArrayList@713[1] { ResolutionCandidate@212 }
+    <name not found> = ArrayList@714[1] { ResolutionCandidate@254 }
+    <name not found> = ArrayList@715[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@716[1] { ResolutionCandidate@470 }
+    <name not found> = ArrayList@717[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@718[1] { ResolutionCandidate@572 }
+    <name not found> = ArrayList@719[1] { ResolutionCandidate@257 }
+    <name not found> = ArrayList@720[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@721[1] { ResolutionCandidate@539 }
+    <name not found> = ArrayList@722[1] { ResolutionCandidate@368 }
+    <name not found> = ArrayList@723[1] { ResolutionCandidate@419 }
+    <name not found> = ArrayList@724[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@725[1] { ResolutionCandidate@548 }
+    <name not found> = ArrayList@726[1] { ResolutionCandidate@215 }
+    <name not found> = ArrayList@727[1] { ResolutionCandidate@134 }
+    <name not found> = ArrayList@728[1] { ResolutionCandidate@401 }
+    <name not found> = ArrayList@729[1] { ResolutionCandidate@167 }
+    <name not found> = ArrayList@730[1] { ResolutionCandidate@209 }
+    <name not found> = ArrayList@731[1] { ResolutionCandidate@422 }
+    <name not found> = ArrayList@732[1] { ResolutionCandidate@446 }
+    <name not found> = ArrayList@733[1] { ResolutionCandidate@293 }
+    <name not found> = ArrayList@734[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@735[1] { ResolutionCandidate@251 }
+    <name not found> = ArrayList@736[1] { ResolutionCandidate@593 }
+    <name not found> = ArrayList@737[1] { ResolutionCandidate@632 }
+    <name not found> = ArrayList@738[1] { ResolutionCandidate@113 }
+    <name not found> = ArrayList@739[1] { ResolutionCandidate@623 }
+    <name not found> = ArrayList@740[1] { ResolutionCandidate@635 }
+    <name not found> = ArrayList@741[1] { ResolutionCandidate@674 }
+    <name not found> = ArrayList@742[1] { ResolutionCandidate@278 }
+    <name not found> = ArrayList@743[1] { ResolutionCandidate@335 }
+    <name not found> = ArrayList@744[1] { ResolutionCandidate@542 }
+    <name not found> = ArrayList@745[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@746[1] { ResolutionCandidate@512 }
+    <name not found> = ArrayList@747[1] { ResolutionCandidate@191 }
+    <name not found> = ArrayList@748[1] { ResolutionCandidate@317 }
+    <name not found> = ArrayList@749[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@750[1] { ResolutionCandidate@617 }
+    <name not found> = ArrayList@751[1] { ResolutionCandidate@227 }
+    <name not found> = ArrayList@752[1] { ResolutionCandidate@365 }
+    <name not found> = ArrayList@753[1] { ResolutionCandidate@164 }
+    <name not found> = ArrayList@754[1] { ResolutionCandidate@500 }
+    <name not found> = ArrayList@755[1] { ResolutionCandidate@428 }
+    <name not found> = ArrayList@756[1] { ResolutionCandidate@149 }
+    <name not found> = ArrayList@757[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@758[1] { ResolutionCandidate@347 }
+    <name not found> = ArrayList@759[1] { ResolutionCandidate@587 }
+    <name not found> = ArrayList@760[1] { ResolutionCandidate@203 }
+    <name not found> = ArrayList@761[1] { ResolutionCandidate@626 }
+    <name not found> = ArrayList@762[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@763[1] { ResolutionCandidate@236 }
+    <name not found> = ArrayList@764[1] { ResolutionCandidate@197 }
+    <name not found> = ArrayList@765[1] { ResolutionCandidate@533 }
+    <name not found> = ArrayList@766[1] { ResolutionCandidate@659 }
+    <name not found> = ArrayList@767[1] { ResolutionCandidate@488 }
+    <name not found> = ArrayList@768[1] { ResolutionCandidate@362 }
+    <name not found> = ArrayList@769[1] { ResolutionCandidate@290 }
+    <name not found> = ArrayList@770[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@771[1] { ResolutionCandidate@638 }
+    <name not found> = ArrayList@772[1] { ResolutionCandidate@653 }
+    <name not found> = ArrayList@773[1] { ResolutionCandidate@395 }
+    <name not found> = ArrayList@774[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@775[1] { ResolutionCandidate@296 }
+    <name not found> = ArrayList@776[1] { ResolutionCandidate@392 }
+    <name not found> = ArrayList@777[1] { ResolutionCandidate@563 }
+    <name not found> = ArrayList@778[1] { ResolutionCandidate@281 }
+    <name not found> = ArrayList@779[1] { ResolutionCandidate@473 }
+    <name not found> = ArrayList@780[1] { ResolutionCandidate@230 }
+    <name not found> = ArrayList@781[1] { ResolutionCandidate@206 }
+    <name not found> = ArrayList@782[1] { ResolutionCandidate@611 }
+    <name not found> = ArrayList@783[1] { ResolutionCandidate@404 }
+    <name not found> = ArrayList@784[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@785[1] { ResolutionCandidate@239 }
+    <name not found> = ArrayList@786[1] { ResolutionCandidate@464 }
+    <name not found> = ArrayList@787[1] { ResolutionCandidate@386 }
+    <name not found> = ArrayList@788[1] { ResolutionCandidate@650 }
+    <name not found> = ArrayList@789[1] { ResolutionCandidate@527 }
+    <name not found> = ArrayList@790[1] { ResolutionCandidate@569 }
+    <name not found> = ArrayList@791[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@792[1] { ResolutionCandidate@578 }
+    <name not found> = ArrayList@793[1] { ResolutionCandidate@503 }
+    <name not found> = ArrayList@794[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@795[1] { ResolutionCandidate@182 }
+    <name not found> = ArrayList@796[1] { ResolutionCandidate@641 }
+    <name not found> = ArrayList@797[1] { ResolutionCandidate@416 }
+    <name not found> = ArrayList@798[1] { ResolutionCandidate@146 }
+    <name not found> = ArrayList@799[1] { ResolutionCandidate@440 }
+    <name not found> = ArrayList@800[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@801[1] { ResolutionCandidate@260 }
+    <name not found> = ArrayList@802[1] { ResolutionCandidate@662 }
+    <name not found> = ArrayList@803[1] { ResolutionCandidate@173 }
+    <name not found> = ArrayList@804[1] { ResolutionCandidate@524 }
+    <name not found> = ArrayList@805[1] { ResolutionCandidate@506 }
+    <name not found> = ArrayList@806[1] { ResolutionCandidate@122 }
+    <name not found> = ArrayList@807[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@808[1] { ResolutionCandidate@584 }
+    <name not found> = ArrayList@809[1] { ResolutionCandidate@374 }
+    <name not found> = ArrayList@810[1] { ResolutionCandidate@614 }
+    <name not found> = ArrayList@811[1] { ResolutionCandidate@521 }
+    <name not found> = ArrayList@812[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@813[1] { ResolutionCandidate@485 }
+    <name not found> = ArrayList@814[1] { ResolutionCandidate@338 }
+    <name not found> = ArrayList@815[1] { ResolutionCandidate@185 }
+    <name not found> = ArrayList@816[1] { ResolutionCandidate@557 }
+    <name not found> = ArrayList@817[1] { ResolutionCandidate@596 }
+    <name not found> = ArrayList@818[1] { ResolutionCandidate@509 }
+    <name not found> = ArrayList@819[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@820[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@821[1] { ResolutionCandidate@299 }
+    <name not found> = ArrayList@822[1] { ResolutionCandidate@359 }
+    <name not found> = ArrayList@823[1] { ResolutionCandidate@575 }
+    <name not found> = ArrayList@824[1] { ResolutionCandidate@383 }
+    <name not found> = ArrayList@825[1] { ResolutionCandidate@449 }
+    <name not found> = ArrayList@826[1] { ResolutionCandidate@272 }
+    <name not found> = ArrayList@827[1] { ResolutionCandidate@545 }
+    <name not found> = ArrayList@828[1] { ResolutionCandidate@407 }
+    <name not found> = ArrayList@829[1] { ResolutionCandidate@353 }
+    <name not found> = ArrayList@830[1] { ResolutionCandidate@137 }
+    <name not found> = ArrayList@831[1] { ResolutionCandidate@218 }
+    <name not found> = ArrayList@832[1] { ResolutionCandidate@170 }
+    <name not found> = ArrayList@833[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@834[1] { ResolutionCandidate@263 }
+    <name not found> = ArrayList@835[1] { ResolutionCandidate@188 }
+    <name not found> = ArrayList@836[1] { ResolutionCandidate@410 }
+    <name not found> = ArrayList@837[1] { ResolutionCandidate@344 }
+    <name not found> = ArrayList@838[1] { ResolutionCandidate@140 }
+    <name not found> = ArrayList@839[1] { ResolutionCandidate@671 }
+    <name not found> = ArrayList@840[1] { ResolutionCandidate@536 }
+    <name not found> = ArrayList@841[1] { ResolutionCandidate@377 }
+    <name not found> = ArrayList@842[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@843[1] { ResolutionCandidate@590 }
+    <name not found> = ArrayList@844[1] { ResolutionCandidate@491 }
+    <name not found> = ArrayList@845[1] { ResolutionCandidate@179 }
+    <name not found> = ArrayList@846[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@847[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@848[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@849[1] { ResolutionCandidate@665 }
+    <name not found> = ArrayList@850[1] { ResolutionCandidate@452 }
+    <name not found> = ArrayList@851[1] { ResolutionCandidate@194 }
+    <name not found> = ArrayList@852[1] { ResolutionCandidate@302 }
+    <name not found> = ArrayList@853[1] { ResolutionCandidate@455 }
+    <name not found> = ArrayList@854[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@855[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@856[1] { ResolutionCandidate@350 }
+    <name not found> = ArrayList@857[1] { ResolutionCandidate@434 }
+    <name not found> = ArrayList@858[1] { ResolutionCandidate@380 }
+    <name not found> = ArrayList@859[1] { ResolutionCandidate@329 }
+    <name not found> = ArrayList@860[1] { ResolutionCandidate@332 }
+    <name not found> = ArrayList@861[1] { ResolutionCandidate@602 }
+    <name not found> = ArrayList@862[1] { ResolutionCandidate@476 }
+    <name not found> = ArrayList@863[1] { ResolutionCandidate@323 }
+    <name not found> = ArrayList@864[1] { ResolutionCandidate@314 }
+    <name not found> = ArrayList@865[1] { ResolutionCandidate@320 }
+    <name not found> = ArrayList@866[1] { ResolutionCandidate@128 }
+    <name not found> = ArrayList@867[1] { ResolutionCandidate@131 }
+    <name not found> = ArrayList@868[1] { ResolutionCandidate@515 }
+    <name not found> = ArrayList@869[1] { ResolutionCandidate@437 }
+    <name not found> = ArrayList@870[1] { ResolutionCandidate@305 }
+    <name not found> = ArrayList@871[1] { ResolutionCandidate@308 }
+    <name not found> = ArrayList@872[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@873[1] { ResolutionCandidate@245 }
+    <name not found> = ArrayList@874[1] { ResolutionCandidate@431 }
+    <name not found> = ArrayList@875[1] { ResolutionCandidate@242 }
+    <name not found> = ArrayList@876[1] { ResolutionCandidate@479 }
+    <name not found> = ArrayList@877[1] { ResolutionCandidate@311 }
+    <name not found> = ArrayList@878[1] { ResolutionCandidate@155 }
+    <name not found> = ArrayList@879[1] { ResolutionCandidate@248 }
+    <name not found> = ArrayList@880[1] { ResolutionCandidate@200 }
+    <name not found> = ArrayList@881[1] { ResolutionCandidate@581 }
+    <name not found> = ArrayList@882[1] { ResolutionCandidate@644 }
+    <name not found> = ArrayList@883[1] { ResolutionCandidate@356 }
+    <name not found> = ArrayList@884[1] { ResolutionCandidate@221 }
+    <name not found> = ArrayList@885[1] { ResolutionCandidate@605 }
+    <name not found> = ArrayList@886[1] { ResolutionCandidate@629 }
+    <name not found> = ArrayList@887[1] { ResolutionCandidate@518 }
+    <name not found> = ArrayList@888[1] { ResolutionCandidate@656 }
+    <name not found> = ArrayList@889[1] { ResolutionCandidate@458 }
+    <name not found> = ArrayList@890[1] { ResolutionCandidate@494 }
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
diff --git a/compiler/testData/diagnostics/tests/resolve/resolveWithSpecifiedFunctionLiteralWithId.lazy.log b/compiler/testData/diagnostics/tests/resolve/resolveWithSpecifiedFunctionLiteralWithId.lazy.log
index 01ccdc0cc0b..e67b4b9c186 100644
--- a/compiler/testData/diagnostics/tests/resolve/resolveWithSpecifiedFunctionLiteralWithId.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/resolveWithSpecifiedFunctionLiteralWithId.lazy.log
@@ -64,318 +64,321 @@ LazyJavaPackageFragment@30['lang'] {
 
 ResolutionTaskHolder@55 {
     <name not found> = ArrayList@56[10] { ResolutionCandidate@57, ResolutionCandidate@58, ResolutionCandidate@59, ... }
-    <name not found> = ArrayList@60[10] { ResolutionCandidate@57, ResolutionCandidate@58, ResolutionCandidate@59, ... }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[10] { ResolutionCandidate@63, ResolutionCandidate@64, ResolutionCandidate@65, ... }
-    <name not found> = ArrayList@66[10] { ResolutionCandidate@63, ResolutionCandidate@64, ResolutionCandidate@65, ... }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[10] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64, ... }
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
 }
 
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[10] { ResolutionCandidate@69, ResolutionCandidate@70, ResolutionCandidate@71, ... }
-    <name not found> = ArrayList@72[10] { ResolutionCandidate@69, ResolutionCandidate@70, ResolutionCandidate@71, ... }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[10] { ResolutionCandidate@67, ResolutionCandidate@68, ResolutionCandidate@69, ... }
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[10] { ResolutionCandidate@75, ResolutionCandidate@76, ResolutionCandidate@77, ... }
-    <name not found> = ArrayList@78[10] { ResolutionCandidate@75, ResolutionCandidate@76, ResolutionCandidate@77, ... }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[10] { ResolutionCandidate@72, ResolutionCandidate@73, ResolutionCandidate@74, ... }
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
 }
 
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[10] { ResolutionCandidate@81, ResolutionCandidate@82, ResolutionCandidate@83, ... }
-    <name not found> = ArrayList@84[10] { ResolutionCandidate@81, ResolutionCandidate@82, ResolutionCandidate@83, ... }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[10] { ResolutionCandidate@77, ResolutionCandidate@78, ResolutionCandidate@79, ... }
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
 }
 
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
+}
+
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+}
+
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
 }
 
 ResolutionTaskHolder@89 {
     <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
 }
 
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
-    <name not found> = EmptyList@48[empty]
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
+}
+
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
     <name not found> = EmptyList@48[empty]
 }
 
 ResolutionTaskHolder@101 {
     <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
 }
 
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
     <name not found> = EmptyList@48[empty]
 }
 
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
     <name not found> = EmptyList@48[empty]
+}
+
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
     <name not found> = EmptyList@48[empty]
 }
 
 ResolutionTaskHolder@113 {
     <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
-    <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
 }
 
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
-    <name not found> = EmptyList@48[empty]
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
     <name not found> = EmptyList@48[empty]
 }
 
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
+ResolutionTaskHolder@119 {
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
+}
+
+ResolutionTaskHolder@122 {
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
 }
 
 ResolutionTaskHolder@125 {
     <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@127 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
 }
 
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@131 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
+ResolutionTaskHolder@128 {
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
 }
 
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@135 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
+ResolutionTaskHolder@131 {
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
+}
+
+ResolutionTaskHolder@134 {
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
 }
 
 ResolutionTaskHolder@137 {
     <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@139 }
 }
 
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@143 }
+ResolutionTaskHolder@140 {
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
 }
 
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@147 }
+ResolutionTaskHolder@143 {
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
+}
+
+ResolutionTaskHolder@146 {
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
 }
 
 ResolutionTaskHolder@149 {
     <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@151 }
 }
 
-ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@155 }
+ResolutionTaskHolder@152 {
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
 }
 
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@159 }
+ResolutionTaskHolder@155 {
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
+}
+
+ResolutionTaskHolder@158 {
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
 }
 
 ResolutionTaskHolder@161 {
     <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@163 }
 }
 
-ResolutionTaskHolder@165 {
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@167 }
+ResolutionTaskHolder@164 {
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
 }
 
-ResolutionTaskHolder@169 {
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@171 }
+ResolutionTaskHolder@167 {
+    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
+}
+
+ResolutionTaskHolder@170 {
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
 }
 
 ResolutionTaskHolder@173 {
     <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@175 }
 }
 
-ResolutionTaskHolder@177 {
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@179 }
+ResolutionTaskHolder@176 {
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
 }
 
-ResolutionTaskHolder@181 {
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@183 }
+ResolutionTaskHolder@179 {
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
+}
+
+ResolutionTaskHolder@182 {
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
 }
 
 ResolutionTaskHolder@185 {
     <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@187 }
 }
 
-ResolutionTaskHolder@189 {
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@191 }
+ResolutionTaskHolder@188 {
+    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
 }
 
-ResolutionTaskHolder@193 {
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@195 }
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@195 }
+ResolutionTaskHolder@191 {
+    <name not found> = ArrayList@192[1] { ResolutionCandidate@193 }
+}
+
+ResolutionTaskHolder@194 {
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@196 }
 }
 
 ResolutionTaskHolder@197 {
     <name not found> = ArrayList@198[1] { ResolutionCandidate@199 }
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@199 }
 }
 
-ResolutionTaskHolder@201 {
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@203 }
+ResolutionTaskHolder@200 {
+    <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
 }
 
-ResolutionTaskHolder@205 {
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@207 }
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@207 }
+ResolutionTaskHolder@203 {
+    <name not found> = ArrayList@204[8] { ResolutionCandidate@205, ResolutionCandidate@206, ResolutionCandidate@207, ... }
 }
 
-ResolutionTaskHolder@209 {
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@211 }
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@211 }
+ResolutionTaskHolder@208 {
+    <name not found> = ArrayList@209[8] { ResolutionCandidate@210, ResolutionCandidate@211, ResolutionCandidate@212, ... }
 }
 
 ResolutionTaskHolder@213 {
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@215 }
+    <name not found> = ArrayList@214[8] { ResolutionCandidate@215, ResolutionCandidate@216, ResolutionCandidate@217, ... }
 }
 
-ResolutionTaskHolder@217 {
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@219 }
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@219 }
+ResolutionTaskHolder@218 {
+    <name not found> = ArrayList@219[8] { ResolutionCandidate@220, ResolutionCandidate@221, ResolutionCandidate@222, ... }
 }
 
-ResolutionTaskHolder@221 {
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@223 }
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@223 }
+ResolutionTaskHolder@223 {
+    <name not found> = ArrayList@224[8] { ResolutionCandidate@225, ResolutionCandidate@226, ResolutionCandidate@227, ... }
 }
 
-ResolutionTaskHolder@225 {
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@227 }
+ResolutionTaskHolder@228 {
+    <name not found> = ArrayList@229[8] { ResolutionCandidate@230, ResolutionCandidate@231, ResolutionCandidate@232, ... }
 }
 
-ResolutionTaskHolder@229 {
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@231 }
-}
-
-ResolutionTaskHolder@233 {
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@235 }
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@235 }
-}
-
-ResolutionTaskHolder@237 {
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@239 }
-}
-
-ResolutionTaskHolder@241 {
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@243 }
-}
-
-ResolutionTaskHolder@245 {
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@247 }
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@247 }
-}
-
-ResolutionTaskHolder@249 {
-    <name not found> = ArrayList@250[8] { ResolutionCandidate@251, ResolutionCandidate@252, ResolutionCandidate@253, ... }
-    <name not found> = ArrayList@254[8] { ResolutionCandidate@251, ResolutionCandidate@252, ResolutionCandidate@253, ... }
-}
-
-ResolutionTaskHolder@255 {
-    <name not found> = ArrayList@256[8] { ResolutionCandidate@257, ResolutionCandidate@258, ResolutionCandidate@259, ... }
-    <name not found> = ArrayList@260[8] { ResolutionCandidate@257, ResolutionCandidate@258, ResolutionCandidate@259, ... }
-}
-
-ResolutionTaskHolder@261 {
-    <name not found> = ArrayList@262[8] { ResolutionCandidate@263, ResolutionCandidate@264, ResolutionCandidate@265, ... }
-    <name not found> = ArrayList@266[8] { ResolutionCandidate@263, ResolutionCandidate@264, ResolutionCandidate@265, ... }
-}
-
-ResolutionTaskHolder@267 {
-    <name not found> = ArrayList@268[8] { ResolutionCandidate@269, ResolutionCandidate@270, ResolutionCandidate@271, ... }
-    <name not found> = ArrayList@272[8] { ResolutionCandidate@269, ResolutionCandidate@270, ResolutionCandidate@271, ... }
-}
-
-ResolutionTaskHolder@273 {
-    <name not found> = ArrayList@274[8] { ResolutionCandidate@275, ResolutionCandidate@276, ResolutionCandidate@277, ... }
-    <name not found> = ArrayList@278[8] { ResolutionCandidate@275, ResolutionCandidate@276, ResolutionCandidate@277, ... }
-}
-
-ResolutionTaskHolder@279 {
-    <name not found> = ArrayList@280[8] { ResolutionCandidate@281, ResolutionCandidate@282, ResolutionCandidate@283, ... }
-    <name not found> = ArrayList@284[8] { ResolutionCandidate@281, ResolutionCandidate@282, ResolutionCandidate@283, ... }
+null {
+    <name not found> = ArrayList@233[10] { ResolutionCandidate@57, ResolutionCandidate@58, ResolutionCandidate@59, ... }
+    <name not found> = ArrayList@234[10] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64, ... }
+    <name not found> = ArrayList@235[10] { ResolutionCandidate@67, ResolutionCandidate@68, ResolutionCandidate@69, ... }
+    <name not found> = ArrayList@236[10] { ResolutionCandidate@72, ResolutionCandidate@73, ResolutionCandidate@74, ... }
+    <name not found> = ArrayList@237[10] { ResolutionCandidate@77, ResolutionCandidate@78, ResolutionCandidate@79, ... }
+    <name not found> = ArrayList@238[1] { ResolutionCandidate@127 }
+    <name not found> = ArrayList@239[1] { ResolutionCandidate@145 }
+    <name not found> = ArrayList@240[1] { ResolutionCandidate@202 }
+    <name not found> = ArrayList@241[1] { ResolutionCandidate@139 }
+    <name not found> = ArrayList@242[1] { ResolutionCandidate@178 }
+    <name not found> = ArrayList@243[1] { ResolutionCandidate@184 }
+    <name not found> = ArrayList@244[1] { ResolutionCandidate@136 }
+    <name not found> = ArrayList@245[1] { ResolutionCandidate@187 }
+    <name not found> = ArrayList@246[1] { ResolutionCandidate@166 }
+    <name not found> = ArrayList@247[1] { ResolutionCandidate@151 }
+    <name not found> = ArrayList@248[1] { ResolutionCandidate@172 }
+    <name not found> = ArrayList@249[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@250[1] { ResolutionCandidate@142 }
+    <name not found> = ArrayList@251[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@252[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@253[1] { ResolutionCandidate@190 }
+    <name not found> = ArrayList@254[1] { ResolutionCandidate@193 }
+    <name not found> = ArrayList@255[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@256[1] { ResolutionCandidate@160 }
+    <name not found> = ArrayList@257[1] { ResolutionCandidate@148 }
+    <name not found> = ArrayList@258[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@259[1] { ResolutionCandidate@199 }
+    <name not found> = ArrayList@260[1] { ResolutionCandidate@154 }
+    <name not found> = ArrayList@261[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@262[1] { ResolutionCandidate@133 }
+    <name not found> = ArrayList@263[1] { ResolutionCandidate@196 }
+    <name not found> = ArrayList@264[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@265[1] { ResolutionCandidate@163 }
+    <name not found> = ArrayList@266[1] { ResolutionCandidate@169 }
+    <name not found> = ArrayList@267[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@268[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@269[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@270[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@271[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@272[1] { ResolutionCandidate@157 }
+    <name not found> = ArrayList@273[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@274[1] { ResolutionCandidate@181 }
+    <name not found> = ArrayList@275[1] { ResolutionCandidate@124 }
+    <name not found> = ArrayList@276[1] { ResolutionCandidate@175 }
+    <name not found> = ArrayList@277[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@278[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@279[8] { ResolutionCandidate@220, ResolutionCandidate@221, ResolutionCandidate@222, ... }
+    <name not found> = ArrayList@280[8] { ResolutionCandidate@230, ResolutionCandidate@231, ResolutionCandidate@232, ... }
+    <name not found> = ArrayList@281[8] { ResolutionCandidate@205, ResolutionCandidate@206, ResolutionCandidate@207, ... }
+    <name not found> = ArrayList@282[8] { ResolutionCandidate@215, ResolutionCandidate@216, ResolutionCandidate@217, ... }
+    <name not found> = ArrayList@283[8] { ResolutionCandidate@225, ResolutionCandidate@226, ResolutionCandidate@227, ... }
+    <name not found> = ArrayList@284[8] { ResolutionCandidate@210, ResolutionCandidate@211, ResolutionCandidate@212, ... }
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/resolve/resolveWithoutGenerics.lazy.log b/compiler/testData/diagnostics/tests/resolve/resolveWithoutGenerics.lazy.log
index 773f43dcf64..6adbec75054 100644
--- a/compiler/testData/diagnostics/tests/resolve/resolveWithoutGenerics.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/resolveWithoutGenerics.lazy.log
@@ -50,15 +50,6 @@ LazyJavaPackageFragment@21['lang'] {
 
 ResolutionTaskHolder@43 {
     <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
@@ -69,91 +60,103 @@ ResolutionTaskHolder@43 {
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
 }
 
 ResolutionTaskHolder@55 {
     <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
+}
+
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
 }
 
 ResolutionTaskHolder@67 {
     <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
 }
 
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
 }
 
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
+}
+
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
 }
 
 ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[5] { ResolutionCandidate@93, ResolutionCandidate@94, ResolutionCandidate@95, ... }
-    <name not found> = ArrayList@96[5] { ResolutionCandidate@93, ResolutionCandidate@94, ResolutionCandidate@95, ... }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+    <name not found> = ArrayList@80[5] { ResolutionCandidate@81, ResolutionCandidate@82, ResolutionCandidate@83, ... }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[5] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
-    <name not found> = ArrayList@102[5] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[5] { ResolutionCandidate@86, ResolutionCandidate@87, ResolutionCandidate@88, ... }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[5] { ResolutionCandidate@105, ResolutionCandidate@106, ResolutionCandidate@107, ... }
-    <name not found> = ArrayList@108[5] { ResolutionCandidate@105, ResolutionCandidate@106, ResolutionCandidate@107, ... }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[5] { ResolutionCandidate@91, ResolutionCandidate@92, ResolutionCandidate@93, ... }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[5] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113, ... }
-    <name not found> = ArrayList@114[5] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113, ... }
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[5] { ResolutionCandidate@96, ResolutionCandidate@97, ResolutionCandidate@98, ... }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+}
+
+null {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@111[5] { ResolutionCandidate@81, ResolutionCandidate@82, ResolutionCandidate@83, ... }
+    <name not found> = ArrayList@112[5] { ResolutionCandidate@91, ResolutionCandidate@92, ResolutionCandidate@93, ... }
+    <name not found> = ArrayList@113[5] { ResolutionCandidate@86, ResolutionCandidate@87, ResolutionCandidate@88, ... }
+    <name not found> = ArrayList@114[5] { ResolutionCandidate@96, ResolutionCandidate@97, ResolutionCandidate@98, ... }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
diff --git a/compiler/testData/diagnostics/tests/resolve/specialConstructions/constantsInIf.lazy.log b/compiler/testData/diagnostics/tests/resolve/specialConstructions/constantsInIf.lazy.log
index 581dc2a859a..6f28ae333d4 100644
--- a/compiler/testData/diagnostics/tests/resolve/specialConstructions/constantsInIf.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/specialConstructions/constantsInIf.lazy.log
@@ -35,3 +35,67 @@ LazyJavaPackageFragment@9['lang'] {
     functions('bar': Name@17) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@25
     memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@25
 }
+
+ResolutionTaskHolder@27 {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+}
+
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+}
+
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
+}
+
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+}
+
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+}
+
+null {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@29 }
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/resolve/specialConstructions/elvisAsCall.lazy.log b/compiler/testData/diagnostics/tests/resolve/specialConstructions/elvisAsCall.lazy.log
index ffaafd98015..f3d82910b87 100644
--- a/compiler/testData/diagnostics/tests/resolve/specialConstructions/elvisAsCall.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/specialConstructions/elvisAsCall.lazy.log
@@ -38,14 +38,14 @@ LazyJavaClassifierType@22['String'] {
 
 LazyJavaClassifierType@25['String'] {
     arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@24['String']
+    classifier = JavaClassImpl@16['String']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@18
 }
 
 LazyJavaClassifierType@28['String'] {
     arguments = ArrayList@29[empty]
-    classifier = JavaClassImpl@16['String']
+    classifier = JavaClassImpl@24['String']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@18
 }
@@ -172,29 +172,20 @@ LazyJavaPackageFragment@71['lang'] {
 
 ResolutionTaskHolder@105 {
     <name not found> = ArrayList@106[16] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
-    <name not found> = ArrayList@110[16] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
 }
 
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[16] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
-    <name not found> = ArrayList@116[16] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[16] { ResolutionCandidate@112, ResolutionCandidate@113, ResolutionCandidate@114, ... }
 }
 
-ResolutionTaskHolder@117 {
+ResolutionTaskHolder@115 {
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
     <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
+    <name not found> = EmptyList@94[empty]
+}
+
+ResolutionTaskHolder@120 {
     <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@126 }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
@@ -212,228 +203,240 @@ ResolutionTaskHolder@124 {
     <name not found> = EmptyList@94[empty]
 }
 
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
+ResolutionTaskHolder@123 {
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
+}
+
+ResolutionTaskHolder@126 {
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+}
+
+ResolutionTaskHolder@129 {
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
 }
 
 ResolutionTaskHolder@132 {
     <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
 }
 
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
+ResolutionTaskHolder@135 {
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
 }
 
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
+ResolutionTaskHolder@138 {
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
+}
+
+ResolutionTaskHolder@141 {
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
 }
 
 ResolutionTaskHolder@144 {
     <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
 }
 
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
+ResolutionTaskHolder@147 {
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
 }
 
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
+ResolutionTaskHolder@150 {
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
 }
 
+ResolutionTaskHolder@153 {
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
+}
+
 ResolutionTaskHolder@156 {
     <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
 }
 
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@162 }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
+ResolutionTaskHolder@159 {
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
 }
 
-ResolutionTaskHolder@164 {
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@166 }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
+ResolutionTaskHolder@162 {
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
+}
+
+ResolutionTaskHolder@165 {
+    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
 }
 
 ResolutionTaskHolder@168 {
     <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@170 }
 }
 
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@174 }
+ResolutionTaskHolder@171 {
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
 }
 
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@178 }
+ResolutionTaskHolder@174 {
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
+}
+
+ResolutionTaskHolder@177 {
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
 }
 
 ResolutionTaskHolder@180 {
     <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@182 }
 }
 
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@186 }
+ResolutionTaskHolder@183 {
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
 }
 
-ResolutionTaskHolder@188 {
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@190 }
+ResolutionTaskHolder@186 {
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
+}
+
+ResolutionTaskHolder@189 {
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
 }
 
 ResolutionTaskHolder@192 {
     <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@194 }
 }
 
-ResolutionTaskHolder@196 {
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@198 }
+ResolutionTaskHolder@195 {
+    <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
 }
 
-ResolutionTaskHolder@200 {
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@202 }
+ResolutionTaskHolder@198 {
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
+}
+
+ResolutionTaskHolder@201 {
+    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
 }
 
 ResolutionTaskHolder@204 {
     <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@206 }
 }
 
-ResolutionTaskHolder@208 {
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@210 }
+ResolutionTaskHolder@207 {
+    <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
 }
 
-ResolutionTaskHolder@212 {
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@214 }
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@214 }
+ResolutionTaskHolder@210 {
+    <name not found> = ArrayList@211[1] { ResolutionCandidate@212 }
+}
+
+ResolutionTaskHolder@213 {
+    <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
 }
 
 ResolutionTaskHolder@216 {
     <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@218 }
 }
 
-ResolutionTaskHolder@220 {
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@222 }
+ResolutionTaskHolder@219 {
+    <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
 }
 
-ResolutionTaskHolder@224 {
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@226 }
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@226 }
+ResolutionTaskHolder@222 {
+    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
 }
 
-ResolutionTaskHolder@228 {
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@230 }
+ResolutionTaskHolder@225 {
+    <name not found> = ArrayList@226[4] { ResolutionCandidate@227, ResolutionCandidate@228, ResolutionCandidate@229, ... }
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
 }
 
-ResolutionTaskHolder@232 {
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@234 }
+ResolutionTaskHolder@230 {
+    <name not found> = ArrayList@231[4] { ResolutionCandidate@232, ResolutionCandidate@233, ResolutionCandidate@234, ... }
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
 }
 
-ResolutionTaskHolder@236 {
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@238 }
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@238 }
-}
-
-ResolutionTaskHolder@240 {
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
-    <name not found> = ArrayList@243[1] { ResolutionCandidate@242 }
-}
-
-ResolutionTaskHolder@244 {
-    <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@246 }
-}
-
-ResolutionTaskHolder@248 {
-    <name not found> = ArrayList@249[1] { ResolutionCandidate@250 }
-    <name not found> = ArrayList@251[1] { ResolutionCandidate@250 }
-}
-
-ResolutionTaskHolder@252 {
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
-    <name not found> = ArrayList@255[1] { ResolutionCandidate@254 }
-}
-
-ResolutionTaskHolder@256 {
-    <name not found> = ArrayList@257[1] { ResolutionCandidate@258 }
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@258 }
-}
-
-ResolutionTaskHolder@260 {
-    <name not found> = ArrayList@261[1] { ResolutionCandidate@262 }
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@262 }
-}
-
-ResolutionTaskHolder@264 {
-    <name not found> = ArrayList@265[4] { ResolutionCandidate@266, ResolutionCandidate@267, ResolutionCandidate@268, ... }
-    <name not found> = ArrayList@269[5] { ResolutionCandidate@266, ResolutionCandidate@267, ResolutionCandidate@268, ... }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-}
-
-ResolutionTaskHolder@270 {
-    <name not found> = ArrayList@271[4] { ResolutionCandidate@272, ResolutionCandidate@273, ResolutionCandidate@274, ... }
-    <name not found> = ArrayList@275[5] { ResolutionCandidate@272, ResolutionCandidate@273, ResolutionCandidate@274, ... }
+null {
+    <name not found> = ArrayList@235[16] { ResolutionCandidate@112, ResolutionCandidate@113, ResolutionCandidate@114, ... }
+    <name not found> = ArrayList@236[16] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
+    <name not found> = ArrayList@237[1] { ResolutionCandidate@161 }
+    <name not found> = ArrayList@238[1] { ResolutionCandidate@155 }
+    <name not found> = ArrayList@239[1] { ResolutionCandidate@188 }
+    <name not found> = ArrayList@240[1] { ResolutionCandidate@197 }
+    <name not found> = ArrayList@241[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@242[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@243[1] { ResolutionCandidate@182 }
+    <name not found> = ArrayList@244[1] { ResolutionCandidate@215 }
+    <name not found> = ArrayList@245[1] { ResolutionCandidate@206 }
+    <name not found> = ArrayList@246[1] { ResolutionCandidate@146 }
+    <name not found> = ArrayList@247[1] { ResolutionCandidate@137 }
+    <name not found> = ArrayList@248[1] { ResolutionCandidate@134 }
+    <name not found> = ArrayList@249[1] { ResolutionCandidate@194 }
+    <name not found> = ArrayList@250[1] { ResolutionCandidate@125 }
+    <name not found> = ArrayList@251[1] { ResolutionCandidate@140 }
+    <name not found> = ArrayList@252[1] { ResolutionCandidate@149 }
+    <name not found> = ArrayList@253[1] { ResolutionCandidate@218 }
+    <name not found> = ArrayList@254[1] { ResolutionCandidate@128 }
+    <name not found> = ArrayList@255[1] { ResolutionCandidate@167 }
+    <name not found> = ArrayList@256[1] { ResolutionCandidate@143 }
+    <name not found> = ArrayList@257[1] { ResolutionCandidate@200 }
+    <name not found> = ArrayList@258[1] { ResolutionCandidate@185 }
+    <name not found> = ArrayList@259[1] { ResolutionCandidate@209 }
+    <name not found> = ArrayList@260[1] { ResolutionCandidate@203 }
+    <name not found> = ArrayList@261[1] { ResolutionCandidate@224 }
+    <name not found> = ArrayList@262[1] { ResolutionCandidate@131 }
+    <name not found> = ArrayList@263[1] { ResolutionCandidate@164 }
+    <name not found> = ArrayList@264[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@265[1] { ResolutionCandidate@221 }
+    <name not found> = ArrayList@266[1] { ResolutionCandidate@212 }
+    <name not found> = ArrayList@267[1] { ResolutionCandidate@173 }
+    <name not found> = ArrayList@268[1] { ResolutionCandidate@152 }
+    <name not found> = ArrayList@269[1] { ResolutionCandidate@191 }
+    <name not found> = ArrayList@270[1] { ResolutionCandidate@176 }
+    <name not found> = ArrayList@271[1] { ResolutionCandidate@170 }
+    <name not found> = ArrayList@272[1] { ResolutionCandidate@179 }
+    <name not found> = ArrayList@273[1] { ResolutionCandidate@122 }
+    <name not found> = ArrayList@274[5] { ResolutionCandidate@227, ResolutionCandidate@228, ResolutionCandidate@229, ... }
+    <name not found> = ArrayList@275[5] { ResolutionCandidate@232, ResolutionCandidate@233, ResolutionCandidate@234, ... }
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
     <name not found> = EmptyList@94[empty]
diff --git a/compiler/testData/diagnostics/tests/resolve/specialConstructions/exclExclAsCall.lazy.log b/compiler/testData/diagnostics/tests/resolve/specialConstructions/exclExclAsCall.lazy.log
index cd85b7d2eec..0bf3b2ab85f 100644
--- a/compiler/testData/diagnostics/tests/resolve/specialConstructions/exclExclAsCall.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/specialConstructions/exclExclAsCall.lazy.log
@@ -45,14 +45,14 @@ LazyJavaClassifierType@25['String'] {
 
 LazyJavaClassifierType@28['String'] {
     arguments = ArrayList@29[empty]
-    classifier = JavaClassImpl@21['String']
+    classifier = JavaClassImpl@24['String']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@18
 }
 
 LazyJavaClassifierType@30['String'] {
     arguments = ArrayList@31[empty]
-    classifier = JavaClassImpl@24['String']
+    classifier = JavaClassImpl@21['String']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@18
 }
@@ -162,153 +162,156 @@ LazyJavaPackageFragment@67['lang'] {
 
 ResolutionTaskHolder@96 {
     <name not found> = ArrayList@97[16] { ResolutionCandidate@98, ResolutionCandidate@99, ResolutionCandidate@100, ... }
-    <name not found> = ArrayList@101[16] { ResolutionCandidate@98, ResolutionCandidate@99, ResolutionCandidate@100, ... }
 }
 
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
     <name not found> = EmptyList@86[empty]
     <name not found> = EmptyList@86[empty]
 }
 
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
     <name not found> = EmptyList@86[empty]
     <name not found> = EmptyList@86[empty]
+}
+
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
     <name not found> = EmptyList@86[empty]
     <name not found> = EmptyList@86[empty]
 }
 
 ResolutionTaskHolder@110 {
     <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
     <name not found> = EmptyList@86[empty]
     <name not found> = EmptyList@86[empty]
 }
 
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
+ResolutionTaskHolder@113 {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
     <name not found> = EmptyList@86[empty]
     <name not found> = EmptyList@86[empty]
 }
 
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
     <name not found> = EmptyList@86[empty]
     <name not found> = EmptyList@86[empty]
+}
+
+ResolutionTaskHolder@119 {
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
     <name not found> = EmptyList@86[empty]
     <name not found> = EmptyList@86[empty]
 }
 
 ResolutionTaskHolder@122 {
     <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
     <name not found> = EmptyList@86[empty]
     <name not found> = EmptyList@86[empty]
 }
 
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
+ResolutionTaskHolder@125 {
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
     <name not found> = EmptyList@86[empty]
     <name not found> = EmptyList@86[empty]
 }
 
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@132 }
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
+ResolutionTaskHolder@128 {
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
+}
+
+ResolutionTaskHolder@131 {
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
 }
 
 ResolutionTaskHolder@134 {
     <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@136 }
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
 }
 
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@140 }
+ResolutionTaskHolder@137 {
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
 }
 
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@144 }
+ResolutionTaskHolder@140 {
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
+}
+
+ResolutionTaskHolder@143 {
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
 }
 
 ResolutionTaskHolder@146 {
     <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@148 }
 }
 
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@152 }
+ResolutionTaskHolder@149 {
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
 }
 
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@156 }
+ResolutionTaskHolder@152 {
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
+}
+
+ResolutionTaskHolder@155 {
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
 }
 
 ResolutionTaskHolder@158 {
     <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@160 }
 }
 
-ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@164 }
+ResolutionTaskHolder@161 {
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
 }
 
-ResolutionTaskHolder@166 {
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@168 }
+ResolutionTaskHolder@164 {
+    <name not found> = ArrayList@165[4] { ResolutionCandidate@166, ResolutionCandidate@167, ResolutionCandidate@168, ... }
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
 }
 
-ResolutionTaskHolder@170 {
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@172 }
-}
-
-ResolutionTaskHolder@174 {
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@176 }
-}
-
-ResolutionTaskHolder@178 {
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@180 }
-}
-
-ResolutionTaskHolder@182 {
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@184 }
-}
-
-ResolutionTaskHolder@186 {
-    <name not found> = ArrayList@187[4] { ResolutionCandidate@188, ResolutionCandidate@189, ResolutionCandidate@190, ... }
-    <name not found> = ArrayList@191[5] { ResolutionCandidate@188, ResolutionCandidate@189, ResolutionCandidate@190, ... }
+null {
+    <name not found> = ArrayList@169[16] { ResolutionCandidate@98, ResolutionCandidate@99, ResolutionCandidate@100, ... }
+    <name not found> = ArrayList@170[1] { ResolutionCandidate@139 }
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@160 }
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@157 }
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@176[1] { ResolutionCandidate@124 }
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@163 }
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@127 }
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@154 }
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@148 }
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@136 }
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@145 }
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@142 }
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@151 }
+    <name not found> = ArrayList@189[1] { ResolutionCandidate@133 }
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@191[5] { ResolutionCandidate@166, ResolutionCandidate@167, ResolutionCandidate@168, ... }
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
     <name not found> = EmptyList@86[empty]
     <name not found> = EmptyList@86[empty]
     <name not found> = EmptyList@86[empty]
diff --git a/compiler/testData/diagnostics/tests/resolve/specialConstructions/multipleSuperClasses.lazy.log b/compiler/testData/diagnostics/tests/resolve/specialConstructions/multipleSuperClasses.lazy.log
index 33e2661e54f..4342a434fa7 100644
--- a/compiler/testData/diagnostics/tests/resolve/specialConstructions/multipleSuperClasses.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/specialConstructions/multipleSuperClasses.lazy.log
@@ -28,3 +28,56 @@ LazyJavaPackageFragment@9['java'] {
     functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@26
     memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
 }
+
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+}
+
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
+}
+
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+}
+
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+}
+
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
+}
+
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
+}
+
+null {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@51 }
+}
diff --git a/compiler/testData/diagnostics/tests/resolve/specialConstructions/reportTypeMismatchDeeplyOnBranches.lazy.log b/compiler/testData/diagnostics/tests/resolve/specialConstructions/reportTypeMismatchDeeplyOnBranches.lazy.log
index 1a6dfc9d0f0..53d08ea9414 100644
--- a/compiler/testData/diagnostics/tests/resolve/specialConstructions/reportTypeMismatchDeeplyOnBranches.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/specialConstructions/reportTypeMismatchDeeplyOnBranches.lazy.log
@@ -38,73 +38,105 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@25[empty]
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@38 {
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
     <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
+    <name not found> = EmptyList@25[empty]
+}
+
+ResolutionTaskHolder@41 {
     <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@25[empty]
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
     <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
     <name not found> = EmptyList@25[empty]
+}
+
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
     <name not found> = EmptyList@25[empty]
 }
 
 ResolutionTaskHolder@66 {
     <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+}
+
+ResolutionTaskHolder@69 {
     <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
@@ -122,166 +154,137 @@ ResolutionTaskHolder@80 {
     <name not found> = EmptyList@25[empty]
 }
 
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
+}
+
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
+}
+
 ResolutionTaskHolder@84 {
     <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
+}
+
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
 }
 
 ResolutionTaskHolder@96 {
     <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
 }
 
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
+}
+
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
 }
 
 ResolutionTaskHolder@108 {
     <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
 }
 
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
+ResolutionTaskHolder@111 {
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
 }
 
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
+}
+
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
 }
 
 ResolutionTaskHolder@120 {
     <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
 }
 
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@126 }
+ResolutionTaskHolder@123 {
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
 }
 
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
+ResolutionTaskHolder@126 {
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
+}
+
+ResolutionTaskHolder@129 {
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
 }
 
 ResolutionTaskHolder@132 {
     <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
 }
 
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
-}
-
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
-}
-
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
-}
-
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
-}
-
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
-}
-
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
-}
-
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@162 }
-}
-
-ResolutionTaskHolder@164 {
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@166 }
-}
-
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@170 }
+null {
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@125 }
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@131 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@128 }
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@134 }
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@113 }
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@166[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@168[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@122 }
+    <name not found> = ArrayList@170[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@74 }
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/resolve/wrongNumberOfTypeArguments.lazy.log b/compiler/testData/diagnostics/tests/resolve/wrongNumberOfTypeArguments.lazy.log
index 9127a36caf4..882b661c401 100644
--- a/compiler/testData/diagnostics/tests/resolve/wrongNumberOfTypeArguments.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/wrongNumberOfTypeArguments.lazy.log
@@ -52,10 +52,6 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@38 {
     <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -73,12 +69,8 @@ ResolutionTaskHolder@38 {
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -96,7 +88,18 @@ ResolutionTaskHolder@42 {
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+}
+
+null {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@43 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/scopes/AmbiguityBetweenRootAndPackage.lazy.log b/compiler/testData/diagnostics/tests/scopes/AmbiguityBetweenRootAndPackage.lazy.log
index e9fae8bae71..8f0bfce1c30 100644
--- a/compiler/testData/diagnostics/tests/scopes/AmbiguityBetweenRootAndPackage.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/AmbiguityBetweenRootAndPackage.lazy.log
@@ -40,9 +40,12 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[2] { ResolutionCandidate@30, ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[2] { ResolutionCandidate@30, ResolutionCandidate@31 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+}
+
+null {
+    <name not found> = ArrayList@32[2] { ResolutionCandidate@30, ResolutionCandidate@31 }
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/scopes/AmbiguousNonExtensions.lazy.log b/compiler/testData/diagnostics/tests/scopes/AmbiguousNonExtensions.lazy.log
index b268675c62c..6001edd2fe0 100644
--- a/compiler/testData/diagnostics/tests/scopes/AmbiguousNonExtensions.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/AmbiguousNonExtensions.lazy.log
@@ -53,16 +53,19 @@ LazyJavaPackageFragment@17['lang'] {
 
 ResolutionTaskHolder@38 {
     <name not found> = ArrayList@39[2] { ResolutionCandidate@40, ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[2] { ResolutionCandidate@40, ResolutionCandidate@41 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[2] { ResolutionCandidate@45, ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[2] { ResolutionCandidate@45, ResolutionCandidate@46 }
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[2] { ResolutionCandidate@44, ResolutionCandidate@45 }
+    <name not found> = EmptyList@29[empty]
+}
+
+null {
+    <name not found> = ArrayList@46[2] { ResolutionCandidate@44, ResolutionCandidate@45 }
+    <name not found> = ArrayList@47[2] { ResolutionCandidate@40, ResolutionCandidate@41 }
+    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/scopes/DontImportRootScope.lazy.log b/compiler/testData/diagnostics/tests/scopes/DontImportRootScope.lazy.log
index fbe44176f30..49f80828f38 100644
--- a/compiler/testData/diagnostics/tests/scopes/DontImportRootScope.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/DontImportRootScope.lazy.log
@@ -56,37 +56,106 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@43 {
     <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@31[empty]
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
     <name not found> = EmptyList@31[empty]
 }
 
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+}
+
 ResolutionTaskHolder@55 {
     <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+}
+
+ResolutionTaskHolder@58 {
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
 }
 
 ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+}
+
+ResolutionTaskHolder@61 {
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+}
+
+ResolutionTaskHolder@62 {
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
 }
 
 ResolutionTaskHolder@63 {
@@ -98,21 +167,17 @@ ResolutionTaskHolder@63 {
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@64 {
+null {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@57 }
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
@@ -134,65 +199,3 @@ ResolutionTaskHolder@64 {
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
-
-ResolutionTaskHolder@65 {
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/scopes/ImportObjectAndUseAsSupertype.lazy.log b/compiler/testData/diagnostics/tests/scopes/ImportObjectAndUseAsSupertype.lazy.log
index 472d4d0650d..075742d33d2 100644
--- a/compiler/testData/diagnostics/tests/scopes/ImportObjectAndUseAsSupertype.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/ImportObjectAndUseAsSupertype.lazy.log
@@ -28,20 +28,23 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
+    <name not found> = EmptyList@22[empty]
+}
+
+null {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@27 }
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/scopes/ImportObjectHidesCurrentPackage.lazy.log b/compiler/testData/diagnostics/tests/scopes/ImportObjectHidesCurrentPackage.lazy.log
index 9650f99c015..8962a6a32c0 100644
--- a/compiler/testData/diagnostics/tests/scopes/ImportObjectHidesCurrentPackage.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/ImportObjectHidesCurrentPackage.lazy.log
@@ -27,7 +27,10 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@22 {
     <name not found> = ArrayList@23[1] { ResolutionCandidate@24 }
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@24 }
-    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+}
+
+null {
+    <name not found> = ArrayList@25[1] { ResolutionCandidate@24 }
     <name not found> = EmptyList@19[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/scopes/ImportTwoTimes.lazy.log b/compiler/testData/diagnostics/tests/scopes/ImportTwoTimes.lazy.log
index 823a04e2055..d9aadc1daa0 100644
--- a/compiler/testData/diagnostics/tests/scopes/ImportTwoTimes.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/ImportTwoTimes.lazy.log
@@ -31,14 +31,17 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
+}
+
+null {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@27 }
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@30 }
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/scopes/ImportTwoTimesStar.lazy.log b/compiler/testData/diagnostics/tests/scopes/ImportTwoTimesStar.lazy.log
index 09740151bed..ed1f012ef33 100644
--- a/compiler/testData/diagnostics/tests/scopes/ImportTwoTimesStar.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/ImportTwoTimesStar.lazy.log
@@ -30,14 +30,17 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@24 {
     <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
 }
 
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
+ResolutionTaskHolder@27 {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
+}
+
+null {
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@26 }
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@29 }
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/scopes/Imports.lazy.log b/compiler/testData/diagnostics/tests/scopes/Imports.lazy.log
index a00a0a61b11..cc6f4557aea 100644
--- a/compiler/testData/diagnostics/tests/scopes/Imports.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/Imports.lazy.log
@@ -108,34 +108,15 @@ LazyJavaPackageFragment@55['lang'] {
     functions('cValue': Name@98) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
     functions('dValue': Name@99) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
     functions('ext': Name@92) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('f': Name@93) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
+    functions('f': Name@100) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
     functions('fff': Name@94) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
     functions('foo': Name@95) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('i': Name@100) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    memberIndex = computeMemberIndex$1@101 // through LazyPackageFragmentScopeForJavaPackage@85
+    functions('i': Name@101) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
+    memberIndex = computeMemberIndex$1@102 // through LazyPackageFragmentScopeForJavaPackage@85
 }
 
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
@@ -158,122 +139,264 @@ ResolutionTaskHolder@102 {
 
 ResolutionTaskHolder@106 {
     <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
 }
 
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
 }
 
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
+}
+
+ResolutionTaskHolder@115 {
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
 }
 
 ResolutionTaskHolder@118 {
     <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
 }
 
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
+ResolutionTaskHolder@121 {
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
     <name not found> = EmptyList@82[empty]
 }
 
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
+ResolutionTaskHolder@124 {
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
     <name not found> = EmptyList@82[empty]
+}
+
+ResolutionTaskHolder@127 {
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
     <name not found> = EmptyList@82[empty]
 }
 
 ResolutionTaskHolder@130 {
     <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@132 }
-    <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
 }
 
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@136 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
+ResolutionTaskHolder@133 {
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
 }
 
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@140 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
+ResolutionTaskHolder@136 {
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
+}
+
+ResolutionTaskHolder@139 {
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
 }
 
 ResolutionTaskHolder@142 {
     <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@144 }
 }
 
-ResolutionTaskHolder@146 {
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@148 }
+ResolutionTaskHolder@145 {
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
 }
 
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@152 }
+ResolutionTaskHolder@148 {
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
+}
+
+ResolutionTaskHolder@151 {
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
 }
 
 ResolutionTaskHolder@154 {
     <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@156 }
+}
+
+ResolutionTaskHolder@157 {
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
 }
 
 ResolutionTaskHolder@158 {
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@160 }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+}
+
+ResolutionTaskHolder@159 {
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+}
+
+ResolutionTaskHolder@160 {
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+}
+
+ResolutionTaskHolder@161 {
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
 }
 
 ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@164 }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+}
+
+ResolutionTaskHolder@163 {
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+}
+
+ResolutionTaskHolder@164 {
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+}
+
+ResolutionTaskHolder@165 {
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
 }
 
 ResolutionTaskHolder@166 {
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@168 }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
 }
 
-ResolutionTaskHolder@170 {
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@172 }
+ResolutionTaskHolder@167 {
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
 }
 
-ResolutionTaskHolder@174 {
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
+ResolutionTaskHolder@168 {
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
@@ -282,6 +405,9 @@ ResolutionTaskHolder@174 {
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
+}
+
+ResolutionTaskHolder@169 {
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
@@ -292,19 +418,7 @@ ResolutionTaskHolder@174 {
     <name not found> = EmptyList@82[empty]
 }
 
-ResolutionTaskHolder@175 {
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
+ResolutionTaskHolder@170 {
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
@@ -315,7 +429,79 @@ ResolutionTaskHolder@175 {
     <name not found> = EmptyList@82[empty]
 }
 
-ResolutionTaskHolder@176 {
+null {
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@135 }
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@176[1] { ResolutionCandidate@132 }
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@141 }
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@126 }
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@129 }
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@153 }
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@156 }
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@147 }
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@150 }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
@@ -337,186 +523,3 @@ ResolutionTaskHolder@176 {
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
 }
-
-ResolutionTaskHolder@177 {
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@178 {
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@179 {
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@180 {
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@181 {
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@182 {
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@183 {
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@184 {
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@185 {
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@186 {
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@187 {
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/scopes/NoAmbiguityBetweenRootAndPackage.lazy.log b/compiler/testData/diagnostics/tests/scopes/NoAmbiguityBetweenRootAndPackage.lazy.log
index e8eea930726..170a2b30c36 100644
--- a/compiler/testData/diagnostics/tests/scopes/NoAmbiguityBetweenRootAndPackage.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/NoAmbiguityBetweenRootAndPackage.lazy.log
@@ -32,9 +32,12 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@23 {
     <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@25 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+}
+
+null {
+    <name not found> = ArrayList@26[1] { ResolutionCandidate@25 }
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/scopes/VisibilityInheritModifier.lazy.log b/compiler/testData/diagnostics/tests/scopes/VisibilityInheritModifier.lazy.log
index 520677e3ebe..948c23ad766 100644
--- a/compiler/testData/diagnostics/tests/scopes/VisibilityInheritModifier.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/VisibilityInheritModifier.lazy.log
@@ -81,12 +81,6 @@ LazyJavaPackageFragment@38['lang'] {
 
 ResolutionTaskHolder@74 {
     <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@68[empty]
-    <name not found> = EmptyList@68[empty]
-    <name not found> = EmptyList@68[empty]
-    <name not found> = EmptyList@68[empty]
-    <name not found> = EmptyList@68[empty]
     <name not found> = EmptyList@68[empty]
     <name not found> = EmptyList@68[empty]
     <name not found> = EmptyList@68[empty]
@@ -112,56 +106,65 @@ ResolutionTaskHolder@74 {
     <name not found> = EmptyList@68[empty]
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@68[empty]
-    <name not found> = EmptyList@68[empty]
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
     <name not found> = EmptyList@68[empty]
     <name not found> = EmptyList@68[empty]
 }
 
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
+}
+
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
 }
 
 ResolutionTaskHolder@86 {
     <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
+}
+
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
 }
 
 ResolutionTaskHolder@98 {
     <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
 }
 
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
 }
 
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
 }
 
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
+null {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@79 }
+    <name not found> = EmptyList@68[empty]
+    <name not found> = EmptyList@68[empty]
+    <name not found> = EmptyList@68[empty]
+    <name not found> = EmptyList@68[empty]
+    <name not found> = EmptyList@68[empty]
+    <name not found> = EmptyList@68[empty]
+    <name not found> = EmptyList@68[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/scopes/initializerScopeOfExtensionProperty.lazy.log b/compiler/testData/diagnostics/tests/scopes/initializerScopeOfExtensionProperty.lazy.log
index ceeb686d6fa..ba07f571608 100644
--- a/compiler/testData/diagnostics/tests/scopes/initializerScopeOfExtensionProperty.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/initializerScopeOfExtensionProperty.lazy.log
@@ -74,74 +74,51 @@ LazyJavaPackageFragment@34['lang'] {
 
 ResolutionTaskHolder@64 {
     <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
     <name not found> = EmptyList@56[empty]
     <name not found> = EmptyList@56[empty]
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
     <name not found> = EmptyList@56[empty]
     <name not found> = EmptyList@56[empty]
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
     <name not found> = EmptyList@56[empty]
     <name not found> = EmptyList@56[empty]
+}
+
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
     <name not found> = EmptyList@56[empty]
     <name not found> = EmptyList@56[empty]
 }
 
 ResolutionTaskHolder@76 {
     <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
     <name not found> = EmptyList@56[empty]
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
-    <name not found> = EmptyList@56[empty]
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
     <name not found> = EmptyList@56[empty]
 }
 
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
+}
+
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
 }
 
 ResolutionTaskHolder@88 {
     <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
+ResolutionTaskHolder@91 {
     <name not found> = EmptyList@56[empty]
     <name not found> = EmptyList@56[empty]
     <name not found> = EmptyList@56[empty]
@@ -160,7 +137,33 @@ ResolutionTaskHolder@100 {
     <name not found> = EmptyList@56[empty]
 }
 
-ResolutionTaskHolder@101 {
+ResolutionTaskHolder@92 {
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+}
+
+null {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@69 }
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
+    <name not found> = EmptyList@56[empty]
     <name not found> = EmptyList@56[empty]
     <name not found> = EmptyList@56[empty]
     <name not found> = EmptyList@56[empty]
diff --git a/compiler/testData/diagnostics/tests/scopes/kt1078.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt1078.lazy.log
index f6742d62468..2545c1a19ec 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt1078.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/kt1078.lazy.log
@@ -35,37 +35,40 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
+}
+
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+null {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@33 }
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/scopes/kt1244.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt1244.lazy.log
index 3b360434fe1..4885a1907c8 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt1244.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/kt1244.lazy.log
@@ -30,10 +30,6 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@24 {
     <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
@@ -51,9 +47,8 @@ ResolutionTaskHolder@24 {
     <name not found> = EmptyList@19[empty]
 }
 
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
+ResolutionTaskHolder@27 {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
@@ -62,6 +57,14 @@ ResolutionTaskHolder@28 {
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
+}
+
+null {
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@26 }
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
diff --git a/compiler/testData/diagnostics/tests/scopes/kt151.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt151.lazy.log
index 40d3b32ce57..4b0a24025a3 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt151.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/kt151.lazy.log
@@ -44,12 +44,6 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
@@ -75,32 +69,41 @@ ResolutionTaskHolder@40 {
     <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
 }
 
 ResolutionTaskHolder@52 {
     <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+null {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@42 }
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/scopes/kt1579_map_entry.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt1579_map_entry.lazy.log
index 803a66706c9..586ee74c46d 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt1579_map_entry.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/kt1579_map_entry.lazy.log
@@ -40,15 +40,18 @@ LazyJavaPackageFragment@20['java'] {
 
 ResolutionTaskHolder@38 {
     <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+}
+
+null {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@40 }
 }
diff --git a/compiler/testData/diagnostics/tests/scopes/kt1738.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt1738.lazy.log
index d4cfdf9cacf..5862c2081ca 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt1738.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/kt1738.lazy.log
@@ -29,9 +29,6 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@26 {
     <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
@@ -45,27 +42,33 @@ ResolutionTaskHolder@26 {
     <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
+ResolutionTaskHolder@29 {
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
 }
 
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
+}
+
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
 }
 
 ResolutionTaskHolder@38 {
     <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+null {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@28 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@31 }
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/scopes/kt1805.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt1805.lazy.log
index d57584966e0..0d82a4397dc 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt1805.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/kt1805.lazy.log
@@ -38,9 +38,6 @@ ResolutionTaskHolder@29 {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
     <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@35 }
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
@@ -54,14 +51,25 @@ ResolutionTaskHolder@29 {
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
+}
+
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
 }
 
 ResolutionTaskHolder@39 {
     <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
@@ -75,53 +83,48 @@ ResolutionTaskHolder@39 {
     <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
 }
 
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+}
+
 ResolutionTaskHolder@51 {
     <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
+null {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@35 }
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/scopes/kt1806.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt1806.lazy.log
index 285c87dc9fa..a732e38653d 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt1806.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/kt1806.lazy.log
@@ -44,11 +44,6 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@35 {
     <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -70,12 +65,8 @@ ResolutionTaskHolder@35 {
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -93,15 +84,8 @@ ResolutionTaskHolder@39 {
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -110,34 +94,53 @@ ResolutionTaskHolder@43 {
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
 ResolutionTaskHolder@47 {
     <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+null {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@43 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/scopes/kt1822.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt1822.lazy.log
index ef43d7e07a1..d9fd05190dd 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt1822.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/kt1822.lazy.log
@@ -39,10 +39,13 @@ LazyJavaPackageFragment@9['java'] {
 
 ResolutionTaskHolder@39 {
     <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
+}
+
+null {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@44 }
 }
diff --git a/compiler/testData/diagnostics/tests/scopes/kt1942.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt1942.lazy.log
index b13dfd3f7be..a4a4eb2dc8e 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt1942.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/kt1942.lazy.log
@@ -72,12 +72,6 @@ ResolutionTaskHolder@67 {
     <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
     <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
     <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
@@ -100,7 +94,16 @@ ResolutionTaskHolder@67 {
     <name not found> = EmptyList@11[empty]
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
+}
+
+null {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@75 }
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/scopes/kt2262.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt2262.lazy.log
index fd6944e779e..2f4e9c554cc 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt2262.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/kt2262.lazy.log
@@ -45,35 +45,38 @@ LazyJavaPackageFragment@15['lang'] {
 
 ResolutionTaskHolder@39 {
     <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
+}
+
+null {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@52 }
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/scopes/kt250.617.10.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt250.617.10.lazy.log
index 16c3d64db84..5ac53062964 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt250.617.10.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/kt250.617.10.lazy.log
@@ -148,21 +148,21 @@ LazyJavaClassifierType@121['E'] {
     arguments = ArrayList@122[empty]
     classifier = JavaTypeParameterImpl@123['E']
     nullable = 'false': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@124
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@120
 }
 
-LazyJavaClassifierType@125['E'] {
-    arguments = ArrayList@126[empty]
-    classifier = JavaTypeParameterImpl@127['E']
+LazyJavaClassifierType@124['E'] {
+    arguments = ArrayList@125[empty]
+    classifier = JavaTypeParameterImpl@126['E']
     nullable = 'false': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@124
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
 
 LazyJavaClassifierType@128['E'] {
     arguments = ArrayList@129[empty]
     classifier = JavaTypeParameterImpl@130['E']
     nullable = 'false': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@124
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@120
 }
 
 LazyJavaClassifierType@131['E'] {
@@ -176,14 +176,14 @@ LazyJavaClassifierType@134['E'] {
     arguments = ArrayList@135[empty]
     classifier = JavaTypeParameterImpl@136['E']
     nullable = 'false': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@124
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@120
 }
 
 LazyJavaClassifierType@137['E'] {
     arguments = ArrayList@138[empty]
     classifier = JavaTypeParameterImpl@139['E']
     nullable = 'false': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@120
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
 
 LazyJavaClassifierType@140['E'] {
@@ -197,105 +197,105 @@ LazyJavaClassifierType@143['E'] {
     arguments = ArrayList@144[empty]
     classifier = JavaTypeParameterImpl@145['E']
     nullable = 'false': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@120
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
 
 LazyJavaClassifierType@146['E'] {
     arguments = ArrayList@147[empty]
     classifier = JavaTypeParameterImpl@148['E']
     nullable = 'false': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@124
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
 
 LazyJavaClassifierType@149['E'] {
     arguments = ArrayList@150[empty]
     classifier = JavaTypeParameterImpl@151['E']
     nullable = 'false': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@124
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@120
 }
 
 LazyJavaClassifierType@152['E'] {
     arguments = ArrayList@153[empty]
-    classifier = JavaTypeParameterImpl@139['E']
+    classifier = JavaTypeParameterImpl@130['E']
     nullable = 'true': Boolean@107
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@120
 }
 
 LazyJavaClassifierType@154['E'] {
     arguments = ArrayList@155[empty]
-    classifier = JavaTypeParameterImpl@145['E']
+    classifier = JavaTypeParameterImpl@133['E']
     nullable = 'true': Boolean@107
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@120
 }
 
 LazyJavaClassifierType@156['E'] {
     arguments = ArrayList@157[empty]
-    classifier = JavaTypeParameterImpl@136['E']
+    classifier = JavaTypeParameterImpl@151['E']
     nullable = 'true': Boolean@107
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@124
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@120
 }
 
 LazyJavaClassifierType@158['E'] {
     arguments = ArrayList@159[empty]
-    classifier = JavaTypeParameterImpl@148['E']
+    classifier = JavaTypeParameterImpl@126['E']
     nullable = 'true': Boolean@107
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@124
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
 
 LazyJavaClassifierType@160['E'] {
     arguments = ArrayList@161[empty]
-    classifier = JavaTypeParameterImpl@119['E']
+    classifier = JavaTypeParameterImpl@136['E']
     nullable = 'true': Boolean@107
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@120
 }
 
 LazyJavaClassifierType@162['E'] {
     arguments = ArrayList@163[empty]
-    classifier = JavaTypeParameterImpl@115['E']
+    classifier = JavaTypeParameterImpl@119['E']
     nullable = 'true': Boolean@107
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@120
 }
 
 LazyJavaClassifierType@164['E'] {
     arguments = ArrayList@165[empty]
-    classifier = JavaTypeParameterImpl@130['E']
+    classifier = JavaTypeParameterImpl@145['E']
     nullable = 'true': Boolean@107
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@124
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
 
 LazyJavaClassifierType@166['E'] {
     arguments = ArrayList@167[empty]
-    classifier = JavaTypeParameterImpl@142['E']
+    classifier = JavaTypeParameterImpl@115['E']
     nullable = 'true': Boolean@107
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
 }
 
 LazyJavaClassifierType@168['E'] {
     arguments = ArrayList@169[empty]
-    classifier = JavaTypeParameterImpl@151['E']
+    classifier = JavaTypeParameterImpl@148['E']
     nullable = 'true': Boolean@107
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@124
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
 
 LazyJavaClassifierType@170['E'] {
     arguments = ArrayList@171[empty]
-    classifier = JavaTypeParameterImpl@133['E']
+    classifier = JavaTypeParameterImpl@123['E']
     nullable = 'true': Boolean@107
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@120
 }
 
 LazyJavaClassifierType@172['E'] {
     arguments = ArrayList@173[empty]
-    classifier = JavaTypeParameterImpl@123['E']
+    classifier = JavaTypeParameterImpl@139['E']
     nullable = 'true': Boolean@107
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@124
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
 
 LazyJavaClassifierType@174['E'] {
     arguments = ArrayList@175[empty]
-    classifier = JavaTypeParameterImpl@127['E']
+    classifier = JavaTypeParameterImpl@142['E']
     nullable = 'true': Boolean@107
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@124
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
 }
 
 LazyJavaClassifierType@176['K'] {
@@ -401,14 +401,14 @@ LazyJavaClassifierType@225['V'] {
 
 LazyJavaClassifierType@228['V'] {
     arguments = ArrayList@229[empty]
-    classifier = JavaTypeParameterImpl@223['V']
+    classifier = JavaTypeParameterImpl@227['V']
     nullable = 'true': Boolean@107
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@224
 }
 
 LazyJavaClassifierType@230['V'] {
     arguments = ArrayList@231[empty]
-    classifier = JavaTypeParameterImpl@227['V']
+    classifier = JavaTypeParameterImpl@223['V']
     nullable = 'true': Boolean@107
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@224
 }
@@ -533,21 +533,21 @@ LazyJavaPackageFragment@264['util'] {
     memberIndex = computeMemberIndex$1@339 // through LazyPackageFragmentScopeForJavaPackage@335
 }
 
-LazyJavaTypeParameterDescriptor@70['E'] {
+LazyJavaTypeParameterDescriptor@61['E'] {
     defaultType = JetTypeImpl@340['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@124
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
     upperBounds = LinkedHashSet@341[1] { NullableType@342 }
     upperBoundsAsType = NullableType@342
 }
 
-LazyJavaTypeParameterDescriptor@61['E'] {
+LazyJavaTypeParameterDescriptor@65['E'] {
     defaultType = JetTypeImpl@343['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
     upperBounds = LinkedHashSet@344[1] { NullableType@345 }
     upperBoundsAsType = NullableType@345
 }
 
-LazyJavaTypeParameterDescriptor@65['E'] {
+LazyJavaTypeParameterDescriptor@70['E'] {
     defaultType = JetTypeImpl@346['E']
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@120
     upperBounds = LinkedHashSet@347[1] { NullableType@348 }
@@ -567,35 +567,35 @@ LazyJavaTypeParameterDescriptor@77['V'] {
 }
 
 LazyJavaTypeParameterResolver@355 {
-    resolve(JavaTypeParameterImpl@356['E']) = LazyJavaTypeParameterDescriptor@70['E']
+    resolve(JavaTypeParameterImpl@356['E']) = LazyJavaTypeParameterDescriptor@61['E']
 }
 
 LazyJavaTypeParameterResolver@357 {
-    resolve(JavaTypeParameterImpl@358['E']) = LazyJavaTypeParameterDescriptor@61['E']
+    resolve(JavaTypeParameterImpl@358['E']) = LazyJavaTypeParameterDescriptor@65['E']
 }
 
 LazyJavaTypeParameterResolver@359 {
-    resolve(JavaTypeParameterImpl@360['E']) = LazyJavaTypeParameterDescriptor@65['E']
+    resolve(JavaTypeParameterImpl@360['E']) = LazyJavaTypeParameterDescriptor@70['E']
 }
 
 LazyJavaTypeParameterResolver@361 {
-    resolve(JavaTypeParameterImpl@139['E']) = null
+    resolve(JavaTypeParameterImpl@123['E']) = null
 }
 
 LazyJavaTypeParameterResolver@362 {
-    resolve(JavaTypeParameterImpl@142['E']) = null
+    resolve(JavaTypeParameterImpl@115['E']) = null
 }
 
 LazyJavaTypeParameterResolver@363 {
-    resolve(JavaTypeParameterImpl@133['E']) = null
+    resolve(JavaTypeParameterImpl@145['E']) = null
 }
 
 LazyJavaTypeParameterResolver@364 {
-    resolve(JavaTypeParameterImpl@148['E']) = null
+    resolve(JavaTypeParameterImpl@119['E']) = null
 }
 
 LazyJavaTypeParameterResolver@365 {
-    resolve(JavaTypeParameterImpl@130['E']) = null
+    resolve(JavaTypeParameterImpl@139['E']) = null
 }
 
 LazyJavaTypeParameterResolver@366 {
@@ -605,11 +605,27 @@ LazyJavaTypeParameterResolver@366 {
 
 ResolutionTaskHolder@369 {
     <name not found> = ArrayList@370[1] { ResolutionCandidate@371 }
-    <name not found> = ArrayList@372[1] { ResolutionCandidate@371 }
-    <name not found> = ArrayList@373[1] { ResolutionCandidate@374 }
-    <name not found> = ArrayList@375[1] { ResolutionCandidate@374 }
-    <name not found> = ArrayList@376[1] { ResolutionCandidate@377 }
-    <name not found> = ArrayList@378[1] { ResolutionCandidate@377 }
+    <name not found> = ArrayList@372[1] { ResolutionCandidate@373 }
+    <name not found> = ArrayList@374[1] { ResolutionCandidate@375 }
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+}
+
+ResolutionTaskHolder@376 {
+    <name not found> = ArrayList@377[1] { ResolutionCandidate@378 }
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
     <name not found> = EmptyList@52[empty]
     <name not found> = EmptyList@52[empty]
     <name not found> = EmptyList@52[empty]
@@ -620,118 +636,161 @@ ResolutionTaskHolder@369 {
 
 ResolutionTaskHolder@379 {
     <name not found> = ArrayList@380[1] { ResolutionCandidate@381 }
-    <name not found> = ArrayList@382[1] { ResolutionCandidate@381 }
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
 }
 
-ResolutionTaskHolder@383 {
-    <name not found> = ArrayList@384[1] { ResolutionCandidate@385 }
-    <name not found> = ArrayList@386[1] { ResolutionCandidate@385 }
+ResolutionTaskHolder@382 {
+    <name not found> = ArrayList@383[1] { ResolutionCandidate@384 }
 }
 
-ResolutionTaskHolder@387 {
-    <name not found> = ArrayList@388[1] { ResolutionCandidate@389 }
-    <name not found> = ArrayList@390[1] { ResolutionCandidate@389 }
+ResolutionTaskHolder@385 {
+    <name not found> = ArrayList@386[1] { ResolutionCandidate@387 }
+}
+
+ResolutionTaskHolder@388 {
+    <name not found> = ArrayList@389[1] { ResolutionCandidate@390 }
 }
 
 ResolutionTaskHolder@391 {
     <name not found> = ArrayList@392[1] { ResolutionCandidate@393 }
-    <name not found> = ArrayList@394[1] { ResolutionCandidate@393 }
 }
 
-ResolutionTaskHolder@395 {
-    <name not found> = ArrayList@396[1] { ResolutionCandidate@397 }
-    <name not found> = ArrayList@398[1] { ResolutionCandidate@397 }
+ResolutionTaskHolder@394 {
+    <name not found> = ArrayList@395[1] { ResolutionCandidate@396 }
 }
 
-ResolutionTaskHolder@399 {
-    <name not found> = ArrayList@400[1] { ResolutionCandidate@401 }
-    <name not found> = ArrayList@402[1] { ResolutionCandidate@401 }
+ResolutionTaskHolder@397 {
+    <name not found> = ArrayList@398[1] { ResolutionCandidate@399 }
+}
+
+ResolutionTaskHolder@400 {
+    <name not found> = ArrayList@401[1] { ResolutionCandidate@402 }
 }
 
 ResolutionTaskHolder@403 {
     <name not found> = ArrayList@404[1] { ResolutionCandidate@405 }
-    <name not found> = ArrayList@406[1] { ResolutionCandidate@405 }
 }
 
-ResolutionTaskHolder@407 {
-    <name not found> = ArrayList@408[1] { ResolutionCandidate@409 }
-    <name not found> = ArrayList@410[1] { ResolutionCandidate@409 }
+ResolutionTaskHolder@406 {
+    <name not found> = ArrayList@407[1] { ResolutionCandidate@408 }
 }
 
-ResolutionTaskHolder@411 {
-    <name not found> = ArrayList@412[1] { ResolutionCandidate@413 }
-    <name not found> = ArrayList@414[1] { ResolutionCandidate@413 }
+ResolutionTaskHolder@409 {
+    <name not found> = ArrayList@410[1] { ResolutionCandidate@411 }
+}
+
+ResolutionTaskHolder@412 {
+    <name not found> = ArrayList@413[1] { ResolutionCandidate@414 }
 }
 
 ResolutionTaskHolder@415 {
     <name not found> = ArrayList@416[1] { ResolutionCandidate@417 }
-    <name not found> = ArrayList@418[1] { ResolutionCandidate@417 }
 }
 
-ResolutionTaskHolder@419 {
-    <name not found> = ArrayList@420[1] { ResolutionCandidate@421 }
-    <name not found> = ArrayList@422[1] { ResolutionCandidate@421 }
+ResolutionTaskHolder@418 {
+    <name not found> = ArrayList@419[2] { ResolutionCandidate@420, ResolutionCandidate@421 }
 }
 
-ResolutionTaskHolder@423 {
-    <name not found> = ArrayList@424[1] { ResolutionCandidate@425 }
-    <name not found> = ArrayList@426[1] { ResolutionCandidate@425 }
+ResolutionTaskHolder@422 {
+    <name not found> = ArrayList@423[3] { ResolutionCandidate@424, ResolutionCandidate@425, ResolutionCandidate@426 }
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
 }
 
 ResolutionTaskHolder@427 {
-    <name not found> = ArrayList@428[1] { ResolutionCandidate@429 }
-    <name not found> = ArrayList@430[1] { ResolutionCandidate@429 }
+    <name not found> = ArrayList@428[4] { ResolutionCandidate@429, ResolutionCandidate@430, ResolutionCandidate@431, ... }
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
 }
 
-ResolutionTaskHolder@431 {
-    <name not found> = ArrayList@432[1] { ResolutionCandidate@433 }
-    <name not found> = ArrayList@434[1] { ResolutionCandidate@433 }
+ResolutionTaskHolder@432 {
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+}
+
+ResolutionTaskHolder@433 {
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+}
+
+ResolutionTaskHolder@434 {
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
 }
 
 ResolutionTaskHolder@435 {
-    <name not found> = ArrayList@436[2] { ResolutionCandidate@437, ResolutionCandidate@438 }
-    <name not found> = ArrayList@439[2] { ResolutionCandidate@437, ResolutionCandidate@438 }
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
 }
 
-ResolutionTaskHolder@440 {
-    <name not found> = ArrayList@441[3] { ResolutionCandidate@442, ResolutionCandidate@443, ResolutionCandidate@444 }
-    <name not found> = ArrayList@445[3] { ResolutionCandidate@442, ResolutionCandidate@443, ResolutionCandidate@444 }
+ResolutionTaskHolder@436 {
     <name not found> = EmptyList@52[empty]
     <name not found> = EmptyList@52[empty]
     <name not found> = EmptyList@52[empty]
@@ -750,17 +809,48 @@ ResolutionTaskHolder@440 {
     <name not found> = EmptyList@52[empty]
 }
 
-ResolutionTaskHolder@446 {
-    <name not found> = ArrayList@447[4] { ResolutionCandidate@448, ResolutionCandidate@449, ResolutionCandidate@450, ... }
-    <name not found> = ArrayList@451[4] { ResolutionCandidate@448, ResolutionCandidate@449, ResolutionCandidate@450, ... }
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
+ResolutionTaskHolder@437 {
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+}
+
+ResolutionTaskHolder@438 {
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+}
+
+ResolutionTaskHolder@439 {
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+}
+
+ResolutionTaskHolder@440 {
     <name not found> = EmptyList@52[empty]
     <name not found> = EmptyList@52[empty]
     <name not found> = EmptyList@52[empty]
@@ -771,19 +861,7 @@ ResolutionTaskHolder@446 {
     <name not found> = EmptyList@52[empty]
 }
 
-ResolutionTaskHolder@452 {
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
+ResolutionTaskHolder@441 {
     <name not found> = EmptyList@52[empty]
     <name not found> = EmptyList@52[empty]
     <name not found> = EmptyList@52[empty]
@@ -794,19 +872,7 @@ ResolutionTaskHolder@452 {
     <name not found> = EmptyList@52[empty]
 }
 
-ResolutionTaskHolder@453 {
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
+ResolutionTaskHolder@442 {
     <name not found> = EmptyList@52[empty]
     <name not found> = EmptyList@52[empty]
     <name not found> = EmptyList@52[empty]
@@ -817,19 +883,7 @@ ResolutionTaskHolder@453 {
     <name not found> = EmptyList@52[empty]
 }
 
-ResolutionTaskHolder@454 {
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
+ResolutionTaskHolder@443 {
     <name not found> = EmptyList@52[empty]
     <name not found> = EmptyList@52[empty]
     <name not found> = EmptyList@52[empty]
@@ -840,7 +894,80 @@ ResolutionTaskHolder@454 {
     <name not found> = EmptyList@52[empty]
 }
 
-ResolutionTaskHolder@455 {
+null {
+    <name not found> = ArrayList@444[1] { ResolutionCandidate@417 }
+    <name not found> = ArrayList@445[1] { ResolutionCandidate@414 }
+    <name not found> = ArrayList@446[1] { ResolutionCandidate@384 }
+    <name not found> = ArrayList@447[1] { ResolutionCandidate@411 }
+    <name not found> = ArrayList@448[1] { ResolutionCandidate@381 }
+    <name not found> = ArrayList@449[1] { ResolutionCandidate@390 }
+    <name not found> = ArrayList@450[1] { ResolutionCandidate@408 }
+    <name not found> = ArrayList@451[1] { ResolutionCandidate@396 }
+    <name not found> = ArrayList@452[1] { ResolutionCandidate@402 }
+    <name not found> = ArrayList@453[1] { ResolutionCandidate@387 }
+    <name not found> = ArrayList@454[1] { ResolutionCandidate@393 }
+    <name not found> = ArrayList@455[1] { ResolutionCandidate@399 }
+    <name not found> = ArrayList@456[1] { ResolutionCandidate@405 }
+    <name not found> = ArrayList@457[1] { ResolutionCandidate@371 }
+    <name not found> = ArrayList@458[1] { ResolutionCandidate@373 }
+    <name not found> = ArrayList@459[1] { ResolutionCandidate@375 }
+    <name not found> = ArrayList@460[1] { ResolutionCandidate@378 }
+    <name not found> = ArrayList@461[2] { ResolutionCandidate@420, ResolutionCandidate@421 }
+    <name not found> = ArrayList@462[3] { ResolutionCandidate@424, ResolutionCandidate@425, ResolutionCandidate@426 }
+    <name not found> = ArrayList@463[4] { ResolutionCandidate@429, ResolutionCandidate@430, ResolutionCandidate@431, ... }
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
     <name not found> = EmptyList@52[empty]
     <name not found> = EmptyList@52[empty]
     <name not found> = EmptyList@52[empty]
@@ -862,127 +989,3 @@ ResolutionTaskHolder@455 {
     <name not found> = EmptyList@52[empty]
     <name not found> = EmptyList@52[empty]
 }
-
-ResolutionTaskHolder@456 {
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-}
-
-ResolutionTaskHolder@457 {
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-}
-
-ResolutionTaskHolder@458 {
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-}
-
-ResolutionTaskHolder@459 {
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-}
-
-ResolutionTaskHolder@460 {
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-}
-
-ResolutionTaskHolder@461 {
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-}
-
-ResolutionTaskHolder@462 {
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-}
-
-ResolutionTaskHolder@463 {
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/scopes/kt323.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt323.lazy.log
index 74d28392947..0f565c0f344 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt323.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/kt323.lazy.log
@@ -31,5 +31,8 @@ LazyJavaPackageFragment@9['java'] {
 
 ResolutionTaskHolder@29 {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
+}
+
+null {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
 }
diff --git a/compiler/testData/diagnostics/tests/scopes/kt37.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt37.lazy.log
index bef8b84f036..a776503681e 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt37.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/kt37.lazy.log
@@ -34,9 +34,6 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@30 {
     <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -50,28 +47,34 @@ ResolutionTaskHolder@30 {
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
     <name not found> = EmptyList@24[empty]
 }
 
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+}
+
 ResolutionTaskHolder@42 {
     <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+null {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@44 }
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/scopes/kt421Scopes.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt421Scopes.lazy.log
index b87549e30ae..f58262da951 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt421Scopes.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/kt421Scopes.lazy.log
@@ -38,14 +38,17 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@26 {
     <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
+ResolutionTaskHolder@29 {
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
+    <name not found> = EmptyList@23[empty]
+}
+
+null {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@28 }
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@31 }
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/scopes/kt587.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt587.lazy.log
index 38038148673..51af6d5cb30 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt587.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/kt587.lazy.log
@@ -38,9 +38,7 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@26 {
     <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
@@ -90,6 +88,16 @@ ResolutionTaskHolder@26 {
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
+}
+
+ResolutionTaskHolder@31 {
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
@@ -141,14 +149,9 @@ ResolutionTaskHolder@26 {
     <name not found> = EmptyList@18[empty]
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
+null {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@28 }
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@30 }
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
diff --git a/compiler/testData/diagnostics/tests/scopes/kt900-1.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt900-1.lazy.log
index b8b73cfdd7b..5f3c1be46b9 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt900-1.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/kt900-1.lazy.log
@@ -36,18 +36,11 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@32 {
     <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@36 {
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@35 {
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
@@ -66,9 +59,19 @@ ResolutionTaskHolder@36 {
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@36 {
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+}
+
+null {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@34 }
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
diff --git a/compiler/testData/diagnostics/tests/scopes/kt900-2.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt900-2.lazy.log
index 5fdfa11a4dc..73e51e9faee 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt900-2.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/kt900-2.lazy.log
@@ -56,17 +56,71 @@ LazyJavaPackageFragment@21['lang'] {
 
 ResolutionTaskHolder@51 {
     <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+}
+
+ResolutionTaskHolder@61 {
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+}
+
+ResolutionTaskHolder@62 {
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
 }
 
 ResolutionTaskHolder@63 {
@@ -86,10 +140,6 @@ ResolutionTaskHolder@63 {
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
 }
 
 ResolutionTaskHolder@64 {
@@ -109,10 +159,6 @@ ResolutionTaskHolder@64 {
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
 }
 
 ResolutionTaskHolder@65 {
@@ -124,18 +170,6 @@ ResolutionTaskHolder@65 {
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
 }
 
 ResolutionTaskHolder@66 {
@@ -147,18 +181,6 @@ ResolutionTaskHolder@66 {
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
 }
 
 ResolutionTaskHolder@67 {
@@ -170,18 +192,6 @@ ResolutionTaskHolder@67 {
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
 }
 
 ResolutionTaskHolder@68 {
@@ -193,8 +203,6 @@ ResolutionTaskHolder@68 {
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
 }
 
 ResolutionTaskHolder@69 {
@@ -206,37 +214,32 @@ ResolutionTaskHolder@69 {
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@72 {
+null {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@56 }
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
diff --git a/compiler/testData/diagnostics/tests/scopes/kt900.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt900.lazy.log
index 2be08290def..e1d11378bd4 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt900.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/kt900.lazy.log
@@ -48,71 +48,189 @@ LazyJavaPackageFragment@21['lang'] {
 
 ResolutionTaskHolder@44 {
     <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@35[empty]
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
+}
+
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
     <name not found> = EmptyList@35[empty]
 }
 
 ResolutionTaskHolder@56 {
     <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
+}
+
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
 }
 
 ResolutionTaskHolder@68 {
     <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+}
+
+ResolutionTaskHolder@71 {
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
 }
 
 ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+}
+
+ResolutionTaskHolder@73 {
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+}
+
+ResolutionTaskHolder@74 {
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+}
+
+ResolutionTaskHolder@75 {
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
 }
 
 ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+}
+
+ResolutionTaskHolder@77 {
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+}
+
+ResolutionTaskHolder@78 {
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+}
+
+ResolutionTaskHolder@79 {
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
 }
 
 ResolutionTaskHolder@80 {
@@ -124,21 +242,40 @@ ResolutionTaskHolder@80 {
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@81 {
+null {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@61 }
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
@@ -160,137 +297,3 @@ ResolutionTaskHolder@81 {
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
 }
-
-ResolutionTaskHolder@82 {
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/scopes/kt939.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt939.lazy.log
index d11bb18704f..eb01268c731 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt939.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/kt939.lazy.log
@@ -63,35 +63,35 @@ LazyJavaClassifierType@34['String'] {
 
 LazyJavaClassifierType@37['String'] {
     arguments = ArrayList@38[empty]
-    classifier = JavaClassImpl@21['String']
+    classifier = JavaClassImpl@27['String']
     nullable = 'true': Boolean@39
     typeConstructor = DeserializedClassTypeConstructor@24
 }
 
 LazyJavaClassifierType@40['String'] {
     arguments = ArrayList@41[empty]
-    classifier = JavaClassImpl@30['String']
+    classifier = JavaClassImpl@33['String']
     nullable = 'true': Boolean@39
     typeConstructor = DeserializedClassTypeConstructor@24
 }
 
 LazyJavaClassifierType@42['String'] {
     arguments = ArrayList@43[empty]
-    classifier = JavaClassImpl@27['String']
+    classifier = JavaClassImpl@21['String']
     nullable = 'true': Boolean@39
     typeConstructor = DeserializedClassTypeConstructor@24
 }
 
 LazyJavaClassifierType@44['String'] {
     arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@33['String']
+    classifier = JavaClassImpl@36['String']
     nullable = 'true': Boolean@39
     typeConstructor = DeserializedClassTypeConstructor@24
 }
 
 LazyJavaClassifierType@46['String'] {
     arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@36['String']
+    classifier = JavaClassImpl@30['String']
     nullable = 'true': Boolean@39
     typeConstructor = DeserializedClassTypeConstructor@24
 }
@@ -133,115 +133,89 @@ LazyJavaPackageFragment@57['lang'] {
 
 ResolutionTaskHolder@79 {
     <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
 }
 
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
 }
 
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
+}
+
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
 }
 
 ResolutionTaskHolder@91 {
     <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
 }
 
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
 }
 
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
+}
+
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
 }
 
 ResolutionTaskHolder@103 {
     <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
 }
 
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
 }
 
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@113 }
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
+}
+
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
 }
 
 ResolutionTaskHolder@115 {
     <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@117 }
 }
 
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@121 }
+ResolutionTaskHolder@118 {
+    <name not found> = ArrayList@119[2] { ResolutionCandidate@120, ResolutionCandidate@121 }
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@125 }
+ResolutionTaskHolder@122 {
+    <name not found> = ArrayList@123[2] { ResolutionCandidate@124, ResolutionCandidate@125 }
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@129 }
+ResolutionTaskHolder@126 {
+    <name not found> = ArrayList@127[7] { ResolutionCandidate@128, ResolutionCandidate@129, ResolutionCandidate@130, ... }
 }
 
 ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[2] { ResolutionCandidate@133, ResolutionCandidate@134 }
-    <name not found> = ArrayList@135[2] { ResolutionCandidate@133, ResolutionCandidate@134 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
+    <name not found> = ArrayList@132[7] { ResolutionCandidate@133, ResolutionCandidate@134, ResolutionCandidate@135, ... }
 }
 
 ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[2] { ResolutionCandidate@138, ResolutionCandidate@139 }
-    <name not found> = ArrayList@140[2] { ResolutionCandidate@138, ResolutionCandidate@139 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
+    <name not found> = ArrayList@137[8] { ResolutionCandidate@138, ResolutionCandidate@139, ResolutionCandidate@140, ... }
 }
 
 ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[7] { ResolutionCandidate@143, ResolutionCandidate@144, ResolutionCandidate@145, ... }
-    <name not found> = ArrayList@146[7] { ResolutionCandidate@143, ResolutionCandidate@144, ResolutionCandidate@145, ... }
+    <name not found> = ArrayList@142[8] { ResolutionCandidate@143, ResolutionCandidate@144, ResolutionCandidate@145, ... }
 }
 
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[7] { ResolutionCandidate@149, ResolutionCandidate@150, ResolutionCandidate@151, ... }
-    <name not found> = ArrayList@152[7] { ResolutionCandidate@149, ResolutionCandidate@150, ResolutionCandidate@151, ... }
+ResolutionTaskHolder@146 {
+    <name not found> = ArrayList@147[8] { ResolutionCandidate@148, ResolutionCandidate@149, ResolutionCandidate@150, ... }
 }
 
-ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[8] { ResolutionCandidate@155, ResolutionCandidate@156, ResolutionCandidate@157, ... }
-    <name not found> = ArrayList@158[8] { ResolutionCandidate@155, ResolutionCandidate@156, ResolutionCandidate@157, ... }
-}
-
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[8] { ResolutionCandidate@161, ResolutionCandidate@162, ResolutionCandidate@163, ... }
-    <name not found> = ArrayList@164[8] { ResolutionCandidate@161, ResolutionCandidate@162, ResolutionCandidate@163, ... }
-}
-
-ResolutionTaskHolder@165 {
-    <name not found> = ArrayList@166[8] { ResolutionCandidate@167, ResolutionCandidate@168, ResolutionCandidate@169, ... }
-    <name not found> = ArrayList@170[8] { ResolutionCandidate@167, ResolutionCandidate@168, ResolutionCandidate@169, ... }
-}
-
-ResolutionTaskHolder@171 {
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
+ResolutionTaskHolder@151 {
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
@@ -252,9 +226,38 @@ ResolutionTaskHolder@171 {
     <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@172 {
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
+ResolutionTaskHolder@152 {
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+}
+
+null {
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@166[2] { ResolutionCandidate@120, ResolutionCandidate@121 }
+    <name not found> = ArrayList@167[2] { ResolutionCandidate@124, ResolutionCandidate@125 }
+    <name not found> = ArrayList@168[7] { ResolutionCandidate@133, ResolutionCandidate@134, ResolutionCandidate@135, ... }
+    <name not found> = ArrayList@169[7] { ResolutionCandidate@128, ResolutionCandidate@129, ResolutionCandidate@130, ... }
+    <name not found> = ArrayList@170[8] { ResolutionCandidate@148, ResolutionCandidate@149, ResolutionCandidate@150, ... }
+    <name not found> = ArrayList@171[8] { ResolutionCandidate@138, ResolutionCandidate@139, ResolutionCandidate@140, ... }
+    <name not found> = ArrayList@172[8] { ResolutionCandidate@143, ResolutionCandidate@144, ResolutionCandidate@145, ... }
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
diff --git a/compiler/testData/diagnostics/tests/scopes/kt955.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt955.lazy.log
index 7fb18ea8435..f502cd9b5ff 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt955.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/kt955.lazy.log
@@ -56,16 +56,19 @@ LazyJavaPackageFragment@11['util'] {
 
 ResolutionTaskHolder@37 {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+}
+
+null {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@39 }
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
diff --git a/compiler/testData/diagnostics/tests/scopes/stopResolutionOnAmbiguity.lazy.log b/compiler/testData/diagnostics/tests/scopes/stopResolutionOnAmbiguity.lazy.log
index 471406ed7b6..4640ee09a8a 100644
--- a/compiler/testData/diagnostics/tests/scopes/stopResolutionOnAmbiguity.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/stopResolutionOnAmbiguity.lazy.log
@@ -29,20 +29,23 @@ LazyJavaPackageFragment@11['java'] {
 
 ResolutionTaskHolder@29 {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[2] { ResolutionCandidate@43, ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[2] { ResolutionCandidate@43, ResolutionCandidate@44 }
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[2] { ResolutionCandidate@40, ResolutionCandidate@41 }
+}
+
+null {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@45[2] { ResolutionCandidate@40, ResolutionCandidate@41 }
 }
diff --git a/compiler/testData/diagnostics/tests/scopes/visibility.lazy.log b/compiler/testData/diagnostics/tests/scopes/visibility.lazy.log
index f03664cc140..f6fdc697abb 100644
--- a/compiler/testData/diagnostics/tests/scopes/visibility.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/visibility.lazy.log
@@ -75,12 +75,6 @@ LazyJavaPackageFragment@19['lang'] {
 
 ResolutionTaskHolder@64 {
     <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
@@ -106,12 +100,8 @@ ResolutionTaskHolder@64 {
     <name not found> = EmptyList@54[empty]
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
@@ -129,9 +119,8 @@ ResolutionTaskHolder@68 {
     <name not found> = EmptyList@54[empty]
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
@@ -147,6 +136,18 @@ ResolutionTaskHolder@72 {
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
+}
+
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
@@ -154,12 +155,6 @@ ResolutionTaskHolder@72 {
 
 ResolutionTaskHolder@76 {
     <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
@@ -173,17 +168,8 @@ ResolutionTaskHolder@76 {
     <name not found> = EmptyList@54[empty]
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
@@ -194,9 +180,8 @@ ResolutionTaskHolder@80 {
     <name not found> = EmptyList@54[empty]
 }
 
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
@@ -205,6 +190,10 @@ ResolutionTaskHolder@84 {
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
+}
+
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
@@ -217,15 +206,6 @@ ResolutionTaskHolder@84 {
 
 ResolutionTaskHolder@88 {
     <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
@@ -236,17 +216,8 @@ ResolutionTaskHolder@88 {
     <name not found> = EmptyList@54[empty]
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
@@ -257,9 +228,8 @@ ResolutionTaskHolder@92 {
     <name not found> = EmptyList@54[empty]
 }
 
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
@@ -268,6 +238,10 @@ ResolutionTaskHolder@96 {
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
+}
+
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
@@ -280,15 +254,6 @@ ResolutionTaskHolder@96 {
 
 ResolutionTaskHolder@100 {
     <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
@@ -299,17 +264,8 @@ ResolutionTaskHolder@100 {
     <name not found> = EmptyList@54[empty]
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
@@ -320,167 +276,214 @@ ResolutionTaskHolder@104 {
     <name not found> = EmptyList@54[empty]
 }
 
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
+}
+
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
 }
 
 ResolutionTaskHolder@112 {
     <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
 }
 
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
+ResolutionTaskHolder@115 {
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
     <name not found> = EmptyList@54[empty]
 }
 
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
+ResolutionTaskHolder@118 {
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
     <name not found> = EmptyList@54[empty]
+}
+
+ResolutionTaskHolder@121 {
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
     <name not found> = EmptyList@54[empty]
 }
 
 ResolutionTaskHolder@124 {
     <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@126 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
 }
 
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
+ResolutionTaskHolder@127 {
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
 }
 
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
+ResolutionTaskHolder@130 {
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
+}
+
+ResolutionTaskHolder@133 {
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
 }
 
 ResolutionTaskHolder@136 {
     <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
 }
 
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
+ResolutionTaskHolder@139 {
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
 }
 
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
+ResolutionTaskHolder@142 {
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
+}
+
+ResolutionTaskHolder@145 {
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
 }
 
 ResolutionTaskHolder@148 {
     <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
 }
 
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
+ResolutionTaskHolder@151 {
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
 }
 
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
+ResolutionTaskHolder@154 {
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
 }
 
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@162 }
+ResolutionTaskHolder@157 {
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
 }
 
-ResolutionTaskHolder@164 {
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@166 }
-}
-
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@170 }
-}
-
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@174 }
-}
-
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@178 }
-}
-
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@182 }
-}
-
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@186 }
-}
-
-ResolutionTaskHolder@188 {
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@190 }
+null {
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@129 }
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@156 }
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@166[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@168[1] { ResolutionCandidate@153 }
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@170[1] { ResolutionCandidate@147 }
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@132 }
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@159 }
+    <name not found> = ArrayList@176[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@126 }
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@135 }
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@141 }
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@189[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@96 }
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/scopes/visibility2.lazy.log b/compiler/testData/diagnostics/tests/scopes/visibility2.lazy.log
index 0db548a4d0e..1ef20c68ee6 100644
--- a/compiler/testData/diagnostics/tests/scopes/visibility2.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/visibility2.lazy.log
@@ -412,7 +412,7 @@ LazyJavaClassifierType@394['Collection<? extends E>'] {
 
 LazyJavaClassifierType@400['Collection<? extends E>'] {
     arguments = ArrayList@401[1] { TypeProjectionImpl@402 }
-    classifier = JavaClassImpl@392['Collection']
+    classifier = JavaClassImpl@371['Collection']
     memberScope = SubstitutingScope@403
     nullable = 'true': Boolean@398
     typeConstructor = DeserializedClassTypeConstructor@399
@@ -420,7 +420,7 @@ LazyJavaClassifierType@400['Collection<? extends E>'] {
 
 LazyJavaClassifierType@404['Collection<? extends E>'] {
     arguments = ArrayList@405[1] { TypeProjectionImpl@406 }
-    classifier = JavaClassImpl@382['Collection']
+    classifier = JavaClassImpl@392['Collection']
     memberScope = SubstitutingScope@407
     nullable = 'true': Boolean@398
     typeConstructor = DeserializedClassTypeConstructor@399
@@ -428,7 +428,7 @@ LazyJavaClassifierType@404['Collection<? extends E>'] {
 
 LazyJavaClassifierType@408['Collection<? extends E>'] {
     arguments = ArrayList@409[1] { TypeProjectionImpl@410 }
-    classifier = JavaClassImpl@387['Collection']
+    classifier = JavaClassImpl@382['Collection']
     memberScope = SubstitutingScope@411
     nullable = 'true': Boolean@398
     typeConstructor = DeserializedClassTypeConstructor@399
@@ -436,7 +436,7 @@ LazyJavaClassifierType@408['Collection<? extends E>'] {
 
 LazyJavaClassifierType@412['Collection<? extends E>'] {
     arguments = ArrayList@413[1] { TypeProjectionImpl@414 }
-    classifier = JavaClassImpl@371['Collection']
+    classifier = JavaClassImpl@387['Collection']
     memberScope = SubstitutingScope@415
     nullable = 'true': Boolean@398
     typeConstructor = DeserializedClassTypeConstructor@399
@@ -492,7 +492,7 @@ LazyJavaClassifierType@441['Collection<?>'] {
 
 LazyJavaClassifierType@446['Collection<?>'] {
     arguments = ArrayList@447[1] { LazyStarProjection@448 }
-    classifier = JavaClassImpl@439['Collection']
+    classifier = JavaClassImpl@444['Collection']
     memberScope = SubstitutingScope@449
     nullable = 'true': Boolean@398
     typeConstructor = DeserializedClassTypeConstructor@399
@@ -500,7 +500,7 @@ LazyJavaClassifierType@446['Collection<?>'] {
 
 LazyJavaClassifierType@450['Collection<?>'] {
     arguments = ArrayList@451[1] { LazyStarProjection@452 }
-    classifier = JavaClassImpl@429['Collection']
+    classifier = JavaClassImpl@424['Collection']
     memberScope = SubstitutingScope@453
     nullable = 'true': Boolean@398
     typeConstructor = DeserializedClassTypeConstructor@399
@@ -508,7 +508,7 @@ LazyJavaClassifierType@450['Collection<?>'] {
 
 LazyJavaClassifierType@454['Collection<?>'] {
     arguments = ArrayList@455[1] { LazyStarProjection@456 }
-    classifier = JavaClassImpl@434['Collection']
+    classifier = JavaClassImpl@429['Collection']
     memberScope = SubstitutingScope@457
     nullable = 'true': Boolean@398
     typeConstructor = DeserializedClassTypeConstructor@399
@@ -524,7 +524,7 @@ LazyJavaClassifierType@458['Collection<?>'] {
 
 LazyJavaClassifierType@462['Collection<?>'] {
     arguments = ArrayList@463[1] { LazyStarProjection@464 }
-    classifier = JavaClassImpl@424['Collection']
+    classifier = JavaClassImpl@434['Collection']
     memberScope = SubstitutingScope@465
     nullable = 'true': Boolean@398
     typeConstructor = DeserializedClassTypeConstructor@399
@@ -532,7 +532,7 @@ LazyJavaClassifierType@462['Collection<?>'] {
 
 LazyJavaClassifierType@466['Collection<?>'] {
     arguments = ArrayList@467[1] { LazyStarProjection@468 }
-    classifier = JavaClassImpl@444['Collection']
+    classifier = JavaClassImpl@439['Collection']
     memberScope = SubstitutingScope@469
     nullable = 'true': Boolean@398
     typeConstructor = DeserializedClassTypeConstructor@399
@@ -563,168 +563,168 @@ LazyJavaClassifierType@481['E'] {
     arguments = ArrayList@482[empty]
     classifier = JavaTypeParameterImpl@483['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
 }
 
-LazyJavaClassifierType@484['E'] {
-    arguments = ArrayList@485[empty]
-    classifier = JavaTypeParameterImpl@486['E']
+LazyJavaClassifierType@485['E'] {
+    arguments = ArrayList@486[empty]
+    classifier = JavaTypeParameterImpl@487['E']
     nullable = 'false': Boolean@358
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
-LazyJavaClassifierType@487['E'] {
-    arguments = ArrayList@488[empty]
-    classifier = JavaTypeParameterImpl@489['E']
+LazyJavaClassifierType@488['E'] {
+    arguments = ArrayList@489[empty]
+    classifier = JavaTypeParameterImpl@490['E']
     nullable = 'false': Boolean@358
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
-LazyJavaClassifierType@490['E'] {
-    arguments = ArrayList@491[empty]
-    classifier = JavaTypeParameterImpl@492['E']
+LazyJavaClassifierType@491['E'] {
+    arguments = ArrayList@492[empty]
+    classifier = JavaTypeParameterImpl@493['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
 }
 
-LazyJavaClassifierType@493['E'] {
-    arguments = ArrayList@494[empty]
-    classifier = JavaTypeParameterImpl@495['E']
+LazyJavaClassifierType@494['E'] {
+    arguments = ArrayList@495[empty]
+    classifier = JavaTypeParameterImpl@496['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
 LazyJavaClassifierType@497['E'] {
     arguments = ArrayList@498[empty]
     classifier = JavaTypeParameterImpl@499['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
 }
 
 LazyJavaClassifierType@500['E'] {
     arguments = ArrayList@501[empty]
     classifier = JavaTypeParameterImpl@502['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
 }
 
 LazyJavaClassifierType@503['E'] {
     arguments = ArrayList@504[empty]
     classifier = JavaTypeParameterImpl@505['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
 }
 
 LazyJavaClassifierType@506['E'] {
     arguments = ArrayList@507[empty]
     classifier = JavaTypeParameterImpl@508['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
 }
 
 LazyJavaClassifierType@509['E'] {
     arguments = ArrayList@510[empty]
     classifier = JavaTypeParameterImpl@511['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
 LazyJavaClassifierType@512['E'] {
     arguments = ArrayList@513[empty]
     classifier = JavaTypeParameterImpl@514['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
 }
 
 LazyJavaClassifierType@515['E'] {
     arguments = ArrayList@516[empty]
     classifier = JavaTypeParameterImpl@517['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
 LazyJavaClassifierType@518['E'] {
     arguments = ArrayList@519[empty]
     classifier = JavaTypeParameterImpl@520['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
-LazyJavaClassifierType@522['E'] {
-    arguments = ArrayList@523[empty]
-    classifier = JavaTypeParameterImpl@524['E']
+LazyJavaClassifierType@521['E'] {
+    arguments = ArrayList@522[empty]
+    classifier = JavaTypeParameterImpl@523['E']
     nullable = 'false': Boolean@358
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
-LazyJavaClassifierType@525['E'] {
-    arguments = ArrayList@526[empty]
-    classifier = JavaTypeParameterImpl@527['E']
+LazyJavaClassifierType@524['E'] {
+    arguments = ArrayList@525[empty]
+    classifier = JavaTypeParameterImpl@526['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@527
 }
 
 LazyJavaClassifierType@528['E'] {
     arguments = ArrayList@529[empty]
     classifier = JavaTypeParameterImpl@530['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
 }
 
 LazyJavaClassifierType@531['E'] {
     arguments = ArrayList@532[empty]
     classifier = JavaTypeParameterImpl@533['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
 }
 
 LazyJavaClassifierType@534['E'] {
     arguments = ArrayList@535[empty]
     classifier = JavaTypeParameterImpl@536['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
 LazyJavaClassifierType@537['E'] {
     arguments = ArrayList@538[empty]
     classifier = JavaTypeParameterImpl@539['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
 }
 
 LazyJavaClassifierType@540['E'] {
     arguments = ArrayList@541[empty]
     classifier = JavaTypeParameterImpl@542['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@527
 }
 
 LazyJavaClassifierType@543['E'] {
     arguments = ArrayList@544[empty]
     classifier = JavaTypeParameterImpl@545['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
 }
 
 LazyJavaClassifierType@546['E'] {
     arguments = ArrayList@547[empty]
     classifier = JavaTypeParameterImpl@548['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
 }
 
 LazyJavaClassifierType@549['E'] {
     arguments = ArrayList@550[empty]
     classifier = JavaTypeParameterImpl@551['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
 }
 
 LazyJavaClassifierType@552['E'] {
     arguments = ArrayList@553[empty]
     classifier = JavaTypeParameterImpl@554['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
 LazyJavaClassifierType@555['E'] {
@@ -738,7 +738,7 @@ LazyJavaClassifierType@558['E'] {
     arguments = ArrayList@559[empty]
     classifier = JavaTypeParameterImpl@560['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
 LazyJavaClassifierType@561['E'] {
@@ -752,42 +752,42 @@ LazyJavaClassifierType@564['E'] {
     arguments = ArrayList@565[empty]
     classifier = JavaTypeParameterImpl@566['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@527
 }
 
 LazyJavaClassifierType@567['E'] {
     arguments = ArrayList@568[empty]
     classifier = JavaTypeParameterImpl@569['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
 LazyJavaClassifierType@570['E'] {
     arguments = ArrayList@571[empty]
     classifier = JavaTypeParameterImpl@572['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
 LazyJavaClassifierType@573['E'] {
     arguments = ArrayList@574[empty]
     classifier = JavaTypeParameterImpl@575['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
 }
 
 LazyJavaClassifierType@576['E'] {
     arguments = ArrayList@577[empty]
     classifier = JavaTypeParameterImpl@578['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
 }
 
 LazyJavaClassifierType@579['E'] {
     arguments = ArrayList@580[empty]
     classifier = JavaTypeParameterImpl@581['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
 }
 
 LazyJavaClassifierType@582['E'] {
@@ -801,413 +801,413 @@ LazyJavaClassifierType@585['E'] {
     arguments = ArrayList@586[empty]
     classifier = JavaTypeParameterImpl@587['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
 LazyJavaClassifierType@588['E'] {
     arguments = ArrayList@589[empty]
     classifier = JavaTypeParameterImpl@590['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
 }
 
 LazyJavaClassifierType@591['E'] {
     arguments = ArrayList@592[empty]
     classifier = JavaTypeParameterImpl@593['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
 LazyJavaClassifierType@594['E'] {
     arguments = ArrayList@595[empty]
     classifier = JavaTypeParameterImpl@596['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
 }
 
 LazyJavaClassifierType@597['E'] {
     arguments = ArrayList@598[empty]
     classifier = JavaTypeParameterImpl@599['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@527
 }
 
 LazyJavaClassifierType@600['E'] {
     arguments = ArrayList@601[empty]
     classifier = JavaTypeParameterImpl@602['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@527
 }
 
 LazyJavaClassifierType@603['E'] {
     arguments = ArrayList@604[empty]
     classifier = JavaTypeParameterImpl@605['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
 }
 
 LazyJavaClassifierType@606['E'] {
     arguments = ArrayList@607[empty]
     classifier = JavaTypeParameterImpl@608['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
 }
 
 LazyJavaClassifierType@609['E'] {
     arguments = ArrayList@610[empty]
     classifier = JavaTypeParameterImpl@611['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
 }
 
 LazyJavaClassifierType@612['E'] {
     arguments = ArrayList@613[empty]
     classifier = JavaTypeParameterImpl@614['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
 }
 
 LazyJavaClassifierType@615['E'] {
     arguments = ArrayList@616[empty]
     classifier = JavaTypeParameterImpl@617['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
 }
 
 LazyJavaClassifierType@618['E'] {
     arguments = ArrayList@619[empty]
     classifier = JavaTypeParameterImpl@620['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@527
 }
 
 LazyJavaClassifierType@621['E'] {
     arguments = ArrayList@622[empty]
-    classifier = JavaTypeParameterImpl@605['E']
+    classifier = JavaTypeParameterImpl@508['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
 }
 
 LazyJavaClassifierType@623['E'] {
     arguments = ArrayList@624[empty]
-    classifier = JavaTypeParameterImpl@560['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
-}
-
-LazyJavaClassifierType@625['E'] {
-    arguments = ArrayList@626[empty]
-    classifier = JavaTypeParameterImpl@517['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
-}
-
-LazyJavaClassifierType@627['E'] {
-    arguments = ArrayList@628[empty]
-    classifier = JavaTypeParameterImpl@557['E']
+    classifier = JavaTypeParameterImpl@496['E']
     nullable = 'true': Boolean@398
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
+LazyJavaClassifierType@625['E'] {
+    arguments = ArrayList@626[empty]
+    classifier = JavaTypeParameterImpl@548['E']
+    nullable = 'true': Boolean@398
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
+}
+
+LazyJavaClassifierType@627['E'] {
+    arguments = ArrayList@628[empty]
+    classifier = JavaTypeParameterImpl@530['E']
+    nullable = 'true': Boolean@398
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
+}
+
 LazyJavaClassifierType@629['E'] {
     arguments = ArrayList@630[empty]
-    classifier = JavaTypeParameterImpl@514['E']
+    classifier = JavaTypeParameterImpl@478['E']
     nullable = 'true': Boolean@398
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
 LazyJavaClassifierType@631['E'] {
     arguments = ArrayList@632[empty]
-    classifier = JavaTypeParameterImpl@524['E']
+    classifier = JavaTypeParameterImpl@575['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
 }
 
 LazyJavaClassifierType@633['E'] {
     arguments = ArrayList@634[empty]
-    classifier = JavaTypeParameterImpl@527['E']
+    classifier = JavaTypeParameterImpl@563['E']
     nullable = 'true': Boolean@398
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
 LazyJavaClassifierType@635['E'] {
     arguments = ArrayList@636[empty]
-    classifier = JavaTypeParameterImpl@548['E']
+    classifier = JavaTypeParameterImpl@566['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@527
 }
 
 LazyJavaClassifierType@637['E'] {
     arguments = ArrayList@638[empty]
-    classifier = JavaTypeParameterImpl@495['E']
+    classifier = JavaTypeParameterImpl@520['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
 LazyJavaClassifierType@639['E'] {
     arguments = ArrayList@640[empty]
-    classifier = JavaTypeParameterImpl@478['E']
+    classifier = JavaTypeParameterImpl@502['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
 }
 
 LazyJavaClassifierType@641['E'] {
     arguments = ArrayList@642[empty]
-    classifier = JavaTypeParameterImpl@572['E']
+    classifier = JavaTypeParameterImpl@596['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
 }
 
 LazyJavaClassifierType@643['E'] {
     arguments = ArrayList@644[empty]
-    classifier = JavaTypeParameterImpl@502['E']
+    classifier = JavaTypeParameterImpl@581['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
 }
 
 LazyJavaClassifierType@645['E'] {
     arguments = ArrayList@646[empty]
-    classifier = JavaTypeParameterImpl@599['E']
+    classifier = JavaTypeParameterImpl@511['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
 LazyJavaClassifierType@647['E'] {
     arguments = ArrayList@648[empty]
-    classifier = JavaTypeParameterImpl@590['E']
+    classifier = JavaTypeParameterImpl@490['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
 LazyJavaClassifierType@649['E'] {
     arguments = ArrayList@650[empty]
-    classifier = JavaTypeParameterImpl@593['E']
+    classifier = JavaTypeParameterImpl@599['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@527
 }
 
 LazyJavaClassifierType@651['E'] {
     arguments = ArrayList@652[empty]
-    classifier = JavaTypeParameterImpl@545['E']
+    classifier = JavaTypeParameterImpl@602['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@527
 }
 
 LazyJavaClassifierType@653['E'] {
     arguments = ArrayList@654[empty]
-    classifier = JavaTypeParameterImpl@575['E']
+    classifier = JavaTypeParameterImpl@499['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
 }
 
 LazyJavaClassifierType@655['E'] {
     arguments = ArrayList@656[empty]
-    classifier = JavaTypeParameterImpl@530['E']
+    classifier = JavaTypeParameterImpl@551['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
 }
 
 LazyJavaClassifierType@657['E'] {
     arguments = ArrayList@658[empty]
-    classifier = JavaTypeParameterImpl@587['E']
+    classifier = JavaTypeParameterImpl@514['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
 }
 
 LazyJavaClassifierType@659['E'] {
     arguments = ArrayList@660[empty]
-    classifier = JavaTypeParameterImpl@578['E']
+    classifier = JavaTypeParameterImpl@539['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
 }
 
 LazyJavaClassifierType@661['E'] {
     arguments = ArrayList@662[empty]
-    classifier = JavaTypeParameterImpl@539['E']
+    classifier = JavaTypeParameterImpl@578['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
 }
 
 LazyJavaClassifierType@663['E'] {
     arguments = ArrayList@664[empty]
-    classifier = JavaTypeParameterImpl@520['E']
+    classifier = JavaTypeParameterImpl@590['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
 }
 
 LazyJavaClassifierType@665['E'] {
     arguments = ArrayList@666[empty]
-    classifier = JavaTypeParameterImpl@611['E']
+    classifier = JavaTypeParameterImpl@557['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
 LazyJavaClassifierType@667['E'] {
     arguments = ArrayList@668[empty]
-    classifier = JavaTypeParameterImpl@620['E']
+    classifier = JavaTypeParameterImpl@523['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
 LazyJavaClassifierType@669['E'] {
     arguments = ArrayList@670[empty]
-    classifier = JavaTypeParameterImpl@499['E']
+    classifier = JavaTypeParameterImpl@584['E']
     nullable = 'true': Boolean@398
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
 LazyJavaClassifierType@671['E'] {
     arguments = ArrayList@672[empty]
-    classifier = JavaTypeParameterImpl@508['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
-}
-
-LazyJavaClassifierType@673['E'] {
-    arguments = ArrayList@674[empty]
-    classifier = JavaTypeParameterImpl@492['E']
+    classifier = JavaTypeParameterImpl@572['E']
     nullable = 'true': Boolean@398
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
+LazyJavaClassifierType@673['E'] {
+    arguments = ArrayList@674[empty]
+    classifier = JavaTypeParameterImpl@533['E']
+    nullable = 'true': Boolean@398
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
+}
+
 LazyJavaClassifierType@675['E'] {
     arguments = ArrayList@676[empty]
-    classifier = JavaTypeParameterImpl@511['E']
+    classifier = JavaTypeParameterImpl@569['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
 LazyJavaClassifierType@677['E'] {
     arguments = ArrayList@678[empty]
-    classifier = JavaTypeParameterImpl@608['E']
+    classifier = JavaTypeParameterImpl@487['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
 LazyJavaClassifierType@679['E'] {
     arguments = ArrayList@680[empty]
-    classifier = JavaTypeParameterImpl@489['E']
+    classifier = JavaTypeParameterImpl@517['E']
     nullable = 'true': Boolean@398
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
 LazyJavaClassifierType@681['E'] {
     arguments = ArrayList@682[empty]
-    classifier = JavaTypeParameterImpl@542['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
-}
-
-LazyJavaClassifierType@683['E'] {
-    arguments = ArrayList@684[empty]
-    classifier = JavaTypeParameterImpl@617['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
-}
-
-LazyJavaClassifierType@685['E'] {
-    arguments = ArrayList@686[empty]
-    classifier = JavaTypeParameterImpl@483['E']
+    classifier = JavaTypeParameterImpl@593['E']
     nullable = 'true': Boolean@398
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
+LazyJavaClassifierType@683['E'] {
+    arguments = ArrayList@684[empty]
+    classifier = JavaTypeParameterImpl@526['E']
+    nullable = 'true': Boolean@398
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@527
+}
+
+LazyJavaClassifierType@685['E'] {
+    arguments = ArrayList@686[empty]
+    classifier = JavaTypeParameterImpl@545['E']
+    nullable = 'true': Boolean@398
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
+}
+
 LazyJavaClassifierType@687['E'] {
     arguments = ArrayList@688[empty]
-    classifier = JavaTypeParameterImpl@505['E']
+    classifier = JavaTypeParameterImpl@587['E']
     nullable = 'true': Boolean@398
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
 LazyJavaClassifierType@689['E'] {
     arguments = ArrayList@690[empty]
-    classifier = JavaTypeParameterImpl@533['E']
+    classifier = JavaTypeParameterImpl@536['E']
     nullable = 'true': Boolean@398
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
 LazyJavaClassifierType@691['E'] {
     arguments = ArrayList@692[empty]
-    classifier = JavaTypeParameterImpl@584['E']
+    classifier = JavaTypeParameterImpl@542['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@527
 }
 
 LazyJavaClassifierType@693['E'] {
     arguments = ArrayList@694[empty]
-    classifier = JavaTypeParameterImpl@566['E']
+    classifier = JavaTypeParameterImpl@617['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
 }
 
 LazyJavaClassifierType@695['E'] {
     arguments = ArrayList@696[empty]
-    classifier = JavaTypeParameterImpl@581['E']
+    classifier = JavaTypeParameterImpl@611['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
 }
 
 LazyJavaClassifierType@697['E'] {
     arguments = ArrayList@698[empty]
-    classifier = JavaTypeParameterImpl@569['E']
+    classifier = JavaTypeParameterImpl@554['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
 LazyJavaClassifierType@699['E'] {
     arguments = ArrayList@700[empty]
-    classifier = JavaTypeParameterImpl@551['E']
+    classifier = JavaTypeParameterImpl@608['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
 }
 
 LazyJavaClassifierType@701['E'] {
     arguments = ArrayList@702[empty]
-    classifier = JavaTypeParameterImpl@602['E']
+    classifier = JavaTypeParameterImpl@605['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
 }
 
 LazyJavaClassifierType@703['E'] {
     arguments = ArrayList@704[empty]
-    classifier = JavaTypeParameterImpl@614['E']
+    classifier = JavaTypeParameterImpl@483['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
 }
 
 LazyJavaClassifierType@705['E'] {
     arguments = ArrayList@706[empty]
-    classifier = JavaTypeParameterImpl@554['E']
+    classifier = JavaTypeParameterImpl@560['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
 LazyJavaClassifierType@707['E'] {
     arguments = ArrayList@708[empty]
-    classifier = JavaTypeParameterImpl@486['E']
+    classifier = JavaTypeParameterImpl@493['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
 }
 
 LazyJavaClassifierType@709['E'] {
     arguments = ArrayList@710[empty]
-    classifier = JavaTypeParameterImpl@536['E']
+    classifier = JavaTypeParameterImpl@614['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
 }
 
 LazyJavaClassifierType@711['E'] {
     arguments = ArrayList@712[empty]
-    classifier = JavaTypeParameterImpl@563['E']
+    classifier = JavaTypeParameterImpl@505['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
 }
 
 LazyJavaClassifierType@713['E'] {
     arguments = ArrayList@714[empty]
-    classifier = JavaTypeParameterImpl@596['E']
+    classifier = JavaTypeParameterImpl@620['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@527
 }
 
 LazyJavaClassifierType@715['Iterator<E>'] {
@@ -1258,41 +1258,41 @@ LazyJavaClassifierType@740['Iterator<E>'] {
     typeConstructor = DeserializedClassTypeConstructor@735
 }
 
-LazyJavaClassifierType@744['List<E>'] {
-    arguments = ArrayList@745[1] { TypeProjectionImpl@746 }
-    classifier = JavaClassImpl@747['List']
-    memberScope = SubstitutingScope@748
-    nullable = 'false': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@749
-}
-
-LazyJavaClassifierType@750['List<E>'] {
-    arguments = ArrayList@751[1] { TypeProjectionImpl@752 }
-    classifier = JavaClassImpl@753['List']
-    memberScope = SubstitutingScope@754
-    nullable = 'false': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@749
-}
-
 LazyJavaClassifierType@339['List<E>'] {
-    arguments = ArrayList@755[1] { TypeProjectionImpl@756 }
-    classifier = JavaClassImpl@757['List']
-    memberScope = SubstitutingScope@758
+    arguments = ArrayList@744[1] { TypeProjectionImpl@745 }
+    classifier = JavaClassImpl@746['List']
+    memberScope = SubstitutingScope@747
     nullable = 'false': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@749
+    typeConstructor = DeserializedClassTypeConstructor@748
 }
 
 LazyJavaClassifierType@334['List<E>'] {
+    arguments = ArrayList@749[1] { TypeProjectionImpl@750 }
+    classifier = JavaClassImpl@751['List']
+    memberScope = SubstitutingScope@752
+    nullable = 'false': Boolean@358
+    typeConstructor = DeserializedClassTypeConstructor@748
+}
+
+LazyJavaClassifierType@753['List<E>'] {
+    arguments = ArrayList@754[1] { TypeProjectionImpl@755 }
+    classifier = JavaClassImpl@756['List']
+    memberScope = SubstitutingScope@757
+    nullable = 'false': Boolean@358
+    typeConstructor = DeserializedClassTypeConstructor@748
+}
+
+LazyJavaClassifierType@758['List<E>'] {
     arguments = ArrayList@759[1] { TypeProjectionImpl@760 }
     classifier = JavaClassImpl@761['List']
     memberScope = SubstitutingScope@762
     nullable = 'false': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@749
+    typeConstructor = DeserializedClassTypeConstructor@748
 }
 
 LazyJavaClassifierType@763['List<E>'] {
     arguments = ArrayList@764[1] { TypeProjectionImpl@765 }
-    classifier = JavaClassImpl@753['List']
+    classifier = JavaClassImpl@756['List']
     memberScope = SubstitutingScope@766
     nullable = 'true': Boolean@398
     typeConstructor = DeserializedClassTypeConstructor@767
@@ -1300,7 +1300,7 @@ LazyJavaClassifierType@763['List<E>'] {
 
 LazyJavaClassifierType@768['List<E>'] {
     arguments = ArrayList@769[1] { TypeProjectionImpl@770 }
-    classifier = JavaClassImpl@747['List']
+    classifier = JavaClassImpl@761['List']
     memberScope = SubstitutingScope@771
     nullable = 'true': Boolean@398
     typeConstructor = DeserializedClassTypeConstructor@767
@@ -1340,7 +1340,7 @@ LazyJavaClassifierType@788['ListIterator<E>'] {
 
 LazyJavaClassifierType@793['ListIterator<E>'] {
     arguments = ArrayList@794[1] { TypeProjectionImpl@795 }
-    classifier = JavaClassImpl@786['ListIterator']
+    classifier = JavaClassImpl@775['ListIterator']
     memberScope = SubstitutingScope@796
     nullable = 'true': Boolean@398
     typeConstructor = DeserializedClassTypeConstructor@797
@@ -1348,7 +1348,7 @@ LazyJavaClassifierType@793['ListIterator<E>'] {
 
 LazyJavaClassifierType@798['ListIterator<E>'] {
     arguments = ArrayList@799[1] { TypeProjectionImpl@800 }
-    classifier = JavaClassImpl@775['ListIterator']
+    classifier = JavaClassImpl@791['ListIterator']
     memberScope = SubstitutingScope@801
     nullable = 'true': Boolean@398
     typeConstructor = DeserializedClassTypeConstructor@797
@@ -1356,7 +1356,7 @@ LazyJavaClassifierType@798['ListIterator<E>'] {
 
 LazyJavaClassifierType@802['ListIterator<E>'] {
     arguments = ArrayList@803[1] { TypeProjectionImpl@804 }
-    classifier = JavaClassImpl@781['ListIterator']
+    classifier = JavaClassImpl@786['ListIterator']
     memberScope = SubstitutingScope@805
     nullable = 'true': Boolean@398
     typeConstructor = DeserializedClassTypeConstructor@797
@@ -1364,7 +1364,7 @@ LazyJavaClassifierType@802['ListIterator<E>'] {
 
 LazyJavaClassifierType@806['ListIterator<E>'] {
     arguments = ArrayList@807[1] { TypeProjectionImpl@808 }
-    classifier = JavaClassImpl@791['ListIterator']
+    classifier = JavaClassImpl@781['ListIterator']
     memberScope = SubstitutingScope@809
     nullable = 'true': Boolean@398
     typeConstructor = DeserializedClassTypeConstructor@797
@@ -1482,7 +1482,7 @@ LazyJavaClassifierType@851['Object'] {
 
 LazyJavaClassifierType@854['Object'] {
     arguments = ArrayList@855[empty]
-    classifier = JavaClassImpl@826['Object']
+    classifier = JavaClassImpl@835['Object']
     memberScope = DeserializedClassMemberScope@816
     nullable = 'true': Boolean@398
     typeConstructor = DeserializedClassTypeConstructor@817
@@ -1490,7 +1490,7 @@ LazyJavaClassifierType@854['Object'] {
 
 LazyJavaClassifierType@856['Object'] {
     arguments = ArrayList@857[empty]
-    classifier = JavaClassImpl@815['Object']
+    classifier = JavaClassImpl@838['Object']
     memberScope = DeserializedClassMemberScope@816
     nullable = 'true': Boolean@398
     typeConstructor = DeserializedClassTypeConstructor@817
@@ -1498,7 +1498,7 @@ LazyJavaClassifierType@856['Object'] {
 
 LazyJavaClassifierType@858['Object'] {
     arguments = ArrayList@859[empty]
-    classifier = JavaClassImpl@841['Object']
+    classifier = JavaClassImpl@850['Object']
     memberScope = DeserializedClassMemberScope@816
     nullable = 'true': Boolean@398
     typeConstructor = DeserializedClassTypeConstructor@817
@@ -1506,7 +1506,7 @@ LazyJavaClassifierType@858['Object'] {
 
 LazyJavaClassifierType@860['Object'] {
     arguments = ArrayList@861[empty]
-    classifier = JavaClassImpl@832['Object']
+    classifier = JavaClassImpl@823['Object']
     memberScope = DeserializedClassMemberScope@816
     nullable = 'true': Boolean@398
     typeConstructor = DeserializedClassTypeConstructor@817
@@ -1514,7 +1514,7 @@ LazyJavaClassifierType@860['Object'] {
 
 LazyJavaClassifierType@862['Object'] {
     arguments = ArrayList@863[empty]
-    classifier = JavaClassImpl@844['Object']
+    classifier = JavaClassImpl@820['Object']
     memberScope = DeserializedClassMemberScope@816
     nullable = 'true': Boolean@398
     typeConstructor = DeserializedClassTypeConstructor@817
@@ -1538,7 +1538,7 @@ LazyJavaClassifierType@866['Object'] {
 
 LazyJavaClassifierType@868['Object'] {
     arguments = ArrayList@869[empty]
-    classifier = JavaClassImpl@829['Object']
+    classifier = JavaClassImpl@841['Object']
     memberScope = DeserializedClassMemberScope@816
     nullable = 'true': Boolean@398
     typeConstructor = DeserializedClassTypeConstructor@817
@@ -1546,7 +1546,7 @@ LazyJavaClassifierType@868['Object'] {
 
 LazyJavaClassifierType@870['Object'] {
     arguments = ArrayList@871[empty]
-    classifier = JavaClassImpl@823['Object']
+    classifier = JavaClassImpl@832['Object']
     memberScope = DeserializedClassMemberScope@816
     nullable = 'true': Boolean@398
     typeConstructor = DeserializedClassTypeConstructor@817
@@ -1554,7 +1554,7 @@ LazyJavaClassifierType@870['Object'] {
 
 LazyJavaClassifierType@872['Object'] {
     arguments = ArrayList@873[empty]
-    classifier = JavaClassImpl@835['Object']
+    classifier = JavaClassImpl@844['Object']
     memberScope = DeserializedClassMemberScope@816
     nullable = 'true': Boolean@398
     typeConstructor = DeserializedClassTypeConstructor@817
@@ -1562,7 +1562,7 @@ LazyJavaClassifierType@872['Object'] {
 
 LazyJavaClassifierType@874['Object'] {
     arguments = ArrayList@875[empty]
-    classifier = JavaClassImpl@820['Object']
+    classifier = JavaClassImpl@815['Object']
     memberScope = DeserializedClassMemberScope@816
     nullable = 'true': Boolean@398
     typeConstructor = DeserializedClassTypeConstructor@817
@@ -1570,7 +1570,7 @@ LazyJavaClassifierType@874['Object'] {
 
 LazyJavaClassifierType@876['Object'] {
     arguments = ArrayList@877[empty]
-    classifier = JavaClassImpl@838['Object']
+    classifier = JavaClassImpl@826['Object']
     memberScope = DeserializedClassMemberScope@816
     nullable = 'true': Boolean@398
     typeConstructor = DeserializedClassTypeConstructor@817
@@ -1578,7 +1578,7 @@ LazyJavaClassifierType@876['Object'] {
 
 LazyJavaClassifierType@878['Object'] {
     arguments = ArrayList@879[empty]
-    classifier = JavaClassImpl@850['Object']
+    classifier = JavaClassImpl@829['Object']
     memberScope = DeserializedClassMemberScope@816
     nullable = 'true': Boolean@398
     typeConstructor = DeserializedClassTypeConstructor@817
@@ -1681,7 +1681,7 @@ LazyJavaClassifierType@914['String'] {
 
 LazyJavaClassifierType@916['String'] {
     arguments = ArrayList@917[empty]
-    classifier = JavaClassImpl@910['String']
+    classifier = JavaClassImpl@913['String']
     memberScope = DeserializedClassMemberScope@906
     nullable = 'true': Boolean@398
     typeConstructor = DeserializedClassTypeConstructor@907
@@ -1689,7 +1689,7 @@ LazyJavaClassifierType@916['String'] {
 
 LazyJavaClassifierType@918['String'] {
     arguments = ArrayList@919[empty]
-    classifier = JavaClassImpl@913['String']
+    classifier = JavaClassImpl@910['String']
     memberScope = DeserializedClassMemberScope@906
     nullable = 'true': Boolean@398
     typeConstructor = DeserializedClassTypeConstructor@907
@@ -1725,9 +1725,9 @@ LazyJavaClassifierType@931['T'] {
 
 LazyJavaClassifierType@934['T'] {
     arguments = ArrayList@935[empty]
-    classifier = JavaTypeParameterImpl@933['T']
+    classifier = JavaTypeParameterImpl@926['T']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@930
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@923
 }
 
 LazyJavaClassifierType@936['T'] {
@@ -1739,16 +1739,16 @@ LazyJavaClassifierType@936['T'] {
 
 LazyJavaClassifierType@938['T'] {
     arguments = ArrayList@939[empty]
-    classifier = JavaTypeParameterImpl@929['T']
+    classifier = JavaTypeParameterImpl@933['T']
     nullable = 'true': Boolean@398
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@930
 }
 
 LazyJavaClassifierType@940['T'] {
     arguments = ArrayList@941[empty]
-    classifier = JavaTypeParameterImpl@926['T']
+    classifier = JavaTypeParameterImpl@929['T']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@923
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@930
 }
 
 LazyJavaPackageFragmentProvider@942 {
@@ -1825,14 +1825,14 @@ LazyJavaPackageFragment@971['util'] {
 
 LazyJavaTypeParameterDescriptor@327['E'] {
     defaultType = JetTypeImpl@1000['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@527
     upperBounds = LinkedHashSet@1001[1] { NullableType@1002 }
     upperBoundsAsType = NullableType@1002
 }
 
 LazyJavaTypeParameterDescriptor@336['E'] {
     defaultType = JetTypeImpl@1003['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
     upperBounds = LinkedHashSet@1004[1] { NullableType@1005 }
     upperBoundsAsType = NullableType@1005
 }
@@ -1867,7 +1867,7 @@ LazyJavaTypeParameterResolver@1019 {
 }
 
 LazyJavaTypeParameterResolver@1021 {
-    resolve(JavaTypeParameterImpl@1022['E']) = LazyJavaTypeParameterDescriptor@336['E']
+    resolve(JavaTypeParameterImpl@1022['E']) = LazyJavaTypeParameterDescriptor@331['E']
 }
 
 LazyJavaTypeParameterResolver@1023 {
@@ -1875,107 +1875,107 @@ LazyJavaTypeParameterResolver@1023 {
 }
 
 LazyJavaTypeParameterResolver@1025 {
-    resolve(JavaTypeParameterImpl@1026['E']) = LazyJavaTypeParameterDescriptor@331['E']
+    resolve(JavaTypeParameterImpl@1026['E']) = LazyJavaTypeParameterDescriptor@336['E']
 }
 
 LazyJavaTypeParameterResolver@1027 {
-    resolve(JavaTypeParameterImpl@492['E']) = null
+    resolve(JavaTypeParameterImpl@599['E']) = null
 }
 
 LazyJavaTypeParameterResolver@1028 {
-    resolve(JavaTypeParameterImpl@596['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1029 {
-    resolve(JavaTypeParameterImpl@530['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1030 {
-    resolve(JavaTypeParameterImpl@517['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1031 {
     resolve(JavaTypeParameterImpl@511['E']) = null
 }
 
+LazyJavaTypeParameterResolver@1029 {
+    resolve(JavaTypeParameterImpl@581['E']) = null
+}
+
+LazyJavaTypeParameterResolver@1030 {
+    resolve(JavaTypeParameterImpl@620['E']) = null
+}
+
+LazyJavaTypeParameterResolver@1031 {
+    resolve(JavaTypeParameterImpl@514['E']) = null
+}
+
 LazyJavaTypeParameterResolver@1032 {
-    resolve(JavaTypeParameterImpl@548['E']) = null
+    resolve(JavaTypeParameterImpl@505['E']) = null
 }
 
 LazyJavaTypeParameterResolver@1033 {
-    resolve(JavaTypeParameterImpl@486['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1034 {
-    resolve(JavaTypeParameterImpl@539['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1035 {
-    resolve(JavaTypeParameterImpl@489['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1036 {
-    resolve(JavaTypeParameterImpl@495['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1037 {
-    resolve(JavaTypeParameterImpl@569['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1038 {
     resolve(JavaTypeParameterImpl@587['E']) = null
 }
 
-LazyJavaTypeParameterResolver@1039 {
-    resolve(JavaTypeParameterImpl@602['E']) = null
+LazyJavaTypeParameterResolver@1034 {
+    resolve(JavaTypeParameterImpl@520['E']) = null
 }
 
-LazyJavaTypeParameterResolver@1040 {
-    resolve(JavaTypeParameterImpl@508['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1041 {
-    resolve(JavaTypeParameterImpl@536['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1042 {
+LazyJavaTypeParameterResolver@1035 {
     resolve(JavaTypeParameterImpl@617['E']) = null
 }
 
+LazyJavaTypeParameterResolver@1036 {
+    resolve(JavaTypeParameterImpl@593['E']) = null
+}
+
+LazyJavaTypeParameterResolver@1037 {
+    resolve(JavaTypeParameterImpl@545['E']) = null
+}
+
+LazyJavaTypeParameterResolver@1038 {
+    resolve(JavaTypeParameterImpl@569['E']) = null
+}
+
+LazyJavaTypeParameterResolver@1039 {
+    resolve(JavaTypeParameterImpl@614['E']) = null
+}
+
+LazyJavaTypeParameterResolver@1040 {
+    resolve(JavaTypeParameterImpl@551['E']) = null
+}
+
+LazyJavaTypeParameterResolver@1041 {
+    resolve(JavaTypeParameterImpl@539['E']) = null
+}
+
+LazyJavaTypeParameterResolver@1042 {
+    resolve(JavaTypeParameterImpl@605['E']) = null
+}
+
 LazyJavaTypeParameterResolver@1043 {
-    resolve(JavaTypeParameterImpl@483['E']) = null
+    resolve(JavaTypeParameterImpl@490['E']) = null
 }
 
 LazyJavaTypeParameterResolver@1044 {
-    resolve(JavaTypeParameterImpl@560['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1045 {
-    resolve(JavaTypeParameterImpl@533['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1046 {
-    resolve(JavaTypeParameterImpl@575['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1047 {
-    resolve(JavaTypeParameterImpl@557['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1048 {
-    resolve(JavaTypeParameterImpl@584['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1049 {
-    resolve(JavaTypeParameterImpl@590['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1050 {
     resolve(JavaTypeParameterImpl@554['E']) = null
 }
 
+LazyJavaTypeParameterResolver@1045 {
+    resolve(JavaTypeParameterImpl@487['E']) = null
+}
+
+LazyJavaTypeParameterResolver@1046 {
+    resolve(JavaTypeParameterImpl@563['E']) = null
+}
+
+LazyJavaTypeParameterResolver@1047 {
+    resolve(JavaTypeParameterImpl@578['E']) = null
+}
+
+LazyJavaTypeParameterResolver@1048 {
+    resolve(JavaTypeParameterImpl@502['E']) = null
+}
+
+LazyJavaTypeParameterResolver@1049 {
+    resolve(JavaTypeParameterImpl@526['E']) = null
+}
+
+LazyJavaTypeParameterResolver@1050 {
+    resolve(JavaTypeParameterImpl@530['E']) = null
+}
+
 LazyJavaTypeParameterResolver@1051 {
-    resolve(JavaTypeParameterImpl@524['E']) = null
+    resolve(JavaTypeParameterImpl@560['E']) = null
 }
 
 LazyJavaTypeParameterResolver@1052 {
@@ -1988,20 +1988,6 @@ LazyJavaTypeParameterResolver@1054 {
 
 ResolutionTaskHolder@1056 {
     <name not found> = ArrayList@1057[1] { ResolutionCandidate@1058 }
-    <name not found> = ArrayList@1059[1] { ResolutionCandidate@1058 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
@@ -2027,19 +2013,8 @@ ResolutionTaskHolder@1056 {
     <name not found> = EmptyList@6[empty]
 }
 
-ResolutionTaskHolder@1060 {
-    <name not found> = ArrayList@1061[1] { ResolutionCandidate@1062 }
-    <name not found> = ArrayList@1063[1] { ResolutionCandidate@1062 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
+ResolutionTaskHolder@1059 {
+    <name not found> = ArrayList@1060[1] { ResolutionCandidate@1061 }
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
@@ -2060,9 +2035,8 @@ ResolutionTaskHolder@1060 {
     <name not found> = EmptyList@6[empty]
 }
 
-ResolutionTaskHolder@1064 {
-    <name not found> = ArrayList@1065[1] { ResolutionCandidate@1066 }
-    <name not found> = ArrayList@1067[1] { ResolutionCandidate@1066 }
+ResolutionTaskHolder@1062 {
+    <name not found> = ArrayList@1063[1] { ResolutionCandidate@1064 }
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
@@ -2078,6 +2052,22 @@ ResolutionTaskHolder@1064 {
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
+}
+
+ResolutionTaskHolder@1065 {
+    <name not found> = ArrayList@1066[1] { ResolutionCandidate@1067 }
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
@@ -2085,18 +2075,6 @@ ResolutionTaskHolder@1064 {
 
 ResolutionTaskHolder@1068 {
     <name not found> = ArrayList@1069[1] { ResolutionCandidate@1070 }
-    <name not found> = ArrayList@1071[1] { ResolutionCandidate@1070 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
@@ -2106,51 +2084,76 @@ ResolutionTaskHolder@1068 {
     <name not found> = EmptyList@6[empty]
 }
 
-ResolutionTaskHolder@1072 {
-    <name not found> = ArrayList@1073[1] { ResolutionCandidate@1074 }
-    <name not found> = ArrayList@1075[1] { ResolutionCandidate@1074 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
+ResolutionTaskHolder@1071 {
+    <name not found> = ArrayList@1072[1] { ResolutionCandidate@1073 }
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
 }
 
-ResolutionTaskHolder@1076 {
-    <name not found> = ArrayList@1077[1] { ResolutionCandidate@1078 }
-    <name not found> = ArrayList@1079[1] { ResolutionCandidate@1078 }
+ResolutionTaskHolder@1074 {
+    <name not found> = ArrayList@1075[1] { ResolutionCandidate@1076 }
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
+}
+
+ResolutionTaskHolder@1077 {
+    <name not found> = ArrayList@1078[1] { ResolutionCandidate@1079 }
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
 }
 
 ResolutionTaskHolder@1080 {
     <name not found> = ArrayList@1081[1] { ResolutionCandidate@1082 }
-    <name not found> = ArrayList@1083[1] { ResolutionCandidate@1082 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
 }
 
-ResolutionTaskHolder@1084 {
-    <name not found> = ArrayList@1085[1] { ResolutionCandidate@1086 }
-    <name not found> = ArrayList@1087[1] { ResolutionCandidate@1086 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
+ResolutionTaskHolder@1083 {
+    <name not found> = ArrayList@1084[3] { ResolutionCandidate@1085, ResolutionCandidate@1086, ResolutionCandidate@1087 }
 }
 
-ResolutionTaskHolder@1088 {
-    <name not found> = ArrayList@1089[1] { ResolutionCandidate@1090 }
-    <name not found> = ArrayList@1091[1] { ResolutionCandidate@1090 }
-}
-
-ResolutionTaskHolder@1092 {
-    <name not found> = ArrayList@1093[3] { ResolutionCandidate@1094, ResolutionCandidate@1095, ResolutionCandidate@1096 }
-    <name not found> = ArrayList@1097[3] { ResolutionCandidate@1094, ResolutionCandidate@1095, ResolutionCandidate@1096 }
+null {
+    <name not found> = ArrayList@1088[1] { ResolutionCandidate@1073 }
+    <name not found> = ArrayList@1089[1] { ResolutionCandidate@1079 }
+    <name not found> = ArrayList@1090[1] { ResolutionCandidate@1076 }
+    <name not found> = ArrayList@1091[1] { ResolutionCandidate@1082 }
+    <name not found> = ArrayList@1092[1] { ResolutionCandidate@1058 }
+    <name not found> = ArrayList@1093[1] { ResolutionCandidate@1064 }
+    <name not found> = ArrayList@1094[1] { ResolutionCandidate@1067 }
+    <name not found> = ArrayList@1095[1] { ResolutionCandidate@1070 }
+    <name not found> = ArrayList@1096[1] { ResolutionCandidate@1061 }
+    <name not found> = ArrayList@1097[3] { ResolutionCandidate@1085, ResolutionCandidate@1086, ResolutionCandidate@1087 }
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/script/AccessForwardDeclarationInScript.lazy.log b/compiler/testData/diagnostics/tests/script/AccessForwardDeclarationInScript.lazy.log
index 01ab6fa4a13..687065e829e 100644
--- a/compiler/testData/diagnostics/tests/script/AccessForwardDeclarationInScript.lazy.log
+++ b/compiler/testData/diagnostics/tests/script/AccessForwardDeclarationInScript.lazy.log
@@ -81,18 +81,6 @@ ResolutionTaskHolder@26 {
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
 }
 
 ResolutionTaskHolder@27 {
@@ -120,6 +108,21 @@ ResolutionTaskHolder@27 {
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
+}
+
+null {
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
diff --git a/compiler/testData/diagnostics/tests/script/ComplexScript.lazy.log b/compiler/testData/diagnostics/tests/script/ComplexScript.lazy.log
index 65ab5790fff..109f0f003f7 100644
--- a/compiler/testData/diagnostics/tests/script/ComplexScript.lazy.log
+++ b/compiler/testData/diagnostics/tests/script/ComplexScript.lazy.log
@@ -39,9 +39,16 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
@@ -50,14 +57,10 @@ ResolutionTaskHolder@28 {
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+null {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@35 }
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
diff --git a/compiler/testData/diagnostics/tests/senselessComparison/parenthesized.lazy.log b/compiler/testData/diagnostics/tests/senselessComparison/parenthesized.lazy.log
index 904a229a373..e66ac31fa8c 100644
--- a/compiler/testData/diagnostics/tests/senselessComparison/parenthesized.lazy.log
+++ b/compiler/testData/diagnostics/tests/senselessComparison/parenthesized.lazy.log
@@ -38,240 +38,243 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@29 {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
+}
+
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
 ResolutionTaskHolder@41 {
     <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
+}
+
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
 ResolutionTaskHolder@53 {
     <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
+}
+
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
 }
 
 ResolutionTaskHolder@65 {
     <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
+}
+
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
 }
 
 ResolutionTaskHolder@77 {
     <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
 }
 
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
 }
 
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
+}
+
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
 }
 
 ResolutionTaskHolder@89 {
     <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
 }
 
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
+}
+
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
 }
 
 ResolutionTaskHolder@101 {
     <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
 }
 
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
 }
 
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
+}
+
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
 }
 
 ResolutionTaskHolder@113 {
     <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
 }
 
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
 }
 
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
+ResolutionTaskHolder@119 {
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
+}
+
+ResolutionTaskHolder@122 {
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
 }
 
 ResolutionTaskHolder@125 {
     <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@127 }
 }
 
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@131 }
+ResolutionTaskHolder@128 {
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
 }
 
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@135 }
+ResolutionTaskHolder@131 {
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
+}
+
+ResolutionTaskHolder@134 {
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
 }
 
 ResolutionTaskHolder@137 {
     <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@139 }
 }
 
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@143 }
+ResolutionTaskHolder@140 {
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
 }
 
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@147 }
+ResolutionTaskHolder@143 {
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
 }
 
-ResolutionTaskHolder@149 {
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@151 }
+ResolutionTaskHolder@146 {
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
 }
 
-ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@155 }
-}
-
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@159 }
-}
-
-ResolutionTaskHolder@161 {
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@163 }
-}
-
-ResolutionTaskHolder@165 {
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@167 }
-}
-
-ResolutionTaskHolder@169 {
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@171 }
-}
-
-ResolutionTaskHolder@173 {
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@175 }
-}
-
-ResolutionTaskHolder@177 {
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@179 }
-}
-
-ResolutionTaskHolder@181 {
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@183 }
-}
-
-ResolutionTaskHolder@185 {
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@187 }
+null {
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@133 }
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@124 }
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@148 }
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@166[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@168[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@145 }
+    <name not found> = ArrayList@170[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@139 }
+    <name not found> = ArrayList@176[1] { ResolutionCandidate@136 }
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@142 }
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@127 }
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@55 }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/shadowing/ShadowMultiDeclarationWithFunParameter.lazy.log b/compiler/testData/diagnostics/tests/shadowing/ShadowMultiDeclarationWithFunParameter.lazy.log
index 0ee08a2c421..a191eabfe3d 100644
--- a/compiler/testData/diagnostics/tests/shadowing/ShadowMultiDeclarationWithFunParameter.lazy.log
+++ b/compiler/testData/diagnostics/tests/shadowing/ShadowMultiDeclarationWithFunParameter.lazy.log
@@ -46,93 +46,96 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
 }
 
 ResolutionTaskHolder@43 {
     <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
 }
 
 ResolutionTaskHolder@55 {
     <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
+}
+
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
 }
 
 ResolutionTaskHolder@67 {
     <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
 }
 
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
 }
 
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
+}
+
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
 }
 
 ResolutionTaskHolder@79 {
     <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
 }
 
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
+null {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@69 }
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/shadowing/ShadowParameterInFunctionBody.lazy.log b/compiler/testData/diagnostics/tests/shadowing/ShadowParameterInFunctionBody.lazy.log
index 91f94fb77a7..ef5bd35001f 100644
--- a/compiler/testData/diagnostics/tests/shadowing/ShadowParameterInFunctionBody.lazy.log
+++ b/compiler/testData/diagnostics/tests/shadowing/ShadowParameterInFunctionBody.lazy.log
@@ -23,5 +23,8 @@ LazyJavaPackageFragment@5['java'] {
 
 ResolutionTaskHolder@21 {
     <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
+}
+
+null {
     <name not found> = ArrayList@24[1] { ResolutionCandidate@23 }
 }
diff --git a/compiler/testData/diagnostics/tests/shadowing/ShadowParameterInNestedBlockInFor.lazy.log b/compiler/testData/diagnostics/tests/shadowing/ShadowParameterInNestedBlockInFor.lazy.log
index c89a6e4f819..6ebac4ba8bd 100644
--- a/compiler/testData/diagnostics/tests/shadowing/ShadowParameterInNestedBlockInFor.lazy.log
+++ b/compiler/testData/diagnostics/tests/shadowing/ShadowParameterInNestedBlockInFor.lazy.log
@@ -23,20 +23,23 @@ LazyJavaPackageFragment@5['java'] {
 
 ResolutionTaskHolder@21 {
     <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@23 }
 }
 
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
+ResolutionTaskHolder@24 {
+    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+ResolutionTaskHolder@27 {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[7] { ResolutionCandidate@35, ResolutionCandidate@36, ResolutionCandidate@37, ... }
-    <name not found> = ArrayList@38[7] { ResolutionCandidate@35, ResolutionCandidate@36, ResolutionCandidate@37, ... }
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[7] { ResolutionCandidate@32, ResolutionCandidate@33, ResolutionCandidate@34, ... }
+}
+
+null {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@23 }
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@26 }
+    <name not found> = ArrayList@38[7] { ResolutionCandidate@32, ResolutionCandidate@33, ResolutionCandidate@34, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/shadowing/ShadowPropertyInClosure.lazy.log b/compiler/testData/diagnostics/tests/shadowing/ShadowPropertyInClosure.lazy.log
index 5260ffd836e..700c88b5357 100644
--- a/compiler/testData/diagnostics/tests/shadowing/ShadowPropertyInClosure.lazy.log
+++ b/compiler/testData/diagnostics/tests/shadowing/ShadowPropertyInClosure.lazy.log
@@ -31,5 +31,8 @@ LazyJavaPackageFragment@11['java'] {
 
 ResolutionTaskHolder@27 {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
+}
+
+null {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
 }
diff --git a/compiler/testData/diagnostics/tests/shadowing/ShadowPropertyInFor.lazy.log b/compiler/testData/diagnostics/tests/shadowing/ShadowPropertyInFor.lazy.log
index 87d01949d61..8520bc4ccca 100644
--- a/compiler/testData/diagnostics/tests/shadowing/ShadowPropertyInFor.lazy.log
+++ b/compiler/testData/diagnostics/tests/shadowing/ShadowPropertyInFor.lazy.log
@@ -21,20 +21,23 @@ LazyJavaPackageFragment@7['java'] {
 
 ResolutionTaskHolder@19 {
     <name not found> = ArrayList@20[1] { ResolutionCandidate@21 }
-    <name not found> = ArrayList@22[1] { ResolutionCandidate@21 }
 }
 
-ResolutionTaskHolder@23 {
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@25 }
+ResolutionTaskHolder@22 {
+    <name not found> = ArrayList@23[1] { ResolutionCandidate@24 }
 }
 
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
+ResolutionTaskHolder@25 {
+    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
 }
 
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[7] { ResolutionCandidate@33, ResolutionCandidate@34, ResolutionCandidate@35, ... }
-    <name not found> = ArrayList@36[7] { ResolutionCandidate@33, ResolutionCandidate@34, ResolutionCandidate@35, ... }
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[7] { ResolutionCandidate@30, ResolutionCandidate@31, ResolutionCandidate@32, ... }
+}
+
+null {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@27 }
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@21 }
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@24 }
+    <name not found> = ArrayList@36[7] { ResolutionCandidate@30, ResolutionCandidate@31, ResolutionCandidate@32, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/shadowing/ShadowPropertyInFunction.lazy.log b/compiler/testData/diagnostics/tests/shadowing/ShadowPropertyInFunction.lazy.log
index ca7565a1830..798231e4b6a 100644
--- a/compiler/testData/diagnostics/tests/shadowing/ShadowPropertyInFunction.lazy.log
+++ b/compiler/testData/diagnostics/tests/shadowing/ShadowPropertyInFunction.lazy.log
@@ -28,5 +28,8 @@ LazyJavaPackageFragment@8['java'] {
 
 ResolutionTaskHolder@24 {
     <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
+}
+
+null {
     <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
 }
diff --git a/compiler/testData/diagnostics/tests/shadowing/ShadowVariableInFor.lazy.log b/compiler/testData/diagnostics/tests/shadowing/ShadowVariableInFor.lazy.log
index 29e69803154..e41632bc3f0 100644
--- a/compiler/testData/diagnostics/tests/shadowing/ShadowVariableInFor.lazy.log
+++ b/compiler/testData/diagnostics/tests/shadowing/ShadowVariableInFor.lazy.log
@@ -23,25 +23,28 @@ LazyJavaPackageFragment@5['java'] {
 
 ResolutionTaskHolder@21 {
     <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@23 }
 }
 
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
+ResolutionTaskHolder@24 {
+    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+ResolutionTaskHolder@27 {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
+}
+
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
 }
 
 ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@34[7] { ResolutionCandidate@35, ResolutionCandidate@36, ResolutionCandidate@37, ... }
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[7] { ResolutionCandidate@39, ResolutionCandidate@40, ResolutionCandidate@41, ... }
-    <name not found> = ArrayList@42[7] { ResolutionCandidate@39, ResolutionCandidate@40, ResolutionCandidate@41, ... }
+null {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@23 }
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@26 }
+    <name not found> = ArrayList@42[7] { ResolutionCandidate@35, ResolutionCandidate@36, ResolutionCandidate@37, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/shadowing/ShadowVariableInNestedBlock.lazy.log b/compiler/testData/diagnostics/tests/shadowing/ShadowVariableInNestedBlock.lazy.log
index 91f94fb77a7..ef5bd35001f 100644
--- a/compiler/testData/diagnostics/tests/shadowing/ShadowVariableInNestedBlock.lazy.log
+++ b/compiler/testData/diagnostics/tests/shadowing/ShadowVariableInNestedBlock.lazy.log
@@ -23,5 +23,8 @@ LazyJavaPackageFragment@5['java'] {
 
 ResolutionTaskHolder@21 {
     <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
+}
+
+null {
     <name not found> = ArrayList@24[1] { ResolutionCandidate@23 }
 }
diff --git a/compiler/testData/diagnostics/tests/shadowing/ShadowVariableInNestedClosure.lazy.log b/compiler/testData/diagnostics/tests/shadowing/ShadowVariableInNestedClosure.lazy.log
index eab643625ac..628b36dcc25 100644
--- a/compiler/testData/diagnostics/tests/shadowing/ShadowVariableInNestedClosure.lazy.log
+++ b/compiler/testData/diagnostics/tests/shadowing/ShadowVariableInNestedClosure.lazy.log
@@ -27,5 +27,8 @@ LazyJavaPackageFragment@6['java'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
+}
+
+null {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
 }
diff --git a/compiler/testData/diagnostics/tests/shadowing/ShadowVariableInNestedClosureParam.lazy.log b/compiler/testData/diagnostics/tests/shadowing/ShadowVariableInNestedClosureParam.lazy.log
index 972786f3d0e..03a9d5da3be 100644
--- a/compiler/testData/diagnostics/tests/shadowing/ShadowVariableInNestedClosureParam.lazy.log
+++ b/compiler/testData/diagnostics/tests/shadowing/ShadowVariableInNestedClosureParam.lazy.log
@@ -23,10 +23,13 @@ LazyJavaPackageFragment@5['java'] {
 
 ResolutionTaskHolder@21 {
     <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@23 }
 }
 
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
+ResolutionTaskHolder@24 {
+    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
+}
+
+null {
+    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@23 }
 }
diff --git a/compiler/testData/diagnostics/tests/smartCasts/afterBinaryExpr.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/afterBinaryExpr.lazy.log
index 5e7d0764072..8beb9343e87 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/afterBinaryExpr.lazy.log
+++ b/compiler/testData/diagnostics/tests/smartCasts/afterBinaryExpr.lazy.log
@@ -29,35 +29,38 @@ LazyJavaPackageFragment@8['java'] {
 
 ResolutionTaskHolder@27 {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
 }
 
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
+}
+
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
 }
 
 ResolutionTaskHolder@39 {
     <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[2] { ResolutionCandidate@47, ResolutionCandidate@48 }
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[2] { ResolutionCandidate@53, ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[2] { ResolutionCandidate@53, ResolutionCandidate@54 }
+null {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@55[2] { ResolutionCandidate@47, ResolutionCandidate@48 }
 }
diff --git a/compiler/testData/diagnostics/tests/smartCasts/classObjectMember.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/classObjectMember.lazy.log
index 31a106faa2c..4516224c567 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/classObjectMember.lazy.log
+++ b/compiler/testData/diagnostics/tests/smartCasts/classObjectMember.lazy.log
@@ -52,104 +52,107 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@38 {
     <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+    <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
 ResolutionTaskHolder@49 {
     <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
     <name not found> = EmptyList@30[empty]
 }
 
 ResolutionTaskHolder@61 {
     <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
+}
+
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
 }
 
 ResolutionTaskHolder@73 {
     <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+}
+
+null {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@45 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
-}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/combineWithNoSelectorInfo.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/combineWithNoSelectorInfo.lazy.log
index 0cc16eca493..447a512b437 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/combineWithNoSelectorInfo.lazy.log
+++ b/compiler/testData/diagnostics/tests/smartCasts/combineWithNoSelectorInfo.lazy.log
@@ -32,34 +32,37 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@23[empty]
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
     <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
+}
+
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
 }
 
 ResolutionTaskHolder@39 {
     <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+null {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@32 }
+    <name not found> = EmptyList@23[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/smartCasts/dataFlowInfoForArguments.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/dataFlowInfoForArguments.lazy.log
index ac0dd8447f7..8c3027dae75 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/dataFlowInfoForArguments.lazy.log
+++ b/compiler/testData/diagnostics/tests/smartCasts/dataFlowInfoForArguments.lazy.log
@@ -28,24 +28,27 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@24 {
     <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
 }
 
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
+ResolutionTaskHolder@27 {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
 }
 
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
 }
 
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
+}
+
+null {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@26 }
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/smartCasts/elvisNothingRHS.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/elvisNothingRHS.lazy.log
index 700ebb9b30a..ae48b9a20b3 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/elvisNothingRHS.lazy.log
+++ b/compiler/testData/diagnostics/tests/smartCasts/elvisNothingRHS.lazy.log
@@ -41,12 +41,6 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@29 {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
@@ -72,49 +66,58 @@ ResolutionTaskHolder@29 {
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+}
+
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
 }
 
 ResolutionTaskHolder@41 {
     <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
+}
+
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
 }
 
 ResolutionTaskHolder@53 {
     <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[2] { ResolutionCandidate@58, ResolutionCandidate@59 }
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[2] { ResolutionCandidate@67, ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[2] { ResolutionCandidate@67, ResolutionCandidate@68 }
+null {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@69[2] { ResolutionCandidate@58, ResolutionCandidate@59 }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/smartCasts/elvisRHS.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/elvisRHS.lazy.log
index 9b4eb72732a..2bb1dd384e9 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/elvisRHS.lazy.log
+++ b/compiler/testData/diagnostics/tests/smartCasts/elvisRHS.lazy.log
@@ -34,39 +34,42 @@ LazyJavaPackageFragment@7['lang'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@17[empty]
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
     <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
+}
+
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
 }
 
 ResolutionTaskHolder@36 {
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+null {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@27 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@47 }
+    <name not found> = EmptyList@17[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/smartCasts/inference/dependentOnPrevArg.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/inference/dependentOnPrevArg.lazy.log
index 1d1964ae4ed..5828e931f20 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/inference/dependentOnPrevArg.lazy.log
+++ b/compiler/testData/diagnostics/tests/smartCasts/inference/dependentOnPrevArg.lazy.log
@@ -32,29 +32,32 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
 }
 
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
+}
+
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
 }
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+null {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@30 }
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/smartCasts/inference/intersectionTypes.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/inference/intersectionTypes.lazy.log
index 82d818ef9ee..8b7793dcb0f 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/inference/intersectionTypes.lazy.log
+++ b/compiler/testData/diagnostics/tests/smartCasts/inference/intersectionTypes.lazy.log
@@ -37,21 +37,21 @@ LazyJavaClassifierType@21['String'] {
 
 LazyJavaClassifierType@24['String'] {
     arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@15['String']
+    classifier = JavaClassImpl@20['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@23['String']
+    classifier = JavaClassImpl@15['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@29['String'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@20['String']
+    classifier = JavaClassImpl@23['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -79,21 +79,21 @@ LazyJavaClassifierType@38['Throwable'] {
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@40['Throwable']
+    classifier = JavaClassImpl@33['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@43['Throwable'] {
     arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@37['Throwable']
+    classifier = JavaClassImpl@40['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@45['Throwable'] {
     arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@33['Throwable']
+    classifier = JavaClassImpl@37['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -177,19 +177,31 @@ LazyJavaPackageFragment@72['lang'] {
 
 ResolutionTaskHolder@109 {
     <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
+    <name not found> = EmptyList@97[empty]
+}
+
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
     <name not found> = EmptyList@97[empty]
     <name not found> = EmptyList@97[empty]
 }
 
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
     <name not found> = EmptyList@97[empty]
     <name not found> = EmptyList@97[empty]
     <name not found> = EmptyList@97[empty]
@@ -209,326 +221,317 @@ ResolutionTaskHolder@116 {
 
 ResolutionTaskHolder@120 {
     <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
     <name not found> = EmptyList@97[empty]
     <name not found> = EmptyList@97[empty]
 }
 
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@126 }
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
+ResolutionTaskHolder@123 {
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
     <name not found> = EmptyList@97[empty]
     <name not found> = EmptyList@97[empty]
 }
 
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
+ResolutionTaskHolder@126 {
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
     <name not found> = EmptyList@97[empty]
     <name not found> = EmptyList@97[empty]
+}
+
+ResolutionTaskHolder@129 {
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
     <name not found> = EmptyList@97[empty]
     <name not found> = EmptyList@97[empty]
 }
 
 ResolutionTaskHolder@132 {
     <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
     <name not found> = EmptyList@97[empty]
     <name not found> = EmptyList@97[empty]
 }
 
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
+ResolutionTaskHolder@135 {
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
     <name not found> = EmptyList@97[empty]
     <name not found> = EmptyList@97[empty]
 }
 
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
+ResolutionTaskHolder@138 {
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
     <name not found> = EmptyList@97[empty]
     <name not found> = EmptyList@97[empty]
+}
+
+ResolutionTaskHolder@141 {
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
     <name not found> = EmptyList@97[empty]
     <name not found> = EmptyList@97[empty]
 }
 
 ResolutionTaskHolder@144 {
     <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
     <name not found> = EmptyList@97[empty]
     <name not found> = EmptyList@97[empty]
 }
 
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
+ResolutionTaskHolder@147 {
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
 }
 
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
+ResolutionTaskHolder@150 {
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
+}
+
+ResolutionTaskHolder@153 {
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
 }
 
 ResolutionTaskHolder@156 {
     <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
 }
 
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@162 }
+ResolutionTaskHolder@159 {
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
 }
 
-ResolutionTaskHolder@164 {
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@166 }
+ResolutionTaskHolder@162 {
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
+}
+
+ResolutionTaskHolder@165 {
+    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
 }
 
 ResolutionTaskHolder@168 {
     <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@170 }
 }
 
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@174 }
+ResolutionTaskHolder@171 {
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
 }
 
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@178 }
+ResolutionTaskHolder@174 {
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
+}
+
+ResolutionTaskHolder@177 {
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
 }
 
 ResolutionTaskHolder@180 {
     <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@182 }
 }
 
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@186 }
+ResolutionTaskHolder@183 {
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
 }
 
-ResolutionTaskHolder@188 {
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@190 }
+ResolutionTaskHolder@186 {
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
+}
+
+ResolutionTaskHolder@189 {
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
 }
 
 ResolutionTaskHolder@192 {
     <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@194 }
 }
 
-ResolutionTaskHolder@196 {
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@198 }
+ResolutionTaskHolder@195 {
+    <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
 }
 
-ResolutionTaskHolder@200 {
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@202 }
+ResolutionTaskHolder@198 {
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
+}
+
+ResolutionTaskHolder@201 {
+    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
 }
 
 ResolutionTaskHolder@204 {
     <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@206 }
 }
 
-ResolutionTaskHolder@208 {
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@210 }
+ResolutionTaskHolder@207 {
+    <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
 }
 
-ResolutionTaskHolder@212 {
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@214 }
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@214 }
+ResolutionTaskHolder@210 {
+    <name not found> = ArrayList@211[1] { ResolutionCandidate@212 }
+}
+
+ResolutionTaskHolder@213 {
+    <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
 }
 
 ResolutionTaskHolder@216 {
     <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@218 }
 }
 
-ResolutionTaskHolder@220 {
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@222 }
+ResolutionTaskHolder@219 {
+    <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
 }
 
-ResolutionTaskHolder@224 {
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@226 }
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@226 }
+ResolutionTaskHolder@222 {
+    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
+}
+
+ResolutionTaskHolder@225 {
+    <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
 }
 
 ResolutionTaskHolder@228 {
     <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@230 }
 }
 
-ResolutionTaskHolder@232 {
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@234 }
+ResolutionTaskHolder@231 {
+    <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
 }
 
-ResolutionTaskHolder@236 {
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@238 }
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@238 }
+ResolutionTaskHolder@234 {
+    <name not found> = ArrayList@235[1] { ResolutionCandidate@236 }
+}
+
+ResolutionTaskHolder@237 {
+    <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
 }
 
 ResolutionTaskHolder@240 {
     <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
-    <name not found> = ArrayList@243[1] { ResolutionCandidate@242 }
 }
 
-ResolutionTaskHolder@244 {
-    <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@246 }
+ResolutionTaskHolder@243 {
+    <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
 }
 
-ResolutionTaskHolder@248 {
-    <name not found> = ArrayList@249[1] { ResolutionCandidate@250 }
-    <name not found> = ArrayList@251[1] { ResolutionCandidate@250 }
+ResolutionTaskHolder@246 {
+    <name not found> = ArrayList@247[1] { ResolutionCandidate@248 }
+}
+
+ResolutionTaskHolder@249 {
+    <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
 }
 
 ResolutionTaskHolder@252 {
     <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
-    <name not found> = ArrayList@255[1] { ResolutionCandidate@254 }
 }
 
-ResolutionTaskHolder@256 {
-    <name not found> = ArrayList@257[1] { ResolutionCandidate@258 }
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@258 }
+ResolutionTaskHolder@255 {
+    <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
 }
 
-ResolutionTaskHolder@260 {
-    <name not found> = ArrayList@261[1] { ResolutionCandidate@262 }
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@262 }
+ResolutionTaskHolder@258 {
+    <name not found> = ArrayList@259[1] { ResolutionCandidate@260 }
+}
+
+ResolutionTaskHolder@261 {
+    <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
 }
 
 ResolutionTaskHolder@264 {
     <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
-    <name not found> = ArrayList@267[1] { ResolutionCandidate@266 }
 }
 
-ResolutionTaskHolder@268 {
-    <name not found> = ArrayList@269[1] { ResolutionCandidate@270 }
-    <name not found> = ArrayList@271[1] { ResolutionCandidate@270 }
+ResolutionTaskHolder@267 {
+    <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
 }
 
-ResolutionTaskHolder@272 {
-    <name not found> = ArrayList@273[1] { ResolutionCandidate@274 }
-    <name not found> = ArrayList@275[1] { ResolutionCandidate@274 }
+ResolutionTaskHolder@270 {
+    <name not found> = ArrayList@271[1] { ResolutionCandidate@272 }
+}
+
+ResolutionTaskHolder@273 {
+    <name not found> = ArrayList@274[1] { ResolutionCandidate@275 }
 }
 
 ResolutionTaskHolder@276 {
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
-    <name not found> = ArrayList@279[1] { ResolutionCandidate@278 }
+    <name not found> = ArrayList@277[4] { ResolutionCandidate@278, ResolutionCandidate@279, ResolutionCandidate@280, ... }
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
 }
 
-ResolutionTaskHolder@280 {
-    <name not found> = ArrayList@281[1] { ResolutionCandidate@282 }
-    <name not found> = ArrayList@283[1] { ResolutionCandidate@282 }
-}
-
-ResolutionTaskHolder@284 {
-    <name not found> = ArrayList@285[1] { ResolutionCandidate@286 }
-    <name not found> = ArrayList@287[1] { ResolutionCandidate@286 }
-}
-
-ResolutionTaskHolder@288 {
-    <name not found> = ArrayList@289[1] { ResolutionCandidate@290 }
-    <name not found> = ArrayList@291[1] { ResolutionCandidate@290 }
-}
-
-ResolutionTaskHolder@292 {
-    <name not found> = ArrayList@293[1] { ResolutionCandidate@294 }
-    <name not found> = ArrayList@295[1] { ResolutionCandidate@294 }
-}
-
-ResolutionTaskHolder@296 {
-    <name not found> = ArrayList@297[1] { ResolutionCandidate@298 }
-    <name not found> = ArrayList@299[1] { ResolutionCandidate@298 }
-}
-
-ResolutionTaskHolder@300 {
-    <name not found> = ArrayList@301[1] { ResolutionCandidate@302 }
-    <name not found> = ArrayList@303[1] { ResolutionCandidate@302 }
-}
-
-ResolutionTaskHolder@304 {
-    <name not found> = ArrayList@305[1] { ResolutionCandidate@306 }
-    <name not found> = ArrayList@307[1] { ResolutionCandidate@306 }
-}
-
-ResolutionTaskHolder@308 {
-    <name not found> = ArrayList@309[1] { ResolutionCandidate@310 }
-    <name not found> = ArrayList@311[1] { ResolutionCandidate@310 }
-}
-
-ResolutionTaskHolder@312 {
-    <name not found> = ArrayList@313[1] { ResolutionCandidate@314 }
-    <name not found> = ArrayList@315[1] { ResolutionCandidate@314 }
-}
-
-ResolutionTaskHolder@316 {
-    <name not found> = ArrayList@317[1] { ResolutionCandidate@318 }
-    <name not found> = ArrayList@319[1] { ResolutionCandidate@318 }
-}
-
-ResolutionTaskHolder@320 {
-    <name not found> = ArrayList@321[1] { ResolutionCandidate@322 }
-    <name not found> = ArrayList@323[1] { ResolutionCandidate@322 }
-}
-
-ResolutionTaskHolder@324 {
-    <name not found> = ArrayList@325[1] { ResolutionCandidate@326 }
-    <name not found> = ArrayList@327[1] { ResolutionCandidate@326 }
-}
-
-ResolutionTaskHolder@328 {
-    <name not found> = ArrayList@329[1] { ResolutionCandidate@330 }
-    <name not found> = ArrayList@331[1] { ResolutionCandidate@330 }
-}
-
-ResolutionTaskHolder@332 {
-    <name not found> = ArrayList@333[4] { ResolutionCandidate@334, ResolutionCandidate@335, ResolutionCandidate@336, ... }
-    <name not found> = ArrayList@337[5] { ResolutionCandidate@334, ResolutionCandidate@335, ResolutionCandidate@336, ... }
+null {
+    <name not found> = ArrayList@281[1] { ResolutionCandidate@215 }
+    <name not found> = ArrayList@282[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@283[1] { ResolutionCandidate@251 }
+    <name not found> = ArrayList@284[1] { ResolutionCandidate@221 }
+    <name not found> = ArrayList@285[1] { ResolutionCandidate@176 }
+    <name not found> = ArrayList@286[1] { ResolutionCandidate@272 }
+    <name not found> = ArrayList@287[1] { ResolutionCandidate@146 }
+    <name not found> = ArrayList@288[1] { ResolutionCandidate@152 }
+    <name not found> = ArrayList@289[1] { ResolutionCandidate@122 }
+    <name not found> = ArrayList@290[1] { ResolutionCandidate@149 }
+    <name not found> = ArrayList@291[1] { ResolutionCandidate@128 }
+    <name not found> = ArrayList@292[1] { ResolutionCandidate@257 }
+    <name not found> = ArrayList@293[1] { ResolutionCandidate@206 }
+    <name not found> = ArrayList@294[1] { ResolutionCandidate@185 }
+    <name not found> = ArrayList@295[1] { ResolutionCandidate@134 }
+    <name not found> = ArrayList@296[1] { ResolutionCandidate@200 }
+    <name not found> = ArrayList@297[1] { ResolutionCandidate@248 }
+    <name not found> = ArrayList@298[1] { ResolutionCandidate@161 }
+    <name not found> = ArrayList@299[1] { ResolutionCandidate@218 }
+    <name not found> = ArrayList@300[1] { ResolutionCandidate@125 }
+    <name not found> = ArrayList@301[1] { ResolutionCandidate@266 }
+    <name not found> = ArrayList@302[1] { ResolutionCandidate@275 }
+    <name not found> = ArrayList@303[1] { ResolutionCandidate@179 }
+    <name not found> = ArrayList@304[1] { ResolutionCandidate@143 }
+    <name not found> = ArrayList@305[1] { ResolutionCandidate@197 }
+    <name not found> = ArrayList@306[1] { ResolutionCandidate@236 }
+    <name not found> = ArrayList@307[1] { ResolutionCandidate@227 }
+    <name not found> = ArrayList@308[1] { ResolutionCandidate@173 }
+    <name not found> = ArrayList@309[1] { ResolutionCandidate@245 }
+    <name not found> = ArrayList@310[1] { ResolutionCandidate@131 }
+    <name not found> = ArrayList@311[1] { ResolutionCandidate@155 }
+    <name not found> = ArrayList@312[1] { ResolutionCandidate@212 }
+    <name not found> = ArrayList@313[1] { ResolutionCandidate@209 }
+    <name not found> = ArrayList@314[1] { ResolutionCandidate@239 }
+    <name not found> = ArrayList@315[1] { ResolutionCandidate@230 }
+    <name not found> = ArrayList@316[1] { ResolutionCandidate@260 }
+    <name not found> = ArrayList@317[1] { ResolutionCandidate@203 }
+    <name not found> = ArrayList@318[1] { ResolutionCandidate@140 }
+    <name not found> = ArrayList@319[1] { ResolutionCandidate@191 }
+    <name not found> = ArrayList@320[1] { ResolutionCandidate@254 }
+    <name not found> = ArrayList@321[1] { ResolutionCandidate@224 }
+    <name not found> = ArrayList@322[1] { ResolutionCandidate@182 }
+    <name not found> = ArrayList@323[1] { ResolutionCandidate@188 }
+    <name not found> = ArrayList@324[1] { ResolutionCandidate@167 }
+    <name not found> = ArrayList@325[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@326[1] { ResolutionCandidate@164 }
+    <name not found> = ArrayList@327[1] { ResolutionCandidate@242 }
+    <name not found> = ArrayList@328[1] { ResolutionCandidate@263 }
+    <name not found> = ArrayList@329[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@330[1] { ResolutionCandidate@233 }
+    <name not found> = ArrayList@331[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@332[1] { ResolutionCandidate@113 }
+    <name not found> = ArrayList@333[1] { ResolutionCandidate@170 }
+    <name not found> = ArrayList@334[1] { ResolutionCandidate@137 }
+    <name not found> = ArrayList@335[1] { ResolutionCandidate@194 }
+    <name not found> = ArrayList@336[1] { ResolutionCandidate@269 }
+    <name not found> = ArrayList@337[5] { ResolutionCandidate@278, ResolutionCandidate@279, ResolutionCandidate@280, ... }
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
     <name not found> = EmptyList@97[empty]
     <name not found> = EmptyList@97[empty]
     <name not found> = EmptyList@97[empty]
diff --git a/compiler/testData/diagnostics/tests/smartCasts/inference/kt1355.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/inference/kt1355.lazy.log
index 27e08645728..065879a39c6 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/inference/kt1355.lazy.log
+++ b/compiler/testData/diagnostics/tests/smartCasts/inference/kt1355.lazy.log
@@ -66,42 +66,42 @@ LazyJavaClassifierType@51['K'] {
     arguments = ArrayList@52[empty]
     classifier = JavaTypeParameterImpl@53['K']
     nullable = 'false': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@54
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@50
 }
 
-LazyJavaClassifierType@55['K'] {
-    arguments = ArrayList@56[empty]
-    classifier = JavaTypeParameterImpl@57['K']
+LazyJavaClassifierType@54['K'] {
+    arguments = ArrayList@55[empty]
+    classifier = JavaTypeParameterImpl@56['K']
     nullable = 'false': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@54
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
 }
 
 LazyJavaClassifierType@58['K'] {
     arguments = ArrayList@59[empty]
     classifier = JavaTypeParameterImpl@60['K']
     nullable = 'false': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@54
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@50
 }
 
 LazyJavaClassifierType@61['K'] {
     arguments = ArrayList@62[empty]
-    classifier = JavaTypeParameterImpl@60['K']
+    classifier = JavaTypeParameterImpl@53['K']
     nullable = 'true': Boolean@63
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@54
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@50
 }
 
 LazyJavaClassifierType@64['K'] {
     arguments = ArrayList@65[empty]
-    classifier = JavaTypeParameterImpl@53['K']
+    classifier = JavaTypeParameterImpl@60['K']
     nullable = 'true': Boolean@63
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@54
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@50
 }
 
 LazyJavaClassifierType@66['K'] {
     arguments = ArrayList@67[empty]
-    classifier = JavaTypeParameterImpl@57['K']
+    classifier = JavaTypeParameterImpl@56['K']
     nullable = 'true': Boolean@63
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@54
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
 }
 
 LazyJavaClassifierType@68['K'] {
@@ -173,21 +173,21 @@ LazyJavaClassifierType@101['String'] {
 
 LazyJavaClassifierType@104['String'] {
     arguments = ArrayList@105[empty]
-    classifier = JavaClassImpl@103['String']
+    classifier = JavaClassImpl@100['String']
     nullable = 'true': Boolean@63
     typeConstructor = DeserializedClassTypeConstructor@97
 }
 
 LazyJavaClassifierType@106['String'] {
     arguments = ArrayList@107[empty]
-    classifier = JavaClassImpl@96['String']
+    classifier = JavaClassImpl@103['String']
     nullable = 'true': Boolean@63
     typeConstructor = DeserializedClassTypeConstructor@97
 }
 
 LazyJavaClassifierType@108['String'] {
     arguments = ArrayList@109[empty]
-    classifier = JavaClassImpl@100['String']
+    classifier = JavaClassImpl@96['String']
     nullable = 'true': Boolean@63
     typeConstructor = DeserializedClassTypeConstructor@97
 }
@@ -215,21 +215,21 @@ LazyJavaClassifierType@117['Throwable'] {
 
 LazyJavaClassifierType@120['Throwable'] {
     arguments = ArrayList@121[empty]
-    classifier = JavaClassImpl@119['Throwable']
+    classifier = JavaClassImpl@112['Throwable']
     nullable = 'true': Boolean@63
     typeConstructor = DeserializedClassTypeConstructor@113
 }
 
 LazyJavaClassifierType@122['Throwable'] {
     arguments = ArrayList@123[empty]
-    classifier = JavaClassImpl@116['Throwable']
+    classifier = JavaClassImpl@119['Throwable']
     nullable = 'true': Boolean@63
     typeConstructor = DeserializedClassTypeConstructor@113
 }
 
 LazyJavaClassifierType@124['Throwable'] {
     arguments = ArrayList@125[empty]
-    classifier = JavaClassImpl@112['Throwable']
+    classifier = JavaClassImpl@116['Throwable']
     nullable = 'true': Boolean@63
     typeConstructor = DeserializedClassTypeConstructor@113
 }
@@ -251,49 +251,49 @@ LazyJavaClassifierType@132['V'] {
     arguments = ArrayList@133[empty]
     classifier = JavaTypeParameterImpl@134['V']
     nullable = 'false': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@135
 }
 
-LazyJavaClassifierType@135['V'] {
-    arguments = ArrayList@136[empty]
-    classifier = JavaTypeParameterImpl@137['V']
+LazyJavaClassifierType@136['V'] {
+    arguments = ArrayList@137[empty]
+    classifier = JavaTypeParameterImpl@138['V']
     nullable = 'false': Boolean@49
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
 }
 
-LazyJavaClassifierType@138['V'] {
-    arguments = ArrayList@139[empty]
-    classifier = JavaTypeParameterImpl@140['V']
+LazyJavaClassifierType@139['V'] {
+    arguments = ArrayList@140[empty]
+    classifier = JavaTypeParameterImpl@141['V']
     nullable = 'false': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@141
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
 }
 
 LazyJavaClassifierType@142['V'] {
     arguments = ArrayList@143[empty]
-    classifier = JavaTypeParameterImpl@130['V']
+    classifier = JavaTypeParameterImpl@134['V']
     nullable = 'true': Boolean@63
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@135
 }
 
 LazyJavaClassifierType@144['V'] {
     arguments = ArrayList@145[empty]
-    classifier = JavaTypeParameterImpl@137['V']
+    classifier = JavaTypeParameterImpl@130['V']
     nullable = 'true': Boolean@63
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
 }
 
 LazyJavaClassifierType@146['V'] {
     arguments = ArrayList@147[empty]
-    classifier = JavaTypeParameterImpl@134['V']
+    classifier = JavaTypeParameterImpl@138['V']
     nullable = 'true': Boolean@63
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
 }
 
 LazyJavaClassifierType@148['V'] {
     arguments = ArrayList@149[empty]
-    classifier = JavaTypeParameterImpl@140['V']
+    classifier = JavaTypeParameterImpl@141['V']
     nullable = 'true': Boolean@63
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@141
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
 }
 
 LazyJavaPackageFragmentProvider@150 {
@@ -383,12 +383,12 @@ LazyJavaPackageFragment@188['util'] {
 
 LazyJavaTypeParameterDescriptor@34['K'] {
     defaultType = JetTypeImpl@224['K']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@54
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@50
     upperBounds = LinkedHashSet@225[1] { NullableType@226 }
 }
 
 LazyJavaTypeParameterDescriptor@26['K'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@50
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
 }
 
 LazyJavaTypeParameterDescriptor@35['V'] {
@@ -398,50 +398,34 @@ LazyJavaTypeParameterDescriptor@35['V'] {
 }
 
 LazyJavaTypeParameterDescriptor@27['V'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@141
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@135
 }
 
 LazyJavaTypeParameterResolver@230 {
-    resolve(JavaTypeParameterImpl@231['K']) = LazyJavaTypeParameterDescriptor@34['K']
-    resolve(JavaTypeParameterImpl@232['V']) = LazyJavaTypeParameterDescriptor@35['V']
+    resolve(JavaTypeParameterImpl@231['K']) = LazyJavaTypeParameterDescriptor@26['K']
+    resolve(JavaTypeParameterImpl@232['V']) = LazyJavaTypeParameterDescriptor@27['V']
 }
 
 LazyJavaTypeParameterResolver@233 {
-    resolve(JavaTypeParameterImpl@234['K']) = LazyJavaTypeParameterDescriptor@26['K']
-    resolve(JavaTypeParameterImpl@235['V']) = LazyJavaTypeParameterDescriptor@27['V']
+    resolve(JavaTypeParameterImpl@234['K']) = LazyJavaTypeParameterDescriptor@34['K']
+    resolve(JavaTypeParameterImpl@235['V']) = LazyJavaTypeParameterDescriptor@35['V']
 }
 
 ResolutionTaskHolder@236 {
     <name not found> = ArrayList@237[1] { ResolutionCandidate@238 }
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@238 }
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@241 }
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@241 }
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
+    <name not found> = ArrayList@239[1] { ResolutionCandidate@240 }
     <name not found> = EmptyList@209[empty]
     <name not found> = EmptyList@209[empty]
 }
 
-ResolutionTaskHolder@243 {
+ResolutionTaskHolder@241 {
+    <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
     <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@245 }
+    <name not found> = EmptyList@209[empty]
+}
+
+ResolutionTaskHolder@246 {
     <name not found> = ArrayList@247[1] { ResolutionCandidate@248 }
-    <name not found> = ArrayList@249[1] { ResolutionCandidate@248 }
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-}
-
-ResolutionTaskHolder@250 {
-    <name not found> = ArrayList@251[1] { ResolutionCandidate@252 }
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@252 }
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
     <name not found> = EmptyList@209[empty]
     <name not found> = EmptyList@209[empty]
     <name not found> = EmptyList@209[empty]
@@ -452,180 +436,130 @@ ResolutionTaskHolder@250 {
     <name not found> = EmptyList@209[empty]
 }
 
-ResolutionTaskHolder@254 {
-    <name not found> = ArrayList@255[1] { ResolutionCandidate@256 }
-    <name not found> = ArrayList@257[1] { ResolutionCandidate@256 }
+ResolutionTaskHolder@249 {
+    <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
     <name not found> = EmptyList@209[empty]
     <name not found> = EmptyList@209[empty]
     <name not found> = EmptyList@209[empty]
+}
+
+ResolutionTaskHolder@252 {
+    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
     <name not found> = EmptyList@209[empty]
     <name not found> = EmptyList@209[empty]
     <name not found> = EmptyList@209[empty]
 }
 
+ResolutionTaskHolder@255 {
+    <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
+}
+
 ResolutionTaskHolder@258 {
     <name not found> = ArrayList@259[1] { ResolutionCandidate@260 }
-    <name not found> = ArrayList@261[1] { ResolutionCandidate@260 }
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
     <name not found> = EmptyList@209[empty]
     <name not found> = EmptyList@209[empty]
 }
 
-ResolutionTaskHolder@262 {
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@264 }
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@264 }
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
+ResolutionTaskHolder@261 {
+    <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
     <name not found> = EmptyList@209[empty]
 }
 
-ResolutionTaskHolder@266 {
-    <name not found> = ArrayList@267[1] { ResolutionCandidate@268 }
-    <name not found> = ArrayList@269[1] { ResolutionCandidate@268 }
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
+ResolutionTaskHolder@264 {
+    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
     <name not found> = EmptyList@209[empty]
+}
+
+ResolutionTaskHolder@267 {
+    <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
     <name not found> = EmptyList@209[empty]
 }
 
 ResolutionTaskHolder@270 {
     <name not found> = ArrayList@271[1] { ResolutionCandidate@272 }
-    <name not found> = ArrayList@273[1] { ResolutionCandidate@272 }
-    <name not found> = EmptyList@209[empty]
     <name not found> = EmptyList@209[empty]
 }
 
-ResolutionTaskHolder@274 {
-    <name not found> = ArrayList@275[1] { ResolutionCandidate@276 }
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@276 }
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
+ResolutionTaskHolder@273 {
+    <name not found> = ArrayList@274[1] { ResolutionCandidate@275 }
 }
 
-ResolutionTaskHolder@278 {
-    <name not found> = ArrayList@279[1] { ResolutionCandidate@280 }
-    <name not found> = ArrayList@281[1] { ResolutionCandidate@280 }
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
+ResolutionTaskHolder@276 {
+    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
+}
+
+ResolutionTaskHolder@279 {
+    <name not found> = ArrayList@280[1] { ResolutionCandidate@281 }
 }
 
 ResolutionTaskHolder@282 {
     <name not found> = ArrayList@283[1] { ResolutionCandidate@284 }
-    <name not found> = ArrayList@285[1] { ResolutionCandidate@284 }
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
 }
 
-ResolutionTaskHolder@286 {
-    <name not found> = ArrayList@287[1] { ResolutionCandidate@288 }
-    <name not found> = ArrayList@289[1] { ResolutionCandidate@288 }
+ResolutionTaskHolder@285 {
+    <name not found> = ArrayList@286[1] { ResolutionCandidate@287 }
 }
 
-ResolutionTaskHolder@290 {
-    <name not found> = ArrayList@291[1] { ResolutionCandidate@292 }
-    <name not found> = ArrayList@293[1] { ResolutionCandidate@292 }
+ResolutionTaskHolder@288 {
+    <name not found> = ArrayList@289[1] { ResolutionCandidate@290 }
+}
+
+ResolutionTaskHolder@291 {
+    <name not found> = ArrayList@292[1] { ResolutionCandidate@293 }
 }
 
 ResolutionTaskHolder@294 {
     <name not found> = ArrayList@295[1] { ResolutionCandidate@296 }
-    <name not found> = ArrayList@297[1] { ResolutionCandidate@296 }
 }
 
-ResolutionTaskHolder@298 {
-    <name not found> = ArrayList@299[1] { ResolutionCandidate@300 }
-    <name not found> = ArrayList@301[1] { ResolutionCandidate@300 }
+ResolutionTaskHolder@297 {
+    <name not found> = ArrayList@298[1] { ResolutionCandidate@299 }
 }
 
-ResolutionTaskHolder@302 {
-    <name not found> = ArrayList@303[1] { ResolutionCandidate@304 }
-    <name not found> = ArrayList@305[1] { ResolutionCandidate@304 }
+ResolutionTaskHolder@300 {
+    <name not found> = ArrayList@301[1] { ResolutionCandidate@302 }
+}
+
+ResolutionTaskHolder@303 {
+    <name not found> = ArrayList@304[1] { ResolutionCandidate@305 }
 }
 
 ResolutionTaskHolder@306 {
     <name not found> = ArrayList@307[1] { ResolutionCandidate@308 }
-    <name not found> = ArrayList@309[1] { ResolutionCandidate@308 }
 }
 
-ResolutionTaskHolder@310 {
-    <name not found> = ArrayList@311[1] { ResolutionCandidate@312 }
-    <name not found> = ArrayList@313[1] { ResolutionCandidate@312 }
+ResolutionTaskHolder@309 {
+    <name not found> = ArrayList@310[1] { ResolutionCandidate@311 }
 }
 
-ResolutionTaskHolder@314 {
-    <name not found> = ArrayList@315[1] { ResolutionCandidate@316 }
-    <name not found> = ArrayList@317[1] { ResolutionCandidate@316 }
+ResolutionTaskHolder@312 {
+    <name not found> = ArrayList@313[1] { ResolutionCandidate@314 }
+}
+
+ResolutionTaskHolder@315 {
+    <name not found> = ArrayList@316[1] { ResolutionCandidate@317 }
 }
 
 ResolutionTaskHolder@318 {
     <name not found> = ArrayList@319[1] { ResolutionCandidate@320 }
-    <name not found> = ArrayList@321[1] { ResolutionCandidate@320 }
 }
 
-ResolutionTaskHolder@322 {
-    <name not found> = ArrayList@323[1] { ResolutionCandidate@324 }
-    <name not found> = ArrayList@325[1] { ResolutionCandidate@324 }
+ResolutionTaskHolder@321 {
+    <name not found> = ArrayList@322[1] { ResolutionCandidate@323 }
 }
 
-ResolutionTaskHolder@326 {
-    <name not found> = ArrayList@327[1] { ResolutionCandidate@328 }
-    <name not found> = ArrayList@329[1] { ResolutionCandidate@328 }
+ResolutionTaskHolder@324 {
+    <name not found> = ArrayList@325[1] { ResolutionCandidate@326 }
+}
+
+ResolutionTaskHolder@327 {
+    <name not found> = ArrayList@328[1] { ResolutionCandidate@329 }
 }
 
 ResolutionTaskHolder@330 {
-    <name not found> = ArrayList@331[1] { ResolutionCandidate@332 }
-    <name not found> = ArrayList@333[1] { ResolutionCandidate@332 }
-}
-
-ResolutionTaskHolder@334 {
-    <name not found> = ArrayList@335[1] { ResolutionCandidate@336 }
-    <name not found> = ArrayList@337[1] { ResolutionCandidate@336 }
-}
-
-ResolutionTaskHolder@338 {
-    <name not found> = ArrayList@339[1] { ResolutionCandidate@340 }
-    <name not found> = ArrayList@341[1] { ResolutionCandidate@340 }
-}
-
-ResolutionTaskHolder@342 {
-    <name not found> = ArrayList@343[1] { ResolutionCandidate@344 }
-    <name not found> = ArrayList@345[1] { ResolutionCandidate@344 }
-}
-
-ResolutionTaskHolder@346 {
-    <name not found> = ArrayList@347[1] { ResolutionCandidate@348 }
-    <name not found> = ArrayList@349[1] { ResolutionCandidate@348 }
-}
-
-ResolutionTaskHolder@350 {
-    <name not found> = ArrayList@351[1] { ResolutionCandidate@352 }
-    <name not found> = ArrayList@353[1] { ResolutionCandidate@352 }
-}
-
-ResolutionTaskHolder@354 {
-    <name not found> = ArrayList@355[1] { ResolutionCandidate@356 }
-    <name not found> = ArrayList@357[1] { ResolutionCandidate@356 }
-}
-
-ResolutionTaskHolder@358 {
-    <name not found> = ArrayList@359[1] { ResolutionCandidate@360 }
-    <name not found> = ArrayList@361[1] { ResolutionCandidate@360 }
-}
-
-ResolutionTaskHolder@362 {
-    <name not found> = ArrayList@363[4] { ResolutionCandidate@364, ResolutionCandidate@365, ResolutionCandidate@366, ... }
-    <name not found> = ArrayList@367[4] { ResolutionCandidate@364, ResolutionCandidate@365, ResolutionCandidate@366, ... }
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
+    <name not found> = ArrayList@331[4] { ResolutionCandidate@332, ResolutionCandidate@333, ResolutionCandidate@334, ... }
     <name not found> = EmptyList@209[empty]
     <name not found> = EmptyList@209[empty]
     <name not found> = EmptyList@209[empty]
@@ -636,9 +570,78 @@ ResolutionTaskHolder@362 {
     <name not found> = EmptyList@209[empty]
 }
 
-ResolutionTaskHolder@368 {
-    <name not found> = ArrayList@369[4] { ResolutionCandidate@370, ResolutionCandidate@371, ResolutionCandidate@372, ... }
-    <name not found> = ArrayList@373[5] { ResolutionCandidate@370, ResolutionCandidate@371, ResolutionCandidate@372, ... }
+ResolutionTaskHolder@335 {
+    <name not found> = ArrayList@336[4] { ResolutionCandidate@337, ResolutionCandidate@338, ResolutionCandidate@339, ... }
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
+}
+
+null {
+    <name not found> = ArrayList@340[1] { ResolutionCandidate@248 }
+    <name not found> = ArrayList@341[1] { ResolutionCandidate@263 }
+    <name not found> = ArrayList@342[1] { ResolutionCandidate@317 }
+    <name not found> = ArrayList@343[1] { ResolutionCandidate@287 }
+    <name not found> = ArrayList@344[1] { ResolutionCandidate@238 }
+    <name not found> = ArrayList@345[1] { ResolutionCandidate@240 }
+    <name not found> = ArrayList@346[1] { ResolutionCandidate@272 }
+    <name not found> = ArrayList@347[1] { ResolutionCandidate@302 }
+    <name not found> = ArrayList@348[1] { ResolutionCandidate@266 }
+    <name not found> = ArrayList@349[1] { ResolutionCandidate@323 }
+    <name not found> = ArrayList@350[1] { ResolutionCandidate@326 }
+    <name not found> = ArrayList@351[1] { ResolutionCandidate@251 }
+    <name not found> = ArrayList@352[1] { ResolutionCandidate@293 }
+    <name not found> = ArrayList@353[1] { ResolutionCandidate@308 }
+    <name not found> = ArrayList@354[1] { ResolutionCandidate@278 }
+    <name not found> = ArrayList@355[1] { ResolutionCandidate@269 }
+    <name not found> = ArrayList@356[1] { ResolutionCandidate@275 }
+    <name not found> = ArrayList@357[1] { ResolutionCandidate@254 }
+    <name not found> = ArrayList@358[1] { ResolutionCandidate@320 }
+    <name not found> = ArrayList@359[1] { ResolutionCandidate@296 }
+    <name not found> = ArrayList@360[1] { ResolutionCandidate@305 }
+    <name not found> = ArrayList@361[1] { ResolutionCandidate@243 }
+    <name not found> = ArrayList@362[1] { ResolutionCandidate@245 }
+    <name not found> = ArrayList@363[1] { ResolutionCandidate@329 }
+    <name not found> = ArrayList@364[1] { ResolutionCandidate@290 }
+    <name not found> = ArrayList@365[1] { ResolutionCandidate@284 }
+    <name not found> = ArrayList@366[1] { ResolutionCandidate@281 }
+    <name not found> = ArrayList@367[1] { ResolutionCandidate@311 }
+    <name not found> = ArrayList@368[1] { ResolutionCandidate@257 }
+    <name not found> = ArrayList@369[1] { ResolutionCandidate@314 }
+    <name not found> = ArrayList@370[1] { ResolutionCandidate@299 }
+    <name not found> = ArrayList@371[1] { ResolutionCandidate@260 }
+    <name not found> = ArrayList@372[4] { ResolutionCandidate@332, ResolutionCandidate@333, ResolutionCandidate@334, ... }
+    <name not found> = ArrayList@373[5] { ResolutionCandidate@337, ResolutionCandidate@338, ResolutionCandidate@339, ... }
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
     <name not found> = EmptyList@209[empty]
     <name not found> = EmptyList@209[empty]
     <name not found> = EmptyList@209[empty]
diff --git a/compiler/testData/diagnostics/tests/smartCasts/inference/kt2746.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/inference/kt2746.lazy.log
index 3446c8a24f4..684a4c20e3a 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/inference/kt2746.lazy.log
+++ b/compiler/testData/diagnostics/tests/smartCasts/inference/kt2746.lazy.log
@@ -48,52 +48,55 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@36 {
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
     <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[empty]
 }
 
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+}
+
 ResolutionTaskHolder@48 {
     <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+null {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@38 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/smartCasts/inference/kt2851.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/inference/kt2851.lazy.log
index c9ba2ace494..234e244e3ad 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/inference/kt2851.lazy.log
+++ b/compiler/testData/diagnostics/tests/smartCasts/inference/kt2851.lazy.log
@@ -52,88 +52,91 @@ LazyJavaPackageFragment@19['lang'] {
 
 ResolutionTaskHolder@44 {
     <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+    <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
 ResolutionTaskHolder@55 {
     <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
 ResolutionTaskHolder@67 {
     <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
 }
 
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
+}
+
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
 }
 
 ResolutionTaskHolder@79 {
     <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
 }
 
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
+null {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@66 }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/smartCasts/inference/kt4009.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/inference/kt4009.lazy.log
index d175ec09e8e..e47e1f35f2b 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/inference/kt4009.lazy.log
+++ b/compiler/testData/diagnostics/tests/smartCasts/inference/kt4009.lazy.log
@@ -37,21 +37,21 @@ LazyJavaClassifierType@21['String'] {
 
 LazyJavaClassifierType@24['String'] {
     arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@20['String']
+    classifier = JavaClassImpl@23['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@15['String']
+    classifier = JavaClassImpl@20['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@29['String'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@23['String']
+    classifier = JavaClassImpl@15['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -86,14 +86,14 @@ LazyJavaClassifierType@41['Throwable'] {
 
 LazyJavaClassifierType@43['Throwable'] {
     arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@33['Throwable']
+    classifier = JavaClassImpl@37['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@45['Throwable'] {
     arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@37['Throwable']
+    classifier = JavaClassImpl@33['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -159,80 +159,83 @@ LazyJavaPackageFragment@59['lang'] {
 
 ResolutionTaskHolder@87 {
     <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
+    <name not found> = EmptyList@79[empty]
+}
+
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
     <name not found> = EmptyList@79[empty]
     <name not found> = EmptyList@79[empty]
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
-    <name not found> = EmptyList@79[empty]
-    <name not found> = EmptyList@79[empty]
-    <name not found> = EmptyList@79[empty]
-    <name not found> = EmptyList@79[empty]
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
 }
 
 ResolutionTaskHolder@98 {
     <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
 }
 
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
 }
 
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
+}
+
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
 }
 
 ResolutionTaskHolder@110 {
     <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
 }
 
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
+ResolutionTaskHolder@113 {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
 }
 
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
+}
+
+ResolutionTaskHolder@119 {
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
 }
 
 ResolutionTaskHolder@122 {
     <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
 }
 
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
+ResolutionTaskHolder@125 {
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
 }
 
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@132 }
+ResolutionTaskHolder@128 {
+    <name not found> = ArrayList@129[4] { ResolutionCandidate@130, ResolutionCandidate@131, ResolutionCandidate@132, ... }
+    <name not found> = EmptyList@79[empty]
+    <name not found> = EmptyList@79[empty]
 }
 
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@136 }
-}
-
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@140 }
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[4] { ResolutionCandidate@144, ResolutionCandidate@145, ResolutionCandidate@146, ... }
-    <name not found> = ArrayList@147[5] { ResolutionCandidate@144, ResolutionCandidate@145, ResolutionCandidate@146, ... }
+null {
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@127 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@124 }
+    <name not found> = ArrayList@147[5] { ResolutionCandidate@130, ResolutionCandidate@131, ResolutionCandidate@132, ... }
+    <name not found> = EmptyList@79[empty]
     <name not found> = EmptyList@79[empty]
     <name not found> = EmptyList@79[empty]
     <name not found> = EmptyList@79[empty]
diff --git a/compiler/testData/diagnostics/tests/smartCasts/inference/kt4403.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/inference/kt4403.lazy.log
index 5f0c8645569..d8f41e37610 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/inference/kt4403.lazy.log
+++ b/compiler/testData/diagnostics/tests/smartCasts/inference/kt4403.lazy.log
@@ -39,19 +39,22 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@30 {
     <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+}
+
+null {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@32 }
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/smartCasts/inference/kt4415.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/inference/kt4415.lazy.log
index 9e128883f5d..8ff8eaaada4 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/inference/kt4415.lazy.log
+++ b/compiler/testData/diagnostics/tests/smartCasts/inference/kt4415.lazy.log
@@ -114,21 +114,21 @@ LazyJavaClassifierType@55['String'] {
 
 LazyJavaClassifierType@58['String'] {
     arguments = ArrayList@59[empty]
-    classifier = JavaClassImpl@49['String']
+    classifier = JavaClassImpl@57['String']
     nullable = 'true': Boolean@60
     typeConstructor = DeserializedClassTypeConstructor@51
 }
 
 LazyJavaClassifierType@61['String'] {
     arguments = ArrayList@62[empty]
-    classifier = JavaClassImpl@57['String']
+    classifier = JavaClassImpl@54['String']
     nullable = 'true': Boolean@60
     typeConstructor = DeserializedClassTypeConstructor@51
 }
 
 LazyJavaClassifierType@63['String'] {
     arguments = ArrayList@64[empty]
-    classifier = JavaClassImpl@54['String']
+    classifier = JavaClassImpl@49['String']
     nullable = 'true': Boolean@60
     typeConstructor = DeserializedClassTypeConstructor@51
 }
@@ -163,14 +163,14 @@ LazyJavaClassifierType@75['Throwable'] {
 
 LazyJavaClassifierType@77['Throwable'] {
     arguments = ArrayList@78[empty]
-    classifier = JavaClassImpl@71['Throwable']
+    classifier = JavaClassImpl@74['Throwable']
     nullable = 'true': Boolean@60
     typeConstructor = DeserializedClassTypeConstructor@68
 }
 
 LazyJavaClassifierType@79['Throwable'] {
     arguments = ArrayList@80[empty]
-    classifier = JavaClassImpl@74['Throwable']
+    classifier = JavaClassImpl@71['Throwable']
     nullable = 'true': Boolean@60
     typeConstructor = DeserializedClassTypeConstructor@68
 }
@@ -255,16 +255,6 @@ LazyJavaTypeParameterResolver@132 {
 
 ResolutionTaskHolder@134 {
     <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@136 }
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
     <name not found> = EmptyList@121[empty]
     <name not found> = EmptyList@121[empty]
     <name not found> = EmptyList@121[empty]
@@ -276,43 +266,56 @@ ResolutionTaskHolder@134 {
     <name not found> = EmptyList@121[empty]
 }
 
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@140 }
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
+ResolutionTaskHolder@137 {
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
     <name not found> = EmptyList@121[empty]
     <name not found> = EmptyList@121[empty]
     <name not found> = EmptyList@121[empty]
     <name not found> = EmptyList@121[empty]
 }
 
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@144 }
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
+ResolutionTaskHolder@140 {
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
     <name not found> = EmptyList@121[empty]
     <name not found> = EmptyList@121[empty]
     <name not found> = EmptyList@121[empty]
 }
 
+ResolutionTaskHolder@143 {
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
+}
+
 ResolutionTaskHolder@146 {
     <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@148 }
 }
 
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@152 }
+ResolutionTaskHolder@149 {
+    <name not found> = ArrayList@150[4] { ResolutionCandidate@151, ResolutionCandidate@152, ResolutionCandidate@153, ... }
+    <name not found> = EmptyList@121[empty]
+    <name not found> = EmptyList@121[empty]
+    <name not found> = EmptyList@121[empty]
+    <name not found> = EmptyList@121[empty]
+    <name not found> = EmptyList@121[empty]
+    <name not found> = EmptyList@121[empty]
+    <name not found> = EmptyList@121[empty]
+    <name not found> = EmptyList@121[empty]
 }
 
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[4] { ResolutionCandidate@156, ResolutionCandidate@157, ResolutionCandidate@158, ... }
-    <name not found> = ArrayList@159[5] { ResolutionCandidate@156, ResolutionCandidate@157, ResolutionCandidate@158, ... }
+null {
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@148 }
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@136 }
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@145 }
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@142 }
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@139 }
+    <name not found> = ArrayList@159[5] { ResolutionCandidate@151, ResolutionCandidate@152, ResolutionCandidate@153, ... }
+    <name not found> = EmptyList@121[empty]
+    <name not found> = EmptyList@121[empty]
+    <name not found> = EmptyList@121[empty]
+    <name not found> = EmptyList@121[empty]
+    <name not found> = EmptyList@121[empty]
+    <name not found> = EmptyList@121[empty]
+    <name not found> = EmptyList@121[empty]
+    <name not found> = EmptyList@121[empty]
     <name not found> = EmptyList@121[empty]
     <name not found> = EmptyList@121[empty]
     <name not found> = EmptyList@121[empty]
diff --git a/compiler/testData/diagnostics/tests/smartCasts/inference/kt6242.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/inference/kt6242.lazy.log
index 98c0fc22190..64e8a2fb9e4 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/inference/kt6242.lazy.log
+++ b/compiler/testData/diagnostics/tests/smartCasts/inference/kt6242.lazy.log
@@ -32,31 +32,80 @@ LazyJavaPackageFragment@8['<root>'] {
     classes('equals': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
     classes('foo': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
     classes('inline': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('invoke': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('block': Name@27) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('equals': Name@28) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('foo': Name@29) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('invoke': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('block': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('equals': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('foo': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@26
 }
 
 LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('lang': Name@37) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('lang': Name@36) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
+    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@35
 }
 
 LazyJavaPackageFragment@15['lang'] {
-    classes('block': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('equals': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('foo': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('invoke': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('block': Name@27) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('equals': Name@28) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('foo': Name@29) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('invoke': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('block': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('equals': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('foo': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('block': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('equals': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('foo': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
+    <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+    <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
+}
+
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+}
+
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
+}
+
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
+}
+
+null {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@62 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/smartCasts/inference/smartCastOnReceiver.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/inference/smartCastOnReceiver.lazy.log
index 014140b49e8..02da3f9fbfe 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/inference/smartCastOnReceiver.lazy.log
+++ b/compiler/testData/diagnostics/tests/smartCasts/inference/smartCastOnReceiver.lazy.log
@@ -56,31 +56,25 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@39 {
     <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+}
+
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
@@ -88,41 +82,50 @@ ResolutionTaskHolder@46 {
 
 ResolutionTaskHolder@50 {
     <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+}
+
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
 }
 
 ResolutionTaskHolder@62 {
     <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[2] { ResolutionCandidate@67, ResolutionCandidate@68 }
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[2] { ResolutionCandidate@76, ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[2] { ResolutionCandidate@76, ResolutionCandidate@77 }
+null {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@78[2] { ResolutionCandidate@67, ResolutionCandidate@68 }
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/smartCasts/kt1461.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/kt1461.lazy.log
index 5c2b0ebf6ee..094381febef 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/kt1461.lazy.log
+++ b/compiler/testData/diagnostics/tests/smartCasts/kt1461.lazy.log
@@ -33,7 +33,7 @@ LazyJavaClassifierType@19['String'] {
 
 LazyJavaClassifierType@22['String'] {
     arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@13['String']
+    classifier = JavaClassImpl@18['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
@@ -47,7 +47,7 @@ LazyJavaClassifierType@25['String'] {
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@18['String']
+    classifier = JavaClassImpl@13['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
@@ -145,98 +145,101 @@ LazyJavaPackageFragment@62['lang'] {
 
 ResolutionTaskHolder@85 {
     <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@79[empty]
-    <name not found> = EmptyList@79[empty]
     <name not found> = EmptyList@79[empty]
     <name not found> = EmptyList@79[empty]
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@79[empty]
-    <name not found> = EmptyList@79[empty]
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
     <name not found> = EmptyList@79[empty]
     <name not found> = EmptyList@79[empty]
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
     <name not found> = EmptyList@79[empty]
     <name not found> = EmptyList@79[empty]
+}
+
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
     <name not found> = EmptyList@79[empty]
     <name not found> = EmptyList@79[empty]
 }
 
 ResolutionTaskHolder@97 {
     <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
-    <name not found> = EmptyList@79[empty]
-    <name not found> = EmptyList@79[empty]
-    <name not found> = EmptyList@79[empty]
-    <name not found> = EmptyList@79[empty]
 }
 
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
 }
 
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
+}
+
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
 }
 
 ResolutionTaskHolder@109 {
     <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
 }
 
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
 }
 
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
+ResolutionTaskHolder@115 {
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
+}
+
+ResolutionTaskHolder@118 {
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
 }
 
 ResolutionTaskHolder@121 {
     <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
 }
 
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@127 }
+ResolutionTaskHolder@124 {
+    <name not found> = ArrayList@125[2] { ResolutionCandidate@126, ResolutionCandidate@127 }
 }
 
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@131 }
+ResolutionTaskHolder@128 {
+    <name not found> = ArrayList@129[2] { ResolutionCandidate@130, ResolutionCandidate@131 }
 }
 
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@135 }
+ResolutionTaskHolder@132 {
+    <name not found> = ArrayList@133[4] { ResolutionCandidate@134, ResolutionCandidate@135, ResolutionCandidate@136, ... }
+    <name not found> = EmptyList@79[empty]
+    <name not found> = EmptyList@79[empty]
 }
 
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[2] { ResolutionCandidate@139, ResolutionCandidate@140 }
-    <name not found> = ArrayList@141[2] { ResolutionCandidate@139, ResolutionCandidate@140 }
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[2] { ResolutionCandidate@144, ResolutionCandidate@145 }
-    <name not found> = ArrayList@146[2] { ResolutionCandidate@144, ResolutionCandidate@145 }
-}
-
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[4] { ResolutionCandidate@149, ResolutionCandidate@150, ResolutionCandidate@151, ... }
-    <name not found> = ArrayList@152[5] { ResolutionCandidate@149, ResolutionCandidate@150, ResolutionCandidate@151, ... }
+null {
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@150[2] { ResolutionCandidate@130, ResolutionCandidate@131 }
+    <name not found> = ArrayList@151[2] { ResolutionCandidate@126, ResolutionCandidate@127 }
+    <name not found> = ArrayList@152[5] { ResolutionCandidate@134, ResolutionCandidate@135, ResolutionCandidate@136, ... }
+    <name not found> = EmptyList@79[empty]
+    <name not found> = EmptyList@79[empty]
+    <name not found> = EmptyList@79[empty]
+    <name not found> = EmptyList@79[empty]
+    <name not found> = EmptyList@79[empty]
+    <name not found> = EmptyList@79[empty]
     <name not found> = EmptyList@79[empty]
     <name not found> = EmptyList@79[empty]
     <name not found> = EmptyList@79[empty]
diff --git a/compiler/testData/diagnostics/tests/smartCasts/kt2422.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/kt2422.lazy.log
index 8d083e5c361..6304d92bb9e 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/kt2422.lazy.log
+++ b/compiler/testData/diagnostics/tests/smartCasts/kt2422.lazy.log
@@ -41,19 +41,7 @@ LazyJavaPackageFragment@15['lang'] {
 
 ResolutionTaskHolder@34 {
     <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -102,232 +90,247 @@ ResolutionTaskHolder@34 {
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@41 {
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
     <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+}
+
+ResolutionTaskHolder@44 {
     <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
     <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
+}
+
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
 
 ResolutionTaskHolder@69 {
     <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
+}
+
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
 
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
+    <name not found> = EmptyList@27[empty]
+}
+
 ResolutionTaskHolder@83 {
     <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
+    <name not found> = EmptyList@27[empty]
+}
+
+ResolutionTaskHolder@86 {
     <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
+}
+
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
 }
 
 ResolutionTaskHolder@98 {
     <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
 }
 
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
+}
+
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
 }
 
 ResolutionTaskHolder@110 {
     <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
+ResolutionTaskHolder@113 {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
 }
 
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
+}
+
+ResolutionTaskHolder@119 {
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
 }
 
 ResolutionTaskHolder@122 {
     <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
 }
 
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@132 }
-}
-
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@136 }
-}
-
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@140 }
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@144 }
-}
-
-ResolutionTaskHolder@146 {
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@148 }
-}
-
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@152 }
-}
-
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@156 }
+null {
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@124 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@76 }
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/smartCasts/kt5455.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/kt5455.lazy.log
index 882b7460ee9..d4f6e932fce 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/kt5455.lazy.log
+++ b/compiler/testData/diagnostics/tests/smartCasts/kt5455.lazy.log
@@ -48,74 +48,77 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@39 {
     <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@31[empty]
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+}
+
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
 }
 
 ResolutionTaskHolder@50 {
     <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+}
+
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
 }
 
 ResolutionTaskHolder@62 {
     <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
+}
+
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
 }
 
 ResolutionTaskHolder@74 {
     <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
 }
 
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[8] { ResolutionCandidate@82, ResolutionCandidate@83, ResolutionCandidate@84, ... }
 }
 
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[8] { ResolutionCandidate@96, ResolutionCandidate@97, ResolutionCandidate@98, ... }
-    <name not found> = ArrayList@99[8] { ResolutionCandidate@96, ResolutionCandidate@97, ResolutionCandidate@98, ... }
+null {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@99[8] { ResolutionCandidate@82, ResolutionCandidate@83, ResolutionCandidate@84, ... }
+    <name not found> = EmptyList@31[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/smartCasts/noErrorCheckForPackageLevelVal.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/noErrorCheckForPackageLevelVal.lazy.log
index e592eca9d00..0d8ee90ef6e 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/noErrorCheckForPackageLevelVal.lazy.log
+++ b/compiler/testData/diagnostics/tests/smartCasts/noErrorCheckForPackageLevelVal.lazy.log
@@ -46,38 +46,19 @@ LazyJavaPackageFragment@20['lang'] {
 
 ResolutionTaskHolder@39 {
     <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@46 {
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
     <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+    <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@49 {
     <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -127,10 +108,8 @@ ResolutionTaskHolder@53 {
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -146,50 +125,33 @@ ResolutionTaskHolder@57 {
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
     <name not found> = EmptyList@30[empty]
 }
 
 ResolutionTaskHolder@61 {
     <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@70 {
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -216,7 +178,48 @@ ResolutionTaskHolder@81 {
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@82 {
+ResolutionTaskHolder@71 {
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+}
+
+null {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@51 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
diff --git a/compiler/testData/diagnostics/tests/smartCasts/noUnnecessarySmartCastForReceiver.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/noUnnecessarySmartCastForReceiver.lazy.log
index 2917374f202..d3392158c40 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/noUnnecessarySmartCastForReceiver.lazy.log
+++ b/compiler/testData/diagnostics/tests/smartCasts/noUnnecessarySmartCastForReceiver.lazy.log
@@ -38,28 +38,31 @@ LazyJavaPackageFragment@7['lang'] {
 
 ResolutionTaskHolder@26 {
     <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
+    <name not found> = EmptyList@18[empty]
+}
+
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
 }
 
 ResolutionTaskHolder@37 {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+null {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@28 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@33 }
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/smartCasts/publicVal.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/publicVal.lazy.log
index 3d3c10bff6c..5b39409ccaa 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/publicVal.lazy.log
+++ b/compiler/testData/diagnostics/tests/smartCasts/publicVal.lazy.log
@@ -44,43 +44,46 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@30 {
     <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+}
+
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
 }
 
 ResolutionTaskHolder@42 {
     <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+null {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@32 }
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/smartCasts/thisWithLabel.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/thisWithLabel.lazy.log
index 89a6732187f..d3eb712072d 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/thisWithLabel.lazy.log
+++ b/compiler/testData/diagnostics/tests/smartCasts/thisWithLabel.lazy.log
@@ -46,80 +46,78 @@ LazyJavaPackageFragment@16['lang'] {
 
 ResolutionTaskHolder@38 {
     <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
 ResolutionTaskHolder@55 {
     <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@62 {
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
     <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@65 {
     <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -128,6 +126,10 @@ ResolutionTaskHolder@76 {
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -136,6 +138,10 @@ ResolutionTaskHolder@76 {
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -148,15 +154,6 @@ ResolutionTaskHolder@76 {
 
 ResolutionTaskHolder@80 {
     <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -167,156 +164,162 @@ ResolutionTaskHolder@80 {
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
     <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
     <name not found> = EmptyList@30[empty]
 }
 
 ResolutionTaskHolder@92 {
     <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
 }
 
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
+}
+
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
 }
 
 ResolutionTaskHolder@104 {
     <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
 }
 
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
+}
+
+ResolutionTaskHolder@113 {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
 }
 
 ResolutionTaskHolder@116 {
     <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
 }
 
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@126 }
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
-}
-
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
-}
-
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
-}
-
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
+null {
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@67 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/smartCasts/thisWithLabelAsReceiverPart.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/thisWithLabelAsReceiverPart.lazy.log
index 1a3f72c1e29..d2c7ca254da 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/thisWithLabelAsReceiverPart.lazy.log
+++ b/compiler/testData/diagnostics/tests/smartCasts/thisWithLabelAsReceiverPart.lazy.log
@@ -50,80 +50,78 @@ LazyJavaPackageFragment@18['lang'] {
 
 ResolutionTaskHolder@42 {
     <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@34[empty]
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
+}
+
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
 
 ResolutionTaskHolder@59 {
     <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@66 {
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
     <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+}
+
+ResolutionTaskHolder@69 {
     <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
@@ -132,6 +130,10 @@ ResolutionTaskHolder@80 {
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
+}
+
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
@@ -140,6 +142,10 @@ ResolutionTaskHolder@80 {
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
+}
+
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
@@ -152,15 +158,6 @@ ResolutionTaskHolder@80 {
 
 ResolutionTaskHolder@84 {
     <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
@@ -171,206 +168,212 @@ ResolutionTaskHolder@84 {
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
     <name not found> = EmptyList@34[empty]
+}
+
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
     <name not found> = EmptyList@34[empty]
 }
 
 ResolutionTaskHolder@96 {
     <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
+}
+
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
 }
 
 ResolutionTaskHolder@108 {
     <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
+ResolutionTaskHolder@111 {
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
 }
 
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
+}
+
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
 }
 
 ResolutionTaskHolder@120 {
     <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
 }
 
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@126 }
+ResolutionTaskHolder@123 {
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
 }
 
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
+ResolutionTaskHolder@126 {
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
+}
+
+ResolutionTaskHolder@129 {
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
 }
 
 ResolutionTaskHolder@132 {
     <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
 }
 
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
+ResolutionTaskHolder@135 {
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
 }
 
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
+ResolutionTaskHolder@138 {
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
+}
+
+ResolutionTaskHolder@141 {
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
 }
 
 ResolutionTaskHolder@144 {
     <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
 }
 
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
+ResolutionTaskHolder@147 {
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
 }
 
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
+ResolutionTaskHolder@150 {
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
 }
 
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
-}
-
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@162 }
-}
-
-ResolutionTaskHolder@164 {
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@166 }
-}
-
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@170 }
-}
-
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@174 }
-}
-
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@178 }
-}
-
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@182 }
-}
-
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@186 }
-}
-
-ResolutionTaskHolder@188 {
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@190 }
+null {
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@128 }
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@140 }
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@152 }
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@143 }
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@149 }
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@166[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@168[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@170[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@131 }
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@113 }
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@122 }
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@176[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@125 }
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@134 }
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@189[1] { ResolutionCandidate@137 }
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@146 }
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@71 }
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/substitutions/kt1558-short.lazy.log b/compiler/testData/diagnostics/tests/substitutions/kt1558-short.lazy.log
index 6948bf53593..b1b91d7f20c 100644
--- a/compiler/testData/diagnostics/tests/substitutions/kt1558-short.lazy.log
+++ b/compiler/testData/diagnostics/tests/substitutions/kt1558-short.lazy.log
@@ -52,28 +52,19 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@41 {
     <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@50 {
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -92,9 +83,21 @@ ResolutionTaskHolder@53 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@51 {
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+}
+
+null {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@43 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
diff --git a/compiler/testData/diagnostics/tests/substitutions/kt4887.lazy.log b/compiler/testData/diagnostics/tests/substitutions/kt4887.lazy.log
index 5531243b9d9..1af884098a0 100644
--- a/compiler/testData/diagnostics/tests/substitutions/kt4887.lazy.log
+++ b/compiler/testData/diagnostics/tests/substitutions/kt4887.lazy.log
@@ -40,15 +40,6 @@ LazyJavaPackageFragment@15['lang'] {
 
 ResolutionTaskHolder@36 {
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
@@ -59,7 +50,19 @@ ResolutionTaskHolder@36 {
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+}
+
+null {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@38 }
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithAmbiguity.lazy.log b/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithAmbiguity.lazy.log
index 87926f8f346..950cc633e2d 100644
--- a/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithAmbiguity.lazy.log
+++ b/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithAmbiguity.lazy.log
@@ -42,14 +42,17 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@33 {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[2] { ResolutionCandidate@39, ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[2] { ResolutionCandidate@39, ResolutionCandidate@40 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[2] { ResolutionCandidate@38, ResolutionCandidate@39 }
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+}
+
+null {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@41[2] { ResolutionCandidate@38, ResolutionCandidate@39 }
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithErrorTypes.lazy.log b/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithErrorTypes.lazy.log
index c058324694a..f187c221fb8 100644
--- a/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithErrorTypes.lazy.log
+++ b/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithErrorTypes.lazy.log
@@ -75,14 +75,14 @@ LazyJavaClassifierType@36['Throwable'] {
 
 LazyJavaClassifierType@39['Throwable'] {
     arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@35['Throwable']
+    classifier = JavaClassImpl@31['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@31['Throwable']
+    classifier = JavaClassImpl@35['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
@@ -158,39 +158,42 @@ LazyJavaPackageFragment@58['lang'] {
 
 ResolutionTaskHolder@89 {
     <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[3] { ResolutionCandidate@95, ResolutionCandidate@96, ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[3] { ResolutionCandidate@95, ResolutionCandidate@96, ResolutionCandidate@97 }
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[3] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96 }
     <name not found> = EmptyList@81[empty]
     <name not found> = EmptyList@81[empty]
 }
 
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[4] { ResolutionCandidate@101, ResolutionCandidate@102, ResolutionCandidate@103, ... }
-    <name not found> = ArrayList@104[5] { ResolutionCandidate@101, ResolutionCandidate@102, ResolutionCandidate@103, ... }
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[4] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
     <name not found> = EmptyList@81[empty]
     <name not found> = EmptyList@81[empty]
 }
 
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[4] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
-    <name not found> = ArrayList@110[5] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[4] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
     <name not found> = EmptyList@81[empty]
     <name not found> = EmptyList@81[empty]
 }
 
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[4] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
-    <name not found> = ArrayList@116[5] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[4] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111, ... }
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+}
+
+null {
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@113[3] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96 }
+    <name not found> = ArrayList@114[5] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111, ... }
+    <name not found> = ArrayList@115[5] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
+    <name not found> = ArrayList@116[5] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
     <name not found> = EmptyList@81[empty]
     <name not found> = EmptyList@81[empty]
     <name not found> = EmptyList@81[empty]
diff --git a/compiler/testData/diagnostics/tests/subtyping/kt-1457.lazy.log b/compiler/testData/diagnostics/tests/subtyping/kt-1457.lazy.log
index 55f5d5f7c86..53e7a395489 100644
--- a/compiler/testData/diagnostics/tests/subtyping/kt-1457.lazy.log
+++ b/compiler/testData/diagnostics/tests/subtyping/kt-1457.lazy.log
@@ -378,7 +378,7 @@ LazyJavaClassifierType@372['Collection<? extends E>'] {
 
 LazyJavaClassifierType@377['Collection<? extends E>'] {
     arguments = ArrayList@378[1] { TypeProjectionImpl@379 }
-    classifier = JavaClassImpl@360['Collection']
+    classifier = JavaClassImpl@375['Collection']
     memberScope = SubstitutingScope@380
     nullable = 'true': Boolean@381
     typeConstructor = DeserializedClassTypeConstructor@382
@@ -386,7 +386,7 @@ LazyJavaClassifierType@377['Collection<? extends E>'] {
 
 LazyJavaClassifierType@383['Collection<? extends E>'] {
     arguments = ArrayList@384[1] { TypeProjectionImpl@385 }
-    classifier = JavaClassImpl@375['Collection']
+    classifier = JavaClassImpl@370['Collection']
     memberScope = SubstitutingScope@386
     nullable = 'true': Boolean@381
     typeConstructor = DeserializedClassTypeConstructor@382
@@ -402,7 +402,7 @@ LazyJavaClassifierType@387['Collection<? extends E>'] {
 
 LazyJavaClassifierType@391['Collection<? extends E>'] {
     arguments = ArrayList@392[1] { TypeProjectionImpl@393 }
-    classifier = JavaClassImpl@370['Collection']
+    classifier = JavaClassImpl@365['Collection']
     memberScope = SubstitutingScope@394
     nullable = 'true': Boolean@381
     typeConstructor = DeserializedClassTypeConstructor@382
@@ -410,7 +410,7 @@ LazyJavaClassifierType@391['Collection<? extends E>'] {
 
 LazyJavaClassifierType@395['Collection<? extends E>'] {
     arguments = ArrayList@396[1] { TypeProjectionImpl@397 }
-    classifier = JavaClassImpl@365['Collection']
+    classifier = JavaClassImpl@360['Collection']
     memberScope = SubstitutingScope@398
     nullable = 'true': Boolean@381
     typeConstructor = DeserializedClassTypeConstructor@382
@@ -466,7 +466,7 @@ LazyJavaClassifierType@424['Collection<?>'] {
 
 LazyJavaClassifierType@429['Collection<?>'] {
     arguments = ArrayList@430[1] { LazyStarProjection@431 }
-    classifier = JavaClassImpl@412['Collection']
+    classifier = JavaClassImpl@407['Collection']
     memberScope = SubstitutingScope@432
     nullable = 'true': Boolean@381
     typeConstructor = DeserializedClassTypeConstructor@382
@@ -474,7 +474,7 @@ LazyJavaClassifierType@429['Collection<?>'] {
 
 LazyJavaClassifierType@433['Collection<?>'] {
     arguments = ArrayList@434[1] { LazyStarProjection@435 }
-    classifier = JavaClassImpl@402['Collection']
+    classifier = JavaClassImpl@417['Collection']
     memberScope = SubstitutingScope@436
     nullable = 'true': Boolean@381
     typeConstructor = DeserializedClassTypeConstructor@382
@@ -482,7 +482,7 @@ LazyJavaClassifierType@433['Collection<?>'] {
 
 LazyJavaClassifierType@437['Collection<?>'] {
     arguments = ArrayList@438[1] { LazyStarProjection@439 }
-    classifier = JavaClassImpl@407['Collection']
+    classifier = JavaClassImpl@427['Collection']
     memberScope = SubstitutingScope@440
     nullable = 'true': Boolean@381
     typeConstructor = DeserializedClassTypeConstructor@382
@@ -490,7 +490,7 @@ LazyJavaClassifierType@437['Collection<?>'] {
 
 LazyJavaClassifierType@441['Collection<?>'] {
     arguments = ArrayList@442[1] { LazyStarProjection@443 }
-    classifier = JavaClassImpl@422['Collection']
+    classifier = JavaClassImpl@412['Collection']
     memberScope = SubstitutingScope@444
     nullable = 'true': Boolean@381
     typeConstructor = DeserializedClassTypeConstructor@382
@@ -498,7 +498,7 @@ LazyJavaClassifierType@441['Collection<?>'] {
 
 LazyJavaClassifierType@445['Collection<?>'] {
     arguments = ArrayList@446[1] { LazyStarProjection@447 }
-    classifier = JavaClassImpl@427['Collection']
+    classifier = JavaClassImpl@422['Collection']
     memberScope = SubstitutingScope@448
     nullable = 'true': Boolean@381
     typeConstructor = DeserializedClassTypeConstructor@382
@@ -506,7 +506,7 @@ LazyJavaClassifierType@445['Collection<?>'] {
 
 LazyJavaClassifierType@449['Collection<?>'] {
     arguments = ArrayList@450[1] { LazyStarProjection@451 }
-    classifier = JavaClassImpl@417['Collection']
+    classifier = JavaClassImpl@402['Collection']
     memberScope = SubstitutingScope@452
     nullable = 'true': Boolean@381
     typeConstructor = DeserializedClassTypeConstructor@382
@@ -539,35 +539,35 @@ LazyJavaClassifierType@466['E'] {
     arguments = ArrayList@467[empty]
     classifier = JavaTypeParameterImpl@468['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@469
 }
 
-LazyJavaClassifierType@469['E'] {
-    arguments = ArrayList@470[empty]
-    classifier = JavaTypeParameterImpl@471['E']
+LazyJavaClassifierType@470['E'] {
+    arguments = ArrayList@471[empty]
+    classifier = JavaTypeParameterImpl@472['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@469
 }
 
-LazyJavaClassifierType@472['E'] {
-    arguments = ArrayList@473[empty]
-    classifier = JavaTypeParameterImpl@474['E']
+LazyJavaClassifierType@473['E'] {
+    arguments = ArrayList@474[empty]
+    classifier = JavaTypeParameterImpl@475['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@475
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
 LazyJavaClassifierType@476['E'] {
     arguments = ArrayList@477[empty]
     classifier = JavaTypeParameterImpl@478['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@475
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@479['E'] {
     arguments = ArrayList@480[empty]
     classifier = JavaTypeParameterImpl@481['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@482['E'] {
@@ -581,14 +581,14 @@ LazyJavaClassifierType@485['E'] {
     arguments = ArrayList@486[empty]
     classifier = JavaTypeParameterImpl@487['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
 LazyJavaClassifierType@488['E'] {
     arguments = ArrayList@489[empty]
     classifier = JavaTypeParameterImpl@490['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
 LazyJavaClassifierType@491['E'] {
@@ -602,7 +602,7 @@ LazyJavaClassifierType@494['E'] {
     arguments = ArrayList@495[empty]
     classifier = JavaTypeParameterImpl@496['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@497['E'] {
@@ -623,28 +623,28 @@ LazyJavaClassifierType@503['E'] {
     arguments = ArrayList@504[empty]
     classifier = JavaTypeParameterImpl@505['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@506['E'] {
     arguments = ArrayList@507[empty]
     classifier = JavaTypeParameterImpl@508['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@475
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@509['E'] {
     arguments = ArrayList@510[empty]
     classifier = JavaTypeParameterImpl@511['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@469
 }
 
 LazyJavaClassifierType@512['E'] {
     arguments = ArrayList@513[empty]
     classifier = JavaTypeParameterImpl@514['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@469
 }
 
 LazyJavaClassifierType@515['E'] {
@@ -665,7 +665,7 @@ LazyJavaClassifierType@521['E'] {
     arguments = ArrayList@522[empty]
     classifier = JavaTypeParameterImpl@523['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@475
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@524['E'] {
@@ -679,7 +679,7 @@ LazyJavaClassifierType@527['E'] {
     arguments = ArrayList@528[empty]
     classifier = JavaTypeParameterImpl@529['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@530['E'] {
@@ -693,7 +693,7 @@ LazyJavaClassifierType@533['E'] {
     arguments = ArrayList@534[empty]
     classifier = JavaTypeParameterImpl@535['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@536['E'] {
@@ -707,14 +707,14 @@ LazyJavaClassifierType@539['E'] {
     arguments = ArrayList@540[empty]
     classifier = JavaTypeParameterImpl@541['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@542['E'] {
     arguments = ArrayList@543[empty]
     classifier = JavaTypeParameterImpl@544['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@469
 }
 
 LazyJavaClassifierType@545['E'] {
@@ -742,7 +742,7 @@ LazyJavaClassifierType@554['E'] {
     arguments = ArrayList@555[empty]
     classifier = JavaTypeParameterImpl@556['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
 LazyJavaClassifierType@557['E'] {
@@ -756,14 +756,14 @@ LazyJavaClassifierType@560['E'] {
     arguments = ArrayList@561[empty]
     classifier = JavaTypeParameterImpl@562['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@563['E'] {
     arguments = ArrayList@564[empty]
     classifier = JavaTypeParameterImpl@565['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@469
 }
 
 LazyJavaClassifierType@566['E'] {
@@ -777,7 +777,7 @@ LazyJavaClassifierType@569['E'] {
     arguments = ArrayList@570[empty]
     classifier = JavaTypeParameterImpl@571['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
 LazyJavaClassifierType@572['E'] {
@@ -791,42 +791,42 @@ LazyJavaClassifierType@575['E'] {
     arguments = ArrayList@576[empty]
     classifier = JavaTypeParameterImpl@577['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
 LazyJavaClassifierType@578['E'] {
     arguments = ArrayList@579[empty]
     classifier = JavaTypeParameterImpl@580['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
 LazyJavaClassifierType@581['E'] {
     arguments = ArrayList@582[empty]
     classifier = JavaTypeParameterImpl@583['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
 LazyJavaClassifierType@584['E'] {
     arguments = ArrayList@585[empty]
     classifier = JavaTypeParameterImpl@586['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
 LazyJavaClassifierType@587['E'] {
     arguments = ArrayList@588[empty]
     classifier = JavaTypeParameterImpl@589['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
 LazyJavaClassifierType@590['E'] {
     arguments = ArrayList@591[empty]
     classifier = JavaTypeParameterImpl@592['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
 LazyJavaClassifierType@593['E'] {
@@ -840,343 +840,343 @@ LazyJavaClassifierType@596['E'] {
     arguments = ArrayList@597[empty]
     classifier = JavaTypeParameterImpl@598['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@475
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@599['E'] {
     arguments = ArrayList@600[empty]
     classifier = JavaTypeParameterImpl@601['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@475
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
 LazyJavaClassifierType@602['E'] {
     arguments = ArrayList@603[empty]
-    classifier = JavaTypeParameterImpl@565['E']
+    classifier = JavaTypeParameterImpl@490['E']
     nullable = 'true': Boolean@381
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
 LazyJavaClassifierType@604['E'] {
     arguments = ArrayList@605[empty]
-    classifier = JavaTypeParameterImpl@589['E']
+    classifier = JavaTypeParameterImpl@568['E']
     nullable = 'true': Boolean@381
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@606['E'] {
     arguments = ArrayList@607[empty]
-    classifier = JavaTypeParameterImpl@544['E']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
-}
-
-LazyJavaClassifierType@608['E'] {
-    arguments = ArrayList@609[empty]
-    classifier = JavaTypeParameterImpl@505['E']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
-}
-
-LazyJavaClassifierType@610['E'] {
-    arguments = ArrayList@611[empty]
-    classifier = JavaTypeParameterImpl@532['E']
+    classifier = JavaTypeParameterImpl@535['E']
     nullable = 'true': Boolean@381
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
-LazyJavaClassifierType@612['E'] {
-    arguments = ArrayList@613[empty]
-    classifier = JavaTypeParameterImpl@511['E']
+LazyJavaClassifierType@608['E'] {
+    arguments = ArrayList@609[empty]
+    classifier = JavaTypeParameterImpl@472['E']
+    nullable = 'true': Boolean@381
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@469
+}
+
+LazyJavaClassifierType@610['E'] {
+    arguments = ArrayList@611[empty]
+    classifier = JavaTypeParameterImpl@517['E']
     nullable = 'true': Boolean@381
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
+LazyJavaClassifierType@612['E'] {
+    arguments = ArrayList@613[empty]
+    classifier = JavaTypeParameterImpl@523['E']
+    nullable = 'true': Boolean@381
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
+}
+
 LazyJavaClassifierType@614['E'] {
     arguments = ArrayList@615[empty]
-    classifier = JavaTypeParameterImpl@586['E']
+    classifier = JavaTypeParameterImpl@496['E']
     nullable = 'true': Boolean@381
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@616['E'] {
     arguments = ArrayList@617[empty]
-    classifier = JavaTypeParameterImpl@559['E']
+    classifier = JavaTypeParameterImpl@538['E']
     nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
 LazyJavaClassifierType@618['E'] {
     arguments = ArrayList@619[empty]
-    classifier = JavaTypeParameterImpl@580['E']
+    classifier = JavaTypeParameterImpl@586['E']
     nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
 LazyJavaClassifierType@620['E'] {
     arguments = ArrayList@621[empty]
-    classifier = JavaTypeParameterImpl@538['E']
+    classifier = JavaTypeParameterImpl@601['E']
     nullable = 'true': Boolean@381
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
 LazyJavaClassifierType@622['E'] {
     arguments = ArrayList@623[empty]
-    classifier = JavaTypeParameterImpl@550['E']
+    classifier = JavaTypeParameterImpl@580['E']
     nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
 LazyJavaClassifierType@624['E'] {
     arguments = ArrayList@625[empty]
-    classifier = JavaTypeParameterImpl@490['E']
+    classifier = JavaTypeParameterImpl@529['E']
     nullable = 'true': Boolean@381
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@626['E'] {
     arguments = ArrayList@627[empty]
-    classifier = JavaTypeParameterImpl@508['E']
+    classifier = JavaTypeParameterImpl@468['E']
     nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@475
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@469
 }
 
 LazyJavaClassifierType@628['E'] {
     arguments = ArrayList@629[empty]
-    classifier = JavaTypeParameterImpl@547['E']
+    classifier = JavaTypeParameterImpl@577['E']
     nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
 LazyJavaClassifierType@630['E'] {
     arguments = ArrayList@631[empty]
-    classifier = JavaTypeParameterImpl@571['E']
+    classifier = JavaTypeParameterImpl@553['E']
     nullable = 'true': Boolean@381
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@632['E'] {
     arguments = ArrayList@633[empty]
-    classifier = JavaTypeParameterImpl@478['E']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@475
-}
-
-LazyJavaClassifierType@634['E'] {
-    arguments = ArrayList@635[empty]
-    classifier = JavaTypeParameterImpl@562['E']
+    classifier = JavaTypeParameterImpl@459['E']
     nullable = 'true': Boolean@381
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
+LazyJavaClassifierType@634['E'] {
+    arguments = ArrayList@635[empty]
+    classifier = JavaTypeParameterImpl@511['E']
+    nullable = 'true': Boolean@381
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@469
+}
+
 LazyJavaClassifierType@636['E'] {
     arguments = ArrayList@637[empty]
-    classifier = JavaTypeParameterImpl@459['E']
+    classifier = JavaTypeParameterImpl@499['E']
     nullable = 'true': Boolean@381
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
 LazyJavaClassifierType@638['E'] {
     arguments = ArrayList@639[empty]
-    classifier = JavaTypeParameterImpl@517['E']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
-}
-
-LazyJavaClassifierType@640['E'] {
-    arguments = ArrayList@641[empty]
-    classifier = JavaTypeParameterImpl@523['E']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@475
-}
-
-LazyJavaClassifierType@642['E'] {
-    arguments = ArrayList@643[empty]
-    classifier = JavaTypeParameterImpl@556['E']
+    classifier = JavaTypeParameterImpl@541['E']
     nullable = 'true': Boolean@381
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
+LazyJavaClassifierType@640['E'] {
+    arguments = ArrayList@641[empty]
+    classifier = JavaTypeParameterImpl@550['E']
+    nullable = 'true': Boolean@381
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
+}
+
+LazyJavaClassifierType@642['E'] {
+    arguments = ArrayList@643[empty]
+    classifier = JavaTypeParameterImpl@544['E']
+    nullable = 'true': Boolean@381
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@469
+}
+
 LazyJavaClassifierType@644['E'] {
     arguments = ArrayList@645[empty]
-    classifier = JavaTypeParameterImpl@598['E']
+    classifier = JavaTypeParameterImpl@475['E']
     nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@475
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
 LazyJavaClassifierType@646['E'] {
     arguments = ArrayList@647[empty]
     classifier = JavaTypeParameterImpl@514['E']
     nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@469
 }
 
 LazyJavaClassifierType@648['E'] {
     arguments = ArrayList@649[empty]
-    classifier = JavaTypeParameterImpl@502['E']
+    classifier = JavaTypeParameterImpl@493['E']
     nullable = 'true': Boolean@381
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@650['E'] {
     arguments = ArrayList@651[empty]
-    classifier = JavaTypeParameterImpl@474['E']
+    classifier = JavaTypeParameterImpl@583['E']
     nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@475
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
 LazyJavaClassifierType@652['E'] {
     arguments = ArrayList@653[empty]
-    classifier = JavaTypeParameterImpl@499['E']
+    classifier = JavaTypeParameterImpl@484['E']
     nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@654['E'] {
     arguments = ArrayList@655[empty]
-    classifier = JavaTypeParameterImpl@541['E']
+    classifier = JavaTypeParameterImpl@565['E']
     nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@469
 }
 
 LazyJavaClassifierType@656['E'] {
     arguments = ArrayList@657[empty]
-    classifier = JavaTypeParameterImpl@529['E']
+    classifier = JavaTypeParameterImpl@556['E']
     nullable = 'true': Boolean@381
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
 LazyJavaClassifierType@658['E'] {
     arguments = ArrayList@659[empty]
-    classifier = JavaTypeParameterImpl@481['E']
+    classifier = JavaTypeParameterImpl@478['E']
     nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@660['E'] {
     arguments = ArrayList@661[empty]
-    classifier = JavaTypeParameterImpl@487['E']
+    classifier = JavaTypeParameterImpl@595['E']
     nullable = 'true': Boolean@381
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@662['E'] {
     arguments = ArrayList@663[empty]
-    classifier = JavaTypeParameterImpl@535['E']
+    classifier = JavaTypeParameterImpl@532['E']
     nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@664['E'] {
     arguments = ArrayList@665[empty]
-    classifier = JavaTypeParameterImpl@471['E']
+    classifier = JavaTypeParameterImpl@505['E']
     nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@666['E'] {
     arguments = ArrayList@667[empty]
-    classifier = JavaTypeParameterImpl@464['E']
+    classifier = JavaTypeParameterImpl@508['E']
     nullable = 'true': Boolean@381
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@668['E'] {
     arguments = ArrayList@669[empty]
-    classifier = JavaTypeParameterImpl@583['E']
+    classifier = JavaTypeParameterImpl@562['E']
     nullable = 'true': Boolean@381
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@670['E'] {
     arguments = ArrayList@671[empty]
-    classifier = JavaTypeParameterImpl@493['E']
+    classifier = JavaTypeParameterImpl@589['E']
     nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
 LazyJavaClassifierType@672['E'] {
     arguments = ArrayList@673[empty]
-    classifier = JavaTypeParameterImpl@484['E']
+    classifier = JavaTypeParameterImpl@598['E']
     nullable = 'true': Boolean@381
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@674['E'] {
     arguments = ArrayList@675[empty]
-    classifier = JavaTypeParameterImpl@496['E']
+    classifier = JavaTypeParameterImpl@502['E']
     nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@676['E'] {
     arguments = ArrayList@677[empty]
-    classifier = JavaTypeParameterImpl@526['E']
+    classifier = JavaTypeParameterImpl@547['E']
     nullable = 'true': Boolean@381
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@678['E'] {
     arguments = ArrayList@679[empty]
-    classifier = JavaTypeParameterImpl@577['E']
+    classifier = JavaTypeParameterImpl@464['E']
     nullable = 'true': Boolean@381
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@680['E'] {
     arguments = ArrayList@681[empty]
-    classifier = JavaTypeParameterImpl@553['E']
+    classifier = JavaTypeParameterImpl@559['E']
     nullable = 'true': Boolean@381
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@682['E'] {
     arguments = ArrayList@683[empty]
-    classifier = JavaTypeParameterImpl@592['E']
+    classifier = JavaTypeParameterImpl@574['E']
     nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
 LazyJavaClassifierType@684['E'] {
     arguments = ArrayList@685[empty]
-    classifier = JavaTypeParameterImpl@568['E']
+    classifier = JavaTypeParameterImpl@571['E']
     nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
 LazyJavaClassifierType@686['E'] {
     arguments = ArrayList@687[empty]
-    classifier = JavaTypeParameterImpl@601['E']
+    classifier = JavaTypeParameterImpl@481['E']
     nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@475
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@688['E'] {
     arguments = ArrayList@689[empty]
-    classifier = JavaTypeParameterImpl@574['E']
+    classifier = JavaTypeParameterImpl@520['E']
     nullable = 'true': Boolean@381
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
 LazyJavaClassifierType@690['E'] {
     arguments = ArrayList@691[empty]
-    classifier = JavaTypeParameterImpl@520['E']
+    classifier = JavaTypeParameterImpl@487['E']
     nullable = 'true': Boolean@381
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
 LazyJavaClassifierType@692['E'] {
     arguments = ArrayList@693[empty]
-    classifier = JavaTypeParameterImpl@595['E']
+    classifier = JavaTypeParameterImpl@592['E']
     nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
 LazyJavaClassifierType@694['E'] {
     arguments = ArrayList@695[empty]
-    classifier = JavaTypeParameterImpl@468['E']
+    classifier = JavaTypeParameterImpl@526['E']
     nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@696['Iterator<E>'] {
@@ -1205,7 +1205,7 @@ LazyJavaClassifierType@707['Iterator<E>'] {
 
 LazyJavaClassifierType@712['Iterator<E>'] {
     arguments = ArrayList@713[1] { TypeProjectionImpl@714 }
-    classifier = JavaClassImpl@710['Iterator']
+    classifier = JavaClassImpl@699['Iterator']
     memberScope = SubstitutingScope@715
     nullable = 'true': Boolean@381
     typeConstructor = DeserializedClassTypeConstructor@716
@@ -1221,7 +1221,7 @@ LazyJavaClassifierType@717['Iterator<E>'] {
 
 LazyJavaClassifierType@721['Iterator<E>'] {
     arguments = ArrayList@722[1] { TypeProjectionImpl@723 }
-    classifier = JavaClassImpl@699['Iterator']
+    classifier = JavaClassImpl@710['Iterator']
     memberScope = SubstitutingScope@724
     nullable = 'true': Boolean@381
     typeConstructor = DeserializedClassTypeConstructor@716
@@ -1235,23 +1235,23 @@ LazyJavaClassifierType@323['List<E>'] {
     typeConstructor = DeserializedClassTypeConstructor@729
 }
 
+LazyJavaClassifierType@730['List<E>'] {
+    arguments = ArrayList@731[1] { TypeProjectionImpl@732 }
+    classifier = JavaClassImpl@733['List']
+    memberScope = SubstitutingScope@734
+    nullable = 'false': Boolean@341
+    typeConstructor = DeserializedClassTypeConstructor@729
+}
+
+LazyJavaClassifierType@735['List<E>'] {
+    arguments = ArrayList@736[1] { TypeProjectionImpl@737 }
+    classifier = JavaClassImpl@738['List']
+    memberScope = SubstitutingScope@739
+    nullable = 'false': Boolean@341
+    typeConstructor = DeserializedClassTypeConstructor@729
+}
+
 LazyJavaClassifierType@328['List<E>'] {
-    arguments = ArrayList@730[1] { TypeProjectionImpl@731 }
-    classifier = JavaClassImpl@732['List']
-    memberScope = SubstitutingScope@733
-    nullable = 'false': Boolean@341
-    typeConstructor = DeserializedClassTypeConstructor@729
-}
-
-LazyJavaClassifierType@734['List<E>'] {
-    arguments = ArrayList@735[1] { TypeProjectionImpl@736 }
-    classifier = JavaClassImpl@737['List']
-    memberScope = SubstitutingScope@738
-    nullable = 'false': Boolean@341
-    typeConstructor = DeserializedClassTypeConstructor@729
-}
-
-LazyJavaClassifierType@739['List<E>'] {
     arguments = ArrayList@740[1] { TypeProjectionImpl@741 }
     classifier = JavaClassImpl@742['List']
     memberScope = SubstitutingScope@743
@@ -1261,7 +1261,7 @@ LazyJavaClassifierType@739['List<E>'] {
 
 LazyJavaClassifierType@744['List<E>'] {
     arguments = ArrayList@745[1] { TypeProjectionImpl@746 }
-    classifier = JavaClassImpl@742['List']
+    classifier = JavaClassImpl@738['List']
     memberScope = SubstitutingScope@747
     nullable = 'true': Boolean@381
     typeConstructor = DeserializedClassTypeConstructor@748
@@ -1269,7 +1269,7 @@ LazyJavaClassifierType@744['List<E>'] {
 
 LazyJavaClassifierType@749['List<E>'] {
     arguments = ArrayList@750[1] { TypeProjectionImpl@751 }
-    classifier = JavaClassImpl@737['List']
+    classifier = JavaClassImpl@733['List']
     memberScope = SubstitutingScope@752
     nullable = 'true': Boolean@381
     typeConstructor = DeserializedClassTypeConstructor@748
@@ -1309,7 +1309,7 @@ LazyJavaClassifierType@769['ListIterator<E>'] {
 
 LazyJavaClassifierType@774['ListIterator<E>'] {
     arguments = ArrayList@775[1] { TypeProjectionImpl@776 }
-    classifier = JavaClassImpl@767['ListIterator']
+    classifier = JavaClassImpl@756['ListIterator']
     memberScope = SubstitutingScope@777
     nullable = 'true': Boolean@381
     typeConstructor = DeserializedClassTypeConstructor@778
@@ -1325,7 +1325,7 @@ LazyJavaClassifierType@779['ListIterator<E>'] {
 
 LazyJavaClassifierType@783['ListIterator<E>'] {
     arguments = ArrayList@784[1] { TypeProjectionImpl@785 }
-    classifier = JavaClassImpl@756['ListIterator']
+    classifier = JavaClassImpl@762['ListIterator']
     memberScope = SubstitutingScope@786
     nullable = 'true': Boolean@381
     typeConstructor = DeserializedClassTypeConstructor@778
@@ -1333,7 +1333,7 @@ LazyJavaClassifierType@783['ListIterator<E>'] {
 
 LazyJavaClassifierType@787['ListIterator<E>'] {
     arguments = ArrayList@788[1] { TypeProjectionImpl@789 }
-    classifier = JavaClassImpl@762['ListIterator']
+    classifier = JavaClassImpl@767['ListIterator']
     memberScope = SubstitutingScope@790
     nullable = 'true': Boolean@381
     typeConstructor = DeserializedClassTypeConstructor@778
@@ -1445,7 +1445,7 @@ LazyJavaClassifierType@829['Object'] {
 
 LazyJavaClassifierType@832['Object'] {
     arguments = ArrayList@833[empty]
-    classifier = JavaClassImpl@807['Object']
+    classifier = JavaClassImpl@822['Object']
     memberScope = DeserializedClassMemberScope@794
     nullable = 'true': Boolean@381
     typeConstructor = DeserializedClassTypeConstructor@795
@@ -1453,7 +1453,7 @@ LazyJavaClassifierType@832['Object'] {
 
 LazyJavaClassifierType@834['Object'] {
     arguments = ArrayList@835[empty]
-    classifier = JavaClassImpl@819['Object']
+    classifier = JavaClassImpl@801['Object']
     memberScope = DeserializedClassMemberScope@794
     nullable = 'true': Boolean@381
     typeConstructor = DeserializedClassTypeConstructor@795
@@ -1461,7 +1461,7 @@ LazyJavaClassifierType@834['Object'] {
 
 LazyJavaClassifierType@836['Object'] {
     arguments = ArrayList@837[empty]
-    classifier = JavaClassImpl@793['Object']
+    classifier = JavaClassImpl@819['Object']
     memberScope = DeserializedClassMemberScope@794
     nullable = 'true': Boolean@381
     typeConstructor = DeserializedClassTypeConstructor@795
@@ -1469,7 +1469,7 @@ LazyJavaClassifierType@836['Object'] {
 
 LazyJavaClassifierType@838['Object'] {
     arguments = ArrayList@839[empty]
-    classifier = JavaClassImpl@801['Object']
+    classifier = JavaClassImpl@807['Object']
     memberScope = DeserializedClassMemberScope@794
     nullable = 'true': Boolean@381
     typeConstructor = DeserializedClassTypeConstructor@795
@@ -1477,7 +1477,7 @@ LazyJavaClassifierType@838['Object'] {
 
 LazyJavaClassifierType@840['Object'] {
     arguments = ArrayList@841[empty]
-    classifier = JavaClassImpl@822['Object']
+    classifier = JavaClassImpl@804['Object']
     memberScope = DeserializedClassMemberScope@794
     nullable = 'true': Boolean@381
     typeConstructor = DeserializedClassTypeConstructor@795
@@ -1485,7 +1485,7 @@ LazyJavaClassifierType@840['Object'] {
 
 LazyJavaClassifierType@842['Object'] {
     arguments = ArrayList@843[empty]
-    classifier = JavaClassImpl@810['Object']
+    classifier = JavaClassImpl@816['Object']
     memberScope = DeserializedClassMemberScope@794
     nullable = 'true': Boolean@381
     typeConstructor = DeserializedClassTypeConstructor@795
@@ -1493,7 +1493,7 @@ LazyJavaClassifierType@842['Object'] {
 
 LazyJavaClassifierType@844['Object'] {
     arguments = ArrayList@845[empty]
-    classifier = JavaClassImpl@816['Object']
+    classifier = JavaClassImpl@828['Object']
     memberScope = DeserializedClassMemberScope@794
     nullable = 'true': Boolean@381
     typeConstructor = DeserializedClassTypeConstructor@795
@@ -1501,7 +1501,7 @@ LazyJavaClassifierType@844['Object'] {
 
 LazyJavaClassifierType@846['Object'] {
     arguments = ArrayList@847[empty]
-    classifier = JavaClassImpl@828['Object']
+    classifier = JavaClassImpl@813['Object']
     memberScope = DeserializedClassMemberScope@794
     nullable = 'true': Boolean@381
     typeConstructor = DeserializedClassTypeConstructor@795
@@ -1509,7 +1509,7 @@ LazyJavaClassifierType@846['Object'] {
 
 LazyJavaClassifierType@848['Object'] {
     arguments = ArrayList@849[empty]
-    classifier = JavaClassImpl@804['Object']
+    classifier = JavaClassImpl@798['Object']
     memberScope = DeserializedClassMemberScope@794
     nullable = 'true': Boolean@381
     typeConstructor = DeserializedClassTypeConstructor@795
@@ -1517,7 +1517,7 @@ LazyJavaClassifierType@848['Object'] {
 
 LazyJavaClassifierType@850['Object'] {
     arguments = ArrayList@851[empty]
-    classifier = JavaClassImpl@825['Object']
+    classifier = JavaClassImpl@810['Object']
     memberScope = DeserializedClassMemberScope@794
     nullable = 'true': Boolean@381
     typeConstructor = DeserializedClassTypeConstructor@795
@@ -1525,7 +1525,7 @@ LazyJavaClassifierType@850['Object'] {
 
 LazyJavaClassifierType@852['Object'] {
     arguments = ArrayList@853[empty]
-    classifier = JavaClassImpl@813['Object']
+    classifier = JavaClassImpl@793['Object']
     memberScope = DeserializedClassMemberScope@794
     nullable = 'true': Boolean@381
     typeConstructor = DeserializedClassTypeConstructor@795
@@ -1533,7 +1533,7 @@ LazyJavaClassifierType@852['Object'] {
 
 LazyJavaClassifierType@854['Object'] {
     arguments = ArrayList@855[empty]
-    classifier = JavaClassImpl@831['Object']
+    classifier = JavaClassImpl@825['Object']
     memberScope = DeserializedClassMemberScope@794
     nullable = 'true': Boolean@381
     typeConstructor = DeserializedClassTypeConstructor@795
@@ -1541,7 +1541,7 @@ LazyJavaClassifierType@854['Object'] {
 
 LazyJavaClassifierType@856['Object'] {
     arguments = ArrayList@857[empty]
-    classifier = JavaClassImpl@798['Object']
+    classifier = JavaClassImpl@831['Object']
     memberScope = DeserializedClassMemberScope@794
     nullable = 'true': Boolean@381
     typeConstructor = DeserializedClassTypeConstructor@795
@@ -1636,7 +1636,7 @@ LazyJavaClassifierType@889['String'] {
 
 LazyJavaClassifierType@892['String'] {
     arguments = ArrayList@893[empty]
-    classifier = JavaClassImpl@883['String']
+    classifier = JavaClassImpl@888['String']
     memberScope = DeserializedClassMemberScope@884
     nullable = 'true': Boolean@381
     typeConstructor = DeserializedClassTypeConstructor@885
@@ -1652,7 +1652,7 @@ LazyJavaClassifierType@894['String'] {
 
 LazyJavaClassifierType@896['String'] {
     arguments = ArrayList@897[empty]
-    classifier = JavaClassImpl@888['String']
+    classifier = JavaClassImpl@883['String']
     memberScope = DeserializedClassMemberScope@884
     nullable = 'true': Boolean@381
     typeConstructor = DeserializedClassTypeConstructor@885
@@ -1676,40 +1676,40 @@ LazyJavaClassifierType@906['T'] {
     arguments = ArrayList@907[empty]
     classifier = JavaTypeParameterImpl@908['T']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@905
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@901
 }
 
 LazyJavaClassifierType@909['T'] {
     arguments = ArrayList@910[empty]
     classifier = JavaTypeParameterImpl@911['T']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@901
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@905
 }
 
 LazyJavaClassifierType@912['T'] {
     arguments = ArrayList@913[empty]
     classifier = JavaTypeParameterImpl@908['T']
     nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@905
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@901
 }
 
 LazyJavaClassifierType@914['T'] {
     arguments = ArrayList@915[empty]
-    classifier = JavaTypeParameterImpl@911['T']
+    classifier = JavaTypeParameterImpl@900['T']
     nullable = 'true': Boolean@381
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@901
 }
 
 LazyJavaClassifierType@916['T'] {
     arguments = ArrayList@917[empty]
-    classifier = JavaTypeParameterImpl@900['T']
+    classifier = JavaTypeParameterImpl@904['T']
     nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@901
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@905
 }
 
 LazyJavaClassifierType@918['T'] {
     arguments = ArrayList@919[empty]
-    classifier = JavaTypeParameterImpl@904['T']
+    classifier = JavaTypeParameterImpl@911['T']
     nullable = 'true': Boolean@381
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@905
 }
@@ -1786,9 +1786,9 @@ LazyJavaPackageFragment@943['util'] {
     memberIndex = computeMemberIndex$1@974 // through LazyPackageFragmentScopeForJavaPackage@972
 }
 
-LazyJavaTypeParameterDescriptor@320['E'] {
+LazyJavaTypeParameterDescriptor@316['E'] {
     defaultType = JetTypeImpl@975['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@469
     upperBounds = LinkedHashSet@976[1] { NullableType@977 }
     upperBoundsAsType = NullableType@977
 }
@@ -1800,9 +1800,9 @@ LazyJavaTypeParameterDescriptor@325['E'] {
     upperBoundsAsType = NullableType@980
 }
 
-LazyJavaTypeParameterDescriptor@316['E'] {
+LazyJavaTypeParameterDescriptor@320['E'] {
     defaultType = JetTypeImpl@981['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@475
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
     upperBounds = LinkedHashSet@982[1] { NullableType@983 }
     upperBoundsAsType = NullableType@983
 }
@@ -1833,123 +1833,126 @@ LazyJavaTypeParameterResolver@995 {
 }
 
 LazyJavaTypeParameterResolver@997 {
-    resolve(JavaTypeParameterImpl@586['E']) = null
-}
-
-LazyJavaTypeParameterResolver@998 {
-    resolve(JavaTypeParameterImpl@520['E']) = null
-}
-
-LazyJavaTypeParameterResolver@999 {
-    resolve(JavaTypeParameterImpl@577['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1000 {
-    resolve(JavaTypeParameterImpl@544['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1001 {
-    resolve(JavaTypeParameterImpl@502['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1002 {
-    resolve(JavaTypeParameterImpl@490['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1003 {
-    resolve(JavaTypeParameterImpl@553['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1004 {
-    resolve(JavaTypeParameterImpl@508['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1005 {
-    resolve(JavaTypeParameterImpl@496['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1006 {
-    resolve(JavaTypeParameterImpl@478['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1007 {
-    resolve(JavaTypeParameterImpl@592['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1008 {
-    resolve(JavaTypeParameterImpl@529['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1009 {
     resolve(JavaTypeParameterImpl@559['E']) = null
 }
 
+LazyJavaTypeParameterResolver@998 {
+    resolve(JavaTypeParameterImpl@538['E']) = null
+}
+
+LazyJavaTypeParameterResolver@999 {
+    resolve(JavaTypeParameterImpl@508['E']) = null
+}
+
+LazyJavaTypeParameterResolver@1000 {
+    resolve(JavaTypeParameterImpl@580['E']) = null
+}
+
+LazyJavaTypeParameterResolver@1001 {
+    resolve(JavaTypeParameterImpl@553['E']) = null
+}
+
+LazyJavaTypeParameterResolver@1002 {
+    resolve(JavaTypeParameterImpl@592['E']) = null
+}
+
+LazyJavaTypeParameterResolver@1003 {
+    resolve(JavaTypeParameterImpl@475['E']) = null
+}
+
+LazyJavaTypeParameterResolver@1004 {
+    resolve(JavaTypeParameterImpl@478['E']) = null
+}
+
+LazyJavaTypeParameterResolver@1005 {
+    resolve(JavaTypeParameterImpl@487['E']) = null
+}
+
+LazyJavaTypeParameterResolver@1006 {
+    resolve(JavaTypeParameterImpl@541['E']) = null
+}
+
+LazyJavaTypeParameterResolver@1007 {
+    resolve(JavaTypeParameterImpl@490['E']) = null
+}
+
+LazyJavaTypeParameterResolver@1008 {
+    resolve(JavaTypeParameterImpl@547['E']) = null
+}
+
+LazyJavaTypeParameterResolver@1009 {
+    resolve(JavaTypeParameterImpl@523['E']) = null
+}
+
 LazyJavaTypeParameterResolver@1010 {
-    resolve(JavaTypeParameterImpl@499['E']) = null
+    resolve(JavaTypeParameterImpl@544['E']) = null
 }
 
 LazyJavaTypeParameterResolver@1011 {
-    resolve(JavaTypeParameterImpl@468['E']) = null
+    resolve(JavaTypeParameterImpl@505['E']) = null
 }
 
 LazyJavaTypeParameterResolver@1012 {
-    resolve(JavaTypeParameterImpl@550['E']) = null
+    resolve(JavaTypeParameterImpl@520['E']) = null
 }
 
 LazyJavaTypeParameterResolver@1013 {
-    resolve(JavaTypeParameterImpl@565['E']) = null
+    resolve(JavaTypeParameterImpl@514['E']) = null
 }
 
 LazyJavaTypeParameterResolver@1014 {
-    resolve(JavaTypeParameterImpl@517['E']) = null
+    resolve(JavaTypeParameterImpl@472['E']) = null
 }
 
 LazyJavaTypeParameterResolver@1015 {
-    resolve(JavaTypeParameterImpl@493['E']) = null
+    resolve(JavaTypeParameterImpl@568['E']) = null
 }
 
 LazyJavaTypeParameterResolver@1016 {
-    resolve(JavaTypeParameterImpl@556['E']) = null
+    resolve(JavaTypeParameterImpl@601['E']) = null
 }
 
 LazyJavaTypeParameterResolver@1017 {
-    resolve(JavaTypeParameterImpl@562['E']) = null
+    resolve(JavaTypeParameterImpl@574['E']) = null
 }
 
 LazyJavaTypeParameterResolver@1018 {
-    resolve(JavaTypeParameterImpl@595['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1019 {
-    resolve(JavaTypeParameterImpl@474['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1020 {
     resolve(JavaTypeParameterImpl@535['E']) = null
 }
 
+LazyJavaTypeParameterResolver@1019 {
+    resolve(JavaTypeParameterImpl@529['E']) = null
+}
+
+LazyJavaTypeParameterResolver@1020 {
+    resolve(JavaTypeParameterImpl@562['E']) = null
+}
+
 LazyJavaTypeParameterResolver@1021 {
-    resolve(JavaTypeParameterImpl@484['E']) = null
+    resolve(JavaTypeParameterImpl@586['E']) = null
 }
 
 LazyJavaTypeParameterResolver@1022 {
-    resolve(JavaTypeParameterImpl@1023['T']) = LazyJavaTypeParameterDescriptor@984['T']
+    resolve(JavaTypeParameterImpl@1023['T']) = LazyJavaTypeParameterDescriptor@988['T']
 }
 
 LazyJavaTypeParameterResolver@1024 {
-    resolve(JavaTypeParameterImpl@1025['T']) = LazyJavaTypeParameterDescriptor@988['T']
+    resolve(JavaTypeParameterImpl@1025['T']) = LazyJavaTypeParameterDescriptor@984['T']
 }
 
 ResolutionTaskHolder@1026 {
     <name not found> = ArrayList@1027[1] { ResolutionCandidate@1028 }
-    <name not found> = ArrayList@1029[1] { ResolutionCandidate@1028 }
-    <name not found> = EmptyList@3[empty]
-    <name not found> = EmptyList@3[empty]
     <name not found> = EmptyList@3[empty]
     <name not found> = EmptyList@3[empty]
 }
 
-ResolutionTaskHolder@1030 {
-    <name not found> = ArrayList@1031[3] { ResolutionCandidate@1032, ResolutionCandidate@1033, ResolutionCandidate@1034 }
-    <name not found> = ArrayList@1035[3] { ResolutionCandidate@1032, ResolutionCandidate@1033, ResolutionCandidate@1034 }
+ResolutionTaskHolder@1029 {
+    <name not found> = ArrayList@1030[3] { ResolutionCandidate@1031, ResolutionCandidate@1032, ResolutionCandidate@1033 }
+}
+
+null {
+    <name not found> = ArrayList@1034[1] { ResolutionCandidate@1028 }
+    <name not found> = ArrayList@1035[3] { ResolutionCandidate@1031, ResolutionCandidate@1032, ResolutionCandidate@1033 }
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/subtyping/kt2069.lazy.log b/compiler/testData/diagnostics/tests/subtyping/kt2069.lazy.log
index 02b95ae17fc..c60c4f70bb3 100644
--- a/compiler/testData/diagnostics/tests/subtyping/kt2069.lazy.log
+++ b/compiler/testData/diagnostics/tests/subtyping/kt2069.lazy.log
@@ -22,5 +22,8 @@ LazyJavaPackageFragment@5['java'] {
 
 ResolutionTaskHolder@22 {
     <name not found> = ArrayList@23[1] { ResolutionCandidate@24 }
+}
+
+null {
     <name not found> = ArrayList@25[1] { ResolutionCandidate@24 }
 }
diff --git a/compiler/testData/diagnostics/tests/subtyping/localAnonymousObjects.lazy.log b/compiler/testData/diagnostics/tests/subtyping/localAnonymousObjects.lazy.log
index 62831aa36ca..03c93581de9 100644
--- a/compiler/testData/diagnostics/tests/subtyping/localAnonymousObjects.lazy.log
+++ b/compiler/testData/diagnostics/tests/subtyping/localAnonymousObjects.lazy.log
@@ -24,5 +24,8 @@ LazyJavaPackageFragment@8['java'] {
 
 ResolutionTaskHolder@20 {
     <name not found> = ArrayList@21[1] { ResolutionCandidate@22 }
+}
+
+null {
     <name not found> = ArrayList@23[1] { ResolutionCandidate@22 }
 }
diff --git a/compiler/testData/diagnostics/tests/subtyping/localClasses.lazy.log b/compiler/testData/diagnostics/tests/subtyping/localClasses.lazy.log
index df7fb8eacfd..9f01fd0ab87 100644
--- a/compiler/testData/diagnostics/tests/subtyping/localClasses.lazy.log
+++ b/compiler/testData/diagnostics/tests/subtyping/localClasses.lazy.log
@@ -43,69 +43,72 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@34 {
     <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
+}
+
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
 ResolutionTaskHolder@46 {
     <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[2] { ResolutionCandidate@57, ResolutionCandidate@58 }
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[2] { ResolutionCandidate@61, ResolutionCandidate@62 }
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[2] { ResolutionCandidate@64, ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[2] { ResolutionCandidate@64, ResolutionCandidate@65 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[2] { ResolutionCandidate@69, ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[2] { ResolutionCandidate@69, ResolutionCandidate@70 }
+null {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@70[2] { ResolutionCandidate@57, ResolutionCandidate@58 }
+    <name not found> = ArrayList@71[2] { ResolutionCandidate@61, ResolutionCandidate@62 }
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
diff --git a/compiler/testData/diagnostics/tests/subtyping/memberAnonymousObjects.lazy.log b/compiler/testData/diagnostics/tests/subtyping/memberAnonymousObjects.lazy.log
index 0cd6e1dacbe..f07d036af36 100644
--- a/compiler/testData/diagnostics/tests/subtyping/memberAnonymousObjects.lazy.log
+++ b/compiler/testData/diagnostics/tests/subtyping/memberAnonymousObjects.lazy.log
@@ -39,7 +39,10 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@26 {
     <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+}
+
+null {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
     <name not found> = EmptyList@23[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/subtyping/nestedIntoLocalClasses.lazy.log b/compiler/testData/diagnostics/tests/subtyping/nestedIntoLocalClasses.lazy.log
index 9ef9cf20ffa..39f78fcd81e 100644
--- a/compiler/testData/diagnostics/tests/subtyping/nestedIntoLocalClasses.lazy.log
+++ b/compiler/testData/diagnostics/tests/subtyping/nestedIntoLocalClasses.lazy.log
@@ -59,79 +59,82 @@ LazyJavaPackageFragment@17['lang'] {
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
 ResolutionTaskHolder@52 {
     <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
+}
+
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
 }
 
 ResolutionTaskHolder@64 {
     <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[2] { ResolutionCandidate@78, ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[2] { ResolutionCandidate@78, ResolutionCandidate@79 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[2] { ResolutionCandidate@69, ResolutionCandidate@70 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[2] { ResolutionCandidate@83, ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[2] { ResolutionCandidate@83, ResolutionCandidate@84 }
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[2] { ResolutionCandidate@73, ResolutionCandidate@74 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+}
+
+null {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@84[2] { ResolutionCandidate@69, ResolutionCandidate@70 }
+    <name not found> = ArrayList@85[2] { ResolutionCandidate@73, ResolutionCandidate@74 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
diff --git a/compiler/testData/diagnostics/tests/subtyping/nestedLocalClasses.lazy.log b/compiler/testData/diagnostics/tests/subtyping/nestedLocalClasses.lazy.log
index b4bb5ea34fb..29a7c1f26c4 100644
--- a/compiler/testData/diagnostics/tests/subtyping/nestedLocalClasses.lazy.log
+++ b/compiler/testData/diagnostics/tests/subtyping/nestedLocalClasses.lazy.log
@@ -43,79 +43,82 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@34 {
     <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
+}
+
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
 ResolutionTaskHolder@46 {
     <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
 }
 
 ResolutionTaskHolder@58 {
     <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[2] { ResolutionCandidate@72, ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[2] { ResolutionCandidate@72, ResolutionCandidate@73 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[2] { ResolutionCandidate@63, ResolutionCandidate@64 }
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[2] { ResolutionCandidate@77, ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[2] { ResolutionCandidate@77, ResolutionCandidate@78 }
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[2] { ResolutionCandidate@67, ResolutionCandidate@68 }
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+}
+
+null {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@78[2] { ResolutionCandidate@63, ResolutionCandidate@64 }
+    <name not found> = ArrayList@79[2] { ResolutionCandidate@67, ResolutionCandidate@68 }
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
diff --git a/compiler/testData/diagnostics/tests/subtyping/topLevelAnonymousObjects.lazy.log b/compiler/testData/diagnostics/tests/subtyping/topLevelAnonymousObjects.lazy.log
index 397c093acfa..8c95091b32f 100644
--- a/compiler/testData/diagnostics/tests/subtyping/topLevelAnonymousObjects.lazy.log
+++ b/compiler/testData/diagnostics/tests/subtyping/topLevelAnonymousObjects.lazy.log
@@ -39,7 +39,10 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@26 {
     <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+}
+
+null {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
     <name not found> = EmptyList@23[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnClass.lazy.log b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnClass.lazy.log
index 0f478ce3704..a263a97ee2e 100644
--- a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnClass.lazy.log
@@ -34,10 +34,13 @@ LazyJavaPackageFragment@11['java'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
+}
+
+null {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@33 }
 }
diff --git a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnClassObject.lazy.log b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnClassObject.lazy.log
index b0b7decc8cc..b6918b8fcd7 100644
--- a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnClassObject.lazy.log
+++ b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnClassObject.lazy.log
@@ -42,5 +42,8 @@ LazyJavaPackageFragment@13['java'] {
 
 ResolutionTaskHolder@36 {
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+}
+
+null {
     <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
 }
diff --git a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnExpression.lazy.log b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnExpression.lazy.log
index 02ae581e7ab..6a05c3669ea 100644
--- a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnExpression.lazy.log
+++ b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnExpression.lazy.log
@@ -33,5 +33,8 @@ LazyJavaPackageFragment@10['java'] {
 
 ResolutionTaskHolder@30 {
     <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
+}
+
+null {
     <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
 }
diff --git a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnFunction.lazy.log b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnFunction.lazy.log
index db58bd9b34e..39b473b756a 100644
--- a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnFunction.lazy.log
+++ b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnFunction.lazy.log
@@ -34,5 +34,8 @@ LazyJavaPackageFragment@11['java'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+}
+
+null {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
 }
diff --git a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnObject.lazy.log b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnObject.lazy.log
index db58bd9b34e..39b473b756a 100644
--- a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnObject.lazy.log
+++ b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnObject.lazy.log
@@ -34,5 +34,8 @@ LazyJavaPackageFragment@11['java'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+}
+
+null {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
 }
diff --git a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnParameter.lazy.log b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnParameter.lazy.log
index db58bd9b34e..39b473b756a 100644
--- a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnParameter.lazy.log
+++ b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnParameter.lazy.log
@@ -34,5 +34,8 @@ LazyJavaPackageFragment@11['java'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+}
+
+null {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
 }
diff --git a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnProperty.lazy.log b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnProperty.lazy.log
index b0b7decc8cc..b6918b8fcd7 100644
--- a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnProperty.lazy.log
+++ b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnProperty.lazy.log
@@ -42,5 +42,8 @@ LazyJavaPackageFragment@13['java'] {
 
 ResolutionTaskHolder@36 {
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+}
+
+null {
     <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
 }
diff --git a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnPropertyAccessor.lazy.log b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnPropertyAccessor.lazy.log
index 0e797837951..21f4f1c59a1 100644
--- a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnPropertyAccessor.lazy.log
+++ b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnPropertyAccessor.lazy.log
@@ -38,5 +38,8 @@ LazyJavaPackageFragment@12['java'] {
 
 ResolutionTaskHolder@35 {
     <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+}
+
+null {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
 }
diff --git a/compiler/testData/diagnostics/tests/suppress/manyWarnings/mixed.lazy.log b/compiler/testData/diagnostics/tests/suppress/manyWarnings/mixed.lazy.log
index a1acad05283..096e4ef70b7 100644
--- a/compiler/testData/diagnostics/tests/suppress/manyWarnings/mixed.lazy.log
+++ b/compiler/testData/diagnostics/tests/suppress/manyWarnings/mixed.lazy.log
@@ -40,15 +40,18 @@ LazyJavaPackageFragment@15['java'] {
 
 ResolutionTaskHolder@35 {
     <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
+}
+
+null {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@43 }
 }
diff --git a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onClass.lazy.log b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onClass.lazy.log
index 0f478ce3704..53193dfd9c3 100644
--- a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onClass.lazy.log
@@ -34,10 +34,13 @@ LazyJavaPackageFragment@11['java'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
+}
+
+null {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@36 }
 }
diff --git a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onClassObject.lazy.log b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onClassObject.lazy.log
index a92b435abda..95bdcf46fbc 100644
--- a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onClassObject.lazy.log
+++ b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onClassObject.lazy.log
@@ -38,10 +38,13 @@ LazyJavaPackageFragment@12['java'] {
 
 ResolutionTaskHolder@32 {
     <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
 }
 
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+}
+
+null {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@37 }
 }
diff --git a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onExpression.lazy.log b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onExpression.lazy.log
index 732b75cec34..4efea778524 100644
--- a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onExpression.lazy.log
+++ b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onExpression.lazy.log
@@ -37,10 +37,13 @@ LazyJavaPackageFragment@11['java'] {
 
 ResolutionTaskHolder@34 {
     <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
+}
+
+null {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@39 }
 }
diff --git a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onFunction.lazy.log b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onFunction.lazy.log
index 0f478ce3704..a263a97ee2e 100644
--- a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onFunction.lazy.log
+++ b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onFunction.lazy.log
@@ -34,10 +34,13 @@ LazyJavaPackageFragment@11['java'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
+}
+
+null {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@33 }
 }
diff --git a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onObject.lazy.log b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onObject.lazy.log
index 0f478ce3704..53193dfd9c3 100644
--- a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onObject.lazy.log
+++ b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onObject.lazy.log
@@ -34,10 +34,13 @@ LazyJavaPackageFragment@11['java'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
+}
+
+null {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@36 }
 }
diff --git a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onParameter.lazy.log b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onParameter.lazy.log
index 8f2004b76d0..a31ab1ca19a 100644
--- a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onParameter.lazy.log
+++ b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onParameter.lazy.log
@@ -38,15 +38,18 @@ LazyJavaPackageFragment@13['java'] {
 
 ResolutionTaskHolder@33 {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+}
+
+null {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@41 }
 }
diff --git a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onProperty.lazy.log b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onProperty.lazy.log
index a92b435abda..777f187a705 100644
--- a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onProperty.lazy.log
+++ b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onProperty.lazy.log
@@ -38,10 +38,13 @@ LazyJavaPackageFragment@12['java'] {
 
 ResolutionTaskHolder@32 {
     <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
 }
 
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+}
+
+null {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@34 }
 }
diff --git a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onPropertyAccessor.lazy.log b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onPropertyAccessor.lazy.log
index 0f478ce3704..a263a97ee2e 100644
--- a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onPropertyAccessor.lazy.log
+++ b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onPropertyAccessor.lazy.log
@@ -34,10 +34,13 @@ LazyJavaPackageFragment@11['java'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
+}
+
+null {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@33 }
 }
diff --git a/compiler/testData/diagnostics/tests/suppress/oneWarning/onClass.lazy.log b/compiler/testData/diagnostics/tests/suppress/oneWarning/onClass.lazy.log
index 0e797837951..21f4f1c59a1 100644
--- a/compiler/testData/diagnostics/tests/suppress/oneWarning/onClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/suppress/oneWarning/onClass.lazy.log
@@ -38,5 +38,8 @@ LazyJavaPackageFragment@12['java'] {
 
 ResolutionTaskHolder@35 {
     <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+}
+
+null {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
 }
diff --git a/compiler/testData/diagnostics/tests/suppress/oneWarning/onClassObject.lazy.log b/compiler/testData/diagnostics/tests/suppress/oneWarning/onClassObject.lazy.log
index b0b7decc8cc..b6918b8fcd7 100644
--- a/compiler/testData/diagnostics/tests/suppress/oneWarning/onClassObject.lazy.log
+++ b/compiler/testData/diagnostics/tests/suppress/oneWarning/onClassObject.lazy.log
@@ -42,5 +42,8 @@ LazyJavaPackageFragment@13['java'] {
 
 ResolutionTaskHolder@36 {
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+}
+
+null {
     <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
 }
diff --git a/compiler/testData/diagnostics/tests/suppress/oneWarning/onExpression.lazy.log b/compiler/testData/diagnostics/tests/suppress/oneWarning/onExpression.lazy.log
index 3003faf0348..7c9129049c0 100644
--- a/compiler/testData/diagnostics/tests/suppress/oneWarning/onExpression.lazy.log
+++ b/compiler/testData/diagnostics/tests/suppress/oneWarning/onExpression.lazy.log
@@ -37,5 +37,8 @@ LazyJavaPackageFragment@11['java'] {
 
 ResolutionTaskHolder@34 {
     <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
+}
+
+null {
     <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
 }
diff --git a/compiler/testData/diagnostics/tests/suppress/oneWarning/onFunction.lazy.log b/compiler/testData/diagnostics/tests/suppress/oneWarning/onFunction.lazy.log
index 0e797837951..21f4f1c59a1 100644
--- a/compiler/testData/diagnostics/tests/suppress/oneWarning/onFunction.lazy.log
+++ b/compiler/testData/diagnostics/tests/suppress/oneWarning/onFunction.lazy.log
@@ -38,5 +38,8 @@ LazyJavaPackageFragment@12['java'] {
 
 ResolutionTaskHolder@35 {
     <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+}
+
+null {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
 }
diff --git a/compiler/testData/diagnostics/tests/suppress/oneWarning/onLocalVariable.lazy.log b/compiler/testData/diagnostics/tests/suppress/oneWarning/onLocalVariable.lazy.log
index 555a2f5425c..3e29ef5c8e9 100644
--- a/compiler/testData/diagnostics/tests/suppress/oneWarning/onLocalVariable.lazy.log
+++ b/compiler/testData/diagnostics/tests/suppress/oneWarning/onLocalVariable.lazy.log
@@ -42,10 +42,13 @@ LazyJavaPackageFragment@13['java'] {
 
 ResolutionTaskHolder@39 {
     <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
+}
+
+null {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@41 }
 }
diff --git a/compiler/testData/diagnostics/tests/suppress/oneWarning/onObject.lazy.log b/compiler/testData/diagnostics/tests/suppress/oneWarning/onObject.lazy.log
index 0e797837951..21f4f1c59a1 100644
--- a/compiler/testData/diagnostics/tests/suppress/oneWarning/onObject.lazy.log
+++ b/compiler/testData/diagnostics/tests/suppress/oneWarning/onObject.lazy.log
@@ -38,5 +38,8 @@ LazyJavaPackageFragment@12['java'] {
 
 ResolutionTaskHolder@35 {
     <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+}
+
+null {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
 }
diff --git a/compiler/testData/diagnostics/tests/suppress/oneWarning/onParameter.lazy.log b/compiler/testData/diagnostics/tests/suppress/oneWarning/onParameter.lazy.log
index b5a07299be7..040e2d466e4 100644
--- a/compiler/testData/diagnostics/tests/suppress/oneWarning/onParameter.lazy.log
+++ b/compiler/testData/diagnostics/tests/suppress/oneWarning/onParameter.lazy.log
@@ -42,10 +42,13 @@ LazyJavaPackageFragment@14['java'] {
 
 ResolutionTaskHolder@37 {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+}
+
+null {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@42 }
 }
diff --git a/compiler/testData/diagnostics/tests/suppress/oneWarning/onProperty.lazy.log b/compiler/testData/diagnostics/tests/suppress/oneWarning/onProperty.lazy.log
index b0b7decc8cc..b6918b8fcd7 100644
--- a/compiler/testData/diagnostics/tests/suppress/oneWarning/onProperty.lazy.log
+++ b/compiler/testData/diagnostics/tests/suppress/oneWarning/onProperty.lazy.log
@@ -42,5 +42,8 @@ LazyJavaPackageFragment@13['java'] {
 
 ResolutionTaskHolder@36 {
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+}
+
+null {
     <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
 }
diff --git a/compiler/testData/diagnostics/tests/suppress/oneWarning/onPropertyAccessor.lazy.log b/compiler/testData/diagnostics/tests/suppress/oneWarning/onPropertyAccessor.lazy.log
index 0e797837951..21f4f1c59a1 100644
--- a/compiler/testData/diagnostics/tests/suppress/oneWarning/onPropertyAccessor.lazy.log
+++ b/compiler/testData/diagnostics/tests/suppress/oneWarning/onPropertyAccessor.lazy.log
@@ -38,5 +38,8 @@ LazyJavaPackageFragment@12['java'] {
 
 ResolutionTaskHolder@35 {
     <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+}
+
+null {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
 }
diff --git a/compiler/testData/diagnostics/tests/thisAndSuper/QualifiedThis.lazy.log b/compiler/testData/diagnostics/tests/thisAndSuper/QualifiedThis.lazy.log
index 50b450e57aa..6349658ae8d 100644
--- a/compiler/testData/diagnostics/tests/thisAndSuper/QualifiedThis.lazy.log
+++ b/compiler/testData/diagnostics/tests/thisAndSuper/QualifiedThis.lazy.log
@@ -41,19 +41,22 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
 }
 
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
+}
+
+null {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@30 }
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/thisAndSuper/Super.lazy.log b/compiler/testData/diagnostics/tests/thisAndSuper/Super.lazy.log
index a80a960b962..4976bef7d9d 100644
--- a/compiler/testData/diagnostics/tests/thisAndSuper/Super.lazy.log
+++ b/compiler/testData/diagnostics/tests/thisAndSuper/Super.lazy.log
@@ -61,138 +61,105 @@ LazyJavaPackageFragment@26['lang'] {
 
 ResolutionTaskHolder@57 {
     <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
+}
+
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
 }
 
 ResolutionTaskHolder@69 {
     <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
+}
+
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
 }
 
 ResolutionTaskHolder@81 {
     <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
 }
 
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
+}
+
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
 }
 
 ResolutionTaskHolder@93 {
     <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
 }
 
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
 }
 
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
+}
+
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
 }
 
 ResolutionTaskHolder@105 {
     <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
 }
 
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
 }
 
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
+ResolutionTaskHolder@111 {
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
+}
+
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
 }
 
 ResolutionTaskHolder@117 {
     <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
 }
 
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
+ResolutionTaskHolder@120 {
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
 }
 
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@127 }
+ResolutionTaskHolder@123 {
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
+}
+
+ResolutionTaskHolder@126 {
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
 }
 
 ResolutionTaskHolder@129 {
     <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@131 }
 }
 
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@135 }
-}
-
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@139 }
-}
-
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@143 }
-}
-
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@147 }
-}
-
-ResolutionTaskHolder@149 {
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@151 }
-}
-
-ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@155 }
-}
-
-ResolutionTaskHolder@157 {
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
+ResolutionTaskHolder@132 {
     <name not found> = EmptyList@50[empty]
     <name not found> = EmptyList@50[empty]
     <name not found> = EmptyList@50[empty]
@@ -227,11 +194,7 @@ ResolutionTaskHolder@157 {
     <name not found> = EmptyList@50[empty]
 }
 
-ResolutionTaskHolder@158 {
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
+ResolutionTaskHolder@133 {
     <name not found> = EmptyList@50[empty]
     <name not found> = EmptyList@50[empty]
     <name not found> = EmptyList@50[empty]
@@ -249,3 +212,43 @@ ResolutionTaskHolder@158 {
     <name not found> = EmptyList@50[empty]
     <name not found> = EmptyList@50[empty]
 }
+
+null {
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@128 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@113 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@122 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@131 }
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@125 }
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@86 }
+    <name not found> = EmptyList@50[empty]
+    <name not found> = EmptyList@50[empty]
+    <name not found> = EmptyList@50[empty]
+    <name not found> = EmptyList@50[empty]
+    <name not found> = EmptyList@50[empty]
+    <name not found> = EmptyList@50[empty]
+    <name not found> = EmptyList@50[empty]
+    <name not found> = EmptyList@50[empty]
+    <name not found> = EmptyList@50[empty]
+    <name not found> = EmptyList@50[empty]
+    <name not found> = EmptyList@50[empty]
+    <name not found> = EmptyList@50[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/thisAndSuper/notAccessibleSuperInTrait.lazy.log b/compiler/testData/diagnostics/tests/thisAndSuper/notAccessibleSuperInTrait.lazy.log
index 1fccbb0551b..1dc24edcf33 100644
--- a/compiler/testData/diagnostics/tests/thisAndSuper/notAccessibleSuperInTrait.lazy.log
+++ b/compiler/testData/diagnostics/tests/thisAndSuper/notAccessibleSuperInTrait.lazy.log
@@ -20,5 +20,8 @@ LazyJavaPackageFragment@6['java'] {
 
 ResolutionTaskHolder@20 {
     <name not found> = ArrayList@21[1] { ResolutionCandidate@22 }
+}
+
+null {
     <name not found> = ArrayList@23[1] { ResolutionCandidate@22 }
 }
diff --git a/compiler/testData/diagnostics/tests/thisAndSuper/superInExtensionFunction.lazy.log b/compiler/testData/diagnostics/tests/thisAndSuper/superInExtensionFunction.lazy.log
index 7cd9c72d0ee..5ddf9c4b059 100644
--- a/compiler/testData/diagnostics/tests/thisAndSuper/superInExtensionFunction.lazy.log
+++ b/compiler/testData/diagnostics/tests/thisAndSuper/superInExtensionFunction.lazy.log
@@ -23,10 +23,13 @@ LazyJavaPackageFragment@5['java'] {
 
 ResolutionTaskHolder@21 {
     <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@23 }
 }
 
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
+ResolutionTaskHolder@24 {
+    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
+}
+
+null {
+    <name not found> = ArrayList@27[1] { ResolutionCandidate@23 }
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@26 }
 }
diff --git a/compiler/testData/diagnostics/tests/thisAndSuper/superInExtensionFunctionCall.lazy.log b/compiler/testData/diagnostics/tests/thisAndSuper/superInExtensionFunctionCall.lazy.log
index deb325dba95..a6a92f82c8a 100644
--- a/compiler/testData/diagnostics/tests/thisAndSuper/superInExtensionFunctionCall.lazy.log
+++ b/compiler/testData/diagnostics/tests/thisAndSuper/superInExtensionFunctionCall.lazy.log
@@ -31,14 +31,6 @@ LazyJavaPackageFragment@7['lang'] {
 
 ResolutionTaskHolder@22 {
     <name not found> = ArrayList@23[1] { ResolutionCandidate@24 }
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@24 }
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
     <name not found> = EmptyList@14[empty]
     <name not found> = EmptyList@14[empty]
     <name not found> = EmptyList@14[empty]
@@ -71,3 +63,14 @@ ResolutionTaskHolder@22 {
     <name not found> = EmptyList@14[empty]
     <name not found> = EmptyList@14[empty]
 }
+
+null {
+    <name not found> = ArrayList@25[1] { ResolutionCandidate@24 }
+    <name not found> = EmptyList@14[empty]
+    <name not found> = EmptyList@14[empty]
+    <name not found> = EmptyList@14[empty]
+    <name not found> = EmptyList@14[empty]
+    <name not found> = EmptyList@14[empty]
+    <name not found> = EmptyList@14[empty]
+    <name not found> = EmptyList@14[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/thisAndSuper/superInToplevelFunction.lazy.log b/compiler/testData/diagnostics/tests/thisAndSuper/superInToplevelFunction.lazy.log
index 309789614f5..9f18bbbab68 100644
--- a/compiler/testData/diagnostics/tests/thisAndSuper/superInToplevelFunction.lazy.log
+++ b/compiler/testData/diagnostics/tests/thisAndSuper/superInToplevelFunction.lazy.log
@@ -23,10 +23,13 @@ LazyJavaPackageFragment@5['java'] {
 
 ResolutionTaskHolder@21 {
     <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@23 }
 }
 
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
+ResolutionTaskHolder@24 {
+    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
+}
+
+null {
+    <name not found> = ArrayList@27[1] { ResolutionCandidate@23 }
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@26 }
 }
diff --git a/compiler/testData/diagnostics/tests/thisAndSuper/superIsNotAnExpression.lazy.log b/compiler/testData/diagnostics/tests/thisAndSuper/superIsNotAnExpression.lazy.log
index 624f74abb31..20d0e2a0ce1 100644
--- a/compiler/testData/diagnostics/tests/thisAndSuper/superIsNotAnExpression.lazy.log
+++ b/compiler/testData/diagnostics/tests/thisAndSuper/superIsNotAnExpression.lazy.log
@@ -34,14 +34,17 @@ LazyJavaPackageFragment@7['lang'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
+}
+
+null {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@27 }
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@30 }
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/thisAndSuper/thisInFunctionLiterals.lazy.log b/compiler/testData/diagnostics/tests/thisAndSuper/thisInFunctionLiterals.lazy.log
index caa78259d52..45cfda09392 100644
--- a/compiler/testData/diagnostics/tests/thisAndSuper/thisInFunctionLiterals.lazy.log
+++ b/compiler/testData/diagnostics/tests/thisAndSuper/thisInFunctionLiterals.lazy.log
@@ -41,15 +41,18 @@ LazyJavaPackageFragment@10['java'] {
 
 ResolutionTaskHolder@39 {
     <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[8] { ResolutionCandidate@45, ResolutionCandidate@46, ResolutionCandidate@47, ... }
-    <name not found> = ArrayList@48[8] { ResolutionCandidate@45, ResolutionCandidate@46, ResolutionCandidate@47, ... }
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[8] { ResolutionCandidate@44, ResolutionCandidate@45, ResolutionCandidate@46, ... }
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[8] { ResolutionCandidate@51, ResolutionCandidate@52, ResolutionCandidate@53, ... }
-    <name not found> = ArrayList@54[8] { ResolutionCandidate@51, ResolutionCandidate@52, ResolutionCandidate@53, ... }
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[8] { ResolutionCandidate@49, ResolutionCandidate@50, ResolutionCandidate@51, ... }
+}
+
+null {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@53[8] { ResolutionCandidate@44, ResolutionCandidate@45, ResolutionCandidate@46, ... }
+    <name not found> = ArrayList@54[8] { ResolutionCandidate@49, ResolutionCandidate@50, ResolutionCandidate@51, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/traitWithRequired/abstractClass.lazy.log b/compiler/testData/diagnostics/tests/traitWithRequired/abstractClass.lazy.log
index e498ca60117..436fef2f00c 100644
--- a/compiler/testData/diagnostics/tests/traitWithRequired/abstractClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/traitWithRequired/abstractClass.lazy.log
@@ -26,5 +26,8 @@ LazyJavaPackageFragment@8['java'] {
 
 ResolutionTaskHolder@26 {
     <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
+}
+
+null {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
 }
diff --git a/compiler/testData/diagnostics/tests/traitWithRequired/anonymousObjectExtendsTraitWithRequired.lazy.log b/compiler/testData/diagnostics/tests/traitWithRequired/anonymousObjectExtendsTraitWithRequired.lazy.log
index 39ff87252db..8192b1f54b8 100644
--- a/compiler/testData/diagnostics/tests/traitWithRequired/anonymousObjectExtendsTraitWithRequired.lazy.log
+++ b/compiler/testData/diagnostics/tests/traitWithRequired/anonymousObjectExtendsTraitWithRequired.lazy.log
@@ -37,5 +37,8 @@ LazyJavaPackageFragment@14['java'] {
 
 ResolutionTaskHolder@30 {
     <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
+}
+
+null {
     <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
 }
diff --git a/compiler/testData/diagnostics/tests/traitWithRequired/differentGenericArguments.lazy.log b/compiler/testData/diagnostics/tests/traitWithRequired/differentGenericArguments.lazy.log
index c486f9f87f4..92355f70b3c 100644
--- a/compiler/testData/diagnostics/tests/traitWithRequired/differentGenericArguments.lazy.log
+++ b/compiler/testData/diagnostics/tests/traitWithRequired/differentGenericArguments.lazy.log
@@ -38,5 +38,8 @@ LazyJavaPackageFragment@11['java'] {
 
 ResolutionTaskHolder@36 {
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+}
+
+null {
     <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
 }
diff --git a/compiler/testData/diagnostics/tests/traitWithRequired/kt3006.lazy.log b/compiler/testData/diagnostics/tests/traitWithRequired/kt3006.lazy.log
index 9be96ecb2b3..f3b621bce48 100644
--- a/compiler/testData/diagnostics/tests/traitWithRequired/kt3006.lazy.log
+++ b/compiler/testData/diagnostics/tests/traitWithRequired/kt3006.lazy.log
@@ -42,15 +42,6 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
@@ -61,7 +52,19 @@ ResolutionTaskHolder@31 {
     <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
+}
+
+null {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@33 }
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/traitWithRequired/manyTraitsRequireSameClass.lazy.log b/compiler/testData/diagnostics/tests/traitWithRequired/manyTraitsRequireSameClass.lazy.log
index f82ecd6f811..121b73cbd59 100644
--- a/compiler/testData/diagnostics/tests/traitWithRequired/manyTraitsRequireSameClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/traitWithRequired/manyTraitsRequireSameClass.lazy.log
@@ -35,10 +35,13 @@ LazyJavaPackageFragment@13['java'] {
 
 ResolutionTaskHolder@35 {
     <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
+}
+
+null {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@40 }
 }
diff --git a/compiler/testData/diagnostics/tests/traitWithRequired/requirementFulfilledBySubclass.lazy.log b/compiler/testData/diagnostics/tests/traitWithRequired/requirementFulfilledBySubclass.lazy.log
index bd75fee4455..a69673e1525 100644
--- a/compiler/testData/diagnostics/tests/traitWithRequired/requirementFulfilledBySubclass.lazy.log
+++ b/compiler/testData/diagnostics/tests/traitWithRequired/requirementFulfilledBySubclass.lazy.log
@@ -27,10 +27,13 @@ LazyJavaPackageFragment@9['java'] {
 
 ResolutionTaskHolder@27 {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
 }
 
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
+}
+
+null {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@32 }
 }
diff --git a/compiler/testData/diagnostics/tests/traitWithRequired/traitExtendsTraitWithRequired.lazy.log b/compiler/testData/diagnostics/tests/traitWithRequired/traitExtendsTraitWithRequired.lazy.log
index 2c1a71c1037..2eb976e6745 100644
--- a/compiler/testData/diagnostics/tests/traitWithRequired/traitExtendsTraitWithRequired.lazy.log
+++ b/compiler/testData/diagnostics/tests/traitWithRequired/traitExtendsTraitWithRequired.lazy.log
@@ -34,5 +34,8 @@ LazyJavaPackageFragment@10['java'] {
 
 ResolutionTaskHolder@32 {
     <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
+}
+
+null {
     <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
 }
diff --git a/compiler/testData/diagnostics/tests/traitWithRequired/traitRequiresAny.lazy.log b/compiler/testData/diagnostics/tests/traitWithRequired/traitRequiresAny.lazy.log
index 1311518149b..7267b8aa1f6 100644
--- a/compiler/testData/diagnostics/tests/traitWithRequired/traitRequiresAny.lazy.log
+++ b/compiler/testData/diagnostics/tests/traitWithRequired/traitRequiresAny.lazy.log
@@ -28,5 +28,8 @@ LazyJavaPackageFragment@8['java'] {
 
 ResolutionTaskHolder@26 {
     <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
+}
+
+null {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
 }
diff --git a/compiler/testData/diagnostics/tests/traitWithRequired/traitSupertypeList.lazy.log b/compiler/testData/diagnostics/tests/traitWithRequired/traitSupertypeList.lazy.log
index 3c6ecaac14a..9b88a76b14c 100644
--- a/compiler/testData/diagnostics/tests/traitWithRequired/traitSupertypeList.lazy.log
+++ b/compiler/testData/diagnostics/tests/traitWithRequired/traitSupertypeList.lazy.log
@@ -25,10 +25,13 @@ LazyJavaPackageFragment@9['java'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
+}
+
+null {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@27 }
 }
diff --git a/compiler/testData/diagnostics/tests/unit/nullableUnit.lazy.log b/compiler/testData/diagnostics/tests/unit/nullableUnit.lazy.log
index c38d5ca731d..46353246c60 100644
--- a/compiler/testData/diagnostics/tests/unit/nullableUnit.lazy.log
+++ b/compiler/testData/diagnostics/tests/unit/nullableUnit.lazy.log
@@ -39,9 +39,12 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@27 {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+}
+
+null {
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/varargs/AmbiguousVararg.lazy.log b/compiler/testData/diagnostics/tests/varargs/AmbiguousVararg.lazy.log
index 37185b7de86..843613d8ec9 100644
--- a/compiler/testData/diagnostics/tests/varargs/AmbiguousVararg.lazy.log
+++ b/compiler/testData/diagnostics/tests/varargs/AmbiguousVararg.lazy.log
@@ -43,9 +43,12 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[2] { ResolutionCandidate@33, ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[2] { ResolutionCandidate@33, ResolutionCandidate@34 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+}
+
+null {
+    <name not found> = ArrayList@35[2] { ResolutionCandidate@33, ResolutionCandidate@34 }
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/varargs/MoreSpecificVarargsOfEqualLength.lazy.log b/compiler/testData/diagnostics/tests/varargs/MoreSpecificVarargsOfEqualLength.lazy.log
index 67c6a11817f..259966cbbee 100644
--- a/compiler/testData/diagnostics/tests/varargs/MoreSpecificVarargsOfEqualLength.lazy.log
+++ b/compiler/testData/diagnostics/tests/varargs/MoreSpecificVarargsOfEqualLength.lazy.log
@@ -30,20 +30,23 @@ LazyJavaPackageFragment@7['java'] {
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
 }
 
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
 }
 
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[2] { ResolutionCandidate@38, ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[2] { ResolutionCandidate@38, ResolutionCandidate@39 }
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[2] { ResolutionCandidate@36, ResolutionCandidate@37 }
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[2] { ResolutionCandidate@43, ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[2] { ResolutionCandidate@43, ResolutionCandidate@44 }
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[2] { ResolutionCandidate@40, ResolutionCandidate@41 }
+}
+
+null {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@44[2] { ResolutionCandidate@36, ResolutionCandidate@37 }
+    <name not found> = ArrayList@45[2] { ResolutionCandidate@40, ResolutionCandidate@41 }
 }
diff --git a/compiler/testData/diagnostics/tests/varargs/MostSepcificVarargsWithJava.lazy.log b/compiler/testData/diagnostics/tests/varargs/MostSepcificVarargsWithJava.lazy.log
index 5a9b5da4764..b6df6c527a6 100644
--- a/compiler/testData/diagnostics/tests/varargs/MostSepcificVarargsWithJava.lazy.log
+++ b/compiler/testData/diagnostics/tests/varargs/MostSepcificVarargsWithJava.lazy.log
@@ -63,14 +63,14 @@ LazyJavaClassifierType@36['String'] {
 
 LazyJavaClassifierType@39['String'] {
     arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@38['String']
+    classifier = JavaClassImpl@29['String']
     nullable = 'true': Boolean@41
     typeConstructor = DeserializedClassTypeConstructor@23
 }
 
 LazyJavaClassifierType@42['String'] {
     arguments = ArrayList@43[empty]
-    classifier = JavaClassImpl@35['String']
+    classifier = JavaClassImpl@32['String']
     nullable = 'true': Boolean@41
     typeConstructor = DeserializedClassTypeConstructor@23
 }
@@ -84,14 +84,14 @@ LazyJavaClassifierType@44['String'] {
 
 LazyJavaClassifierType@46['String'] {
     arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@32['String']
+    classifier = JavaClassImpl@38['String']
     nullable = 'true': Boolean@41
     typeConstructor = DeserializedClassTypeConstructor@23
 }
 
 LazyJavaClassifierType@48['String'] {
     arguments = ArrayList@49[empty]
-    classifier = JavaClassImpl@29['String']
+    classifier = JavaClassImpl@35['String']
     nullable = 'true': Boolean@41
     typeConstructor = DeserializedClassTypeConstructor@23
 }
@@ -137,70 +137,73 @@ LazyJavaPackageFragment@59['java'] {
 
 ResolutionTaskHolder@82 {
     <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
 }
 
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
+}
+
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
 }
 
 ResolutionTaskHolder@94 {
     <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
 }
 
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
 }
 
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
+}
+
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
 }
 
 ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@107[5] { ResolutionCandidate@108, ResolutionCandidate@109, ResolutionCandidate@110, ... }
 }
 
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
+ResolutionTaskHolder@111 {
+    <name not found> = ArrayList@112[5] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
 }
 
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[5] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
-    <name not found> = ArrayList@119[5] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[5] { ResolutionCandidate@118, ResolutionCandidate@119, ResolutionCandidate@120, ... }
 }
 
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[5] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
-    <name not found> = ArrayList@125[5] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
+ResolutionTaskHolder@121 {
+    <name not found> = ArrayList@122[5] { ResolutionCandidate@123, ResolutionCandidate@124, ResolutionCandidate@125, ... }
 }
 
 ResolutionTaskHolder@126 {
     <name not found> = ArrayList@127[5] { ResolutionCandidate@128, ResolutionCandidate@129, ResolutionCandidate@130, ... }
-    <name not found> = ArrayList@131[5] { ResolutionCandidate@128, ResolutionCandidate@129, ResolutionCandidate@130, ... }
 }
 
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[5] { ResolutionCandidate@134, ResolutionCandidate@135, ResolutionCandidate@136, ... }
-    <name not found> = ArrayList@137[5] { ResolutionCandidate@134, ResolutionCandidate@135, ResolutionCandidate@136, ... }
+ResolutionTaskHolder@131 {
+    <name not found> = ArrayList@132[5] { ResolutionCandidate@133, ResolutionCandidate@134, ResolutionCandidate@135, ... }
 }
 
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[5] { ResolutionCandidate@140, ResolutionCandidate@141, ResolutionCandidate@142, ... }
-    <name not found> = ArrayList@143[5] { ResolutionCandidate@140, ResolutionCandidate@141, ResolutionCandidate@142, ... }
-}
-
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[5] { ResolutionCandidate@146, ResolutionCandidate@147, ResolutionCandidate@148, ... }
-    <name not found> = ArrayList@149[5] { ResolutionCandidate@146, ResolutionCandidate@147, ResolutionCandidate@148, ... }
+null {
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@144[5] { ResolutionCandidate@108, ResolutionCandidate@109, ResolutionCandidate@110, ... }
+    <name not found> = ArrayList@145[5] { ResolutionCandidate@133, ResolutionCandidate@134, ResolutionCandidate@135, ... }
+    <name not found> = ArrayList@146[5] { ResolutionCandidate@123, ResolutionCandidate@124, ResolutionCandidate@125, ... }
+    <name not found> = ArrayList@147[5] { ResolutionCandidate@128, ResolutionCandidate@129, ResolutionCandidate@130, ... }
+    <name not found> = ArrayList@148[5] { ResolutionCandidate@118, ResolutionCandidate@119, ResolutionCandidate@120, ... }
+    <name not found> = ArrayList@149[5] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/varargs/NilaryVsVararg.lazy.log b/compiler/testData/diagnostics/tests/varargs/NilaryVsVararg.lazy.log
index adec51bcf4d..685d0513022 100644
--- a/compiler/testData/diagnostics/tests/varargs/NilaryVsVararg.lazy.log
+++ b/compiler/testData/diagnostics/tests/varargs/NilaryVsVararg.lazy.log
@@ -42,39 +42,42 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@30 {
     <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[2] { ResolutionCandidate@40, ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[2] { ResolutionCandidate@40, ResolutionCandidate@41 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[2] { ResolutionCandidate@38, ResolutionCandidate@39 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[2] { ResolutionCandidate@45, ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[2] { ResolutionCandidate@45, ResolutionCandidate@46 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[2] { ResolutionCandidate@42, ResolutionCandidate@43 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[2] { ResolutionCandidate@50, ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[2] { ResolutionCandidate@50, ResolutionCandidate@51 }
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[2] { ResolutionCandidate@46, ResolutionCandidate@47 }
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+}
+
+null {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@50[2] { ResolutionCandidate@46, ResolutionCandidate@47 }
+    <name not found> = ArrayList@51[2] { ResolutionCandidate@38, ResolutionCandidate@39 }
+    <name not found> = ArrayList@52[2] { ResolutionCandidate@42, ResolutionCandidate@43 }
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
diff --git a/compiler/testData/diagnostics/tests/varargs/UnaryVsVararg.lazy.log b/compiler/testData/diagnostics/tests/varargs/UnaryVsVararg.lazy.log
index 02e057dd514..9740a393868 100644
--- a/compiler/testData/diagnostics/tests/varargs/UnaryVsVararg.lazy.log
+++ b/compiler/testData/diagnostics/tests/varargs/UnaryVsVararg.lazy.log
@@ -42,30 +42,33 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@30 {
     <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[2] { ResolutionCandidate@40, ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[2] { ResolutionCandidate@40, ResolutionCandidate@41 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[2] { ResolutionCandidate@38, ResolutionCandidate@39 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[2] { ResolutionCandidate@45, ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[2] { ResolutionCandidate@45, ResolutionCandidate@46 }
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[2] { ResolutionCandidate@42, ResolutionCandidate@43 }
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+}
+
+null {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@46[2] { ResolutionCandidate@42, ResolutionCandidate@43 }
+    <name not found> = ArrayList@47[2] { ResolutionCandidate@38, ResolutionCandidate@39 }
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
diff --git a/compiler/testData/diagnostics/tests/varargs/kt1781.lazy.log b/compiler/testData/diagnostics/tests/varargs/kt1781.lazy.log
index 6b20de8b446..7c1465a9aa8 100644
--- a/compiler/testData/diagnostics/tests/varargs/kt1781.lazy.log
+++ b/compiler/testData/diagnostics/tests/varargs/kt1781.lazy.log
@@ -56,16 +56,19 @@ LazyJavaPackageFragment@22['lang'] {
 
 ResolutionTaskHolder@38 {
     <name not found> = ArrayList@39[2] { ResolutionCandidate@40, ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[2] { ResolutionCandidate@40, ResolutionCandidate@41 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[2] { ResolutionCandidate@45, ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[2] { ResolutionCandidate@45, ResolutionCandidate@46 }
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[2] { ResolutionCandidate@44, ResolutionCandidate@45 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+}
+
+null {
+    <name not found> = ArrayList@46[2] { ResolutionCandidate@40, ResolutionCandidate@41 }
+    <name not found> = ArrayList@47[2] { ResolutionCandidate@44, ResolutionCandidate@45 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
diff --git a/compiler/testData/diagnostics/tests/varargs/kt1835.lazy.log b/compiler/testData/diagnostics/tests/varargs/kt1835.lazy.log
index ee71e786626..5d410a933cf 100644
--- a/compiler/testData/diagnostics/tests/varargs/kt1835.lazy.log
+++ b/compiler/testData/diagnostics/tests/varargs/kt1835.lazy.log
@@ -37,14 +37,14 @@ LazyJavaClassifierType@25['String'] {
 
 LazyJavaClassifierType@28['String'] {
     arguments = ArrayList@29[empty]
-    classifier = JavaClassImpl@27['String']
+    classifier = JavaClassImpl@22['String']
     nullable = 'true': Boolean@30
     typeConstructor = DeserializedClassTypeConstructor@24
 }
 
 LazyJavaClassifierType@31['String'] {
     arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@22['String']
+    classifier = JavaClassImpl@27['String']
     nullable = 'true': Boolean@30
     typeConstructor = DeserializedClassTypeConstructor@24
 }
@@ -90,42 +90,45 @@ LazyJavaPackageFragment@41['lang'] {
 
 ResolutionTaskHolder@63 {
     <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[2] { ResolutionCandidate@77, ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[2] { ResolutionCandidate@77, ResolutionCandidate@78 }
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[2] { ResolutionCandidate@74, ResolutionCandidate@75 }
+}
+
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[2] { ResolutionCandidate@78, ResolutionCandidate@79 }
 }
 
 ResolutionTaskHolder@80 {
     <name not found> = ArrayList@81[2] { ResolutionCandidate@82, ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[2] { ResolutionCandidate@82, ResolutionCandidate@83 }
 }
 
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[2] { ResolutionCandidate@87, ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[2] { ResolutionCandidate@87, ResolutionCandidate@88 }
+null {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@87[2] { ResolutionCandidate@74, ResolutionCandidate@75 }
+    <name not found> = ArrayList@88[2] { ResolutionCandidate@78, ResolutionCandidate@79 }
+    <name not found> = ArrayList@89[2] { ResolutionCandidate@82, ResolutionCandidate@83 }
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/varargs/kt1838-param.lazy.log b/compiler/testData/diagnostics/tests/varargs/kt1838-param.lazy.log
index b7388a66136..f4ead9acf7b 100644
--- a/compiler/testData/diagnostics/tests/varargs/kt1838-param.lazy.log
+++ b/compiler/testData/diagnostics/tests/varargs/kt1838-param.lazy.log
@@ -28,5 +28,8 @@ LazyJavaPackageFragment@7['java'] {
 
 ResolutionTaskHolder@26 {
     <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
+}
+
+null {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
 }
diff --git a/compiler/testData/diagnostics/tests/varargs/kt1838-val.lazy.log b/compiler/testData/diagnostics/tests/varargs/kt1838-val.lazy.log
index c5e482d63e8..5f969de0c8a 100644
--- a/compiler/testData/diagnostics/tests/varargs/kt1838-val.lazy.log
+++ b/compiler/testData/diagnostics/tests/varargs/kt1838-val.lazy.log
@@ -35,7 +35,10 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+}
+
+null {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
     <name not found> = EmptyList@25[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/varargs/kt422.lazy.log b/compiler/testData/diagnostics/tests/varargs/kt422.lazy.log
index d0a40f646c3..8e5799195d2 100644
--- a/compiler/testData/diagnostics/tests/varargs/kt422.lazy.log
+++ b/compiler/testData/diagnostics/tests/varargs/kt422.lazy.log
@@ -53,50 +53,53 @@ LazyJavaPackageFragment@14['lang'] {
 
 ResolutionTaskHolder@38 {
     <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+}
+
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
 }
 
 ResolutionTaskHolder@50 {
     <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[2] { ResolutionCandidate@60, ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[2] { ResolutionCandidate@60, ResolutionCandidate@61 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[2] { ResolutionCandidate@55, ResolutionCandidate@56 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[2] { ResolutionCandidate@65, ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[2] { ResolutionCandidate@65, ResolutionCandidate@66 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[2] { ResolutionCandidate@59, ResolutionCandidate@60 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[3] { ResolutionCandidate@70, ResolutionCandidate@71, ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[3] { ResolutionCandidate@70, ResolutionCandidate@71, ResolutionCandidate@72 }
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[3] { ResolutionCandidate@63, ResolutionCandidate@64, ResolutionCandidate@65 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+}
+
+null {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@71[2] { ResolutionCandidate@55, ResolutionCandidate@56 }
+    <name not found> = ArrayList@72[2] { ResolutionCandidate@59, ResolutionCandidate@60 }
+    <name not found> = ArrayList@73[3] { ResolutionCandidate@63, ResolutionCandidate@64, ResolutionCandidate@65 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
diff --git a/compiler/testData/diagnostics/tests/varargs/varargsAndFunctionLiterals.lazy.log b/compiler/testData/diagnostics/tests/varargs/varargsAndFunctionLiterals.lazy.log
index 7bcba7a6a23..9bc806018dd 100644
--- a/compiler/testData/diagnostics/tests/varargs/varargsAndFunctionLiterals.lazy.log
+++ b/compiler/testData/diagnostics/tests/varargs/varargsAndFunctionLiterals.lazy.log
@@ -38,34 +38,37 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@29 {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+}
+
+null {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@37 }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
diff --git a/compiler/testData/diagnostics/tests/when/AnnotatedWhenStatement.lazy.log b/compiler/testData/diagnostics/tests/when/AnnotatedWhenStatement.lazy.log
index b4ecd24c116..2a0b73a8c0b 100644
--- a/compiler/testData/diagnostics/tests/when/AnnotatedWhenStatement.lazy.log
+++ b/compiler/testData/diagnostics/tests/when/AnnotatedWhenStatement.lazy.log
@@ -31,10 +31,13 @@ LazyJavaPackageFragment@9['java'] {
 
 ResolutionTaskHolder@27 {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
 }
 
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
+}
+
+null {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@29 }
 }
diff --git a/compiler/testData/diagnostics/tests/when/ElseOnNullableEnum.lazy.log b/compiler/testData/diagnostics/tests/when/ElseOnNullableEnum.lazy.log
index b4f27e9df2d..840e8320750 100644
--- a/compiler/testData/diagnostics/tests/when/ElseOnNullableEnum.lazy.log
+++ b/compiler/testData/diagnostics/tests/when/ElseOnNullableEnum.lazy.log
@@ -85,94 +85,80 @@ LazyJavaPackageFragment@38['lang'] {
 
 ResolutionTaskHolder@61 {
     <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
     <name not found> = EmptyList@11[empty]
+}
+
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
     <name not found> = EmptyList@11[empty]
 }
 
 ResolutionTaskHolder@73 {
     <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@11[empty]
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
     <name not found> = EmptyList@11[empty]
 }
 
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
     <name not found> = EmptyList@11[empty]
+}
+
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
     <name not found> = EmptyList@11[empty]
 }
 
 ResolutionTaskHolder@85 {
     <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@11[empty]
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
     <name not found> = EmptyList@11[empty]
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
+}
+
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
 }
 
 ResolutionTaskHolder@97 {
     <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
+}
+
+ResolutionTaskHolder@100 {
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
 }
 
 ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
-}
-
-ResolutionTaskHolder@113 {
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
@@ -181,13 +167,42 @@ ResolutionTaskHolder@113 {
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
+}
+
+ResolutionTaskHolder@102 {
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+}
+
+ResolutionTaskHolder@103 {
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+}
+
+ResolutionTaskHolder@104 {
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
 }
 
-ResolutionTaskHolder@114 {
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
+ResolutionTaskHolder@105 {
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
@@ -198,9 +213,7 @@ ResolutionTaskHolder@114 {
     <name not found> = EmptyList@11[empty]
 }
 
-ResolutionTaskHolder@115 {
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
+ResolutionTaskHolder@106 {
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
@@ -211,9 +224,7 @@ ResolutionTaskHolder@115 {
     <name not found> = EmptyList@11[empty]
 }
 
-ResolutionTaskHolder@116 {
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
+ResolutionTaskHolder@107 {
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
@@ -224,9 +235,7 @@ ResolutionTaskHolder@116 {
     <name not found> = EmptyList@11[empty]
 }
 
-ResolutionTaskHolder@117 {
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
+ResolutionTaskHolder@108 {
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
@@ -237,46 +246,40 @@ ResolutionTaskHolder@117 {
     <name not found> = EmptyList@11[empty]
 }
 
-ResolutionTaskHolder@118 {
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-}
-
-ResolutionTaskHolder@121 {
+null {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@81 }
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
diff --git a/compiler/testData/diagnostics/tests/when/ElseOnNullableEnumWithSmartCast.lazy.log b/compiler/testData/diagnostics/tests/when/ElseOnNullableEnumWithSmartCast.lazy.log
index 3e131014c49..9977dca30fe 100644
--- a/compiler/testData/diagnostics/tests/when/ElseOnNullableEnumWithSmartCast.lazy.log
+++ b/compiler/testData/diagnostics/tests/when/ElseOnNullableEnumWithSmartCast.lazy.log
@@ -41,45 +41,33 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@32 {
     <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@24[empty]
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
     <name not found> = EmptyList@24[empty]
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@24[empty]
 }
 
 ResolutionTaskHolder@43 {
     <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@52 {
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -90,9 +78,7 @@ ResolutionTaskHolder@59 {
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@53 {
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -102,3 +88,20 @@ ResolutionTaskHolder@60 {
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
 }
+
+null {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@48 }
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+}
diff --git a/compiler/testData/diagnostics/tests/when/NoElseExpectedUnit.lazy.log b/compiler/testData/diagnostics/tests/when/NoElseExpectedUnit.lazy.log
index 779e59d7b1a..bb2617c8260 100644
--- a/compiler/testData/diagnostics/tests/when/NoElseExpectedUnit.lazy.log
+++ b/compiler/testData/diagnostics/tests/when/NoElseExpectedUnit.lazy.log
@@ -27,10 +27,13 @@ LazyJavaPackageFragment@6['java'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
+}
+
+null {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@27 }
 }
diff --git a/compiler/testData/diagnostics/tests/when/NoElseNoExpectedType.lazy.log b/compiler/testData/diagnostics/tests/when/NoElseNoExpectedType.lazy.log
index cdc81c7c937..1d3986d70ce 100644
--- a/compiler/testData/diagnostics/tests/when/NoElseNoExpectedType.lazy.log
+++ b/compiler/testData/diagnostics/tests/when/NoElseNoExpectedType.lazy.log
@@ -27,10 +27,13 @@ LazyJavaPackageFragment@6['java'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
+}
+
+null {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@27 }
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@30 }
 }
diff --git a/compiler/testData/diagnostics/tests/when/NoElseReturnedCoercionToUnit.lazy.log b/compiler/testData/diagnostics/tests/when/NoElseReturnedCoercionToUnit.lazy.log
index 3fc5f32450c..9b69688d59e 100644
--- a/compiler/testData/diagnostics/tests/when/NoElseReturnedCoercionToUnit.lazy.log
+++ b/compiler/testData/diagnostics/tests/when/NoElseReturnedCoercionToUnit.lazy.log
@@ -42,26 +42,29 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@30 {
     <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+}
+
+null {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@41 }
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/when/NoElseReturnedFromLambdaExpectedInt.lazy.log b/compiler/testData/diagnostics/tests/when/NoElseReturnedFromLambdaExpectedInt.lazy.log
index 5df317b4f61..6e4ad18fa72 100644
--- a/compiler/testData/diagnostics/tests/when/NoElseReturnedFromLambdaExpectedInt.lazy.log
+++ b/compiler/testData/diagnostics/tests/when/NoElseReturnedFromLambdaExpectedInt.lazy.log
@@ -38,26 +38,29 @@ LazyJavaPackageFragment@7['lang'] {
 
 ResolutionTaskHolder@26 {
     <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
 }
 
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@18[empty]
+ResolutionTaskHolder@29 {
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
     <name not found> = EmptyList@18[empty]
 }
 
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+}
+
+null {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@28 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@34 }
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
 }
diff --git a/compiler/testData/diagnostics/tests/when/NoElseReturnedNonUnit.lazy.log b/compiler/testData/diagnostics/tests/when/NoElseReturnedNonUnit.lazy.log
index 0b4ded2ca54..bb081375732 100644
--- a/compiler/testData/diagnostics/tests/when/NoElseReturnedNonUnit.lazy.log
+++ b/compiler/testData/diagnostics/tests/when/NoElseReturnedNonUnit.lazy.log
@@ -27,5 +27,8 @@ LazyJavaPackageFragment@6['java'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
+}
+
+null {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
 }
diff --git a/compiler/testData/diagnostics/tests/when/NoElseReturnedUnit.lazy.log b/compiler/testData/diagnostics/tests/when/NoElseReturnedUnit.lazy.log
index 91f94fb77a7..ef5bd35001f 100644
--- a/compiler/testData/diagnostics/tests/when/NoElseReturnedUnit.lazy.log
+++ b/compiler/testData/diagnostics/tests/when/NoElseReturnedUnit.lazy.log
@@ -23,5 +23,8 @@ LazyJavaPackageFragment@5['java'] {
 
 ResolutionTaskHolder@21 {
     <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
+}
+
+null {
     <name not found> = ArrayList@24[1] { ResolutionCandidate@23 }
 }
diff --git a/compiler/testData/diagnostics/tests/when/NoElseWhenStatement.lazy.log b/compiler/testData/diagnostics/tests/when/NoElseWhenStatement.lazy.log
index 91f94fb77a7..ef5bd35001f 100644
--- a/compiler/testData/diagnostics/tests/when/NoElseWhenStatement.lazy.log
+++ b/compiler/testData/diagnostics/tests/when/NoElseWhenStatement.lazy.log
@@ -23,5 +23,8 @@ LazyJavaPackageFragment@5['java'] {
 
 ResolutionTaskHolder@21 {
     <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
+}
+
+null {
     <name not found> = ArrayList@24[1] { ResolutionCandidate@23 }
 }
diff --git a/compiler/testData/diagnostics/tests/when/When.lazy.log b/compiler/testData/diagnostics/tests/when/When.lazy.log
index 9a9c0b4782a..9c12e55fa5a 100644
--- a/compiler/testData/diagnostics/tests/when/When.lazy.log
+++ b/compiler/testData/diagnostics/tests/when/When.lazy.log
@@ -58,78 +58,59 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@44 {
     <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
+}
+
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
 }
 
 ResolutionTaskHolder@56 {
     <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
+}
+
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
 }
 
 ResolutionTaskHolder@68 {
     <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
 }
 
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[7] { ResolutionCandidate@76, ResolutionCandidate@77, ResolutionCandidate@78, ... }
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[7] { ResolutionCandidate@81, ResolutionCandidate@82, ResolutionCandidate@83, ... }
 }
 
 ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[7] { ResolutionCandidate@86, ResolutionCandidate@87, ResolutionCandidate@88, ... }
-    <name not found> = ArrayList@89[7] { ResolutionCandidate@86, ResolutionCandidate@87, ResolutionCandidate@88, ... }
+    <name not found> = ArrayList@85[8] { ResolutionCandidate@86, ResolutionCandidate@87, ResolutionCandidate@88, ... }
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[7] { ResolutionCandidate@92, ResolutionCandidate@93, ResolutionCandidate@94, ... }
-    <name not found> = ArrayList@95[7] { ResolutionCandidate@92, ResolutionCandidate@93, ResolutionCandidate@94, ... }
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[8] { ResolutionCandidate@98, ResolutionCandidate@99, ResolutionCandidate@100, ... }
-    <name not found> = ArrayList@101[8] { ResolutionCandidate@98, ResolutionCandidate@99, ResolutionCandidate@100, ... }
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
+ResolutionTaskHolder@89 {
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
@@ -148,11 +129,7 @@ ResolutionTaskHolder@102 {
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@103 {
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
+ResolutionTaskHolder@90 {
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
@@ -171,11 +148,7 @@ ResolutionTaskHolder@103 {
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
+ResolutionTaskHolder@91 {
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
@@ -194,9 +167,7 @@ ResolutionTaskHolder@104 {
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@105 {
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
+ResolutionTaskHolder@92 {
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
@@ -207,9 +178,7 @@ ResolutionTaskHolder@105 {
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@106 {
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
+ResolutionTaskHolder@93 {
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
@@ -220,7 +189,41 @@ ResolutionTaskHolder@106 {
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@107 {
+ResolutionTaskHolder@94 {
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+}
+
+null {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@105[7] { ResolutionCandidate@81, ResolutionCandidate@82, ResolutionCandidate@83, ... }
+    <name not found> = ArrayList@106[7] { ResolutionCandidate@76, ResolutionCandidate@77, ResolutionCandidate@78, ... }
+    <name not found> = ArrayList@107[8] { ResolutionCandidate@86, ResolutionCandidate@87, ResolutionCandidate@88, ... }
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/ClassObjectAnnotatedWithItsClass.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/annotations/ClassObjectAnnotatedWithItsClass.lazy.log
index 066990ec0f9..fa4a43f4175 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/ClassObjectAnnotatedWithItsClass.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/ClassObjectAnnotatedWithItsClass.lazy.log
@@ -30,11 +30,11 @@ DeserializedTypeParameterDescriptor@17['T'] {
 }
 
 DeserializedType@21['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@18
+    constructor = AbstractLazyTypeParameterDescriptor$1@14
 }
 
 DeserializedType@22['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@14
+    constructor = AbstractLazyTypeParameterDescriptor$1@18
 }
 
 DeserializedType@23['T in kotlin'] {
@@ -295,27 +295,8 @@ LazyJavaTypeParameterResolver@164 {
 
 ResolutionTaskHolder@166 {
     <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@168 }
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@171 }
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@174 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
@@ -334,18 +315,11 @@ ResolutionTaskHolder@166 {
     <name not found> = EmptyList@38[empty]
 }
 
+ResolutionTaskHolder@173 {
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
+}
+
 ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@178 }
-}
-
-ResolutionTaskHolder@180 {
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
@@ -372,13 +346,7 @@ ResolutionTaskHolder@180 {
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@181 {
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
+ResolutionTaskHolder@177 {
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
@@ -405,13 +373,7 @@ ResolutionTaskHolder@181 {
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@182 {
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
+ResolutionTaskHolder@178 {
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
@@ -438,13 +400,7 @@ ResolutionTaskHolder@182 {
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@183 {
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
+ResolutionTaskHolder@179 {
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
@@ -471,12 +427,59 @@ ResolutionTaskHolder@183 {
     <name not found> = EmptyList@38[empty]
 }
 
+TypeDeserializer@180 {
+    classDescriptors('34': Integer@181) = LazyJavaClassDescriptor@42['Class']
+    classDescriptors('9': Integer@182) = DeserializedClassDescriptor@183['Any']
+}
+
 TypeDeserializer@184 {
-    classDescriptors('34': Integer@185) = LazyJavaClassDescriptor@42['Class']
-    classDescriptors('9': Integer@186) = DeserializedClassDescriptor@187['Any']
+    classDescriptors('34': Integer@181) = LazyJavaClassDescriptor@42['Class']
+    classDescriptors('9': Integer@182) = DeserializedClassDescriptor@183['Any']
 }
 
-TypeDeserializer@188 {
-    classDescriptors('34': Integer@185) = LazyJavaClassDescriptor@42['Class']
-    classDescriptors('9': Integer@186) = DeserializedClassDescriptor@187['Any']
+null {
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@168 }
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@170 }
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@172 }
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@175 }
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/illegalPlatformName.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/illegalPlatformName.lazy.log
index d99fa1d9488..e101bae0472 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/illegalPlatformName.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/illegalPlatformName.lazy.log
@@ -108,24 +108,27 @@ LazyJavaPackageFragment@3['platform'] {
 
 ResolutionTaskHolder@76 {
     <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
 }
 
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
 }
 
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
 }
 
-TypeDeserializer@92 {
-    classDescriptors('4': Integer@93) = DeserializedClassDescriptor@94['String']
+TypeDeserializer@88 {
+    classDescriptors('4': Integer@89) = DeserializedClassDescriptor@90['String']
+}
+
+null {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@84 }
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/platformName.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/platformName.lazy.log
index acd799a68b2..5d30b7446ac 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/platformName.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/platformName.lazy.log
@@ -221,99 +221,102 @@ LazyJavaPackageFragment@7['platform'] {
 
 ResolutionTaskHolder@152 {
     <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
 }
 
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
+ResolutionTaskHolder@155 {
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
 }
 
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@162 }
+ResolutionTaskHolder@158 {
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
+}
+
+ResolutionTaskHolder@161 {
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
 }
 
 ResolutionTaskHolder@164 {
     <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@166 }
 }
 
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@170 }
+ResolutionTaskHolder@167 {
+    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
 }
 
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@174 }
+ResolutionTaskHolder@170 {
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
+}
+
+ResolutionTaskHolder@173 {
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
 }
 
 ResolutionTaskHolder@176 {
     <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@178 }
 }
 
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@182 }
+ResolutionTaskHolder@179 {
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
 }
 
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@186 }
+ResolutionTaskHolder@182 {
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
+}
+
+ResolutionTaskHolder@185 {
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
 }
 
 ResolutionTaskHolder@188 {
     <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@190 }
 }
 
-ResolutionTaskHolder@192 {
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@194 }
+ResolutionTaskHolder@191 {
+    <name not found> = ArrayList@192[1] { ResolutionCandidate@193 }
 }
 
-ResolutionTaskHolder@196 {
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@198 }
+ResolutionTaskHolder@194 {
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@196 }
+}
+
+ResolutionTaskHolder@197 {
+    <name not found> = ArrayList@198[1] { ResolutionCandidate@199 }
 }
 
 ResolutionTaskHolder@200 {
     <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@202 }
 }
 
-ResolutionTaskHolder@204 {
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@206 }
+ResolutionTaskHolder@203 {
+    <name not found> = ArrayList@204[1] { ResolutionCandidate@205 }
 }
 
-ResolutionTaskHolder@208 {
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@210 }
+ResolutionTaskHolder@206 {
+    <name not found> = ArrayList@207[1] { ResolutionCandidate@208 }
 }
 
-ResolutionTaskHolder@212 {
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@214 }
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@214 }
+TypeDeserializer@209 {
+    classDescriptors('4': Integer@210) = DeserializedClassDescriptor@211['String']
 }
 
-ResolutionTaskHolder@216 {
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@218 }
-}
-
-ResolutionTaskHolder@220 {
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@222 }
-}
-
-ResolutionTaskHolder@224 {
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@226 }
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@226 }
-}
-
-TypeDeserializer@228 {
-    classDescriptors('4': Integer@229) = DeserializedClassDescriptor@230['String']
+null {
+    <name not found> = ArrayList@212[1] { ResolutionCandidate@181 }
+    <name not found> = ArrayList@213[1] { ResolutionCandidate@160 }
+    <name not found> = ArrayList@214[1] { ResolutionCandidate@169 }
+    <name not found> = ArrayList@215[1] { ResolutionCandidate@205 }
+    <name not found> = ArrayList@216[1] { ResolutionCandidate@172 }
+    <name not found> = ArrayList@217[1] { ResolutionCandidate@166 }
+    <name not found> = ArrayList@218[1] { ResolutionCandidate@208 }
+    <name not found> = ArrayList@219[1] { ResolutionCandidate@202 }
+    <name not found> = ArrayList@220[1] { ResolutionCandidate@196 }
+    <name not found> = ArrayList@221[1] { ResolutionCandidate@175 }
+    <name not found> = ArrayList@222[1] { ResolutionCandidate@163 }
+    <name not found> = ArrayList@223[1] { ResolutionCandidate@187 }
+    <name not found> = ArrayList@224[1] { ResolutionCandidate@193 }
+    <name not found> = ArrayList@225[1] { ResolutionCandidate@184 }
+    <name not found> = ArrayList@226[1] { ResolutionCandidate@190 }
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@178 }
+    <name not found> = ArrayList@228[1] { ResolutionCandidate@154 }
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@157 }
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@199 }
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/array.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/array.lazy.log
index b30de9455ad..43bfdd7a9f3 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/array.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/array.lazy.log
@@ -40,11 +40,11 @@ DeserializedTypeParameterDescriptor@25['T'] {
 }
 
 DeserializedType@29['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@26
+    constructor = AbstractLazyTypeParameterDescriptor$1@22
 }
 
 DeserializedType@30['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@22
+    constructor = AbstractLazyTypeParameterDescriptor$1@26
 }
 
 DeserializedType@31['T in kotlin'] {
@@ -60,12 +60,12 @@ DeserializedType@33['java.lang.Class'] {
     memberScope = SubstitutingScope@35
 }
 
-DeserializedType@24['kotlin.Any'] {
+DeserializedType@28['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@36
     memberScope = DeserializedClassMemberScope@37
 }
 
-DeserializedType@28['kotlin.Any'] {
+DeserializedType@24['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@36
     memberScope = DeserializedClassMemberScope@37
 }
@@ -476,10 +476,6 @@ LazyJavaTypeParameterResolver@241 {
 
 ResolutionTaskHolder@243 {
     <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@245 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
@@ -497,289 +493,296 @@ ResolutionTaskHolder@243 {
     <name not found> = EmptyList@204[empty]
 }
 
-ResolutionTaskHolder@247 {
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@249 }
-    <name not found> = EmptyList@204[empty]
+ResolutionTaskHolder@246 {
+    <name not found> = ArrayList@247[1] { ResolutionCandidate@248 }
     <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
 }
 
-ResolutionTaskHolder@251 {
-    <name not found> = ArrayList@252[1] { ResolutionCandidate@253 }
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@253 }
+ResolutionTaskHolder@249 {
+    <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
     <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
+}
+
+ResolutionTaskHolder@252 {
+    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
+    <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
 }
 
 ResolutionTaskHolder@255 {
     <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
-    <name not found> = ArrayList@258[1] { ResolutionCandidate@257 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
 }
 
-ResolutionTaskHolder@259 {
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@261 }
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@261 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
+ResolutionTaskHolder@258 {
+    <name not found> = ArrayList@259[1] { ResolutionCandidate@260 }
     <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
 }
 
-ResolutionTaskHolder@263 {
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@265 }
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@265 }
+ResolutionTaskHolder@261 {
+    <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
     <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
+}
+
+ResolutionTaskHolder@264 {
+    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
     <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
 }
 
 ResolutionTaskHolder@267 {
     <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
-    <name not found> = ArrayList@270[1] { ResolutionCandidate@269 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
 }
 
-ResolutionTaskHolder@271 {
-    <name not found> = ArrayList@272[1] { ResolutionCandidate@273 }
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@273 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
+ResolutionTaskHolder@270 {
+    <name not found> = ArrayList@271[1] { ResolutionCandidate@272 }
     <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
 }
 
-ResolutionTaskHolder@275 {
-    <name not found> = ArrayList@276[1] { ResolutionCandidate@277 }
-    <name not found> = ArrayList@278[1] { ResolutionCandidate@277 }
+ResolutionTaskHolder@273 {
+    <name not found> = ArrayList@274[1] { ResolutionCandidate@275 }
     <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
+}
+
+ResolutionTaskHolder@276 {
+    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
     <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
 }
 
 ResolutionTaskHolder@279 {
     <name not found> = ArrayList@280[1] { ResolutionCandidate@281 }
-    <name not found> = ArrayList@282[1] { ResolutionCandidate@281 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
 }
 
-ResolutionTaskHolder@283 {
-    <name not found> = ArrayList@284[1] { ResolutionCandidate@285 }
-    <name not found> = ArrayList@286[1] { ResolutionCandidate@285 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
+ResolutionTaskHolder@282 {
+    <name not found> = ArrayList@283[1] { ResolutionCandidate@284 }
     <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
 }
 
-ResolutionTaskHolder@287 {
-    <name not found> = ArrayList@288[1] { ResolutionCandidate@289 }
-    <name not found> = ArrayList@290[1] { ResolutionCandidate@289 }
+ResolutionTaskHolder@285 {
+    <name not found> = ArrayList@286[1] { ResolutionCandidate@287 }
     <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
+}
+
+ResolutionTaskHolder@288 {
+    <name not found> = ArrayList@289[1] { ResolutionCandidate@290 }
     <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
 }
 
 ResolutionTaskHolder@291 {
     <name not found> = ArrayList@292[1] { ResolutionCandidate@293 }
-    <name not found> = ArrayList@294[1] { ResolutionCandidate@293 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
 }
 
-ResolutionTaskHolder@295 {
-    <name not found> = ArrayList@296[1] { ResolutionCandidate@297 }
-    <name not found> = ArrayList@298[1] { ResolutionCandidate@297 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
+ResolutionTaskHolder@294 {
+    <name not found> = ArrayList@295[1] { ResolutionCandidate@296 }
     <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
 }
 
-ResolutionTaskHolder@299 {
-    <name not found> = ArrayList@300[1] { ResolutionCandidate@301 }
-    <name not found> = ArrayList@302[1] { ResolutionCandidate@301 }
-    <name not found> = EmptyList@204[empty]
+ResolutionTaskHolder@297 {
+    <name not found> = ArrayList@298[1] { ResolutionCandidate@299 }
     <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
+}
+
+ResolutionTaskHolder@300 {
+    <name not found> = ArrayList@301[1] { ResolutionCandidate@302 }
     <name not found> = EmptyList@204[empty]
 }
 
 ResolutionTaskHolder@303 {
     <name not found> = ArrayList@304[1] { ResolutionCandidate@305 }
-    <name not found> = ArrayList@306[1] { ResolutionCandidate@305 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
 }
 
-ResolutionTaskHolder@307 {
-    <name not found> = ArrayList@308[1] { ResolutionCandidate@309 }
-    <name not found> = ArrayList@310[1] { ResolutionCandidate@309 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
+ResolutionTaskHolder@306 {
+    <name not found> = ArrayList@307[1] { ResolutionCandidate@308 }
     <name not found> = EmptyList@204[empty]
 }
 
-ResolutionTaskHolder@311 {
-    <name not found> = ArrayList@312[1] { ResolutionCandidate@313 }
-    <name not found> = ArrayList@314[1] { ResolutionCandidate@313 }
-    <name not found> = EmptyList@204[empty]
+ResolutionTaskHolder@309 {
+    <name not found> = ArrayList@310[1] { ResolutionCandidate@311 }
     <name not found> = EmptyList@204[empty]
+}
+
+ResolutionTaskHolder@312 {
+    <name not found> = ArrayList@313[1] { ResolutionCandidate@314 }
     <name not found> = EmptyList@204[empty]
 }
 
 ResolutionTaskHolder@315 {
     <name not found> = ArrayList@316[1] { ResolutionCandidate@317 }
-    <name not found> = ArrayList@318[1] { ResolutionCandidate@317 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
 }
 
-ResolutionTaskHolder@319 {
-    <name not found> = ArrayList@320[1] { ResolutionCandidate@321 }
-    <name not found> = ArrayList@322[1] { ResolutionCandidate@321 }
-    <name not found> = EmptyList@204[empty]
+ResolutionTaskHolder@318 {
+    <name not found> = ArrayList@319[1] { ResolutionCandidate@320 }
     <name not found> = EmptyList@204[empty]
 }
 
-ResolutionTaskHolder@323 {
-    <name not found> = ArrayList@324[1] { ResolutionCandidate@325 }
-    <name not found> = ArrayList@326[1] { ResolutionCandidate@325 }
+ResolutionTaskHolder@321 {
+    <name not found> = ArrayList@322[1] { ResolutionCandidate@323 }
     <name not found> = EmptyList@204[empty]
+}
+
+ResolutionTaskHolder@324 {
+    <name not found> = ArrayList@325[1] { ResolutionCandidate@326 }
     <name not found> = EmptyList@204[empty]
 }
 
 ResolutionTaskHolder@327 {
     <name not found> = ArrayList@328[1] { ResolutionCandidate@329 }
-    <name not found> = ArrayList@330[1] { ResolutionCandidate@329 }
-    <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
 }
 
-ResolutionTaskHolder@331 {
-    <name not found> = ArrayList@332[1] { ResolutionCandidate@333 }
-    <name not found> = ArrayList@334[1] { ResolutionCandidate@333 }
-    <name not found> = EmptyList@204[empty]
+ResolutionTaskHolder@330 {
+    <name not found> = ArrayList@331[1] { ResolutionCandidate@332 }
     <name not found> = EmptyList@204[empty]
 }
 
-ResolutionTaskHolder@335 {
-    <name not found> = ArrayList@336[1] { ResolutionCandidate@337 }
-    <name not found> = ArrayList@338[1] { ResolutionCandidate@337 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
+ResolutionTaskHolder@333 {
+    <name not found> = ArrayList@334[1] { ResolutionCandidate@335 }
+}
+
+ResolutionTaskHolder@336 {
+    <name not found> = ArrayList@337[1] { ResolutionCandidate@338 }
 }
 
 ResolutionTaskHolder@339 {
     <name not found> = ArrayList@340[1] { ResolutionCandidate@341 }
-    <name not found> = ArrayList@342[1] { ResolutionCandidate@341 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
 }
 
-ResolutionTaskHolder@343 {
-    <name not found> = ArrayList@344[1] { ResolutionCandidate@345 }
-    <name not found> = ArrayList@346[1] { ResolutionCandidate@345 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
+ResolutionTaskHolder@342 {
+    <name not found> = ArrayList@343[1] { ResolutionCandidate@344 }
 }
 
-ResolutionTaskHolder@347 {
-    <name not found> = ArrayList@348[1] { ResolutionCandidate@349 }
-    <name not found> = ArrayList@350[1] { ResolutionCandidate@349 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
+ResolutionTaskHolder@345 {
+    <name not found> = ArrayList@346[1] { ResolutionCandidate@347 }
+}
+
+ResolutionTaskHolder@348 {
+    <name not found> = ArrayList@349[1] { ResolutionCandidate@350 }
 }
 
 ResolutionTaskHolder@351 {
     <name not found> = ArrayList@352[1] { ResolutionCandidate@353 }
-    <name not found> = ArrayList@354[1] { ResolutionCandidate@353 }
+}
+
+TypeDeserializer@354 {
+    classDescriptors('27': Integer@355) = DeserializedClassDescriptor@356['Int']
+    classDescriptors('28': Integer@357) = DeserializedClassDescriptor@358['IntArray']
+}
+
+TypeDeserializer@359 {
+    classDescriptors('34': Integer@360) = LazyJavaClassDescriptor@88['Class']
+    classDescriptors('9': Integer@361) = DeserializedClassDescriptor@362['Any']
+}
+
+TypeDeserializer@363 {
+    classDescriptors('8': Integer@364) = DeserializedClassDescriptor@365['Array']
+    classDescriptors('9': Integer@361) = DeserializedClassDescriptor@362['Any']
+}
+
+null {
+    <name not found> = ArrayList@366[1] { ResolutionCandidate@290 }
+    <name not found> = ArrayList@367[1] { ResolutionCandidate@293 }
+    <name not found> = ArrayList@368[1] { ResolutionCandidate@278 }
+    <name not found> = ArrayList@369[1] { ResolutionCandidate@287 }
+    <name not found> = ArrayList@370[1] { ResolutionCandidate@323 }
+    <name not found> = ArrayList@371[1] { ResolutionCandidate@266 }
+    <name not found> = ArrayList@372[1] { ResolutionCandidate@335 }
+    <name not found> = ArrayList@373[1] { ResolutionCandidate@320 }
+    <name not found> = ArrayList@374[1] { ResolutionCandidate@284 }
+    <name not found> = ArrayList@375[1] { ResolutionCandidate@350 }
+    <name not found> = ArrayList@376[1] { ResolutionCandidate@332 }
+    <name not found> = ArrayList@377[1] { ResolutionCandidate@263 }
+    <name not found> = ArrayList@378[1] { ResolutionCandidate@347 }
+    <name not found> = ArrayList@379[1] { ResolutionCandidate@305 }
+    <name not found> = ArrayList@380[1] { ResolutionCandidate@329 }
+    <name not found> = ArrayList@381[1] { ResolutionCandidate@314 }
+    <name not found> = ArrayList@382[1] { ResolutionCandidate@269 }
+    <name not found> = ArrayList@383[1] { ResolutionCandidate@338 }
+    <name not found> = ArrayList@384[1] { ResolutionCandidate@308 }
+    <name not found> = ArrayList@385[1] { ResolutionCandidate@311 }
+    <name not found> = ArrayList@386[1] { ResolutionCandidate@302 }
+    <name not found> = ArrayList@387[1] { ResolutionCandidate@260 }
+    <name not found> = ArrayList@388[1] { ResolutionCandidate@245 }
+    <name not found> = ArrayList@389[1] { ResolutionCandidate@341 }
+    <name not found> = ArrayList@390[1] { ResolutionCandidate@281 }
+    <name not found> = ArrayList@391[1] { ResolutionCandidate@257 }
+    <name not found> = ArrayList@392[1] { ResolutionCandidate@251 }
+    <name not found> = ArrayList@393[1] { ResolutionCandidate@317 }
+    <name not found> = ArrayList@394[1] { ResolutionCandidate@272 }
+    <name not found> = ArrayList@395[1] { ResolutionCandidate@248 }
+    <name not found> = ArrayList@396[1] { ResolutionCandidate@296 }
+    <name not found> = ArrayList@397[1] { ResolutionCandidate@275 }
+    <name not found> = ArrayList@398[1] { ResolutionCandidate@299 }
+    <name not found> = ArrayList@399[1] { ResolutionCandidate@344 }
+    <name not found> = ArrayList@400[1] { ResolutionCandidate@326 }
+    <name not found> = ArrayList@401[1] { ResolutionCandidate@254 }
+    <name not found> = ArrayList@402[1] { ResolutionCandidate@353 }
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
 }
-
-ResolutionTaskHolder@355 {
-    <name not found> = ArrayList@356[1] { ResolutionCandidate@357 }
-    <name not found> = ArrayList@358[1] { ResolutionCandidate@357 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@359 {
-    <name not found> = ArrayList@360[1] { ResolutionCandidate@361 }
-    <name not found> = ArrayList@362[1] { ResolutionCandidate@361 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@363 {
-    <name not found> = ArrayList@364[1] { ResolutionCandidate@365 }
-    <name not found> = ArrayList@366[1] { ResolutionCandidate@365 }
-}
-
-ResolutionTaskHolder@367 {
-    <name not found> = ArrayList@368[1] { ResolutionCandidate@369 }
-    <name not found> = ArrayList@370[1] { ResolutionCandidate@369 }
-}
-
-ResolutionTaskHolder@371 {
-    <name not found> = ArrayList@372[1] { ResolutionCandidate@373 }
-    <name not found> = ArrayList@374[1] { ResolutionCandidate@373 }
-}
-
-ResolutionTaskHolder@375 {
-    <name not found> = ArrayList@376[1] { ResolutionCandidate@377 }
-    <name not found> = ArrayList@378[1] { ResolutionCandidate@377 }
-}
-
-ResolutionTaskHolder@379 {
-    <name not found> = ArrayList@380[1] { ResolutionCandidate@381 }
-    <name not found> = ArrayList@382[1] { ResolutionCandidate@381 }
-}
-
-ResolutionTaskHolder@383 {
-    <name not found> = ArrayList@384[1] { ResolutionCandidate@385 }
-    <name not found> = ArrayList@386[1] { ResolutionCandidate@385 }
-}
-
-ResolutionTaskHolder@387 {
-    <name not found> = ArrayList@388[1] { ResolutionCandidate@389 }
-    <name not found> = ArrayList@390[1] { ResolutionCandidate@389 }
-}
-
-TypeDeserializer@391 {
-    classDescriptors('27': Integer@392) = DeserializedClassDescriptor@393['Int']
-    classDescriptors('28': Integer@394) = DeserializedClassDescriptor@395['IntArray']
-}
-
-TypeDeserializer@396 {
-    classDescriptors('34': Integer@397) = LazyJavaClassDescriptor@88['Class']
-    classDescriptors('9': Integer@398) = DeserializedClassDescriptor@399['Any']
-}
-
-TypeDeserializer@400 {
-    classDescriptors('8': Integer@401) = DeserializedClassDescriptor@402['Array']
-    classDescriptors('9': Integer@398) = DeserializedClassDescriptor@399['Any']
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/classLiteral.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/classLiteral.lazy.log
index 5e348a97192..cd6caec61ce 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/classLiteral.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/classLiteral.lazy.log
@@ -172,40 +172,43 @@ LazyJavaTypeParameterResolver@104 {
 
 ResolutionTaskHolder@106 {
     <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
 }
 
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
-    <name not found> = EmptyList@71[empty]
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
     <name not found> = EmptyList@71[empty]
 }
 
+ResolutionTaskHolder@115 {
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
+}
+
 ResolutionTaskHolder@118 {
     <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
 }
 
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
+TypeDeserializer@121 {
+    classDescriptors('34': Integer@122) = LazyJavaClassDescriptor@31['Class']
+    classDescriptors('9': Integer@123) = DeserializedClassDescriptor@124['Any']
 }
 
-TypeDeserializer@126 {
-    classDescriptors('34': Integer@127) = LazyJavaClassDescriptor@31['Class']
-    classDescriptors('9': Integer@128) = DeserializedClassDescriptor@129['Any']
+null {
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@120 }
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/simple.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/simple.lazy.log
index 73b3ebc379c..ad36f1ab633 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/simple.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/simple.lazy.log
@@ -308,116 +308,119 @@ LazyJavaPackageFragment@79['lang'] {
 
 ResolutionTaskHolder@159 {
     <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@161 }
-    <name not found> = EmptyList@129[empty]
-    <name not found> = EmptyList@129[empty]
     <name not found> = EmptyList@129[empty]
     <name not found> = EmptyList@129[empty]
 }
 
-ResolutionTaskHolder@163 {
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@165 }
-    <name not found> = EmptyList@129[empty]
-    <name not found> = EmptyList@129[empty]
+ResolutionTaskHolder@162 {
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
     <name not found> = EmptyList@129[empty]
     <name not found> = EmptyList@129[empty]
 }
 
-ResolutionTaskHolder@167 {
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@169 }
+ResolutionTaskHolder@165 {
+    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
     <name not found> = EmptyList@129[empty]
     <name not found> = EmptyList@129[empty]
+}
+
+ResolutionTaskHolder@168 {
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
     <name not found> = EmptyList@129[empty]
     <name not found> = EmptyList@129[empty]
 }
 
 ResolutionTaskHolder@171 {
     <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@173 }
-    <name not found> = EmptyList@129[empty]
-    <name not found> = EmptyList@129[empty]
-    <name not found> = EmptyList@129[empty]
     <name not found> = EmptyList@129[empty]
 }
 
-ResolutionTaskHolder@175 {
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@177 }
-    <name not found> = EmptyList@129[empty]
+ResolutionTaskHolder@174 {
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
     <name not found> = EmptyList@129[empty]
 }
 
-ResolutionTaskHolder@179 {
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@181 }
+ResolutionTaskHolder@177 {
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
     <name not found> = EmptyList@129[empty]
+}
+
+ResolutionTaskHolder@180 {
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
     <name not found> = EmptyList@129[empty]
 }
 
 ResolutionTaskHolder@183 {
     <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@185 }
-    <name not found> = EmptyList@129[empty]
     <name not found> = EmptyList@129[empty]
 }
 
-ResolutionTaskHolder@187 {
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@189 }
-    <name not found> = EmptyList@129[empty]
-    <name not found> = EmptyList@129[empty]
+ResolutionTaskHolder@186 {
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
 }
 
-ResolutionTaskHolder@191 {
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@193 }
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@193 }
-    <name not found> = EmptyList@129[empty]
-    <name not found> = EmptyList@129[empty]
+ResolutionTaskHolder@189 {
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
+}
+
+ResolutionTaskHolder@192 {
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
 }
 
 ResolutionTaskHolder@195 {
     <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@197 }
 }
 
-ResolutionTaskHolder@199 {
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@201 }
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@201 }
+ResolutionTaskHolder@198 {
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
 }
 
-ResolutionTaskHolder@203 {
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@205 }
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@205 }
+ResolutionTaskHolder@201 {
+    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
 }
 
-ResolutionTaskHolder@207 {
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@209 }
+ResolutionTaskHolder@204 {
+    <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
 }
 
-ResolutionTaskHolder@211 {
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@213 }
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@213 }
+TypeDeserializer@207 {
+    classDescriptors('27': Integer@208) = DeserializedClassDescriptor@209['Int']
+    classDescriptors('28': Integer@210) = DeserializedClassDescriptor@211['IntArray']
 }
 
-ResolutionTaskHolder@215 {
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@217 }
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@217 }
+TypeDeserializer@212 {
+    classDescriptors('8': Integer@213) = DeserializedClassDescriptor@214['Array']
+    classDescriptors('9': Integer@215) = DeserializedClassDescriptor@216['Any']
 }
 
-ResolutionTaskHolder@219 {
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@221 }
-}
-
-TypeDeserializer@223 {
-    classDescriptors('27': Integer@224) = DeserializedClassDescriptor@225['Int']
-    classDescriptors('28': Integer@226) = DeserializedClassDescriptor@227['IntArray']
-}
-
-TypeDeserializer@228 {
-    classDescriptors('8': Integer@229) = DeserializedClassDescriptor@230['Array']
-    classDescriptors('9': Integer@231) = DeserializedClassDescriptor@232['Any']
+null {
+    <name not found> = ArrayList@217[1] { ResolutionCandidate@185 }
+    <name not found> = ArrayList@218[1] { ResolutionCandidate@191 }
+    <name not found> = ArrayList@219[1] { ResolutionCandidate@161 }
+    <name not found> = ArrayList@220[1] { ResolutionCandidate@167 }
+    <name not found> = ArrayList@221[1] { ResolutionCandidate@164 }
+    <name not found> = ArrayList@222[1] { ResolutionCandidate@170 }
+    <name not found> = ArrayList@223[1] { ResolutionCandidate@200 }
+    <name not found> = ArrayList@224[1] { ResolutionCandidate@203 }
+    <name not found> = ArrayList@225[1] { ResolutionCandidate@182 }
+    <name not found> = ArrayList@226[1] { ResolutionCandidate@194 }
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@176 }
+    <name not found> = ArrayList@228[1] { ResolutionCandidate@188 }
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@179 }
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@206 }
+    <name not found> = ArrayList@231[1] { ResolutionCandidate@173 }
+    <name not found> = ArrayList@232[1] { ResolutionCandidate@197 }
+    <name not found> = EmptyList@129[empty]
+    <name not found> = EmptyList@129[empty]
+    <name not found> = EmptyList@129[empty]
+    <name not found> = EmptyList@129[empty]
+    <name not found> = EmptyList@129[empty]
+    <name not found> = EmptyList@129[empty]
+    <name not found> = EmptyList@129[empty]
+    <name not found> = EmptyList@129[empty]
+    <name not found> = EmptyList@129[empty]
+    <name not found> = EmptyList@129[empty]
+    <name not found> = EmptyList@129[empty]
+    <name not found> = EmptyList@129[empty]
+    <name not found> = EmptyList@129[empty]
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/vararg.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/vararg.lazy.log
index f44eb246668..546423f15c8 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/vararg.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/vararg.lazy.log
@@ -40,7 +40,7 @@ DeserializedTypeParameterDescriptor@25['T'] {
 }
 
 DeserializedType@29['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@26
+    constructor = AbstractLazyTypeParameterDescriptor$1@22
 }
 
 DeserializedType@30['T in kotlin'] {
@@ -52,7 +52,7 @@ DeserializedType@31['T in kotlin'] {
 }
 
 DeserializedType@32['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@22
+    constructor = AbstractLazyTypeParameterDescriptor$1@26
 }
 
 DeserializedType@33['java.lang.Class'] {
@@ -60,12 +60,12 @@ DeserializedType@33['java.lang.Class'] {
     memberScope = SubstitutingScope@35
 }
 
-DeserializedType@24['kotlin.Any'] {
+DeserializedType@28['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@36
     memberScope = DeserializedClassMemberScope@37
 }
 
-DeserializedType@28['kotlin.Any'] {
+DeserializedType@24['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@36
     memberScope = DeserializedClassMemberScope@37
 }
@@ -478,296 +478,299 @@ LazyJavaTypeParameterResolver@243 {
 
 ResolutionTaskHolder@245 {
     <name not found> = ArrayList@246[1] { ResolutionCandidate@247 }
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@247 }
-    <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
 }
 
-ResolutionTaskHolder@249 {
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
-    <name not found> = ArrayList@252[1] { ResolutionCandidate@251 }
-    <name not found> = EmptyList@204[empty]
+ResolutionTaskHolder@248 {
+    <name not found> = ArrayList@249[1] { ResolutionCandidate@250 }
     <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
 }
 
-ResolutionTaskHolder@253 {
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@255 }
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@255 }
+ResolutionTaskHolder@251 {
+    <name not found> = ArrayList@252[1] { ResolutionCandidate@253 }
     <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
+}
+
+ResolutionTaskHolder@254 {
+    <name not found> = ArrayList@255[1] { ResolutionCandidate@256 }
     <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
 }
 
 ResolutionTaskHolder@257 {
     <name not found> = ArrayList@258[1] { ResolutionCandidate@259 }
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@259 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
 }
 
-ResolutionTaskHolder@261 {
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@263 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
+ResolutionTaskHolder@260 {
+    <name not found> = ArrayList@261[1] { ResolutionCandidate@262 }
     <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
 }
 
-ResolutionTaskHolder@265 {
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@267 }
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@267 }
+ResolutionTaskHolder@263 {
+    <name not found> = ArrayList@264[1] { ResolutionCandidate@265 }
     <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
+}
+
+ResolutionTaskHolder@266 {
+    <name not found> = ArrayList@267[1] { ResolutionCandidate@268 }
     <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
 }
 
 ResolutionTaskHolder@269 {
     <name not found> = ArrayList@270[1] { ResolutionCandidate@271 }
-    <name not found> = ArrayList@272[1] { ResolutionCandidate@271 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
 }
 
-ResolutionTaskHolder@273 {
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@275 }
-    <name not found> = ArrayList@276[1] { ResolutionCandidate@275 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
+ResolutionTaskHolder@272 {
+    <name not found> = ArrayList@273[1] { ResolutionCandidate@274 }
     <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
 }
 
-ResolutionTaskHolder@277 {
-    <name not found> = ArrayList@278[1] { ResolutionCandidate@279 }
-    <name not found> = ArrayList@280[1] { ResolutionCandidate@279 }
+ResolutionTaskHolder@275 {
+    <name not found> = ArrayList@276[1] { ResolutionCandidate@277 }
     <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
+}
+
+ResolutionTaskHolder@278 {
+    <name not found> = ArrayList@279[1] { ResolutionCandidate@280 }
     <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
 }
 
 ResolutionTaskHolder@281 {
     <name not found> = ArrayList@282[1] { ResolutionCandidate@283 }
-    <name not found> = ArrayList@284[1] { ResolutionCandidate@283 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
 }
 
-ResolutionTaskHolder@285 {
-    <name not found> = ArrayList@286[1] { ResolutionCandidate@287 }
-    <name not found> = ArrayList@288[1] { ResolutionCandidate@287 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
+ResolutionTaskHolder@284 {
+    <name not found> = ArrayList@285[1] { ResolutionCandidate@286 }
     <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
 }
 
-ResolutionTaskHolder@289 {
-    <name not found> = ArrayList@290[1] { ResolutionCandidate@291 }
-    <name not found> = ArrayList@292[1] { ResolutionCandidate@291 }
-    <name not found> = EmptyList@204[empty]
+ResolutionTaskHolder@287 {
+    <name not found> = ArrayList@288[1] { ResolutionCandidate@289 }
     <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
+}
+
+ResolutionTaskHolder@290 {
+    <name not found> = ArrayList@291[1] { ResolutionCandidate@292 }
     <name not found> = EmptyList@204[empty]
 }
 
 ResolutionTaskHolder@293 {
     <name not found> = ArrayList@294[1] { ResolutionCandidate@295 }
-    <name not found> = ArrayList@296[1] { ResolutionCandidate@295 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
 }
 
-ResolutionTaskHolder@297 {
-    <name not found> = ArrayList@298[1] { ResolutionCandidate@299 }
-    <name not found> = ArrayList@300[1] { ResolutionCandidate@299 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
+ResolutionTaskHolder@296 {
+    <name not found> = ArrayList@297[1] { ResolutionCandidate@298 }
     <name not found> = EmptyList@204[empty]
 }
 
-ResolutionTaskHolder@301 {
-    <name not found> = ArrayList@302[1] { ResolutionCandidate@303 }
-    <name not found> = ArrayList@304[1] { ResolutionCandidate@303 }
-    <name not found> = EmptyList@204[empty]
+ResolutionTaskHolder@299 {
+    <name not found> = ArrayList@300[1] { ResolutionCandidate@301 }
     <name not found> = EmptyList@204[empty]
+}
+
+ResolutionTaskHolder@302 {
+    <name not found> = ArrayList@303[1] { ResolutionCandidate@304 }
     <name not found> = EmptyList@204[empty]
 }
 
 ResolutionTaskHolder@305 {
     <name not found> = ArrayList@306[1] { ResolutionCandidate@307 }
-    <name not found> = ArrayList@308[1] { ResolutionCandidate@307 }
-    <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
 }
 
-ResolutionTaskHolder@309 {
-    <name not found> = ArrayList@310[1] { ResolutionCandidate@311 }
-    <name not found> = ArrayList@312[1] { ResolutionCandidate@311 }
-    <name not found> = EmptyList@204[empty]
+ResolutionTaskHolder@308 {
+    <name not found> = ArrayList@309[1] { ResolutionCandidate@310 }
     <name not found> = EmptyList@204[empty]
 }
 
-ResolutionTaskHolder@313 {
-    <name not found> = ArrayList@314[1] { ResolutionCandidate@315 }
-    <name not found> = ArrayList@316[1] { ResolutionCandidate@315 }
+ResolutionTaskHolder@311 {
+    <name not found> = ArrayList@312[1] { ResolutionCandidate@313 }
     <name not found> = EmptyList@204[empty]
+}
+
+ResolutionTaskHolder@314 {
+    <name not found> = ArrayList@315[1] { ResolutionCandidate@316 }
     <name not found> = EmptyList@204[empty]
 }
 
 ResolutionTaskHolder@317 {
     <name not found> = ArrayList@318[1] { ResolutionCandidate@319 }
-    <name not found> = ArrayList@320[1] { ResolutionCandidate@319 }
-    <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
 }
 
-ResolutionTaskHolder@321 {
-    <name not found> = ArrayList@322[1] { ResolutionCandidate@323 }
-    <name not found> = ArrayList@324[1] { ResolutionCandidate@323 }
-    <name not found> = EmptyList@204[empty]
+ResolutionTaskHolder@320 {
+    <name not found> = ArrayList@321[1] { ResolutionCandidate@322 }
     <name not found> = EmptyList@204[empty]
 }
 
-ResolutionTaskHolder@325 {
-    <name not found> = ArrayList@326[1] { ResolutionCandidate@327 }
-    <name not found> = ArrayList@328[1] { ResolutionCandidate@327 }
+ResolutionTaskHolder@323 {
+    <name not found> = ArrayList@324[1] { ResolutionCandidate@325 }
     <name not found> = EmptyList@204[empty]
+}
+
+ResolutionTaskHolder@326 {
+    <name not found> = ArrayList@327[1] { ResolutionCandidate@328 }
     <name not found> = EmptyList@204[empty]
 }
 
 ResolutionTaskHolder@329 {
     <name not found> = ArrayList@330[1] { ResolutionCandidate@331 }
-    <name not found> = ArrayList@332[1] { ResolutionCandidate@331 }
-    <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
 }
 
-ResolutionTaskHolder@333 {
-    <name not found> = ArrayList@334[1] { ResolutionCandidate@335 }
-    <name not found> = ArrayList@336[1] { ResolutionCandidate@335 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
+ResolutionTaskHolder@332 {
+    <name not found> = ArrayList@333[1] { ResolutionCandidate@334 }
 }
 
-ResolutionTaskHolder@337 {
-    <name not found> = ArrayList@338[1] { ResolutionCandidate@339 }
-    <name not found> = ArrayList@340[1] { ResolutionCandidate@339 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
+ResolutionTaskHolder@335 {
+    <name not found> = ArrayList@336[1] { ResolutionCandidate@337 }
+}
+
+ResolutionTaskHolder@338 {
+    <name not found> = ArrayList@339[1] { ResolutionCandidate@340 }
 }
 
 ResolutionTaskHolder@341 {
     <name not found> = ArrayList@342[1] { ResolutionCandidate@343 }
-    <name not found> = ArrayList@344[1] { ResolutionCandidate@343 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
 }
 
-ResolutionTaskHolder@345 {
-    <name not found> = ArrayList@346[1] { ResolutionCandidate@347 }
-    <name not found> = ArrayList@348[1] { ResolutionCandidate@347 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
+ResolutionTaskHolder@344 {
+    <name not found> = ArrayList@345[1] { ResolutionCandidate@346 }
 }
 
-ResolutionTaskHolder@349 {
-    <name not found> = ArrayList@350[1] { ResolutionCandidate@351 }
-    <name not found> = ArrayList@352[1] { ResolutionCandidate@351 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
+ResolutionTaskHolder@347 {
+    <name not found> = ArrayList@348[1] { ResolutionCandidate@349 }
+}
+
+ResolutionTaskHolder@350 {
+    <name not found> = ArrayList@351[1] { ResolutionCandidate@352 }
 }
 
 ResolutionTaskHolder@353 {
     <name not found> = ArrayList@354[1] { ResolutionCandidate@355 }
-    <name not found> = ArrayList@356[1] { ResolutionCandidate@355 }
+}
+
+ResolutionTaskHolder@356 {
+    <name not found> = ArrayList@357[1] { ResolutionCandidate@358 }
+}
+
+ResolutionTaskHolder@359 {
+    <name not found> = ArrayList@360[1] { ResolutionCandidate@361 }
+}
+
+TypeDeserializer@362 {
+    classDescriptors('27': Integer@363) = DeserializedClassDescriptor@364['Int']
+    classDescriptors('28': Integer@365) = DeserializedClassDescriptor@366['IntArray']
+}
+
+TypeDeserializer@367 {
+    classDescriptors('34': Integer@368) = LazyJavaClassDescriptor@100['Class']
+    classDescriptors('9': Integer@369) = DeserializedClassDescriptor@370['Any']
+}
+
+TypeDeserializer@371 {
+    classDescriptors('8': Integer@372) = DeserializedClassDescriptor@373['Array']
+    classDescriptors('9': Integer@369) = DeserializedClassDescriptor@370['Any']
+}
+
+null {
+    <name not found> = ArrayList@374[1] { ResolutionCandidate@265 }
+    <name not found> = ArrayList@375[1] { ResolutionCandidate@283 }
+    <name not found> = ArrayList@376[1] { ResolutionCandidate@253 }
+    <name not found> = ArrayList@377[1] { ResolutionCandidate@298 }
+    <name not found> = ArrayList@378[1] { ResolutionCandidate@352 }
+    <name not found> = ArrayList@379[1] { ResolutionCandidate@322 }
+    <name not found> = ArrayList@380[1] { ResolutionCandidate@334 }
+    <name not found> = ArrayList@381[1] { ResolutionCandidate@331 }
+    <name not found> = ArrayList@382[1] { ResolutionCandidate@343 }
+    <name not found> = ArrayList@383[1] { ResolutionCandidate@304 }
+    <name not found> = ArrayList@384[1] { ResolutionCandidate@295 }
+    <name not found> = ArrayList@385[1] { ResolutionCandidate@301 }
+    <name not found> = ArrayList@386[1] { ResolutionCandidate@337 }
+    <name not found> = ArrayList@387[1] { ResolutionCandidate@325 }
+    <name not found> = ArrayList@388[1] { ResolutionCandidate@274 }
+    <name not found> = ArrayList@389[1] { ResolutionCandidate@340 }
+    <name not found> = ArrayList@390[1] { ResolutionCandidate@313 }
+    <name not found> = ArrayList@391[1] { ResolutionCandidate@256 }
+    <name not found> = ArrayList@392[1] { ResolutionCandidate@349 }
+    <name not found> = ArrayList@393[1] { ResolutionCandidate@328 }
+    <name not found> = ArrayList@394[1] { ResolutionCandidate@289 }
+    <name not found> = ArrayList@395[1] { ResolutionCandidate@346 }
+    <name not found> = ArrayList@396[1] { ResolutionCandidate@310 }
+    <name not found> = ArrayList@397[1] { ResolutionCandidate@307 }
+    <name not found> = ArrayList@398[1] { ResolutionCandidate@316 }
+    <name not found> = ArrayList@399[1] { ResolutionCandidate@280 }
+    <name not found> = ArrayList@400[1] { ResolutionCandidate@355 }
+    <name not found> = ArrayList@401[1] { ResolutionCandidate@259 }
+    <name not found> = ArrayList@402[1] { ResolutionCandidate@268 }
+    <name not found> = ArrayList@403[1] { ResolutionCandidate@247 }
+    <name not found> = ArrayList@404[1] { ResolutionCandidate@292 }
+    <name not found> = ArrayList@405[1] { ResolutionCandidate@262 }
+    <name not found> = ArrayList@406[1] { ResolutionCandidate@250 }
+    <name not found> = ArrayList@407[1] { ResolutionCandidate@286 }
+    <name not found> = ArrayList@408[1] { ResolutionCandidate@277 }
+    <name not found> = ArrayList@409[1] { ResolutionCandidate@361 }
+    <name not found> = ArrayList@410[1] { ResolutionCandidate@319 }
+    <name not found> = ArrayList@411[1] { ResolutionCandidate@271 }
+    <name not found> = ArrayList@412[1] { ResolutionCandidate@358 }
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
     <name not found> = EmptyList@204[empty]
 }
-
-ResolutionTaskHolder@357 {
-    <name not found> = ArrayList@358[1] { ResolutionCandidate@359 }
-    <name not found> = ArrayList@360[1] { ResolutionCandidate@359 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@361 {
-    <name not found> = ArrayList@362[1] { ResolutionCandidate@363 }
-    <name not found> = ArrayList@364[1] { ResolutionCandidate@363 }
-}
-
-ResolutionTaskHolder@365 {
-    <name not found> = ArrayList@366[1] { ResolutionCandidate@367 }
-    <name not found> = ArrayList@368[1] { ResolutionCandidate@367 }
-}
-
-ResolutionTaskHolder@369 {
-    <name not found> = ArrayList@370[1] { ResolutionCandidate@371 }
-    <name not found> = ArrayList@372[1] { ResolutionCandidate@371 }
-}
-
-ResolutionTaskHolder@373 {
-    <name not found> = ArrayList@374[1] { ResolutionCandidate@375 }
-    <name not found> = ArrayList@376[1] { ResolutionCandidate@375 }
-}
-
-ResolutionTaskHolder@377 {
-    <name not found> = ArrayList@378[1] { ResolutionCandidate@379 }
-    <name not found> = ArrayList@380[1] { ResolutionCandidate@379 }
-}
-
-ResolutionTaskHolder@381 {
-    <name not found> = ArrayList@382[1] { ResolutionCandidate@383 }
-    <name not found> = ArrayList@384[1] { ResolutionCandidate@383 }
-}
-
-ResolutionTaskHolder@385 {
-    <name not found> = ArrayList@386[1] { ResolutionCandidate@387 }
-    <name not found> = ArrayList@388[1] { ResolutionCandidate@387 }
-}
-
-ResolutionTaskHolder@389 {
-    <name not found> = ArrayList@390[1] { ResolutionCandidate@391 }
-    <name not found> = ArrayList@392[1] { ResolutionCandidate@391 }
-}
-
-ResolutionTaskHolder@393 {
-    <name not found> = ArrayList@394[1] { ResolutionCandidate@395 }
-    <name not found> = ArrayList@396[1] { ResolutionCandidate@395 }
-}
-
-ResolutionTaskHolder@397 {
-    <name not found> = ArrayList@398[1] { ResolutionCandidate@399 }
-    <name not found> = ArrayList@400[1] { ResolutionCandidate@399 }
-}
-
-TypeDeserializer@401 {
-    classDescriptors('27': Integer@402) = DeserializedClassDescriptor@403['Int']
-    classDescriptors('28': Integer@404) = DeserializedClassDescriptor@405['IntArray']
-}
-
-TypeDeserializer@406 {
-    classDescriptors('34': Integer@407) = LazyJavaClassDescriptor@100['Class']
-    classDescriptors('9': Integer@408) = DeserializedClassDescriptor@409['Any']
-}
-
-TypeDeserializer@410 {
-    classDescriptors('8': Integer@411) = DeserializedClassDescriptor@412['Array']
-    classDescriptors('9': Integer@408) = DeserializedClassDescriptor@409['Any']
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/functions.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/functions.lazy.log
index 79a1e170c3b..57a32bc884a 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/functions.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/functions.lazy.log
@@ -115,40 +115,43 @@ LazyJavaPackageFragment@7['platform'] {
 
 ResolutionTaskHolder@80 {
     <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
 }
 
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
 }
 
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
+}
+
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
 }
 
 ResolutionTaskHolder@92 {
     <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
 }
 
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
 }
 
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
 }
 
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
+null {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@88 }
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/localFun.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/localFun.lazy.log
index 43dcc56a9ce..f45ebe602ec 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/localFun.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/localFun.lazy.log
@@ -94,5 +94,8 @@ LazyJavaPackageFragment@3['platform'] {
 
 ResolutionTaskHolder@67 {
     <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
+}
+
+null {
     <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/property.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/property.lazy.log
index ece7a026b34..8197c21db89 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/property.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/property.lazy.log
@@ -172,81 +172,84 @@ LazyJavaPackageFragment@14['platform'] {
 
 ResolutionTaskHolder@110 {
     <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
-    <name not found> = EmptyList@85[empty]
     <name not found> = EmptyList@85[empty]
 }
 
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
-    <name not found> = EmptyList@85[empty]
+ResolutionTaskHolder@113 {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
     <name not found> = EmptyList@85[empty]
 }
 
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
-    <name not found> = EmptyList@85[empty]
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
     <name not found> = EmptyList@85[empty]
 }
 
+ResolutionTaskHolder@119 {
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
+}
+
 ResolutionTaskHolder@122 {
     <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
 }
 
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
+ResolutionTaskHolder@125 {
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
 }
 
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@132 }
+ResolutionTaskHolder@128 {
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
+}
+
+ResolutionTaskHolder@131 {
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
 }
 
 ResolutionTaskHolder@134 {
     <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@136 }
 }
 
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@140 }
+ResolutionTaskHolder@137 {
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
 }
 
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@144 }
+ResolutionTaskHolder@140 {
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
+}
+
+ResolutionTaskHolder@143 {
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
 }
 
 ResolutionTaskHolder@146 {
     <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@148 }
 }
 
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@152 }
+ResolutionTaskHolder@149 {
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
 }
 
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@156 }
+ResolutionTaskHolder@152 {
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
 }
 
-ResolutionTaskHolder@158 {
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@160 }
-}
-
-ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@164 }
-}
-
-ResolutionTaskHolder@166 {
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@168 }
+null {
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@148 }
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@145 }
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@124 }
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@154 }
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@151 }
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@139 }
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@142 }
+    <name not found> = ArrayList@166[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@127 }
+    <name not found> = ArrayList@168[1] { ResolutionCandidate@133 }
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@136 }
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/qualifiedCallValue.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/annotations/qualifiedCallValue.lazy.log
index a734f90ad4e..34feed9f9f4 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/qualifiedCallValue.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/qualifiedCallValue.lazy.log
@@ -42,7 +42,7 @@ DeserializedTypeParameterDescriptor@25['T'] {
 }
 
 DeserializedType@29['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@22
+    constructor = AbstractLazyTypeParameterDescriptor$1@26
 }
 
 DeserializedType@30['T in kotlin'] {
@@ -50,7 +50,7 @@ DeserializedType@30['T in kotlin'] {
 }
 
 DeserializedType@31['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@22
+    constructor = AbstractLazyTypeParameterDescriptor$1@26
 }
 
 DeserializedType@32['T in kotlin'] {
@@ -62,12 +62,12 @@ DeserializedType@33['java.lang.Class'] {
     memberScope = SubstitutingScope@35
 }
 
-DeserializedType@28['kotlin.Any'] {
+DeserializedType@24['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@36
     memberScope = DeserializedClassMemberScope@37
 }
 
-DeserializedType@24['kotlin.Any'] {
+DeserializedType@28['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@36
     memberScope = DeserializedClassMemberScope@37
 }
@@ -324,163 +324,271 @@ LazyJavaTypeParameterResolver@217 {
 
 ResolutionTaskHolder@219 {
     <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@221 }
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
     <name not found> = EmptyList@185[empty]
     <name not found> = EmptyList@185[empty]
 }
 
-ResolutionTaskHolder@223 {
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@225 }
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
+ResolutionTaskHolder@222 {
+    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
     <name not found> = EmptyList@185[empty]
     <name not found> = EmptyList@185[empty]
 }
 
-ResolutionTaskHolder@227 {
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@229 }
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@229 }
+ResolutionTaskHolder@225 {
+    <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
     <name not found> = EmptyList@185[empty]
     <name not found> = EmptyList@185[empty]
+}
+
+ResolutionTaskHolder@228 {
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
     <name not found> = EmptyList@185[empty]
     <name not found> = EmptyList@185[empty]
 }
 
 ResolutionTaskHolder@231 {
     <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@233 }
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
     <name not found> = EmptyList@185[empty]
     <name not found> = EmptyList@185[empty]
 }
 
-ResolutionTaskHolder@235 {
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@237 }
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
+ResolutionTaskHolder@234 {
+    <name not found> = ArrayList@235[1] { ResolutionCandidate@236 }
     <name not found> = EmptyList@185[empty]
     <name not found> = EmptyList@185[empty]
 }
 
-ResolutionTaskHolder@239 {
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@241 }
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@241 }
+ResolutionTaskHolder@237 {
+    <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
     <name not found> = EmptyList@185[empty]
     <name not found> = EmptyList@185[empty]
+}
+
+ResolutionTaskHolder@240 {
+    <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
     <name not found> = EmptyList@185[empty]
     <name not found> = EmptyList@185[empty]
 }
 
 ResolutionTaskHolder@243 {
     <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@245 }
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
     <name not found> = EmptyList@185[empty]
     <name not found> = EmptyList@185[empty]
 }
 
-ResolutionTaskHolder@247 {
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@249 }
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
+ResolutionTaskHolder@246 {
+    <name not found> = ArrayList@247[1] { ResolutionCandidate@248 }
     <name not found> = EmptyList@185[empty]
     <name not found> = EmptyList@185[empty]
 }
 
-ResolutionTaskHolder@251 {
-    <name not found> = ArrayList@252[1] { ResolutionCandidate@253 }
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@253 }
+ResolutionTaskHolder@249 {
+    <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
     <name not found> = EmptyList@185[empty]
     <name not found> = EmptyList@185[empty]
+}
+
+ResolutionTaskHolder@252 {
+    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
     <name not found> = EmptyList@185[empty]
     <name not found> = EmptyList@185[empty]
 }
 
 ResolutionTaskHolder@255 {
     <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
-    <name not found> = ArrayList@258[1] { ResolutionCandidate@257 }
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
 }
 
-ResolutionTaskHolder@259 {
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@261 }
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@261 }
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
+ResolutionTaskHolder@258 {
+    <name not found> = ArrayList@259[1] { ResolutionCandidate@260 }
 }
 
-ResolutionTaskHolder@263 {
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@265 }
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@265 }
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
+ResolutionTaskHolder@261 {
+    <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
+}
+
+ResolutionTaskHolder@264 {
+    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
 }
 
 ResolutionTaskHolder@267 {
     <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
-    <name not found> = ArrayList@270[1] { ResolutionCandidate@269 }
 }
 
-ResolutionTaskHolder@271 {
-    <name not found> = ArrayList@272[1] { ResolutionCandidate@273 }
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@273 }
+ResolutionTaskHolder@270 {
+    <name not found> = ArrayList@271[1] { ResolutionCandidate@272 }
 }
 
-ResolutionTaskHolder@275 {
-    <name not found> = ArrayList@276[1] { ResolutionCandidate@277 }
-    <name not found> = ArrayList@278[1] { ResolutionCandidate@277 }
+ResolutionTaskHolder@273 {
+    <name not found> = ArrayList@274[1] { ResolutionCandidate@275 }
+}
+
+ResolutionTaskHolder@276 {
+    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
 }
 
 ResolutionTaskHolder@279 {
     <name not found> = ArrayList@280[1] { ResolutionCandidate@281 }
-    <name not found> = ArrayList@282[1] { ResolutionCandidate@281 }
 }
 
-ResolutionTaskHolder@283 {
-    <name not found> = ArrayList@284[1] { ResolutionCandidate@285 }
-    <name not found> = ArrayList@286[1] { ResolutionCandidate@285 }
+ResolutionTaskHolder@282 {
+    <name not found> = ArrayList@283[1] { ResolutionCandidate@284 }
+}
+
+ResolutionTaskHolder@285 {
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+}
+
+ResolutionTaskHolder@286 {
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
 }
 
 ResolutionTaskHolder@287 {
-    <name not found> = ArrayList@288[1] { ResolutionCandidate@289 }
-    <name not found> = ArrayList@290[1] { ResolutionCandidate@289 }
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+}
+
+ResolutionTaskHolder@288 {
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+}
+
+ResolutionTaskHolder@289 {
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+}
+
+ResolutionTaskHolder@290 {
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
 }
 
 ResolutionTaskHolder@291 {
-    <name not found> = ArrayList@292[1] { ResolutionCandidate@293 }
-    <name not found> = ArrayList@294[1] { ResolutionCandidate@293 }
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+}
+
+ResolutionTaskHolder@292 {
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+}
+
+ResolutionTaskHolder@293 {
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+}
+
+ResolutionTaskHolder@294 {
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
 }
 
 ResolutionTaskHolder@295 {
-    <name not found> = ArrayList@296[1] { ResolutionCandidate@297 }
-    <name not found> = ArrayList@298[1] { ResolutionCandidate@297 }
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+}
+
+ResolutionTaskHolder@296 {
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+}
+
+ResolutionTaskHolder@297 {
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+}
+
+ResolutionTaskHolder@298 {
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
 }
 
 ResolutionTaskHolder@299 {
-    <name not found> = ArrayList@300[1] { ResolutionCandidate@301 }
-    <name not found> = ArrayList@302[1] { ResolutionCandidate@301 }
-}
-
-ResolutionTaskHolder@303 {
-    <name not found> = ArrayList@304[1] { ResolutionCandidate@305 }
-    <name not found> = ArrayList@306[1] { ResolutionCandidate@305 }
-}
-
-ResolutionTaskHolder@307 {
     <name not found> = EmptyList@185[empty]
     <name not found> = EmptyList@185[empty]
     <name not found> = EmptyList@185[empty]
@@ -489,13 +597,42 @@ ResolutionTaskHolder@307 {
     <name not found> = EmptyList@185[empty]
     <name not found> = EmptyList@185[empty]
     <name not found> = EmptyList@185[empty]
+}
+
+ResolutionTaskHolder@300 {
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+}
+
+ResolutionTaskHolder@301 {
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+}
+
+ResolutionTaskHolder@302 {
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
     <name not found> = EmptyList@185[empty]
     <name not found> = EmptyList@185[empty]
 }
 
-ResolutionTaskHolder@308 {
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
+ResolutionTaskHolder@303 {
     <name not found> = EmptyList@185[empty]
     <name not found> = EmptyList@185[empty]
     <name not found> = EmptyList@185[empty]
@@ -506,9 +643,7 @@ ResolutionTaskHolder@308 {
     <name not found> = EmptyList@185[empty]
 }
 
-ResolutionTaskHolder@309 {
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
+ResolutionTaskHolder@304 {
     <name not found> = EmptyList@185[empty]
     <name not found> = EmptyList@185[empty]
     <name not found> = EmptyList@185[empty]
@@ -519,9 +654,7 @@ ResolutionTaskHolder@309 {
     <name not found> = EmptyList@185[empty]
 }
 
-ResolutionTaskHolder@310 {
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
+ResolutionTaskHolder@305 {
     <name not found> = EmptyList@185[empty]
     <name not found> = EmptyList@185[empty]
     <name not found> = EmptyList@185[empty]
@@ -532,9 +665,7 @@ ResolutionTaskHolder@310 {
     <name not found> = EmptyList@185[empty]
 }
 
-ResolutionTaskHolder@311 {
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
+ResolutionTaskHolder@306 {
     <name not found> = EmptyList@185[empty]
     <name not found> = EmptyList@185[empty]
     <name not found> = EmptyList@185[empty]
@@ -545,46 +676,102 @@ ResolutionTaskHolder@311 {
     <name not found> = EmptyList@185[empty]
 }
 
-ResolutionTaskHolder@312 {
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
+TypeDeserializer@307 {
+    classDescriptors('1': Integer@308) = DeserializedClassDescriptor@4['deprecated']
+    classDescriptors('3': Integer@309) = DeserializedClassDescriptor@310['String']
 }
 
-ResolutionTaskHolder@313 {
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
+TypeDeserializer@311 {
+    classDescriptors('34': Integer@312) = LazyJavaClassDescriptor@91['Class']
+    classDescriptors('9': Integer@313) = DeserializedClassDescriptor@314['Any']
 }
 
-ResolutionTaskHolder@314 {
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
+TypeDeserializer@315 {
+    classDescriptors('8': Integer@316) = DeserializedClassDescriptor@317['Array']
+    classDescriptors('9': Integer@313) = DeserializedClassDescriptor@314['Any']
 }
 
-ResolutionTaskHolder@315 {
+null {
+    <name not found> = ArrayList@318[1] { ResolutionCandidate@233 }
+    <name not found> = ArrayList@319[1] { ResolutionCandidate@236 }
+    <name not found> = ArrayList@320[1] { ResolutionCandidate@245 }
+    <name not found> = ArrayList@321[1] { ResolutionCandidate@227 }
+    <name not found> = ArrayList@322[1] { ResolutionCandidate@254 }
+    <name not found> = ArrayList@323[1] { ResolutionCandidate@242 }
+    <name not found> = ArrayList@324[1] { ResolutionCandidate@266 }
+    <name not found> = ArrayList@325[1] { ResolutionCandidate@230 }
+    <name not found> = ArrayList@326[1] { ResolutionCandidate@269 }
+    <name not found> = ArrayList@327[1] { ResolutionCandidate@272 }
+    <name not found> = ArrayList@328[1] { ResolutionCandidate@251 }
+    <name not found> = ArrayList@329[1] { ResolutionCandidate@260 }
+    <name not found> = ArrayList@330[1] { ResolutionCandidate@284 }
+    <name not found> = ArrayList@331[1] { ResolutionCandidate@221 }
+    <name not found> = ArrayList@332[1] { ResolutionCandidate@257 }
+    <name not found> = ArrayList@333[1] { ResolutionCandidate@263 }
+    <name not found> = ArrayList@334[1] { ResolutionCandidate@224 }
+    <name not found> = ArrayList@335[1] { ResolutionCandidate@275 }
+    <name not found> = ArrayList@336[1] { ResolutionCandidate@248 }
+    <name not found> = ArrayList@337[1] { ResolutionCandidate@278 }
+    <name not found> = ArrayList@338[1] { ResolutionCandidate@239 }
+    <name not found> = ArrayList@339[1] { ResolutionCandidate@281 }
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
     <name not found> = EmptyList@185[empty]
     <name not found> = EmptyList@185[empty]
     <name not found> = EmptyList@185[empty]
@@ -596,187 +783,3 @@ ResolutionTaskHolder@315 {
     <name not found> = EmptyList@185[empty]
     <name not found> = EmptyList@185[empty]
 }
-
-ResolutionTaskHolder@316 {
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-}
-
-ResolutionTaskHolder@317 {
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-}
-
-ResolutionTaskHolder@318 {
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-}
-
-ResolutionTaskHolder@319 {
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-}
-
-ResolutionTaskHolder@320 {
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-}
-
-ResolutionTaskHolder@321 {
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-}
-
-ResolutionTaskHolder@322 {
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-}
-
-ResolutionTaskHolder@323 {
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-}
-
-ResolutionTaskHolder@324 {
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-}
-
-ResolutionTaskHolder@325 {
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-}
-
-ResolutionTaskHolder@326 {
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-}
-
-ResolutionTaskHolder@327 {
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-}
-
-ResolutionTaskHolder@328 {
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-}
-
-TypeDeserializer@329 {
-    classDescriptors('1': Integer@330) = DeserializedClassDescriptor@4['deprecated']
-    classDescriptors('3': Integer@331) = DeserializedClassDescriptor@332['String']
-}
-
-TypeDeserializer@333 {
-    classDescriptors('34': Integer@334) = LazyJavaClassDescriptor@91['Class']
-    classDescriptors('9': Integer@335) = DeserializedClassDescriptor@336['Any']
-}
-
-TypeDeserializer@337 {
-    classDescriptors('8': Integer@338) = DeserializedClassDescriptor@339['Array']
-    classDescriptors('9': Integer@335) = DeserializedClassDescriptor@336['Any']
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/abstractClassConstructors.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/abstractClassConstructors.lazy.log
index 32d20845735..9b3c51f1843 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/abstractClassConstructors.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/abstractClassConstructors.lazy.log
@@ -143,7 +143,6 @@ LazyJavaPackageFragment@6['reflect'] {
 
 ResolutionTaskHolder@62 {
     <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
@@ -159,42 +158,40 @@ ResolutionTaskHolder@62 {
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
+}
+
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+}
+
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+}
+
+ResolutionTaskHolder@71 {
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
+ResolutionTaskHolder@72 {
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
@@ -205,23 +202,29 @@ ResolutionTaskHolder@74 {
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@75 {
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
+TypeDeserializer@73 {
+    classDescriptors('2': Integer@74) = DeserializedClassDescriptor@75['Any']
 }
 
 TypeDeserializer@76 {
-    classDescriptors('2': Integer@77) = DeserializedClassDescriptor@78['Any']
+    classDescriptors('4': Integer@77) = DeserializedClassDescriptor@2['Function0']
 }
 
-TypeDeserializer@79 {
-    classDescriptors('4': Integer@80) = DeserializedClassDescriptor@2['Function0']
+null {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@64 }
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/ambiguityTopLevelVsTopLevel.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/ambiguityTopLevelVsTopLevel.lazy.log
index 35a5ea73a31..f1f8e96e46c 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/ambiguityTopLevelVsTopLevel.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/ambiguityTopLevelVsTopLevel.lazy.log
@@ -105,26 +105,29 @@ LazyJavaPackageFragment@16['lang'] {
 
 ResolutionTaskHolder@62 {
     <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[2] { ResolutionCandidate@72, ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[2] { ResolutionCandidate@72, ResolutionCandidate@73 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[2] { ResolutionCandidate@70, ResolutionCandidate@71 }
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
 }
 
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[2] { ResolutionCandidate@77, ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[2] { ResolutionCandidate@77, ResolutionCandidate@78 }
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[2] { ResolutionCandidate@74, ResolutionCandidate@75 }
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+}
+
+null {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@78[2] { ResolutionCandidate@74, ResolutionCandidate@75 }
+    <name not found> = ArrayList@79[2] { ResolutionCandidate@70, ResolutionCandidate@71 }
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/callableRefrenceOnNestedObject.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/callableRefrenceOnNestedObject.lazy.log
index 5c740404d01..f06d87b619a 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/callableRefrenceOnNestedObject.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/callableRefrenceOnNestedObject.lazy.log
@@ -142,35 +142,24 @@ NestedClassDescriptors@86 {
 
 ResolutionTaskHolder@87 {
     <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@67[empty]
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
     <name not found> = EmptyList@67[empty]
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
-    <name not found> = EmptyList@67[empty]
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
     <name not found> = EmptyList@67[empty]
 }
 
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
+}
+
 ResolutionTaskHolder@98 {
     <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
 }
 
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
+ResolutionTaskHolder@101 {
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
@@ -189,11 +178,7 @@ ResolutionTaskHolder@106 {
     <name not found> = EmptyList@67[empty]
 }
 
-ResolutionTaskHolder@107 {
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
+ResolutionTaskHolder@102 {
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
@@ -212,9 +197,7 @@ ResolutionTaskHolder@107 {
     <name not found> = EmptyList@67[empty]
 }
 
-ResolutionTaskHolder@108 {
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
+ResolutionTaskHolder@103 {
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
@@ -225,9 +208,7 @@ ResolutionTaskHolder@108 {
     <name not found> = EmptyList@67[empty]
 }
 
-ResolutionTaskHolder@109 {
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
+ResolutionTaskHolder@104 {
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
@@ -238,9 +219,7 @@ ResolutionTaskHolder@109 {
     <name not found> = EmptyList@67[empty]
 }
 
-ResolutionTaskHolder@110 {
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
+ResolutionTaskHolder@105 {
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
@@ -251,10 +230,34 @@ ResolutionTaskHolder@110 {
     <name not found> = EmptyList@67[empty]
 }
 
-TypeDeserializer@111 {
-    classDescriptors('2': Integer@112) = DeserializedClassDescriptor@113['Any']
+TypeDeserializer@106 {
+    classDescriptors('2': Integer@107) = DeserializedClassDescriptor@108['Any']
 }
 
-TypeDeserializer@114 {
-    classDescriptors('4': Integer@115) = DeserializedClassDescriptor@2['ExtensionFunction0']
+TypeDeserializer@109 {
+    classDescriptors('4': Integer@110) = DeserializedClassDescriptor@2['ExtensionFunction0']
+}
+
+null {
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@91 }
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromClass.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromClass.lazy.log
index 91cbadcd918..dfecfc27195 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromClass.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromClass.lazy.log
@@ -125,15 +125,6 @@ LazyJavaPackageFragment@6['reflect'] {
 
 ResolutionTaskHolder@77 {
     <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
@@ -144,17 +135,8 @@ ResolutionTaskHolder@77 {
     <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
     <name not found> = EmptyList@46[empty]
@@ -165,21 +147,42 @@ ResolutionTaskHolder@81 {
     <name not found> = EmptyList@46[empty]
 }
 
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
 }
 
-TypeDeserializer@93 {
-    classDescriptors('2': Integer@94) = DeserializedClassDescriptor@95['Any']
+TypeDeserializer@89 {
+    classDescriptors('2': Integer@90) = DeserializedClassDescriptor@91['Any']
 }
 
-TypeDeserializer@96 {
-    classDescriptors('3': Integer@97) = DeserializedClassDescriptor@95['Any']
-    classDescriptors('4': Integer@98) = DeserializedClassDescriptor@2['Function0']
+TypeDeserializer@92 {
+    classDescriptors('3': Integer@93) = DeserializedClassDescriptor@91['Any']
+    classDescriptors('4': Integer@94) = DeserializedClassDescriptor@2['Function0']
+}
+
+null {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@88 }
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtension.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtension.lazy.log
index 90241f6080e..c9784e4c723 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtension.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtension.lazy.log
@@ -143,15 +143,6 @@ LazyJavaPackageFragment@6['reflect'] {
 
 ResolutionTaskHolder@82 {
     <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
@@ -162,17 +153,8 @@ ResolutionTaskHolder@82 {
     <name not found> = EmptyList@51[empty]
 }
 
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
@@ -183,21 +165,42 @@ ResolutionTaskHolder@86 {
     <name not found> = EmptyList@51[empty]
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
 }
 
-TypeDeserializer@98 {
-    classDescriptors('2': Integer@99) = DeserializedClassDescriptor@100['Any']
+TypeDeserializer@94 {
+    classDescriptors('2': Integer@95) = DeserializedClassDescriptor@96['Any']
 }
 
-TypeDeserializer@101 {
-    classDescriptors('3': Integer@102) = DeserializedClassDescriptor@100['Any']
-    classDescriptors('4': Integer@103) = DeserializedClassDescriptor@2['Function0']
+TypeDeserializer@97 {
+    classDescriptors('3': Integer@98) = DeserializedClassDescriptor@96['Any']
+    classDescriptors('4': Integer@99) = DeserializedClassDescriptor@2['Function0']
+}
+
+null {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@93 }
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtensionInClass.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtensionInClass.lazy.log
index 2145cde53ed..860c26f754a 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtensionInClass.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtensionInClass.lazy.log
@@ -143,25 +143,6 @@ LazyJavaPackageFragment@6['reflect'] {
 
 ResolutionTaskHolder@82 {
     <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
@@ -182,27 +163,8 @@ ResolutionTaskHolder@82 {
     <name not found> = EmptyList@51[empty]
 }
 
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
@@ -223,9 +185,8 @@ ResolutionTaskHolder@86 {
     <name not found> = EmptyList@51[empty]
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
@@ -244,6 +205,10 @@ ResolutionTaskHolder@90 {
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
+}
+
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
@@ -266,70 +231,108 @@ ResolutionTaskHolder@90 {
 
 ResolutionTaskHolder@94 {
     <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
 }
 
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
 }
 
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
 }
 
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
 }
 
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
+TypeDeserializer@106 {
+    classDescriptors('2': Integer@107) = DeserializedClassDescriptor@108['Any']
 }
 
-TypeDeserializer@114 {
-    classDescriptors('2': Integer@115) = DeserializedClassDescriptor@116['Any']
+TypeDeserializer@109 {
+    classDescriptors('3': Integer@110) = DeserializedClassDescriptor@108['Any']
+    classDescriptors('4': Integer@111) = DeserializedClassDescriptor@2['Function0']
 }
 
-TypeDeserializer@117 {
-    classDescriptors('3': Integer@118) = DeserializedClassDescriptor@116['Any']
-    classDescriptors('4': Integer@119) = DeserializedClassDescriptor@2['Function0']
+null {
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@102 }
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromTopLevel.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromTopLevel.lazy.log
index 52d18a85158..199669b59bc 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromTopLevel.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromTopLevel.lazy.log
@@ -124,23 +124,26 @@ LazyJavaPackageFragment@6['reflect'] {
 
 ResolutionTaskHolder@76 {
     <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
     <name not found> = EmptyList@45[empty]
     <name not found> = EmptyList@45[empty]
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
 }
 
-TypeDeserializer@84 {
-    classDescriptors('2': Integer@85) = DeserializedClassDescriptor@86['Any']
+TypeDeserializer@82 {
+    classDescriptors('2': Integer@83) = DeserializedClassDescriptor@84['Any']
 }
 
-TypeDeserializer@87 {
-    classDescriptors('3': Integer@88) = DeserializedClassDescriptor@86['Any']
-    classDescriptors('4': Integer@89) = DeserializedClassDescriptor@2['Function0']
+TypeDeserializer@85 {
+    classDescriptors('3': Integer@86) = DeserializedClassDescriptor@84['Any']
+    classDescriptors('4': Integer@87) = DeserializedClassDescriptor@2['Function0']
+}
+
+null {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@81 }
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageClass.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageClass.lazy.log
index a8a1fe57d06..832c59889ec 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageClass.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageClass.lazy.log
@@ -58,16 +58,6 @@ DeserializedTypeParameterDescriptor@31['T'] {
     upperBoundsAsType = DeserializedType@34['kotlin.Any']
 }
 
-DeserializedType@34['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@30['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
 DeserializedType@18['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
@@ -78,11 +68,21 @@ DeserializedType@22['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
+DeserializedType@34['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@35
+    memberScope = DeserializedClassMemberScope@36
+}
+
 DeserializedType@26['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
 
+DeserializedType@30['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@35
+    memberScope = DeserializedClassMemberScope@36
+}
+
 DeserializedType@37['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
 }
@@ -221,32 +221,140 @@ LazyJavaPackageFragment@14['reflect'] {
 
 ResolutionTaskHolder@134 {
     <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@136 }
 }
 
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@140 }
+ResolutionTaskHolder@137 {
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
 }
 
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@144 }
+ResolutionTaskHolder@140 {
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
+}
+
+ResolutionTaskHolder@143 {
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
 }
 
 ResolutionTaskHolder@146 {
     <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@148 }
 }
 
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@152 }
+ResolutionTaskHolder@149 {
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
+}
+
+ResolutionTaskHolder@152 {
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+}
+
+ResolutionTaskHolder@153 {
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
 }
 
 ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@156 }
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+}
+
+ResolutionTaskHolder@155 {
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+}
+
+ResolutionTaskHolder@156 {
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+}
+
+ResolutionTaskHolder@157 {
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
 }
 
 ResolutionTaskHolder@158 {
@@ -258,18 +366,6 @@ ResolutionTaskHolder@158 {
     <name not found> = EmptyList@113[empty]
     <name not found> = EmptyList@113[empty]
     <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
 }
 
 ResolutionTaskHolder@159 {
@@ -281,18 +377,6 @@ ResolutionTaskHolder@159 {
     <name not found> = EmptyList@113[empty]
     <name not found> = EmptyList@113[empty]
     <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
 }
 
 ResolutionTaskHolder@160 {
@@ -304,18 +388,6 @@ ResolutionTaskHolder@160 {
     <name not found> = EmptyList@113[empty]
     <name not found> = EmptyList@113[empty]
     <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
 }
 
 ResolutionTaskHolder@161 {
@@ -327,18 +399,6 @@ ResolutionTaskHolder@161 {
     <name not found> = EmptyList@113[empty]
     <name not found> = EmptyList@113[empty]
     <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
 }
 
 ResolutionTaskHolder@162 {
@@ -350,18 +410,6 @@ ResolutionTaskHolder@162 {
     <name not found> = EmptyList@113[empty]
     <name not found> = EmptyList@113[empty]
     <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
 }
 
 ResolutionTaskHolder@163 {
@@ -373,86 +421,63 @@ ResolutionTaskHolder@163 {
     <name not found> = EmptyList@113[empty]
     <name not found> = EmptyList@113[empty]
     <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
 }
 
-ResolutionTaskHolder@164 {
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
+TypeDeserializer@164 {
+    classDescriptors('2': Integer@165) = DeserializedClassDescriptor@166['Any']
 }
 
-ResolutionTaskHolder@165 {
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
+TypeDeserializer@167 {
+    classDescriptors('2': Integer@165) = DeserializedClassDescriptor@166['Any']
 }
 
-ResolutionTaskHolder@166 {
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
+TypeDeserializer@168 {
+    classDescriptors('2': Integer@165) = DeserializedClassDescriptor@166['Any']
 }
 
-ResolutionTaskHolder@167 {
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
+TypeDeserializer@169 {
+    classDescriptors('3': Integer@170) = DeserializedClassDescriptor@166['Any']
+    classDescriptors('4': Integer@171) = DeserializedClassDescriptor@2['ExtensionFunction0']
 }
 
-ResolutionTaskHolder@168 {
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
+TypeDeserializer@172 {
+    classDescriptors('3': Integer@170) = DeserializedClassDescriptor@166['Any']
+    classDescriptors('4': Integer@171) = DeserializedClassDescriptor@4['ExtensionFunction1']
 }
 
-ResolutionTaskHolder@169 {
+null {
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@142 }
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@136 }
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@145 }
+    <name not found> = ArrayList@176[1] { ResolutionCandidate@151 }
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@139 }
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@148 }
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
     <name not found> = EmptyList@113[empty]
     <name not found> = EmptyList@113[empty]
     <name not found> = EmptyList@113[empty]
@@ -464,25 +489,3 @@ ResolutionTaskHolder@169 {
     <name not found> = EmptyList@113[empty]
     <name not found> = EmptyList@113[empty]
 }
-
-TypeDeserializer@170 {
-    classDescriptors('2': Integer@171) = DeserializedClassDescriptor@172['Any']
-}
-
-TypeDeserializer@173 {
-    classDescriptors('2': Integer@171) = DeserializedClassDescriptor@172['Any']
-}
-
-TypeDeserializer@174 {
-    classDescriptors('2': Integer@171) = DeserializedClassDescriptor@172['Any']
-}
-
-TypeDeserializer@175 {
-    classDescriptors('3': Integer@176) = DeserializedClassDescriptor@172['Any']
-    classDescriptors('4': Integer@177) = DeserializedClassDescriptor@2['ExtensionFunction0']
-}
-
-TypeDeserializer@178 {
-    classDescriptors('3': Integer@176) = DeserializedClassDescriptor@172['Any']
-    classDescriptors('4': Integer@177) = DeserializedClassDescriptor@4['ExtensionFunction1']
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageExtension.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageExtension.lazy.log
index b882437899a..93263b914bb 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageExtension.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageExtension.lazy.log
@@ -176,16 +176,66 @@ LazyJavaPackageFragment@8['reflect'] {
 
 ResolutionTaskHolder@95 {
     <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+}
+
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
+}
+
+ResolutionTaskHolder@101 {
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
 }
 
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
+ResolutionTaskHolder@102 {
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
 }
 
 ResolutionTaskHolder@103 {
@@ -205,20 +255,6 @@ ResolutionTaskHolder@103 {
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
 }
 
 ResolutionTaskHolder@104 {
@@ -238,20 +274,6 @@ ResolutionTaskHolder@104 {
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
 }
 
 ResolutionTaskHolder@105 {
@@ -271,10 +293,6 @@ ResolutionTaskHolder@105 {
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
 }
 
 ResolutionTaskHolder@106 {
@@ -294,10 +312,6 @@ ResolutionTaskHolder@106 {
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
 }
 
 ResolutionTaskHolder@107 {
@@ -317,10 +331,6 @@ ResolutionTaskHolder@107 {
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
 }
 
 ResolutionTaskHolder@108 {
@@ -340,10 +350,6 @@ ResolutionTaskHolder@108 {
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
 }
 
 ResolutionTaskHolder@109 {
@@ -359,14 +365,6 @@ ResolutionTaskHolder@109 {
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
 }
 
 ResolutionTaskHolder@110 {
@@ -382,14 +380,6 @@ ResolutionTaskHolder@110 {
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
 }
 
 ResolutionTaskHolder@111 {
@@ -401,13 +391,6 @@ ResolutionTaskHolder@111 {
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
 }
 
 ResolutionTaskHolder@112 {
@@ -419,13 +402,6 @@ ResolutionTaskHolder@112 {
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
 }
 
 ResolutionTaskHolder@113 {
@@ -437,8 +413,6 @@ ResolutionTaskHolder@113 {
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
 }
 
 ResolutionTaskHolder@114 {
@@ -450,8 +424,6 @@ ResolutionTaskHolder@114 {
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
 }
 
 ResolutionTaskHolder@115 {
@@ -463,8 +435,6 @@ ResolutionTaskHolder@115 {
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
 }
 
 ResolutionTaskHolder@116 {
@@ -476,45 +446,78 @@ ResolutionTaskHolder@116 {
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
     <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
 }
 
-ResolutionTaskHolder@117 {
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
+TypeDeserializer@117 {
+    classDescriptors('2': Integer@118) = DeserializedClassDescriptor@119['Any']
 }
 
-ResolutionTaskHolder@118 {
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
+TypeDeserializer@120 {
+    classDescriptors('2': Integer@118) = DeserializedClassDescriptor@119['Any']
 }
 
-TypeDeserializer@119 {
-    classDescriptors('2': Integer@120) = DeserializedClassDescriptor@121['Any']
+TypeDeserializer@121 {
+    classDescriptors('3': Integer@122) = DeserializedClassDescriptor@119['Any']
+    classDescriptors('4': Integer@123) = DeserializedClassDescriptor@2['ExtensionFunction0']
 }
 
-TypeDeserializer@122 {
-    classDescriptors('2': Integer@120) = DeserializedClassDescriptor@121['Any']
-}
-
-TypeDeserializer@123 {
-    classDescriptors('3': Integer@124) = DeserializedClassDescriptor@121['Any']
-    classDescriptors('4': Integer@125) = DeserializedClassDescriptor@2['ExtensionFunction0']
+null {
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@100 }
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageTopLevel.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageTopLevel.lazy.log
index 40a63d2e72d..faed17158b5 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageTopLevel.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageTopLevel.lazy.log
@@ -51,12 +51,12 @@ DeserializedType@22['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@28
 }
 
-DeserializedType@26['kotlin.Any'] {
+DeserializedType@18['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
     memberScope = DeserializedClassMemberScope@28
 }
 
-DeserializedType@18['kotlin.Any'] {
+DeserializedType@26['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
     memberScope = DeserializedClassMemberScope@28
 }
@@ -239,64 +239,67 @@ LazyJavaPackageFragment@14['reflect'] {
 
 ResolutionTaskHolder@128 {
     <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
-    <name not found> = EmptyList@98[empty]
-    <name not found> = EmptyList@98[empty]
     <name not found> = EmptyList@98[empty]
     <name not found> = EmptyList@98[empty]
 }
 
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
-    <name not found> = EmptyList@98[empty]
-    <name not found> = EmptyList@98[empty]
+ResolutionTaskHolder@131 {
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
     <name not found> = EmptyList@98[empty]
     <name not found> = EmptyList@98[empty]
 }
 
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
-    <name not found> = EmptyList@98[empty]
-    <name not found> = EmptyList@98[empty]
+ResolutionTaskHolder@134 {
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
     <name not found> = EmptyList@98[empty]
     <name not found> = EmptyList@98[empty]
 }
 
+ResolutionTaskHolder@137 {
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
+}
+
 ResolutionTaskHolder@140 {
     <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
 }
 
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
+ResolutionTaskHolder@143 {
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
 }
 
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
+TypeDeserializer@146 {
+    classDescriptors('2': Integer@147) = DeserializedClassDescriptor@148['Any']
 }
 
-TypeDeserializer@152 {
-    classDescriptors('2': Integer@153) = DeserializedClassDescriptor@154['Any']
+TypeDeserializer@149 {
+    classDescriptors('2': Integer@147) = DeserializedClassDescriptor@148['Any']
 }
 
-TypeDeserializer@155 {
-    classDescriptors('2': Integer@153) = DeserializedClassDescriptor@154['Any']
+TypeDeserializer@150 {
+    classDescriptors('2': Integer@147) = DeserializedClassDescriptor@148['Any']
 }
 
-TypeDeserializer@156 {
-    classDescriptors('2': Integer@153) = DeserializedClassDescriptor@154['Any']
+TypeDeserializer@151 {
+    classDescriptors('3': Integer@152) = DeserializedClassDescriptor@148['Any']
+    classDescriptors('4': Integer@153) = DeserializedClassDescriptor@2['Function0']
 }
 
-TypeDeserializer@157 {
-    classDescriptors('3': Integer@158) = DeserializedClassDescriptor@154['Any']
-    classDescriptors('4': Integer@159) = DeserializedClassDescriptor@2['Function0']
+TypeDeserializer@154 {
+    classDescriptors('3': Integer@152) = DeserializedClassDescriptor@148['Any']
+    classDescriptors('4': Integer@153) = DeserializedClassDescriptor@4['Function1']
 }
 
-TypeDeserializer@160 {
-    classDescriptors('3': Integer@158) = DeserializedClassDescriptor@154['Any']
-    classDescriptors('4': Integer@159) = DeserializedClassDescriptor@4['Function1']
+null {
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@133 }
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@136 }
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@139 }
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@142 }
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@145 }
+    <name not found> = EmptyList@98[empty]
+    <name not found> = EmptyList@98[empty]
+    <name not found> = EmptyList@98[empty]
+    <name not found> = EmptyList@98[empty]
+    <name not found> = EmptyList@98[empty]
+    <name not found> = EmptyList@98[empty]
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromClass.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromClass.lazy.log
index 74f04fcd509..5c6fb714135 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromClass.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromClass.lazy.log
@@ -58,31 +58,31 @@ DeserializedTypeParameterDescriptor@31['T'] {
     upperBoundsAsType = DeserializedType@34['kotlin.Any']
 }
 
-DeserializedType@30['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
 DeserializedType@22['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@18['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
 DeserializedType@26['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
 
+DeserializedType@30['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@35
+    memberScope = DeserializedClassMemberScope@36
+}
+
 DeserializedType@34['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
 
+DeserializedType@18['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@35
+    memberScope = DeserializedClassMemberScope@36
+}
+
 DeserializedType@37['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
 }
@@ -274,12 +274,6 @@ LazyJavaPackageFragment@14['reflect'] {
 
 ResolutionTaskHolder@136 {
     <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
     <name not found> = EmptyList@104[empty]
     <name not found> = EmptyList@104[empty]
     <name not found> = EmptyList@104[empty]
@@ -287,14 +281,8 @@ ResolutionTaskHolder@136 {
     <name not found> = EmptyList@104[empty]
 }
 
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
+ResolutionTaskHolder@139 {
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
     <name not found> = EmptyList@104[empty]
     <name not found> = EmptyList@104[empty]
     <name not found> = EmptyList@104[empty]
@@ -302,14 +290,8 @@ ResolutionTaskHolder@140 {
     <name not found> = EmptyList@104[empty]
 }
 
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
+ResolutionTaskHolder@142 {
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
     <name not found> = EmptyList@104[empty]
     <name not found> = EmptyList@104[empty]
     <name not found> = EmptyList@104[empty]
@@ -317,39 +299,60 @@ ResolutionTaskHolder@144 {
     <name not found> = EmptyList@104[empty]
 }
 
+ResolutionTaskHolder@145 {
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
+}
+
 ResolutionTaskHolder@148 {
     <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
 }
 
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
+ResolutionTaskHolder@151 {
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
 }
 
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
+TypeDeserializer@154 {
+    classDescriptors('2': Integer@155) = DeserializedClassDescriptor@156['Any']
 }
 
-TypeDeserializer@160 {
-    classDescriptors('2': Integer@161) = DeserializedClassDescriptor@162['Any']
+TypeDeserializer@157 {
+    classDescriptors('2': Integer@155) = DeserializedClassDescriptor@156['Any']
 }
 
-TypeDeserializer@163 {
-    classDescriptors('2': Integer@161) = DeserializedClassDescriptor@162['Any']
+TypeDeserializer@158 {
+    classDescriptors('2': Integer@155) = DeserializedClassDescriptor@156['Any']
 }
 
-TypeDeserializer@164 {
-    classDescriptors('2': Integer@161) = DeserializedClassDescriptor@162['Any']
+TypeDeserializer@159 {
+    classDescriptors('3': Integer@160) = DeserializedClassDescriptor@156['Any']
+    classDescriptors('4': Integer@161) = DeserializedClassDescriptor@2['ExtensionFunction0']
 }
 
-TypeDeserializer@165 {
-    classDescriptors('3': Integer@166) = DeserializedClassDescriptor@162['Any']
-    classDescriptors('4': Integer@167) = DeserializedClassDescriptor@2['ExtensionFunction0']
+TypeDeserializer@162 {
+    classDescriptors('3': Integer@160) = DeserializedClassDescriptor@156['Any']
+    classDescriptors('4': Integer@161) = DeserializedClassDescriptor@4['ExtensionFunction1']
 }
 
-TypeDeserializer@168 {
-    classDescriptors('3': Integer@166) = DeserializedClassDescriptor@162['Any']
-    classDescriptors('4': Integer@167) = DeserializedClassDescriptor@4['ExtensionFunction1']
+null {
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@141 }
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@166[1] { ResolutionCandidate@153 }
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@168[1] { ResolutionCandidate@147 }
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtension.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtension.lazy.log
index 6d9bd991291..a68304fd1cf 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtension.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtension.lazy.log
@@ -58,17 +58,17 @@ DeserializedTypeParameterDescriptor@31['T'] {
     upperBoundsAsType = DeserializedType@34['kotlin.Any']
 }
 
-DeserializedType@34['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
 DeserializedType@22['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@18['kotlin.Any'] {
+DeserializedType@34['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@35
+    memberScope = DeserializedClassMemberScope@36
+}
+
+DeserializedType@26['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -78,7 +78,7 @@ DeserializedType@30['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@26['kotlin.Any'] {
+DeserializedType@18['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -274,12 +274,6 @@ LazyJavaPackageFragment@14['reflect'] {
 
 ResolutionTaskHolder@136 {
     <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
     <name not found> = EmptyList@104[empty]
     <name not found> = EmptyList@104[empty]
     <name not found> = EmptyList@104[empty]
@@ -287,14 +281,8 @@ ResolutionTaskHolder@136 {
     <name not found> = EmptyList@104[empty]
 }
 
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
+ResolutionTaskHolder@139 {
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
     <name not found> = EmptyList@104[empty]
     <name not found> = EmptyList@104[empty]
     <name not found> = EmptyList@104[empty]
@@ -302,14 +290,8 @@ ResolutionTaskHolder@140 {
     <name not found> = EmptyList@104[empty]
 }
 
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
+ResolutionTaskHolder@142 {
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
     <name not found> = EmptyList@104[empty]
     <name not found> = EmptyList@104[empty]
     <name not found> = EmptyList@104[empty]
@@ -317,39 +299,60 @@ ResolutionTaskHolder@144 {
     <name not found> = EmptyList@104[empty]
 }
 
+ResolutionTaskHolder@145 {
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
+}
+
 ResolutionTaskHolder@148 {
     <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
 }
 
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
+ResolutionTaskHolder@151 {
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
 }
 
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
+TypeDeserializer@154 {
+    classDescriptors('2': Integer@155) = DeserializedClassDescriptor@156['Any']
 }
 
-TypeDeserializer@160 {
-    classDescriptors('2': Integer@161) = DeserializedClassDescriptor@162['Any']
+TypeDeserializer@157 {
+    classDescriptors('2': Integer@155) = DeserializedClassDescriptor@156['Any']
 }
 
-TypeDeserializer@163 {
-    classDescriptors('2': Integer@161) = DeserializedClassDescriptor@162['Any']
+TypeDeserializer@158 {
+    classDescriptors('2': Integer@155) = DeserializedClassDescriptor@156['Any']
 }
 
-TypeDeserializer@164 {
-    classDescriptors('2': Integer@161) = DeserializedClassDescriptor@162['Any']
+TypeDeserializer@159 {
+    classDescriptors('3': Integer@160) = DeserializedClassDescriptor@156['Any']
+    classDescriptors('4': Integer@161) = DeserializedClassDescriptor@2['ExtensionFunction0']
 }
 
-TypeDeserializer@165 {
-    classDescriptors('3': Integer@166) = DeserializedClassDescriptor@162['Any']
-    classDescriptors('4': Integer@167) = DeserializedClassDescriptor@2['ExtensionFunction0']
+TypeDeserializer@162 {
+    classDescriptors('3': Integer@160) = DeserializedClassDescriptor@156['Any']
+    classDescriptors('4': Integer@161) = DeserializedClassDescriptor@4['ExtensionFunction1']
 }
 
-TypeDeserializer@168 {
-    classDescriptors('3': Integer@166) = DeserializedClassDescriptor@162['Any']
-    classDescriptors('4': Integer@167) = DeserializedClassDescriptor@4['ExtensionFunction1']
+null {
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@141 }
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@166[1] { ResolutionCandidate@153 }
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@168[1] { ResolutionCandidate@147 }
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtensionInClass.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtensionInClass.lazy.log
index 0c218714dab..06216493895 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtensionInClass.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtensionInClass.lazy.log
@@ -63,16 +63,6 @@ DeserializedType@30['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@34['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@18['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
 DeserializedType@22['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
@@ -83,6 +73,16 @@ DeserializedType@26['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
+DeserializedType@34['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@35
+    memberScope = DeserializedClassMemberScope@36
+}
+
+DeserializedType@18['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@35
+    memberScope = DeserializedClassMemberScope@36
+}
+
 DeserializedType@37['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
 }
@@ -280,22 +280,7 @@ LazyJavaPackageFragment@14['reflect'] {
 
 ResolutionTaskHolder@142 {
     <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@147 }
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
     <name not found> = EmptyList@110[empty]
     <name not found> = EmptyList@110[empty]
     <name not found> = EmptyList@110[empty]
@@ -311,24 +296,9 @@ ResolutionTaskHolder@142 {
     <name not found> = EmptyList@110[empty]
 }
 
-ResolutionTaskHolder@149 {
+ResolutionTaskHolder@147 {
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
     <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@151 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
     <name not found> = EmptyList@110[empty]
     <name not found> = EmptyList@110[empty]
     <name not found> = EmptyList@110[empty]
@@ -344,24 +314,9 @@ ResolutionTaskHolder@149 {
     <name not found> = EmptyList@110[empty]
 }
 
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@161 }
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
+ResolutionTaskHolder@152 {
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
     <name not found> = EmptyList@110[empty]
     <name not found> = EmptyList@110[empty]
     <name not found> = EmptyList@110[empty]
@@ -377,39 +332,87 @@ ResolutionTaskHolder@156 {
     <name not found> = EmptyList@110[empty]
 }
 
+ResolutionTaskHolder@157 {
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
+}
+
+ResolutionTaskHolder@160 {
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
+}
+
 ResolutionTaskHolder@163 {
     <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@165 }
 }
 
-ResolutionTaskHolder@167 {
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@169 }
+TypeDeserializer@166 {
+    classDescriptors('2': Integer@167) = DeserializedClassDescriptor@168['Any']
 }
 
-ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@173 }
+TypeDeserializer@169 {
+    classDescriptors('2': Integer@167) = DeserializedClassDescriptor@168['Any']
 }
 
-TypeDeserializer@175 {
-    classDescriptors('2': Integer@176) = DeserializedClassDescriptor@177['Any']
+TypeDeserializer@170 {
+    classDescriptors('2': Integer@167) = DeserializedClassDescriptor@168['Any']
 }
 
-TypeDeserializer@178 {
-    classDescriptors('2': Integer@176) = DeserializedClassDescriptor@177['Any']
+TypeDeserializer@171 {
+    classDescriptors('3': Integer@172) = DeserializedClassDescriptor@168['Any']
+    classDescriptors('4': Integer@173) = DeserializedClassDescriptor@2['ExtensionFunction0']
 }
 
-TypeDeserializer@179 {
-    classDescriptors('2': Integer@176) = DeserializedClassDescriptor@177['Any']
+TypeDeserializer@174 {
+    classDescriptors('3': Integer@172) = DeserializedClassDescriptor@168['Any']
+    classDescriptors('4': Integer@173) = DeserializedClassDescriptor@4['ExtensionFunction1']
 }
 
-TypeDeserializer@180 {
-    classDescriptors('3': Integer@181) = DeserializedClassDescriptor@177['Any']
-    classDescriptors('4': Integer@182) = DeserializedClassDescriptor@2['ExtensionFunction0']
-}
-
-TypeDeserializer@183 {
-    classDescriptors('3': Integer@181) = DeserializedClassDescriptor@177['Any']
-    classDescriptors('4': Integer@182) = DeserializedClassDescriptor@4['ExtensionFunction1']
+null {
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@176[1] { ResolutionCandidate@146 }
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@149 }
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@151 }
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@154 }
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@156 }
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@162 }
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@165 }
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@159 }
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromTopLevel.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromTopLevel.lazy.log
index 884c012ac60..cdae9727898 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromTopLevel.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromTopLevel.lazy.log
@@ -63,7 +63,7 @@ DeserializedType@30['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@26['kotlin.Any'] {
+DeserializedType@18['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -73,12 +73,12 @@ DeserializedType@34['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@22['kotlin.Any'] {
+DeserializedType@26['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@18['kotlin.Any'] {
+DeserializedType@22['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -268,44 +268,146 @@ LazyJavaPackageFragment@14['reflect'] {
 
 ResolutionTaskHolder@136 {
     <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
     <name not found> = EmptyList@104[empty]
     <name not found> = EmptyList@104[empty]
 }
 
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
+ResolutionTaskHolder@139 {
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
     <name not found> = EmptyList@104[empty]
     <name not found> = EmptyList@104[empty]
 }
 
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
+ResolutionTaskHolder@142 {
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
     <name not found> = EmptyList@104[empty]
     <name not found> = EmptyList@104[empty]
 }
 
+ResolutionTaskHolder@145 {
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
+}
+
 ResolutionTaskHolder@148 {
     <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
 }
 
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
+ResolutionTaskHolder@151 {
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
+}
+
+ResolutionTaskHolder@154 {
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+}
+
+ResolutionTaskHolder@155 {
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
 }
 
 ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+}
+
+ResolutionTaskHolder@157 {
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+}
+
+ResolutionTaskHolder@158 {
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+}
+
+ResolutionTaskHolder@159 {
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
 }
 
 ResolutionTaskHolder@160 {
@@ -317,18 +419,6 @@ ResolutionTaskHolder@160 {
     <name not found> = EmptyList@104[empty]
     <name not found> = EmptyList@104[empty]
     <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
 }
 
 ResolutionTaskHolder@161 {
@@ -340,18 +430,6 @@ ResolutionTaskHolder@161 {
     <name not found> = EmptyList@104[empty]
     <name not found> = EmptyList@104[empty]
     <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
 }
 
 ResolutionTaskHolder@162 {
@@ -363,18 +441,6 @@ ResolutionTaskHolder@162 {
     <name not found> = EmptyList@104[empty]
     <name not found> = EmptyList@104[empty]
     <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
 }
 
 ResolutionTaskHolder@163 {
@@ -386,18 +452,6 @@ ResolutionTaskHolder@163 {
     <name not found> = EmptyList@104[empty]
     <name not found> = EmptyList@104[empty]
     <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
 }
 
 ResolutionTaskHolder@164 {
@@ -409,18 +463,6 @@ ResolutionTaskHolder@164 {
     <name not found> = EmptyList@104[empty]
     <name not found> = EmptyList@104[empty]
     <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
 }
 
 ResolutionTaskHolder@165 {
@@ -432,86 +474,69 @@ ResolutionTaskHolder@165 {
     <name not found> = EmptyList@104[empty]
     <name not found> = EmptyList@104[empty]
     <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
 }
 
-ResolutionTaskHolder@166 {
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
+TypeDeserializer@166 {
+    classDescriptors('2': Integer@167) = DeserializedClassDescriptor@168['Any']
 }
 
-ResolutionTaskHolder@167 {
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
+TypeDeserializer@169 {
+    classDescriptors('2': Integer@167) = DeserializedClassDescriptor@168['Any']
 }
 
-ResolutionTaskHolder@168 {
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
+TypeDeserializer@170 {
+    classDescriptors('2': Integer@167) = DeserializedClassDescriptor@168['Any']
 }
 
-ResolutionTaskHolder@169 {
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
+TypeDeserializer@171 {
+    classDescriptors('3': Integer@172) = DeserializedClassDescriptor@168['Any']
+    classDescriptors('4': Integer@173) = DeserializedClassDescriptor@2['ExtensionFunction0']
 }
 
-ResolutionTaskHolder@170 {
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
+TypeDeserializer@174 {
+    classDescriptors('3': Integer@172) = DeserializedClassDescriptor@168['Any']
+    classDescriptors('4': Integer@173) = DeserializedClassDescriptor@4['ExtensionFunction1']
 }
 
-ResolutionTaskHolder@171 {
+null {
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@141 }
+    <name not found> = ArrayList@176[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@147 }
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@153 }
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
     <name not found> = EmptyList@104[empty]
     <name not found> = EmptyList@104[empty]
     <name not found> = EmptyList@104[empty]
@@ -523,25 +548,3 @@ ResolutionTaskHolder@171 {
     <name not found> = EmptyList@104[empty]
     <name not found> = EmptyList@104[empty]
 }
-
-TypeDeserializer@172 {
-    classDescriptors('2': Integer@173) = DeserializedClassDescriptor@174['Any']
-}
-
-TypeDeserializer@175 {
-    classDescriptors('2': Integer@173) = DeserializedClassDescriptor@174['Any']
-}
-
-TypeDeserializer@176 {
-    classDescriptors('2': Integer@173) = DeserializedClassDescriptor@174['Any']
-}
-
-TypeDeserializer@177 {
-    classDescriptors('3': Integer@178) = DeserializedClassDescriptor@174['Any']
-    classDescriptors('4': Integer@179) = DeserializedClassDescriptor@2['ExtensionFunction0']
-}
-
-TypeDeserializer@180 {
-    classDescriptors('3': Integer@178) = DeserializedClassDescriptor@174['Any']
-    classDescriptors('4': Integer@179) = DeserializedClassDescriptor@4['ExtensionFunction1']
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionInClassDisallowed.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionInClassDisallowed.lazy.log
index afa4c9a1d38..ff75b39184f 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionInClassDisallowed.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionInClassDisallowed.lazy.log
@@ -107,35 +107,113 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@59 {
     <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
+}
+
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
 }
 
 ResolutionTaskHolder@71 {
     <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
+}
+
+ResolutionTaskHolder@74 {
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
 }
 
 ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@76 {
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@77 {
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@78 {
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
 }
 
 ResolutionTaskHolder@79 {
@@ -147,18 +225,6 @@ ResolutionTaskHolder@79 {
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
 }
 
 ResolutionTaskHolder@80 {
@@ -170,18 +236,6 @@ ResolutionTaskHolder@80 {
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
 }
 
 ResolutionTaskHolder@81 {
@@ -193,21 +247,22 @@ ResolutionTaskHolder@81 {
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@82 {
+null {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@64 }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
@@ -229,55 +284,3 @@ ResolutionTaskHolder@82 {
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
-
-ResolutionTaskHolder@83 {
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionOnNullable.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionOnNullable.lazy.log
index 565aef54272..27fbf87b48d 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionOnNullable.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionOnNullable.lazy.log
@@ -48,6 +48,11 @@ DeserializedTypeParameterDescriptor@26['T'] {
     upperBoundsAsType = DeserializedType@29['kotlin.Any']
 }
 
+DeserializedType@21['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@30
+    memberScope = DeserializedClassMemberScope@31
+}
+
 DeserializedType@29['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@30
     memberScope = DeserializedClassMemberScope@31
@@ -58,11 +63,6 @@ DeserializedType@17['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@31
 }
 
-DeserializedType@21['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@30
-    memberScope = DeserializedClassMemberScope@31
-}
-
 DeserializedType@25['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@30
     memberScope = DeserializedClassMemberScope@31
@@ -200,16 +200,69 @@ LazyJavaPackageFragment@13['reflect'] {
 
 ResolutionTaskHolder@112 {
     <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
+    <name not found> = EmptyList@83[empty]
+}
+
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
+}
+
+ResolutionTaskHolder@120 {
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@121 }
+ResolutionTaskHolder@121 {
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+}
+
+ResolutionTaskHolder@122 {
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
 }
 
 ResolutionTaskHolder@123 {
@@ -229,10 +282,6 @@ ResolutionTaskHolder@123 {
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
 }
 
 ResolutionTaskHolder@124 {
@@ -244,18 +293,6 @@ ResolutionTaskHolder@124 {
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
 }
 
 ResolutionTaskHolder@125 {
@@ -267,18 +304,6 @@ ResolutionTaskHolder@125 {
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
 }
 
 ResolutionTaskHolder@126 {
@@ -290,18 +315,6 @@ ResolutionTaskHolder@126 {
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
 }
 
 ResolutionTaskHolder@127 {
@@ -313,63 +326,53 @@ ResolutionTaskHolder@127 {
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@128 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@129 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
+TypeDeserializer@128 {
+    classDescriptors('2': Integer@129) = DeserializedClassDescriptor@130['Any']
 }
 
 TypeDeserializer@131 {
-    classDescriptors('2': Integer@132) = DeserializedClassDescriptor@133['Any']
+    classDescriptors('2': Integer@129) = DeserializedClassDescriptor@130['Any']
 }
 
-TypeDeserializer@134 {
-    classDescriptors('2': Integer@132) = DeserializedClassDescriptor@133['Any']
+TypeDeserializer@132 {
+    classDescriptors('3': Integer@133) = DeserializedClassDescriptor@130['Any']
+    classDescriptors('4': Integer@134) = DeserializedClassDescriptor@2['ExtensionFunction0']
 }
 
 TypeDeserializer@135 {
-    classDescriptors('3': Integer@136) = DeserializedClassDescriptor@133['Any']
-    classDescriptors('4': Integer@137) = DeserializedClassDescriptor@2['ExtensionFunction0']
+    classDescriptors('3': Integer@133) = DeserializedClassDescriptor@130['Any']
+    classDescriptors('4': Integer@134) = DeserializedClassDescriptor@2['ExtensionFunction0']
 }
 
-TypeDeserializer@138 {
-    classDescriptors('3': Integer@136) = DeserializedClassDescriptor@133['Any']
-    classDescriptors('4': Integer@137) = DeserializedClassDescriptor@2['ExtensionFunction0']
+null {
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@116 }
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/genericClassFromTopLevel.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/genericClassFromTopLevel.lazy.log
index a0b9dae96d5..6765e0512aa 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/genericClassFromTopLevel.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/genericClassFromTopLevel.lazy.log
@@ -22,12 +22,12 @@ DeserializedTypeParameterDescriptor@11['T'] {
     upperBoundsAsType = DeserializedType@14['kotlin.Any']
 }
 
-DeserializedType@14['kotlin.Any'] {
+DeserializedType@10['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@15
     memberScope = DeserializedClassMemberScope@16
 }
 
-DeserializedType@10['kotlin.Any'] {
+DeserializedType@14['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@15
     memberScope = DeserializedClassMemberScope@16
 }
@@ -139,19 +139,64 @@ LazyJavaPackageFragment@6['reflect'] {
 
 ResolutionTaskHolder@88 {
     <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+    <name not found> = EmptyList@61[empty]
+}
+
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
+}
+
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
+}
+
+ResolutionTaskHolder@97 {
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
     <name not found> = EmptyList@61[empty]
     <name not found> = EmptyList@61[empty]
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
+ResolutionTaskHolder@98 {
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
 }
 
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
+ResolutionTaskHolder@99 {
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
 }
 
 ResolutionTaskHolder@100 {
@@ -163,74 +208,32 @@ ResolutionTaskHolder@100 {
     <name not found> = EmptyList@61[empty]
     <name not found> = EmptyList@61[empty]
     <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
 }
 
-ResolutionTaskHolder@101 {
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
+TypeDeserializer@101 {
+    classDescriptors('2': Integer@102) = DeserializedClassDescriptor@103['Any']
 }
 
 TypeDeserializer@104 {
-    classDescriptors('2': Integer@105) = DeserializedClassDescriptor@106['Any']
+    classDescriptors('3': Integer@105) = DeserializedClassDescriptor@103['Any']
+    classDescriptors('4': Integer@106) = DeserializedClassDescriptor@2['ExtensionFunction0']
 }
 
-TypeDeserializer@107 {
-    classDescriptors('3': Integer@108) = DeserializedClassDescriptor@106['Any']
-    classDescriptors('4': Integer@109) = DeserializedClassDescriptor@2['ExtensionFunction0']
+null {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@90 }
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/importedInnerConstructor.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/importedInnerConstructor.lazy.log
index 4f922d6b753..58a1aae19dd 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/importedInnerConstructor.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/importedInnerConstructor.lazy.log
@@ -83,10 +83,6 @@ ResolutionTaskHolder@41 {
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
 }
 
 ResolutionTaskHolder@42 {
@@ -98,6 +94,13 @@ ResolutionTaskHolder@42 {
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
+}
+
+null {
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromClass.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromClass.lazy.log
index 5081f59c64c..c512a386da4 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromClass.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromClass.lazy.log
@@ -22,12 +22,12 @@ DeserializedTypeParameterDescriptor@11['T'] {
     upperBoundsAsType = DeserializedType@14['kotlin.Any']
 }
 
-DeserializedType@14['kotlin.Any'] {
+DeserializedType@10['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@15
     memberScope = DeserializedClassMemberScope@16
 }
 
-DeserializedType@10['kotlin.Any'] {
+DeserializedType@14['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@15
     memberScope = DeserializedClassMemberScope@16
 }
@@ -141,31 +141,7 @@ LazyJavaPackageFragment@6['reflect'] {
 
 ResolutionTaskHolder@86 {
     <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
@@ -262,48 +238,252 @@ ResolutionTaskHolder@86 {
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
 
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
+}
+
 ResolutionTaskHolder@97 {
     <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
 }
 
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
 }
 
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
+}
+
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
 }
 
 ResolutionTaskHolder@109 {
     <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
 }
 
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
+}
+
+ResolutionTaskHolder@115 {
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@116 {
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
 }
 
 ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@118 {
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@119 {
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@120 {
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
 }
 
 ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@122 {
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@123 {
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@124 {
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
 }
 
 ResolutionTaskHolder@125 {
@@ -315,58 +495,6 @@ ResolutionTaskHolder@125 {
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
 }
 
 ResolutionTaskHolder@126 {
@@ -378,28 +506,6 @@ ResolutionTaskHolder@126 {
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
 }
 
 ResolutionTaskHolder@127 {
@@ -411,18 +517,6 @@ ResolutionTaskHolder@127 {
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
 }
 
 ResolutionTaskHolder@128 {
@@ -434,67 +528,86 @@ ResolutionTaskHolder@128 {
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@129 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+TypeDeserializer@129 {
+    classDescriptors('2': Integer@130) = DeserializedClassDescriptor@131['Any']
 }
 
-ResolutionTaskHolder@130 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+TypeDeserializer@132 {
+    classDescriptors('3': Integer@133) = DeserializedClassDescriptor@131['Any']
+    classDescriptors('4': Integer@134) = DeserializedClassDescriptor@2['ExtensionFunction0']
 }
 
-ResolutionTaskHolder@131 {
+null {
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@96 }
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
@@ -516,113 +629,3 @@ ResolutionTaskHolder@131 {
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
-
-ResolutionTaskHolder@132 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@133 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@134 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@135 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@137 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@138 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-TypeDeserializer@139 {
-    classDescriptors('2': Integer@140) = DeserializedClassDescriptor@141['Any']
-}
-
-TypeDeserializer@142 {
-    classDescriptors('3': Integer@143) = DeserializedClassDescriptor@141['Any']
-    classDescriptors('4': Integer@144) = DeserializedClassDescriptor@2['ExtensionFunction0']
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromExtension.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromExtension.lazy.log
index 8ab6f0ea4af..948a4c172ea 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromExtension.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromExtension.lazy.log
@@ -22,12 +22,12 @@ DeserializedTypeParameterDescriptor@11['T'] {
     upperBoundsAsType = DeserializedType@14['kotlin.Any']
 }
 
-DeserializedType@10['kotlin.Any'] {
+DeserializedType@14['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@15
     memberScope = DeserializedClassMemberScope@16
 }
 
-DeserializedType@14['kotlin.Any'] {
+DeserializedType@10['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@15
     memberScope = DeserializedClassMemberScope@16
 }
@@ -144,36 +144,182 @@ LazyJavaPackageFragment@6['reflect'] {
 
 ResolutionTaskHolder@86 {
     <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
+}
+
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
 }
 
 ResolutionTaskHolder@98 {
     <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
 }
 
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
+}
+
+ResolutionTaskHolder@104 {
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@105 {
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
 }
 
 ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@107 {
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@108 {
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@109 {
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
 }
 
 ResolutionTaskHolder@110 {
@@ -185,58 +331,6 @@ ResolutionTaskHolder@110 {
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
 }
 
 ResolutionTaskHolder@111 {
@@ -248,28 +342,6 @@ ResolutionTaskHolder@111 {
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
 }
 
 ResolutionTaskHolder@112 {
@@ -281,18 +353,6 @@ ResolutionTaskHolder@112 {
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
 }
 
 ResolutionTaskHolder@113 {
@@ -304,67 +364,58 @@ ResolutionTaskHolder@113 {
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@114 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+TypeDeserializer@114 {
+    classDescriptors('2': Integer@115) = DeserializedClassDescriptor@116['Any']
 }
 
-ResolutionTaskHolder@115 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+TypeDeserializer@117 {
+    classDescriptors('3': Integer@118) = DeserializedClassDescriptor@116['Any']
+    classDescriptors('4': Integer@119) = DeserializedClassDescriptor@2['ExtensionFunction0']
 }
 
-ResolutionTaskHolder@116 {
+null {
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@94 }
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
@@ -376,51 +427,3 @@ ResolutionTaskHolder@116 {
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
-
-ResolutionTaskHolder@117 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-TypeDeserializer@120 {
-    classDescriptors('2': Integer@121) = DeserializedClassDescriptor@122['Any']
-}
-
-TypeDeserializer@123 {
-    classDescriptors('3': Integer@124) = DeserializedClassDescriptor@122['Any']
-    classDescriptors('4': Integer@125) = DeserializedClassDescriptor@2['ExtensionFunction0']
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromTopLevel.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromTopLevel.lazy.log
index 8c529094780..9e5b84545ad 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromTopLevel.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromTopLevel.lazy.log
@@ -22,12 +22,12 @@ DeserializedTypeParameterDescriptor@11['T'] {
     upperBoundsAsType = DeserializedType@14['kotlin.Any']
 }
 
-DeserializedType@10['kotlin.Any'] {
+DeserializedType@14['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@15
     memberScope = DeserializedClassMemberScope@16
 }
 
-DeserializedType@14['kotlin.Any'] {
+DeserializedType@10['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@15
     memberScope = DeserializedClassMemberScope@16
 }
@@ -135,12 +135,48 @@ LazyJavaPackageFragment@6['reflect'] {
 
 ResolutionTaskHolder@80 {
     <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
 }
 
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
+}
+
+ResolutionTaskHolder@86 {
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+}
+
+ResolutionTaskHolder@87 {
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
 }
 
 ResolutionTaskHolder@88 {
@@ -160,10 +196,6 @@ ResolutionTaskHolder@88 {
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
 }
 
 ResolutionTaskHolder@89 {
@@ -175,18 +207,6 @@ ResolutionTaskHolder@89 {
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
 }
 
 ResolutionTaskHolder@90 {
@@ -198,18 +218,6 @@ ResolutionTaskHolder@90 {
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
 }
 
 ResolutionTaskHolder@91 {
@@ -221,41 +229,36 @@ ResolutionTaskHolder@91 {
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
+TypeDeserializer@92 {
+    classDescriptors('2': Integer@93) = DeserializedClassDescriptor@94['Any']
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
+TypeDeserializer@95 {
+    classDescriptors('3': Integer@96) = DeserializedClassDescriptor@94['Any']
+    classDescriptors('4': Integer@97) = DeserializedClassDescriptor@2['ExtensionFunction0']
 }
 
-TypeDeserializer@94 {
-    classDescriptors('2': Integer@95) = DeserializedClassDescriptor@96['Any']
-}
-
-TypeDeserializer@97 {
-    classDescriptors('3': Integer@98) = DeserializedClassDescriptor@96['Any']
-    classDescriptors('4': Integer@99) = DeserializedClassDescriptor@2['ExtensionFunction0']
+null {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@82 }
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/javaStaticMethod.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/javaStaticMethod.lazy.log
index 302ac8b8cd5..d2dc7c03fc7 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/javaStaticMethod.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/javaStaticMethod.lazy.log
@@ -61,6 +61,11 @@ DeserializedType@39['R in kotlin.reflect.KFunction1'] {
     constructor = AbstractLazyTypeParameterDescriptor$1@33
 }
 
+DeserializedType@28['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@40
+    memberScope = DeserializedClassMemberScope@41
+}
+
 DeserializedType@35['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@40
     memberScope = DeserializedClassMemberScope@41
@@ -71,19 +76,14 @@ DeserializedType@42['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@41
 }
 
-DeserializedType@28['kotlin.Any'] {
+DeserializedType@43['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@40
-    memberScope = DeserializedClassMemberScope@41
 }
 
 DeserializedType@24['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@40
 }
 
-DeserializedType@43['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@40
-}
-
 DeserializedType@44['kotlin.Function1'] {
     constructor = DeserializedClassTypeConstructor@45
     memberScope = SubstitutingScope@46
@@ -267,63 +267,66 @@ NestedClassDescriptors@159 {
 
 ResolutionTaskHolder@160 {
     <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@162 }
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
     <name not found> = EmptyList@57[empty]
     <name not found> = EmptyList@57[empty]
 }
 
-ResolutionTaskHolder@164 {
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@166 }
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
+ResolutionTaskHolder@163 {
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
     <name not found> = EmptyList@57[empty]
     <name not found> = EmptyList@57[empty]
 }
 
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@170 }
-    <name not found> = EmptyList@57[empty]
+ResolutionTaskHolder@166 {
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
     <name not found> = EmptyList@57[empty]
 }
 
+ResolutionTaskHolder@169 {
+    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
+}
+
 ResolutionTaskHolder@172 {
     <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@174 }
 }
 
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@178 }
+ResolutionTaskHolder@175 {
+    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
 }
 
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@182 }
+ResolutionTaskHolder@178 {
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
 }
 
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@186 }
+ResolutionTaskHolder@181 {
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
 }
 
-ResolutionTaskHolder@188 {
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@190 }
+TypeDeserializer@184 {
+    classDescriptors('2': Integer@185) = DeserializedClassDescriptor@186['Any']
 }
 
-TypeDeserializer@192 {
-    classDescriptors('2': Integer@193) = DeserializedClassDescriptor@194['Any']
+TypeDeserializer@187 {
+    classDescriptors('2': Integer@185) = DeserializedClassDescriptor@186['Any']
 }
 
-TypeDeserializer@195 {
-    classDescriptors('2': Integer@193) = DeserializedClassDescriptor@194['Any']
+TypeDeserializer@188 {
+    classDescriptors('3': Integer@189) = DeserializedClassDescriptor@186['Any']
+    classDescriptors('4': Integer@190) = DeserializedClassDescriptor@2['Function1']
 }
 
-TypeDeserializer@196 {
-    classDescriptors('3': Integer@197) = DeserializedClassDescriptor@194['Any']
-    classDescriptors('4': Integer@198) = DeserializedClassDescriptor@2['Function1']
+null {
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@162 }
+    <name not found> = ArrayList@192[1] { ResolutionCandidate@174 }
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@183 }
+    <name not found> = ArrayList@194[1] { ResolutionCandidate@168 }
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@180 }
+    <name not found> = ArrayList@196[1] { ResolutionCandidate@165 }
+    <name not found> = ArrayList@197[1] { ResolutionCandidate@171 }
+    <name not found> = ArrayList@198[1] { ResolutionCandidate@177 }
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructor.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructor.lazy.log
index 52d18a85158..199669b59bc 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructor.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructor.lazy.log
@@ -124,23 +124,26 @@ LazyJavaPackageFragment@6['reflect'] {
 
 ResolutionTaskHolder@76 {
     <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
     <name not found> = EmptyList@45[empty]
     <name not found> = EmptyList@45[empty]
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
 }
 
-TypeDeserializer@84 {
-    classDescriptors('2': Integer@85) = DeserializedClassDescriptor@86['Any']
+TypeDeserializer@82 {
+    classDescriptors('2': Integer@83) = DeserializedClassDescriptor@84['Any']
 }
 
-TypeDeserializer@87 {
-    classDescriptors('3': Integer@88) = DeserializedClassDescriptor@86['Any']
-    classDescriptors('4': Integer@89) = DeserializedClassDescriptor@2['Function0']
+TypeDeserializer@85 {
+    classDescriptors('3': Integer@86) = DeserializedClassDescriptor@84['Any']
+    classDescriptors('4': Integer@87) = DeserializedClassDescriptor@2['Function0']
+}
+
+null {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@81 }
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromExtensionInLocalClass.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromExtensionInLocalClass.lazy.log
index a1ba029b13c..a84adf378d6 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromExtensionInLocalClass.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromExtensionInLocalClass.lazy.log
@@ -133,25 +133,6 @@ LazyJavaPackageFragment@6['reflect'] {
 
 ResolutionTaskHolder@82 {
     <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
@@ -172,27 +153,8 @@ ResolutionTaskHolder@82 {
     <name not found> = EmptyList@51[empty]
 }
 
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
@@ -213,21 +175,62 @@ ResolutionTaskHolder@86 {
     <name not found> = EmptyList@51[empty]
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
 }
 
-TypeDeserializer@98 {
-    classDescriptors('2': Integer@99) = DeserializedClassDescriptor@100['Any']
+TypeDeserializer@94 {
+    classDescriptors('2': Integer@95) = DeserializedClassDescriptor@96['Any']
 }
 
-TypeDeserializer@101 {
-    classDescriptors('3': Integer@102) = DeserializedClassDescriptor@100['Any']
-    classDescriptors('4': Integer@103) = DeserializedClassDescriptor@2['Function0']
+TypeDeserializer@97 {
+    classDescriptors('3': Integer@98) = DeserializedClassDescriptor@96['Any']
+    classDescriptors('4': Integer@99) = DeserializedClassDescriptor@2['Function0']
+}
+
+null {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@93 }
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalClass.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalClass.lazy.log
index e4d3466cb6c..dadffec4822 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalClass.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalClass.lazy.log
@@ -135,15 +135,6 @@ LazyJavaPackageFragment@8['reflect'] {
 
 ResolutionTaskHolder@79 {
     <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
@@ -154,18 +145,30 @@ ResolutionTaskHolder@79 {
     <name not found> = EmptyList@48[empty]
 }
 
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@48[empty]
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
     <name not found> = EmptyList@48[empty]
 }
 
-TypeDeserializer@87 {
-    classDescriptors('2': Integer@88) = DeserializedClassDescriptor@89['Any']
+TypeDeserializer@85 {
+    classDescriptors('2': Integer@86) = DeserializedClassDescriptor@87['Any']
 }
 
-TypeDeserializer@90 {
-    classDescriptors('3': Integer@91) = DeserializedClassDescriptor@89['Any']
-    classDescriptors('4': Integer@92) = DeserializedClassDescriptor@2['Function0']
+TypeDeserializer@88 {
+    classDescriptors('3': Integer@89) = DeserializedClassDescriptor@87['Any']
+    classDescriptors('4': Integer@90) = DeserializedClassDescriptor@2['Function0']
+}
+
+null {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@84 }
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalExtension.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalExtension.lazy.log
index cfc9497cc58..4de841458bf 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalExtension.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalExtension.lazy.log
@@ -133,15 +133,6 @@ LazyJavaPackageFragment@6['reflect'] {
 
 ResolutionTaskHolder@82 {
     <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
@@ -152,17 +143,8 @@ ResolutionTaskHolder@82 {
     <name not found> = EmptyList@51[empty]
 }
 
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
@@ -173,21 +155,42 @@ ResolutionTaskHolder@86 {
     <name not found> = EmptyList@51[empty]
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
 }
 
-TypeDeserializer@98 {
-    classDescriptors('2': Integer@99) = DeserializedClassDescriptor@100['Any']
+TypeDeserializer@94 {
+    classDescriptors('2': Integer@95) = DeserializedClassDescriptor@96['Any']
 }
 
-TypeDeserializer@101 {
-    classDescriptors('3': Integer@102) = DeserializedClassDescriptor@100['Any']
-    classDescriptors('4': Integer@103) = DeserializedClassDescriptor@2['Function0']
+TypeDeserializer@97 {
+    classDescriptors('3': Integer@98) = DeserializedClassDescriptor@96['Any']
+    classDescriptors('4': Integer@99) = DeserializedClassDescriptor@2['Function0']
+}
+
+null {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@93 }
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFun.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFun.lazy.log
index ca395953a5f..f440982f4d4 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFun.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFun.lazy.log
@@ -46,12 +46,12 @@ DeserializedTypeParameterDescriptor@23['R'] {
     upperBounds = LinkedHashSet@25[1] { DeserializedType@26['kotlin.Any'] }
 }
 
-DeserializedType@22['kotlin.Any'] {
+DeserializedType@26['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
     memberScope = DeserializedClassMemberScope@28
 }
 
-DeserializedType@26['kotlin.Any'] {
+DeserializedType@22['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
     memberScope = DeserializedClassMemberScope@28
 }
@@ -246,52 +246,55 @@ LazyJavaPackageFragment@14['reflect'] {
 
 ResolutionTaskHolder@122 {
     <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
 }
 
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
+ResolutionTaskHolder@125 {
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
 }
 
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@132 }
+ResolutionTaskHolder@128 {
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
+}
+
+ResolutionTaskHolder@131 {
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
 }
 
 ResolutionTaskHolder@134 {
     <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@136 }
 }
 
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@140 }
+ResolutionTaskHolder@137 {
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
 }
 
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@144 }
+TypeDeserializer@140 {
+    classDescriptors('2': Integer@141) = DeserializedClassDescriptor@142['Any']
 }
 
-TypeDeserializer@146 {
-    classDescriptors('2': Integer@147) = DeserializedClassDescriptor@148['Any']
+TypeDeserializer@143 {
+    classDescriptors('2': Integer@141) = DeserializedClassDescriptor@142['Any']
 }
 
-TypeDeserializer@149 {
-    classDescriptors('2': Integer@147) = DeserializedClassDescriptor@148['Any']
+TypeDeserializer@144 {
+    classDescriptors('2': Integer@141) = DeserializedClassDescriptor@142['Any']
 }
 
-TypeDeserializer@150 {
-    classDescriptors('2': Integer@147) = DeserializedClassDescriptor@148['Any']
+TypeDeserializer@145 {
+    classDescriptors('3': Integer@146) = DeserializedClassDescriptor@142['Any']
+    classDescriptors('4': Integer@147) = DeserializedClassDescriptor@2['Function0']
 }
 
-TypeDeserializer@151 {
-    classDescriptors('3': Integer@152) = DeserializedClassDescriptor@148['Any']
-    classDescriptors('4': Integer@153) = DeserializedClassDescriptor@2['Function0']
+TypeDeserializer@148 {
+    classDescriptors('3': Integer@146) = DeserializedClassDescriptor@142['Any']
+    classDescriptors('4': Integer@147) = DeserializedClassDescriptor@4['Function1']
 }
 
-TypeDeserializer@154 {
-    classDescriptors('3': Integer@152) = DeserializedClassDescriptor@148['Any']
-    classDescriptors('4': Integer@153) = DeserializedClassDescriptor@4['Function1']
+null {
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@124 }
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@139 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@127 }
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@136 }
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@133 }
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromExtensionInLocalClass.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromExtensionInLocalClass.lazy.log
index 487de766720..530571e9f98 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromExtensionInLocalClass.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromExtensionInLocalClass.lazy.log
@@ -46,12 +46,12 @@ DeserializedTypeParameterDescriptor@23['R'] {
     upperBounds = LinkedHashSet@25[1] { DeserializedType@26['kotlin.Any'] }
 }
 
-DeserializedType@18['kotlin.Any'] {
+DeserializedType@26['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
     memberScope = DeserializedClassMemberScope@28
 }
 
-DeserializedType@26['kotlin.Any'] {
+DeserializedType@18['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
     memberScope = DeserializedClassMemberScope@28
 }
@@ -252,52 +252,55 @@ LazyJavaPackageFragment@14['reflect'] {
 
 ResolutionTaskHolder@128 {
     <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
 }
 
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
+ResolutionTaskHolder@131 {
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
 }
 
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
+ResolutionTaskHolder@134 {
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
+}
+
+ResolutionTaskHolder@137 {
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
 }
 
 ResolutionTaskHolder@140 {
     <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
 }
 
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
+ResolutionTaskHolder@143 {
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
 }
 
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
+TypeDeserializer@146 {
+    classDescriptors('2': Integer@147) = DeserializedClassDescriptor@148['Any']
 }
 
-TypeDeserializer@152 {
-    classDescriptors('2': Integer@153) = DeserializedClassDescriptor@154['Any']
+TypeDeserializer@149 {
+    classDescriptors('2': Integer@147) = DeserializedClassDescriptor@148['Any']
 }
 
-TypeDeserializer@155 {
-    classDescriptors('2': Integer@153) = DeserializedClassDescriptor@154['Any']
+TypeDeserializer@150 {
+    classDescriptors('2': Integer@147) = DeserializedClassDescriptor@148['Any']
 }
 
-TypeDeserializer@156 {
-    classDescriptors('2': Integer@153) = DeserializedClassDescriptor@154['Any']
+TypeDeserializer@151 {
+    classDescriptors('3': Integer@152) = DeserializedClassDescriptor@148['Any']
+    classDescriptors('4': Integer@153) = DeserializedClassDescriptor@2['Function0']
 }
 
-TypeDeserializer@157 {
-    classDescriptors('3': Integer@158) = DeserializedClassDescriptor@154['Any']
-    classDescriptors('4': Integer@159) = DeserializedClassDescriptor@2['Function0']
+TypeDeserializer@154 {
+    classDescriptors('3': Integer@152) = DeserializedClassDescriptor@148['Any']
+    classDescriptors('4': Integer@153) = DeserializedClassDescriptor@4['Function1']
 }
 
-TypeDeserializer@160 {
-    classDescriptors('3': Integer@158) = DeserializedClassDescriptor@154['Any']
-    classDescriptors('4': Integer@159) = DeserializedClassDescriptor@4['Function1']
+null {
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@136 }
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@142 }
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@139 }
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@145 }
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@133 }
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalClass.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalClass.lazy.log
index f59bd05f25d..5976e7641c9 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalClass.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalClass.lazy.log
@@ -57,12 +57,12 @@ DeserializedType@30['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@32
 }
 
-DeserializedType@22['kotlin.Any'] {
+DeserializedType@26['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@31
     memberScope = DeserializedClassMemberScope@32
 }
 
-DeserializedType@26['kotlin.Any'] {
+DeserializedType@22['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@31
     memberScope = DeserializedClassMemberScope@32
 }
@@ -276,58 +276,61 @@ LazyJavaPackageFragment@18['reflect'] {
 
 ResolutionTaskHolder@129 {
     <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@131 }
-    <name not found> = EmptyList@97[empty]
     <name not found> = EmptyList@97[empty]
 }
 
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@135 }
-    <name not found> = EmptyList@97[empty]
+ResolutionTaskHolder@132 {
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
     <name not found> = EmptyList@97[empty]
 }
 
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@139 }
-    <name not found> = EmptyList@97[empty]
+ResolutionTaskHolder@135 {
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
     <name not found> = EmptyList@97[empty]
 }
 
+ResolutionTaskHolder@138 {
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
+}
+
 ResolutionTaskHolder@141 {
     <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@143 }
 }
 
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@147 }
+ResolutionTaskHolder@144 {
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
 }
 
-ResolutionTaskHolder@149 {
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@151 }
+TypeDeserializer@147 {
+    classDescriptors('2': Integer@148) = DeserializedClassDescriptor@149['Any']
 }
 
-TypeDeserializer@153 {
-    classDescriptors('2': Integer@154) = DeserializedClassDescriptor@155['Any']
+TypeDeserializer@150 {
+    classDescriptors('2': Integer@148) = DeserializedClassDescriptor@149['Any']
 }
 
-TypeDeserializer@156 {
-    classDescriptors('2': Integer@154) = DeserializedClassDescriptor@155['Any']
+TypeDeserializer@151 {
+    classDescriptors('2': Integer@148) = DeserializedClassDescriptor@149['Any']
 }
 
-TypeDeserializer@157 {
-    classDescriptors('2': Integer@154) = DeserializedClassDescriptor@155['Any']
+TypeDeserializer@152 {
+    classDescriptors('3': Integer@153) = DeserializedClassDescriptor@149['Any']
+    classDescriptors('4': Integer@154) = DeserializedClassDescriptor@2['Function0']
 }
 
-TypeDeserializer@158 {
-    classDescriptors('3': Integer@159) = DeserializedClassDescriptor@155['Any']
-    classDescriptors('4': Integer@160) = DeserializedClassDescriptor@2['Function0']
+TypeDeserializer@155 {
+    classDescriptors('3': Integer@153) = DeserializedClassDescriptor@149['Any']
+    classDescriptors('4': Integer@154) = DeserializedClassDescriptor@4['Function1']
 }
 
-TypeDeserializer@161 {
-    classDescriptors('3': Integer@159) = DeserializedClassDescriptor@155['Any']
-    classDescriptors('4': Integer@160) = DeserializedClassDescriptor@4['Function1']
+null {
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@146 }
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@140 }
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@143 }
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@131 }
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@137 }
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@134 }
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalExtension.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalExtension.lazy.log
index 2c4ccb8c9a6..c1f7afa2fbf 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalExtension.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalExtension.lazy.log
@@ -46,11 +46,6 @@ DeserializedTypeParameterDescriptor@23['R'] {
     upperBounds = LinkedHashSet@25[1] { DeserializedType@26['kotlin.Any'] }
 }
 
-DeserializedType@22['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-    memberScope = DeserializedClassMemberScope@28
-}
-
 DeserializedType@18['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
     memberScope = DeserializedClassMemberScope@28
@@ -61,6 +56,11 @@ DeserializedType@26['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@28
 }
 
+DeserializedType@22['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@27
+    memberScope = DeserializedClassMemberScope@28
+}
+
 DeserializedType@29['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
 }
@@ -252,52 +252,55 @@ LazyJavaPackageFragment@14['reflect'] {
 
 ResolutionTaskHolder@128 {
     <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
 }
 
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
+ResolutionTaskHolder@131 {
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
 }
 
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
+ResolutionTaskHolder@134 {
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
+}
+
+ResolutionTaskHolder@137 {
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
 }
 
 ResolutionTaskHolder@140 {
     <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
 }
 
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
+ResolutionTaskHolder@143 {
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
 }
 
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
+TypeDeserializer@146 {
+    classDescriptors('2': Integer@147) = DeserializedClassDescriptor@148['Any']
 }
 
-TypeDeserializer@152 {
-    classDescriptors('2': Integer@153) = DeserializedClassDescriptor@154['Any']
+TypeDeserializer@149 {
+    classDescriptors('2': Integer@147) = DeserializedClassDescriptor@148['Any']
 }
 
-TypeDeserializer@155 {
-    classDescriptors('2': Integer@153) = DeserializedClassDescriptor@154['Any']
+TypeDeserializer@150 {
+    classDescriptors('2': Integer@147) = DeserializedClassDescriptor@148['Any']
 }
 
-TypeDeserializer@156 {
-    classDescriptors('2': Integer@153) = DeserializedClassDescriptor@154['Any']
+TypeDeserializer@151 {
+    classDescriptors('3': Integer@152) = DeserializedClassDescriptor@148['Any']
+    classDescriptors('4': Integer@153) = DeserializedClassDescriptor@2['Function0']
 }
 
-TypeDeserializer@157 {
-    classDescriptors('3': Integer@158) = DeserializedClassDescriptor@154['Any']
-    classDescriptors('4': Integer@159) = DeserializedClassDescriptor@2['Function0']
+TypeDeserializer@154 {
+    classDescriptors('3': Integer@152) = DeserializedClassDescriptor@148['Any']
+    classDescriptors('4': Integer@153) = DeserializedClassDescriptor@4['Function1']
 }
 
-TypeDeserializer@160 {
-    classDescriptors('3': Integer@158) = DeserializedClassDescriptor@154['Any']
-    classDescriptors('4': Integer@159) = DeserializedClassDescriptor@4['Function1']
+null {
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@142 }
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@133 }
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@136 }
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@139 }
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@145 }
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/longQualifiedName.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/longQualifiedName.lazy.log
index c348849c019..fc87babfe51 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/longQualifiedName.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/longQualifiedName.lazy.log
@@ -26,12 +26,12 @@ DeserializedTypeParameterDescriptor@13['T'] {
     upperBoundsAsType = DeserializedType@16['kotlin.Any']
 }
 
-DeserializedType@12['kotlin.Any'] {
+DeserializedType@16['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@17
     memberScope = DeserializedClassMemberScope@18
 }
 
-DeserializedType@16['kotlin.Any'] {
+DeserializedType@12['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@17
     memberScope = DeserializedClassMemberScope@18
 }
@@ -131,12 +131,48 @@ LazyJavaPackageFragment@8['reflect'] {
 
 ResolutionTaskHolder@82 {
     <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
 }
 
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
+}
+
+ResolutionTaskHolder@88 {
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+}
+
+ResolutionTaskHolder@89 {
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
 }
 
 ResolutionTaskHolder@90 {
@@ -148,18 +184,6 @@ ResolutionTaskHolder@90 {
     <name not found> = EmptyList@57[empty]
     <name not found> = EmptyList@57[empty]
     <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
 }
 
 ResolutionTaskHolder@91 {
@@ -171,51 +195,30 @@ ResolutionTaskHolder@91 {
     <name not found> = EmptyList@57[empty]
     <name not found> = EmptyList@57[empty]
     <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
+TypeDeserializer@92 {
+    classDescriptors('2': Integer@93) = DeserializedClassDescriptor@94['Any']
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
+TypeDeserializer@95 {
+    classDescriptors('3': Integer@96) = DeserializedClassDescriptor@94['Any']
+    classDescriptors('4': Integer@97) = DeserializedClassDescriptor@2['ExtensionFunction0']
 }
 
-TypeDeserializer@94 {
-    classDescriptors('2': Integer@95) = DeserializedClassDescriptor@96['Any']
-}
-
-TypeDeserializer@97 {
-    classDescriptors('3': Integer@98) = DeserializedClassDescriptor@96['Any']
-    classDescriptors('4': Integer@99) = DeserializedClassDescriptor@2['ExtensionFunction0']
+null {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@87 }
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/longQualifiedNameGeneric.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/longQualifiedNameGeneric.lazy.log
index 2fa38ce05c3..0f9440b7146 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/longQualifiedNameGeneric.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/longQualifiedNameGeneric.lazy.log
@@ -38,12 +38,7 @@ DeserializedTypeParameterDescriptor@21['T'] {
     upperBoundsAsType = DeserializedType@24['kotlin.Any']
 }
 
-DeserializedType@20['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@25
-    memberScope = DeserializedClassMemberScope@26
-}
-
-DeserializedType@24['kotlin.Any'] {
+DeserializedType@12['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@25
     memberScope = DeserializedClassMemberScope@26
 }
@@ -53,7 +48,12 @@ DeserializedType@16['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@26
 }
 
-DeserializedType@12['kotlin.Any'] {
+DeserializedType@20['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@25
+    memberScope = DeserializedClassMemberScope@26
+}
+
+DeserializedType@24['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@25
     memberScope = DeserializedClassMemberScope@26
 }
@@ -174,12 +174,48 @@ LazyJavaPackageFragment@8['reflect'] {
 
 ResolutionTaskHolder@108 {
     <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
 }
 
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
+ResolutionTaskHolder@111 {
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
+}
+
+ResolutionTaskHolder@114 {
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+}
+
+ResolutionTaskHolder@115 {
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
 }
 
 ResolutionTaskHolder@116 {
@@ -191,18 +227,6 @@ ResolutionTaskHolder@116 {
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
 }
 
 ResolutionTaskHolder@117 {
@@ -214,51 +238,30 @@ ResolutionTaskHolder@117 {
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@118 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
+TypeDeserializer@118 {
+    classDescriptors('2': Integer@119) = DeserializedClassDescriptor@120['Any']
 }
 
-ResolutionTaskHolder@119 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
+TypeDeserializer@121 {
+    classDescriptors('3': Integer@122) = DeserializedClassDescriptor@120['Any']
+    classDescriptors('4': Integer@123) = DeserializedClassDescriptor@2['ExtensionFunction2']
 }
 
-TypeDeserializer@120 {
-    classDescriptors('2': Integer@121) = DeserializedClassDescriptor@122['Any']
-}
-
-TypeDeserializer@123 {
-    classDescriptors('3': Integer@124) = DeserializedClassDescriptor@122['Any']
-    classDescriptors('4': Integer@125) = DeserializedClassDescriptor@2['ExtensionFunction2']
+null {
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@113 }
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromClass.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromClass.lazy.log
index 479afe3f272..d46c4a3a692 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromClass.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromClass.lazy.log
@@ -58,7 +58,7 @@ DeserializedTypeParameterDescriptor@31['T'] {
     upperBoundsAsType = DeserializedType@34['kotlin.Any']
 }
 
-DeserializedType@30['kotlin.Any'] {
+DeserializedType@18['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -68,21 +68,21 @@ DeserializedType@22['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@34['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@18['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
 DeserializedType@26['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
 
+DeserializedType@30['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@35
+    memberScope = DeserializedClassMemberScope@36
+}
+
+DeserializedType@34['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@35
+    memberScope = DeserializedClassMemberScope@36
+}
+
 DeserializedType@37['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
 }
@@ -274,64 +274,67 @@ LazyJavaPackageFragment@14['reflect'] {
 
 ResolutionTaskHolder@136 {
     <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
     <name not found> = EmptyList@104[empty]
     <name not found> = EmptyList@104[empty]
 }
 
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
+ResolutionTaskHolder@139 {
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
     <name not found> = EmptyList@104[empty]
     <name not found> = EmptyList@104[empty]
 }
 
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
+ResolutionTaskHolder@142 {
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
     <name not found> = EmptyList@104[empty]
     <name not found> = EmptyList@104[empty]
 }
 
+ResolutionTaskHolder@145 {
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
+}
+
 ResolutionTaskHolder@148 {
     <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
 }
 
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
+ResolutionTaskHolder@151 {
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
 }
 
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
+TypeDeserializer@154 {
+    classDescriptors('2': Integer@155) = DeserializedClassDescriptor@156['Any']
 }
 
-TypeDeserializer@160 {
-    classDescriptors('2': Integer@161) = DeserializedClassDescriptor@162['Any']
+TypeDeserializer@157 {
+    classDescriptors('2': Integer@155) = DeserializedClassDescriptor@156['Any']
 }
 
-TypeDeserializer@163 {
-    classDescriptors('2': Integer@161) = DeserializedClassDescriptor@162['Any']
+TypeDeserializer@158 {
+    classDescriptors('2': Integer@155) = DeserializedClassDescriptor@156['Any']
 }
 
-TypeDeserializer@164 {
-    classDescriptors('2': Integer@161) = DeserializedClassDescriptor@162['Any']
+TypeDeserializer@159 {
+    classDescriptors('3': Integer@160) = DeserializedClassDescriptor@156['Any']
+    classDescriptors('4': Integer@161) = DeserializedClassDescriptor@2['ExtensionFunction0']
 }
 
-TypeDeserializer@165 {
-    classDescriptors('3': Integer@166) = DeserializedClassDescriptor@162['Any']
-    classDescriptors('4': Integer@167) = DeserializedClassDescriptor@2['ExtensionFunction0']
+TypeDeserializer@162 {
+    classDescriptors('3': Integer@160) = DeserializedClassDescriptor@156['Any']
+    classDescriptors('4': Integer@161) = DeserializedClassDescriptor@4['ExtensionFunction1']
 }
 
-TypeDeserializer@168 {
-    classDescriptors('3': Integer@166) = DeserializedClassDescriptor@162['Any']
-    classDescriptors('4': Integer@167) = DeserializedClassDescriptor@4['ExtensionFunction1']
+null {
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@141 }
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@166[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@153 }
+    <name not found> = ArrayList@168[1] { ResolutionCandidate@147 }
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromExtension.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromExtension.lazy.log
index 7144bd789ed..a1d06ab16e5 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromExtension.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromExtension.lazy.log
@@ -58,7 +58,7 @@ DeserializedTypeParameterDescriptor@31['T'] {
     upperBoundsAsType = DeserializedType@34['kotlin.Any']
 }
 
-DeserializedType@26['kotlin.Any'] {
+DeserializedType@22['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -68,7 +68,7 @@ DeserializedType@30['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@22['kotlin.Any'] {
+DeserializedType@26['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -274,64 +274,67 @@ LazyJavaPackageFragment@14['reflect'] {
 
 ResolutionTaskHolder@136 {
     <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
     <name not found> = EmptyList@104[empty]
     <name not found> = EmptyList@104[empty]
 }
 
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
+ResolutionTaskHolder@139 {
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
     <name not found> = EmptyList@104[empty]
     <name not found> = EmptyList@104[empty]
 }
 
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
+ResolutionTaskHolder@142 {
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
     <name not found> = EmptyList@104[empty]
     <name not found> = EmptyList@104[empty]
 }
 
+ResolutionTaskHolder@145 {
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
+}
+
 ResolutionTaskHolder@148 {
     <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
 }
 
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
+ResolutionTaskHolder@151 {
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
 }
 
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
+TypeDeserializer@154 {
+    classDescriptors('2': Integer@155) = DeserializedClassDescriptor@156['Any']
 }
 
-TypeDeserializer@160 {
-    classDescriptors('2': Integer@161) = DeserializedClassDescriptor@162['Any']
+TypeDeserializer@157 {
+    classDescriptors('2': Integer@155) = DeserializedClassDescriptor@156['Any']
 }
 
-TypeDeserializer@163 {
-    classDescriptors('2': Integer@161) = DeserializedClassDescriptor@162['Any']
+TypeDeserializer@158 {
+    classDescriptors('2': Integer@155) = DeserializedClassDescriptor@156['Any']
 }
 
-TypeDeserializer@164 {
-    classDescriptors('2': Integer@161) = DeserializedClassDescriptor@162['Any']
+TypeDeserializer@159 {
+    classDescriptors('3': Integer@160) = DeserializedClassDescriptor@156['Any']
+    classDescriptors('4': Integer@161) = DeserializedClassDescriptor@2['ExtensionFunction0']
 }
 
-TypeDeserializer@165 {
-    classDescriptors('3': Integer@166) = DeserializedClassDescriptor@162['Any']
-    classDescriptors('4': Integer@167) = DeserializedClassDescriptor@2['ExtensionFunction0']
+TypeDeserializer@162 {
+    classDescriptors('3': Integer@160) = DeserializedClassDescriptor@156['Any']
+    classDescriptors('4': Integer@161) = DeserializedClassDescriptor@4['ExtensionFunction1']
 }
 
-TypeDeserializer@168 {
-    classDescriptors('3': Integer@166) = DeserializedClassDescriptor@162['Any']
-    classDescriptors('4': Integer@167) = DeserializedClassDescriptor@4['ExtensionFunction1']
+null {
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@141 }
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@166[1] { ResolutionCandidate@153 }
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@168[1] { ResolutionCandidate@147 }
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromExtensionInClass.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromExtensionInClass.lazy.log
index 69b251b5c47..04c48a2b481 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromExtensionInClass.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromExtensionInClass.lazy.log
@@ -68,7 +68,7 @@ DeserializedType@26['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@18['kotlin.Any'] {
+DeserializedType@22['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -78,7 +78,7 @@ DeserializedType@30['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@22['kotlin.Any'] {
+DeserializedType@18['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -275,64 +275,67 @@ LazyJavaPackageFragment@14['reflect'] {
 
 ResolutionTaskHolder@137 {
     <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@139 }
-    <name not found> = EmptyList@105[empty]
-    <name not found> = EmptyList@105[empty]
     <name not found> = EmptyList@105[empty]
     <name not found> = EmptyList@105[empty]
 }
 
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@143 }
-    <name not found> = EmptyList@105[empty]
-    <name not found> = EmptyList@105[empty]
+ResolutionTaskHolder@140 {
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
     <name not found> = EmptyList@105[empty]
     <name not found> = EmptyList@105[empty]
 }
 
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@147 }
-    <name not found> = EmptyList@105[empty]
-    <name not found> = EmptyList@105[empty]
+ResolutionTaskHolder@143 {
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
     <name not found> = EmptyList@105[empty]
     <name not found> = EmptyList@105[empty]
 }
 
+ResolutionTaskHolder@146 {
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
+}
+
 ResolutionTaskHolder@149 {
     <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@151 }
 }
 
-ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@155 }
+ResolutionTaskHolder@152 {
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
 }
 
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@159 }
+TypeDeserializer@155 {
+    classDescriptors('2': Integer@156) = DeserializedClassDescriptor@157['Any']
 }
 
-TypeDeserializer@161 {
-    classDescriptors('2': Integer@162) = DeserializedClassDescriptor@163['Any']
+TypeDeserializer@158 {
+    classDescriptors('2': Integer@156) = DeserializedClassDescriptor@157['Any']
 }
 
-TypeDeserializer@164 {
-    classDescriptors('2': Integer@162) = DeserializedClassDescriptor@163['Any']
+TypeDeserializer@159 {
+    classDescriptors('2': Integer@156) = DeserializedClassDescriptor@157['Any']
 }
 
-TypeDeserializer@165 {
-    classDescriptors('2': Integer@162) = DeserializedClassDescriptor@163['Any']
+TypeDeserializer@160 {
+    classDescriptors('3': Integer@161) = DeserializedClassDescriptor@157['Any']
+    classDescriptors('4': Integer@162) = DeserializedClassDescriptor@2['ExtensionFunction0']
 }
 
-TypeDeserializer@166 {
-    classDescriptors('3': Integer@167) = DeserializedClassDescriptor@163['Any']
-    classDescriptors('4': Integer@168) = DeserializedClassDescriptor@2['ExtensionFunction0']
+TypeDeserializer@163 {
+    classDescriptors('3': Integer@161) = DeserializedClassDescriptor@157['Any']
+    classDescriptors('4': Integer@162) = DeserializedClassDescriptor@4['ExtensionFunction1']
 }
 
-TypeDeserializer@169 {
-    classDescriptors('3': Integer@167) = DeserializedClassDescriptor@163['Any']
-    classDescriptors('4': Integer@168) = DeserializedClassDescriptor@4['ExtensionFunction1']
+null {
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@145 }
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@142 }
+    <name not found> = ArrayList@166[1] { ResolutionCandidate@139 }
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@154 }
+    <name not found> = ArrayList@168[1] { ResolutionCandidate@148 }
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@151 }
+    <name not found> = EmptyList@105[empty]
+    <name not found> = EmptyList@105[empty]
+    <name not found> = EmptyList@105[empty]
+    <name not found> = EmptyList@105[empty]
+    <name not found> = EmptyList@105[empty]
+    <name not found> = EmptyList@105[empty]
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromTopLevel.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromTopLevel.lazy.log
index 105efd80dd0..d6a3e006976 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromTopLevel.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromTopLevel.lazy.log
@@ -63,12 +63,7 @@ DeserializedType@22['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@34['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@26['kotlin.Any'] {
+DeserializedType@18['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -78,7 +73,12 @@ DeserializedType@30['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@18['kotlin.Any'] {
+DeserializedType@34['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@35
+    memberScope = DeserializedClassMemberScope@36
+}
+
+DeserializedType@26['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -214,32 +214,140 @@ LazyJavaPackageFragment@14['reflect'] {
 
 ResolutionTaskHolder@126 {
     <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
 }
 
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@132 }
+ResolutionTaskHolder@129 {
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
 }
 
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@136 }
+ResolutionTaskHolder@132 {
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
+}
+
+ResolutionTaskHolder@135 {
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
 }
 
 ResolutionTaskHolder@138 {
     <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@140 }
 }
 
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@144 }
+ResolutionTaskHolder@141 {
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
+}
+
+ResolutionTaskHolder@144 {
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+}
+
+ResolutionTaskHolder@145 {
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
 }
 
 ResolutionTaskHolder@146 {
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@148 }
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+}
+
+ResolutionTaskHolder@147 {
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+}
+
+ResolutionTaskHolder@148 {
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+}
+
+ResolutionTaskHolder@149 {
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
 }
 
 ResolutionTaskHolder@150 {
@@ -251,18 +359,6 @@ ResolutionTaskHolder@150 {
     <name not found> = EmptyList@102[empty]
     <name not found> = EmptyList@102[empty]
     <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
 }
 
 ResolutionTaskHolder@151 {
@@ -274,18 +370,6 @@ ResolutionTaskHolder@151 {
     <name not found> = EmptyList@102[empty]
     <name not found> = EmptyList@102[empty]
     <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
 }
 
 ResolutionTaskHolder@152 {
@@ -297,18 +381,6 @@ ResolutionTaskHolder@152 {
     <name not found> = EmptyList@102[empty]
     <name not found> = EmptyList@102[empty]
     <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
 }
 
 ResolutionTaskHolder@153 {
@@ -320,18 +392,6 @@ ResolutionTaskHolder@153 {
     <name not found> = EmptyList@102[empty]
     <name not found> = EmptyList@102[empty]
     <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
 }
 
 ResolutionTaskHolder@154 {
@@ -343,18 +403,6 @@ ResolutionTaskHolder@154 {
     <name not found> = EmptyList@102[empty]
     <name not found> = EmptyList@102[empty]
     <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
 }
 
 ResolutionTaskHolder@155 {
@@ -366,86 +414,63 @@ ResolutionTaskHolder@155 {
     <name not found> = EmptyList@102[empty]
     <name not found> = EmptyList@102[empty]
     <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
 }
 
-ResolutionTaskHolder@156 {
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
+TypeDeserializer@156 {
+    classDescriptors('2': Integer@157) = DeserializedClassDescriptor@158['Any']
 }
 
-ResolutionTaskHolder@157 {
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
+TypeDeserializer@159 {
+    classDescriptors('2': Integer@157) = DeserializedClassDescriptor@158['Any']
 }
 
-ResolutionTaskHolder@158 {
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
+TypeDeserializer@160 {
+    classDescriptors('2': Integer@157) = DeserializedClassDescriptor@158['Any']
 }
 
-ResolutionTaskHolder@159 {
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
+TypeDeserializer@161 {
+    classDescriptors('3': Integer@162) = DeserializedClassDescriptor@158['Any']
+    classDescriptors('4': Integer@163) = DeserializedClassDescriptor@2['ExtensionFunction0']
 }
 
-ResolutionTaskHolder@160 {
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
+TypeDeserializer@164 {
+    classDescriptors('3': Integer@162) = DeserializedClassDescriptor@158['Any']
+    classDescriptors('4': Integer@163) = DeserializedClassDescriptor@4['ExtensionFunction1']
 }
 
-ResolutionTaskHolder@161 {
+null {
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@134 }
+    <name not found> = ArrayList@166[1] { ResolutionCandidate@137 }
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@131 }
+    <name not found> = ArrayList@168[1] { ResolutionCandidate@128 }
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@143 }
+    <name not found> = ArrayList@170[1] { ResolutionCandidate@140 }
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
     <name not found> = EmptyList@102[empty]
     <name not found> = EmptyList@102[empty]
     <name not found> = EmptyList@102[empty]
@@ -457,25 +482,3 @@ ResolutionTaskHolder@161 {
     <name not found> = EmptyList@102[empty]
     <name not found> = EmptyList@102[empty]
 }
-
-TypeDeserializer@162 {
-    classDescriptors('2': Integer@163) = DeserializedClassDescriptor@164['Any']
-}
-
-TypeDeserializer@165 {
-    classDescriptors('2': Integer@163) = DeserializedClassDescriptor@164['Any']
-}
-
-TypeDeserializer@166 {
-    classDescriptors('2': Integer@163) = DeserializedClassDescriptor@164['Any']
-}
-
-TypeDeserializer@167 {
-    classDescriptors('3': Integer@168) = DeserializedClassDescriptor@164['Any']
-    classDescriptors('4': Integer@169) = DeserializedClassDescriptor@2['ExtensionFunction0']
-}
-
-TypeDeserializer@170 {
-    classDescriptors('3': Integer@168) = DeserializedClassDescriptor@164['Any']
-    classDescriptors('4': Integer@169) = DeserializedClassDescriptor@4['ExtensionFunction1']
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromClass.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromClass.lazy.log
index c4df29a088d..909ca3cf5ac 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromClass.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromClass.lazy.log
@@ -130,25 +130,6 @@ LazyJavaPackageFragment@6['reflect'] {
 
 ResolutionTaskHolder@82 {
     <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
@@ -169,27 +150,8 @@ ResolutionTaskHolder@82 {
     <name not found> = EmptyList@51[empty]
 }
 
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
@@ -210,82 +172,138 @@ ResolutionTaskHolder@86 {
     <name not found> = EmptyList@51[empty]
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
+}
+
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
 }
 
 ResolutionTaskHolder@94 {
     <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
 }
 
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
 }
 
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
+}
+
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
 }
 
 ResolutionTaskHolder@106 {
     <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
+}
+
+ResolutionTaskHolder@109 {
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
 }
 
 ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
 }
 
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
+ResolutionTaskHolder@111 {
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
 }
 
-ResolutionTaskHolder@118 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
+ResolutionTaskHolder@112 {
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
@@ -302,6 +320,9 @@ ResolutionTaskHolder@118 {
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
+}
+
+ResolutionTaskHolder@113 {
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
@@ -320,29 +341,7 @@ ResolutionTaskHolder@118 {
     <name not found> = EmptyList@51[empty]
 }
 
-ResolutionTaskHolder@119 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
+ResolutionTaskHolder@114 {
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
@@ -353,19 +352,7 @@ ResolutionTaskHolder@119 {
     <name not found> = EmptyList@51[empty]
 }
 
-ResolutionTaskHolder@120 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
+ResolutionTaskHolder@115 {
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
@@ -376,19 +363,7 @@ ResolutionTaskHolder@120 {
     <name not found> = EmptyList@51[empty]
 }
 
-ResolutionTaskHolder@121 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
+ResolutionTaskHolder@116 {
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
@@ -399,43 +374,93 @@ ResolutionTaskHolder@121 {
     <name not found> = EmptyList@51[empty]
 }
 
-ResolutionTaskHolder@122 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
+TypeDeserializer@117 {
+    classDescriptors('2': Integer@118) = DeserializedClassDescriptor@119['Any']
 }
 
-ResolutionTaskHolder@123 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
+TypeDeserializer@120 {
+    classDescriptors('3': Integer@121) = DeserializedClassDescriptor@119['Any']
+    classDescriptors('4': Integer@122) = DeserializedClassDescriptor@2['Function0']
 }
 
-ResolutionTaskHolder@124 {
+null {
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@102 }
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
@@ -447,25 +472,3 @@ ResolutionTaskHolder@124 {
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
 }
-
-ResolutionTaskHolder@125 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-TypeDeserializer@126 {
-    classDescriptors('2': Integer@127) = DeserializedClassDescriptor@128['Any']
-}
-
-TypeDeserializer@129 {
-    classDescriptors('3': Integer@130) = DeserializedClassDescriptor@128['Any']
-    classDescriptors('4': Integer@131) = DeserializedClassDescriptor@2['Function0']
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromExtension.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromExtension.lazy.log
index 299b0e34adf..844d8ed01b7 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromExtension.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromExtension.lazy.log
@@ -133,18 +133,6 @@ LazyJavaPackageFragment@6['reflect'] {
 
 ResolutionTaskHolder@82 {
     <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
@@ -194,32 +182,151 @@ ResolutionTaskHolder@82 {
     <name not found> = EmptyList@51[empty]
 }
 
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
 }
 
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
+}
+
 ResolutionTaskHolder@94 {
     <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+}
+
+ResolutionTaskHolder@97 {
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
 }
 
 ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+}
+
+ResolutionTaskHolder@99 {
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+}
+
+ResolutionTaskHolder@100 {
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+}
+
+ResolutionTaskHolder@101 {
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
 }
 
 ResolutionTaskHolder@102 {
@@ -231,117 +338,48 @@ ResolutionTaskHolder@102 {
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
 }
 
-ResolutionTaskHolder@103 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
+TypeDeserializer@103 {
+    classDescriptors('2': Integer@104) = DeserializedClassDescriptor@105['Any']
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
+TypeDeserializer@106 {
+    classDescriptors('3': Integer@107) = DeserializedClassDescriptor@105['Any']
+    classDescriptors('4': Integer@108) = DeserializedClassDescriptor@2['Function0']
 }
 
-ResolutionTaskHolder@105 {
+null {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@96 }
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
@@ -363,38 +401,3 @@ ResolutionTaskHolder@105 {
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
 }
-
-ResolutionTaskHolder@106 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-TypeDeserializer@108 {
-    classDescriptors('2': Integer@109) = DeserializedClassDescriptor@110['Any']
-}
-
-TypeDeserializer@111 {
-    classDescriptors('3': Integer@112) = DeserializedClassDescriptor@110['Any']
-    classDescriptors('4': Integer@113) = DeserializedClassDescriptor@2['Function0']
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromTopLevel.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromTopLevel.lazy.log
index 76f0235ffce..739a276ce5d 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromTopLevel.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromTopLevel.lazy.log
@@ -94,23 +94,15 @@ LazyJavaPackageFragment@6['reflect'] {
 
 ResolutionTaskHolder@67 {
     <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
     <name not found> = EmptyList@45[empty]
     <name not found> = EmptyList@45[empty]
 }
 
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
 }
 
-ResolutionTaskHolder@75 {
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
+ResolutionTaskHolder@73 {
     <name not found> = EmptyList@45[empty]
     <name not found> = EmptyList@45[empty]
     <name not found> = EmptyList@45[empty]
@@ -129,9 +121,7 @@ ResolutionTaskHolder@75 {
     <name not found> = EmptyList@45[empty]
 }
 
-ResolutionTaskHolder@76 {
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
+ResolutionTaskHolder@74 {
     <name not found> = EmptyList@45[empty]
     <name not found> = EmptyList@45[empty]
     <name not found> = EmptyList@45[empty]
@@ -142,11 +132,24 @@ ResolutionTaskHolder@76 {
     <name not found> = EmptyList@45[empty]
 }
 
-TypeDeserializer@77 {
-    classDescriptors('2': Integer@78) = DeserializedClassDescriptor@79['Any']
+TypeDeserializer@75 {
+    classDescriptors('2': Integer@76) = DeserializedClassDescriptor@77['Any']
 }
 
-TypeDeserializer@80 {
-    classDescriptors('3': Integer@81) = DeserializedClassDescriptor@79['Any']
-    classDescriptors('4': Integer@82) = DeserializedClassDescriptor@2['Function0']
+TypeDeserializer@78 {
+    classDescriptors('3': Integer@79) = DeserializedClassDescriptor@77['Any']
+    classDescriptors('4': Integer@80) = DeserializedClassDescriptor@2['Function0']
+}
+
+null {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@72 }
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityLocalVsTopLevel.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityLocalVsTopLevel.lazy.log
index db94cefb91e..56b49243992 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityLocalVsTopLevel.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityLocalVsTopLevel.lazy.log
@@ -102,13 +102,16 @@ LazyJavaPackageFragment@8['reflect'] {
 
 ResolutionTaskHolder@57 {
     <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
 }
 
-TypeDeserializer@61 {
-    classDescriptors('2': Integer@62) = DeserializedClassDescriptor@63['Any']
+TypeDeserializer@60 {
+    classDescriptors('2': Integer@61) = DeserializedClassDescriptor@62['Any']
 }
 
-TypeDeserializer@64 {
-    classDescriptors('4': Integer@65) = DeserializedClassDescriptor@2['Function0']
+TypeDeserializer@63 {
+    classDescriptors('4': Integer@64) = DeserializedClassDescriptor@2['Function0']
+}
+
+null {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@59 }
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsExtension.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsExtension.lazy.log
index cb6f9958320..c43abfef71d 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsExtension.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsExtension.lazy.log
@@ -124,12 +124,48 @@ LazyJavaPackageFragment@8['reflect'] {
 
 ResolutionTaskHolder@81 {
     <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
 }
 
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
+}
+
+ResolutionTaskHolder@87 {
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+}
+
+ResolutionTaskHolder@88 {
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
 }
 
 ResolutionTaskHolder@89 {
@@ -141,18 +177,6 @@ ResolutionTaskHolder@89 {
     <name not found> = EmptyList@57[empty]
     <name not found> = EmptyList@57[empty]
     <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
 }
 
 ResolutionTaskHolder@90 {
@@ -164,51 +188,30 @@ ResolutionTaskHolder@90 {
     <name not found> = EmptyList@57[empty]
     <name not found> = EmptyList@57[empty]
     <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
 }
 
-ResolutionTaskHolder@91 {
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
+TypeDeserializer@91 {
+    classDescriptors('2': Integer@92) = DeserializedClassDescriptor@93['Any']
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
+TypeDeserializer@94 {
+    classDescriptors('3': Integer@95) = DeserializedClassDescriptor@93['Any']
+    classDescriptors('4': Integer@96) = DeserializedClassDescriptor@2['ExtensionFunction0']
 }
 
-TypeDeserializer@93 {
-    classDescriptors('2': Integer@94) = DeserializedClassDescriptor@95['Any']
-}
-
-TypeDeserializer@96 {
-    classDescriptors('3': Integer@97) = DeserializedClassDescriptor@95['Any']
-    classDescriptors('4': Integer@98) = DeserializedClassDescriptor@2['ExtensionFunction0']
+null {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@83 }
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsTopLevel.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsTopLevel.lazy.log
index 4f8abec671c..082f25f9dc8 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsTopLevel.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsTopLevel.lazy.log
@@ -27,12 +27,12 @@ DeserializedTypeParameterDescriptor@13['T'] {
     upperBoundsAsType = DeserializedType@16['kotlin.Any']
 }
 
-DeserializedType@12['kotlin.Any'] {
+DeserializedType@16['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@17
     memberScope = DeserializedClassMemberScope@18
 }
 
-DeserializedType@16['kotlin.Any'] {
+DeserializedType@12['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@17
     memberScope = DeserializedClassMemberScope@18
 }
@@ -153,27 +153,30 @@ LazyJavaPackageFragment@8['reflect'] {
 
 ResolutionTaskHolder@89 {
     <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
     <name not found> = EmptyList@58[empty]
     <name not found> = EmptyList@58[empty]
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
 }
 
-TypeDeserializer@97 {
-    classDescriptors('2': Integer@98) = DeserializedClassDescriptor@99['Any']
+TypeDeserializer@95 {
+    classDescriptors('2': Integer@96) = DeserializedClassDescriptor@97['Any']
 }
 
-TypeDeserializer@100 {
-    classDescriptors('2': Integer@98) = DeserializedClassDescriptor@99['Any']
+TypeDeserializer@98 {
+    classDescriptors('2': Integer@96) = DeserializedClassDescriptor@97['Any']
 }
 
-TypeDeserializer@101 {
-    classDescriptors('3': Integer@102) = DeserializedClassDescriptor@99['Any']
-    classDescriptors('4': Integer@103) = DeserializedClassDescriptor@2['ExtensionFunction0']
+TypeDeserializer@99 {
+    classDescriptors('3': Integer@100) = DeserializedClassDescriptor@97['Any']
+    classDescriptors('4': Integer@101) = DeserializedClassDescriptor@2['ExtensionFunction0']
+}
+
+null {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@94 }
+    <name not found> = EmptyList@58[empty]
+    <name not found> = EmptyList@58[empty]
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/renameOnImport.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/renameOnImport.lazy.log
index cdbb120f7f1..4b3e56a4ea9 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/renameOnImport.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/renameOnImport.lazy.log
@@ -73,17 +73,12 @@ DeserializedTypeParameterDescriptor@39['T'] {
     upperBoundsAsType = DeserializedType@42['kotlin.Any']
 }
 
-DeserializedType@38['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@43
-    memberScope = DeserializedClassMemberScope@44
-}
-
 DeserializedType@42['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@43
     memberScope = DeserializedClassMemberScope@44
 }
 
-DeserializedType@22['kotlin.Any'] {
+DeserializedType@30['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@43
     memberScope = DeserializedClassMemberScope@44
 }
@@ -98,7 +93,12 @@ DeserializedType@34['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@44
 }
 
-DeserializedType@30['kotlin.Any'] {
+DeserializedType@22['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@43
+    memberScope = DeserializedClassMemberScope@44
+}
+
+DeserializedType@38['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@43
     memberScope = DeserializedClassMemberScope@44
 }
@@ -306,40 +306,128 @@ LazyJavaPackageFragment@18['reflect'] {
 
 ResolutionTaskHolder@169 {
     <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@171 }
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
     <name not found> = EmptyList@133[empty]
     <name not found> = EmptyList@133[empty]
 }
 
-ResolutionTaskHolder@173 {
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@175 }
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
+ResolutionTaskHolder@172 {
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
     <name not found> = EmptyList@133[empty]
     <name not found> = EmptyList@133[empty]
 }
 
-ResolutionTaskHolder@177 {
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@179 }
+ResolutionTaskHolder@175 {
+    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
+}
+
+ResolutionTaskHolder@178 {
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
 }
 
 ResolutionTaskHolder@181 {
     <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@183 }
 }
 
-ResolutionTaskHolder@185 {
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@187 }
+ResolutionTaskHolder@184 {
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
+}
+
+ResolutionTaskHolder@187 {
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+}
+
+ResolutionTaskHolder@188 {
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
 }
 
 ResolutionTaskHolder@189 {
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@191 }
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+}
+
+ResolutionTaskHolder@190 {
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+}
+
+ResolutionTaskHolder@191 {
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+}
+
+ResolutionTaskHolder@192 {
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
 }
 
 ResolutionTaskHolder@193 {
@@ -351,18 +439,6 @@ ResolutionTaskHolder@193 {
     <name not found> = EmptyList@133[empty]
     <name not found> = EmptyList@133[empty]
     <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
 }
 
 ResolutionTaskHolder@194 {
@@ -374,145 +450,72 @@ ResolutionTaskHolder@194 {
     <name not found> = EmptyList@133[empty]
     <name not found> = EmptyList@133[empty]
     <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
 }
 
-ResolutionTaskHolder@195 {
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
+TypeDeserializer@195 {
+    classDescriptors('2': Integer@196) = DeserializedClassDescriptor@197['Any']
 }
 
-ResolutionTaskHolder@196 {
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
+TypeDeserializer@198 {
+    classDescriptors('2': Integer@196) = DeserializedClassDescriptor@197['Any']
 }
 
-ResolutionTaskHolder@197 {
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
+TypeDeserializer@199 {
+    classDescriptors('2': Integer@196) = DeserializedClassDescriptor@197['Any']
 }
 
-ResolutionTaskHolder@198 {
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-}
-
-ResolutionTaskHolder@199 {
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-}
-
-ResolutionTaskHolder@200 {
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
+TypeDeserializer@200 {
+    classDescriptors('2': Integer@196) = DeserializedClassDescriptor@197['Any']
 }
 
 TypeDeserializer@201 {
-    classDescriptors('2': Integer@202) = DeserializedClassDescriptor@203['Any']
+    classDescriptors('3': Integer@202) = DeserializedClassDescriptor@197['Any']
+    classDescriptors('4': Integer@203) = DeserializedClassDescriptor@2['ExtensionFunction0']
 }
 
 TypeDeserializer@204 {
-    classDescriptors('2': Integer@202) = DeserializedClassDescriptor@203['Any']
+    classDescriptors('3': Integer@202) = DeserializedClassDescriptor@197['Any']
+    classDescriptors('4': Integer@203) = DeserializedClassDescriptor@4['ExtensionFunction1']
 }
 
 TypeDeserializer@205 {
-    classDescriptors('2': Integer@202) = DeserializedClassDescriptor@203['Any']
+    classDescriptors('3': Integer@202) = DeserializedClassDescriptor@197['Any']
+    classDescriptors('4': Integer@203) = DeserializedClassDescriptor@6['Function0']
 }
 
-TypeDeserializer@206 {
-    classDescriptors('2': Integer@202) = DeserializedClassDescriptor@203['Any']
-}
-
-TypeDeserializer@207 {
-    classDescriptors('3': Integer@208) = DeserializedClassDescriptor@203['Any']
-    classDescriptors('4': Integer@209) = DeserializedClassDescriptor@2['ExtensionFunction0']
-}
-
-TypeDeserializer@210 {
-    classDescriptors('3': Integer@208) = DeserializedClassDescriptor@203['Any']
-    classDescriptors('4': Integer@209) = DeserializedClassDescriptor@4['ExtensionFunction1']
-}
-
-TypeDeserializer@211 {
-    classDescriptors('3': Integer@208) = DeserializedClassDescriptor@203['Any']
-    classDescriptors('4': Integer@209) = DeserializedClassDescriptor@6['Function0']
+null {
+    <name not found> = ArrayList@206[1] { ResolutionCandidate@171 }
+    <name not found> = ArrayList@207[1] { ResolutionCandidate@186 }
+    <name not found> = ArrayList@208[1] { ResolutionCandidate@174 }
+    <name not found> = ArrayList@209[1] { ResolutionCandidate@183 }
+    <name not found> = ArrayList@210[1] { ResolutionCandidate@177 }
+    <name not found> = ArrayList@211[1] { ResolutionCandidate@180 }
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromClass.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromClass.lazy.log
index 646e38f0eca..487cd5ee048 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromClass.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromClass.lazy.log
@@ -46,11 +46,6 @@ DeserializedTypeParameterDescriptor@23['R'] {
     upperBounds = LinkedHashSet@25[1] { DeserializedType@26['kotlin.Any'] }
 }
 
-DeserializedType@22['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-    memberScope = DeserializedClassMemberScope@28
-}
-
 DeserializedType@18['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
     memberScope = DeserializedClassMemberScope@28
@@ -61,6 +56,11 @@ DeserializedType@26['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@28
 }
 
+DeserializedType@22['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@27
+    memberScope = DeserializedClassMemberScope@28
+}
+
 DeserializedType@29['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
 }
@@ -247,15 +247,6 @@ LazyJavaPackageFragment@14['reflect'] {
 
 ResolutionTaskHolder@123 {
     <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@125 }
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
     <name not found> = EmptyList@91[empty]
     <name not found> = EmptyList@91[empty]
     <name not found> = EmptyList@91[empty]
@@ -266,17 +257,8 @@ ResolutionTaskHolder@123 {
     <name not found> = EmptyList@91[empty]
 }
 
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@129 }
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
+ResolutionTaskHolder@126 {
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
     <name not found> = EmptyList@91[empty]
     <name not found> = EmptyList@91[empty]
     <name not found> = EmptyList@91[empty]
@@ -287,17 +269,8 @@ ResolutionTaskHolder@127 {
     <name not found> = EmptyList@91[empty]
 }
 
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@133 }
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
+ResolutionTaskHolder@129 {
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
     <name not found> = EmptyList@91[empty]
     <name not found> = EmptyList@91[empty]
     <name not found> = EmptyList@91[empty]
@@ -308,39 +281,69 @@ ResolutionTaskHolder@131 {
     <name not found> = EmptyList@91[empty]
 }
 
+ResolutionTaskHolder@132 {
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
+}
+
 ResolutionTaskHolder@135 {
     <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@137 }
 }
 
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@141 }
+ResolutionTaskHolder@138 {
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
 }
 
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@145 }
+TypeDeserializer@141 {
+    classDescriptors('2': Integer@142) = DeserializedClassDescriptor@143['Any']
 }
 
-TypeDeserializer@147 {
-    classDescriptors('2': Integer@148) = DeserializedClassDescriptor@149['Any']
+TypeDeserializer@144 {
+    classDescriptors('2': Integer@142) = DeserializedClassDescriptor@143['Any']
 }
 
-TypeDeserializer@150 {
-    classDescriptors('2': Integer@148) = DeserializedClassDescriptor@149['Any']
+TypeDeserializer@145 {
+    classDescriptors('2': Integer@142) = DeserializedClassDescriptor@143['Any']
 }
 
-TypeDeserializer@151 {
-    classDescriptors('2': Integer@148) = DeserializedClassDescriptor@149['Any']
+TypeDeserializer@146 {
+    classDescriptors('3': Integer@147) = DeserializedClassDescriptor@143['Any']
+    classDescriptors('4': Integer@148) = DeserializedClassDescriptor@2['Function0']
 }
 
-TypeDeserializer@152 {
-    classDescriptors('3': Integer@153) = DeserializedClassDescriptor@149['Any']
-    classDescriptors('4': Integer@154) = DeserializedClassDescriptor@2['Function0']
+TypeDeserializer@149 {
+    classDescriptors('3': Integer@147) = DeserializedClassDescriptor@143['Any']
+    classDescriptors('4': Integer@148) = DeserializedClassDescriptor@4['Function1']
 }
 
-TypeDeserializer@155 {
-    classDescriptors('3': Integer@153) = DeserializedClassDescriptor@149['Any']
-    classDescriptors('4': Integer@154) = DeserializedClassDescriptor@4['Function1']
+null {
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@125 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@131 }
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@128 }
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@134 }
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@140 }
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@137 }
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromExtension.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromExtension.lazy.log
index 09d0b3d4e63..15fb9ee28fa 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromExtension.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromExtension.lazy.log
@@ -46,12 +46,12 @@ DeserializedTypeParameterDescriptor@23['R'] {
     upperBounds = LinkedHashSet@25[1] { DeserializedType@26['kotlin.Any'] }
 }
 
-DeserializedType@22['kotlin.Any'] {
+DeserializedType@26['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
     memberScope = DeserializedClassMemberScope@28
 }
 
-DeserializedType@26['kotlin.Any'] {
+DeserializedType@22['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
     memberScope = DeserializedClassMemberScope@28
 }
@@ -252,15 +252,6 @@ LazyJavaPackageFragment@14['reflect'] {
 
 ResolutionTaskHolder@128 {
     <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
     <name not found> = EmptyList@96[empty]
     <name not found> = EmptyList@96[empty]
     <name not found> = EmptyList@96[empty]
@@ -271,17 +262,8 @@ ResolutionTaskHolder@128 {
     <name not found> = EmptyList@96[empty]
 }
 
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
+ResolutionTaskHolder@131 {
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
     <name not found> = EmptyList@96[empty]
     <name not found> = EmptyList@96[empty]
     <name not found> = EmptyList@96[empty]
@@ -292,17 +274,8 @@ ResolutionTaskHolder@132 {
     <name not found> = EmptyList@96[empty]
 }
 
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
+ResolutionTaskHolder@134 {
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
     <name not found> = EmptyList@96[empty]
     <name not found> = EmptyList@96[empty]
     <name not found> = EmptyList@96[empty]
@@ -313,39 +286,69 @@ ResolutionTaskHolder@136 {
     <name not found> = EmptyList@96[empty]
 }
 
+ResolutionTaskHolder@137 {
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
+}
+
 ResolutionTaskHolder@140 {
     <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
 }
 
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
+ResolutionTaskHolder@143 {
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
 }
 
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
+TypeDeserializer@146 {
+    classDescriptors('2': Integer@147) = DeserializedClassDescriptor@148['Any']
 }
 
-TypeDeserializer@152 {
-    classDescriptors('2': Integer@153) = DeserializedClassDescriptor@154['Any']
+TypeDeserializer@149 {
+    classDescriptors('2': Integer@147) = DeserializedClassDescriptor@148['Any']
 }
 
-TypeDeserializer@155 {
-    classDescriptors('2': Integer@153) = DeserializedClassDescriptor@154['Any']
+TypeDeserializer@150 {
+    classDescriptors('2': Integer@147) = DeserializedClassDescriptor@148['Any']
 }
 
-TypeDeserializer@156 {
-    classDescriptors('2': Integer@153) = DeserializedClassDescriptor@154['Any']
+TypeDeserializer@151 {
+    classDescriptors('3': Integer@152) = DeserializedClassDescriptor@148['Any']
+    classDescriptors('4': Integer@153) = DeserializedClassDescriptor@2['Function0']
 }
 
-TypeDeserializer@157 {
-    classDescriptors('3': Integer@158) = DeserializedClassDescriptor@154['Any']
-    classDescriptors('4': Integer@159) = DeserializedClassDescriptor@2['Function0']
+TypeDeserializer@154 {
+    classDescriptors('3': Integer@152) = DeserializedClassDescriptor@148['Any']
+    classDescriptors('4': Integer@153) = DeserializedClassDescriptor@4['Function1']
 }
 
-TypeDeserializer@160 {
-    classDescriptors('3': Integer@158) = DeserializedClassDescriptor@154['Any']
-    classDescriptors('4': Integer@159) = DeserializedClassDescriptor@4['Function1']
+null {
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@133 }
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@136 }
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@139 }
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@145 }
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@142 }
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromExtensionInClass.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromExtensionInClass.lazy.log
index 0f721b5b794..d95a36df8db 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromExtensionInClass.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromExtensionInClass.lazy.log
@@ -46,11 +46,6 @@ DeserializedTypeParameterDescriptor@23['R'] {
     upperBounds = LinkedHashSet@25[1] { DeserializedType@26['kotlin.Any'] }
 }
 
-DeserializedType@18['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-    memberScope = DeserializedClassMemberScope@28
-}
-
 DeserializedType@26['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
     memberScope = DeserializedClassMemberScope@28
@@ -61,6 +56,11 @@ DeserializedType@22['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@28
 }
 
+DeserializedType@18['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@27
+    memberScope = DeserializedClassMemberScope@28
+}
+
 DeserializedType@29['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
 }
@@ -253,25 +253,6 @@ LazyJavaPackageFragment@14['reflect'] {
 
 ResolutionTaskHolder@129 {
     <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@131 }
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
     <name not found> = EmptyList@97[empty]
     <name not found> = EmptyList@97[empty]
     <name not found> = EmptyList@97[empty]
@@ -292,27 +273,8 @@ ResolutionTaskHolder@129 {
     <name not found> = EmptyList@97[empty]
 }
 
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@135 }
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
+ResolutionTaskHolder@132 {
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
     <name not found> = EmptyList@97[empty]
     <name not found> = EmptyList@97[empty]
     <name not found> = EmptyList@97[empty]
@@ -333,27 +295,8 @@ ResolutionTaskHolder@133 {
     <name not found> = EmptyList@97[empty]
 }
 
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@139 }
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
+ResolutionTaskHolder@135 {
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
     <name not found> = EmptyList@97[empty]
     <name not found> = EmptyList@97[empty]
     <name not found> = EmptyList@97[empty]
@@ -374,39 +317,99 @@ ResolutionTaskHolder@137 {
     <name not found> = EmptyList@97[empty]
 }
 
+ResolutionTaskHolder@138 {
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
+}
+
 ResolutionTaskHolder@141 {
     <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@143 }
 }
 
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@147 }
+ResolutionTaskHolder@144 {
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
 }
 
-ResolutionTaskHolder@149 {
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@151 }
+TypeDeserializer@147 {
+    classDescriptors('2': Integer@148) = DeserializedClassDescriptor@149['Any']
 }
 
-TypeDeserializer@153 {
-    classDescriptors('2': Integer@154) = DeserializedClassDescriptor@155['Any']
+TypeDeserializer@150 {
+    classDescriptors('2': Integer@148) = DeserializedClassDescriptor@149['Any']
 }
 
-TypeDeserializer@156 {
-    classDescriptors('2': Integer@154) = DeserializedClassDescriptor@155['Any']
+TypeDeserializer@151 {
+    classDescriptors('2': Integer@148) = DeserializedClassDescriptor@149['Any']
 }
 
-TypeDeserializer@157 {
-    classDescriptors('2': Integer@154) = DeserializedClassDescriptor@155['Any']
+TypeDeserializer@152 {
+    classDescriptors('3': Integer@153) = DeserializedClassDescriptor@149['Any']
+    classDescriptors('4': Integer@154) = DeserializedClassDescriptor@2['Function0']
 }
 
-TypeDeserializer@158 {
-    classDescriptors('3': Integer@159) = DeserializedClassDescriptor@155['Any']
-    classDescriptors('4': Integer@160) = DeserializedClassDescriptor@2['Function0']
+TypeDeserializer@155 {
+    classDescriptors('3': Integer@153) = DeserializedClassDescriptor@149['Any']
+    classDescriptors('4': Integer@154) = DeserializedClassDescriptor@4['Function1']
 }
 
-TypeDeserializer@161 {
-    classDescriptors('3': Integer@159) = DeserializedClassDescriptor@155['Any']
-    classDescriptors('4': Integer@160) = DeserializedClassDescriptor@4['Function1']
+null {
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@137 }
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@134 }
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@131 }
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@143 }
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@140 }
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@146 }
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromTopLevel.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromTopLevel.lazy.log
index 3f5d89d3d2b..888ccb8044d 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromTopLevel.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromTopLevel.lazy.log
@@ -46,7 +46,7 @@ DeserializedTypeParameterDescriptor@23['R'] {
     upperBounds = LinkedHashSet@25[1] { DeserializedType@26['kotlin.Any'] }
 }
 
-DeserializedType@26['kotlin.Any'] {
+DeserializedType@22['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
     memberScope = DeserializedClassMemberScope@28
 }
@@ -56,7 +56,7 @@ DeserializedType@18['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@28
 }
 
-DeserializedType@22['kotlin.Any'] {
+DeserializedType@26['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
     memberScope = DeserializedClassMemberScope@28
 }
@@ -246,64 +246,67 @@ LazyJavaPackageFragment@14['reflect'] {
 
 ResolutionTaskHolder@122 {
     <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
 }
 
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
+ResolutionTaskHolder@125 {
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
     <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
 }
 
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@132 }
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
+ResolutionTaskHolder@128 {
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
     <name not found> = EmptyList@90[empty]
     <name not found> = EmptyList@90[empty]
 }
 
+ResolutionTaskHolder@131 {
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
+}
+
 ResolutionTaskHolder@134 {
     <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@136 }
 }
 
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@140 }
+ResolutionTaskHolder@137 {
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
 }
 
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@144 }
+TypeDeserializer@140 {
+    classDescriptors('2': Integer@141) = DeserializedClassDescriptor@142['Any']
 }
 
-TypeDeserializer@146 {
-    classDescriptors('2': Integer@147) = DeserializedClassDescriptor@148['Any']
+TypeDeserializer@143 {
+    classDescriptors('2': Integer@141) = DeserializedClassDescriptor@142['Any']
 }
 
-TypeDeserializer@149 {
-    classDescriptors('2': Integer@147) = DeserializedClassDescriptor@148['Any']
+TypeDeserializer@144 {
+    classDescriptors('2': Integer@141) = DeserializedClassDescriptor@142['Any']
 }
 
-TypeDeserializer@150 {
-    classDescriptors('2': Integer@147) = DeserializedClassDescriptor@148['Any']
+TypeDeserializer@145 {
+    classDescriptors('3': Integer@146) = DeserializedClassDescriptor@142['Any']
+    classDescriptors('4': Integer@147) = DeserializedClassDescriptor@2['Function0']
 }
 
-TypeDeserializer@151 {
-    classDescriptors('3': Integer@152) = DeserializedClassDescriptor@148['Any']
-    classDescriptors('4': Integer@153) = DeserializedClassDescriptor@2['Function0']
+TypeDeserializer@148 {
+    classDescriptors('3': Integer@146) = DeserializedClassDescriptor@142['Any']
+    classDescriptors('4': Integer@147) = DeserializedClassDescriptor@4['Function1']
 }
 
-TypeDeserializer@154 {
-    classDescriptors('3': Integer@152) = DeserializedClassDescriptor@148['Any']
-    classDescriptors('4': Integer@153) = DeserializedClassDescriptor@4['Function1']
+null {
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@127 }
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@124 }
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@139 }
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@133 }
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@136 }
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/unresolved.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/unresolved.lazy.log
index ad1151cb6a2..8bd3b1dab63 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/unresolved.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/unresolved.lazy.log
@@ -126,7 +126,33 @@ LazyJavaPackageFragment@6['reflect'] {
 
 ResolutionTaskHolder@67 {
     <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
+}
+
+ResolutionTaskHolder@70 {
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
 }
 
 ResolutionTaskHolder@71 {
@@ -146,20 +172,6 @@ ResolutionTaskHolder@71 {
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
 }
 
 ResolutionTaskHolder@72 {
@@ -179,10 +191,6 @@ ResolutionTaskHolder@72 {
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
 }
 
 ResolutionTaskHolder@73 {
@@ -202,10 +210,6 @@ ResolutionTaskHolder@73 {
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
 }
 
 ResolutionTaskHolder@74 {
@@ -225,10 +229,6 @@ ResolutionTaskHolder@74 {
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
 }
 
 ResolutionTaskHolder@75 {
@@ -248,10 +248,6 @@ ResolutionTaskHolder@75 {
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
 }
 
 ResolutionTaskHolder@76 {
@@ -271,10 +267,6 @@ ResolutionTaskHolder@76 {
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
 }
 
 ResolutionTaskHolder@77 {
@@ -290,14 +282,6 @@ ResolutionTaskHolder@77 {
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
 }
 
 ResolutionTaskHolder@78 {
@@ -309,13 +293,6 @@ ResolutionTaskHolder@78 {
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
 }
 
 ResolutionTaskHolder@79 {
@@ -327,8 +304,6 @@ ResolutionTaskHolder@79 {
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
 }
 
 ResolutionTaskHolder@80 {
@@ -340,8 +315,6 @@ ResolutionTaskHolder@80 {
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
 }
 
 ResolutionTaskHolder@81 {
@@ -353,8 +326,6 @@ ResolutionTaskHolder@81 {
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
 }
 
 ResolutionTaskHolder@82 {
@@ -366,8 +337,6 @@ ResolutionTaskHolder@82 {
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
 }
 
 ResolutionTaskHolder@83 {
@@ -379,27 +348,61 @@ ResolutionTaskHolder@83 {
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@84 {
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
+TypeDeserializer@84 {
+    classDescriptors('2': Integer@85) = DeserializedClassDescriptor@86['Any']
 }
 
-TypeDeserializer@85 {
-    classDescriptors('2': Integer@86) = DeserializedClassDescriptor@87['Any']
+TypeDeserializer@87 {
+    classDescriptors('4': Integer@88) = DeserializedClassDescriptor@2['Function0']
 }
 
-TypeDeserializer@88 {
-    classDescriptors('4': Integer@89) = DeserializedClassDescriptor@2['Function0']
+null {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@69 }
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/abstractPropertyViaSubclasses.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/abstractPropertyViaSubclasses.lazy.log
index abc7b1d1eb2..48510360a8f 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/abstractPropertyViaSubclasses.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/abstractPropertyViaSubclasses.lazy.log
@@ -61,19 +61,19 @@ DeserializedType@40['T in kotlin.reflect.KMemberProperty'] {
     constructor = AbstractLazyTypeParameterDescriptor$1@36
 }
 
-DeserializedType@29['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@41
-    memberScope = DeserializedClassMemberScope@42
+DeserializedType@41['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@42
+    memberScope = DeserializedClassMemberScope@43
 }
 
 DeserializedType@38['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@41
-    memberScope = DeserializedClassMemberScope@42
+    constructor = DeserializedClassTypeConstructor@42
+    memberScope = DeserializedClassMemberScope@43
 }
 
-DeserializedType@43['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@41
-    memberScope = DeserializedClassMemberScope@42
+DeserializedType@29['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@42
+    memberScope = DeserializedClassMemberScope@43
 }
 
 DeserializedType@44['kotlin.CharSequence'] {
@@ -321,9 +321,7 @@ NestedClassDescriptors@160 {
 
 ResolutionTaskHolder@161 {
     <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@163 }
-    <name not found> = ArrayList@165[2] { ResolutionCandidate@166, ResolutionCandidate@167 }
-    <name not found> = ArrayList@168[2] { ResolutionCandidate@166, ResolutionCandidate@167 }
+    <name not found> = ArrayList@164[2] { ResolutionCandidate@165, ResolutionCandidate@166 }
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
@@ -346,20 +344,37 @@ ResolutionTaskHolder@161 {
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
+}
+
+ResolutionTaskHolder@167 {
+    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
 }
 
-ResolutionTaskHolder@169 {
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@171 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
+ResolutionTaskHolder@170 {
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
@@ -387,12 +402,6 @@ ResolutionTaskHolder@169 {
 
 ResolutionTaskHolder@173 {
     <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@175 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
@@ -418,196 +427,295 @@ ResolutionTaskHolder@173 {
     <name not found> = EmptyList@13[empty]
 }
 
-ResolutionTaskHolder@177 {
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@179 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
+ResolutionTaskHolder@176 {
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
 }
 
-ResolutionTaskHolder@181 {
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@183 }
+ResolutionTaskHolder@179 {
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
+}
+
+ResolutionTaskHolder@182 {
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
 }
 
 ResolutionTaskHolder@185 {
     <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@187 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
 }
 
-ResolutionTaskHolder@189 {
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@191 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
+ResolutionTaskHolder@188 {
+    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
 }
 
-ResolutionTaskHolder@193 {
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@195 }
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@195 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
+ResolutionTaskHolder@191 {
+    <name not found> = ArrayList@192[1] { ResolutionCandidate@193 }
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
 }
 
+ResolutionTaskHolder@194 {
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@196 }
+}
+
 ResolutionTaskHolder@197 {
     <name not found> = ArrayList@198[1] { ResolutionCandidate@199 }
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@199 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
 }
 
-ResolutionTaskHolder@201 {
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@203 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
+ResolutionTaskHolder@200 {
+    <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
 }
 
-ResolutionTaskHolder@205 {
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@207 }
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@207 }
+ResolutionTaskHolder@203 {
+    <name not found> = ArrayList@204[1] { ResolutionCandidate@205 }
+}
+
+ResolutionTaskHolder@206 {
+    <name not found> = ArrayList@207[1] { ResolutionCandidate@208 }
 }
 
 ResolutionTaskHolder@209 {
     <name not found> = ArrayList@210[1] { ResolutionCandidate@211 }
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@211 }
 }
 
-ResolutionTaskHolder@213 {
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@215 }
+ResolutionTaskHolder@212 {
+    <name not found> = ArrayList@213[1] { ResolutionCandidate@214 }
 }
 
-ResolutionTaskHolder@217 {
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@219 }
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@219 }
+ResolutionTaskHolder@215 {
+    <name not found> = ArrayList@216[1] { ResolutionCandidate@217 }
+}
+
+ResolutionTaskHolder@218 {
+    <name not found> = ArrayList@219[1] { ResolutionCandidate@220 }
 }
 
 ResolutionTaskHolder@221 {
     <name not found> = ArrayList@222[1] { ResolutionCandidate@223 }
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@223 }
 }
 
-ResolutionTaskHolder@225 {
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@227 }
+ResolutionTaskHolder@224 {
+    <name not found> = ArrayList@225[1] { ResolutionCandidate@226 }
 }
 
-ResolutionTaskHolder@229 {
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@231 }
+ResolutionTaskHolder@227 {
+    <name not found> = ArrayList@228[1] { ResolutionCandidate@229 }
+}
+
+ResolutionTaskHolder@230 {
+    <name not found> = ArrayList@231[1] { ResolutionCandidate@232 }
 }
 
 ResolutionTaskHolder@233 {
     <name not found> = ArrayList@234[1] { ResolutionCandidate@235 }
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@235 }
 }
 
-ResolutionTaskHolder@237 {
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@239 }
+ResolutionTaskHolder@236 {
+    <name not found> = ArrayList@237[1] { ResolutionCandidate@238 }
 }
 
-ResolutionTaskHolder@241 {
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@243 }
+ResolutionTaskHolder@239 {
+    <name not found> = ArrayList@240[1] { ResolutionCandidate@241 }
+}
+
+ResolutionTaskHolder@242 {
+    <name not found> = ArrayList@243[1] { ResolutionCandidate@244 }
 }
 
 ResolutionTaskHolder@245 {
     <name not found> = ArrayList@246[1] { ResolutionCandidate@247 }
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@247 }
+}
+
+ResolutionTaskHolder@248 {
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
 }
 
 ResolutionTaskHolder@249 {
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
-    <name not found> = ArrayList@252[1] { ResolutionCandidate@251 }
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+}
+
+ResolutionTaskHolder@250 {
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+}
+
+ResolutionTaskHolder@251 {
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+}
+
+ResolutionTaskHolder@252 {
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
 }
 
 ResolutionTaskHolder@253 {
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@255 }
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@255 }
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+}
+
+ResolutionTaskHolder@254 {
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+}
+
+ResolutionTaskHolder@255 {
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+}
+
+ResolutionTaskHolder@256 {
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
 }
 
 ResolutionTaskHolder@257 {
-    <name not found> = ArrayList@258[1] { ResolutionCandidate@259 }
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@259 }
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
 }
 
-ResolutionTaskHolder@261 {
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@263 }
+ResolutionTaskHolder@258 {
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
 }
 
-ResolutionTaskHolder@265 {
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@267 }
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@267 }
+ResolutionTaskHolder@259 {
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
 }
 
-ResolutionTaskHolder@269 {
-    <name not found> = ArrayList@270[1] { ResolutionCandidate@271 }
-    <name not found> = ArrayList@272[1] { ResolutionCandidate@271 }
-}
-
-ResolutionTaskHolder@273 {
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@275 }
-    <name not found> = ArrayList@276[1] { ResolutionCandidate@275 }
-}
-
-ResolutionTaskHolder@277 {
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
+ResolutionTaskHolder@260 {
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
@@ -618,19 +726,7 @@ ResolutionTaskHolder@277 {
     <name not found> = EmptyList@13[empty]
 }
 
-ResolutionTaskHolder@278 {
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
+ResolutionTaskHolder@261 {
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
@@ -641,19 +737,7 @@ ResolutionTaskHolder@278 {
     <name not found> = EmptyList@13[empty]
 }
 
-ResolutionTaskHolder@279 {
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
+ResolutionTaskHolder@262 {
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
@@ -664,102 +748,122 @@ ResolutionTaskHolder@279 {
     <name not found> = EmptyList@13[empty]
 }
 
-ResolutionTaskHolder@280 {
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
+TypeDeserializer@263 {
+    classDescriptors('27': Integer@264) = DeserializedClassDescriptor@265['Int']
+    classDescriptors('40': Integer@266) = DeserializedClassDescriptor@267['CharSequence']
 }
 
-ResolutionTaskHolder@281 {
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
+TypeDeserializer@268 {
+    classDescriptors('27': Integer@264) = DeserializedClassDescriptor@265['Int']
+    classDescriptors('40': Integer@266) = DeserializedClassDescriptor@267['CharSequence']
 }
 
-ResolutionTaskHolder@282 {
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
+TypeDeserializer@269 {
+    classDescriptors('3': Integer@270) = DeserializedClassDescriptor@271['Any']
+    classDescriptors('4': Integer@272) = DeserializedClassDescriptor@6['KProperty']
 }
 
-ResolutionTaskHolder@283 {
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
+TypeDeserializer@273 {
+    classDescriptors('3': Integer@270) = DeserializedClassDescriptor@271['Any']
 }
 
-ResolutionTaskHolder@284 {
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
+TypeDeserializer@274 {
+    classDescriptors('4': Integer@272) = DeserializedClassDescriptor@2['KCallable']
 }
 
-ResolutionTaskHolder@285 {
+null {
+    <name not found> = ArrayList@275[1] { ResolutionCandidate@211 }
+    <name not found> = ArrayList@276[1] { ResolutionCandidate@169 }
+    <name not found> = ArrayList@277[1] { ResolutionCandidate@202 }
+    <name not found> = ArrayList@278[1] { ResolutionCandidate@199 }
+    <name not found> = ArrayList@279[1] { ResolutionCandidate@217 }
+    <name not found> = ArrayList@280[1] { ResolutionCandidate@193 }
+    <name not found> = ArrayList@281[1] { ResolutionCandidate@232 }
+    <name not found> = ArrayList@282[1] { ResolutionCandidate@220 }
+    <name not found> = ArrayList@283[1] { ResolutionCandidate@184 }
+    <name not found> = ArrayList@284[1] { ResolutionCandidate@244 }
+    <name not found> = ArrayList@285[1] { ResolutionCandidate@238 }
+    <name not found> = ArrayList@286[1] { ResolutionCandidate@181 }
+    <name not found> = ArrayList@287[1] { ResolutionCandidate@247 }
+    <name not found> = ArrayList@288[1] { ResolutionCandidate@172 }
+    <name not found> = ArrayList@289[1] { ResolutionCandidate@214 }
+    <name not found> = ArrayList@290[1] { ResolutionCandidate@196 }
+    <name not found> = ArrayList@291[1] { ResolutionCandidate@208 }
+    <name not found> = ArrayList@292[1] { ResolutionCandidate@190 }
+    <name not found> = ArrayList@293[1] { ResolutionCandidate@226 }
+    <name not found> = ArrayList@294[1] { ResolutionCandidate@223 }
+    <name not found> = ArrayList@295[1] { ResolutionCandidate@178 }
+    <name not found> = ArrayList@296[1] { ResolutionCandidate@163 }
+    <name not found> = ArrayList@297[1] { ResolutionCandidate@175 }
+    <name not found> = ArrayList@298[1] { ResolutionCandidate@241 }
+    <name not found> = ArrayList@299[1] { ResolutionCandidate@229 }
+    <name not found> = ArrayList@300[1] { ResolutionCandidate@235 }
+    <name not found> = ArrayList@301[1] { ResolutionCandidate@187 }
+    <name not found> = ArrayList@302[1] { ResolutionCandidate@205 }
+    <name not found> = ArrayList@303[2] { ResolutionCandidate@165, ResolutionCandidate@166 }
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
@@ -771,104 +875,3 @@ ResolutionTaskHolder@285 {
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
 }
-
-ResolutionTaskHolder@286 {
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@287 {
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@288 {
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@289 {
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@290 {
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@291 {
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-TypeDeserializer@292 {
-    classDescriptors('27': Integer@293) = DeserializedClassDescriptor@294['Int']
-    classDescriptors('40': Integer@295) = DeserializedClassDescriptor@296['CharSequence']
-}
-
-TypeDeserializer@297 {
-    classDescriptors('27': Integer@293) = DeserializedClassDescriptor@294['Int']
-    classDescriptors('40': Integer@295) = DeserializedClassDescriptor@296['CharSequence']
-}
-
-TypeDeserializer@298 {
-    classDescriptors('3': Integer@299) = DeserializedClassDescriptor@300['Any']
-    classDescriptors('4': Integer@301) = DeserializedClassDescriptor@6['KProperty']
-}
-
-TypeDeserializer@302 {
-    classDescriptors('3': Integer@299) = DeserializedClassDescriptor@300['Any']
-}
-
-TypeDeserializer@303 {
-    classDescriptors('4': Integer@301) = DeserializedClassDescriptor@2['KCallable']
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/accessViaSubclass.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/accessViaSubclass.lazy.log
index e65cd8ee246..47dafe389d3 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/accessViaSubclass.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/accessViaSubclass.lazy.log
@@ -56,19 +56,19 @@ DeserializedType@37['T in kotlin.reflect.KMemberProperty'] {
     constructor = AbstractLazyTypeParameterDescriptor$1@33
 }
 
-DeserializedType@38['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@39
-    memberScope = DeserializedClassMemberScope@40
+DeserializedType@35['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@38
+    memberScope = DeserializedClassMemberScope@39
 }
 
-DeserializedType@35['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@39
-    memberScope = DeserializedClassMemberScope@40
+DeserializedType@40['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@38
+    memberScope = DeserializedClassMemberScope@39
 }
 
 DeserializedType@26['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@39
-    memberScope = DeserializedClassMemberScope@40
+    constructor = DeserializedClassTypeConstructor@38
+    memberScope = DeserializedClassMemberScope@39
 }
 
 DeserializedType@41['kotlin.reflect.KCallable'] {
@@ -221,12 +221,6 @@ NestedClassDescriptors@118 {
 
 ResolutionTaskHolder@119 {
     <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@121 }
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
@@ -252,41 +246,52 @@ ResolutionTaskHolder@119 {
     <name not found> = EmptyList@11[empty]
 }
 
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@125 }
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
+ResolutionTaskHolder@122 {
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
 }
 
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@129 }
+ResolutionTaskHolder@125 {
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
+}
+
+ResolutionTaskHolder@128 {
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
 }
 
 ResolutionTaskHolder@131 {
     <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@133 }
 }
 
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@137 }
+ResolutionTaskHolder@134 {
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
 }
 
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@141 }
+ResolutionTaskHolder@137 {
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
 }
 
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@145 }
+ResolutionTaskHolder@140 {
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
 }
 
-ResolutionTaskHolder@147 {
+ResolutionTaskHolder@141 {
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
@@ -303,25 +308,20 @@ ResolutionTaskHolder@147 {
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
+}
+
+ResolutionTaskHolder@142 {
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
 }
 
-ResolutionTaskHolder@148 {
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
+ResolutionTaskHolder@143 {
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
@@ -332,9 +332,7 @@ ResolutionTaskHolder@148 {
     <name not found> = EmptyList@11[empty]
 }
 
-ResolutionTaskHolder@149 {
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
+ResolutionTaskHolder@144 {
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
@@ -345,41 +343,46 @@ ResolutionTaskHolder@149 {
     <name not found> = EmptyList@11[empty]
 }
 
-ResolutionTaskHolder@150 {
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
+TypeDeserializer@145 {
+    classDescriptors('3': Integer@146) = DeserializedClassDescriptor@147['Any']
+    classDescriptors('4': Integer@148) = DeserializedClassDescriptor@6['KProperty']
 }
 
-ResolutionTaskHolder@151 {
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
+TypeDeserializer@149 {
+    classDescriptors('3': Integer@146) = DeserializedClassDescriptor@147['Any']
 }
 
-TypeDeserializer@152 {
-    classDescriptors('3': Integer@153) = DeserializedClassDescriptor@154['Any']
-    classDescriptors('4': Integer@155) = DeserializedClassDescriptor@6['KProperty']
+TypeDeserializer@150 {
+    classDescriptors('4': Integer@148) = DeserializedClassDescriptor@2['KCallable']
 }
 
-TypeDeserializer@156 {
-    classDescriptors('3': Integer@153) = DeserializedClassDescriptor@154['Any']
-}
-
-TypeDeserializer@157 {
-    classDescriptors('4': Integer@155) = DeserializedClassDescriptor@2['KCallable']
+null {
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@136 }
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@139 }
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@127 }
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@124 }
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@133 }
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/classFromClass.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/classFromClass.lazy.log
index 8b4c5eb1709..21d0e00c0ca 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/classFromClass.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/classFromClass.lazy.log
@@ -35,17 +35,12 @@ DeserializedTypeParameterDescriptor@20['T'] {
     upperBounds = LinkedHashSet@22[1] { DeserializedType@23['kotlin.Any'] }
 }
 
-DeserializedType@19['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@24
-    memberScope = DeserializedClassMemberScope@25
-}
-
 DeserializedType@23['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@24
     memberScope = DeserializedClassMemberScope@25
 }
 
-DeserializedType@11['kotlin.Any'] {
+DeserializedType@19['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@24
     memberScope = DeserializedClassMemberScope@25
 }
@@ -55,6 +50,11 @@ DeserializedType@15['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@25
 }
 
+DeserializedType@11['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@24
+    memberScope = DeserializedClassMemberScope@25
+}
+
 LazyJavaPackageFragmentProvider@26 {
     packageFragments('<root>': FqName@27) = LazyJavaPackageFragment@28['<root>']
     packageFragments('A': FqName@29) = null
@@ -200,21 +200,9 @@ LazyJavaPackageFragment@7['reflect'] {
 
 ResolutionTaskHolder@101 {
     <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
     <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
@@ -261,15 +249,11 @@ ResolutionTaskHolder@101 {
     <name not found> = EmptyList@73[empty]
 }
 
-ResolutionTaskHolder@114 {
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
     <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@125 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
     <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
@@ -314,6 +298,46 @@ ResolutionTaskHolder@114 {
     <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
+}
+
+ResolutionTaskHolder@119 {
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
+    <name not found> = EmptyList@73[empty]
+}
+
+ResolutionTaskHolder@122 {
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
+    <name not found> = EmptyList@73[empty]
+}
+
+ResolutionTaskHolder@125 {
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+}
+
+ResolutionTaskHolder@126 {
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
@@ -325,15 +349,153 @@ ResolutionTaskHolder@114 {
 }
 
 ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@129 }
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+}
+
+ResolutionTaskHolder@128 {
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+}
+
+ResolutionTaskHolder@129 {
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+}
+
+ResolutionTaskHolder@130 {
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
 }
 
 ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@133 }
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+}
+
+ResolutionTaskHolder@132 {
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+}
+
+ResolutionTaskHolder@133 {
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+}
+
+ResolutionTaskHolder@134 {
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
 }
@@ -355,10 +517,6 @@ ResolutionTaskHolder@135 {
     <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
 }
 
 ResolutionTaskHolder@136 {
@@ -378,59 +536,73 @@ ResolutionTaskHolder@136 {
     <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
 }
 
-ResolutionTaskHolder@137 {
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
+TypeDeserializer@137 {
+    classDescriptors('3': Integer@138) = DeserializedClassDescriptor@139['Any']
 }
 
-ResolutionTaskHolder@138 {
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
+TypeDeserializer@140 {
+    classDescriptors('3': Integer@138) = DeserializedClassDescriptor@139['Any']
 }
 
-ResolutionTaskHolder@139 {
+null {
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@124 }
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
@@ -452,172 +624,3 @@ ResolutionTaskHolder@139 {
     <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
 }
-
-ResolutionTaskHolder@140 {
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-}
-
-ResolutionTaskHolder@141 {
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-}
-
-ResolutionTaskHolder@143 {
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-}
-
-ResolutionTaskHolder@144 {
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-}
-
-ResolutionTaskHolder@145 {
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-}
-
-ResolutionTaskHolder@146 {
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-}
-
-TypeDeserializer@147 {
-    classDescriptors('3': Integer@148) = DeserializedClassDescriptor@149['Any']
-}
-
-TypeDeserializer@150 {
-    classDescriptors('3': Integer@148) = DeserializedClassDescriptor@149['Any']
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionFromClass.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionFromClass.lazy.log
index d1c3c858fa8..d3709c05eb7 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionFromClass.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionFromClass.lazy.log
@@ -315,18 +315,6 @@ LazyJavaPackageFragment@17['reflect'] {
 
 ResolutionTaskHolder@156 {
     <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
     <name not found> = EmptyList@122[empty]
     <name not found> = EmptyList@122[empty]
     <name not found> = EmptyList@122[empty]
@@ -376,20 +364,8 @@ ResolutionTaskHolder@156 {
     <name not found> = EmptyList@122[empty]
 }
 
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@162 }
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
+ResolutionTaskHolder@159 {
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
     <name not found> = EmptyList@122[empty]
     <name not found> = EmptyList@122[empty]
     <name not found> = EmptyList@122[empty]
@@ -439,33 +415,21 @@ ResolutionTaskHolder@160 {
     <name not found> = EmptyList@122[empty]
 }
 
-ResolutionTaskHolder@164 {
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@166 }
+ResolutionTaskHolder@162 {
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
     <name not found> = EmptyList@122[empty]
     <name not found> = EmptyList@122[empty]
     <name not found> = EmptyList@122[empty]
+}
+
+ResolutionTaskHolder@165 {
+    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
     <name not found> = EmptyList@122[empty]
     <name not found> = EmptyList@122[empty]
     <name not found> = EmptyList@122[empty]
 }
 
 ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@170 }
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-}
-
-ResolutionTaskHolder@172 {
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
     <name not found> = EmptyList@122[empty]
     <name not found> = EmptyList@122[empty]
     <name not found> = EmptyList@122[empty]
@@ -484,11 +448,7 @@ ResolutionTaskHolder@172 {
     <name not found> = EmptyList@122[empty]
 }
 
-ResolutionTaskHolder@173 {
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
+ResolutionTaskHolder@169 {
     <name not found> = EmptyList@122[empty]
     <name not found> = EmptyList@122[empty]
     <name not found> = EmptyList@122[empty]
@@ -507,11 +467,7 @@ ResolutionTaskHolder@173 {
     <name not found> = EmptyList@122[empty]
 }
 
-ResolutionTaskHolder@174 {
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
+ResolutionTaskHolder@170 {
     <name not found> = EmptyList@122[empty]
     <name not found> = EmptyList@122[empty]
     <name not found> = EmptyList@122[empty]
@@ -530,11 +486,7 @@ ResolutionTaskHolder@174 {
     <name not found> = EmptyList@122[empty]
 }
 
-ResolutionTaskHolder@175 {
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
+ResolutionTaskHolder@171 {
     <name not found> = EmptyList@122[empty]
     <name not found> = EmptyList@122[empty]
     <name not found> = EmptyList@122[empty]
@@ -553,34 +505,85 @@ ResolutionTaskHolder@175 {
     <name not found> = EmptyList@122[empty]
 }
 
+TypeDeserializer@172 {
+    classDescriptors('3': Integer@173) = DeserializedClassDescriptor@174['Any']
+    classDescriptors('4': Integer@175) = DeserializedClassDescriptor@12['KProperty']
+}
+
 TypeDeserializer@176 {
-    classDescriptors('3': Integer@177) = DeserializedClassDescriptor@178['Any']
-    classDescriptors('4': Integer@179) = DeserializedClassDescriptor@12['KProperty']
+    classDescriptors('3': Integer@173) = DeserializedClassDescriptor@174['Any']
 }
 
-TypeDeserializer@180 {
-    classDescriptors('3': Integer@177) = DeserializedClassDescriptor@178['Any']
+TypeDeserializer@177 {
+    classDescriptors('3': Integer@173) = DeserializedClassDescriptor@174['Any']
+}
+
+TypeDeserializer@178 {
+    classDescriptors('4': Integer@175) = DeserializedClassDescriptor@2['KCallable']
+}
+
+TypeDeserializer@179 {
+    classDescriptors('4': Integer@175) = DeserializedClassDescriptor@4['KExtensionProperty']
+    classDescriptors('5': Integer@180) = DeserializedClassDescriptor@16['KTopLevelProperty']
 }
 
 TypeDeserializer@181 {
-    classDescriptors('3': Integer@177) = DeserializedClassDescriptor@178['Any']
+    classDescriptors('4': Integer@175) = DeserializedClassDescriptor@12['KProperty']
 }
 
 TypeDeserializer@182 {
-    classDescriptors('4': Integer@179) = DeserializedClassDescriptor@2['KCallable']
+    classDescriptors('4': Integer@175) = DeserializedClassDescriptor@14['KTopLevelExtensionProperty']
+    classDescriptors('5': Integer@180) = DeserializedClassDescriptor@6['KMutableExtensionProperty']
+    classDescriptors('6': Integer@183) = DeserializedClassDescriptor@10['KMutableTopLevelProperty']
 }
 
-TypeDeserializer@183 {
-    classDescriptors('4': Integer@179) = DeserializedClassDescriptor@4['KExtensionProperty']
-    classDescriptors('5': Integer@184) = DeserializedClassDescriptor@16['KTopLevelProperty']
-}
-
-TypeDeserializer@185 {
-    classDescriptors('4': Integer@179) = DeserializedClassDescriptor@12['KProperty']
-}
-
-TypeDeserializer@186 {
-    classDescriptors('4': Integer@179) = DeserializedClassDescriptor@14['KTopLevelExtensionProperty']
-    classDescriptors('5': Integer@184) = DeserializedClassDescriptor@6['KMutableExtensionProperty']
-    classDescriptors('6': Integer@187) = DeserializedClassDescriptor@10['KMutableTopLevelProperty']
+null {
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@161 }
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@167 }
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@164 }
+    <name not found> = EmptyList@122[empty]
+    <name not found> = EmptyList@122[empty]
+    <name not found> = EmptyList@122[empty]
+    <name not found> = EmptyList@122[empty]
+    <name not found> = EmptyList@122[empty]
+    <name not found> = EmptyList@122[empty]
+    <name not found> = EmptyList@122[empty]
+    <name not found> = EmptyList@122[empty]
+    <name not found> = EmptyList@122[empty]
+    <name not found> = EmptyList@122[empty]
+    <name not found> = EmptyList@122[empty]
+    <name not found> = EmptyList@122[empty]
+    <name not found> = EmptyList@122[empty]
+    <name not found> = EmptyList@122[empty]
+    <name not found> = EmptyList@122[empty]
+    <name not found> = EmptyList@122[empty]
+    <name not found> = EmptyList@122[empty]
+    <name not found> = EmptyList@122[empty]
+    <name not found> = EmptyList@122[empty]
+    <name not found> = EmptyList@122[empty]
+    <name not found> = EmptyList@122[empty]
+    <name not found> = EmptyList@122[empty]
+    <name not found> = EmptyList@122[empty]
+    <name not found> = EmptyList@122[empty]
+    <name not found> = EmptyList@122[empty]
+    <name not found> = EmptyList@122[empty]
+    <name not found> = EmptyList@122[empty]
+    <name not found> = EmptyList@122[empty]
+    <name not found> = EmptyList@122[empty]
+    <name not found> = EmptyList@122[empty]
+    <name not found> = EmptyList@122[empty]
+    <name not found> = EmptyList@122[empty]
+    <name not found> = EmptyList@122[empty]
+    <name not found> = EmptyList@122[empty]
+    <name not found> = EmptyList@122[empty]
+    <name not found> = EmptyList@122[empty]
+    <name not found> = EmptyList@122[empty]
+    <name not found> = EmptyList@122[empty]
+    <name not found> = EmptyList@122[empty]
+    <name not found> = EmptyList@122[empty]
+    <name not found> = EmptyList@122[empty]
+    <name not found> = EmptyList@122[empty]
+    <name not found> = EmptyList@122[empty]
+    <name not found> = EmptyList@122[empty]
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionFromTopLevel.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionFromTopLevel.lazy.log
index e5887ed8a04..6690528118e 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionFromTopLevel.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionFromTopLevel.lazy.log
@@ -205,15 +205,15 @@ DeserializedType@128['R in kotlin.reflect.KTopLevelExtensionProperty'] {
 }
 
 DeserializedType@129['T in kotlin.reflect.KExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@103
+    constructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 DeserializedType@130['T in kotlin.reflect.KMutableExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@98
+    constructor = AbstractLazyTypeParameterDescriptor$1@103
 }
 
 DeserializedType@131['T in kotlin.reflect.KMutableExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@98
+    constructor = AbstractLazyTypeParameterDescriptor$1@103
 }
 
 DeserializedType@132['T in kotlin.reflect.KMutableTopLevelExtensionProperty'] {
@@ -225,7 +225,7 @@ DeserializedType@133['T in kotlin.reflect.KMutableTopLevelExtensionProperty'] {
 }
 
 DeserializedType@134['T in kotlin.reflect.KTopLevelExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@108
+    constructor = AbstractLazyTypeParameterDescriptor$1@98
 }
 
 DeserializedType@135['V in kotlin'] {
@@ -240,7 +240,7 @@ DeserializedType@137['V in kotlin'] {
     constructor = AbstractLazyTypeParameterDescriptor$1@116
 }
 
-DeserializedType@76['kotlin.Any'] {
+DeserializedType@100['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@138
     memberScope = DeserializedClassMemberScope@139
 }
@@ -250,22 +250,7 @@ DeserializedType@110['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@139
 }
 
-DeserializedType@105['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@138
-    memberScope = DeserializedClassMemberScope@139
-}
-
-DeserializedType@100['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@138
-    memberScope = DeserializedClassMemberScope@139
-}
-
-DeserializedType@66['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@138
-    memberScope = DeserializedClassMemberScope@139
-}
-
-DeserializedType@140['kotlin.Any'] {
+DeserializedType@71['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@138
     memberScope = DeserializedClassMemberScope@139
 }
@@ -275,17 +260,22 @@ DeserializedType@81['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@139
 }
 
-DeserializedType@118['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@138
-    memberScope = DeserializedClassMemberScope@139
-}
-
 DeserializedType@114['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@138
     memberScope = DeserializedClassMemberScope@139
 }
 
-DeserializedType@71['kotlin.Any'] {
+DeserializedType@140['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@138
+    memberScope = DeserializedClassMemberScope@139
+}
+
+DeserializedType@76['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@138
+    memberScope = DeserializedClassMemberScope@139
+}
+
+DeserializedType@105['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@138
     memberScope = DeserializedClassMemberScope@139
 }
@@ -295,6 +285,16 @@ DeserializedType@85['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@139
 }
 
+DeserializedType@66['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@138
+    memberScope = DeserializedClassMemberScope@139
+}
+
+DeserializedType@118['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@138
+    memberScope = DeserializedClassMemberScope@139
+}
+
 DeserializedType@141['kotlin.MutableMap'] {
     constructor = DeserializedClassTypeConstructor@142
     memberScope = SubstitutingScope@143
@@ -371,13 +371,13 @@ DeserializedType@179['kotlin.reflect.KTopLevelProperty'] {
 }
 
 EnumEntryClassDescriptors@181 {
-    findEnumEntry('get': Name@34) = null
-    findEnumEntry('set': Name@38) = null
+    findEnumEntry('get': Name@22) = null
+    findEnumEntry('set': Name@25) = null
 }
 
 EnumEntryClassDescriptors@182 {
-    findEnumEntry('get': Name@22) = null
-    findEnumEntry('set': Name@25) = null
+    findEnumEntry('get': Name@34) = null
+    findEnumEntry('set': Name@38) = null
 }
 
 LazyJavaPackageFragmentProvider@183 {
@@ -600,12 +600,6 @@ NestedClassDescriptors@293 {
 
 ResolutionTaskHolder@294 {
     <name not found> = ArrayList@295[1] { ResolutionCandidate@296 }
-    <name not found> = ArrayList@297[1] { ResolutionCandidate@296 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
@@ -631,14 +625,8 @@ ResolutionTaskHolder@294 {
     <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@298 {
-    <name not found> = ArrayList@299[1] { ResolutionCandidate@300 }
-    <name not found> = ArrayList@301[1] { ResolutionCandidate@300 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
+ResolutionTaskHolder@297 {
+    <name not found> = ArrayList@298[1] { ResolutionCandidate@299 }
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
@@ -664,13 +652,8 @@ ResolutionTaskHolder@298 {
     <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@302 {
-    <name not found> = ArrayList@303[1] { ResolutionCandidate@304 }
-    <name not found> = ArrayList@305[1] { ResolutionCandidate@304 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
+ResolutionTaskHolder@300 {
+    <name not found> = ArrayList@301[1] { ResolutionCandidate@302 }
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
@@ -694,113 +677,189 @@ ResolutionTaskHolder@302 {
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
+}
+
+ResolutionTaskHolder@303 {
+    <name not found> = ArrayList@304[1] { ResolutionCandidate@305 }
     <name not found> = EmptyList@23[empty]
 }
 
 ResolutionTaskHolder@306 {
     <name not found> = ArrayList@307[1] { ResolutionCandidate@308 }
-    <name not found> = ArrayList@309[1] { ResolutionCandidate@308 }
-    <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@310 {
-    <name not found> = ArrayList@311[1] { ResolutionCandidate@312 }
-    <name not found> = ArrayList@313[1] { ResolutionCandidate@312 }
-    <name not found> = EmptyList@23[empty]
+ResolutionTaskHolder@309 {
+    <name not found> = ArrayList@310[1] { ResolutionCandidate@311 }
     <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@314 {
-    <name not found> = ArrayList@315[1] { ResolutionCandidate@316 }
-    <name not found> = ArrayList@317[1] { ResolutionCandidate@316 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
+ResolutionTaskHolder@312 {
+    <name not found> = ArrayList@313[1] { ResolutionCandidate@314 }
+}
+
+ResolutionTaskHolder@315 {
+    <name not found> = ArrayList@316[1] { ResolutionCandidate@317 }
 }
 
 ResolutionTaskHolder@318 {
     <name not found> = ArrayList@319[1] { ResolutionCandidate@320 }
-    <name not found> = ArrayList@321[1] { ResolutionCandidate@320 }
 }
 
-ResolutionTaskHolder@322 {
-    <name not found> = ArrayList@323[1] { ResolutionCandidate@324 }
-    <name not found> = ArrayList@325[1] { ResolutionCandidate@324 }
+ResolutionTaskHolder@321 {
+    <name not found> = ArrayList@322[1] { ResolutionCandidate@323 }
 }
 
-ResolutionTaskHolder@326 {
-    <name not found> = ArrayList@327[1] { ResolutionCandidate@328 }
-    <name not found> = ArrayList@329[1] { ResolutionCandidate@328 }
+ResolutionTaskHolder@324 {
+    <name not found> = ArrayList@325[1] { ResolutionCandidate@326 }
+}
+
+ResolutionTaskHolder@327 {
+    <name not found> = ArrayList@328[1] { ResolutionCandidate@329 }
 }
 
 ResolutionTaskHolder@330 {
     <name not found> = ArrayList@331[1] { ResolutionCandidate@332 }
-    <name not found> = ArrayList@333[1] { ResolutionCandidate@332 }
 }
 
-ResolutionTaskHolder@334 {
-    <name not found> = ArrayList@335[1] { ResolutionCandidate@336 }
-    <name not found> = ArrayList@337[1] { ResolutionCandidate@336 }
+ResolutionTaskHolder@333 {
+    <name not found> = ArrayList@334[1] { ResolutionCandidate@335 }
 }
 
-ResolutionTaskHolder@338 {
-    <name not found> = ArrayList@339[1] { ResolutionCandidate@340 }
-    <name not found> = ArrayList@341[1] { ResolutionCandidate@340 }
+ResolutionTaskHolder@336 {
+    <name not found> = ArrayList@337[1] { ResolutionCandidate@338 }
+}
+
+ResolutionTaskHolder@339 {
+    <name not found> = ArrayList@340[1] { ResolutionCandidate@341 }
 }
 
 ResolutionTaskHolder@342 {
     <name not found> = ArrayList@343[1] { ResolutionCandidate@344 }
-    <name not found> = ArrayList@345[1] { ResolutionCandidate@344 }
 }
 
-ResolutionTaskHolder@346 {
-    <name not found> = ArrayList@347[1] { ResolutionCandidate@348 }
-    <name not found> = ArrayList@349[1] { ResolutionCandidate@348 }
+ResolutionTaskHolder@345 {
+    <name not found> = ArrayList@346[1] { ResolutionCandidate@347 }
 }
 
-ResolutionTaskHolder@350 {
-    <name not found> = ArrayList@351[1] { ResolutionCandidate@352 }
-    <name not found> = ArrayList@353[1] { ResolutionCandidate@352 }
+ResolutionTaskHolder@348 {
+    <name not found> = ArrayList@349[1] { ResolutionCandidate@350 }
+}
+
+ResolutionTaskHolder@351 {
+    <name not found> = ArrayList@352[1] { ResolutionCandidate@353 }
 }
 
 ResolutionTaskHolder@354 {
-    <name not found> = ArrayList@355[1] { ResolutionCandidate@356 }
-    <name not found> = ArrayList@357[1] { ResolutionCandidate@356 }
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+}
+
+ResolutionTaskHolder@355 {
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+}
+
+ResolutionTaskHolder@356 {
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+}
+
+ResolutionTaskHolder@357 {
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
 }
 
 ResolutionTaskHolder@358 {
-    <name not found> = ArrayList@359[1] { ResolutionCandidate@360 }
-    <name not found> = ArrayList@361[1] { ResolutionCandidate@360 }
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@362 {
-    <name not found> = ArrayList@363[1] { ResolutionCandidate@364 }
-    <name not found> = ArrayList@365[1] { ResolutionCandidate@364 }
+ResolutionTaskHolder@359 {
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@366 {
-    <name not found> = ArrayList@367[1] { ResolutionCandidate@368 }
-    <name not found> = ArrayList@369[1] { ResolutionCandidate@368 }
+ResolutionTaskHolder@360 {
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@370 {
-    <name not found> = ArrayList@371[1] { ResolutionCandidate@372 }
-    <name not found> = ArrayList@373[1] { ResolutionCandidate@372 }
-}
-
-ResolutionTaskHolder@374 {
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
+ResolutionTaskHolder@361 {
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
@@ -811,19 +870,7 @@ ResolutionTaskHolder@374 {
     <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@375 {
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
+ResolutionTaskHolder@362 {
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
@@ -834,19 +881,7 @@ ResolutionTaskHolder@375 {
     <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@376 {
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
+ResolutionTaskHolder@363 {
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
@@ -857,173 +892,141 @@ ResolutionTaskHolder@376 {
     <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@377 {
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
+ResolutionTaskHolder@364 {
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@378 {
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
+ResolutionTaskHolder@365 {
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@379 {
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
+TypeDeserializer@366 {
+    classDescriptors('129': Integer@367) = DeserializedClassDescriptor@368['MutableMap']
+    classDescriptors('9': Integer@369) = DeserializedClassDescriptor@370['Any']
 }
 
-ResolutionTaskHolder@380 {
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
+TypeDeserializer@371 {
+    classDescriptors('3': Integer@372) = DeserializedClassDescriptor@370['Any']
+    classDescriptors('4': Integer@373) = DeserializedClassDescriptor@4['KExtensionProperty']
+    classDescriptors('5': Integer@374) = DeserializedClassDescriptor@8['KMutableProperty']
 }
 
-ResolutionTaskHolder@381 {
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
+TypeDeserializer@375 {
+    classDescriptors('3': Integer@372) = DeserializedClassDescriptor@370['Any']
+    classDescriptors('4': Integer@373) = DeserializedClassDescriptor@4['KExtensionProperty']
+    classDescriptors('5': Integer@374) = DeserializedClassDescriptor@18['KTopLevelProperty']
 }
 
-ResolutionTaskHolder@382 {
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
+TypeDeserializer@376 {
+    classDescriptors('3': Integer@372) = DeserializedClassDescriptor@370['Any']
+    classDescriptors('4': Integer@373) = DeserializedClassDescriptor@14['KProperty']
 }
 
-ResolutionTaskHolder@383 {
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
+TypeDeserializer@377 {
+    classDescriptors('3': Integer@372) = DeserializedClassDescriptor@370['Any']
+    classDescriptors('4': Integer@373) = DeserializedClassDescriptor@16['KTopLevelExtensionProperty']
+    classDescriptors('5': Integer@374) = DeserializedClassDescriptor@6['KMutableExtensionProperty']
+    classDescriptors('6': Integer@378) = DeserializedClassDescriptor@12['KMutableTopLevelProperty']
 }
 
-ResolutionTaskHolder@384 {
+TypeDeserializer@379 {
+    classDescriptors('3': Integer@372) = DeserializedClassDescriptor@370['Any']
+}
+
+TypeDeserializer@380 {
+    classDescriptors('4': Integer@373) = DeserializedClassDescriptor@2['KCallable']
+}
+
+TypeDeserializer@381 {
+    classDescriptors('4': Integer@373) = DeserializedClassDescriptor@14['KProperty']
+}
+
+TypeDeserializer@382 {
+    classDescriptors('4': Integer@373) = DeserializedClassDescriptor@14['KProperty']
+}
+
+TypeDeserializer@383 {
+    classDescriptors('4': Integer@373) = DeserializedClassDescriptor@18['KTopLevelProperty']
+    classDescriptors('5': Integer@374) = DeserializedClassDescriptor@8['KMutableProperty']
+}
+
+TypeDeserializer@384 {
+    classDescriptors('6': Integer@378) = DeserializedClassDescriptor@20['Unit']
+}
+
+null {
+    <name not found> = ArrayList@385[1] { ResolutionCandidate@311 }
+    <name not found> = ArrayList@386[1] { ResolutionCandidate@296 }
+    <name not found> = ArrayList@387[1] { ResolutionCandidate@308 }
+    <name not found> = ArrayList@388[1] { ResolutionCandidate@317 }
+    <name not found> = ArrayList@389[1] { ResolutionCandidate@341 }
+    <name not found> = ArrayList@390[1] { ResolutionCandidate@338 }
+    <name not found> = ArrayList@391[1] { ResolutionCandidate@323 }
+    <name not found> = ArrayList@392[1] { ResolutionCandidate@314 }
+    <name not found> = ArrayList@393[1] { ResolutionCandidate@347 }
+    <name not found> = ArrayList@394[1] { ResolutionCandidate@302 }
+    <name not found> = ArrayList@395[1] { ResolutionCandidate@299 }
+    <name not found> = ArrayList@396[1] { ResolutionCandidate@305 }
+    <name not found> = ArrayList@397[1] { ResolutionCandidate@353 }
+    <name not found> = ArrayList@398[1] { ResolutionCandidate@320 }
+    <name not found> = ArrayList@399[1] { ResolutionCandidate@344 }
+    <name not found> = ArrayList@400[1] { ResolutionCandidate@332 }
+    <name not found> = ArrayList@401[1] { ResolutionCandidate@335 }
+    <name not found> = ArrayList@402[1] { ResolutionCandidate@350 }
+    <name not found> = ArrayList@403[1] { ResolutionCandidate@329 }
+    <name not found> = ArrayList@404[1] { ResolutionCandidate@326 }
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@385 {
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
-}
-
-TypeDeserializer@386 {
-    classDescriptors('129': Integer@387) = DeserializedClassDescriptor@388['MutableMap']
-    classDescriptors('9': Integer@389) = DeserializedClassDescriptor@390['Any']
-}
-
-TypeDeserializer@391 {
-    classDescriptors('3': Integer@392) = DeserializedClassDescriptor@390['Any']
-    classDescriptors('4': Integer@393) = DeserializedClassDescriptor@4['KExtensionProperty']
-    classDescriptors('5': Integer@394) = DeserializedClassDescriptor@8['KMutableProperty']
-}
-
-TypeDeserializer@395 {
-    classDescriptors('3': Integer@392) = DeserializedClassDescriptor@390['Any']
-    classDescriptors('4': Integer@393) = DeserializedClassDescriptor@4['KExtensionProperty']
-    classDescriptors('5': Integer@394) = DeserializedClassDescriptor@18['KTopLevelProperty']
-}
-
-TypeDeserializer@396 {
-    classDescriptors('3': Integer@392) = DeserializedClassDescriptor@390['Any']
-    classDescriptors('4': Integer@393) = DeserializedClassDescriptor@14['KProperty']
-}
-
-TypeDeserializer@397 {
-    classDescriptors('3': Integer@392) = DeserializedClassDescriptor@390['Any']
-    classDescriptors('4': Integer@393) = DeserializedClassDescriptor@16['KTopLevelExtensionProperty']
-    classDescriptors('5': Integer@394) = DeserializedClassDescriptor@6['KMutableExtensionProperty']
-    classDescriptors('6': Integer@398) = DeserializedClassDescriptor@12['KMutableTopLevelProperty']
-}
-
-TypeDeserializer@399 {
-    classDescriptors('3': Integer@392) = DeserializedClassDescriptor@390['Any']
-}
-
-TypeDeserializer@400 {
-    classDescriptors('4': Integer@393) = DeserializedClassDescriptor@2['KCallable']
-}
-
-TypeDeserializer@401 {
-    classDescriptors('4': Integer@393) = DeserializedClassDescriptor@14['KProperty']
-}
-
-TypeDeserializer@402 {
-    classDescriptors('4': Integer@393) = DeserializedClassDescriptor@14['KProperty']
-}
-
-TypeDeserializer@403 {
-    classDescriptors('4': Integer@393) = DeserializedClassDescriptor@18['KTopLevelProperty']
-    classDescriptors('5': Integer@394) = DeserializedClassDescriptor@8['KMutableProperty']
-}
-
-TypeDeserializer@404 {
-    classDescriptors('6': Integer@398) = DeserializedClassDescriptor@20['Unit']
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionPropertyOnNullable.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionPropertyOnNullable.lazy.log
index 6bfcbec161e..c7b8ff69fad 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionPropertyOnNullable.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionPropertyOnNullable.lazy.log
@@ -73,7 +73,7 @@ DeserializedType@46['R in kotlin.reflect.KExtensionProperty'] {
 }
 
 DeserializedType@47['R in kotlin.reflect.KTopLevelExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@34
+    constructor = AbstractLazyTypeParameterDescriptor$1@36
 }
 
 DeserializedType@48['T in kotlin.reflect.KExtensionProperty'] {
@@ -229,12 +229,6 @@ NestedClassDescriptors@126 {
 
 ResolutionTaskHolder@127 {
     <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@129 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
@@ -260,38 +254,47 @@ ResolutionTaskHolder@127 {
     <name not found> = EmptyList@13[empty]
 }
 
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@133 }
-    <name not found> = EmptyList@13[empty]
+ResolutionTaskHolder@130 {
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
     <name not found> = EmptyList@13[empty]
 }
 
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@137 }
+ResolutionTaskHolder@133 {
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
+}
+
+ResolutionTaskHolder@136 {
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
 }
 
 ResolutionTaskHolder@139 {
     <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@141 }
 }
 
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@145 }
+ResolutionTaskHolder@142 {
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
 }
 
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@149 }
+ResolutionTaskHolder@145 {
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
 }
 
-ResolutionTaskHolder@151 {
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
+ResolutionTaskHolder@146 {
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
@@ -310,19 +313,7 @@ ResolutionTaskHolder@151 {
     <name not found> = EmptyList@13[empty]
 }
 
-ResolutionTaskHolder@152 {
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
+ResolutionTaskHolder@147 {
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
@@ -333,9 +324,7 @@ ResolutionTaskHolder@152 {
     <name not found> = EmptyList@13[empty]
 }
 
-ResolutionTaskHolder@153 {
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
+ResolutionTaskHolder@148 {
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
@@ -346,9 +335,7 @@ ResolutionTaskHolder@153 {
     <name not found> = EmptyList@13[empty]
 }
 
-ResolutionTaskHolder@154 {
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
+ResolutionTaskHolder@149 {
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
@@ -359,44 +346,60 @@ ResolutionTaskHolder@154 {
     <name not found> = EmptyList@13[empty]
 }
 
-ResolutionTaskHolder@155 {
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
+ResolutionTaskHolder@150 {
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
 }
 
-ResolutionTaskHolder@156 {
+TypeDeserializer@151 {
+    classDescriptors('3': Integer@152) = DeserializedClassDescriptor@153['Any']
+}
+
+TypeDeserializer@154 {
+    classDescriptors('4': Integer@155) = DeserializedClassDescriptor@2['KCallable']
+}
+
+TypeDeserializer@156 {
+    classDescriptors('4': Integer@155) = DeserializedClassDescriptor@4['KExtensionProperty']
+    classDescriptors('5': Integer@157) = DeserializedClassDescriptor@10['KTopLevelProperty']
+}
+
+TypeDeserializer@158 {
+    classDescriptors('4': Integer@155) = DeserializedClassDescriptor@6['KProperty']
+}
+
+TypeDeserializer@159 {
+    classDescriptors('4': Integer@155) = DeserializedClassDescriptor@6['KProperty']
+}
+
+null {
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@129 }
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@132 }
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@141 }
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@135 }
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
 }
-
-TypeDeserializer@157 {
-    classDescriptors('3': Integer@158) = DeserializedClassDescriptor@159['Any']
-}
-
-TypeDeserializer@160 {
-    classDescriptors('4': Integer@161) = DeserializedClassDescriptor@2['KCallable']
-}
-
-TypeDeserializer@162 {
-    classDescriptors('4': Integer@161) = DeserializedClassDescriptor@4['KExtensionProperty']
-    classDescriptors('5': Integer@163) = DeserializedClassDescriptor@10['KTopLevelProperty']
-}
-
-TypeDeserializer@164 {
-    classDescriptors('4': Integer@161) = DeserializedClassDescriptor@6['KProperty']
-}
-
-TypeDeserializer@165 {
-    classDescriptors('4': Integer@161) = DeserializedClassDescriptor@6['KProperty']
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/genericClass.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/genericClass.lazy.log
index 37130ba55ff..30935428517 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/genericClass.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/genericClass.lazy.log
@@ -161,12 +161,6 @@ LazyJavaPackageFragment@3['reflect'] {
 
 ResolutionTaskHolder@93 {
     <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
@@ -192,14 +186,8 @@ ResolutionTaskHolder@93 {
     <name not found> = EmptyList@63[empty]
 }
 
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
     <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
@@ -225,36 +213,149 @@ ResolutionTaskHolder@97 {
     <name not found> = EmptyList@63[empty]
 }
 
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
-    <name not found> = EmptyList@63[empty]
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
     <name not found> = EmptyList@63[empty]
 }
 
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
+}
+
 ResolutionTaskHolder@105 {
     <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
 }
 
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
 }
 
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
+ResolutionTaskHolder@111 {
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
+}
+
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
 }
 
 ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+}
+
+ResolutionTaskHolder@118 {
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+}
+
+ResolutionTaskHolder@119 {
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+}
+
+ResolutionTaskHolder@120 {
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
 }
 
 ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+}
+
+ResolutionTaskHolder@122 {
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+}
+
+ResolutionTaskHolder@123 {
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+}
+
+ResolutionTaskHolder@124 {
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
 }
 
 ResolutionTaskHolder@125 {
@@ -266,18 +367,6 @@ ResolutionTaskHolder@125 {
     <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
 }
 
 ResolutionTaskHolder@126 {
@@ -289,44 +378,40 @@ ResolutionTaskHolder@126 {
     <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
 }
 
-ResolutionTaskHolder@127 {
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
+TypeDeserializer@127 {
+    classDescriptors('3': Integer@128) = DeserializedClassDescriptor@129['Any']
 }
 
-ResolutionTaskHolder@128 {
+null {
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@113 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@104 }
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
@@ -348,85 +433,3 @@ ResolutionTaskHolder@128 {
     <name not found> = EmptyList@63[empty]
     <name not found> = EmptyList@63[empty]
 }
-
-ResolutionTaskHolder@129 {
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@131 {
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@132 {
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@133 {
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@134 {
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-}
-
-TypeDeserializer@135 {
-    classDescriptors('3': Integer@136) = DeserializedClassDescriptor@137['Any']
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/javaInstanceField.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/javaInstanceField.lazy.log
index 46443481d4e..7ba845f886e 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/javaInstanceField.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/javaInstanceField.lazy.log
@@ -41,12 +41,12 @@ DeserializedType@13['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@23
 }
 
-DeserializedType@9['kotlin.Any'] {
+DeserializedType@17['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@22
     memberScope = DeserializedClassMemberScope@23
 }
 
-DeserializedType@17['kotlin.Any'] {
+DeserializedType@9['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@22
     memberScope = DeserializedClassMemberScope@23
 }
@@ -396,12 +396,6 @@ LazyJavaPackageFragment@5['reflect'] {
 
 ResolutionTaskHolder@193 {
     <name not found> = ArrayList@194[1] { ResolutionCandidate@195 }
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@195 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -427,14 +421,8 @@ ResolutionTaskHolder@193 {
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@197 {
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@199 }
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@199 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@196 {
+    <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -460,9 +448,8 @@ ResolutionTaskHolder@197 {
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@201 {
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@203 }
+ResolutionTaskHolder@199 {
+    <name not found> = ArrayList@200[1] { ResolutionCandidate@201 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -486,6 +473,28 @@ ResolutionTaskHolder@201 {
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@202 {
+    <name not found> = ArrayList@203[1] { ResolutionCandidate@204 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -495,12 +504,6 @@ ResolutionTaskHolder@201 {
 
 ResolutionTaskHolder@205 {
     <name not found> = ArrayList@206[1] { ResolutionCandidate@207 }
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@207 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -526,14 +529,8 @@ ResolutionTaskHolder@205 {
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@209 {
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@211 }
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@211 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@208 {
+    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -559,15 +556,8 @@ ResolutionTaskHolder@209 {
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@213 {
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@215 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@211 {
+    <name not found> = ArrayList@212[1] { ResolutionCandidate@213 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -579,6 +569,10 @@ ResolutionTaskHolder@213 {
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@214 {
+    <name not found> = ArrayList@215[1] { ResolutionCandidate@216 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -594,58 +588,246 @@ ResolutionTaskHolder@213 {
 
 ResolutionTaskHolder@217 {
     <name not found> = ArrayList@218[1] { ResolutionCandidate@219 }
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@219 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@221 {
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@223 }
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@223 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@220 {
+    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
 }
 
-ResolutionTaskHolder@225 {
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@227 }
+ResolutionTaskHolder@223 {
+    <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
+}
+
+ResolutionTaskHolder@226 {
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
 }
 
 ResolutionTaskHolder@229 {
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@231 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@230 {
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@231 {
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@232 {
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
 }
 
 ResolutionTaskHolder@233 {
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@235 }
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@235 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@234 {
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@235 {
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@236 {
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
 }
 
 ResolutionTaskHolder@237 {
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@239 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@238 {
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@239 {
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@240 {
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
 }
 
 ResolutionTaskHolder@241 {
@@ -657,18 +839,6 @@ ResolutionTaskHolder@241 {
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
 }
 
 ResolutionTaskHolder@242 {
@@ -680,18 +850,6 @@ ResolutionTaskHolder@242 {
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
 }
 
 ResolutionTaskHolder@243 {
@@ -703,18 +861,6 @@ ResolutionTaskHolder@243 {
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
 }
 
 ResolutionTaskHolder@244 {
@@ -726,18 +872,6 @@ ResolutionTaskHolder@244 {
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
 }
 
 ResolutionTaskHolder@245 {
@@ -749,18 +883,6 @@ ResolutionTaskHolder@245 {
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
 }
 
 ResolutionTaskHolder@246 {
@@ -772,18 +894,6 @@ ResolutionTaskHolder@246 {
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
 }
 
 ResolutionTaskHolder@247 {
@@ -795,18 +905,6 @@ ResolutionTaskHolder@247 {
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
 }
 
 ResolutionTaskHolder@248 {
@@ -818,18 +916,6 @@ ResolutionTaskHolder@248 {
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
 }
 
 ResolutionTaskHolder@249 {
@@ -841,18 +927,6 @@ ResolutionTaskHolder@249 {
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
 }
 
 ResolutionTaskHolder@250 {
@@ -864,18 +938,6 @@ ResolutionTaskHolder@250 {
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
 }
 
 ResolutionTaskHolder@251 {
@@ -887,18 +949,6 @@ ResolutionTaskHolder@251 {
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
 }
 
 ResolutionTaskHolder@252 {
@@ -910,18 +960,6 @@ ResolutionTaskHolder@252 {
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
 }
 
 ResolutionTaskHolder@253 {
@@ -933,8 +971,6 @@ ResolutionTaskHolder@253 {
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
 }
 
 ResolutionTaskHolder@254 {
@@ -946,8 +982,6 @@ ResolutionTaskHolder@254 {
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
 }
 
 ResolutionTaskHolder@255 {
@@ -959,8 +993,6 @@ ResolutionTaskHolder@255 {
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
 }
 
 ResolutionTaskHolder@256 {
@@ -972,8 +1004,6 @@ ResolutionTaskHolder@256 {
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
 }
 
 ResolutionTaskHolder@257 {
@@ -985,8 +1015,6 @@ ResolutionTaskHolder@257 {
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
 }
 
 ResolutionTaskHolder@258 {
@@ -998,37 +1026,137 @@ ResolutionTaskHolder@258 {
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@259 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+TypeDeserializer@259 {
+    classDescriptors('3': Integer@260) = DeserializedClassDescriptor@261['Any']
 }
 
-ResolutionTaskHolder@260 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+TypeDeserializer@262 {
+    classDescriptors('3': Integer@260) = DeserializedClassDescriptor@261['Any']
 }
 
-ResolutionTaskHolder@261 {
+null {
+    <name not found> = ArrayList@263[1] { ResolutionCandidate@210 }
+    <name not found> = ArrayList@264[1] { ResolutionCandidate@219 }
+    <name not found> = ArrayList@265[1] { ResolutionCandidate@204 }
+    <name not found> = ArrayList@266[1] { ResolutionCandidate@225 }
+    <name not found> = ArrayList@267[1] { ResolutionCandidate@195 }
+    <name not found> = ArrayList@268[1] { ResolutionCandidate@222 }
+    <name not found> = ArrayList@269[1] { ResolutionCandidate@207 }
+    <name not found> = ArrayList@270[1] { ResolutionCandidate@228 }
+    <name not found> = ArrayList@271[1] { ResolutionCandidate@201 }
+    <name not found> = ArrayList@272[1] { ResolutionCandidate@216 }
+    <name not found> = ArrayList@273[1] { ResolutionCandidate@198 }
+    <name not found> = ArrayList@274[1] { ResolutionCandidate@213 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -1040,128 +1168,3 @@ ResolutionTaskHolder@261 {
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
-
-ResolutionTaskHolder@262 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@263 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@264 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@265 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@266 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@267 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@268 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@269 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@270 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-TypeDeserializer@271 {
-    classDescriptors('3': Integer@272) = DeserializedClassDescriptor@273['Any']
-}
-
-TypeDeserializer@274 {
-    classDescriptors('3': Integer@272) = DeserializedClassDescriptor@273['Any']
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/javaStaticFieldViaImport.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/javaStaticFieldViaImport.lazy.log
index fa1f38b931e..59b1b4867e2 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/javaStaticFieldViaImport.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/javaStaticFieldViaImport.lazy.log
@@ -91,7 +91,7 @@ DeserializedType@45['R in kotlin.reflect.KMutableTopLevelVariable'] {
 }
 
 DeserializedType@46['R in kotlin.reflect.KMutableVariable'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@37
+    constructor = AbstractLazyTypeParameterDescriptor$1@43
 }
 
 DeserializedType@47['R in kotlin.reflect.KTopLevelVariable'] {
@@ -103,15 +103,15 @@ DeserializedType@48['R in kotlin.reflect.KTopLevelVariable'] {
 }
 
 DeserializedType@49['R in kotlin.reflect.KVariable'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@43
+    constructor = AbstractLazyTypeParameterDescriptor$1@37
 }
 
-DeserializedType@23['kotlin.Any'] {
+DeserializedType@31['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@50
     memberScope = DeserializedClassMemberScope@51
 }
 
-DeserializedType@31['kotlin.Any'] {
+DeserializedType@27['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@50
     memberScope = DeserializedClassMemberScope@51
 }
@@ -121,7 +121,7 @@ DeserializedType@35['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@51
 }
 
-DeserializedType@27['kotlin.Any'] {
+DeserializedType@23['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@50
     memberScope = DeserializedClassMemberScope@51
 }
@@ -571,10 +571,6 @@ LazyJavaPackageFragment@19['reflect'] {
 
 ResolutionTaskHolder@258 {
     <name not found> = ArrayList@259[1] { ResolutionCandidate@260 }
-    <name not found> = ArrayList@261[1] { ResolutionCandidate@260 }
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
     <name not found> = EmptyList@80[empty]
     <name not found> = EmptyList@80[empty]
     <name not found> = EmptyList@80[empty]
@@ -592,12 +588,8 @@ ResolutionTaskHolder@258 {
     <name not found> = EmptyList@80[empty]
 }
 
-ResolutionTaskHolder@262 {
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@264 }
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@264 }
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
+ResolutionTaskHolder@261 {
+    <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
     <name not found> = EmptyList@80[empty]
     <name not found> = EmptyList@80[empty]
     <name not found> = EmptyList@80[empty]
@@ -615,9 +607,8 @@ ResolutionTaskHolder@262 {
     <name not found> = EmptyList@80[empty]
 }
 
-ResolutionTaskHolder@266 {
-    <name not found> = ArrayList@267[1] { ResolutionCandidate@268 }
-    <name not found> = ArrayList@269[1] { ResolutionCandidate@268 }
+ResolutionTaskHolder@264 {
+    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
     <name not found> = EmptyList@80[empty]
     <name not found> = EmptyList@80[empty]
     <name not found> = EmptyList@80[empty]
@@ -633,6 +624,22 @@ ResolutionTaskHolder@266 {
     <name not found> = EmptyList@80[empty]
     <name not found> = EmptyList@80[empty]
     <name not found> = EmptyList@80[empty]
+}
+
+ResolutionTaskHolder@267 {
+    <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
     <name not found> = EmptyList@80[empty]
     <name not found> = EmptyList@80[empty]
     <name not found> = EmptyList@80[empty]
@@ -640,10 +647,6 @@ ResolutionTaskHolder@266 {
 
 ResolutionTaskHolder@270 {
     <name not found> = ArrayList@271[1] { ResolutionCandidate@272 }
-    <name not found> = ArrayList@273[1] { ResolutionCandidate@272 }
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
     <name not found> = EmptyList@80[empty]
     <name not found> = EmptyList@80[empty]
     <name not found> = EmptyList@80[empty]
@@ -661,12 +664,8 @@ ResolutionTaskHolder@270 {
     <name not found> = EmptyList@80[empty]
 }
 
-ResolutionTaskHolder@274 {
-    <name not found> = ArrayList@275[1] { ResolutionCandidate@276 }
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@276 }
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
+ResolutionTaskHolder@273 {
+    <name not found> = ArrayList@274[1] { ResolutionCandidate@275 }
     <name not found> = EmptyList@80[empty]
     <name not found> = EmptyList@80[empty]
     <name not found> = EmptyList@80[empty]
@@ -684,13 +683,8 @@ ResolutionTaskHolder@274 {
     <name not found> = EmptyList@80[empty]
 }
 
-ResolutionTaskHolder@278 {
-    <name not found> = ArrayList@279[1] { ResolutionCandidate@280 }
-    <name not found> = ArrayList@281[1] { ResolutionCandidate@280 }
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
+ResolutionTaskHolder@276 {
+    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
     <name not found> = EmptyList@80[empty]
     <name not found> = EmptyList@80[empty]
     <name not found> = EmptyList@80[empty]
@@ -698,6 +692,10 @@ ResolutionTaskHolder@278 {
     <name not found> = EmptyList@80[empty]
     <name not found> = EmptyList@80[empty]
     <name not found> = EmptyList@80[empty]
+}
+
+ResolutionTaskHolder@279 {
+    <name not found> = ArrayList@280[1] { ResolutionCandidate@281 }
     <name not found> = EmptyList@80[empty]
     <name not found> = EmptyList@80[empty]
     <name not found> = EmptyList@80[empty]
@@ -709,61 +707,69 @@ ResolutionTaskHolder@278 {
 
 ResolutionTaskHolder@282 {
     <name not found> = ArrayList@283[1] { ResolutionCandidate@284 }
-    <name not found> = ArrayList@285[1] { ResolutionCandidate@284 }
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
     <name not found> = EmptyList@80[empty]
 }
 
-ResolutionTaskHolder@286 {
-    <name not found> = ArrayList@287[1] { ResolutionCandidate@288 }
-    <name not found> = ArrayList@289[1] { ResolutionCandidate@288 }
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
+ResolutionTaskHolder@285 {
+    <name not found> = ArrayList@286[1] { ResolutionCandidate@287 }
     <name not found> = EmptyList@80[empty]
 }
 
-ResolutionTaskHolder@290 {
-    <name not found> = ArrayList@291[1] { ResolutionCandidate@292 }
-    <name not found> = ArrayList@293[1] { ResolutionCandidate@292 }
+ResolutionTaskHolder@288 {
+    <name not found> = ArrayList@289[1] { ResolutionCandidate@290 }
     <name not found> = EmptyList@80[empty]
+}
+
+ResolutionTaskHolder@291 {
+    <name not found> = ArrayList@292[1] { ResolutionCandidate@293 }
     <name not found> = EmptyList@80[empty]
 }
 
 ResolutionTaskHolder@294 {
-    <name not found> = ArrayList@295[1] { ResolutionCandidate@296 }
-    <name not found> = ArrayList@297[1] { ResolutionCandidate@296 }
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+}
+
+ResolutionTaskHolder@295 {
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+}
+
+ResolutionTaskHolder@296 {
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+}
+
+ResolutionTaskHolder@297 {
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
     <name not found> = EmptyList@80[empty]
     <name not found> = EmptyList@80[empty]
 }
 
 ResolutionTaskHolder@298 {
-    <name not found> = ArrayList@299[1] { ResolutionCandidate@300 }
-    <name not found> = ArrayList@301[1] { ResolutionCandidate@300 }
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-}
-
-ResolutionTaskHolder@302 {
-    <name not found> = ArrayList@303[1] { ResolutionCandidate@304 }
-    <name not found> = ArrayList@305[1] { ResolutionCandidate@304 }
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-}
-
-ResolutionTaskHolder@306 {
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
     <name not found> = EmptyList@80[empty]
     <name not found> = EmptyList@80[empty]
     <name not found> = EmptyList@80[empty]
@@ -774,9 +780,7 @@ ResolutionTaskHolder@306 {
     <name not found> = EmptyList@80[empty]
 }
 
-ResolutionTaskHolder@307 {
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
+ResolutionTaskHolder@299 {
     <name not found> = EmptyList@80[empty]
     <name not found> = EmptyList@80[empty]
     <name not found> = EmptyList@80[empty]
@@ -787,97 +791,96 @@ ResolutionTaskHolder@307 {
     <name not found> = EmptyList@80[empty]
 }
 
-ResolutionTaskHolder@308 {
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
+TypeDeserializer@300 {
+    classDescriptors('3': Integer@301) = DeserializedClassDescriptor@302['Any']
+    classDescriptors('4': Integer@303) = DeserializedClassDescriptor@2['KCallable']
 }
 
-ResolutionTaskHolder@309 {
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
+TypeDeserializer@304 {
+    classDescriptors('3': Integer@301) = DeserializedClassDescriptor@302['Any']
+    classDescriptors('4': Integer@303) = DeserializedClassDescriptor@12['KProperty']
 }
 
-ResolutionTaskHolder@310 {
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
+TypeDeserializer@305 {
+    classDescriptors('3': Integer@301) = DeserializedClassDescriptor@302['Any']
+    classDescriptors('4': Integer@303) = DeserializedClassDescriptor@12['KProperty']
 }
 
-ResolutionTaskHolder@311 {
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
+TypeDeserializer@306 {
+    classDescriptors('3': Integer@301) = DeserializedClassDescriptor@302['Any']
+}
+
+TypeDeserializer@307 {
+    classDescriptors('3': Integer@301) = DeserializedClassDescriptor@302['Any']
+}
+
+TypeDeserializer@308 {
+    classDescriptors('4': Integer@303) = DeserializedClassDescriptor@12['KProperty']
+}
+
+TypeDeserializer@309 {
+    classDescriptors('4': Integer@303) = DeserializedClassDescriptor@16['KTopLevelVariable']
+    classDescriptors('5': Integer@310) = DeserializedClassDescriptor@10['KMutableVariable']
+    classDescriptors('6': Integer@311) = DeserializedClassDescriptor@6['KMutableTopLevelProperty']
 }
 
 TypeDeserializer@312 {
-    classDescriptors('3': Integer@313) = DeserializedClassDescriptor@314['Any']
-    classDescriptors('4': Integer@315) = DeserializedClassDescriptor@2['KCallable']
+    classDescriptors('4': Integer@303) = DeserializedClassDescriptor@18['KVariable']
+    classDescriptors('5': Integer@310) = DeserializedClassDescriptor@4['KMutableProperty']
 }
 
-TypeDeserializer@316 {
-    classDescriptors('3': Integer@313) = DeserializedClassDescriptor@314['Any']
-    classDescriptors('4': Integer@315) = DeserializedClassDescriptor@12['KProperty']
+TypeDeserializer@313 {
+    classDescriptors('4': Integer@303) = DeserializedClassDescriptor@18['KVariable']
+    classDescriptors('5': Integer@310) = DeserializedClassDescriptor@14['KTopLevelProperty']
 }
 
-TypeDeserializer@317 {
-    classDescriptors('3': Integer@313) = DeserializedClassDescriptor@314['Any']
-    classDescriptors('4': Integer@315) = DeserializedClassDescriptor@12['KProperty']
-}
-
-TypeDeserializer@318 {
-    classDescriptors('3': Integer@313) = DeserializedClassDescriptor@314['Any']
-}
-
-TypeDeserializer@319 {
-    classDescriptors('3': Integer@313) = DeserializedClassDescriptor@314['Any']
-}
-
-TypeDeserializer@320 {
-    classDescriptors('4': Integer@315) = DeserializedClassDescriptor@12['KProperty']
-}
-
-TypeDeserializer@321 {
-    classDescriptors('4': Integer@315) = DeserializedClassDescriptor@16['KTopLevelVariable']
-    classDescriptors('5': Integer@322) = DeserializedClassDescriptor@10['KMutableVariable']
-    classDescriptors('6': Integer@323) = DeserializedClassDescriptor@6['KMutableTopLevelProperty']
-}
-
-TypeDeserializer@324 {
-    classDescriptors('4': Integer@315) = DeserializedClassDescriptor@18['KVariable']
-    classDescriptors('5': Integer@322) = DeserializedClassDescriptor@4['KMutableProperty']
-}
-
-TypeDeserializer@325 {
-    classDescriptors('4': Integer@315) = DeserializedClassDescriptor@18['KVariable']
-    classDescriptors('5': Integer@322) = DeserializedClassDescriptor@14['KTopLevelProperty']
+null {
+    <name not found> = ArrayList@314[1] { ResolutionCandidate@266 }
+    <name not found> = ArrayList@315[1] { ResolutionCandidate@284 }
+    <name not found> = ArrayList@316[1] { ResolutionCandidate@275 }
+    <name not found> = ArrayList@317[1] { ResolutionCandidate@290 }
+    <name not found> = ArrayList@318[1] { ResolutionCandidate@269 }
+    <name not found> = ArrayList@319[1] { ResolutionCandidate@293 }
+    <name not found> = ArrayList@320[1] { ResolutionCandidate@272 }
+    <name not found> = ArrayList@321[1] { ResolutionCandidate@287 }
+    <name not found> = ArrayList@322[1] { ResolutionCandidate@263 }
+    <name not found> = ArrayList@323[1] { ResolutionCandidate@278 }
+    <name not found> = ArrayList@324[1] { ResolutionCandidate@260 }
+    <name not found> = ArrayList@325[1] { ResolutionCandidate@281 }
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/localVariable.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/localVariable.lazy.log
index f1c5c7b74b3..20218a326af 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/localVariable.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/localVariable.lazy.log
@@ -108,10 +108,6 @@ LazyJavaPackageFragment@7['lang'] {
 
 ResolutionTaskHolder@47 {
     <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
@@ -129,12 +125,8 @@ ResolutionTaskHolder@47 {
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
@@ -152,31 +144,24 @@ ResolutionTaskHolder@51 {
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
     <name not found> = EmptyList@25[empty]
 }
 
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+}
+
 ResolutionTaskHolder@59 {
     <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
 }
 
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@65 {
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
@@ -187,7 +172,25 @@ ResolutionTaskHolder@71 {
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@72 {
+ResolutionTaskHolder@66 {
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+}
+
+null {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@61 }
+    <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/memberFromExtension.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/memberFromExtension.lazy.log
index 177671f9f74..b5f8480c6bf 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/memberFromExtension.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/memberFromExtension.lazy.log
@@ -93,57 +93,57 @@ DeserializedTypeParameterDescriptor@68['T'] {
 }
 
 DeserializedType@73['R in kotlin.reflect.KMemberProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@54
+    constructor = AbstractLazyTypeParameterDescriptor$1@49
 }
 
 DeserializedType@74['R in kotlin.reflect.KMutableMemberProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@49
+    constructor = AbstractLazyTypeParameterDescriptor$1@54
 }
 
 DeserializedType@75['R in kotlin.reflect.KMutableMemberProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@49
+    constructor = AbstractLazyTypeParameterDescriptor$1@54
 }
 
 DeserializedType@76['T in kotlin.reflect.KMemberProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@70
+    constructor = AbstractLazyTypeParameterDescriptor$1@65
 }
 
 DeserializedType@77['T in kotlin.reflect.KMutableMemberProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@65
+    constructor = AbstractLazyTypeParameterDescriptor$1@70
 }
 
 DeserializedType@78['T in kotlin.reflect.KMutableMemberProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@65
+    constructor = AbstractLazyTypeParameterDescriptor$1@70
 }
 
-DeserializedType@72['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@79
-    memberScope = DeserializedClassMemberScope@80
-}
-
-DeserializedType@81['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@79
-    memberScope = DeserializedClassMemberScope@80
-}
-
-DeserializedType@51['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@79
-    memberScope = DeserializedClassMemberScope@80
-}
-
-DeserializedType@82['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@79
-    memberScope = DeserializedClassMemberScope@80
+DeserializedType@79['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@80
+    memberScope = DeserializedClassMemberScope@81
 }
 
 DeserializedType@56['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@79
-    memberScope = DeserializedClassMemberScope@80
+    constructor = DeserializedClassTypeConstructor@80
+    memberScope = DeserializedClassMemberScope@81
+}
+
+DeserializedType@82['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@80
+    memberScope = DeserializedClassMemberScope@81
 }
 
 DeserializedType@67['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@79
-    memberScope = DeserializedClassMemberScope@80
+    constructor = DeserializedClassTypeConstructor@80
+    memberScope = DeserializedClassMemberScope@81
+}
+
+DeserializedType@72['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@80
+    memberScope = DeserializedClassMemberScope@81
+}
+
+DeserializedType@51['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@80
+    memberScope = DeserializedClassMemberScope@81
 }
 
 DeserializedType@83['kotlin.String'] {
@@ -401,19 +401,7 @@ NestedClassDescriptors@194 {
 
 ResolutionTaskHolder@195 {
     <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@197 }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@200 }
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
+    <name not found> = ArrayList@198[1] { ResolutionCandidate@199 }
     <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
@@ -462,21 +450,9 @@ ResolutionTaskHolder@195 {
     <name not found> = EmptyList@15[empty]
 }
 
-ResolutionTaskHolder@202 {
+ResolutionTaskHolder@200 {
+    <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
     <name not found> = ArrayList@203[1] { ResolutionCandidate@204 }
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@204 }
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@207 }
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@207 }
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
@@ -525,11 +501,9 @@ ResolutionTaskHolder@202 {
     <name not found> = EmptyList@15[empty]
 }
 
-ResolutionTaskHolder@209 {
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@211 }
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@211 }
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@214 }
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@214 }
+ResolutionTaskHolder@205 {
+    <name not found> = ArrayList@206[1] { ResolutionCandidate@207 }
+    <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
     <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
@@ -576,6 +550,10 @@ ResolutionTaskHolder@209 {
     <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
+}
+
+ResolutionTaskHolder@210 {
+    <name not found> = ArrayList@211[1] { ResolutionCandidate@212 }
     <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
@@ -584,137 +562,122 @@ ResolutionTaskHolder@209 {
     <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
+}
+
+ResolutionTaskHolder@213 {
+    <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
 }
 
 ResolutionTaskHolder@216 {
     <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@218 }
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
 }
 
-ResolutionTaskHolder@220 {
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@222 }
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
+ResolutionTaskHolder@219 {
+    <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
     <name not found> = EmptyList@15[empty]
 }
 
-ResolutionTaskHolder@224 {
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@226 }
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@226 }
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
+ResolutionTaskHolder@222 {
+    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
     <name not found> = EmptyList@15[empty]
+}
+
+ResolutionTaskHolder@225 {
+    <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
     <name not found> = EmptyList@15[empty]
 }
 
 ResolutionTaskHolder@228 {
     <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@230 }
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
 }
 
-ResolutionTaskHolder@232 {
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@234 }
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
+ResolutionTaskHolder@231 {
+    <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
 }
 
-ResolutionTaskHolder@236 {
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@238 }
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@238 }
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
+ResolutionTaskHolder@234 {
+    <name not found> = ArrayList@235[1] { ResolutionCandidate@236 }
+}
+
+ResolutionTaskHolder@237 {
+    <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
 }
 
 ResolutionTaskHolder@240 {
     <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
-    <name not found> = ArrayList@243[1] { ResolutionCandidate@242 }
 }
 
-ResolutionTaskHolder@244 {
-    <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@246 }
+ResolutionTaskHolder@243 {
+    <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
 }
 
-ResolutionTaskHolder@248 {
-    <name not found> = ArrayList@249[1] { ResolutionCandidate@250 }
-    <name not found> = ArrayList@251[1] { ResolutionCandidate@250 }
+ResolutionTaskHolder@246 {
+    <name not found> = ArrayList@247[1] { ResolutionCandidate@248 }
+}
+
+ResolutionTaskHolder@249 {
+    <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
 }
 
 ResolutionTaskHolder@252 {
     <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
-    <name not found> = ArrayList@255[1] { ResolutionCandidate@254 }
 }
 
-ResolutionTaskHolder@256 {
-    <name not found> = ArrayList@257[1] { ResolutionCandidate@258 }
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@258 }
+ResolutionTaskHolder@255 {
+    <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
+}
+
+ResolutionTaskHolder@258 {
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+}
+
+ResolutionTaskHolder@259 {
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
 }
 
 ResolutionTaskHolder@260 {
-    <name not found> = ArrayList@261[1] { ResolutionCandidate@262 }
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@262 }
-}
-
-ResolutionTaskHolder@264 {
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
-    <name not found> = ArrayList@267[1] { ResolutionCandidate@266 }
-}
-
-ResolutionTaskHolder@268 {
-    <name not found> = ArrayList@269[1] { ResolutionCandidate@270 }
-    <name not found> = ArrayList@271[1] { ResolutionCandidate@270 }
-}
-
-ResolutionTaskHolder@272 {
-    <name not found> = ArrayList@273[1] { ResolutionCandidate@274 }
-    <name not found> = ArrayList@275[1] { ResolutionCandidate@274 }
-}
-
-ResolutionTaskHolder@276 {
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
-    <name not found> = ArrayList@279[1] { ResolutionCandidate@278 }
-}
-
-ResolutionTaskHolder@280 {
     <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
@@ -731,17 +694,66 @@ ResolutionTaskHolder@280 {
     <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
+}
+
+ResolutionTaskHolder@261 {
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+}
+
+ResolutionTaskHolder@262 {
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+}
+
+ResolutionTaskHolder@263 {
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
 }
 
-ResolutionTaskHolder@281 {
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
+ResolutionTaskHolder@264 {
     <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
@@ -760,11 +772,7 @@ ResolutionTaskHolder@281 {
     <name not found> = EmptyList@15[empty]
 }
 
-ResolutionTaskHolder@282 {
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
+ResolutionTaskHolder@265 {
     <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
@@ -783,11 +791,7 @@ ResolutionTaskHolder@282 {
     <name not found> = EmptyList@15[empty]
 }
 
-ResolutionTaskHolder@283 {
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
+ResolutionTaskHolder@266 {
     <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
     <name not found> = EmptyList@15[empty]
@@ -806,152 +810,151 @@ ResolutionTaskHolder@283 {
     <name not found> = EmptyList@15[empty]
 }
 
-ResolutionTaskHolder@284 {
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
+TypeDeserializer@267 {
+    classDescriptors('2': Integer@268) = DeserializedClassDescriptor@269['Any']
 }
 
-ResolutionTaskHolder@285 {
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
+TypeDeserializer@270 {
+    classDescriptors('3': Integer@271) = DeserializedClassDescriptor@269['Any']
+    classDescriptors('4': Integer@272) = DeserializedClassDescriptor@4['KMemberProperty']
+    classDescriptors('5': Integer@273) = DeserializedClassDescriptor@8['KMutableProperty']
 }
 
-ResolutionTaskHolder@286 {
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
+TypeDeserializer@274 {
+    classDescriptors('3': Integer@271) = DeserializedClassDescriptor@269['Any']
+    classDescriptors('4': Integer@272) = DeserializedClassDescriptor@10['KProperty']
 }
 
-ResolutionTaskHolder@287 {
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
+TypeDeserializer@275 {
+    classDescriptors('3': Integer@271) = DeserializedClassDescriptor@269['Any']
 }
 
-ResolutionTaskHolder@288 {
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
+TypeDeserializer@276 {
+    classDescriptors('3': Integer@271) = DeserializedClassDescriptor@277['String']
 }
 
-TypeDeserializer@289 {
-    classDescriptors('2': Integer@290) = DeserializedClassDescriptor@291['Any']
+TypeDeserializer@278 {
+    classDescriptors('4': Integer@272) = DeserializedClassDescriptor@2['KCallable']
 }
 
-TypeDeserializer@292 {
-    classDescriptors('3': Integer@293) = DeserializedClassDescriptor@291['Any']
-    classDescriptors('4': Integer@294) = DeserializedClassDescriptor@4['KMemberProperty']
-    classDescriptors('5': Integer@295) = DeserializedClassDescriptor@8['KMutableProperty']
+TypeDeserializer@279 {
+    classDescriptors('4': Integer@272) = DeserializedClassDescriptor@10['KProperty']
 }
 
-TypeDeserializer@296 {
-    classDescriptors('3': Integer@293) = DeserializedClassDescriptor@291['Any']
-    classDescriptors('4': Integer@294) = DeserializedClassDescriptor@10['KProperty']
+TypeDeserializer@280 {
+    classDescriptors('6': Integer@281) = DeserializedClassDescriptor@12['Unit']
 }
 
-TypeDeserializer@297 {
-    classDescriptors('3': Integer@293) = DeserializedClassDescriptor@291['Any']
-}
-
-TypeDeserializer@298 {
-    classDescriptors('3': Integer@293) = DeserializedClassDescriptor@299['String']
-}
-
-TypeDeserializer@300 {
-    classDescriptors('4': Integer@294) = DeserializedClassDescriptor@2['KCallable']
-}
-
-TypeDeserializer@301 {
-    classDescriptors('4': Integer@294) = DeserializedClassDescriptor@10['KProperty']
-}
-
-TypeDeserializer@302 {
-    classDescriptors('6': Integer@303) = DeserializedClassDescriptor@12['Unit']
+null {
+    <name not found> = ArrayList@282[1] { ResolutionCandidate@218 }
+    <name not found> = ArrayList@283[1] { ResolutionCandidate@207 }
+    <name not found> = ArrayList@284[1] { ResolutionCandidate@209 }
+    <name not found> = ArrayList@285[1] { ResolutionCandidate@221 }
+    <name not found> = ArrayList@286[1] { ResolutionCandidate@202 }
+    <name not found> = ArrayList@287[1] { ResolutionCandidate@204 }
+    <name not found> = ArrayList@288[1] { ResolutionCandidate@227 }
+    <name not found> = ArrayList@289[1] { ResolutionCandidate@197 }
+    <name not found> = ArrayList@290[1] { ResolutionCandidate@199 }
+    <name not found> = ArrayList@291[1] { ResolutionCandidate@224 }
+    <name not found> = ArrayList@292[1] { ResolutionCandidate@254 }
+    <name not found> = ArrayList@293[1] { ResolutionCandidate@230 }
+    <name not found> = ArrayList@294[1] { ResolutionCandidate@239 }
+    <name not found> = ArrayList@295[1] { ResolutionCandidate@242 }
+    <name not found> = ArrayList@296[1] { ResolutionCandidate@257 }
+    <name not found> = ArrayList@297[1] { ResolutionCandidate@215 }
+    <name not found> = ArrayList@298[1] { ResolutionCandidate@251 }
+    <name not found> = ArrayList@299[1] { ResolutionCandidate@233 }
+    <name not found> = ArrayList@300[1] { ResolutionCandidate@212 }
+    <name not found> = ArrayList@301[1] { ResolutionCandidate@248 }
+    <name not found> = ArrayList@302[1] { ResolutionCandidate@236 }
+    <name not found> = ArrayList@303[1] { ResolutionCandidate@245 }
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/memberFromTopLevel.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/memberFromTopLevel.lazy.log
index 6d1f557fd38..0621a2111fe 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/memberFromTopLevel.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/memberFromTopLevel.lazy.log
@@ -127,15 +127,15 @@ DeserializedType@81['R in kotlin.reflect.KMutableMemberProperty'] {
 }
 
 DeserializedType@82['T in kotlin.reflect.KMemberProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@65
+    constructor = AbstractLazyTypeParameterDescriptor$1@70
 }
 
 DeserializedType@83['T in kotlin.reflect.KMutableMemberProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@70
+    constructor = AbstractLazyTypeParameterDescriptor$1@65
 }
 
 DeserializedType@84['T in kotlin.reflect.KMutableMemberProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@70
+    constructor = AbstractLazyTypeParameterDescriptor$1@65
 }
 
 DeserializedType@85['V in kotlin'] {
@@ -150,12 +150,12 @@ DeserializedType@87['V in kotlin'] {
     constructor = AbstractLazyTypeParameterDescriptor$1@74
 }
 
-DeserializedType@56['kotlin.Any'] {
+DeserializedType@72['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@88
     memberScope = DeserializedClassMemberScope@89
 }
 
-DeserializedType@72['kotlin.Any'] {
+DeserializedType@56['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@88
     memberScope = DeserializedClassMemberScope@89
 }
@@ -165,26 +165,26 @@ DeserializedType@90['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@89
 }
 
-DeserializedType@46['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@88
-    memberScope = DeserializedClassMemberScope@89
-}
-
-DeserializedType@51['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@88
-    memberScope = DeserializedClassMemberScope@89
-}
-
 DeserializedType@67['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@88
     memberScope = DeserializedClassMemberScope@89
 }
 
+DeserializedType@46['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@88
+    memberScope = DeserializedClassMemberScope@89
+}
+
 DeserializedType@76['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@88
     memberScope = DeserializedClassMemberScope@89
 }
 
+DeserializedType@51['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@88
+    memberScope = DeserializedClassMemberScope@89
+}
+
 DeserializedType@91['kotlin.CharSequence'] {
     constructor = DeserializedClassTypeConstructor@92
 }
@@ -447,20 +447,18 @@ LazyJavaPackageFragment@15['reflect'] {
 }
 
 NestedClassDescriptors@209 {
-    findNestedClass('get': Name@16) = null
-    findNestedClass('set': Name@19) = null
-}
-
-NestedClassDescriptors@210 {
     findNestedClass('get': Name@29) = null
     findNestedClass('set': Name@33) = null
 }
 
+NestedClassDescriptors@210 {
+    findNestedClass('get': Name@16) = null
+    findNestedClass('set': Name@19) = null
+}
+
 ResolutionTaskHolder@211 {
     <name not found> = ArrayList@212[1] { ResolutionCandidate@213 }
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@213 }
-    <name not found> = ArrayList@215[2] { ResolutionCandidate@216, ResolutionCandidate@217 }
-    <name not found> = ArrayList@218[2] { ResolutionCandidate@216, ResolutionCandidate@217 }
+    <name not found> = ArrayList@214[2] { ResolutionCandidate@215, ResolutionCandidate@216 }
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
@@ -483,20 +481,37 @@ ResolutionTaskHolder@211 {
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
+}
+
+ResolutionTaskHolder@217 {
+    <name not found> = ArrayList@218[1] { ResolutionCandidate@219 }
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@219 {
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@221 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
+ResolutionTaskHolder@220 {
+    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
@@ -524,12 +539,6 @@ ResolutionTaskHolder@219 {
 
 ResolutionTaskHolder@223 {
     <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@225 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
@@ -555,158 +564,185 @@ ResolutionTaskHolder@223 {
     <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@227 {
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@229 }
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@229 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
+ResolutionTaskHolder@226 {
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@231 {
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@233 }
+ResolutionTaskHolder@229 {
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
+}
+
+ResolutionTaskHolder@232 {
+    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
 }
 
 ResolutionTaskHolder@235 {
     <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@237 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@239 {
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@241 }
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@241 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
+ResolutionTaskHolder@238 {
+    <name not found> = ArrayList@239[1] { ResolutionCandidate@240 }
 }
 
-ResolutionTaskHolder@243 {
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@245 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
+ResolutionTaskHolder@241 {
+    <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
+}
+
+ResolutionTaskHolder@244 {
+    <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
 }
 
 ResolutionTaskHolder@247 {
     <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@249 }
 }
 
-ResolutionTaskHolder@251 {
-    <name not found> = ArrayList@252[1] { ResolutionCandidate@253 }
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@253 }
+ResolutionTaskHolder@250 {
+    <name not found> = ArrayList@251[1] { ResolutionCandidate@252 }
 }
 
-ResolutionTaskHolder@255 {
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
-    <name not found> = ArrayList@258[1] { ResolutionCandidate@257 }
+ResolutionTaskHolder@253 {
+    <name not found> = ArrayList@254[1] { ResolutionCandidate@255 }
+}
+
+ResolutionTaskHolder@256 {
+    <name not found> = ArrayList@257[1] { ResolutionCandidate@258 }
 }
 
 ResolutionTaskHolder@259 {
     <name not found> = ArrayList@260[1] { ResolutionCandidate@261 }
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@261 }
 }
 
-ResolutionTaskHolder@263 {
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@265 }
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@265 }
+ResolutionTaskHolder@262 {
+    <name not found> = ArrayList@263[1] { ResolutionCandidate@264 }
 }
 
-ResolutionTaskHolder@267 {
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
-    <name not found> = ArrayList@270[1] { ResolutionCandidate@269 }
+ResolutionTaskHolder@265 {
+    <name not found> = ArrayList@266[1] { ResolutionCandidate@267 }
+}
+
+ResolutionTaskHolder@268 {
+    <name not found> = ArrayList@269[1] { ResolutionCandidate@270 }
 }
 
 ResolutionTaskHolder@271 {
     <name not found> = ArrayList@272[1] { ResolutionCandidate@273 }
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@273 }
 }
 
-ResolutionTaskHolder@275 {
-    <name not found> = ArrayList@276[1] { ResolutionCandidate@277 }
-    <name not found> = ArrayList@278[1] { ResolutionCandidate@277 }
+ResolutionTaskHolder@274 {
+    <name not found> = ArrayList@275[1] { ResolutionCandidate@276 }
 }
 
-ResolutionTaskHolder@279 {
-    <name not found> = ArrayList@280[1] { ResolutionCandidate@281 }
-    <name not found> = ArrayList@282[1] { ResolutionCandidate@281 }
+ResolutionTaskHolder@277 {
+    <name not found> = ArrayList@278[1] { ResolutionCandidate@279 }
+}
+
+ResolutionTaskHolder@280 {
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+}
+
+ResolutionTaskHolder@281 {
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+}
+
+ResolutionTaskHolder@282 {
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
 }
 
 ResolutionTaskHolder@283 {
-    <name not found> = ArrayList@284[1] { ResolutionCandidate@285 }
-    <name not found> = ArrayList@286[1] { ResolutionCandidate@285 }
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@287 {
-    <name not found> = ArrayList@288[1] { ResolutionCandidate@289 }
-    <name not found> = ArrayList@290[1] { ResolutionCandidate@289 }
+ResolutionTaskHolder@284 {
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@291 {
-    <name not found> = ArrayList@292[1] { ResolutionCandidate@293 }
-    <name not found> = ArrayList@294[1] { ResolutionCandidate@293 }
+ResolutionTaskHolder@285 {
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@295 {
-    <name not found> = ArrayList@296[1] { ResolutionCandidate@297 }
-    <name not found> = ArrayList@298[1] { ResolutionCandidate@297 }
-}
-
-ResolutionTaskHolder@299 {
-    <name not found> = ArrayList@300[1] { ResolutionCandidate@301 }
-    <name not found> = ArrayList@302[1] { ResolutionCandidate@301 }
-}
-
-ResolutionTaskHolder@303 {
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
+ResolutionTaskHolder@286 {
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
@@ -717,19 +753,7 @@ ResolutionTaskHolder@303 {
     <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@304 {
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
+ResolutionTaskHolder@287 {
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
@@ -740,19 +764,7 @@ ResolutionTaskHolder@304 {
     <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@305 {
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
+ResolutionTaskHolder@288 {
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
@@ -763,19 +775,7 @@ ResolutionTaskHolder@305 {
     <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@306 {
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
+ResolutionTaskHolder@289 {
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
@@ -786,120 +786,123 @@ ResolutionTaskHolder@306 {
     <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@307 {
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
+TypeDeserializer@290 {
+    classDescriptors('129': Integer@291) = DeserializedClassDescriptor@292['MutableMap']
+    classDescriptors('9': Integer@293) = DeserializedClassDescriptor@294['Any']
 }
 
-ResolutionTaskHolder@308 {
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
+TypeDeserializer@295 {
+    classDescriptors('3': Integer@296) = DeserializedClassDescriptor@294['Any']
+    classDescriptors('4': Integer@297) = DeserializedClassDescriptor@4['KMemberProperty']
+    classDescriptors('5': Integer@298) = DeserializedClassDescriptor@8['KMutableProperty']
 }
 
-ResolutionTaskHolder@309 {
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
+TypeDeserializer@299 {
+    classDescriptors('3': Integer@296) = DeserializedClassDescriptor@294['Any']
+    classDescriptors('4': Integer@297) = DeserializedClassDescriptor@10['KProperty']
 }
 
-ResolutionTaskHolder@310 {
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
+TypeDeserializer@300 {
+    classDescriptors('3': Integer@296) = DeserializedClassDescriptor@294['Any']
 }
 
-ResolutionTaskHolder@311 {
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
+TypeDeserializer@301 {
+    classDescriptors('4': Integer@297) = DeserializedClassDescriptor@2['KCallable']
 }
 
-ResolutionTaskHolder@312 {
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
+TypeDeserializer@302 {
+    classDescriptors('4': Integer@297) = DeserializedClassDescriptor@10['KProperty']
 }
 
-TypeDeserializer@313 {
-    classDescriptors('129': Integer@314) = DeserializedClassDescriptor@315['MutableMap']
-    classDescriptors('9': Integer@316) = DeserializedClassDescriptor@317['Any']
+TypeDeserializer@303 {
+    classDescriptors('40': Integer@304) = DeserializedClassDescriptor@305['CharSequence']
 }
 
-TypeDeserializer@318 {
-    classDescriptors('3': Integer@319) = DeserializedClassDescriptor@317['Any']
-    classDescriptors('4': Integer@320) = DeserializedClassDescriptor@4['KMemberProperty']
-    classDescriptors('5': Integer@321) = DeserializedClassDescriptor@8['KMutableProperty']
+TypeDeserializer@306 {
+    classDescriptors('40': Integer@304) = DeserializedClassDescriptor@305['CharSequence']
 }
 
-TypeDeserializer@322 {
-    classDescriptors('3': Integer@319) = DeserializedClassDescriptor@317['Any']
-    classDescriptors('4': Integer@320) = DeserializedClassDescriptor@10['KProperty']
+TypeDeserializer@307 {
+    classDescriptors('6': Integer@308) = DeserializedClassDescriptor@12['Unit']
 }
 
-TypeDeserializer@323 {
-    classDescriptors('3': Integer@319) = DeserializedClassDescriptor@317['Any']
-}
-
-TypeDeserializer@324 {
-    classDescriptors('4': Integer@320) = DeserializedClassDescriptor@2['KCallable']
-}
-
-TypeDeserializer@325 {
-    classDescriptors('4': Integer@320) = DeserializedClassDescriptor@10['KProperty']
-}
-
-TypeDeserializer@326 {
-    classDescriptors('40': Integer@327) = DeserializedClassDescriptor@328['CharSequence']
-}
-
-TypeDeserializer@329 {
-    classDescriptors('40': Integer@327) = DeserializedClassDescriptor@328['CharSequence']
-}
-
-TypeDeserializer@330 {
-    classDescriptors('6': Integer@331) = DeserializedClassDescriptor@12['Unit']
+null {
+    <name not found> = ArrayList@309[1] { ResolutionCandidate@219 }
+    <name not found> = ArrayList@310[1] { ResolutionCandidate@246 }
+    <name not found> = ArrayList@311[1] { ResolutionCandidate@273 }
+    <name not found> = ArrayList@312[1] { ResolutionCandidate@249 }
+    <name not found> = ArrayList@313[1] { ResolutionCandidate@276 }
+    <name not found> = ArrayList@314[1] { ResolutionCandidate@228 }
+    <name not found> = ArrayList@315[1] { ResolutionCandidate@267 }
+    <name not found> = ArrayList@316[1] { ResolutionCandidate@270 }
+    <name not found> = ArrayList@317[1] { ResolutionCandidate@213 }
+    <name not found> = ArrayList@318[1] { ResolutionCandidate@279 }
+    <name not found> = ArrayList@319[1] { ResolutionCandidate@234 }
+    <name not found> = ArrayList@320[1] { ResolutionCandidate@225 }
+    <name not found> = ArrayList@321[1] { ResolutionCandidate@222 }
+    <name not found> = ArrayList@322[1] { ResolutionCandidate@240 }
+    <name not found> = ArrayList@323[1] { ResolutionCandidate@252 }
+    <name not found> = ArrayList@324[1] { ResolutionCandidate@258 }
+    <name not found> = ArrayList@325[1] { ResolutionCandidate@243 }
+    <name not found> = ArrayList@326[1] { ResolutionCandidate@231 }
+    <name not found> = ArrayList@327[1] { ResolutionCandidate@264 }
+    <name not found> = ArrayList@328[1] { ResolutionCandidate@255 }
+    <name not found> = ArrayList@329[1] { ResolutionCandidate@237 }
+    <name not found> = ArrayList@330[1] { ResolutionCandidate@261 }
+    <name not found> = ArrayList@331[2] { ResolutionCandidate@215, ResolutionCandidate@216 }
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/topLevelFromTopLevel.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/topLevelFromTopLevel.lazy.log
index ffab33f0edc..b715dc012bc 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/topLevelFromTopLevel.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/topLevelFromTopLevel.lazy.log
@@ -166,7 +166,7 @@ DeserializedType@130['K in kotlin'] {
 }
 
 DeserializedType@131['R in kotlin.reflect.KMutableProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@118
+    constructor = AbstractLazyTypeParameterDescriptor$1@106
 }
 
 DeserializedType@132['R in kotlin.reflect.KMutableTopLevelProperty'] {
@@ -178,15 +178,15 @@ DeserializedType@133['R in kotlin.reflect.KMutableTopLevelProperty'] {
 }
 
 DeserializedType@134['R in kotlin.reflect.KMutableTopLevelVariable'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@114
+    constructor = AbstractLazyTypeParameterDescriptor$1@118
 }
 
 DeserializedType@135['R in kotlin.reflect.KMutableTopLevelVariable'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@114
+    constructor = AbstractLazyTypeParameterDescriptor$1@118
 }
 
 DeserializedType@136['R in kotlin.reflect.KMutableTopLevelVariable'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@114
+    constructor = AbstractLazyTypeParameterDescriptor$1@118
 }
 
 DeserializedType@137['R in kotlin.reflect.KMutableVariable'] {
@@ -202,11 +202,11 @@ DeserializedType@139['R in kotlin.reflect.KMutableVariable'] {
 }
 
 DeserializedType@140['R in kotlin.reflect.KProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@106
+    constructor = AbstractLazyTypeParameterDescriptor$1@122
 }
 
 DeserializedType@141['R in kotlin.reflect.KTopLevelProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@122
+    constructor = AbstractLazyTypeParameterDescriptor$1@114
 }
 
 DeserializedType@142['R in kotlin.reflect.KTopLevelVariable'] {
@@ -237,12 +237,7 @@ DeserializedType@148['V in kotlin'] {
     constructor = AbstractLazyTypeParameterDescriptor$1@126
 }
 
-DeserializedType@108['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@149
-    memberScope = DeserializedClassMemberScope@150
-}
-
-DeserializedType@151['kotlin.Any'] {
+DeserializedType@96['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@149
     memberScope = DeserializedClassMemberScope@150
 }
@@ -252,17 +247,22 @@ DeserializedType@124['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@150
 }
 
+DeserializedType@128['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@149
+    memberScope = DeserializedClassMemberScope@150
+}
+
+DeserializedType@120['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@149
+    memberScope = DeserializedClassMemberScope@150
+}
+
 DeserializedType@101['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@149
     memberScope = DeserializedClassMemberScope@150
 }
 
-DeserializedType@112['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@149
-    memberScope = DeserializedClassMemberScope@150
-}
-
-DeserializedType@96['kotlin.Any'] {
+DeserializedType@108['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@149
     memberScope = DeserializedClassMemberScope@150
 }
@@ -272,7 +272,7 @@ DeserializedType@86['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@150
 }
 
-DeserializedType@128['kotlin.Any'] {
+DeserializedType@151['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@149
     memberScope = DeserializedClassMemberScope@150
 }
@@ -287,7 +287,7 @@ DeserializedType@116['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@150
 }
 
-DeserializedType@120['kotlin.Any'] {
+DeserializedType@112['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@149
     memberScope = DeserializedClassMemberScope@150
 }
@@ -373,17 +373,17 @@ DeserializedType@193['kotlin.reflect.KVariable'] {
 }
 
 EnumEntryClassDescriptors@195 {
-    findEnumEntry('get': Name@196) = null
-    findEnumEntry('name': Name@197) = null
-    findEnumEntry('set': Name@31) = null
-}
-
-EnumEntryClassDescriptors@198 {
     findEnumEntry('get': Name@23) = null
     findEnumEntry('name': Name@28) = null
     findEnumEntry('set': Name@26) = null
 }
 
+EnumEntryClassDescriptors@196 {
+    findEnumEntry('get': Name@197) = null
+    findEnumEntry('name': Name@198) = null
+    findEnumEntry('set': Name@31) = null
+}
+
 LazyJavaPackageFragmentProvider@199 {
     packageFragments('<root>': FqName@200) = LazyJavaPackageFragment@201['<root>']
     packageFragments('Int': FqName@202) = null
@@ -602,25 +602,19 @@ LazyJavaPackageFragment@21['reflect'] {
 }
 
 NestedClassDescriptors@329 {
+    findNestedClass('get': Name@197) = null
+    findNestedClass('name': Name@198) = null
+    findNestedClass('set': Name@31) = null
+}
+
+NestedClassDescriptors@330 {
     findNestedClass('get': Name@23) = null
     findNestedClass('name': Name@28) = null
     findNestedClass('set': Name@26) = null
 }
 
-NestedClassDescriptors@330 {
-    findNestedClass('get': Name@196) = null
-    findNestedClass('name': Name@197) = null
-    findNestedClass('set': Name@31) = null
-}
-
 ResolutionTaskHolder@331 {
     <name not found> = ArrayList@332[1] { ResolutionCandidate@333 }
-    <name not found> = ArrayList@334[1] { ResolutionCandidate@333 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -646,12 +640,8 @@ ResolutionTaskHolder@331 {
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@335 {
-    <name not found> = ArrayList@336[1] { ResolutionCandidate@337 }
-    <name not found> = ArrayList@338[1] { ResolutionCandidate@337 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@334 {
+    <name not found> = ArrayList@335[1] { ResolutionCandidate@336 }
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -669,11 +659,8 @@ ResolutionTaskHolder@335 {
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@339 {
-    <name not found> = ArrayList@340[1] { ResolutionCandidate@341 }
-    <name not found> = ArrayList@342[1] { ResolutionCandidate@341 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@337 {
+    <name not found> = ArrayList@338[1] { ResolutionCandidate@339 }
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -689,146 +676,126 @@ ResolutionTaskHolder@339 {
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
+}
+
+ResolutionTaskHolder@340 {
+    <name not found> = ArrayList@341[1] { ResolutionCandidate@342 }
     <name not found> = EmptyList@24[empty]
 }
 
 ResolutionTaskHolder@343 {
     <name not found> = ArrayList@344[1] { ResolutionCandidate@345 }
-    <name not found> = ArrayList@346[1] { ResolutionCandidate@345 }
-    <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@347 {
-    <name not found> = ArrayList@348[1] { ResolutionCandidate@349 }
-    <name not found> = ArrayList@350[1] { ResolutionCandidate@349 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@346 {
+    <name not found> = ArrayList@347[1] { ResolutionCandidate@348 }
 }
 
-ResolutionTaskHolder@351 {
-    <name not found> = ArrayList@352[1] { ResolutionCandidate@353 }
-    <name not found> = ArrayList@354[1] { ResolutionCandidate@353 }
+ResolutionTaskHolder@349 {
+    <name not found> = ArrayList@350[1] { ResolutionCandidate@351 }
+}
+
+ResolutionTaskHolder@352 {
+    <name not found> = ArrayList@353[1] { ResolutionCandidate@354 }
 }
 
 ResolutionTaskHolder@355 {
     <name not found> = ArrayList@356[1] { ResolutionCandidate@357 }
-    <name not found> = ArrayList@358[1] { ResolutionCandidate@357 }
 }
 
-ResolutionTaskHolder@359 {
-    <name not found> = ArrayList@360[1] { ResolutionCandidate@361 }
-    <name not found> = ArrayList@362[1] { ResolutionCandidate@361 }
+ResolutionTaskHolder@358 {
+    <name not found> = ArrayList@359[1] { ResolutionCandidate@360 }
 }
 
-ResolutionTaskHolder@363 {
-    <name not found> = ArrayList@364[1] { ResolutionCandidate@365 }
-    <name not found> = ArrayList@366[1] { ResolutionCandidate@365 }
+ResolutionTaskHolder@361 {
+    <name not found> = ArrayList@362[1] { ResolutionCandidate@363 }
+}
+
+ResolutionTaskHolder@364 {
+    <name not found> = ArrayList@365[1] { ResolutionCandidate@366 }
 }
 
 ResolutionTaskHolder@367 {
     <name not found> = ArrayList@368[1] { ResolutionCandidate@369 }
-    <name not found> = ArrayList@370[1] { ResolutionCandidate@369 }
 }
 
-ResolutionTaskHolder@371 {
-    <name not found> = ArrayList@372[1] { ResolutionCandidate@373 }
-    <name not found> = ArrayList@374[1] { ResolutionCandidate@373 }
+ResolutionTaskHolder@370 {
+    <name not found> = ArrayList@371[1] { ResolutionCandidate@372 }
 }
 
-ResolutionTaskHolder@375 {
-    <name not found> = ArrayList@376[1] { ResolutionCandidate@377 }
-    <name not found> = ArrayList@378[1] { ResolutionCandidate@377 }
+ResolutionTaskHolder@373 {
+    <name not found> = ArrayList@374[1] { ResolutionCandidate@375 }
+}
+
+ResolutionTaskHolder@376 {
+    <name not found> = ArrayList@377[1] { ResolutionCandidate@378 }
 }
 
 ResolutionTaskHolder@379 {
     <name not found> = ArrayList@380[1] { ResolutionCandidate@381 }
-    <name not found> = ArrayList@382[1] { ResolutionCandidate@381 }
 }
 
-ResolutionTaskHolder@383 {
-    <name not found> = ArrayList@384[1] { ResolutionCandidate@385 }
-    <name not found> = ArrayList@386[1] { ResolutionCandidate@385 }
+ResolutionTaskHolder@382 {
+    <name not found> = ArrayList@383[1] { ResolutionCandidate@384 }
 }
 
-ResolutionTaskHolder@387 {
-    <name not found> = ArrayList@388[1] { ResolutionCandidate@389 }
-    <name not found> = ArrayList@390[1] { ResolutionCandidate@389 }
+ResolutionTaskHolder@385 {
+    <name not found> = ArrayList@386[1] { ResolutionCandidate@387 }
+}
+
+ResolutionTaskHolder@388 {
+    <name not found> = ArrayList@389[1] { ResolutionCandidate@390 }
 }
 
 ResolutionTaskHolder@391 {
     <name not found> = ArrayList@392[1] { ResolutionCandidate@393 }
-    <name not found> = ArrayList@394[1] { ResolutionCandidate@393 }
 }
 
-ResolutionTaskHolder@395 {
-    <name not found> = ArrayList@396[1] { ResolutionCandidate@397 }
-    <name not found> = ArrayList@398[1] { ResolutionCandidate@397 }
+ResolutionTaskHolder@394 {
+    <name not found> = ArrayList@395[1] { ResolutionCandidate@396 }
 }
 
-ResolutionTaskHolder@399 {
-    <name not found> = ArrayList@400[1] { ResolutionCandidate@401 }
-    <name not found> = ArrayList@402[1] { ResolutionCandidate@401 }
+ResolutionTaskHolder@397 {
+    <name not found> = ArrayList@398[1] { ResolutionCandidate@399 }
+}
+
+ResolutionTaskHolder@400 {
+    <name not found> = ArrayList@401[1] { ResolutionCandidate@402 }
 }
 
 ResolutionTaskHolder@403 {
     <name not found> = ArrayList@404[1] { ResolutionCandidate@405 }
-    <name not found> = ArrayList@406[1] { ResolutionCandidate@405 }
 }
 
-ResolutionTaskHolder@407 {
-    <name not found> = ArrayList@408[1] { ResolutionCandidate@409 }
-    <name not found> = ArrayList@410[1] { ResolutionCandidate@409 }
+ResolutionTaskHolder@406 {
+    <name not found> = ArrayList@407[1] { ResolutionCandidate@408 }
 }
 
-ResolutionTaskHolder@411 {
-    <name not found> = ArrayList@412[1] { ResolutionCandidate@413 }
-    <name not found> = ArrayList@414[1] { ResolutionCandidate@413 }
+ResolutionTaskHolder@409 {
+    <name not found> = ArrayList@410[1] { ResolutionCandidate@411 }
+}
+
+ResolutionTaskHolder@412 {
+    <name not found> = ArrayList@413[1] { ResolutionCandidate@414 }
 }
 
 ResolutionTaskHolder@415 {
     <name not found> = ArrayList@416[1] { ResolutionCandidate@417 }
-    <name not found> = ArrayList@418[1] { ResolutionCandidate@417 }
+}
+
+ResolutionTaskHolder@418 {
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
 }
 
 ResolutionTaskHolder@419 {
-    <name not found> = ArrayList@420[1] { ResolutionCandidate@421 }
-    <name not found> = ArrayList@422[1] { ResolutionCandidate@421 }
-}
-
-ResolutionTaskHolder@423 {
-    <name not found> = ArrayList@424[1] { ResolutionCandidate@425 }
-    <name not found> = ArrayList@426[1] { ResolutionCandidate@425 }
-}
-
-ResolutionTaskHolder@427 {
-    <name not found> = ArrayList@428[1] { ResolutionCandidate@429 }
-    <name not found> = ArrayList@430[1] { ResolutionCandidate@429 }
-}
-
-ResolutionTaskHolder@431 {
-    <name not found> = ArrayList@432[1] { ResolutionCandidate@433 }
-    <name not found> = ArrayList@434[1] { ResolutionCandidate@433 }
-}
-
-ResolutionTaskHolder@435 {
-    <name not found> = ArrayList@436[1] { ResolutionCandidate@437 }
-    <name not found> = ArrayList@438[1] { ResolutionCandidate@437 }
-}
-
-ResolutionTaskHolder@439 {
-    <name not found> = ArrayList@440[1] { ResolutionCandidate@441 }
-    <name not found> = ArrayList@442[1] { ResolutionCandidate@441 }
-}
-
-ResolutionTaskHolder@443 {
-    <name not found> = ArrayList@444[1] { ResolutionCandidate@445 }
-    <name not found> = ArrayList@446[1] { ResolutionCandidate@445 }
-}
-
-ResolutionTaskHolder@447 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -839,7 +806,104 @@ ResolutionTaskHolder@447 {
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@448 {
+TypeDeserializer@420 {
+    classDescriptors('129': Integer@421) = DeserializedClassDescriptor@422['MutableMap']
+    classDescriptors('9': Integer@423) = DeserializedClassDescriptor@424['Any']
+}
+
+TypeDeserializer@425 {
+    classDescriptors('3': Integer@426) = DeserializedClassDescriptor@424['Any']
+    classDescriptors('4': Integer@427) = DeserializedClassDescriptor@2['KCallable']
+}
+
+TypeDeserializer@428 {
+    classDescriptors('3': Integer@426) = DeserializedClassDescriptor@424['Any']
+    classDescriptors('4': Integer@427) = DeserializedClassDescriptor@12['KProperty']
+}
+
+TypeDeserializer@429 {
+    classDescriptors('3': Integer@426) = DeserializedClassDescriptor@424['Any']
+    classDescriptors('4': Integer@427) = DeserializedClassDescriptor@12['KProperty']
+}
+
+TypeDeserializer@430 {
+    classDescriptors('3': Integer@426) = DeserializedClassDescriptor@424['Any']
+    classDescriptors('4': Integer@427) = DeserializedClassDescriptor@14['KTopLevelProperty']
+    classDescriptors('5': Integer@431) = DeserializedClassDescriptor@4['KMutableProperty']
+}
+
+TypeDeserializer@432 {
+    classDescriptors('3': Integer@426) = DeserializedClassDescriptor@424['Any']
+    classDescriptors('4': Integer@427) = DeserializedClassDescriptor@16['KTopLevelVariable']
+    classDescriptors('5': Integer@431) = DeserializedClassDescriptor@10['KMutableVariable']
+    classDescriptors('6': Integer@433) = DeserializedClassDescriptor@6['KMutableTopLevelProperty']
+}
+
+TypeDeserializer@434 {
+    classDescriptors('3': Integer@426) = DeserializedClassDescriptor@424['Any']
+    classDescriptors('4': Integer@427) = DeserializedClassDescriptor@18['KVariable']
+    classDescriptors('5': Integer@431) = DeserializedClassDescriptor@4['KMutableProperty']
+}
+
+TypeDeserializer@435 {
+    classDescriptors('3': Integer@426) = DeserializedClassDescriptor@424['Any']
+    classDescriptors('4': Integer@427) = DeserializedClassDescriptor@18['KVariable']
+    classDescriptors('5': Integer@431) = DeserializedClassDescriptor@14['KTopLevelProperty']
+}
+
+TypeDeserializer@436 {
+    classDescriptors('3': Integer@426) = DeserializedClassDescriptor@424['Any']
+}
+
+TypeDeserializer@437 {
+    classDescriptors('4': Integer@427) = DeserializedClassDescriptor@12['KProperty']
+}
+
+TypeDeserializer@438 {
+    classDescriptors('4': Integer@427) = DeserializedClassDescriptor@439['String']
+}
+
+TypeDeserializer@440 {
+    classDescriptors('6': Integer@433) = DeserializedClassDescriptor@20['Unit']
+}
+
+null {
+    <name not found> = ArrayList@441[1] { ResolutionCandidate@336 }
+    <name not found> = ArrayList@442[1] { ResolutionCandidate@342 }
+    <name not found> = ArrayList@443[1] { ResolutionCandidate@369 }
+    <name not found> = ArrayList@444[1] { ResolutionCandidate@381 }
+    <name not found> = ArrayList@445[1] { ResolutionCandidate@396 }
+    <name not found> = ArrayList@446[1] { ResolutionCandidate@351 }
+    <name not found> = ArrayList@447[1] { ResolutionCandidate@375 }
+    <name not found> = ArrayList@448[1] { ResolutionCandidate@402 }
+    <name not found> = ArrayList@449[1] { ResolutionCandidate@384 }
+    <name not found> = ArrayList@450[1] { ResolutionCandidate@387 }
+    <name not found> = ArrayList@451[1] { ResolutionCandidate@354 }
+    <name not found> = ArrayList@452[1] { ResolutionCandidate@393 }
+    <name not found> = ArrayList@453[1] { ResolutionCandidate@417 }
+    <name not found> = ArrayList@454[1] { ResolutionCandidate@390 }
+    <name not found> = ArrayList@455[1] { ResolutionCandidate@360 }
+    <name not found> = ArrayList@456[1] { ResolutionCandidate@372 }
+    <name not found> = ArrayList@457[1] { ResolutionCandidate@339 }
+    <name not found> = ArrayList@458[1] { ResolutionCandidate@345 }
+    <name not found> = ArrayList@459[1] { ResolutionCandidate@408 }
+    <name not found> = ArrayList@460[1] { ResolutionCandidate@414 }
+    <name not found> = ArrayList@461[1] { ResolutionCandidate@411 }
+    <name not found> = ArrayList@462[1] { ResolutionCandidate@399 }
+    <name not found> = ArrayList@463[1] { ResolutionCandidate@378 }
+    <name not found> = ArrayList@464[1] { ResolutionCandidate@366 }
+    <name not found> = ArrayList@465[1] { ResolutionCandidate@357 }
+    <name not found> = ArrayList@466[1] { ResolutionCandidate@405 }
+    <name not found> = ArrayList@467[1] { ResolutionCandidate@348 }
+    <name not found> = ArrayList@468[1] { ResolutionCandidate@363 }
+    <name not found> = ArrayList@469[1] { ResolutionCandidate@333 }
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -850,65 +914,4 @@ ResolutionTaskHolder@448 {
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
-}
-
-TypeDeserializer@449 {
-    classDescriptors('129': Integer@450) = DeserializedClassDescriptor@451['MutableMap']
-    classDescriptors('9': Integer@452) = DeserializedClassDescriptor@453['Any']
-}
-
-TypeDeserializer@454 {
-    classDescriptors('3': Integer@455) = DeserializedClassDescriptor@453['Any']
-    classDescriptors('4': Integer@456) = DeserializedClassDescriptor@2['KCallable']
-}
-
-TypeDeserializer@457 {
-    classDescriptors('3': Integer@455) = DeserializedClassDescriptor@453['Any']
-    classDescriptors('4': Integer@456) = DeserializedClassDescriptor@12['KProperty']
-}
-
-TypeDeserializer@458 {
-    classDescriptors('3': Integer@455) = DeserializedClassDescriptor@453['Any']
-    classDescriptors('4': Integer@456) = DeserializedClassDescriptor@12['KProperty']
-}
-
-TypeDeserializer@459 {
-    classDescriptors('3': Integer@455) = DeserializedClassDescriptor@453['Any']
-    classDescriptors('4': Integer@456) = DeserializedClassDescriptor@14['KTopLevelProperty']
-    classDescriptors('5': Integer@460) = DeserializedClassDescriptor@4['KMutableProperty']
-}
-
-TypeDeserializer@461 {
-    classDescriptors('3': Integer@455) = DeserializedClassDescriptor@453['Any']
-    classDescriptors('4': Integer@456) = DeserializedClassDescriptor@16['KTopLevelVariable']
-    classDescriptors('5': Integer@460) = DeserializedClassDescriptor@10['KMutableVariable']
-    classDescriptors('6': Integer@462) = DeserializedClassDescriptor@6['KMutableTopLevelProperty']
-}
-
-TypeDeserializer@463 {
-    classDescriptors('3': Integer@455) = DeserializedClassDescriptor@453['Any']
-    classDescriptors('4': Integer@456) = DeserializedClassDescriptor@18['KVariable']
-    classDescriptors('5': Integer@460) = DeserializedClassDescriptor@4['KMutableProperty']
-}
-
-TypeDeserializer@464 {
-    classDescriptors('3': Integer@455) = DeserializedClassDescriptor@453['Any']
-    classDescriptors('4': Integer@456) = DeserializedClassDescriptor@18['KVariable']
-    classDescriptors('5': Integer@460) = DeserializedClassDescriptor@14['KTopLevelProperty']
-}
-
-TypeDeserializer@465 {
-    classDescriptors('3': Integer@455) = DeserializedClassDescriptor@453['Any']
-}
-
-TypeDeserializer@466 {
-    classDescriptors('4': Integer@456) = DeserializedClassDescriptor@12['KProperty']
-}
-
-TypeDeserializer@467 {
-    classDescriptors('4': Integer@456) = DeserializedClassDescriptor@468['String']
-}
-
-TypeDeserializer@469 {
-    classDescriptors('6': Integer@462) = DeserializedClassDescriptor@20['Unit']
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/unused.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/unused.lazy.log
index d7590b21220..2951c05997c 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/unused.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/unused.lazy.log
@@ -174,34 +174,45 @@ LazyJavaPackageFragment@12['reflect'] {
 
 ResolutionTaskHolder@83 {
     <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
 }
 
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
 }
 
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
+}
+
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
 }
 
 ResolutionTaskHolder@95 {
     <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
+}
+
+ResolutionTaskHolder@98 {
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
@@ -209,8 +220,79 @@ ResolutionTaskHolder@95 {
 }
 
 ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+}
+
+ResolutionTaskHolder@100 {
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+}
+
+ResolutionTaskHolder@101 {
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+}
+
+ResolutionTaskHolder@102 {
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
 }
 
 ResolutionTaskHolder@103 {
@@ -222,18 +304,6 @@ ResolutionTaskHolder@103 {
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
 }
 
 ResolutionTaskHolder@104 {
@@ -245,18 +315,6 @@ ResolutionTaskHolder@104 {
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
 }
 
 ResolutionTaskHolder@105 {
@@ -268,18 +326,6 @@ ResolutionTaskHolder@105 {
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
 }
 
 ResolutionTaskHolder@106 {
@@ -291,18 +337,6 @@ ResolutionTaskHolder@106 {
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
 }
 
 ResolutionTaskHolder@107 {
@@ -314,101 +348,70 @@ ResolutionTaskHolder@107 {
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
     <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
 }
 
-ResolutionTaskHolder@108 {
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
+TypeDeserializer@108 {
+    classDescriptors('2': Integer@109) = DeserializedClassDescriptor@110['Any']
 }
 
-ResolutionTaskHolder@109 {
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
+TypeDeserializer@111 {
+    classDescriptors('2': Integer@109) = DeserializedClassDescriptor@110['Any']
 }
 
-ResolutionTaskHolder@110 {
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
+TypeDeserializer@112 {
+    classDescriptors('4': Integer@113) = DeserializedClassDescriptor@2['ExtensionFunction0']
 }
 
-ResolutionTaskHolder@111 {
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
+TypeDeserializer@114 {
+    classDescriptors('4': Integer@113) = DeserializedClassDescriptor@2['ExtensionFunction0']
 }
 
-ResolutionTaskHolder@112 {
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
+TypeDeserializer@115 {
+    classDescriptors('4': Integer@113) = DeserializedClassDescriptor@4['Function0']
 }
 
-TypeDeserializer@113 {
-    classDescriptors('2': Integer@114) = DeserializedClassDescriptor@115['Any']
-}
-
-TypeDeserializer@116 {
-    classDescriptors('2': Integer@114) = DeserializedClassDescriptor@115['Any']
-}
-
-TypeDeserializer@117 {
-    classDescriptors('4': Integer@118) = DeserializedClassDescriptor@2['ExtensionFunction0']
-}
-
-TypeDeserializer@119 {
-    classDescriptors('4': Integer@118) = DeserializedClassDescriptor@2['ExtensionFunction0']
-}
-
-TypeDeserializer@120 {
-    classDescriptors('4': Integer@118) = DeserializedClassDescriptor@4['Function0']
+null {
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@85 }
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/delegatedProperty.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/delegatedProperty.lazy.log
index e943cc25ddf..f24104e75b0 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/delegatedProperty.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/delegatedProperty.lazy.log
@@ -77,7 +77,7 @@ DeserializedType@53['T in kotlin.properties.ReadWriteProperty'] {
     constructor = AbstractLazyTypeParameterDescriptor$1@44
 }
 
-DeserializedType@46['kotlin.Any'] {
+DeserializedType@41['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@54
     memberScope = DeserializedClassMemberScope@55
 }
@@ -87,11 +87,6 @@ DeserializedType@56['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@55
 }
 
-DeserializedType@50['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@54
-    memberScope = DeserializedClassMemberScope@55
-}
-
 DeserializedType@57['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@54
     memberScope = DeserializedClassMemberScope@55
@@ -102,7 +97,12 @@ DeserializedType@58['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@55
 }
 
-DeserializedType@41['kotlin.Any'] {
+DeserializedType@50['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@54
+    memberScope = DeserializedClassMemberScope@55
+}
+
+DeserializedType@46['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@54
     memberScope = DeserializedClassMemberScope@55
 }
@@ -298,15 +298,6 @@ NestedClassDescriptors@155 {
 
 ResolutionTaskHolder@156 {
     <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
@@ -317,17 +308,8 @@ ResolutionTaskHolder@156 {
     <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@162 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
+ResolutionTaskHolder@159 {
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
@@ -338,13 +320,8 @@ ResolutionTaskHolder@160 {
     <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@164 {
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@166 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
+ResolutionTaskHolder@162 {
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
@@ -353,6 +330,10 @@ ResolutionTaskHolder@164 {
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
+}
+
+ResolutionTaskHolder@165 {
+    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
@@ -361,7 +342,45 @@ ResolutionTaskHolder@164 {
 
 ResolutionTaskHolder@168 {
     <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@170 }
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+}
+
+ResolutionTaskHolder@171 {
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
+}
+
+ResolutionTaskHolder@174 {
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
+}
+
+ResolutionTaskHolder@177 {
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
@@ -372,98 +391,82 @@ ResolutionTaskHolder@168 {
     <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@174 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
+TypeDeserializer@178 {
+    classDescriptors('1': Integer@179) = DeserializedClassDescriptor@6['PropertyMetadataImpl']
+    classDescriptors('3': Integer@180) = DeserializedClassDescriptor@181['String']
 }
 
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@178 }
-}
-
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@182 }
-}
-
-ResolutionTaskHolder@184 {
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
+TypeDeserializer@182 {
+    classDescriptors('18': Integer@183) = DeserializedClassDescriptor@8['ReadWriteProperty']
+    classDescriptors('3': Integer@180) = DeserializedClassDescriptor@184['Any']
 }
 
 TypeDeserializer@185 {
-    classDescriptors('1': Integer@186) = DeserializedClassDescriptor@6['PropertyMetadataImpl']
-    classDescriptors('3': Integer@187) = DeserializedClassDescriptor@188['String']
+    classDescriptors('2': Integer@186) = DeserializedClassDescriptor@2['Delegates']
+}
+
+TypeDeserializer@187 {
+    classDescriptors('2': Integer@186) = DeserializedClassDescriptor@4['PropertyMetadata']
+}
+
+TypeDeserializer@188 {
+    classDescriptors('3': Integer@180) = DeserializedClassDescriptor@184['Any']
 }
 
 TypeDeserializer@189 {
-    classDescriptors('18': Integer@190) = DeserializedClassDescriptor@8['ReadWriteProperty']
-    classDescriptors('3': Integer@187) = DeserializedClassDescriptor@191['Any']
+    classDescriptors('3': Integer@180) = DeserializedClassDescriptor@184['Any']
 }
 
-TypeDeserializer@192 {
-    classDescriptors('2': Integer@193) = DeserializedClassDescriptor@2['Delegates']
+TypeDeserializer@190 {
+    classDescriptors('4': Integer@191) = DeserializedClassDescriptor@4['PropertyMetadata']
 }
 
-TypeDeserializer@194 {
-    classDescriptors('2': Integer@193) = DeserializedClassDescriptor@4['PropertyMetadata']
-}
-
-TypeDeserializer@195 {
-    classDescriptors('3': Integer@187) = DeserializedClassDescriptor@191['Any']
-}
-
-TypeDeserializer@196 {
-    classDescriptors('3': Integer@187) = DeserializedClassDescriptor@191['Any']
-}
-
-TypeDeserializer@197 {
-    classDescriptors('4': Integer@198) = DeserializedClassDescriptor@4['PropertyMetadata']
+null {
+    <name not found> = ArrayList@192[1] { ResolutionCandidate@167 }
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@170 }
+    <name not found> = ArrayList@194[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@173 }
+    <name not found> = ArrayList@196[1] { ResolutionCandidate@161 }
+    <name not found> = ArrayList@197[1] { ResolutionCandidate@176 }
+    <name not found> = ArrayList@198[1] { ResolutionCandidate@164 }
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNames.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNames.lazy.log
index e0c46f9490a..481a2851bdf 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNames.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNames.lazy.log
@@ -90,9 +90,12 @@ LazyJavaPackageFragment@3['platform'] {
 
 ResolutionTaskHolder@64 {
     <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
 }
 
-TypeDeserializer@68 {
-    classDescriptors('4': Integer@69) = DeserializedClassDescriptor@70['String']
+TypeDeserializer@67 {
+    classDescriptors('4': Integer@68) = DeserializedClassDescriptor@69['String']
+}
+
+null {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@66 }
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNamesDuplicate.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNamesDuplicate.lazy.log
index e0c46f9490a..481a2851bdf 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNamesDuplicate.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNamesDuplicate.lazy.log
@@ -90,9 +90,12 @@ LazyJavaPackageFragment@3['platform'] {
 
 ResolutionTaskHolder@64 {
     <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
 }
 
-TypeDeserializer@68 {
-    classDescriptors('4': Integer@69) = DeserializedClassDescriptor@70['String']
+TypeDeserializer@67 {
+    classDescriptors('4': Integer@68) = DeserializedClassDescriptor@69['String']
+}
+
+null {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@66 }
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInClassObject.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInClassObject.lazy.log
index c7139620d3e..2fd74bee391 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInClassObject.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInClassObject.lazy.log
@@ -76,10 +76,13 @@ LazyJavaPackageFragment@3['platform'] {
 
 ResolutionTaskHolder@59 {
     <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
+}
+
+null {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@64 }
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInObject.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInObject.lazy.log
index 8f2967a43a5..025a89e9aca 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInObject.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInObject.lazy.log
@@ -91,10 +91,13 @@ LazyJavaPackageFragment@3['platform'] {
 
 ResolutionTaskHolder@67 {
     <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
 }
 
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
+}
+
+null {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@72 }
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/functionLiterals/pseudocodeMemoryOverhead.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/functionLiterals/pseudocodeMemoryOverhead.lazy.log
index 3f83a48828e..0e212297cc1 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/functionLiterals/pseudocodeMemoryOverhead.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/functionLiterals/pseudocodeMemoryOverhead.lazy.log
@@ -171,42 +171,17 @@ DeserializedType@39['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@92
 }
 
-DeserializedType@55['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@91
-    memberScope = DeserializedClassMemberScope@92
-}
-
-DeserializedType@67['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@91
-    memberScope = DeserializedClassMemberScope@92
-}
-
 DeserializedType@34['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@91
     memberScope = DeserializedClassMemberScope@92
 }
 
-DeserializedType@59['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@91
-    memberScope = DeserializedClassMemberScope@92
-}
-
 DeserializedType@30['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@91
     memberScope = DeserializedClassMemberScope@92
 }
 
-DeserializedType@93['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@91
-    memberScope = DeserializedClassMemberScope@92
-}
-
-DeserializedType@43['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@91
-    memberScope = DeserializedClassMemberScope@92
-}
-
-DeserializedType@71['kotlin.Any'] {
+DeserializedType@67['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@91
     memberScope = DeserializedClassMemberScope@92
 }
@@ -221,7 +196,22 @@ DeserializedType@47['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@92
 }
 
-DeserializedType@51['kotlin.Any'] {
+DeserializedType@71['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@91
+    memberScope = DeserializedClassMemberScope@92
+}
+
+DeserializedType@93['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@91
+    memberScope = DeserializedClassMemberScope@92
+}
+
+DeserializedType@59['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@91
+    memberScope = DeserializedClassMemberScope@92
+}
+
+DeserializedType@43['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@91
     memberScope = DeserializedClassMemberScope@92
 }
@@ -231,6 +221,16 @@ DeserializedType@94['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@92
 }
 
+DeserializedType@51['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@91
+    memberScope = DeserializedClassMemberScope@92
+}
+
+DeserializedType@55['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@91
+    memberScope = DeserializedClassMemberScope@92
+}
+
 DeserializedType@95['kotlin.Array'] {
     constructor = DeserializedClassTypeConstructor@96
     memberScope = SubstitutingScope@97
@@ -758,17476 +758,17479 @@ LazyJavaTypeParameterResolver@342 {
 
 ResolutionTaskHolder@345 {
     <name not found> = ArrayList@346[1] { ResolutionCandidate@347 }
-    <name not found> = ArrayList@348[1] { ResolutionCandidate@347 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@349 {
-    <name not found> = ArrayList@350[1] { ResolutionCandidate@351 }
-    <name not found> = ArrayList@352[1] { ResolutionCandidate@351 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@348 {
+    <name not found> = ArrayList@349[1] { ResolutionCandidate@350 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@353 {
-    <name not found> = ArrayList@354[1] { ResolutionCandidate@355 }
-    <name not found> = ArrayList@356[1] { ResolutionCandidate@355 }
+ResolutionTaskHolder@351 {
+    <name not found> = ArrayList@352[1] { ResolutionCandidate@353 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@354 {
+    <name not found> = ArrayList@355[1] { ResolutionCandidate@356 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@357 {
     <name not found> = ArrayList@358[1] { ResolutionCandidate@359 }
-    <name not found> = ArrayList@360[1] { ResolutionCandidate@359 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@361 {
-    <name not found> = ArrayList@362[1] { ResolutionCandidate@363 }
-    <name not found> = ArrayList@364[1] { ResolutionCandidate@363 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@360 {
+    <name not found> = ArrayList@361[1] { ResolutionCandidate@362 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@365 {
-    <name not found> = ArrayList@366[1] { ResolutionCandidate@367 }
-    <name not found> = ArrayList@368[1] { ResolutionCandidate@367 }
+ResolutionTaskHolder@363 {
+    <name not found> = ArrayList@364[1] { ResolutionCandidate@365 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@366 {
+    <name not found> = ArrayList@367[1] { ResolutionCandidate@368 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@369 {
     <name not found> = ArrayList@370[1] { ResolutionCandidate@371 }
-    <name not found> = ArrayList@372[1] { ResolutionCandidate@371 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@373 {
-    <name not found> = ArrayList@374[1] { ResolutionCandidate@375 }
-    <name not found> = ArrayList@376[1] { ResolutionCandidate@375 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@372 {
+    <name not found> = ArrayList@373[1] { ResolutionCandidate@374 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@377 {
-    <name not found> = ArrayList@378[1] { ResolutionCandidate@379 }
-    <name not found> = ArrayList@380[1] { ResolutionCandidate@379 }
+ResolutionTaskHolder@375 {
+    <name not found> = ArrayList@376[1] { ResolutionCandidate@377 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@378 {
+    <name not found> = ArrayList@379[1] { ResolutionCandidate@380 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@381 {
     <name not found> = ArrayList@382[1] { ResolutionCandidate@383 }
-    <name not found> = ArrayList@384[1] { ResolutionCandidate@383 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@385 {
-    <name not found> = ArrayList@386[1] { ResolutionCandidate@387 }
-    <name not found> = ArrayList@388[1] { ResolutionCandidate@387 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@384 {
+    <name not found> = ArrayList@385[1] { ResolutionCandidate@386 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@389 {
-    <name not found> = ArrayList@390[1] { ResolutionCandidate@391 }
-    <name not found> = ArrayList@392[1] { ResolutionCandidate@391 }
+ResolutionTaskHolder@387 {
+    <name not found> = ArrayList@388[1] { ResolutionCandidate@389 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@390 {
+    <name not found> = ArrayList@391[1] { ResolutionCandidate@392 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@393 {
     <name not found> = ArrayList@394[1] { ResolutionCandidate@395 }
-    <name not found> = ArrayList@396[1] { ResolutionCandidate@395 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@397 {
-    <name not found> = ArrayList@398[1] { ResolutionCandidate@399 }
-    <name not found> = ArrayList@400[1] { ResolutionCandidate@399 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@396 {
+    <name not found> = ArrayList@397[1] { ResolutionCandidate@398 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@401 {
-    <name not found> = ArrayList@402[1] { ResolutionCandidate@403 }
-    <name not found> = ArrayList@404[1] { ResolutionCandidate@403 }
+ResolutionTaskHolder@399 {
+    <name not found> = ArrayList@400[1] { ResolutionCandidate@401 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@402 {
+    <name not found> = ArrayList@403[1] { ResolutionCandidate@404 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@405 {
     <name not found> = ArrayList@406[1] { ResolutionCandidate@407 }
-    <name not found> = ArrayList@408[1] { ResolutionCandidate@407 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@409 {
-    <name not found> = ArrayList@410[1] { ResolutionCandidate@411 }
-    <name not found> = ArrayList@412[1] { ResolutionCandidate@411 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@408 {
+    <name not found> = ArrayList@409[1] { ResolutionCandidate@410 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@413 {
-    <name not found> = ArrayList@414[1] { ResolutionCandidate@415 }
-    <name not found> = ArrayList@416[1] { ResolutionCandidate@415 }
+ResolutionTaskHolder@411 {
+    <name not found> = ArrayList@412[1] { ResolutionCandidate@413 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@414 {
+    <name not found> = ArrayList@415[1] { ResolutionCandidate@416 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@417 {
     <name not found> = ArrayList@418[1] { ResolutionCandidate@419 }
-    <name not found> = ArrayList@420[1] { ResolutionCandidate@419 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@421 {
-    <name not found> = ArrayList@422[1] { ResolutionCandidate@423 }
-    <name not found> = ArrayList@424[1] { ResolutionCandidate@423 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@420 {
+    <name not found> = ArrayList@421[1] { ResolutionCandidate@422 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@425 {
-    <name not found> = ArrayList@426[1] { ResolutionCandidate@427 }
-    <name not found> = ArrayList@428[1] { ResolutionCandidate@427 }
+ResolutionTaskHolder@423 {
+    <name not found> = ArrayList@424[1] { ResolutionCandidate@425 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@426 {
+    <name not found> = ArrayList@427[1] { ResolutionCandidate@428 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@429 {
     <name not found> = ArrayList@430[1] { ResolutionCandidate@431 }
-    <name not found> = ArrayList@432[1] { ResolutionCandidate@431 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@433 {
-    <name not found> = ArrayList@434[1] { ResolutionCandidate@435 }
-    <name not found> = ArrayList@436[1] { ResolutionCandidate@435 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@432 {
+    <name not found> = ArrayList@433[1] { ResolutionCandidate@434 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@437 {
-    <name not found> = ArrayList@438[1] { ResolutionCandidate@439 }
-    <name not found> = ArrayList@440[1] { ResolutionCandidate@439 }
+ResolutionTaskHolder@435 {
+    <name not found> = ArrayList@436[1] { ResolutionCandidate@437 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@438 {
+    <name not found> = ArrayList@439[1] { ResolutionCandidate@440 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@441 {
     <name not found> = ArrayList@442[1] { ResolutionCandidate@443 }
-    <name not found> = ArrayList@444[1] { ResolutionCandidate@443 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@445 {
-    <name not found> = ArrayList@446[1] { ResolutionCandidate@447 }
-    <name not found> = ArrayList@448[1] { ResolutionCandidate@447 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@444 {
+    <name not found> = ArrayList@445[1] { ResolutionCandidate@446 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@449 {
-    <name not found> = ArrayList@450[1] { ResolutionCandidate@451 }
-    <name not found> = ArrayList@452[1] { ResolutionCandidate@451 }
+ResolutionTaskHolder@447 {
+    <name not found> = ArrayList@448[1] { ResolutionCandidate@449 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@450 {
+    <name not found> = ArrayList@451[1] { ResolutionCandidate@452 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@453 {
     <name not found> = ArrayList@454[1] { ResolutionCandidate@455 }
-    <name not found> = ArrayList@456[1] { ResolutionCandidate@455 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@457 {
-    <name not found> = ArrayList@458[1] { ResolutionCandidate@459 }
-    <name not found> = ArrayList@460[1] { ResolutionCandidate@459 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@456 {
+    <name not found> = ArrayList@457[1] { ResolutionCandidate@458 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@461 {
-    <name not found> = ArrayList@462[1] { ResolutionCandidate@463 }
-    <name not found> = ArrayList@464[1] { ResolutionCandidate@463 }
+ResolutionTaskHolder@459 {
+    <name not found> = ArrayList@460[1] { ResolutionCandidate@461 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@462 {
+    <name not found> = ArrayList@463[1] { ResolutionCandidate@464 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@465 {
     <name not found> = ArrayList@466[1] { ResolutionCandidate@467 }
-    <name not found> = ArrayList@468[1] { ResolutionCandidate@467 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@469 {
-    <name not found> = ArrayList@470[1] { ResolutionCandidate@471 }
-    <name not found> = ArrayList@472[1] { ResolutionCandidate@471 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@468 {
+    <name not found> = ArrayList@469[1] { ResolutionCandidate@470 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@473 {
-    <name not found> = ArrayList@474[1] { ResolutionCandidate@475 }
-    <name not found> = ArrayList@476[1] { ResolutionCandidate@475 }
+ResolutionTaskHolder@471 {
+    <name not found> = ArrayList@472[1] { ResolutionCandidate@473 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@474 {
+    <name not found> = ArrayList@475[1] { ResolutionCandidate@476 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@477 {
     <name not found> = ArrayList@478[1] { ResolutionCandidate@479 }
-    <name not found> = ArrayList@480[1] { ResolutionCandidate@479 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@481 {
-    <name not found> = ArrayList@482[1] { ResolutionCandidate@483 }
-    <name not found> = ArrayList@484[1] { ResolutionCandidate@483 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@480 {
+    <name not found> = ArrayList@481[1] { ResolutionCandidate@482 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@485 {
-    <name not found> = ArrayList@486[1] { ResolutionCandidate@487 }
-    <name not found> = ArrayList@488[1] { ResolutionCandidate@487 }
+ResolutionTaskHolder@483 {
+    <name not found> = ArrayList@484[1] { ResolutionCandidate@485 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@486 {
+    <name not found> = ArrayList@487[1] { ResolutionCandidate@488 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@489 {
     <name not found> = ArrayList@490[1] { ResolutionCandidate@491 }
-    <name not found> = ArrayList@492[1] { ResolutionCandidate@491 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@493 {
-    <name not found> = ArrayList@494[1] { ResolutionCandidate@495 }
-    <name not found> = ArrayList@496[1] { ResolutionCandidate@495 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@492 {
+    <name not found> = ArrayList@493[1] { ResolutionCandidate@494 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@497 {
-    <name not found> = ArrayList@498[1] { ResolutionCandidate@499 }
-    <name not found> = ArrayList@500[1] { ResolutionCandidate@499 }
+ResolutionTaskHolder@495 {
+    <name not found> = ArrayList@496[1] { ResolutionCandidate@497 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@498 {
+    <name not found> = ArrayList@499[1] { ResolutionCandidate@500 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@501 {
     <name not found> = ArrayList@502[1] { ResolutionCandidate@503 }
-    <name not found> = ArrayList@504[1] { ResolutionCandidate@503 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@505 {
-    <name not found> = ArrayList@506[1] { ResolutionCandidate@507 }
-    <name not found> = ArrayList@508[1] { ResolutionCandidate@507 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@504 {
+    <name not found> = ArrayList@505[1] { ResolutionCandidate@506 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@509 {
-    <name not found> = ArrayList@510[1] { ResolutionCandidate@511 }
-    <name not found> = ArrayList@512[1] { ResolutionCandidate@511 }
+ResolutionTaskHolder@507 {
+    <name not found> = ArrayList@508[1] { ResolutionCandidate@509 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@510 {
+    <name not found> = ArrayList@511[1] { ResolutionCandidate@512 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@513 {
     <name not found> = ArrayList@514[1] { ResolutionCandidate@515 }
-    <name not found> = ArrayList@516[1] { ResolutionCandidate@515 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@517 {
-    <name not found> = ArrayList@518[1] { ResolutionCandidate@519 }
-    <name not found> = ArrayList@520[1] { ResolutionCandidate@519 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@516 {
+    <name not found> = ArrayList@517[1] { ResolutionCandidate@518 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@521 {
-    <name not found> = ArrayList@522[1] { ResolutionCandidate@523 }
-    <name not found> = ArrayList@524[1] { ResolutionCandidate@523 }
+ResolutionTaskHolder@519 {
+    <name not found> = ArrayList@520[1] { ResolutionCandidate@521 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@522 {
+    <name not found> = ArrayList@523[1] { ResolutionCandidate@524 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@525 {
     <name not found> = ArrayList@526[1] { ResolutionCandidate@527 }
-    <name not found> = ArrayList@528[1] { ResolutionCandidate@527 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@529 {
-    <name not found> = ArrayList@530[1] { ResolutionCandidate@531 }
-    <name not found> = ArrayList@532[1] { ResolutionCandidate@531 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@528 {
+    <name not found> = ArrayList@529[1] { ResolutionCandidate@530 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@533 {
-    <name not found> = ArrayList@534[1] { ResolutionCandidate@535 }
-    <name not found> = ArrayList@536[1] { ResolutionCandidate@535 }
+ResolutionTaskHolder@531 {
+    <name not found> = ArrayList@532[1] { ResolutionCandidate@533 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@534 {
+    <name not found> = ArrayList@535[1] { ResolutionCandidate@536 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@537 {
     <name not found> = ArrayList@538[1] { ResolutionCandidate@539 }
-    <name not found> = ArrayList@540[1] { ResolutionCandidate@539 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@541 {
-    <name not found> = ArrayList@542[1] { ResolutionCandidate@543 }
-    <name not found> = ArrayList@544[1] { ResolutionCandidate@543 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@540 {
+    <name not found> = ArrayList@541[1] { ResolutionCandidate@542 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@545 {
-    <name not found> = ArrayList@546[1] { ResolutionCandidate@547 }
-    <name not found> = ArrayList@548[1] { ResolutionCandidate@547 }
+ResolutionTaskHolder@543 {
+    <name not found> = ArrayList@544[1] { ResolutionCandidate@545 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@546 {
+    <name not found> = ArrayList@547[1] { ResolutionCandidate@548 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@549 {
     <name not found> = ArrayList@550[1] { ResolutionCandidate@551 }
-    <name not found> = ArrayList@552[1] { ResolutionCandidate@551 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@553 {
-    <name not found> = ArrayList@554[1] { ResolutionCandidate@555 }
-    <name not found> = ArrayList@556[1] { ResolutionCandidate@555 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@552 {
+    <name not found> = ArrayList@553[1] { ResolutionCandidate@554 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@557 {
-    <name not found> = ArrayList@558[1] { ResolutionCandidate@559 }
-    <name not found> = ArrayList@560[1] { ResolutionCandidate@559 }
+ResolutionTaskHolder@555 {
+    <name not found> = ArrayList@556[1] { ResolutionCandidate@557 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@558 {
+    <name not found> = ArrayList@559[1] { ResolutionCandidate@560 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@561 {
     <name not found> = ArrayList@562[1] { ResolutionCandidate@563 }
-    <name not found> = ArrayList@564[1] { ResolutionCandidate@563 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@565 {
-    <name not found> = ArrayList@566[1] { ResolutionCandidate@567 }
-    <name not found> = ArrayList@568[1] { ResolutionCandidate@567 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@564 {
+    <name not found> = ArrayList@565[1] { ResolutionCandidate@566 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@569 {
-    <name not found> = ArrayList@570[1] { ResolutionCandidate@571 }
-    <name not found> = ArrayList@572[1] { ResolutionCandidate@571 }
+ResolutionTaskHolder@567 {
+    <name not found> = ArrayList@568[1] { ResolutionCandidate@569 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@570 {
+    <name not found> = ArrayList@571[1] { ResolutionCandidate@572 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@573 {
     <name not found> = ArrayList@574[1] { ResolutionCandidate@575 }
-    <name not found> = ArrayList@576[1] { ResolutionCandidate@575 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@577 {
-    <name not found> = ArrayList@578[1] { ResolutionCandidate@579 }
-    <name not found> = ArrayList@580[1] { ResolutionCandidate@579 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@576 {
+    <name not found> = ArrayList@577[1] { ResolutionCandidate@578 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@581 {
-    <name not found> = ArrayList@582[1] { ResolutionCandidate@583 }
-    <name not found> = ArrayList@584[1] { ResolutionCandidate@583 }
+ResolutionTaskHolder@579 {
+    <name not found> = ArrayList@580[1] { ResolutionCandidate@581 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@582 {
+    <name not found> = ArrayList@583[1] { ResolutionCandidate@584 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@585 {
     <name not found> = ArrayList@586[1] { ResolutionCandidate@587 }
-    <name not found> = ArrayList@588[1] { ResolutionCandidate@587 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@589 {
-    <name not found> = ArrayList@590[1] { ResolutionCandidate@591 }
-    <name not found> = ArrayList@592[1] { ResolutionCandidate@591 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@588 {
+    <name not found> = ArrayList@589[1] { ResolutionCandidate@590 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@593 {
-    <name not found> = ArrayList@594[1] { ResolutionCandidate@595 }
-    <name not found> = ArrayList@596[1] { ResolutionCandidate@595 }
+ResolutionTaskHolder@591 {
+    <name not found> = ArrayList@592[1] { ResolutionCandidate@593 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@594 {
+    <name not found> = ArrayList@595[1] { ResolutionCandidate@596 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@597 {
     <name not found> = ArrayList@598[1] { ResolutionCandidate@599 }
-    <name not found> = ArrayList@600[1] { ResolutionCandidate@599 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@601 {
-    <name not found> = ArrayList@602[1] { ResolutionCandidate@603 }
-    <name not found> = ArrayList@604[1] { ResolutionCandidate@603 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@600 {
+    <name not found> = ArrayList@601[1] { ResolutionCandidate@602 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@605 {
-    <name not found> = ArrayList@606[1] { ResolutionCandidate@607 }
-    <name not found> = ArrayList@608[1] { ResolutionCandidate@607 }
+ResolutionTaskHolder@603 {
+    <name not found> = ArrayList@604[1] { ResolutionCandidate@605 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@606 {
+    <name not found> = ArrayList@607[1] { ResolutionCandidate@608 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@609 {
     <name not found> = ArrayList@610[1] { ResolutionCandidate@611 }
-    <name not found> = ArrayList@612[1] { ResolutionCandidate@611 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@613 {
-    <name not found> = ArrayList@614[1] { ResolutionCandidate@615 }
-    <name not found> = ArrayList@616[1] { ResolutionCandidate@615 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@612 {
+    <name not found> = ArrayList@613[1] { ResolutionCandidate@614 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@617 {
-    <name not found> = ArrayList@618[1] { ResolutionCandidate@619 }
-    <name not found> = ArrayList@620[1] { ResolutionCandidate@619 }
+ResolutionTaskHolder@615 {
+    <name not found> = ArrayList@616[1] { ResolutionCandidate@617 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@618 {
+    <name not found> = ArrayList@619[1] { ResolutionCandidate@620 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@621 {
     <name not found> = ArrayList@622[1] { ResolutionCandidate@623 }
-    <name not found> = ArrayList@624[1] { ResolutionCandidate@623 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@625 {
-    <name not found> = ArrayList@626[1] { ResolutionCandidate@627 }
-    <name not found> = ArrayList@628[1] { ResolutionCandidate@627 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@624 {
+    <name not found> = ArrayList@625[1] { ResolutionCandidate@626 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@629 {
-    <name not found> = ArrayList@630[1] { ResolutionCandidate@631 }
-    <name not found> = ArrayList@632[1] { ResolutionCandidate@631 }
+ResolutionTaskHolder@627 {
+    <name not found> = ArrayList@628[1] { ResolutionCandidate@629 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@630 {
+    <name not found> = ArrayList@631[1] { ResolutionCandidate@632 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@633 {
     <name not found> = ArrayList@634[1] { ResolutionCandidate@635 }
-    <name not found> = ArrayList@636[1] { ResolutionCandidate@635 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@637 {
-    <name not found> = ArrayList@638[1] { ResolutionCandidate@639 }
-    <name not found> = ArrayList@640[1] { ResolutionCandidate@639 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@636 {
+    <name not found> = ArrayList@637[1] { ResolutionCandidate@638 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@641 {
-    <name not found> = ArrayList@642[1] { ResolutionCandidate@643 }
-    <name not found> = ArrayList@644[1] { ResolutionCandidate@643 }
+ResolutionTaskHolder@639 {
+    <name not found> = ArrayList@640[1] { ResolutionCandidate@641 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@642 {
+    <name not found> = ArrayList@643[1] { ResolutionCandidate@644 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@645 {
     <name not found> = ArrayList@646[1] { ResolutionCandidate@647 }
-    <name not found> = ArrayList@648[1] { ResolutionCandidate@647 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@649 {
-    <name not found> = ArrayList@650[1] { ResolutionCandidate@651 }
-    <name not found> = ArrayList@652[1] { ResolutionCandidate@651 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@648 {
+    <name not found> = ArrayList@649[1] { ResolutionCandidate@650 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@653 {
-    <name not found> = ArrayList@654[1] { ResolutionCandidate@655 }
-    <name not found> = ArrayList@656[1] { ResolutionCandidate@655 }
+ResolutionTaskHolder@651 {
+    <name not found> = ArrayList@652[1] { ResolutionCandidate@653 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@654 {
+    <name not found> = ArrayList@655[1] { ResolutionCandidate@656 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@657 {
     <name not found> = ArrayList@658[1] { ResolutionCandidate@659 }
-    <name not found> = ArrayList@660[1] { ResolutionCandidate@659 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@661 {
-    <name not found> = ArrayList@662[1] { ResolutionCandidate@663 }
-    <name not found> = ArrayList@664[1] { ResolutionCandidate@663 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@660 {
+    <name not found> = ArrayList@661[1] { ResolutionCandidate@662 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@665 {
-    <name not found> = ArrayList@666[1] { ResolutionCandidate@667 }
-    <name not found> = ArrayList@668[1] { ResolutionCandidate@667 }
+ResolutionTaskHolder@663 {
+    <name not found> = ArrayList@664[1] { ResolutionCandidate@665 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@666 {
+    <name not found> = ArrayList@667[1] { ResolutionCandidate@668 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@669 {
     <name not found> = ArrayList@670[1] { ResolutionCandidate@671 }
-    <name not found> = ArrayList@672[1] { ResolutionCandidate@671 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@673 {
-    <name not found> = ArrayList@674[1] { ResolutionCandidate@675 }
-    <name not found> = ArrayList@676[1] { ResolutionCandidate@675 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@672 {
+    <name not found> = ArrayList@673[1] { ResolutionCandidate@674 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@677 {
-    <name not found> = ArrayList@678[1] { ResolutionCandidate@679 }
-    <name not found> = ArrayList@680[1] { ResolutionCandidate@679 }
+ResolutionTaskHolder@675 {
+    <name not found> = ArrayList@676[1] { ResolutionCandidate@677 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@678 {
+    <name not found> = ArrayList@679[1] { ResolutionCandidate@680 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@681 {
     <name not found> = ArrayList@682[1] { ResolutionCandidate@683 }
-    <name not found> = ArrayList@684[1] { ResolutionCandidate@683 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@685 {
-    <name not found> = ArrayList@686[1] { ResolutionCandidate@687 }
-    <name not found> = ArrayList@688[1] { ResolutionCandidate@687 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@684 {
+    <name not found> = ArrayList@685[1] { ResolutionCandidate@686 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@689 {
-    <name not found> = ArrayList@690[1] { ResolutionCandidate@691 }
-    <name not found> = ArrayList@692[1] { ResolutionCandidate@691 }
+ResolutionTaskHolder@687 {
+    <name not found> = ArrayList@688[1] { ResolutionCandidate@689 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@690 {
+    <name not found> = ArrayList@691[1] { ResolutionCandidate@692 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@693 {
     <name not found> = ArrayList@694[1] { ResolutionCandidate@695 }
-    <name not found> = ArrayList@696[1] { ResolutionCandidate@695 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@697 {
-    <name not found> = ArrayList@698[1] { ResolutionCandidate@699 }
-    <name not found> = ArrayList@700[1] { ResolutionCandidate@699 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@696 {
+    <name not found> = ArrayList@697[1] { ResolutionCandidate@698 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@701 {
-    <name not found> = ArrayList@702[1] { ResolutionCandidate@703 }
-    <name not found> = ArrayList@704[1] { ResolutionCandidate@703 }
+ResolutionTaskHolder@699 {
+    <name not found> = ArrayList@700[1] { ResolutionCandidate@701 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@702 {
+    <name not found> = ArrayList@703[1] { ResolutionCandidate@704 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@705 {
     <name not found> = ArrayList@706[1] { ResolutionCandidate@707 }
-    <name not found> = ArrayList@708[1] { ResolutionCandidate@707 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@709 {
-    <name not found> = ArrayList@710[1] { ResolutionCandidate@711 }
-    <name not found> = ArrayList@712[1] { ResolutionCandidate@711 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@708 {
+    <name not found> = ArrayList@709[1] { ResolutionCandidate@710 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@713 {
-    <name not found> = ArrayList@714[1] { ResolutionCandidate@715 }
-    <name not found> = ArrayList@716[1] { ResolutionCandidate@715 }
+ResolutionTaskHolder@711 {
+    <name not found> = ArrayList@712[1] { ResolutionCandidate@713 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@714 {
+    <name not found> = ArrayList@715[1] { ResolutionCandidate@716 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@717 {
     <name not found> = ArrayList@718[1] { ResolutionCandidate@719 }
-    <name not found> = ArrayList@720[1] { ResolutionCandidate@719 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@721 {
-    <name not found> = ArrayList@722[1] { ResolutionCandidate@723 }
-    <name not found> = ArrayList@724[1] { ResolutionCandidate@723 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@720 {
+    <name not found> = ArrayList@721[1] { ResolutionCandidate@722 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@725 {
-    <name not found> = ArrayList@726[1] { ResolutionCandidate@727 }
-    <name not found> = ArrayList@728[1] { ResolutionCandidate@727 }
+ResolutionTaskHolder@723 {
+    <name not found> = ArrayList@724[1] { ResolutionCandidate@725 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@726 {
+    <name not found> = ArrayList@727[1] { ResolutionCandidate@728 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@729 {
     <name not found> = ArrayList@730[1] { ResolutionCandidate@731 }
-    <name not found> = ArrayList@732[1] { ResolutionCandidate@731 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@733 {
-    <name not found> = ArrayList@734[1] { ResolutionCandidate@735 }
-    <name not found> = ArrayList@736[1] { ResolutionCandidate@735 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@732 {
+    <name not found> = ArrayList@733[1] { ResolutionCandidate@734 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@737 {
-    <name not found> = ArrayList@738[1] { ResolutionCandidate@739 }
-    <name not found> = ArrayList@740[1] { ResolutionCandidate@739 }
+ResolutionTaskHolder@735 {
+    <name not found> = ArrayList@736[1] { ResolutionCandidate@737 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@738 {
+    <name not found> = ArrayList@739[1] { ResolutionCandidate@740 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@741 {
     <name not found> = ArrayList@742[1] { ResolutionCandidate@743 }
-    <name not found> = ArrayList@744[1] { ResolutionCandidate@743 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@745 {
-    <name not found> = ArrayList@746[1] { ResolutionCandidate@747 }
-    <name not found> = ArrayList@748[1] { ResolutionCandidate@747 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@744 {
+    <name not found> = ArrayList@745[1] { ResolutionCandidate@746 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@749 {
-    <name not found> = ArrayList@750[1] { ResolutionCandidate@751 }
-    <name not found> = ArrayList@752[1] { ResolutionCandidate@751 }
+ResolutionTaskHolder@747 {
+    <name not found> = ArrayList@748[1] { ResolutionCandidate@749 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@750 {
+    <name not found> = ArrayList@751[1] { ResolutionCandidate@752 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@753 {
     <name not found> = ArrayList@754[1] { ResolutionCandidate@755 }
-    <name not found> = ArrayList@756[1] { ResolutionCandidate@755 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@757 {
-    <name not found> = ArrayList@758[1] { ResolutionCandidate@759 }
-    <name not found> = ArrayList@760[1] { ResolutionCandidate@759 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@756 {
+    <name not found> = ArrayList@757[1] { ResolutionCandidate@758 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@761 {
-    <name not found> = ArrayList@762[1] { ResolutionCandidate@763 }
-    <name not found> = ArrayList@764[1] { ResolutionCandidate@763 }
+ResolutionTaskHolder@759 {
+    <name not found> = ArrayList@760[1] { ResolutionCandidate@761 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@762 {
+    <name not found> = ArrayList@763[1] { ResolutionCandidate@764 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@765 {
     <name not found> = ArrayList@766[1] { ResolutionCandidate@767 }
-    <name not found> = ArrayList@768[1] { ResolutionCandidate@767 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@769 {
-    <name not found> = ArrayList@770[1] { ResolutionCandidate@771 }
-    <name not found> = ArrayList@772[1] { ResolutionCandidate@771 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@768 {
+    <name not found> = ArrayList@769[1] { ResolutionCandidate@770 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@773 {
-    <name not found> = ArrayList@774[1] { ResolutionCandidate@775 }
-    <name not found> = ArrayList@776[1] { ResolutionCandidate@775 }
+ResolutionTaskHolder@771 {
+    <name not found> = ArrayList@772[1] { ResolutionCandidate@773 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@774 {
+    <name not found> = ArrayList@775[1] { ResolutionCandidate@776 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@777 {
     <name not found> = ArrayList@778[1] { ResolutionCandidate@779 }
-    <name not found> = ArrayList@780[1] { ResolutionCandidate@779 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@781 {
-    <name not found> = ArrayList@782[1] { ResolutionCandidate@783 }
-    <name not found> = ArrayList@784[1] { ResolutionCandidate@783 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@780 {
+    <name not found> = ArrayList@781[1] { ResolutionCandidate@782 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@785 {
-    <name not found> = ArrayList@786[1] { ResolutionCandidate@787 }
-    <name not found> = ArrayList@788[1] { ResolutionCandidate@787 }
+ResolutionTaskHolder@783 {
+    <name not found> = ArrayList@784[1] { ResolutionCandidate@785 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@786 {
+    <name not found> = ArrayList@787[1] { ResolutionCandidate@788 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@789 {
     <name not found> = ArrayList@790[1] { ResolutionCandidate@791 }
-    <name not found> = ArrayList@792[1] { ResolutionCandidate@791 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@793 {
-    <name not found> = ArrayList@794[1] { ResolutionCandidate@795 }
-    <name not found> = ArrayList@796[1] { ResolutionCandidate@795 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@792 {
+    <name not found> = ArrayList@793[1] { ResolutionCandidate@794 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@797 {
-    <name not found> = ArrayList@798[1] { ResolutionCandidate@799 }
-    <name not found> = ArrayList@800[1] { ResolutionCandidate@799 }
+ResolutionTaskHolder@795 {
+    <name not found> = ArrayList@796[1] { ResolutionCandidate@797 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@798 {
+    <name not found> = ArrayList@799[1] { ResolutionCandidate@800 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@801 {
     <name not found> = ArrayList@802[1] { ResolutionCandidate@803 }
-    <name not found> = ArrayList@804[1] { ResolutionCandidate@803 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@805 {
-    <name not found> = ArrayList@806[1] { ResolutionCandidate@807 }
-    <name not found> = ArrayList@808[1] { ResolutionCandidate@807 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@804 {
+    <name not found> = ArrayList@805[1] { ResolutionCandidate@806 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@809 {
-    <name not found> = ArrayList@810[1] { ResolutionCandidate@811 }
-    <name not found> = ArrayList@812[1] { ResolutionCandidate@811 }
+ResolutionTaskHolder@807 {
+    <name not found> = ArrayList@808[1] { ResolutionCandidate@809 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@810 {
+    <name not found> = ArrayList@811[1] { ResolutionCandidate@812 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@813 {
     <name not found> = ArrayList@814[1] { ResolutionCandidate@815 }
-    <name not found> = ArrayList@816[1] { ResolutionCandidate@815 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@817 {
-    <name not found> = ArrayList@818[1] { ResolutionCandidate@819 }
-    <name not found> = ArrayList@820[1] { ResolutionCandidate@819 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@816 {
+    <name not found> = ArrayList@817[1] { ResolutionCandidate@818 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@821 {
-    <name not found> = ArrayList@822[1] { ResolutionCandidate@823 }
-    <name not found> = ArrayList@824[1] { ResolutionCandidate@823 }
+ResolutionTaskHolder@819 {
+    <name not found> = ArrayList@820[1] { ResolutionCandidate@821 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@822 {
+    <name not found> = ArrayList@823[1] { ResolutionCandidate@824 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@825 {
     <name not found> = ArrayList@826[1] { ResolutionCandidate@827 }
-    <name not found> = ArrayList@828[1] { ResolutionCandidate@827 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@829 {
-    <name not found> = ArrayList@830[1] { ResolutionCandidate@831 }
-    <name not found> = ArrayList@832[1] { ResolutionCandidate@831 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@828 {
+    <name not found> = ArrayList@829[1] { ResolutionCandidate@830 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@833 {
-    <name not found> = ArrayList@834[1] { ResolutionCandidate@835 }
-    <name not found> = ArrayList@836[1] { ResolutionCandidate@835 }
+ResolutionTaskHolder@831 {
+    <name not found> = ArrayList@832[1] { ResolutionCandidate@833 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@834 {
+    <name not found> = ArrayList@835[1] { ResolutionCandidate@836 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@837 {
     <name not found> = ArrayList@838[1] { ResolutionCandidate@839 }
-    <name not found> = ArrayList@840[1] { ResolutionCandidate@839 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@841 {
-    <name not found> = ArrayList@842[1] { ResolutionCandidate@843 }
-    <name not found> = ArrayList@844[1] { ResolutionCandidate@843 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@840 {
+    <name not found> = ArrayList@841[1] { ResolutionCandidate@842 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@845 {
-    <name not found> = ArrayList@846[1] { ResolutionCandidate@847 }
-    <name not found> = ArrayList@848[1] { ResolutionCandidate@847 }
+ResolutionTaskHolder@843 {
+    <name not found> = ArrayList@844[1] { ResolutionCandidate@845 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@846 {
+    <name not found> = ArrayList@847[1] { ResolutionCandidate@848 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@849 {
     <name not found> = ArrayList@850[1] { ResolutionCandidate@851 }
-    <name not found> = ArrayList@852[1] { ResolutionCandidate@851 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@853 {
-    <name not found> = ArrayList@854[1] { ResolutionCandidate@855 }
-    <name not found> = ArrayList@856[1] { ResolutionCandidate@855 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@852 {
+    <name not found> = ArrayList@853[1] { ResolutionCandidate@854 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@857 {
-    <name not found> = ArrayList@858[1] { ResolutionCandidate@859 }
-    <name not found> = ArrayList@860[1] { ResolutionCandidate@859 }
+ResolutionTaskHolder@855 {
+    <name not found> = ArrayList@856[1] { ResolutionCandidate@857 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@858 {
+    <name not found> = ArrayList@859[1] { ResolutionCandidate@860 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@861 {
     <name not found> = ArrayList@862[1] { ResolutionCandidate@863 }
-    <name not found> = ArrayList@864[1] { ResolutionCandidate@863 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@865 {
-    <name not found> = ArrayList@866[1] { ResolutionCandidate@867 }
-    <name not found> = ArrayList@868[1] { ResolutionCandidate@867 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@864 {
+    <name not found> = ArrayList@865[1] { ResolutionCandidate@866 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@869 {
-    <name not found> = ArrayList@870[1] { ResolutionCandidate@871 }
-    <name not found> = ArrayList@872[1] { ResolutionCandidate@871 }
+ResolutionTaskHolder@867 {
+    <name not found> = ArrayList@868[1] { ResolutionCandidate@869 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@870 {
+    <name not found> = ArrayList@871[1] { ResolutionCandidate@872 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@873 {
     <name not found> = ArrayList@874[1] { ResolutionCandidate@875 }
-    <name not found> = ArrayList@876[1] { ResolutionCandidate@875 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@877 {
-    <name not found> = ArrayList@878[1] { ResolutionCandidate@879 }
-    <name not found> = ArrayList@880[1] { ResolutionCandidate@879 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@876 {
+    <name not found> = ArrayList@877[1] { ResolutionCandidate@878 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@881 {
-    <name not found> = ArrayList@882[1] { ResolutionCandidate@883 }
-    <name not found> = ArrayList@884[1] { ResolutionCandidate@883 }
+ResolutionTaskHolder@879 {
+    <name not found> = ArrayList@880[1] { ResolutionCandidate@881 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@882 {
+    <name not found> = ArrayList@883[1] { ResolutionCandidate@884 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@885 {
     <name not found> = ArrayList@886[1] { ResolutionCandidate@887 }
-    <name not found> = ArrayList@888[1] { ResolutionCandidate@887 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@889 {
-    <name not found> = ArrayList@890[1] { ResolutionCandidate@891 }
-    <name not found> = ArrayList@892[1] { ResolutionCandidate@891 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@888 {
+    <name not found> = ArrayList@889[1] { ResolutionCandidate@890 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@893 {
-    <name not found> = ArrayList@894[1] { ResolutionCandidate@895 }
-    <name not found> = ArrayList@896[1] { ResolutionCandidate@895 }
+ResolutionTaskHolder@891 {
+    <name not found> = ArrayList@892[1] { ResolutionCandidate@893 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@894 {
+    <name not found> = ArrayList@895[1] { ResolutionCandidate@896 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@897 {
     <name not found> = ArrayList@898[1] { ResolutionCandidate@899 }
-    <name not found> = ArrayList@900[1] { ResolutionCandidate@899 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@901 {
-    <name not found> = ArrayList@902[1] { ResolutionCandidate@903 }
-    <name not found> = ArrayList@904[1] { ResolutionCandidate@903 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@900 {
+    <name not found> = ArrayList@901[1] { ResolutionCandidate@902 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@905 {
-    <name not found> = ArrayList@906[1] { ResolutionCandidate@907 }
-    <name not found> = ArrayList@908[1] { ResolutionCandidate@907 }
+ResolutionTaskHolder@903 {
+    <name not found> = ArrayList@904[1] { ResolutionCandidate@905 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@906 {
+    <name not found> = ArrayList@907[1] { ResolutionCandidate@908 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@909 {
     <name not found> = ArrayList@910[1] { ResolutionCandidate@911 }
-    <name not found> = ArrayList@912[1] { ResolutionCandidate@911 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@913 {
-    <name not found> = ArrayList@914[1] { ResolutionCandidate@915 }
-    <name not found> = ArrayList@916[1] { ResolutionCandidate@915 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@912 {
+    <name not found> = ArrayList@913[1] { ResolutionCandidate@914 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@917 {
-    <name not found> = ArrayList@918[1] { ResolutionCandidate@919 }
-    <name not found> = ArrayList@920[1] { ResolutionCandidate@919 }
+ResolutionTaskHolder@915 {
+    <name not found> = ArrayList@916[1] { ResolutionCandidate@917 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@918 {
+    <name not found> = ArrayList@919[1] { ResolutionCandidate@920 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@921 {
     <name not found> = ArrayList@922[1] { ResolutionCandidate@923 }
-    <name not found> = ArrayList@924[1] { ResolutionCandidate@923 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@925 {
-    <name not found> = ArrayList@926[1] { ResolutionCandidate@927 }
-    <name not found> = ArrayList@928[1] { ResolutionCandidate@927 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@924 {
+    <name not found> = ArrayList@925[1] { ResolutionCandidate@926 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@929 {
-    <name not found> = ArrayList@930[1] { ResolutionCandidate@931 }
-    <name not found> = ArrayList@932[1] { ResolutionCandidate@931 }
+ResolutionTaskHolder@927 {
+    <name not found> = ArrayList@928[1] { ResolutionCandidate@929 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@930 {
+    <name not found> = ArrayList@931[1] { ResolutionCandidate@932 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@933 {
     <name not found> = ArrayList@934[1] { ResolutionCandidate@935 }
-    <name not found> = ArrayList@936[1] { ResolutionCandidate@935 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@937 {
-    <name not found> = ArrayList@938[1] { ResolutionCandidate@939 }
-    <name not found> = ArrayList@940[1] { ResolutionCandidate@939 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@936 {
+    <name not found> = ArrayList@937[1] { ResolutionCandidate@938 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@941 {
-    <name not found> = ArrayList@942[1] { ResolutionCandidate@943 }
-    <name not found> = ArrayList@944[1] { ResolutionCandidate@943 }
+ResolutionTaskHolder@939 {
+    <name not found> = ArrayList@940[1] { ResolutionCandidate@941 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@942 {
+    <name not found> = ArrayList@943[1] { ResolutionCandidate@944 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@945 {
     <name not found> = ArrayList@946[1] { ResolutionCandidate@947 }
-    <name not found> = ArrayList@948[1] { ResolutionCandidate@947 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@949 {
-    <name not found> = ArrayList@950[1] { ResolutionCandidate@951 }
-    <name not found> = ArrayList@952[1] { ResolutionCandidate@951 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@948 {
+    <name not found> = ArrayList@949[1] { ResolutionCandidate@950 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@953 {
-    <name not found> = ArrayList@954[1] { ResolutionCandidate@955 }
-    <name not found> = ArrayList@956[1] { ResolutionCandidate@955 }
+ResolutionTaskHolder@951 {
+    <name not found> = ArrayList@952[1] { ResolutionCandidate@953 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@954 {
+    <name not found> = ArrayList@955[1] { ResolutionCandidate@956 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@957 {
     <name not found> = ArrayList@958[1] { ResolutionCandidate@959 }
-    <name not found> = ArrayList@960[1] { ResolutionCandidate@959 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@961 {
-    <name not found> = ArrayList@962[1] { ResolutionCandidate@963 }
-    <name not found> = ArrayList@964[1] { ResolutionCandidate@963 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@960 {
+    <name not found> = ArrayList@961[1] { ResolutionCandidate@962 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@965 {
-    <name not found> = ArrayList@966[1] { ResolutionCandidate@967 }
-    <name not found> = ArrayList@968[1] { ResolutionCandidate@967 }
+ResolutionTaskHolder@963 {
+    <name not found> = ArrayList@964[1] { ResolutionCandidate@965 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@966 {
+    <name not found> = ArrayList@967[1] { ResolutionCandidate@968 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@969 {
     <name not found> = ArrayList@970[1] { ResolutionCandidate@971 }
-    <name not found> = ArrayList@972[1] { ResolutionCandidate@971 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@973 {
-    <name not found> = ArrayList@974[1] { ResolutionCandidate@975 }
-    <name not found> = ArrayList@976[1] { ResolutionCandidate@975 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@972 {
+    <name not found> = ArrayList@973[1] { ResolutionCandidate@974 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@977 {
-    <name not found> = ArrayList@978[1] { ResolutionCandidate@979 }
-    <name not found> = ArrayList@980[1] { ResolutionCandidate@979 }
+ResolutionTaskHolder@975 {
+    <name not found> = ArrayList@976[1] { ResolutionCandidate@977 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@978 {
+    <name not found> = ArrayList@979[1] { ResolutionCandidate@980 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@981 {
     <name not found> = ArrayList@982[1] { ResolutionCandidate@983 }
-    <name not found> = ArrayList@984[1] { ResolutionCandidate@983 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@985 {
-    <name not found> = ArrayList@986[1] { ResolutionCandidate@987 }
-    <name not found> = ArrayList@988[1] { ResolutionCandidate@987 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@984 {
+    <name not found> = ArrayList@985[1] { ResolutionCandidate@986 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@989 {
-    <name not found> = ArrayList@990[1] { ResolutionCandidate@991 }
-    <name not found> = ArrayList@992[1] { ResolutionCandidate@991 }
+ResolutionTaskHolder@987 {
+    <name not found> = ArrayList@988[1] { ResolutionCandidate@989 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@990 {
+    <name not found> = ArrayList@991[1] { ResolutionCandidate@992 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@993 {
     <name not found> = ArrayList@994[1] { ResolutionCandidate@995 }
-    <name not found> = ArrayList@996[1] { ResolutionCandidate@995 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@997 {
-    <name not found> = ArrayList@998[1] { ResolutionCandidate@999 }
-    <name not found> = ArrayList@1000[1] { ResolutionCandidate@999 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@996 {
+    <name not found> = ArrayList@997[1] { ResolutionCandidate@998 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1001 {
-    <name not found> = ArrayList@1002[1] { ResolutionCandidate@1003 }
-    <name not found> = ArrayList@1004[1] { ResolutionCandidate@1003 }
+ResolutionTaskHolder@999 {
+    <name not found> = ArrayList@1000[1] { ResolutionCandidate@1001 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1002 {
+    <name not found> = ArrayList@1003[1] { ResolutionCandidate@1004 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1005 {
     <name not found> = ArrayList@1006[1] { ResolutionCandidate@1007 }
-    <name not found> = ArrayList@1008[1] { ResolutionCandidate@1007 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1009 {
-    <name not found> = ArrayList@1010[1] { ResolutionCandidate@1011 }
-    <name not found> = ArrayList@1012[1] { ResolutionCandidate@1011 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1008 {
+    <name not found> = ArrayList@1009[1] { ResolutionCandidate@1010 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1013 {
-    <name not found> = ArrayList@1014[1] { ResolutionCandidate@1015 }
-    <name not found> = ArrayList@1016[1] { ResolutionCandidate@1015 }
+ResolutionTaskHolder@1011 {
+    <name not found> = ArrayList@1012[1] { ResolutionCandidate@1013 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1014 {
+    <name not found> = ArrayList@1015[1] { ResolutionCandidate@1016 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1017 {
     <name not found> = ArrayList@1018[1] { ResolutionCandidate@1019 }
-    <name not found> = ArrayList@1020[1] { ResolutionCandidate@1019 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1021 {
-    <name not found> = ArrayList@1022[1] { ResolutionCandidate@1023 }
-    <name not found> = ArrayList@1024[1] { ResolutionCandidate@1023 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1020 {
+    <name not found> = ArrayList@1021[1] { ResolutionCandidate@1022 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1025 {
-    <name not found> = ArrayList@1026[1] { ResolutionCandidate@1027 }
-    <name not found> = ArrayList@1028[1] { ResolutionCandidate@1027 }
+ResolutionTaskHolder@1023 {
+    <name not found> = ArrayList@1024[1] { ResolutionCandidate@1025 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1026 {
+    <name not found> = ArrayList@1027[1] { ResolutionCandidate@1028 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1029 {
     <name not found> = ArrayList@1030[1] { ResolutionCandidate@1031 }
-    <name not found> = ArrayList@1032[1] { ResolutionCandidate@1031 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1033 {
-    <name not found> = ArrayList@1034[1] { ResolutionCandidate@1035 }
-    <name not found> = ArrayList@1036[1] { ResolutionCandidate@1035 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1032 {
+    <name not found> = ArrayList@1033[1] { ResolutionCandidate@1034 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1037 {
-    <name not found> = ArrayList@1038[1] { ResolutionCandidate@1039 }
-    <name not found> = ArrayList@1040[1] { ResolutionCandidate@1039 }
+ResolutionTaskHolder@1035 {
+    <name not found> = ArrayList@1036[1] { ResolutionCandidate@1037 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1038 {
+    <name not found> = ArrayList@1039[1] { ResolutionCandidate@1040 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1041 {
     <name not found> = ArrayList@1042[1] { ResolutionCandidate@1043 }
-    <name not found> = ArrayList@1044[1] { ResolutionCandidate@1043 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1045 {
-    <name not found> = ArrayList@1046[1] { ResolutionCandidate@1047 }
-    <name not found> = ArrayList@1048[1] { ResolutionCandidate@1047 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1044 {
+    <name not found> = ArrayList@1045[1] { ResolutionCandidate@1046 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1049 {
-    <name not found> = ArrayList@1050[1] { ResolutionCandidate@1051 }
-    <name not found> = ArrayList@1052[1] { ResolutionCandidate@1051 }
+ResolutionTaskHolder@1047 {
+    <name not found> = ArrayList@1048[1] { ResolutionCandidate@1049 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1050 {
+    <name not found> = ArrayList@1051[1] { ResolutionCandidate@1052 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1053 {
     <name not found> = ArrayList@1054[1] { ResolutionCandidate@1055 }
-    <name not found> = ArrayList@1056[1] { ResolutionCandidate@1055 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1057 {
-    <name not found> = ArrayList@1058[1] { ResolutionCandidate@1059 }
-    <name not found> = ArrayList@1060[1] { ResolutionCandidate@1059 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1056 {
+    <name not found> = ArrayList@1057[1] { ResolutionCandidate@1058 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1061 {
-    <name not found> = ArrayList@1062[1] { ResolutionCandidate@1063 }
-    <name not found> = ArrayList@1064[1] { ResolutionCandidate@1063 }
+ResolutionTaskHolder@1059 {
+    <name not found> = ArrayList@1060[1] { ResolutionCandidate@1061 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1062 {
+    <name not found> = ArrayList@1063[1] { ResolutionCandidate@1064 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1065 {
     <name not found> = ArrayList@1066[1] { ResolutionCandidate@1067 }
-    <name not found> = ArrayList@1068[1] { ResolutionCandidate@1067 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1069 {
-    <name not found> = ArrayList@1070[1] { ResolutionCandidate@1071 }
-    <name not found> = ArrayList@1072[1] { ResolutionCandidate@1071 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1068 {
+    <name not found> = ArrayList@1069[1] { ResolutionCandidate@1070 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1073 {
-    <name not found> = ArrayList@1074[1] { ResolutionCandidate@1075 }
-    <name not found> = ArrayList@1076[1] { ResolutionCandidate@1075 }
+ResolutionTaskHolder@1071 {
+    <name not found> = ArrayList@1072[1] { ResolutionCandidate@1073 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1074 {
+    <name not found> = ArrayList@1075[1] { ResolutionCandidate@1076 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1077 {
     <name not found> = ArrayList@1078[1] { ResolutionCandidate@1079 }
-    <name not found> = ArrayList@1080[1] { ResolutionCandidate@1079 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1081 {
-    <name not found> = ArrayList@1082[1] { ResolutionCandidate@1083 }
-    <name not found> = ArrayList@1084[1] { ResolutionCandidate@1083 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1080 {
+    <name not found> = ArrayList@1081[1] { ResolutionCandidate@1082 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1085 {
-    <name not found> = ArrayList@1086[1] { ResolutionCandidate@1087 }
-    <name not found> = ArrayList@1088[1] { ResolutionCandidate@1087 }
+ResolutionTaskHolder@1083 {
+    <name not found> = ArrayList@1084[1] { ResolutionCandidate@1085 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1086 {
+    <name not found> = ArrayList@1087[1] { ResolutionCandidate@1088 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1089 {
     <name not found> = ArrayList@1090[1] { ResolutionCandidate@1091 }
-    <name not found> = ArrayList@1092[1] { ResolutionCandidate@1091 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1093 {
-    <name not found> = ArrayList@1094[1] { ResolutionCandidate@1095 }
-    <name not found> = ArrayList@1096[1] { ResolutionCandidate@1095 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1092 {
+    <name not found> = ArrayList@1093[1] { ResolutionCandidate@1094 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1097 {
-    <name not found> = ArrayList@1098[1] { ResolutionCandidate@1099 }
-    <name not found> = ArrayList@1100[1] { ResolutionCandidate@1099 }
+ResolutionTaskHolder@1095 {
+    <name not found> = ArrayList@1096[1] { ResolutionCandidate@1097 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1098 {
+    <name not found> = ArrayList@1099[1] { ResolutionCandidate@1100 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1101 {
     <name not found> = ArrayList@1102[1] { ResolutionCandidate@1103 }
-    <name not found> = ArrayList@1104[1] { ResolutionCandidate@1103 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1105 {
-    <name not found> = ArrayList@1106[1] { ResolutionCandidate@1107 }
-    <name not found> = ArrayList@1108[1] { ResolutionCandidate@1107 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1104 {
+    <name not found> = ArrayList@1105[1] { ResolutionCandidate@1106 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1109 {
-    <name not found> = ArrayList@1110[1] { ResolutionCandidate@1111 }
-    <name not found> = ArrayList@1112[1] { ResolutionCandidate@1111 }
+ResolutionTaskHolder@1107 {
+    <name not found> = ArrayList@1108[1] { ResolutionCandidate@1109 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1110 {
+    <name not found> = ArrayList@1111[1] { ResolutionCandidate@1112 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1113 {
     <name not found> = ArrayList@1114[1] { ResolutionCandidate@1115 }
-    <name not found> = ArrayList@1116[1] { ResolutionCandidate@1115 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1117 {
-    <name not found> = ArrayList@1118[1] { ResolutionCandidate@1119 }
-    <name not found> = ArrayList@1120[1] { ResolutionCandidate@1119 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1116 {
+    <name not found> = ArrayList@1117[1] { ResolutionCandidate@1118 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1121 {
-    <name not found> = ArrayList@1122[1] { ResolutionCandidate@1123 }
-    <name not found> = ArrayList@1124[1] { ResolutionCandidate@1123 }
+ResolutionTaskHolder@1119 {
+    <name not found> = ArrayList@1120[1] { ResolutionCandidate@1121 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1122 {
+    <name not found> = ArrayList@1123[1] { ResolutionCandidate@1124 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1125 {
     <name not found> = ArrayList@1126[1] { ResolutionCandidate@1127 }
-    <name not found> = ArrayList@1128[1] { ResolutionCandidate@1127 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1129 {
-    <name not found> = ArrayList@1130[1] { ResolutionCandidate@1131 }
-    <name not found> = ArrayList@1132[1] { ResolutionCandidate@1131 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1128 {
+    <name not found> = ArrayList@1129[1] { ResolutionCandidate@1130 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1133 {
-    <name not found> = ArrayList@1134[1] { ResolutionCandidate@1135 }
-    <name not found> = ArrayList@1136[1] { ResolutionCandidate@1135 }
+ResolutionTaskHolder@1131 {
+    <name not found> = ArrayList@1132[1] { ResolutionCandidate@1133 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1134 {
+    <name not found> = ArrayList@1135[1] { ResolutionCandidate@1136 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1137 {
     <name not found> = ArrayList@1138[1] { ResolutionCandidate@1139 }
-    <name not found> = ArrayList@1140[1] { ResolutionCandidate@1139 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1141 {
-    <name not found> = ArrayList@1142[1] { ResolutionCandidate@1143 }
-    <name not found> = ArrayList@1144[1] { ResolutionCandidate@1143 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1140 {
+    <name not found> = ArrayList@1141[1] { ResolutionCandidate@1142 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1145 {
-    <name not found> = ArrayList@1146[1] { ResolutionCandidate@1147 }
-    <name not found> = ArrayList@1148[1] { ResolutionCandidate@1147 }
+ResolutionTaskHolder@1143 {
+    <name not found> = ArrayList@1144[1] { ResolutionCandidate@1145 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1146 {
+    <name not found> = ArrayList@1147[1] { ResolutionCandidate@1148 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1149 {
     <name not found> = ArrayList@1150[1] { ResolutionCandidate@1151 }
-    <name not found> = ArrayList@1152[1] { ResolutionCandidate@1151 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1153 {
-    <name not found> = ArrayList@1154[1] { ResolutionCandidate@1155 }
-    <name not found> = ArrayList@1156[1] { ResolutionCandidate@1155 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1152 {
+    <name not found> = ArrayList@1153[1] { ResolutionCandidate@1154 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1157 {
-    <name not found> = ArrayList@1158[1] { ResolutionCandidate@1159 }
-    <name not found> = ArrayList@1160[1] { ResolutionCandidate@1159 }
+ResolutionTaskHolder@1155 {
+    <name not found> = ArrayList@1156[1] { ResolutionCandidate@1157 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1158 {
+    <name not found> = ArrayList@1159[1] { ResolutionCandidate@1160 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1161 {
     <name not found> = ArrayList@1162[1] { ResolutionCandidate@1163 }
-    <name not found> = ArrayList@1164[1] { ResolutionCandidate@1163 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1165 {
-    <name not found> = ArrayList@1166[1] { ResolutionCandidate@1167 }
-    <name not found> = ArrayList@1168[1] { ResolutionCandidate@1167 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1164 {
+    <name not found> = ArrayList@1165[1] { ResolutionCandidate@1166 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1169 {
-    <name not found> = ArrayList@1170[1] { ResolutionCandidate@1171 }
-    <name not found> = ArrayList@1172[1] { ResolutionCandidate@1171 }
+ResolutionTaskHolder@1167 {
+    <name not found> = ArrayList@1168[1] { ResolutionCandidate@1169 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1170 {
+    <name not found> = ArrayList@1171[1] { ResolutionCandidate@1172 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1173 {
     <name not found> = ArrayList@1174[1] { ResolutionCandidate@1175 }
-    <name not found> = ArrayList@1176[1] { ResolutionCandidate@1175 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1177 {
-    <name not found> = ArrayList@1178[1] { ResolutionCandidate@1179 }
-    <name not found> = ArrayList@1180[1] { ResolutionCandidate@1179 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1176 {
+    <name not found> = ArrayList@1177[1] { ResolutionCandidate@1178 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1181 {
-    <name not found> = ArrayList@1182[1] { ResolutionCandidate@1183 }
-    <name not found> = ArrayList@1184[1] { ResolutionCandidate@1183 }
+ResolutionTaskHolder@1179 {
+    <name not found> = ArrayList@1180[1] { ResolutionCandidate@1181 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1182 {
+    <name not found> = ArrayList@1183[1] { ResolutionCandidate@1184 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1185 {
     <name not found> = ArrayList@1186[1] { ResolutionCandidate@1187 }
-    <name not found> = ArrayList@1188[1] { ResolutionCandidate@1187 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1189 {
-    <name not found> = ArrayList@1190[1] { ResolutionCandidate@1191 }
-    <name not found> = ArrayList@1192[1] { ResolutionCandidate@1191 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1188 {
+    <name not found> = ArrayList@1189[1] { ResolutionCandidate@1190 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1193 {
-    <name not found> = ArrayList@1194[1] { ResolutionCandidate@1195 }
-    <name not found> = ArrayList@1196[1] { ResolutionCandidate@1195 }
+ResolutionTaskHolder@1191 {
+    <name not found> = ArrayList@1192[1] { ResolutionCandidate@1193 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1194 {
+    <name not found> = ArrayList@1195[1] { ResolutionCandidate@1196 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1197 {
     <name not found> = ArrayList@1198[1] { ResolutionCandidate@1199 }
-    <name not found> = ArrayList@1200[1] { ResolutionCandidate@1199 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1201 {
-    <name not found> = ArrayList@1202[1] { ResolutionCandidate@1203 }
-    <name not found> = ArrayList@1204[1] { ResolutionCandidate@1203 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1200 {
+    <name not found> = ArrayList@1201[1] { ResolutionCandidate@1202 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1205 {
-    <name not found> = ArrayList@1206[1] { ResolutionCandidate@1207 }
-    <name not found> = ArrayList@1208[1] { ResolutionCandidate@1207 }
+ResolutionTaskHolder@1203 {
+    <name not found> = ArrayList@1204[1] { ResolutionCandidate@1205 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1206 {
+    <name not found> = ArrayList@1207[1] { ResolutionCandidate@1208 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1209 {
     <name not found> = ArrayList@1210[1] { ResolutionCandidate@1211 }
-    <name not found> = ArrayList@1212[1] { ResolutionCandidate@1211 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1213 {
-    <name not found> = ArrayList@1214[1] { ResolutionCandidate@1215 }
-    <name not found> = ArrayList@1216[1] { ResolutionCandidate@1215 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1212 {
+    <name not found> = ArrayList@1213[1] { ResolutionCandidate@1214 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1217 {
-    <name not found> = ArrayList@1218[1] { ResolutionCandidate@1219 }
-    <name not found> = ArrayList@1220[1] { ResolutionCandidate@1219 }
+ResolutionTaskHolder@1215 {
+    <name not found> = ArrayList@1216[1] { ResolutionCandidate@1217 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1218 {
+    <name not found> = ArrayList@1219[1] { ResolutionCandidate@1220 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1221 {
     <name not found> = ArrayList@1222[1] { ResolutionCandidate@1223 }
-    <name not found> = ArrayList@1224[1] { ResolutionCandidate@1223 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1225 {
-    <name not found> = ArrayList@1226[1] { ResolutionCandidate@1227 }
-    <name not found> = ArrayList@1228[1] { ResolutionCandidate@1227 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1224 {
+    <name not found> = ArrayList@1225[1] { ResolutionCandidate@1226 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1229 {
-    <name not found> = ArrayList@1230[1] { ResolutionCandidate@1231 }
-    <name not found> = ArrayList@1232[1] { ResolutionCandidate@1231 }
+ResolutionTaskHolder@1227 {
+    <name not found> = ArrayList@1228[1] { ResolutionCandidate@1229 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1230 {
+    <name not found> = ArrayList@1231[1] { ResolutionCandidate@1232 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1233 {
     <name not found> = ArrayList@1234[1] { ResolutionCandidate@1235 }
-    <name not found> = ArrayList@1236[1] { ResolutionCandidate@1235 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1237 {
-    <name not found> = ArrayList@1238[1] { ResolutionCandidate@1239 }
-    <name not found> = ArrayList@1240[1] { ResolutionCandidate@1239 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1236 {
+    <name not found> = ArrayList@1237[1] { ResolutionCandidate@1238 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1241 {
-    <name not found> = ArrayList@1242[1] { ResolutionCandidate@1243 }
-    <name not found> = ArrayList@1244[1] { ResolutionCandidate@1243 }
+ResolutionTaskHolder@1239 {
+    <name not found> = ArrayList@1240[1] { ResolutionCandidate@1241 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1242 {
+    <name not found> = ArrayList@1243[1] { ResolutionCandidate@1244 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1245 {
     <name not found> = ArrayList@1246[1] { ResolutionCandidate@1247 }
-    <name not found> = ArrayList@1248[1] { ResolutionCandidate@1247 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1249 {
-    <name not found> = ArrayList@1250[1] { ResolutionCandidate@1251 }
-    <name not found> = ArrayList@1252[1] { ResolutionCandidate@1251 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1248 {
+    <name not found> = ArrayList@1249[1] { ResolutionCandidate@1250 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1253 {
-    <name not found> = ArrayList@1254[1] { ResolutionCandidate@1255 }
-    <name not found> = ArrayList@1256[1] { ResolutionCandidate@1255 }
+ResolutionTaskHolder@1251 {
+    <name not found> = ArrayList@1252[1] { ResolutionCandidate@1253 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1254 {
+    <name not found> = ArrayList@1255[1] { ResolutionCandidate@1256 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1257 {
     <name not found> = ArrayList@1258[1] { ResolutionCandidate@1259 }
-    <name not found> = ArrayList@1260[1] { ResolutionCandidate@1259 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1261 {
-    <name not found> = ArrayList@1262[1] { ResolutionCandidate@1263 }
-    <name not found> = ArrayList@1264[1] { ResolutionCandidate@1263 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1260 {
+    <name not found> = ArrayList@1261[1] { ResolutionCandidate@1262 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1265 {
-    <name not found> = ArrayList@1266[1] { ResolutionCandidate@1267 }
-    <name not found> = ArrayList@1268[1] { ResolutionCandidate@1267 }
+ResolutionTaskHolder@1263 {
+    <name not found> = ArrayList@1264[1] { ResolutionCandidate@1265 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1266 {
+    <name not found> = ArrayList@1267[1] { ResolutionCandidate@1268 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1269 {
     <name not found> = ArrayList@1270[1] { ResolutionCandidate@1271 }
-    <name not found> = ArrayList@1272[1] { ResolutionCandidate@1271 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1273 {
-    <name not found> = ArrayList@1274[1] { ResolutionCandidate@1275 }
-    <name not found> = ArrayList@1276[1] { ResolutionCandidate@1275 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1272 {
+    <name not found> = ArrayList@1273[1] { ResolutionCandidate@1274 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1277 {
-    <name not found> = ArrayList@1278[1] { ResolutionCandidate@1279 }
-    <name not found> = ArrayList@1280[1] { ResolutionCandidate@1279 }
+ResolutionTaskHolder@1275 {
+    <name not found> = ArrayList@1276[1] { ResolutionCandidate@1277 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1278 {
+    <name not found> = ArrayList@1279[1] { ResolutionCandidate@1280 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1281 {
     <name not found> = ArrayList@1282[1] { ResolutionCandidate@1283 }
-    <name not found> = ArrayList@1284[1] { ResolutionCandidate@1283 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1285 {
-    <name not found> = ArrayList@1286[1] { ResolutionCandidate@1287 }
-    <name not found> = ArrayList@1288[1] { ResolutionCandidate@1287 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1284 {
+    <name not found> = ArrayList@1285[1] { ResolutionCandidate@1286 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1289 {
-    <name not found> = ArrayList@1290[1] { ResolutionCandidate@1291 }
-    <name not found> = ArrayList@1292[1] { ResolutionCandidate@1291 }
+ResolutionTaskHolder@1287 {
+    <name not found> = ArrayList@1288[1] { ResolutionCandidate@1289 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1290 {
+    <name not found> = ArrayList@1291[1] { ResolutionCandidate@1292 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1293 {
     <name not found> = ArrayList@1294[1] { ResolutionCandidate@1295 }
-    <name not found> = ArrayList@1296[1] { ResolutionCandidate@1295 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1297 {
-    <name not found> = ArrayList@1298[1] { ResolutionCandidate@1299 }
-    <name not found> = ArrayList@1300[1] { ResolutionCandidate@1299 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1296 {
+    <name not found> = ArrayList@1297[1] { ResolutionCandidate@1298 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1301 {
-    <name not found> = ArrayList@1302[1] { ResolutionCandidate@1303 }
-    <name not found> = ArrayList@1304[1] { ResolutionCandidate@1303 }
+ResolutionTaskHolder@1299 {
+    <name not found> = ArrayList@1300[1] { ResolutionCandidate@1301 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1302 {
+    <name not found> = ArrayList@1303[1] { ResolutionCandidate@1304 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1305 {
     <name not found> = ArrayList@1306[1] { ResolutionCandidate@1307 }
-    <name not found> = ArrayList@1308[1] { ResolutionCandidate@1307 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1309 {
-    <name not found> = ArrayList@1310[1] { ResolutionCandidate@1311 }
-    <name not found> = ArrayList@1312[1] { ResolutionCandidate@1311 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1308 {
+    <name not found> = ArrayList@1309[1] { ResolutionCandidate@1310 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1313 {
-    <name not found> = ArrayList@1314[1] { ResolutionCandidate@1315 }
-    <name not found> = ArrayList@1316[1] { ResolutionCandidate@1315 }
+ResolutionTaskHolder@1311 {
+    <name not found> = ArrayList@1312[1] { ResolutionCandidate@1313 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1314 {
+    <name not found> = ArrayList@1315[1] { ResolutionCandidate@1316 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1317 {
     <name not found> = ArrayList@1318[1] { ResolutionCandidate@1319 }
-    <name not found> = ArrayList@1320[1] { ResolutionCandidate@1319 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1321 {
-    <name not found> = ArrayList@1322[1] { ResolutionCandidate@1323 }
-    <name not found> = ArrayList@1324[1] { ResolutionCandidate@1323 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1320 {
+    <name not found> = ArrayList@1321[1] { ResolutionCandidate@1322 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1325 {
-    <name not found> = ArrayList@1326[1] { ResolutionCandidate@1327 }
-    <name not found> = ArrayList@1328[1] { ResolutionCandidate@1327 }
+ResolutionTaskHolder@1323 {
+    <name not found> = ArrayList@1324[1] { ResolutionCandidate@1325 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1326 {
+    <name not found> = ArrayList@1327[1] { ResolutionCandidate@1328 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1329 {
     <name not found> = ArrayList@1330[1] { ResolutionCandidate@1331 }
-    <name not found> = ArrayList@1332[1] { ResolutionCandidate@1331 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1333 {
-    <name not found> = ArrayList@1334[1] { ResolutionCandidate@1335 }
-    <name not found> = ArrayList@1336[1] { ResolutionCandidate@1335 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1332 {
+    <name not found> = ArrayList@1333[1] { ResolutionCandidate@1334 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1337 {
-    <name not found> = ArrayList@1338[1] { ResolutionCandidate@1339 }
-    <name not found> = ArrayList@1340[1] { ResolutionCandidate@1339 }
+ResolutionTaskHolder@1335 {
+    <name not found> = ArrayList@1336[1] { ResolutionCandidate@1337 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1338 {
+    <name not found> = ArrayList@1339[1] { ResolutionCandidate@1340 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1341 {
     <name not found> = ArrayList@1342[1] { ResolutionCandidate@1343 }
-    <name not found> = ArrayList@1344[1] { ResolutionCandidate@1343 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1345 {
-    <name not found> = ArrayList@1346[1] { ResolutionCandidate@1347 }
-    <name not found> = ArrayList@1348[1] { ResolutionCandidate@1347 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1344 {
+    <name not found> = ArrayList@1345[1] { ResolutionCandidate@1346 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1349 {
-    <name not found> = ArrayList@1350[1] { ResolutionCandidate@1351 }
-    <name not found> = ArrayList@1352[1] { ResolutionCandidate@1351 }
+ResolutionTaskHolder@1347 {
+    <name not found> = ArrayList@1348[1] { ResolutionCandidate@1349 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1350 {
+    <name not found> = ArrayList@1351[1] { ResolutionCandidate@1352 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1353 {
     <name not found> = ArrayList@1354[1] { ResolutionCandidate@1355 }
-    <name not found> = ArrayList@1356[1] { ResolutionCandidate@1355 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1357 {
-    <name not found> = ArrayList@1358[1] { ResolutionCandidate@1359 }
-    <name not found> = ArrayList@1360[1] { ResolutionCandidate@1359 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1356 {
+    <name not found> = ArrayList@1357[1] { ResolutionCandidate@1358 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1361 {
-    <name not found> = ArrayList@1362[1] { ResolutionCandidate@1363 }
-    <name not found> = ArrayList@1364[1] { ResolutionCandidate@1363 }
+ResolutionTaskHolder@1359 {
+    <name not found> = ArrayList@1360[1] { ResolutionCandidate@1361 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1362 {
+    <name not found> = ArrayList@1363[1] { ResolutionCandidate@1364 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1365 {
     <name not found> = ArrayList@1366[1] { ResolutionCandidate@1367 }
-    <name not found> = ArrayList@1368[1] { ResolutionCandidate@1367 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1369 {
-    <name not found> = ArrayList@1370[1] { ResolutionCandidate@1371 }
-    <name not found> = ArrayList@1372[1] { ResolutionCandidate@1371 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1368 {
+    <name not found> = ArrayList@1369[1] { ResolutionCandidate@1370 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1373 {
-    <name not found> = ArrayList@1374[1] { ResolutionCandidate@1375 }
-    <name not found> = ArrayList@1376[1] { ResolutionCandidate@1375 }
+ResolutionTaskHolder@1371 {
+    <name not found> = ArrayList@1372[1] { ResolutionCandidate@1373 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1374 {
+    <name not found> = ArrayList@1375[1] { ResolutionCandidate@1376 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1377 {
     <name not found> = ArrayList@1378[1] { ResolutionCandidate@1379 }
-    <name not found> = ArrayList@1380[1] { ResolutionCandidate@1379 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1381 {
-    <name not found> = ArrayList@1382[1] { ResolutionCandidate@1383 }
-    <name not found> = ArrayList@1384[1] { ResolutionCandidate@1383 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1380 {
+    <name not found> = ArrayList@1381[1] { ResolutionCandidate@1382 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1385 {
-    <name not found> = ArrayList@1386[1] { ResolutionCandidate@1387 }
-    <name not found> = ArrayList@1388[1] { ResolutionCandidate@1387 }
+ResolutionTaskHolder@1383 {
+    <name not found> = ArrayList@1384[1] { ResolutionCandidate@1385 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1386 {
+    <name not found> = ArrayList@1387[1] { ResolutionCandidate@1388 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1389 {
     <name not found> = ArrayList@1390[1] { ResolutionCandidate@1391 }
-    <name not found> = ArrayList@1392[1] { ResolutionCandidate@1391 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1393 {
-    <name not found> = ArrayList@1394[1] { ResolutionCandidate@1395 }
-    <name not found> = ArrayList@1396[1] { ResolutionCandidate@1395 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1392 {
+    <name not found> = ArrayList@1393[1] { ResolutionCandidate@1394 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1397 {
-    <name not found> = ArrayList@1398[1] { ResolutionCandidate@1399 }
-    <name not found> = ArrayList@1400[1] { ResolutionCandidate@1399 }
+ResolutionTaskHolder@1395 {
+    <name not found> = ArrayList@1396[1] { ResolutionCandidate@1397 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1398 {
+    <name not found> = ArrayList@1399[1] { ResolutionCandidate@1400 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1401 {
     <name not found> = ArrayList@1402[1] { ResolutionCandidate@1403 }
-    <name not found> = ArrayList@1404[1] { ResolutionCandidate@1403 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1405 {
-    <name not found> = ArrayList@1406[1] { ResolutionCandidate@1407 }
-    <name not found> = ArrayList@1408[1] { ResolutionCandidate@1407 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1404 {
+    <name not found> = ArrayList@1405[1] { ResolutionCandidate@1406 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1409 {
-    <name not found> = ArrayList@1410[1] { ResolutionCandidate@1411 }
-    <name not found> = ArrayList@1412[1] { ResolutionCandidate@1411 }
+ResolutionTaskHolder@1407 {
+    <name not found> = ArrayList@1408[1] { ResolutionCandidate@1409 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1410 {
+    <name not found> = ArrayList@1411[1] { ResolutionCandidate@1412 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1413 {
     <name not found> = ArrayList@1414[1] { ResolutionCandidate@1415 }
-    <name not found> = ArrayList@1416[1] { ResolutionCandidate@1415 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1417 {
-    <name not found> = ArrayList@1418[1] { ResolutionCandidate@1419 }
-    <name not found> = ArrayList@1420[1] { ResolutionCandidate@1419 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1416 {
+    <name not found> = ArrayList@1417[1] { ResolutionCandidate@1418 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1421 {
-    <name not found> = ArrayList@1422[1] { ResolutionCandidate@1423 }
-    <name not found> = ArrayList@1424[1] { ResolutionCandidate@1423 }
+ResolutionTaskHolder@1419 {
+    <name not found> = ArrayList@1420[1] { ResolutionCandidate@1421 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1422 {
+    <name not found> = ArrayList@1423[1] { ResolutionCandidate@1424 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1425 {
     <name not found> = ArrayList@1426[1] { ResolutionCandidate@1427 }
-    <name not found> = ArrayList@1428[1] { ResolutionCandidate@1427 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1429 {
-    <name not found> = ArrayList@1430[1] { ResolutionCandidate@1431 }
-    <name not found> = ArrayList@1432[1] { ResolutionCandidate@1431 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1428 {
+    <name not found> = ArrayList@1429[1] { ResolutionCandidate@1430 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1433 {
-    <name not found> = ArrayList@1434[1] { ResolutionCandidate@1435 }
-    <name not found> = ArrayList@1436[1] { ResolutionCandidate@1435 }
+ResolutionTaskHolder@1431 {
+    <name not found> = ArrayList@1432[1] { ResolutionCandidate@1433 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1434 {
+    <name not found> = ArrayList@1435[1] { ResolutionCandidate@1436 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1437 {
     <name not found> = ArrayList@1438[1] { ResolutionCandidate@1439 }
-    <name not found> = ArrayList@1440[1] { ResolutionCandidate@1439 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1441 {
-    <name not found> = ArrayList@1442[1] { ResolutionCandidate@1443 }
-    <name not found> = ArrayList@1444[1] { ResolutionCandidate@1443 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1440 {
+    <name not found> = ArrayList@1441[1] { ResolutionCandidate@1442 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1445 {
-    <name not found> = ArrayList@1446[1] { ResolutionCandidate@1447 }
-    <name not found> = ArrayList@1448[1] { ResolutionCandidate@1447 }
+ResolutionTaskHolder@1443 {
+    <name not found> = ArrayList@1444[1] { ResolutionCandidate@1445 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1446 {
+    <name not found> = ArrayList@1447[1] { ResolutionCandidate@1448 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1449 {
     <name not found> = ArrayList@1450[1] { ResolutionCandidate@1451 }
-    <name not found> = ArrayList@1452[1] { ResolutionCandidate@1451 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1453 {
-    <name not found> = ArrayList@1454[1] { ResolutionCandidate@1455 }
-    <name not found> = ArrayList@1456[1] { ResolutionCandidate@1455 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1452 {
+    <name not found> = ArrayList@1453[1] { ResolutionCandidate@1454 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1457 {
-    <name not found> = ArrayList@1458[1] { ResolutionCandidate@1459 }
-    <name not found> = ArrayList@1460[1] { ResolutionCandidate@1459 }
+ResolutionTaskHolder@1455 {
+    <name not found> = ArrayList@1456[1] { ResolutionCandidate@1457 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1458 {
+    <name not found> = ArrayList@1459[1] { ResolutionCandidate@1460 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1461 {
     <name not found> = ArrayList@1462[1] { ResolutionCandidate@1463 }
-    <name not found> = ArrayList@1464[1] { ResolutionCandidate@1463 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1465 {
-    <name not found> = ArrayList@1466[1] { ResolutionCandidate@1467 }
-    <name not found> = ArrayList@1468[1] { ResolutionCandidate@1467 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1464 {
+    <name not found> = ArrayList@1465[1] { ResolutionCandidate@1466 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1469 {
-    <name not found> = ArrayList@1470[1] { ResolutionCandidate@1471 }
-    <name not found> = ArrayList@1472[1] { ResolutionCandidate@1471 }
+ResolutionTaskHolder@1467 {
+    <name not found> = ArrayList@1468[1] { ResolutionCandidate@1469 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1470 {
+    <name not found> = ArrayList@1471[1] { ResolutionCandidate@1472 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1473 {
     <name not found> = ArrayList@1474[1] { ResolutionCandidate@1475 }
-    <name not found> = ArrayList@1476[1] { ResolutionCandidate@1475 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1477 {
-    <name not found> = ArrayList@1478[1] { ResolutionCandidate@1479 }
-    <name not found> = ArrayList@1480[1] { ResolutionCandidate@1479 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1476 {
+    <name not found> = ArrayList@1477[1] { ResolutionCandidate@1478 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1481 {
-    <name not found> = ArrayList@1482[1] { ResolutionCandidate@1483 }
-    <name not found> = ArrayList@1484[1] { ResolutionCandidate@1483 }
+ResolutionTaskHolder@1479 {
+    <name not found> = ArrayList@1480[1] { ResolutionCandidate@1481 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1482 {
+    <name not found> = ArrayList@1483[1] { ResolutionCandidate@1484 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1485 {
     <name not found> = ArrayList@1486[1] { ResolutionCandidate@1487 }
-    <name not found> = ArrayList@1488[1] { ResolutionCandidate@1487 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1489 {
-    <name not found> = ArrayList@1490[1] { ResolutionCandidate@1491 }
-    <name not found> = ArrayList@1492[1] { ResolutionCandidate@1491 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1488 {
+    <name not found> = ArrayList@1489[1] { ResolutionCandidate@1490 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1493 {
-    <name not found> = ArrayList@1494[1] { ResolutionCandidate@1495 }
-    <name not found> = ArrayList@1496[1] { ResolutionCandidate@1495 }
+ResolutionTaskHolder@1491 {
+    <name not found> = ArrayList@1492[1] { ResolutionCandidate@1493 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1494 {
+    <name not found> = ArrayList@1495[1] { ResolutionCandidate@1496 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1497 {
     <name not found> = ArrayList@1498[1] { ResolutionCandidate@1499 }
-    <name not found> = ArrayList@1500[1] { ResolutionCandidate@1499 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1501 {
-    <name not found> = ArrayList@1502[1] { ResolutionCandidate@1503 }
-    <name not found> = ArrayList@1504[1] { ResolutionCandidate@1503 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1500 {
+    <name not found> = ArrayList@1501[1] { ResolutionCandidate@1502 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1505 {
-    <name not found> = ArrayList@1506[1] { ResolutionCandidate@1507 }
-    <name not found> = ArrayList@1508[1] { ResolutionCandidate@1507 }
+ResolutionTaskHolder@1503 {
+    <name not found> = ArrayList@1504[1] { ResolutionCandidate@1505 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1506 {
+    <name not found> = ArrayList@1507[1] { ResolutionCandidate@1508 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1509 {
     <name not found> = ArrayList@1510[1] { ResolutionCandidate@1511 }
-    <name not found> = ArrayList@1512[1] { ResolutionCandidate@1511 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1513 {
-    <name not found> = ArrayList@1514[1] { ResolutionCandidate@1515 }
-    <name not found> = ArrayList@1516[1] { ResolutionCandidate@1515 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1512 {
+    <name not found> = ArrayList@1513[1] { ResolutionCandidate@1514 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1517 {
-    <name not found> = ArrayList@1518[1] { ResolutionCandidate@1519 }
-    <name not found> = ArrayList@1520[1] { ResolutionCandidate@1519 }
+ResolutionTaskHolder@1515 {
+    <name not found> = ArrayList@1516[1] { ResolutionCandidate@1517 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1518 {
+    <name not found> = ArrayList@1519[1] { ResolutionCandidate@1520 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1521 {
     <name not found> = ArrayList@1522[1] { ResolutionCandidate@1523 }
-    <name not found> = ArrayList@1524[1] { ResolutionCandidate@1523 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1525 {
-    <name not found> = ArrayList@1526[1] { ResolutionCandidate@1527 }
-    <name not found> = ArrayList@1528[1] { ResolutionCandidate@1527 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1524 {
+    <name not found> = ArrayList@1525[1] { ResolutionCandidate@1526 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1529 {
-    <name not found> = ArrayList@1530[1] { ResolutionCandidate@1531 }
-    <name not found> = ArrayList@1532[1] { ResolutionCandidate@1531 }
+ResolutionTaskHolder@1527 {
+    <name not found> = ArrayList@1528[1] { ResolutionCandidate@1529 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1530 {
+    <name not found> = ArrayList@1531[1] { ResolutionCandidate@1532 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1533 {
     <name not found> = ArrayList@1534[1] { ResolutionCandidate@1535 }
-    <name not found> = ArrayList@1536[1] { ResolutionCandidate@1535 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1537 {
-    <name not found> = ArrayList@1538[1] { ResolutionCandidate@1539 }
-    <name not found> = ArrayList@1540[1] { ResolutionCandidate@1539 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1536 {
+    <name not found> = ArrayList@1537[1] { ResolutionCandidate@1538 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1541 {
-    <name not found> = ArrayList@1542[1] { ResolutionCandidate@1543 }
-    <name not found> = ArrayList@1544[1] { ResolutionCandidate@1543 }
+ResolutionTaskHolder@1539 {
+    <name not found> = ArrayList@1540[1] { ResolutionCandidate@1541 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1542 {
+    <name not found> = ArrayList@1543[1] { ResolutionCandidate@1544 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1545 {
     <name not found> = ArrayList@1546[1] { ResolutionCandidate@1547 }
-    <name not found> = ArrayList@1548[1] { ResolutionCandidate@1547 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1549 {
-    <name not found> = ArrayList@1550[1] { ResolutionCandidate@1551 }
-    <name not found> = ArrayList@1552[1] { ResolutionCandidate@1551 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1548 {
+    <name not found> = ArrayList@1549[1] { ResolutionCandidate@1550 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1553 {
-    <name not found> = ArrayList@1554[1] { ResolutionCandidate@1555 }
-    <name not found> = ArrayList@1556[1] { ResolutionCandidate@1555 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1551 {
+    <name not found> = ArrayList@1552[1] { ResolutionCandidate@1553 }
     <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1554 {
+    <name not found> = ArrayList@1555[1] { ResolutionCandidate@1556 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1557 {
     <name not found> = ArrayList@1558[1] { ResolutionCandidate@1559 }
-    <name not found> = ArrayList@1560[1] { ResolutionCandidate@1559 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1561 {
-    <name not found> = ArrayList@1562[1] { ResolutionCandidate@1563 }
-    <name not found> = ArrayList@1564[1] { ResolutionCandidate@1563 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1560 {
+    <name not found> = ArrayList@1561[1] { ResolutionCandidate@1562 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1565 {
-    <name not found> = ArrayList@1566[1] { ResolutionCandidate@1567 }
-    <name not found> = ArrayList@1568[1] { ResolutionCandidate@1567 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1563 {
+    <name not found> = ArrayList@1564[1] { ResolutionCandidate@1565 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1566 {
+    <name not found> = ArrayList@1567[1] { ResolutionCandidate@1568 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1569 {
     <name not found> = ArrayList@1570[1] { ResolutionCandidate@1571 }
-    <name not found> = ArrayList@1572[1] { ResolutionCandidate@1571 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1573 {
-    <name not found> = ArrayList@1574[1] { ResolutionCandidate@1575 }
-    <name not found> = ArrayList@1576[1] { ResolutionCandidate@1575 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1572 {
+    <name not found> = ArrayList@1573[1] { ResolutionCandidate@1574 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1577 {
-    <name not found> = ArrayList@1578[1] { ResolutionCandidate@1579 }
-    <name not found> = ArrayList@1580[1] { ResolutionCandidate@1579 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1575 {
+    <name not found> = ArrayList@1576[1] { ResolutionCandidate@1577 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1578 {
+    <name not found> = ArrayList@1579[1] { ResolutionCandidate@1580 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1581 {
     <name not found> = ArrayList@1582[1] { ResolutionCandidate@1583 }
-    <name not found> = ArrayList@1584[1] { ResolutionCandidate@1583 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1585 {
-    <name not found> = ArrayList@1586[1] { ResolutionCandidate@1587 }
-    <name not found> = ArrayList@1588[1] { ResolutionCandidate@1587 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1584 {
+    <name not found> = ArrayList@1585[1] { ResolutionCandidate@1586 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1589 {
-    <name not found> = ArrayList@1590[1] { ResolutionCandidate@1591 }
-    <name not found> = ArrayList@1592[1] { ResolutionCandidate@1591 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1587 {
+    <name not found> = ArrayList@1588[1] { ResolutionCandidate@1589 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1590 {
+    <name not found> = ArrayList@1591[1] { ResolutionCandidate@1592 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1593 {
     <name not found> = ArrayList@1594[1] { ResolutionCandidate@1595 }
-    <name not found> = ArrayList@1596[1] { ResolutionCandidate@1595 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1597 {
-    <name not found> = ArrayList@1598[1] { ResolutionCandidate@1599 }
-    <name not found> = ArrayList@1600[1] { ResolutionCandidate@1599 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1596 {
+    <name not found> = ArrayList@1597[1] { ResolutionCandidate@1598 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1601 {
-    <name not found> = ArrayList@1602[1] { ResolutionCandidate@1603 }
-    <name not found> = ArrayList@1604[1] { ResolutionCandidate@1603 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1599 {
+    <name not found> = ArrayList@1600[1] { ResolutionCandidate@1601 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1602 {
+    <name not found> = ArrayList@1603[1] { ResolutionCandidate@1604 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1605 {
     <name not found> = ArrayList@1606[1] { ResolutionCandidate@1607 }
-    <name not found> = ArrayList@1608[1] { ResolutionCandidate@1607 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1609 {
-    <name not found> = ArrayList@1610[1] { ResolutionCandidate@1611 }
-    <name not found> = ArrayList@1612[1] { ResolutionCandidate@1611 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1608 {
+    <name not found> = ArrayList@1609[1] { ResolutionCandidate@1610 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1613 {
-    <name not found> = ArrayList@1614[1] { ResolutionCandidate@1615 }
-    <name not found> = ArrayList@1616[1] { ResolutionCandidate@1615 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1611 {
+    <name not found> = ArrayList@1612[1] { ResolutionCandidate@1613 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1614 {
+    <name not found> = ArrayList@1615[1] { ResolutionCandidate@1616 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1617 {
     <name not found> = ArrayList@1618[1] { ResolutionCandidate@1619 }
-    <name not found> = ArrayList@1620[1] { ResolutionCandidate@1619 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1621 {
-    <name not found> = ArrayList@1622[1] { ResolutionCandidate@1623 }
-    <name not found> = ArrayList@1624[1] { ResolutionCandidate@1623 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1620 {
+    <name not found> = ArrayList@1621[1] { ResolutionCandidate@1622 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1625 {
-    <name not found> = ArrayList@1626[1] { ResolutionCandidate@1627 }
-    <name not found> = ArrayList@1628[1] { ResolutionCandidate@1627 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1623 {
+    <name not found> = ArrayList@1624[1] { ResolutionCandidate@1625 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1626 {
+    <name not found> = ArrayList@1627[1] { ResolutionCandidate@1628 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1629 {
     <name not found> = ArrayList@1630[1] { ResolutionCandidate@1631 }
-    <name not found> = ArrayList@1632[1] { ResolutionCandidate@1631 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1633 {
-    <name not found> = ArrayList@1634[1] { ResolutionCandidate@1635 }
-    <name not found> = ArrayList@1636[1] { ResolutionCandidate@1635 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1632 {
+    <name not found> = ArrayList@1633[1] { ResolutionCandidate@1634 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1637 {
-    <name not found> = ArrayList@1638[1] { ResolutionCandidate@1639 }
-    <name not found> = ArrayList@1640[1] { ResolutionCandidate@1639 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1635 {
+    <name not found> = ArrayList@1636[1] { ResolutionCandidate@1637 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1638 {
+    <name not found> = ArrayList@1639[1] { ResolutionCandidate@1640 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1641 {
     <name not found> = ArrayList@1642[1] { ResolutionCandidate@1643 }
-    <name not found> = ArrayList@1644[1] { ResolutionCandidate@1643 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1645 {
-    <name not found> = ArrayList@1646[1] { ResolutionCandidate@1647 }
-    <name not found> = ArrayList@1648[1] { ResolutionCandidate@1647 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1644 {
+    <name not found> = ArrayList@1645[1] { ResolutionCandidate@1646 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1649 {
-    <name not found> = ArrayList@1650[1] { ResolutionCandidate@1651 }
-    <name not found> = ArrayList@1652[1] { ResolutionCandidate@1651 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1647 {
+    <name not found> = ArrayList@1648[1] { ResolutionCandidate@1649 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1650 {
+    <name not found> = ArrayList@1651[1] { ResolutionCandidate@1652 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1653 {
     <name not found> = ArrayList@1654[1] { ResolutionCandidate@1655 }
-    <name not found> = ArrayList@1656[1] { ResolutionCandidate@1655 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1657 {
-    <name not found> = ArrayList@1658[1] { ResolutionCandidate@1659 }
-    <name not found> = ArrayList@1660[1] { ResolutionCandidate@1659 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1656 {
+    <name not found> = ArrayList@1657[1] { ResolutionCandidate@1658 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1661 {
-    <name not found> = ArrayList@1662[1] { ResolutionCandidate@1663 }
-    <name not found> = ArrayList@1664[1] { ResolutionCandidate@1663 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1659 {
+    <name not found> = ArrayList@1660[1] { ResolutionCandidate@1661 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1662 {
+    <name not found> = ArrayList@1663[1] { ResolutionCandidate@1664 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1665 {
     <name not found> = ArrayList@1666[1] { ResolutionCandidate@1667 }
-    <name not found> = ArrayList@1668[1] { ResolutionCandidate@1667 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1669 {
-    <name not found> = ArrayList@1670[1] { ResolutionCandidate@1671 }
-    <name not found> = ArrayList@1672[1] { ResolutionCandidate@1671 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1668 {
+    <name not found> = ArrayList@1669[1] { ResolutionCandidate@1670 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1673 {
-    <name not found> = ArrayList@1674[1] { ResolutionCandidate@1675 }
-    <name not found> = ArrayList@1676[1] { ResolutionCandidate@1675 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1671 {
+    <name not found> = ArrayList@1672[1] { ResolutionCandidate@1673 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1674 {
+    <name not found> = ArrayList@1675[1] { ResolutionCandidate@1676 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1677 {
     <name not found> = ArrayList@1678[1] { ResolutionCandidate@1679 }
-    <name not found> = ArrayList@1680[1] { ResolutionCandidate@1679 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1681 {
-    <name not found> = ArrayList@1682[1] { ResolutionCandidate@1683 }
-    <name not found> = ArrayList@1684[1] { ResolutionCandidate@1683 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1680 {
+    <name not found> = ArrayList@1681[1] { ResolutionCandidate@1682 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1685 {
-    <name not found> = ArrayList@1686[1] { ResolutionCandidate@1687 }
-    <name not found> = ArrayList@1688[1] { ResolutionCandidate@1687 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1683 {
+    <name not found> = ArrayList@1684[1] { ResolutionCandidate@1685 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1686 {
+    <name not found> = ArrayList@1687[1] { ResolutionCandidate@1688 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1689 {
     <name not found> = ArrayList@1690[1] { ResolutionCandidate@1691 }
-    <name not found> = ArrayList@1692[1] { ResolutionCandidate@1691 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1693 {
-    <name not found> = ArrayList@1694[1] { ResolutionCandidate@1695 }
-    <name not found> = ArrayList@1696[1] { ResolutionCandidate@1695 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1692 {
+    <name not found> = ArrayList@1693[1] { ResolutionCandidate@1694 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1697 {
-    <name not found> = ArrayList@1698[1] { ResolutionCandidate@1699 }
-    <name not found> = ArrayList@1700[1] { ResolutionCandidate@1699 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1695 {
+    <name not found> = ArrayList@1696[1] { ResolutionCandidate@1697 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1698 {
+    <name not found> = ArrayList@1699[1] { ResolutionCandidate@1700 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1701 {
     <name not found> = ArrayList@1702[1] { ResolutionCandidate@1703 }
-    <name not found> = ArrayList@1704[1] { ResolutionCandidate@1703 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1705 {
-    <name not found> = ArrayList@1706[1] { ResolutionCandidate@1707 }
-    <name not found> = ArrayList@1708[1] { ResolutionCandidate@1707 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1704 {
+    <name not found> = ArrayList@1705[1] { ResolutionCandidate@1706 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1709 {
-    <name not found> = ArrayList@1710[1] { ResolutionCandidate@1711 }
-    <name not found> = ArrayList@1712[1] { ResolutionCandidate@1711 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1707 {
+    <name not found> = ArrayList@1708[1] { ResolutionCandidate@1709 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1710 {
+    <name not found> = ArrayList@1711[1] { ResolutionCandidate@1712 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1713 {
     <name not found> = ArrayList@1714[1] { ResolutionCandidate@1715 }
-    <name not found> = ArrayList@1716[1] { ResolutionCandidate@1715 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1717 {
-    <name not found> = ArrayList@1718[1] { ResolutionCandidate@1719 }
-    <name not found> = ArrayList@1720[1] { ResolutionCandidate@1719 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1716 {
+    <name not found> = ArrayList@1717[1] { ResolutionCandidate@1718 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1721 {
-    <name not found> = ArrayList@1722[1] { ResolutionCandidate@1723 }
-    <name not found> = ArrayList@1724[1] { ResolutionCandidate@1723 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1719 {
+    <name not found> = ArrayList@1720[1] { ResolutionCandidate@1721 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1722 {
+    <name not found> = ArrayList@1723[1] { ResolutionCandidate@1724 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1725 {
     <name not found> = ArrayList@1726[1] { ResolutionCandidate@1727 }
-    <name not found> = ArrayList@1728[1] { ResolutionCandidate@1727 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1729 {
-    <name not found> = ArrayList@1730[1] { ResolutionCandidate@1731 }
-    <name not found> = ArrayList@1732[1] { ResolutionCandidate@1731 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1728 {
+    <name not found> = ArrayList@1729[1] { ResolutionCandidate@1730 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1733 {
-    <name not found> = ArrayList@1734[1] { ResolutionCandidate@1735 }
-    <name not found> = ArrayList@1736[1] { ResolutionCandidate@1735 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1731 {
+    <name not found> = ArrayList@1732[1] { ResolutionCandidate@1733 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1734 {
+    <name not found> = ArrayList@1735[1] { ResolutionCandidate@1736 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1737 {
     <name not found> = ArrayList@1738[1] { ResolutionCandidate@1739 }
-    <name not found> = ArrayList@1740[1] { ResolutionCandidate@1739 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1741 {
-    <name not found> = ArrayList@1742[1] { ResolutionCandidate@1743 }
-    <name not found> = ArrayList@1744[1] { ResolutionCandidate@1743 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1740 {
+    <name not found> = ArrayList@1741[1] { ResolutionCandidate@1742 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1745 {
-    <name not found> = ArrayList@1746[1] { ResolutionCandidate@1747 }
-    <name not found> = ArrayList@1748[1] { ResolutionCandidate@1747 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1743 {
+    <name not found> = ArrayList@1744[1] { ResolutionCandidate@1745 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1746 {
+    <name not found> = ArrayList@1747[1] { ResolutionCandidate@1748 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1749 {
     <name not found> = ArrayList@1750[1] { ResolutionCandidate@1751 }
-    <name not found> = ArrayList@1752[1] { ResolutionCandidate@1751 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1753 {
-    <name not found> = ArrayList@1754[1] { ResolutionCandidate@1755 }
-    <name not found> = ArrayList@1756[1] { ResolutionCandidate@1755 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1752 {
+    <name not found> = ArrayList@1753[1] { ResolutionCandidate@1754 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1757 {
-    <name not found> = ArrayList@1758[1] { ResolutionCandidate@1759 }
-    <name not found> = ArrayList@1760[1] { ResolutionCandidate@1759 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1755 {
+    <name not found> = ArrayList@1756[1] { ResolutionCandidate@1757 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1758 {
+    <name not found> = ArrayList@1759[1] { ResolutionCandidate@1760 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1761 {
     <name not found> = ArrayList@1762[1] { ResolutionCandidate@1763 }
-    <name not found> = ArrayList@1764[1] { ResolutionCandidate@1763 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1765 {
-    <name not found> = ArrayList@1766[1] { ResolutionCandidate@1767 }
-    <name not found> = ArrayList@1768[1] { ResolutionCandidate@1767 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1764 {
+    <name not found> = ArrayList@1765[1] { ResolutionCandidate@1766 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1769 {
-    <name not found> = ArrayList@1770[1] { ResolutionCandidate@1771 }
-    <name not found> = ArrayList@1772[1] { ResolutionCandidate@1771 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1767 {
+    <name not found> = ArrayList@1768[1] { ResolutionCandidate@1769 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1770 {
+    <name not found> = ArrayList@1771[1] { ResolutionCandidate@1772 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1773 {
     <name not found> = ArrayList@1774[1] { ResolutionCandidate@1775 }
-    <name not found> = ArrayList@1776[1] { ResolutionCandidate@1775 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1777 {
-    <name not found> = ArrayList@1778[1] { ResolutionCandidate@1779 }
-    <name not found> = ArrayList@1780[1] { ResolutionCandidate@1779 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1776 {
+    <name not found> = ArrayList@1777[1] { ResolutionCandidate@1778 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1781 {
-    <name not found> = ArrayList@1782[1] { ResolutionCandidate@1783 }
-    <name not found> = ArrayList@1784[1] { ResolutionCandidate@1783 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1779 {
+    <name not found> = ArrayList@1780[1] { ResolutionCandidate@1781 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1782 {
+    <name not found> = ArrayList@1783[1] { ResolutionCandidate@1784 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1785 {
     <name not found> = ArrayList@1786[1] { ResolutionCandidate@1787 }
-    <name not found> = ArrayList@1788[1] { ResolutionCandidate@1787 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1789 {
-    <name not found> = ArrayList@1790[1] { ResolutionCandidate@1791 }
-    <name not found> = ArrayList@1792[1] { ResolutionCandidate@1791 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1788 {
+    <name not found> = ArrayList@1789[1] { ResolutionCandidate@1790 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1793 {
-    <name not found> = ArrayList@1794[1] { ResolutionCandidate@1795 }
-    <name not found> = ArrayList@1796[1] { ResolutionCandidate@1795 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1791 {
+    <name not found> = ArrayList@1792[1] { ResolutionCandidate@1793 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1794 {
+    <name not found> = ArrayList@1795[1] { ResolutionCandidate@1796 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1797 {
     <name not found> = ArrayList@1798[1] { ResolutionCandidate@1799 }
-    <name not found> = ArrayList@1800[1] { ResolutionCandidate@1799 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1801 {
-    <name not found> = ArrayList@1802[1] { ResolutionCandidate@1803 }
-    <name not found> = ArrayList@1804[1] { ResolutionCandidate@1803 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1800 {
+    <name not found> = ArrayList@1801[1] { ResolutionCandidate@1802 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1805 {
-    <name not found> = ArrayList@1806[1] { ResolutionCandidate@1807 }
-    <name not found> = ArrayList@1808[1] { ResolutionCandidate@1807 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1803 {
+    <name not found> = ArrayList@1804[1] { ResolutionCandidate@1805 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1806 {
+    <name not found> = ArrayList@1807[1] { ResolutionCandidate@1808 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1809 {
     <name not found> = ArrayList@1810[1] { ResolutionCandidate@1811 }
-    <name not found> = ArrayList@1812[1] { ResolutionCandidate@1811 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1813 {
-    <name not found> = ArrayList@1814[1] { ResolutionCandidate@1815 }
-    <name not found> = ArrayList@1816[1] { ResolutionCandidate@1815 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1812 {
+    <name not found> = ArrayList@1813[1] { ResolutionCandidate@1814 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1817 {
-    <name not found> = ArrayList@1818[1] { ResolutionCandidate@1819 }
-    <name not found> = ArrayList@1820[1] { ResolutionCandidate@1819 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1815 {
+    <name not found> = ArrayList@1816[1] { ResolutionCandidate@1817 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1818 {
+    <name not found> = ArrayList@1819[1] { ResolutionCandidate@1820 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1821 {
     <name not found> = ArrayList@1822[1] { ResolutionCandidate@1823 }
-    <name not found> = ArrayList@1824[1] { ResolutionCandidate@1823 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1825 {
-    <name not found> = ArrayList@1826[1] { ResolutionCandidate@1827 }
-    <name not found> = ArrayList@1828[1] { ResolutionCandidate@1827 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1824 {
+    <name not found> = ArrayList@1825[1] { ResolutionCandidate@1826 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1829 {
-    <name not found> = ArrayList@1830[1] { ResolutionCandidate@1831 }
-    <name not found> = ArrayList@1832[1] { ResolutionCandidate@1831 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1827 {
+    <name not found> = ArrayList@1828[1] { ResolutionCandidate@1829 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1830 {
+    <name not found> = ArrayList@1831[1] { ResolutionCandidate@1832 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1833 {
     <name not found> = ArrayList@1834[1] { ResolutionCandidate@1835 }
-    <name not found> = ArrayList@1836[1] { ResolutionCandidate@1835 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1837 {
-    <name not found> = ArrayList@1838[1] { ResolutionCandidate@1839 }
-    <name not found> = ArrayList@1840[1] { ResolutionCandidate@1839 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1836 {
+    <name not found> = ArrayList@1837[1] { ResolutionCandidate@1838 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1841 {
-    <name not found> = ArrayList@1842[1] { ResolutionCandidate@1843 }
-    <name not found> = ArrayList@1844[1] { ResolutionCandidate@1843 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1839 {
+    <name not found> = ArrayList@1840[1] { ResolutionCandidate@1841 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1842 {
+    <name not found> = ArrayList@1843[1] { ResolutionCandidate@1844 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1845 {
     <name not found> = ArrayList@1846[1] { ResolutionCandidate@1847 }
-    <name not found> = ArrayList@1848[1] { ResolutionCandidate@1847 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1849 {
-    <name not found> = ArrayList@1850[1] { ResolutionCandidate@1851 }
-    <name not found> = ArrayList@1852[1] { ResolutionCandidate@1851 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1848 {
+    <name not found> = ArrayList@1849[1] { ResolutionCandidate@1850 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1853 {
-    <name not found> = ArrayList@1854[1] { ResolutionCandidate@1855 }
-    <name not found> = ArrayList@1856[1] { ResolutionCandidate@1855 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1851 {
+    <name not found> = ArrayList@1852[1] { ResolutionCandidate@1853 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1854 {
+    <name not found> = ArrayList@1855[1] { ResolutionCandidate@1856 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1857 {
     <name not found> = ArrayList@1858[1] { ResolutionCandidate@1859 }
-    <name not found> = ArrayList@1860[1] { ResolutionCandidate@1859 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1861 {
-    <name not found> = ArrayList@1862[1] { ResolutionCandidate@1863 }
-    <name not found> = ArrayList@1864[1] { ResolutionCandidate@1863 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1860 {
+    <name not found> = ArrayList@1861[1] { ResolutionCandidate@1862 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1865 {
-    <name not found> = ArrayList@1866[1] { ResolutionCandidate@1867 }
-    <name not found> = ArrayList@1868[1] { ResolutionCandidate@1867 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1863 {
+    <name not found> = ArrayList@1864[1] { ResolutionCandidate@1865 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1866 {
+    <name not found> = ArrayList@1867[1] { ResolutionCandidate@1868 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1869 {
     <name not found> = ArrayList@1870[1] { ResolutionCandidate@1871 }
-    <name not found> = ArrayList@1872[1] { ResolutionCandidate@1871 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1873 {
-    <name not found> = ArrayList@1874[1] { ResolutionCandidate@1875 }
-    <name not found> = ArrayList@1876[1] { ResolutionCandidate@1875 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1872 {
+    <name not found> = ArrayList@1873[1] { ResolutionCandidate@1874 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1877 {
-    <name not found> = ArrayList@1878[1] { ResolutionCandidate@1879 }
-    <name not found> = ArrayList@1880[1] { ResolutionCandidate@1879 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1875 {
+    <name not found> = ArrayList@1876[1] { ResolutionCandidate@1877 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1878 {
+    <name not found> = ArrayList@1879[1] { ResolutionCandidate@1880 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1881 {
     <name not found> = ArrayList@1882[1] { ResolutionCandidate@1883 }
-    <name not found> = ArrayList@1884[1] { ResolutionCandidate@1883 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1885 {
-    <name not found> = ArrayList@1886[1] { ResolutionCandidate@1887 }
-    <name not found> = ArrayList@1888[1] { ResolutionCandidate@1887 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1884 {
+    <name not found> = ArrayList@1885[1] { ResolutionCandidate@1886 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1889 {
-    <name not found> = ArrayList@1890[1] { ResolutionCandidate@1891 }
-    <name not found> = ArrayList@1892[1] { ResolutionCandidate@1891 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1887 {
+    <name not found> = ArrayList@1888[1] { ResolutionCandidate@1889 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1890 {
+    <name not found> = ArrayList@1891[1] { ResolutionCandidate@1892 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1893 {
     <name not found> = ArrayList@1894[1] { ResolutionCandidate@1895 }
-    <name not found> = ArrayList@1896[1] { ResolutionCandidate@1895 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1897 {
-    <name not found> = ArrayList@1898[1] { ResolutionCandidate@1899 }
-    <name not found> = ArrayList@1900[1] { ResolutionCandidate@1899 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1896 {
+    <name not found> = ArrayList@1897[1] { ResolutionCandidate@1898 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1901 {
-    <name not found> = ArrayList@1902[1] { ResolutionCandidate@1903 }
-    <name not found> = ArrayList@1904[1] { ResolutionCandidate@1903 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1899 {
+    <name not found> = ArrayList@1900[1] { ResolutionCandidate@1901 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1902 {
+    <name not found> = ArrayList@1903[1] { ResolutionCandidate@1904 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1905 {
     <name not found> = ArrayList@1906[1] { ResolutionCandidate@1907 }
-    <name not found> = ArrayList@1908[1] { ResolutionCandidate@1907 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1909 {
-    <name not found> = ArrayList@1910[1] { ResolutionCandidate@1911 }
-    <name not found> = ArrayList@1912[1] { ResolutionCandidate@1911 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1908 {
+    <name not found> = ArrayList@1909[1] { ResolutionCandidate@1910 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1913 {
-    <name not found> = ArrayList@1914[1] { ResolutionCandidate@1915 }
-    <name not found> = ArrayList@1916[1] { ResolutionCandidate@1915 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1911 {
+    <name not found> = ArrayList@1912[1] { ResolutionCandidate@1913 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1914 {
+    <name not found> = ArrayList@1915[1] { ResolutionCandidate@1916 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1917 {
     <name not found> = ArrayList@1918[1] { ResolutionCandidate@1919 }
-    <name not found> = ArrayList@1920[1] { ResolutionCandidate@1919 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1921 {
-    <name not found> = ArrayList@1922[1] { ResolutionCandidate@1923 }
-    <name not found> = ArrayList@1924[1] { ResolutionCandidate@1923 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1920 {
+    <name not found> = ArrayList@1921[1] { ResolutionCandidate@1922 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1925 {
-    <name not found> = ArrayList@1926[1] { ResolutionCandidate@1927 }
-    <name not found> = ArrayList@1928[1] { ResolutionCandidate@1927 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1923 {
+    <name not found> = ArrayList@1924[1] { ResolutionCandidate@1925 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1926 {
+    <name not found> = ArrayList@1927[1] { ResolutionCandidate@1928 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1929 {
     <name not found> = ArrayList@1930[1] { ResolutionCandidate@1931 }
-    <name not found> = ArrayList@1932[1] { ResolutionCandidate@1931 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1933 {
-    <name not found> = ArrayList@1934[1] { ResolutionCandidate@1935 }
-    <name not found> = ArrayList@1936[1] { ResolutionCandidate@1935 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1932 {
+    <name not found> = ArrayList@1933[1] { ResolutionCandidate@1934 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1937 {
-    <name not found> = ArrayList@1938[1] { ResolutionCandidate@1939 }
-    <name not found> = ArrayList@1940[1] { ResolutionCandidate@1939 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1935 {
+    <name not found> = ArrayList@1936[1] { ResolutionCandidate@1937 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1938 {
+    <name not found> = ArrayList@1939[1] { ResolutionCandidate@1940 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1941 {
     <name not found> = ArrayList@1942[1] { ResolutionCandidate@1943 }
-    <name not found> = ArrayList@1944[1] { ResolutionCandidate@1943 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1945 {
-    <name not found> = ArrayList@1946[1] { ResolutionCandidate@1947 }
-    <name not found> = ArrayList@1948[1] { ResolutionCandidate@1947 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1944 {
+    <name not found> = ArrayList@1945[1] { ResolutionCandidate@1946 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1949 {
-    <name not found> = ArrayList@1950[1] { ResolutionCandidate@1951 }
-    <name not found> = ArrayList@1952[1] { ResolutionCandidate@1951 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1947 {
+    <name not found> = ArrayList@1948[1] { ResolutionCandidate@1949 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1950 {
+    <name not found> = ArrayList@1951[1] { ResolutionCandidate@1952 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1953 {
     <name not found> = ArrayList@1954[1] { ResolutionCandidate@1955 }
-    <name not found> = ArrayList@1956[1] { ResolutionCandidate@1955 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1957 {
-    <name not found> = ArrayList@1958[1] { ResolutionCandidate@1959 }
-    <name not found> = ArrayList@1960[1] { ResolutionCandidate@1959 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1956 {
+    <name not found> = ArrayList@1957[1] { ResolutionCandidate@1958 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1961 {
-    <name not found> = ArrayList@1962[1] { ResolutionCandidate@1963 }
-    <name not found> = ArrayList@1964[1] { ResolutionCandidate@1963 }
+ResolutionTaskHolder@1959 {
+    <name not found> = ArrayList@1960[1] { ResolutionCandidate@1961 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1962 {
+    <name not found> = ArrayList@1963[1] { ResolutionCandidate@1964 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1965 {
     <name not found> = ArrayList@1966[1] { ResolutionCandidate@1967 }
-    <name not found> = ArrayList@1968[1] { ResolutionCandidate@1967 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1969 {
-    <name not found> = ArrayList@1970[1] { ResolutionCandidate@1971 }
-    <name not found> = ArrayList@1972[1] { ResolutionCandidate@1971 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1968 {
+    <name not found> = ArrayList@1969[1] { ResolutionCandidate@1970 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1973 {
-    <name not found> = ArrayList@1974[1] { ResolutionCandidate@1975 }
-    <name not found> = ArrayList@1976[1] { ResolutionCandidate@1975 }
+ResolutionTaskHolder@1971 {
+    <name not found> = ArrayList@1972[1] { ResolutionCandidate@1973 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1974 {
+    <name not found> = ArrayList@1975[1] { ResolutionCandidate@1976 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1977 {
     <name not found> = ArrayList@1978[1] { ResolutionCandidate@1979 }
-    <name not found> = ArrayList@1980[1] { ResolutionCandidate@1979 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1981 {
-    <name not found> = ArrayList@1982[1] { ResolutionCandidate@1983 }
-    <name not found> = ArrayList@1984[1] { ResolutionCandidate@1983 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1980 {
+    <name not found> = ArrayList@1981[1] { ResolutionCandidate@1982 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1985 {
-    <name not found> = ArrayList@1986[1] { ResolutionCandidate@1987 }
-    <name not found> = ArrayList@1988[1] { ResolutionCandidate@1987 }
+ResolutionTaskHolder@1983 {
+    <name not found> = ArrayList@1984[1] { ResolutionCandidate@1985 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1986 {
+    <name not found> = ArrayList@1987[1] { ResolutionCandidate@1988 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@1989 {
     <name not found> = ArrayList@1990[1] { ResolutionCandidate@1991 }
-    <name not found> = ArrayList@1992[1] { ResolutionCandidate@1991 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1993 {
-    <name not found> = ArrayList@1994[1] { ResolutionCandidate@1995 }
-    <name not found> = ArrayList@1996[1] { ResolutionCandidate@1995 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@1992 {
+    <name not found> = ArrayList@1993[1] { ResolutionCandidate@1994 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@1997 {
-    <name not found> = ArrayList@1998[1] { ResolutionCandidate@1999 }
-    <name not found> = ArrayList@2000[1] { ResolutionCandidate@1999 }
+ResolutionTaskHolder@1995 {
+    <name not found> = ArrayList@1996[1] { ResolutionCandidate@1997 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1998 {
+    <name not found> = ArrayList@1999[1] { ResolutionCandidate@2000 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2001 {
     <name not found> = ArrayList@2002[1] { ResolutionCandidate@2003 }
-    <name not found> = ArrayList@2004[1] { ResolutionCandidate@2003 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2005 {
-    <name not found> = ArrayList@2006[1] { ResolutionCandidate@2007 }
-    <name not found> = ArrayList@2008[1] { ResolutionCandidate@2007 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2004 {
+    <name not found> = ArrayList@2005[1] { ResolutionCandidate@2006 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2009 {
-    <name not found> = ArrayList@2010[1] { ResolutionCandidate@2011 }
-    <name not found> = ArrayList@2012[1] { ResolutionCandidate@2011 }
+ResolutionTaskHolder@2007 {
+    <name not found> = ArrayList@2008[1] { ResolutionCandidate@2009 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2010 {
+    <name not found> = ArrayList@2011[1] { ResolutionCandidate@2012 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2013 {
     <name not found> = ArrayList@2014[1] { ResolutionCandidate@2015 }
-    <name not found> = ArrayList@2016[1] { ResolutionCandidate@2015 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2017 {
-    <name not found> = ArrayList@2018[1] { ResolutionCandidate@2019 }
-    <name not found> = ArrayList@2020[1] { ResolutionCandidate@2019 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2016 {
+    <name not found> = ArrayList@2017[1] { ResolutionCandidate@2018 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2021 {
-    <name not found> = ArrayList@2022[1] { ResolutionCandidate@2023 }
-    <name not found> = ArrayList@2024[1] { ResolutionCandidate@2023 }
+ResolutionTaskHolder@2019 {
+    <name not found> = ArrayList@2020[1] { ResolutionCandidate@2021 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2022 {
+    <name not found> = ArrayList@2023[1] { ResolutionCandidate@2024 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2025 {
     <name not found> = ArrayList@2026[1] { ResolutionCandidate@2027 }
-    <name not found> = ArrayList@2028[1] { ResolutionCandidate@2027 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2029 {
-    <name not found> = ArrayList@2030[1] { ResolutionCandidate@2031 }
-    <name not found> = ArrayList@2032[1] { ResolutionCandidate@2031 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2028 {
+    <name not found> = ArrayList@2029[1] { ResolutionCandidate@2030 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2033 {
-    <name not found> = ArrayList@2034[1] { ResolutionCandidate@2035 }
-    <name not found> = ArrayList@2036[1] { ResolutionCandidate@2035 }
+ResolutionTaskHolder@2031 {
+    <name not found> = ArrayList@2032[1] { ResolutionCandidate@2033 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2034 {
+    <name not found> = ArrayList@2035[1] { ResolutionCandidate@2036 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2037 {
     <name not found> = ArrayList@2038[1] { ResolutionCandidate@2039 }
-    <name not found> = ArrayList@2040[1] { ResolutionCandidate@2039 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2041 {
-    <name not found> = ArrayList@2042[1] { ResolutionCandidate@2043 }
-    <name not found> = ArrayList@2044[1] { ResolutionCandidate@2043 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2040 {
+    <name not found> = ArrayList@2041[1] { ResolutionCandidate@2042 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2045 {
-    <name not found> = ArrayList@2046[1] { ResolutionCandidate@2047 }
-    <name not found> = ArrayList@2048[1] { ResolutionCandidate@2047 }
+ResolutionTaskHolder@2043 {
+    <name not found> = ArrayList@2044[1] { ResolutionCandidate@2045 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2046 {
+    <name not found> = ArrayList@2047[1] { ResolutionCandidate@2048 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2049 {
     <name not found> = ArrayList@2050[1] { ResolutionCandidate@2051 }
-    <name not found> = ArrayList@2052[1] { ResolutionCandidate@2051 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2053 {
-    <name not found> = ArrayList@2054[1] { ResolutionCandidate@2055 }
-    <name not found> = ArrayList@2056[1] { ResolutionCandidate@2055 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2052 {
+    <name not found> = ArrayList@2053[1] { ResolutionCandidate@2054 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2057 {
-    <name not found> = ArrayList@2058[1] { ResolutionCandidate@2059 }
-    <name not found> = ArrayList@2060[1] { ResolutionCandidate@2059 }
+ResolutionTaskHolder@2055 {
+    <name not found> = ArrayList@2056[1] { ResolutionCandidate@2057 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2058 {
+    <name not found> = ArrayList@2059[1] { ResolutionCandidate@2060 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2061 {
     <name not found> = ArrayList@2062[1] { ResolutionCandidate@2063 }
-    <name not found> = ArrayList@2064[1] { ResolutionCandidate@2063 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2065 {
-    <name not found> = ArrayList@2066[1] { ResolutionCandidate@2067 }
-    <name not found> = ArrayList@2068[1] { ResolutionCandidate@2067 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2064 {
+    <name not found> = ArrayList@2065[1] { ResolutionCandidate@2066 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2069 {
-    <name not found> = ArrayList@2070[1] { ResolutionCandidate@2071 }
-    <name not found> = ArrayList@2072[1] { ResolutionCandidate@2071 }
+ResolutionTaskHolder@2067 {
+    <name not found> = ArrayList@2068[1] { ResolutionCandidate@2069 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2070 {
+    <name not found> = ArrayList@2071[1] { ResolutionCandidate@2072 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2073 {
     <name not found> = ArrayList@2074[1] { ResolutionCandidate@2075 }
-    <name not found> = ArrayList@2076[1] { ResolutionCandidate@2075 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2077 {
-    <name not found> = ArrayList@2078[1] { ResolutionCandidate@2079 }
-    <name not found> = ArrayList@2080[1] { ResolutionCandidate@2079 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2076 {
+    <name not found> = ArrayList@2077[1] { ResolutionCandidate@2078 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2081 {
-    <name not found> = ArrayList@2082[1] { ResolutionCandidate@2083 }
-    <name not found> = ArrayList@2084[1] { ResolutionCandidate@2083 }
+ResolutionTaskHolder@2079 {
+    <name not found> = ArrayList@2080[1] { ResolutionCandidate@2081 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2082 {
+    <name not found> = ArrayList@2083[1] { ResolutionCandidate@2084 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2085 {
     <name not found> = ArrayList@2086[1] { ResolutionCandidate@2087 }
-    <name not found> = ArrayList@2088[1] { ResolutionCandidate@2087 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2089 {
-    <name not found> = ArrayList@2090[1] { ResolutionCandidate@2091 }
-    <name not found> = ArrayList@2092[1] { ResolutionCandidate@2091 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2088 {
+    <name not found> = ArrayList@2089[1] { ResolutionCandidate@2090 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2093 {
-    <name not found> = ArrayList@2094[1] { ResolutionCandidate@2095 }
-    <name not found> = ArrayList@2096[1] { ResolutionCandidate@2095 }
+ResolutionTaskHolder@2091 {
+    <name not found> = ArrayList@2092[1] { ResolutionCandidate@2093 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2094 {
+    <name not found> = ArrayList@2095[1] { ResolutionCandidate@2096 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2097 {
     <name not found> = ArrayList@2098[1] { ResolutionCandidate@2099 }
-    <name not found> = ArrayList@2100[1] { ResolutionCandidate@2099 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2101 {
-    <name not found> = ArrayList@2102[1] { ResolutionCandidate@2103 }
-    <name not found> = ArrayList@2104[1] { ResolutionCandidate@2103 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2100 {
+    <name not found> = ArrayList@2101[1] { ResolutionCandidate@2102 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2105 {
-    <name not found> = ArrayList@2106[1] { ResolutionCandidate@2107 }
-    <name not found> = ArrayList@2108[1] { ResolutionCandidate@2107 }
+ResolutionTaskHolder@2103 {
+    <name not found> = ArrayList@2104[1] { ResolutionCandidate@2105 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2106 {
+    <name not found> = ArrayList@2107[1] { ResolutionCandidate@2108 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2109 {
     <name not found> = ArrayList@2110[1] { ResolutionCandidate@2111 }
-    <name not found> = ArrayList@2112[1] { ResolutionCandidate@2111 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2113 {
-    <name not found> = ArrayList@2114[1] { ResolutionCandidate@2115 }
-    <name not found> = ArrayList@2116[1] { ResolutionCandidate@2115 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2112 {
+    <name not found> = ArrayList@2113[1] { ResolutionCandidate@2114 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2117 {
-    <name not found> = ArrayList@2118[1] { ResolutionCandidate@2119 }
-    <name not found> = ArrayList@2120[1] { ResolutionCandidate@2119 }
+ResolutionTaskHolder@2115 {
+    <name not found> = ArrayList@2116[1] { ResolutionCandidate@2117 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2118 {
+    <name not found> = ArrayList@2119[1] { ResolutionCandidate@2120 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2121 {
     <name not found> = ArrayList@2122[1] { ResolutionCandidate@2123 }
-    <name not found> = ArrayList@2124[1] { ResolutionCandidate@2123 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2125 {
-    <name not found> = ArrayList@2126[1] { ResolutionCandidate@2127 }
-    <name not found> = ArrayList@2128[1] { ResolutionCandidate@2127 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2124 {
+    <name not found> = ArrayList@2125[1] { ResolutionCandidate@2126 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2129 {
-    <name not found> = ArrayList@2130[1] { ResolutionCandidate@2131 }
-    <name not found> = ArrayList@2132[1] { ResolutionCandidate@2131 }
+ResolutionTaskHolder@2127 {
+    <name not found> = ArrayList@2128[1] { ResolutionCandidate@2129 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2130 {
+    <name not found> = ArrayList@2131[1] { ResolutionCandidate@2132 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2133 {
     <name not found> = ArrayList@2134[1] { ResolutionCandidate@2135 }
-    <name not found> = ArrayList@2136[1] { ResolutionCandidate@2135 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2137 {
-    <name not found> = ArrayList@2138[1] { ResolutionCandidate@2139 }
-    <name not found> = ArrayList@2140[1] { ResolutionCandidate@2139 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2136 {
+    <name not found> = ArrayList@2137[1] { ResolutionCandidate@2138 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2141 {
-    <name not found> = ArrayList@2142[1] { ResolutionCandidate@2143 }
-    <name not found> = ArrayList@2144[1] { ResolutionCandidate@2143 }
+ResolutionTaskHolder@2139 {
+    <name not found> = ArrayList@2140[1] { ResolutionCandidate@2141 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2142 {
+    <name not found> = ArrayList@2143[1] { ResolutionCandidate@2144 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2145 {
     <name not found> = ArrayList@2146[1] { ResolutionCandidate@2147 }
-    <name not found> = ArrayList@2148[1] { ResolutionCandidate@2147 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2149 {
-    <name not found> = ArrayList@2150[1] { ResolutionCandidate@2151 }
-    <name not found> = ArrayList@2152[1] { ResolutionCandidate@2151 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2148 {
+    <name not found> = ArrayList@2149[1] { ResolutionCandidate@2150 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2153 {
-    <name not found> = ArrayList@2154[1] { ResolutionCandidate@2155 }
-    <name not found> = ArrayList@2156[1] { ResolutionCandidate@2155 }
+ResolutionTaskHolder@2151 {
+    <name not found> = ArrayList@2152[1] { ResolutionCandidate@2153 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2154 {
+    <name not found> = ArrayList@2155[1] { ResolutionCandidate@2156 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2157 {
     <name not found> = ArrayList@2158[1] { ResolutionCandidate@2159 }
-    <name not found> = ArrayList@2160[1] { ResolutionCandidate@2159 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2161 {
-    <name not found> = ArrayList@2162[1] { ResolutionCandidate@2163 }
-    <name not found> = ArrayList@2164[1] { ResolutionCandidate@2163 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2160 {
+    <name not found> = ArrayList@2161[1] { ResolutionCandidate@2162 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2165 {
-    <name not found> = ArrayList@2166[1] { ResolutionCandidate@2167 }
-    <name not found> = ArrayList@2168[1] { ResolutionCandidate@2167 }
+ResolutionTaskHolder@2163 {
+    <name not found> = ArrayList@2164[1] { ResolutionCandidate@2165 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2166 {
+    <name not found> = ArrayList@2167[1] { ResolutionCandidate@2168 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2169 {
     <name not found> = ArrayList@2170[1] { ResolutionCandidate@2171 }
-    <name not found> = ArrayList@2172[1] { ResolutionCandidate@2171 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2173 {
-    <name not found> = ArrayList@2174[1] { ResolutionCandidate@2175 }
-    <name not found> = ArrayList@2176[1] { ResolutionCandidate@2175 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2172 {
+    <name not found> = ArrayList@2173[1] { ResolutionCandidate@2174 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2177 {
-    <name not found> = ArrayList@2178[1] { ResolutionCandidate@2179 }
-    <name not found> = ArrayList@2180[1] { ResolutionCandidate@2179 }
+ResolutionTaskHolder@2175 {
+    <name not found> = ArrayList@2176[1] { ResolutionCandidate@2177 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2178 {
+    <name not found> = ArrayList@2179[1] { ResolutionCandidate@2180 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2181 {
     <name not found> = ArrayList@2182[1] { ResolutionCandidate@2183 }
-    <name not found> = ArrayList@2184[1] { ResolutionCandidate@2183 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2185 {
-    <name not found> = ArrayList@2186[1] { ResolutionCandidate@2187 }
-    <name not found> = ArrayList@2188[1] { ResolutionCandidate@2187 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2184 {
+    <name not found> = ArrayList@2185[1] { ResolutionCandidate@2186 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2189 {
-    <name not found> = ArrayList@2190[1] { ResolutionCandidate@2191 }
-    <name not found> = ArrayList@2192[1] { ResolutionCandidate@2191 }
+ResolutionTaskHolder@2187 {
+    <name not found> = ArrayList@2188[1] { ResolutionCandidate@2189 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2190 {
+    <name not found> = ArrayList@2191[1] { ResolutionCandidate@2192 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2193 {
     <name not found> = ArrayList@2194[1] { ResolutionCandidate@2195 }
-    <name not found> = ArrayList@2196[1] { ResolutionCandidate@2195 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2197 {
-    <name not found> = ArrayList@2198[1] { ResolutionCandidate@2199 }
-    <name not found> = ArrayList@2200[1] { ResolutionCandidate@2199 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2196 {
+    <name not found> = ArrayList@2197[1] { ResolutionCandidate@2198 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2201 {
-    <name not found> = ArrayList@2202[1] { ResolutionCandidate@2203 }
-    <name not found> = ArrayList@2204[1] { ResolutionCandidate@2203 }
+ResolutionTaskHolder@2199 {
+    <name not found> = ArrayList@2200[1] { ResolutionCandidate@2201 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2202 {
+    <name not found> = ArrayList@2203[1] { ResolutionCandidate@2204 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2205 {
     <name not found> = ArrayList@2206[1] { ResolutionCandidate@2207 }
-    <name not found> = ArrayList@2208[1] { ResolutionCandidate@2207 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2209 {
-    <name not found> = ArrayList@2210[1] { ResolutionCandidate@2211 }
-    <name not found> = ArrayList@2212[1] { ResolutionCandidate@2211 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2208 {
+    <name not found> = ArrayList@2209[1] { ResolutionCandidate@2210 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2213 {
-    <name not found> = ArrayList@2214[1] { ResolutionCandidate@2215 }
-    <name not found> = ArrayList@2216[1] { ResolutionCandidate@2215 }
+ResolutionTaskHolder@2211 {
+    <name not found> = ArrayList@2212[1] { ResolutionCandidate@2213 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2214 {
+    <name not found> = ArrayList@2215[1] { ResolutionCandidate@2216 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2217 {
     <name not found> = ArrayList@2218[1] { ResolutionCandidate@2219 }
-    <name not found> = ArrayList@2220[1] { ResolutionCandidate@2219 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2221 {
-    <name not found> = ArrayList@2222[1] { ResolutionCandidate@2223 }
-    <name not found> = ArrayList@2224[1] { ResolutionCandidate@2223 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2220 {
+    <name not found> = ArrayList@2221[1] { ResolutionCandidate@2222 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2225 {
-    <name not found> = ArrayList@2226[1] { ResolutionCandidate@2227 }
-    <name not found> = ArrayList@2228[1] { ResolutionCandidate@2227 }
+ResolutionTaskHolder@2223 {
+    <name not found> = ArrayList@2224[1] { ResolutionCandidate@2225 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2226 {
+    <name not found> = ArrayList@2227[1] { ResolutionCandidate@2228 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2229 {
     <name not found> = ArrayList@2230[1] { ResolutionCandidate@2231 }
-    <name not found> = ArrayList@2232[1] { ResolutionCandidate@2231 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2233 {
-    <name not found> = ArrayList@2234[1] { ResolutionCandidate@2235 }
-    <name not found> = ArrayList@2236[1] { ResolutionCandidate@2235 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2232 {
+    <name not found> = ArrayList@2233[1] { ResolutionCandidate@2234 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2237 {
-    <name not found> = ArrayList@2238[1] { ResolutionCandidate@2239 }
-    <name not found> = ArrayList@2240[1] { ResolutionCandidate@2239 }
+ResolutionTaskHolder@2235 {
+    <name not found> = ArrayList@2236[1] { ResolutionCandidate@2237 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2238 {
+    <name not found> = ArrayList@2239[1] { ResolutionCandidate@2240 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2241 {
     <name not found> = ArrayList@2242[1] { ResolutionCandidate@2243 }
-    <name not found> = ArrayList@2244[1] { ResolutionCandidate@2243 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2245 {
-    <name not found> = ArrayList@2246[1] { ResolutionCandidate@2247 }
-    <name not found> = ArrayList@2248[1] { ResolutionCandidate@2247 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2244 {
+    <name not found> = ArrayList@2245[1] { ResolutionCandidate@2246 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2249 {
-    <name not found> = ArrayList@2250[1] { ResolutionCandidate@2251 }
-    <name not found> = ArrayList@2252[1] { ResolutionCandidate@2251 }
+ResolutionTaskHolder@2247 {
+    <name not found> = ArrayList@2248[1] { ResolutionCandidate@2249 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2250 {
+    <name not found> = ArrayList@2251[1] { ResolutionCandidate@2252 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2253 {
     <name not found> = ArrayList@2254[1] { ResolutionCandidate@2255 }
-    <name not found> = ArrayList@2256[1] { ResolutionCandidate@2255 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2257 {
-    <name not found> = ArrayList@2258[1] { ResolutionCandidate@2259 }
-    <name not found> = ArrayList@2260[1] { ResolutionCandidate@2259 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2256 {
+    <name not found> = ArrayList@2257[1] { ResolutionCandidate@2258 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2261 {
-    <name not found> = ArrayList@2262[1] { ResolutionCandidate@2263 }
-    <name not found> = ArrayList@2264[1] { ResolutionCandidate@2263 }
+ResolutionTaskHolder@2259 {
+    <name not found> = ArrayList@2260[1] { ResolutionCandidate@2261 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2262 {
+    <name not found> = ArrayList@2263[1] { ResolutionCandidate@2264 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2265 {
     <name not found> = ArrayList@2266[1] { ResolutionCandidate@2267 }
-    <name not found> = ArrayList@2268[1] { ResolutionCandidate@2267 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2269 {
-    <name not found> = ArrayList@2270[1] { ResolutionCandidate@2271 }
-    <name not found> = ArrayList@2272[1] { ResolutionCandidate@2271 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2268 {
+    <name not found> = ArrayList@2269[1] { ResolutionCandidate@2270 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2273 {
-    <name not found> = ArrayList@2274[1] { ResolutionCandidate@2275 }
-    <name not found> = ArrayList@2276[1] { ResolutionCandidate@2275 }
+ResolutionTaskHolder@2271 {
+    <name not found> = ArrayList@2272[1] { ResolutionCandidate@2273 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2274 {
+    <name not found> = ArrayList@2275[1] { ResolutionCandidate@2276 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2277 {
     <name not found> = ArrayList@2278[1] { ResolutionCandidate@2279 }
-    <name not found> = ArrayList@2280[1] { ResolutionCandidate@2279 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2281 {
-    <name not found> = ArrayList@2282[1] { ResolutionCandidate@2283 }
-    <name not found> = ArrayList@2284[1] { ResolutionCandidate@2283 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2280 {
+    <name not found> = ArrayList@2281[1] { ResolutionCandidate@2282 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2285 {
-    <name not found> = ArrayList@2286[1] { ResolutionCandidate@2287 }
-    <name not found> = ArrayList@2288[1] { ResolutionCandidate@2287 }
+ResolutionTaskHolder@2283 {
+    <name not found> = ArrayList@2284[1] { ResolutionCandidate@2285 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2286 {
+    <name not found> = ArrayList@2287[1] { ResolutionCandidate@2288 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2289 {
     <name not found> = ArrayList@2290[1] { ResolutionCandidate@2291 }
-    <name not found> = ArrayList@2292[1] { ResolutionCandidate@2291 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2293 {
-    <name not found> = ArrayList@2294[1] { ResolutionCandidate@2295 }
-    <name not found> = ArrayList@2296[1] { ResolutionCandidate@2295 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2292 {
+    <name not found> = ArrayList@2293[1] { ResolutionCandidate@2294 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2297 {
-    <name not found> = ArrayList@2298[1] { ResolutionCandidate@2299 }
-    <name not found> = ArrayList@2300[1] { ResolutionCandidate@2299 }
+ResolutionTaskHolder@2295 {
+    <name not found> = ArrayList@2296[1] { ResolutionCandidate@2297 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2298 {
+    <name not found> = ArrayList@2299[1] { ResolutionCandidate@2300 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2301 {
     <name not found> = ArrayList@2302[1] { ResolutionCandidate@2303 }
-    <name not found> = ArrayList@2304[1] { ResolutionCandidate@2303 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2305 {
-    <name not found> = ArrayList@2306[1] { ResolutionCandidate@2307 }
-    <name not found> = ArrayList@2308[1] { ResolutionCandidate@2307 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2304 {
+    <name not found> = ArrayList@2305[1] { ResolutionCandidate@2306 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2309 {
-    <name not found> = ArrayList@2310[1] { ResolutionCandidate@2311 }
-    <name not found> = ArrayList@2312[1] { ResolutionCandidate@2311 }
+ResolutionTaskHolder@2307 {
+    <name not found> = ArrayList@2308[1] { ResolutionCandidate@2309 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2310 {
+    <name not found> = ArrayList@2311[1] { ResolutionCandidate@2312 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2313 {
     <name not found> = ArrayList@2314[1] { ResolutionCandidate@2315 }
-    <name not found> = ArrayList@2316[1] { ResolutionCandidate@2315 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2317 {
-    <name not found> = ArrayList@2318[1] { ResolutionCandidate@2319 }
-    <name not found> = ArrayList@2320[1] { ResolutionCandidate@2319 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2316 {
+    <name not found> = ArrayList@2317[1] { ResolutionCandidate@2318 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2321 {
-    <name not found> = ArrayList@2322[1] { ResolutionCandidate@2323 }
-    <name not found> = ArrayList@2324[1] { ResolutionCandidate@2323 }
+ResolutionTaskHolder@2319 {
+    <name not found> = ArrayList@2320[1] { ResolutionCandidate@2321 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2322 {
+    <name not found> = ArrayList@2323[1] { ResolutionCandidate@2324 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2325 {
     <name not found> = ArrayList@2326[1] { ResolutionCandidate@2327 }
-    <name not found> = ArrayList@2328[1] { ResolutionCandidate@2327 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2329 {
-    <name not found> = ArrayList@2330[1] { ResolutionCandidate@2331 }
-    <name not found> = ArrayList@2332[1] { ResolutionCandidate@2331 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2328 {
+    <name not found> = ArrayList@2329[1] { ResolutionCandidate@2330 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2333 {
-    <name not found> = ArrayList@2334[1] { ResolutionCandidate@2335 }
-    <name not found> = ArrayList@2336[1] { ResolutionCandidate@2335 }
+ResolutionTaskHolder@2331 {
+    <name not found> = ArrayList@2332[1] { ResolutionCandidate@2333 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2334 {
+    <name not found> = ArrayList@2335[1] { ResolutionCandidate@2336 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2337 {
     <name not found> = ArrayList@2338[1] { ResolutionCandidate@2339 }
-    <name not found> = ArrayList@2340[1] { ResolutionCandidate@2339 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2341 {
-    <name not found> = ArrayList@2342[1] { ResolutionCandidate@2343 }
-    <name not found> = ArrayList@2344[1] { ResolutionCandidate@2343 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2340 {
+    <name not found> = ArrayList@2341[1] { ResolutionCandidate@2342 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2345 {
-    <name not found> = ArrayList@2346[1] { ResolutionCandidate@2347 }
-    <name not found> = ArrayList@2348[1] { ResolutionCandidate@2347 }
+ResolutionTaskHolder@2343 {
+    <name not found> = ArrayList@2344[1] { ResolutionCandidate@2345 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2346 {
+    <name not found> = ArrayList@2347[1] { ResolutionCandidate@2348 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2349 {
     <name not found> = ArrayList@2350[1] { ResolutionCandidate@2351 }
-    <name not found> = ArrayList@2352[1] { ResolutionCandidate@2351 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2353 {
-    <name not found> = ArrayList@2354[1] { ResolutionCandidate@2355 }
-    <name not found> = ArrayList@2356[1] { ResolutionCandidate@2355 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2352 {
+    <name not found> = ArrayList@2353[1] { ResolutionCandidate@2354 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2357 {
-    <name not found> = ArrayList@2358[1] { ResolutionCandidate@2359 }
-    <name not found> = ArrayList@2360[1] { ResolutionCandidate@2359 }
+ResolutionTaskHolder@2355 {
+    <name not found> = ArrayList@2356[1] { ResolutionCandidate@2357 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2358 {
+    <name not found> = ArrayList@2359[1] { ResolutionCandidate@2360 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2361 {
     <name not found> = ArrayList@2362[1] { ResolutionCandidate@2363 }
-    <name not found> = ArrayList@2364[1] { ResolutionCandidate@2363 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2365 {
-    <name not found> = ArrayList@2366[1] { ResolutionCandidate@2367 }
-    <name not found> = ArrayList@2368[1] { ResolutionCandidate@2367 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2364 {
+    <name not found> = ArrayList@2365[1] { ResolutionCandidate@2366 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2369 {
-    <name not found> = ArrayList@2370[1] { ResolutionCandidate@2371 }
-    <name not found> = ArrayList@2372[1] { ResolutionCandidate@2371 }
+ResolutionTaskHolder@2367 {
+    <name not found> = ArrayList@2368[1] { ResolutionCandidate@2369 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2370 {
+    <name not found> = ArrayList@2371[1] { ResolutionCandidate@2372 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2373 {
     <name not found> = ArrayList@2374[1] { ResolutionCandidate@2375 }
-    <name not found> = ArrayList@2376[1] { ResolutionCandidate@2375 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2377 {
-    <name not found> = ArrayList@2378[1] { ResolutionCandidate@2379 }
-    <name not found> = ArrayList@2380[1] { ResolutionCandidate@2379 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2376 {
+    <name not found> = ArrayList@2377[1] { ResolutionCandidate@2378 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2381 {
-    <name not found> = ArrayList@2382[1] { ResolutionCandidate@2383 }
-    <name not found> = ArrayList@2384[1] { ResolutionCandidate@2383 }
+ResolutionTaskHolder@2379 {
+    <name not found> = ArrayList@2380[1] { ResolutionCandidate@2381 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2382 {
+    <name not found> = ArrayList@2383[1] { ResolutionCandidate@2384 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2385 {
     <name not found> = ArrayList@2386[1] { ResolutionCandidate@2387 }
-    <name not found> = ArrayList@2388[1] { ResolutionCandidate@2387 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2389 {
-    <name not found> = ArrayList@2390[1] { ResolutionCandidate@2391 }
-    <name not found> = ArrayList@2392[1] { ResolutionCandidate@2391 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2388 {
+    <name not found> = ArrayList@2389[1] { ResolutionCandidate@2390 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2393 {
-    <name not found> = ArrayList@2394[1] { ResolutionCandidate@2395 }
-    <name not found> = ArrayList@2396[1] { ResolutionCandidate@2395 }
+ResolutionTaskHolder@2391 {
+    <name not found> = ArrayList@2392[1] { ResolutionCandidate@2393 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2394 {
+    <name not found> = ArrayList@2395[1] { ResolutionCandidate@2396 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2397 {
     <name not found> = ArrayList@2398[1] { ResolutionCandidate@2399 }
-    <name not found> = ArrayList@2400[1] { ResolutionCandidate@2399 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2401 {
-    <name not found> = ArrayList@2402[1] { ResolutionCandidate@2403 }
-    <name not found> = ArrayList@2404[1] { ResolutionCandidate@2403 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2400 {
+    <name not found> = ArrayList@2401[1] { ResolutionCandidate@2402 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2405 {
-    <name not found> = ArrayList@2406[1] { ResolutionCandidate@2407 }
-    <name not found> = ArrayList@2408[1] { ResolutionCandidate@2407 }
+ResolutionTaskHolder@2403 {
+    <name not found> = ArrayList@2404[1] { ResolutionCandidate@2405 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2406 {
+    <name not found> = ArrayList@2407[1] { ResolutionCandidate@2408 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2409 {
     <name not found> = ArrayList@2410[1] { ResolutionCandidate@2411 }
-    <name not found> = ArrayList@2412[1] { ResolutionCandidate@2411 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2413 {
-    <name not found> = ArrayList@2414[1] { ResolutionCandidate@2415 }
-    <name not found> = ArrayList@2416[1] { ResolutionCandidate@2415 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2412 {
+    <name not found> = ArrayList@2413[1] { ResolutionCandidate@2414 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2417 {
-    <name not found> = ArrayList@2418[1] { ResolutionCandidate@2419 }
-    <name not found> = ArrayList@2420[1] { ResolutionCandidate@2419 }
+ResolutionTaskHolder@2415 {
+    <name not found> = ArrayList@2416[1] { ResolutionCandidate@2417 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2418 {
+    <name not found> = ArrayList@2419[1] { ResolutionCandidate@2420 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2421 {
     <name not found> = ArrayList@2422[1] { ResolutionCandidate@2423 }
-    <name not found> = ArrayList@2424[1] { ResolutionCandidate@2423 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2425 {
-    <name not found> = ArrayList@2426[1] { ResolutionCandidate@2427 }
-    <name not found> = ArrayList@2428[1] { ResolutionCandidate@2427 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2424 {
+    <name not found> = ArrayList@2425[1] { ResolutionCandidate@2426 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2429 {
-    <name not found> = ArrayList@2430[1] { ResolutionCandidate@2431 }
-    <name not found> = ArrayList@2432[1] { ResolutionCandidate@2431 }
+ResolutionTaskHolder@2427 {
+    <name not found> = ArrayList@2428[1] { ResolutionCandidate@2429 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2430 {
+    <name not found> = ArrayList@2431[1] { ResolutionCandidate@2432 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2433 {
     <name not found> = ArrayList@2434[1] { ResolutionCandidate@2435 }
-    <name not found> = ArrayList@2436[1] { ResolutionCandidate@2435 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2437 {
-    <name not found> = ArrayList@2438[1] { ResolutionCandidate@2439 }
-    <name not found> = ArrayList@2440[1] { ResolutionCandidate@2439 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2436 {
+    <name not found> = ArrayList@2437[1] { ResolutionCandidate@2438 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2441 {
-    <name not found> = ArrayList@2442[1] { ResolutionCandidate@2443 }
-    <name not found> = ArrayList@2444[1] { ResolutionCandidate@2443 }
+ResolutionTaskHolder@2439 {
+    <name not found> = ArrayList@2440[1] { ResolutionCandidate@2441 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2442 {
+    <name not found> = ArrayList@2443[1] { ResolutionCandidate@2444 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2445 {
     <name not found> = ArrayList@2446[1] { ResolutionCandidate@2447 }
-    <name not found> = ArrayList@2448[1] { ResolutionCandidate@2447 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2449 {
-    <name not found> = ArrayList@2450[1] { ResolutionCandidate@2451 }
-    <name not found> = ArrayList@2452[1] { ResolutionCandidate@2451 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2448 {
+    <name not found> = ArrayList@2449[1] { ResolutionCandidate@2450 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2453 {
-    <name not found> = ArrayList@2454[1] { ResolutionCandidate@2455 }
-    <name not found> = ArrayList@2456[1] { ResolutionCandidate@2455 }
+ResolutionTaskHolder@2451 {
+    <name not found> = ArrayList@2452[1] { ResolutionCandidate@2453 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2454 {
+    <name not found> = ArrayList@2455[1] { ResolutionCandidate@2456 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2457 {
     <name not found> = ArrayList@2458[1] { ResolutionCandidate@2459 }
-    <name not found> = ArrayList@2460[1] { ResolutionCandidate@2459 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2461 {
-    <name not found> = ArrayList@2462[1] { ResolutionCandidate@2463 }
-    <name not found> = ArrayList@2464[1] { ResolutionCandidate@2463 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2460 {
+    <name not found> = ArrayList@2461[1] { ResolutionCandidate@2462 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2465 {
-    <name not found> = ArrayList@2466[1] { ResolutionCandidate@2467 }
-    <name not found> = ArrayList@2468[1] { ResolutionCandidate@2467 }
+ResolutionTaskHolder@2463 {
+    <name not found> = ArrayList@2464[1] { ResolutionCandidate@2465 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2466 {
+    <name not found> = ArrayList@2467[1] { ResolutionCandidate@2468 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2469 {
     <name not found> = ArrayList@2470[1] { ResolutionCandidate@2471 }
-    <name not found> = ArrayList@2472[1] { ResolutionCandidate@2471 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2473 {
-    <name not found> = ArrayList@2474[1] { ResolutionCandidate@2475 }
-    <name not found> = ArrayList@2476[1] { ResolutionCandidate@2475 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2472 {
+    <name not found> = ArrayList@2473[1] { ResolutionCandidate@2474 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2477 {
-    <name not found> = ArrayList@2478[1] { ResolutionCandidate@2479 }
-    <name not found> = ArrayList@2480[1] { ResolutionCandidate@2479 }
+ResolutionTaskHolder@2475 {
+    <name not found> = ArrayList@2476[1] { ResolutionCandidate@2477 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2478 {
+    <name not found> = ArrayList@2479[1] { ResolutionCandidate@2480 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2481 {
     <name not found> = ArrayList@2482[1] { ResolutionCandidate@2483 }
-    <name not found> = ArrayList@2484[1] { ResolutionCandidate@2483 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2485 {
-    <name not found> = ArrayList@2486[1] { ResolutionCandidate@2487 }
-    <name not found> = ArrayList@2488[1] { ResolutionCandidate@2487 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2484 {
+    <name not found> = ArrayList@2485[1] { ResolutionCandidate@2486 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2489 {
-    <name not found> = ArrayList@2490[1] { ResolutionCandidate@2491 }
-    <name not found> = ArrayList@2492[1] { ResolutionCandidate@2491 }
+ResolutionTaskHolder@2487 {
+    <name not found> = ArrayList@2488[1] { ResolutionCandidate@2489 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2490 {
+    <name not found> = ArrayList@2491[1] { ResolutionCandidate@2492 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2493 {
     <name not found> = ArrayList@2494[1] { ResolutionCandidate@2495 }
-    <name not found> = ArrayList@2496[1] { ResolutionCandidate@2495 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2497 {
-    <name not found> = ArrayList@2498[1] { ResolutionCandidate@2499 }
-    <name not found> = ArrayList@2500[1] { ResolutionCandidate@2499 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2496 {
+    <name not found> = ArrayList@2497[1] { ResolutionCandidate@2498 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2501 {
-    <name not found> = ArrayList@2502[1] { ResolutionCandidate@2503 }
-    <name not found> = ArrayList@2504[1] { ResolutionCandidate@2503 }
+ResolutionTaskHolder@2499 {
+    <name not found> = ArrayList@2500[1] { ResolutionCandidate@2501 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2502 {
+    <name not found> = ArrayList@2503[1] { ResolutionCandidate@2504 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2505 {
     <name not found> = ArrayList@2506[1] { ResolutionCandidate@2507 }
-    <name not found> = ArrayList@2508[1] { ResolutionCandidate@2507 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2509 {
-    <name not found> = ArrayList@2510[1] { ResolutionCandidate@2511 }
-    <name not found> = ArrayList@2512[1] { ResolutionCandidate@2511 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2508 {
+    <name not found> = ArrayList@2509[1] { ResolutionCandidate@2510 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2513 {
-    <name not found> = ArrayList@2514[1] { ResolutionCandidate@2515 }
-    <name not found> = ArrayList@2516[1] { ResolutionCandidate@2515 }
+ResolutionTaskHolder@2511 {
+    <name not found> = ArrayList@2512[1] { ResolutionCandidate@2513 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2514 {
+    <name not found> = ArrayList@2515[1] { ResolutionCandidate@2516 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2517 {
     <name not found> = ArrayList@2518[1] { ResolutionCandidate@2519 }
-    <name not found> = ArrayList@2520[1] { ResolutionCandidate@2519 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2521 {
-    <name not found> = ArrayList@2522[1] { ResolutionCandidate@2523 }
-    <name not found> = ArrayList@2524[1] { ResolutionCandidate@2523 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2520 {
+    <name not found> = ArrayList@2521[1] { ResolutionCandidate@2522 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2525 {
-    <name not found> = ArrayList@2526[1] { ResolutionCandidate@2527 }
-    <name not found> = ArrayList@2528[1] { ResolutionCandidate@2527 }
+ResolutionTaskHolder@2523 {
+    <name not found> = ArrayList@2524[1] { ResolutionCandidate@2525 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2526 {
+    <name not found> = ArrayList@2527[1] { ResolutionCandidate@2528 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2529 {
     <name not found> = ArrayList@2530[1] { ResolutionCandidate@2531 }
-    <name not found> = ArrayList@2532[1] { ResolutionCandidate@2531 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2533 {
-    <name not found> = ArrayList@2534[1] { ResolutionCandidate@2535 }
-    <name not found> = ArrayList@2536[1] { ResolutionCandidate@2535 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2532 {
+    <name not found> = ArrayList@2533[1] { ResolutionCandidate@2534 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2537 {
-    <name not found> = ArrayList@2538[1] { ResolutionCandidate@2539 }
-    <name not found> = ArrayList@2540[1] { ResolutionCandidate@2539 }
+ResolutionTaskHolder@2535 {
+    <name not found> = ArrayList@2536[1] { ResolutionCandidate@2537 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2538 {
+    <name not found> = ArrayList@2539[1] { ResolutionCandidate@2540 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2541 {
     <name not found> = ArrayList@2542[1] { ResolutionCandidate@2543 }
-    <name not found> = ArrayList@2544[1] { ResolutionCandidate@2543 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2545 {
-    <name not found> = ArrayList@2546[1] { ResolutionCandidate@2547 }
-    <name not found> = ArrayList@2548[1] { ResolutionCandidate@2547 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2544 {
+    <name not found> = ArrayList@2545[1] { ResolutionCandidate@2546 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2549 {
-    <name not found> = ArrayList@2550[1] { ResolutionCandidate@2551 }
-    <name not found> = ArrayList@2552[1] { ResolutionCandidate@2551 }
+ResolutionTaskHolder@2547 {
+    <name not found> = ArrayList@2548[1] { ResolutionCandidate@2549 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2550 {
+    <name not found> = ArrayList@2551[1] { ResolutionCandidate@2552 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2553 {
     <name not found> = ArrayList@2554[1] { ResolutionCandidate@2555 }
-    <name not found> = ArrayList@2556[1] { ResolutionCandidate@2555 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2557 {
-    <name not found> = ArrayList@2558[1] { ResolutionCandidate@2559 }
-    <name not found> = ArrayList@2560[1] { ResolutionCandidate@2559 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2556 {
+    <name not found> = ArrayList@2557[1] { ResolutionCandidate@2558 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2561 {
-    <name not found> = ArrayList@2562[1] { ResolutionCandidate@2563 }
-    <name not found> = ArrayList@2564[1] { ResolutionCandidate@2563 }
+ResolutionTaskHolder@2559 {
+    <name not found> = ArrayList@2560[1] { ResolutionCandidate@2561 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2562 {
+    <name not found> = ArrayList@2563[1] { ResolutionCandidate@2564 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2565 {
     <name not found> = ArrayList@2566[1] { ResolutionCandidate@2567 }
-    <name not found> = ArrayList@2568[1] { ResolutionCandidate@2567 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2569 {
-    <name not found> = ArrayList@2570[1] { ResolutionCandidate@2571 }
-    <name not found> = ArrayList@2572[1] { ResolutionCandidate@2571 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2568 {
+    <name not found> = ArrayList@2569[1] { ResolutionCandidate@2570 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2573 {
-    <name not found> = ArrayList@2574[1] { ResolutionCandidate@2575 }
-    <name not found> = ArrayList@2576[1] { ResolutionCandidate@2575 }
+ResolutionTaskHolder@2571 {
+    <name not found> = ArrayList@2572[1] { ResolutionCandidate@2573 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2574 {
+    <name not found> = ArrayList@2575[1] { ResolutionCandidate@2576 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2577 {
     <name not found> = ArrayList@2578[1] { ResolutionCandidate@2579 }
-    <name not found> = ArrayList@2580[1] { ResolutionCandidate@2579 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2581 {
-    <name not found> = ArrayList@2582[1] { ResolutionCandidate@2583 }
-    <name not found> = ArrayList@2584[1] { ResolutionCandidate@2583 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2580 {
+    <name not found> = ArrayList@2581[1] { ResolutionCandidate@2582 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2585 {
-    <name not found> = ArrayList@2586[1] { ResolutionCandidate@2587 }
-    <name not found> = ArrayList@2588[1] { ResolutionCandidate@2587 }
+ResolutionTaskHolder@2583 {
+    <name not found> = ArrayList@2584[1] { ResolutionCandidate@2585 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2586 {
+    <name not found> = ArrayList@2587[1] { ResolutionCandidate@2588 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2589 {
     <name not found> = ArrayList@2590[1] { ResolutionCandidate@2591 }
-    <name not found> = ArrayList@2592[1] { ResolutionCandidate@2591 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2593 {
-    <name not found> = ArrayList@2594[1] { ResolutionCandidate@2595 }
-    <name not found> = ArrayList@2596[1] { ResolutionCandidate@2595 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2592 {
+    <name not found> = ArrayList@2593[1] { ResolutionCandidate@2594 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2597 {
-    <name not found> = ArrayList@2598[1] { ResolutionCandidate@2599 }
-    <name not found> = ArrayList@2600[1] { ResolutionCandidate@2599 }
+ResolutionTaskHolder@2595 {
+    <name not found> = ArrayList@2596[1] { ResolutionCandidate@2597 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2598 {
+    <name not found> = ArrayList@2599[1] { ResolutionCandidate@2600 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2601 {
     <name not found> = ArrayList@2602[1] { ResolutionCandidate@2603 }
-    <name not found> = ArrayList@2604[1] { ResolutionCandidate@2603 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2605 {
-    <name not found> = ArrayList@2606[1] { ResolutionCandidate@2607 }
-    <name not found> = ArrayList@2608[1] { ResolutionCandidate@2607 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2604 {
+    <name not found> = ArrayList@2605[1] { ResolutionCandidate@2606 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2609 {
-    <name not found> = ArrayList@2610[1] { ResolutionCandidate@2611 }
-    <name not found> = ArrayList@2612[1] { ResolutionCandidate@2611 }
+ResolutionTaskHolder@2607 {
+    <name not found> = ArrayList@2608[1] { ResolutionCandidate@2609 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2610 {
+    <name not found> = ArrayList@2611[1] { ResolutionCandidate@2612 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2613 {
     <name not found> = ArrayList@2614[1] { ResolutionCandidate@2615 }
-    <name not found> = ArrayList@2616[1] { ResolutionCandidate@2615 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2617 {
-    <name not found> = ArrayList@2618[1] { ResolutionCandidate@2619 }
-    <name not found> = ArrayList@2620[1] { ResolutionCandidate@2619 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2616 {
+    <name not found> = ArrayList@2617[1] { ResolutionCandidate@2618 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2621 {
-    <name not found> = ArrayList@2622[1] { ResolutionCandidate@2623 }
-    <name not found> = ArrayList@2624[1] { ResolutionCandidate@2623 }
+ResolutionTaskHolder@2619 {
+    <name not found> = ArrayList@2620[1] { ResolutionCandidate@2621 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2622 {
+    <name not found> = ArrayList@2623[1] { ResolutionCandidate@2624 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2625 {
     <name not found> = ArrayList@2626[1] { ResolutionCandidate@2627 }
-    <name not found> = ArrayList@2628[1] { ResolutionCandidate@2627 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2629 {
-    <name not found> = ArrayList@2630[1] { ResolutionCandidate@2631 }
-    <name not found> = ArrayList@2632[1] { ResolutionCandidate@2631 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2628 {
+    <name not found> = ArrayList@2629[1] { ResolutionCandidate@2630 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2633 {
-    <name not found> = ArrayList@2634[1] { ResolutionCandidate@2635 }
-    <name not found> = ArrayList@2636[1] { ResolutionCandidate@2635 }
+ResolutionTaskHolder@2631 {
+    <name not found> = ArrayList@2632[1] { ResolutionCandidate@2633 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2634 {
+    <name not found> = ArrayList@2635[1] { ResolutionCandidate@2636 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2637 {
     <name not found> = ArrayList@2638[1] { ResolutionCandidate@2639 }
-    <name not found> = ArrayList@2640[1] { ResolutionCandidate@2639 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2641 {
-    <name not found> = ArrayList@2642[1] { ResolutionCandidate@2643 }
-    <name not found> = ArrayList@2644[1] { ResolutionCandidate@2643 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2640 {
+    <name not found> = ArrayList@2641[1] { ResolutionCandidate@2642 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2645 {
-    <name not found> = ArrayList@2646[1] { ResolutionCandidate@2647 }
-    <name not found> = ArrayList@2648[1] { ResolutionCandidate@2647 }
+ResolutionTaskHolder@2643 {
+    <name not found> = ArrayList@2644[1] { ResolutionCandidate@2645 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2646 {
+    <name not found> = ArrayList@2647[1] { ResolutionCandidate@2648 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2649 {
     <name not found> = ArrayList@2650[1] { ResolutionCandidate@2651 }
-    <name not found> = ArrayList@2652[1] { ResolutionCandidate@2651 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2653 {
-    <name not found> = ArrayList@2654[1] { ResolutionCandidate@2655 }
-    <name not found> = ArrayList@2656[1] { ResolutionCandidate@2655 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2652 {
+    <name not found> = ArrayList@2653[1] { ResolutionCandidate@2654 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2657 {
-    <name not found> = ArrayList@2658[1] { ResolutionCandidate@2659 }
-    <name not found> = ArrayList@2660[1] { ResolutionCandidate@2659 }
+ResolutionTaskHolder@2655 {
+    <name not found> = ArrayList@2656[1] { ResolutionCandidate@2657 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2658 {
+    <name not found> = ArrayList@2659[1] { ResolutionCandidate@2660 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2661 {
     <name not found> = ArrayList@2662[1] { ResolutionCandidate@2663 }
-    <name not found> = ArrayList@2664[1] { ResolutionCandidate@2663 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2665 {
-    <name not found> = ArrayList@2666[1] { ResolutionCandidate@2667 }
-    <name not found> = ArrayList@2668[1] { ResolutionCandidate@2667 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2664 {
+    <name not found> = ArrayList@2665[1] { ResolutionCandidate@2666 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2669 {
-    <name not found> = ArrayList@2670[1] { ResolutionCandidate@2671 }
-    <name not found> = ArrayList@2672[1] { ResolutionCandidate@2671 }
+ResolutionTaskHolder@2667 {
+    <name not found> = ArrayList@2668[1] { ResolutionCandidate@2669 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2670 {
+    <name not found> = ArrayList@2671[1] { ResolutionCandidate@2672 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2673 {
     <name not found> = ArrayList@2674[1] { ResolutionCandidate@2675 }
-    <name not found> = ArrayList@2676[1] { ResolutionCandidate@2675 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2677 {
-    <name not found> = ArrayList@2678[1] { ResolutionCandidate@2679 }
-    <name not found> = ArrayList@2680[1] { ResolutionCandidate@2679 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2676 {
+    <name not found> = ArrayList@2677[1] { ResolutionCandidate@2678 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2681 {
-    <name not found> = ArrayList@2682[1] { ResolutionCandidate@2683 }
-    <name not found> = ArrayList@2684[1] { ResolutionCandidate@2683 }
+ResolutionTaskHolder@2679 {
+    <name not found> = ArrayList@2680[1] { ResolutionCandidate@2681 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2682 {
+    <name not found> = ArrayList@2683[1] { ResolutionCandidate@2684 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2685 {
     <name not found> = ArrayList@2686[1] { ResolutionCandidate@2687 }
-    <name not found> = ArrayList@2688[1] { ResolutionCandidate@2687 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2689 {
-    <name not found> = ArrayList@2690[1] { ResolutionCandidate@2691 }
-    <name not found> = ArrayList@2692[1] { ResolutionCandidate@2691 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2688 {
+    <name not found> = ArrayList@2689[1] { ResolutionCandidate@2690 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2693 {
-    <name not found> = ArrayList@2694[1] { ResolutionCandidate@2695 }
-    <name not found> = ArrayList@2696[1] { ResolutionCandidate@2695 }
+ResolutionTaskHolder@2691 {
+    <name not found> = ArrayList@2692[1] { ResolutionCandidate@2693 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2694 {
+    <name not found> = ArrayList@2695[1] { ResolutionCandidate@2696 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2697 {
     <name not found> = ArrayList@2698[1] { ResolutionCandidate@2699 }
-    <name not found> = ArrayList@2700[1] { ResolutionCandidate@2699 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2701 {
-    <name not found> = ArrayList@2702[1] { ResolutionCandidate@2703 }
-    <name not found> = ArrayList@2704[1] { ResolutionCandidate@2703 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2700 {
+    <name not found> = ArrayList@2701[1] { ResolutionCandidate@2702 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2705 {
-    <name not found> = ArrayList@2706[1] { ResolutionCandidate@2707 }
-    <name not found> = ArrayList@2708[1] { ResolutionCandidate@2707 }
+ResolutionTaskHolder@2703 {
+    <name not found> = ArrayList@2704[1] { ResolutionCandidate@2705 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2706 {
+    <name not found> = ArrayList@2707[1] { ResolutionCandidate@2708 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2709 {
     <name not found> = ArrayList@2710[1] { ResolutionCandidate@2711 }
-    <name not found> = ArrayList@2712[1] { ResolutionCandidate@2711 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2713 {
-    <name not found> = ArrayList@2714[1] { ResolutionCandidate@2715 }
-    <name not found> = ArrayList@2716[1] { ResolutionCandidate@2715 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2712 {
+    <name not found> = ArrayList@2713[1] { ResolutionCandidate@2714 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2717 {
-    <name not found> = ArrayList@2718[1] { ResolutionCandidate@2719 }
-    <name not found> = ArrayList@2720[1] { ResolutionCandidate@2719 }
+ResolutionTaskHolder@2715 {
+    <name not found> = ArrayList@2716[1] { ResolutionCandidate@2717 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2718 {
+    <name not found> = ArrayList@2719[1] { ResolutionCandidate@2720 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2721 {
     <name not found> = ArrayList@2722[1] { ResolutionCandidate@2723 }
-    <name not found> = ArrayList@2724[1] { ResolutionCandidate@2723 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2725 {
-    <name not found> = ArrayList@2726[1] { ResolutionCandidate@2727 }
-    <name not found> = ArrayList@2728[1] { ResolutionCandidate@2727 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2724 {
+    <name not found> = ArrayList@2725[1] { ResolutionCandidate@2726 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2729 {
-    <name not found> = ArrayList@2730[1] { ResolutionCandidate@2731 }
-    <name not found> = ArrayList@2732[1] { ResolutionCandidate@2731 }
+ResolutionTaskHolder@2727 {
+    <name not found> = ArrayList@2728[1] { ResolutionCandidate@2729 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2730 {
+    <name not found> = ArrayList@2731[1] { ResolutionCandidate@2732 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2733 {
     <name not found> = ArrayList@2734[1] { ResolutionCandidate@2735 }
-    <name not found> = ArrayList@2736[1] { ResolutionCandidate@2735 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2737 {
-    <name not found> = ArrayList@2738[1] { ResolutionCandidate@2739 }
-    <name not found> = ArrayList@2740[1] { ResolutionCandidate@2739 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2736 {
+    <name not found> = ArrayList@2737[1] { ResolutionCandidate@2738 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2741 {
-    <name not found> = ArrayList@2742[1] { ResolutionCandidate@2743 }
-    <name not found> = ArrayList@2744[1] { ResolutionCandidate@2743 }
+ResolutionTaskHolder@2739 {
+    <name not found> = ArrayList@2740[1] { ResolutionCandidate@2741 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2742 {
+    <name not found> = ArrayList@2743[1] { ResolutionCandidate@2744 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2745 {
     <name not found> = ArrayList@2746[1] { ResolutionCandidate@2747 }
-    <name not found> = ArrayList@2748[1] { ResolutionCandidate@2747 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2749 {
-    <name not found> = ArrayList@2750[1] { ResolutionCandidate@2751 }
-    <name not found> = ArrayList@2752[1] { ResolutionCandidate@2751 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2748 {
+    <name not found> = ArrayList@2749[1] { ResolutionCandidate@2750 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2753 {
-    <name not found> = ArrayList@2754[1] { ResolutionCandidate@2755 }
-    <name not found> = ArrayList@2756[1] { ResolutionCandidate@2755 }
+ResolutionTaskHolder@2751 {
+    <name not found> = ArrayList@2752[1] { ResolutionCandidate@2753 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2754 {
+    <name not found> = ArrayList@2755[1] { ResolutionCandidate@2756 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2757 {
     <name not found> = ArrayList@2758[1] { ResolutionCandidate@2759 }
-    <name not found> = ArrayList@2760[1] { ResolutionCandidate@2759 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2761 {
-    <name not found> = ArrayList@2762[1] { ResolutionCandidate@2763 }
-    <name not found> = ArrayList@2764[1] { ResolutionCandidate@2763 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2760 {
+    <name not found> = ArrayList@2761[1] { ResolutionCandidate@2762 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2765 {
-    <name not found> = ArrayList@2766[1] { ResolutionCandidate@2767 }
-    <name not found> = ArrayList@2768[1] { ResolutionCandidate@2767 }
+ResolutionTaskHolder@2763 {
+    <name not found> = ArrayList@2764[1] { ResolutionCandidate@2765 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2766 {
+    <name not found> = ArrayList@2767[1] { ResolutionCandidate@2768 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2769 {
     <name not found> = ArrayList@2770[1] { ResolutionCandidate@2771 }
-    <name not found> = ArrayList@2772[1] { ResolutionCandidate@2771 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2773 {
-    <name not found> = ArrayList@2774[1] { ResolutionCandidate@2775 }
-    <name not found> = ArrayList@2776[1] { ResolutionCandidate@2775 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2772 {
+    <name not found> = ArrayList@2773[1] { ResolutionCandidate@2774 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2777 {
-    <name not found> = ArrayList@2778[1] { ResolutionCandidate@2779 }
-    <name not found> = ArrayList@2780[1] { ResolutionCandidate@2779 }
+ResolutionTaskHolder@2775 {
+    <name not found> = ArrayList@2776[1] { ResolutionCandidate@2777 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2778 {
+    <name not found> = ArrayList@2779[1] { ResolutionCandidate@2780 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2781 {
     <name not found> = ArrayList@2782[1] { ResolutionCandidate@2783 }
-    <name not found> = ArrayList@2784[1] { ResolutionCandidate@2783 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2785 {
-    <name not found> = ArrayList@2786[1] { ResolutionCandidate@2787 }
-    <name not found> = ArrayList@2788[1] { ResolutionCandidate@2787 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2784 {
+    <name not found> = ArrayList@2785[1] { ResolutionCandidate@2786 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2789 {
-    <name not found> = ArrayList@2790[1] { ResolutionCandidate@2791 }
-    <name not found> = ArrayList@2792[1] { ResolutionCandidate@2791 }
+ResolutionTaskHolder@2787 {
+    <name not found> = ArrayList@2788[1] { ResolutionCandidate@2789 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2790 {
+    <name not found> = ArrayList@2791[1] { ResolutionCandidate@2792 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2793 {
     <name not found> = ArrayList@2794[1] { ResolutionCandidate@2795 }
-    <name not found> = ArrayList@2796[1] { ResolutionCandidate@2795 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2797 {
-    <name not found> = ArrayList@2798[1] { ResolutionCandidate@2799 }
-    <name not found> = ArrayList@2800[1] { ResolutionCandidate@2799 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2796 {
+    <name not found> = ArrayList@2797[1] { ResolutionCandidate@2798 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2801 {
-    <name not found> = ArrayList@2802[1] { ResolutionCandidate@2803 }
-    <name not found> = ArrayList@2804[1] { ResolutionCandidate@2803 }
+ResolutionTaskHolder@2799 {
+    <name not found> = ArrayList@2800[1] { ResolutionCandidate@2801 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2802 {
+    <name not found> = ArrayList@2803[1] { ResolutionCandidate@2804 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2805 {
     <name not found> = ArrayList@2806[1] { ResolutionCandidate@2807 }
-    <name not found> = ArrayList@2808[1] { ResolutionCandidate@2807 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2809 {
-    <name not found> = ArrayList@2810[1] { ResolutionCandidate@2811 }
-    <name not found> = ArrayList@2812[1] { ResolutionCandidate@2811 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2808 {
+    <name not found> = ArrayList@2809[1] { ResolutionCandidate@2810 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2813 {
-    <name not found> = ArrayList@2814[1] { ResolutionCandidate@2815 }
-    <name not found> = ArrayList@2816[1] { ResolutionCandidate@2815 }
+ResolutionTaskHolder@2811 {
+    <name not found> = ArrayList@2812[1] { ResolutionCandidate@2813 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2814 {
+    <name not found> = ArrayList@2815[1] { ResolutionCandidate@2816 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2817 {
     <name not found> = ArrayList@2818[1] { ResolutionCandidate@2819 }
-    <name not found> = ArrayList@2820[1] { ResolutionCandidate@2819 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2821 {
-    <name not found> = ArrayList@2822[1] { ResolutionCandidate@2823 }
-    <name not found> = ArrayList@2824[1] { ResolutionCandidate@2823 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2820 {
+    <name not found> = ArrayList@2821[1] { ResolutionCandidate@2822 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2825 {
-    <name not found> = ArrayList@2826[1] { ResolutionCandidate@2827 }
-    <name not found> = ArrayList@2828[1] { ResolutionCandidate@2827 }
+ResolutionTaskHolder@2823 {
+    <name not found> = ArrayList@2824[1] { ResolutionCandidate@2825 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2826 {
+    <name not found> = ArrayList@2827[1] { ResolutionCandidate@2828 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2829 {
     <name not found> = ArrayList@2830[1] { ResolutionCandidate@2831 }
-    <name not found> = ArrayList@2832[1] { ResolutionCandidate@2831 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2833 {
-    <name not found> = ArrayList@2834[1] { ResolutionCandidate@2835 }
-    <name not found> = ArrayList@2836[1] { ResolutionCandidate@2835 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2832 {
+    <name not found> = ArrayList@2833[1] { ResolutionCandidate@2834 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2837 {
-    <name not found> = ArrayList@2838[1] { ResolutionCandidate@2839 }
-    <name not found> = ArrayList@2840[1] { ResolutionCandidate@2839 }
+ResolutionTaskHolder@2835 {
+    <name not found> = ArrayList@2836[1] { ResolutionCandidate@2837 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2838 {
+    <name not found> = ArrayList@2839[1] { ResolutionCandidate@2840 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2841 {
     <name not found> = ArrayList@2842[1] { ResolutionCandidate@2843 }
-    <name not found> = ArrayList@2844[1] { ResolutionCandidate@2843 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2845 {
-    <name not found> = ArrayList@2846[1] { ResolutionCandidate@2847 }
-    <name not found> = ArrayList@2848[1] { ResolutionCandidate@2847 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2844 {
+    <name not found> = ArrayList@2845[1] { ResolutionCandidate@2846 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2849 {
-    <name not found> = ArrayList@2850[1] { ResolutionCandidate@2851 }
-    <name not found> = ArrayList@2852[1] { ResolutionCandidate@2851 }
+ResolutionTaskHolder@2847 {
+    <name not found> = ArrayList@2848[1] { ResolutionCandidate@2849 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2850 {
+    <name not found> = ArrayList@2851[1] { ResolutionCandidate@2852 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2853 {
     <name not found> = ArrayList@2854[1] { ResolutionCandidate@2855 }
-    <name not found> = ArrayList@2856[1] { ResolutionCandidate@2855 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2857 {
-    <name not found> = ArrayList@2858[1] { ResolutionCandidate@2859 }
-    <name not found> = ArrayList@2860[1] { ResolutionCandidate@2859 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2856 {
+    <name not found> = ArrayList@2857[1] { ResolutionCandidate@2858 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2861 {
-    <name not found> = ArrayList@2862[1] { ResolutionCandidate@2863 }
-    <name not found> = ArrayList@2864[1] { ResolutionCandidate@2863 }
+ResolutionTaskHolder@2859 {
+    <name not found> = ArrayList@2860[1] { ResolutionCandidate@2861 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2862 {
+    <name not found> = ArrayList@2863[1] { ResolutionCandidate@2864 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2865 {
     <name not found> = ArrayList@2866[1] { ResolutionCandidate@2867 }
-    <name not found> = ArrayList@2868[1] { ResolutionCandidate@2867 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2869 {
-    <name not found> = ArrayList@2870[1] { ResolutionCandidate@2871 }
-    <name not found> = ArrayList@2872[1] { ResolutionCandidate@2871 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2868 {
+    <name not found> = ArrayList@2869[1] { ResolutionCandidate@2870 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2873 {
-    <name not found> = ArrayList@2874[1] { ResolutionCandidate@2875 }
-    <name not found> = ArrayList@2876[1] { ResolutionCandidate@2875 }
+ResolutionTaskHolder@2871 {
+    <name not found> = ArrayList@2872[1] { ResolutionCandidate@2873 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2874 {
+    <name not found> = ArrayList@2875[1] { ResolutionCandidate@2876 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2877 {
     <name not found> = ArrayList@2878[1] { ResolutionCandidate@2879 }
-    <name not found> = ArrayList@2880[1] { ResolutionCandidate@2879 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2881 {
-    <name not found> = ArrayList@2882[1] { ResolutionCandidate@2883 }
-    <name not found> = ArrayList@2884[1] { ResolutionCandidate@2883 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2880 {
+    <name not found> = ArrayList@2881[1] { ResolutionCandidate@2882 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2885 {
-    <name not found> = ArrayList@2886[1] { ResolutionCandidate@2887 }
-    <name not found> = ArrayList@2888[1] { ResolutionCandidate@2887 }
+ResolutionTaskHolder@2883 {
+    <name not found> = ArrayList@2884[1] { ResolutionCandidate@2885 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2886 {
+    <name not found> = ArrayList@2887[1] { ResolutionCandidate@2888 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2889 {
     <name not found> = ArrayList@2890[1] { ResolutionCandidate@2891 }
-    <name not found> = ArrayList@2892[1] { ResolutionCandidate@2891 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2893 {
-    <name not found> = ArrayList@2894[1] { ResolutionCandidate@2895 }
-    <name not found> = ArrayList@2896[1] { ResolutionCandidate@2895 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2892 {
+    <name not found> = ArrayList@2893[1] { ResolutionCandidate@2894 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2897 {
-    <name not found> = ArrayList@2898[1] { ResolutionCandidate@2899 }
-    <name not found> = ArrayList@2900[1] { ResolutionCandidate@2899 }
+ResolutionTaskHolder@2895 {
+    <name not found> = ArrayList@2896[1] { ResolutionCandidate@2897 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2898 {
+    <name not found> = ArrayList@2899[1] { ResolutionCandidate@2900 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2901 {
     <name not found> = ArrayList@2902[1] { ResolutionCandidate@2903 }
-    <name not found> = ArrayList@2904[1] { ResolutionCandidate@2903 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2905 {
-    <name not found> = ArrayList@2906[1] { ResolutionCandidate@2907 }
-    <name not found> = ArrayList@2908[1] { ResolutionCandidate@2907 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2904 {
+    <name not found> = ArrayList@2905[1] { ResolutionCandidate@2906 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2909 {
-    <name not found> = ArrayList@2910[1] { ResolutionCandidate@2911 }
-    <name not found> = ArrayList@2912[1] { ResolutionCandidate@2911 }
+ResolutionTaskHolder@2907 {
+    <name not found> = ArrayList@2908[1] { ResolutionCandidate@2909 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2910 {
+    <name not found> = ArrayList@2911[1] { ResolutionCandidate@2912 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2913 {
     <name not found> = ArrayList@2914[1] { ResolutionCandidate@2915 }
-    <name not found> = ArrayList@2916[1] { ResolutionCandidate@2915 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2917 {
-    <name not found> = ArrayList@2918[1] { ResolutionCandidate@2919 }
-    <name not found> = ArrayList@2920[1] { ResolutionCandidate@2919 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2916 {
+    <name not found> = ArrayList@2917[1] { ResolutionCandidate@2918 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2921 {
-    <name not found> = ArrayList@2922[1] { ResolutionCandidate@2923 }
-    <name not found> = ArrayList@2924[1] { ResolutionCandidate@2923 }
+ResolutionTaskHolder@2919 {
+    <name not found> = ArrayList@2920[1] { ResolutionCandidate@2921 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2922 {
+    <name not found> = ArrayList@2923[1] { ResolutionCandidate@2924 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2925 {
     <name not found> = ArrayList@2926[1] { ResolutionCandidate@2927 }
-    <name not found> = ArrayList@2928[1] { ResolutionCandidate@2927 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2929 {
-    <name not found> = ArrayList@2930[1] { ResolutionCandidate@2931 }
-    <name not found> = ArrayList@2932[1] { ResolutionCandidate@2931 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2928 {
+    <name not found> = ArrayList@2929[1] { ResolutionCandidate@2930 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2933 {
-    <name not found> = ArrayList@2934[1] { ResolutionCandidate@2935 }
-    <name not found> = ArrayList@2936[1] { ResolutionCandidate@2935 }
+ResolutionTaskHolder@2931 {
+    <name not found> = ArrayList@2932[1] { ResolutionCandidate@2933 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2934 {
+    <name not found> = ArrayList@2935[1] { ResolutionCandidate@2936 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2937 {
     <name not found> = ArrayList@2938[1] { ResolutionCandidate@2939 }
-    <name not found> = ArrayList@2940[1] { ResolutionCandidate@2939 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2941 {
-    <name not found> = ArrayList@2942[1] { ResolutionCandidate@2943 }
-    <name not found> = ArrayList@2944[1] { ResolutionCandidate@2943 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2940 {
+    <name not found> = ArrayList@2941[1] { ResolutionCandidate@2942 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2945 {
-    <name not found> = ArrayList@2946[1] { ResolutionCandidate@2947 }
-    <name not found> = ArrayList@2948[1] { ResolutionCandidate@2947 }
+ResolutionTaskHolder@2943 {
+    <name not found> = ArrayList@2944[1] { ResolutionCandidate@2945 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2946 {
+    <name not found> = ArrayList@2947[1] { ResolutionCandidate@2948 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2949 {
     <name not found> = ArrayList@2950[1] { ResolutionCandidate@2951 }
-    <name not found> = ArrayList@2952[1] { ResolutionCandidate@2951 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2953 {
-    <name not found> = ArrayList@2954[1] { ResolutionCandidate@2955 }
-    <name not found> = ArrayList@2956[1] { ResolutionCandidate@2955 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2952 {
+    <name not found> = ArrayList@2953[1] { ResolutionCandidate@2954 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2957 {
-    <name not found> = ArrayList@2958[1] { ResolutionCandidate@2959 }
-    <name not found> = ArrayList@2960[1] { ResolutionCandidate@2959 }
+ResolutionTaskHolder@2955 {
+    <name not found> = ArrayList@2956[1] { ResolutionCandidate@2957 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2958 {
+    <name not found> = ArrayList@2959[1] { ResolutionCandidate@2960 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2961 {
     <name not found> = ArrayList@2962[1] { ResolutionCandidate@2963 }
-    <name not found> = ArrayList@2964[1] { ResolutionCandidate@2963 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2965 {
-    <name not found> = ArrayList@2966[1] { ResolutionCandidate@2967 }
-    <name not found> = ArrayList@2968[1] { ResolutionCandidate@2967 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2964 {
+    <name not found> = ArrayList@2965[1] { ResolutionCandidate@2966 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2969 {
-    <name not found> = ArrayList@2970[1] { ResolutionCandidate@2971 }
-    <name not found> = ArrayList@2972[1] { ResolutionCandidate@2971 }
+ResolutionTaskHolder@2967 {
+    <name not found> = ArrayList@2968[1] { ResolutionCandidate@2969 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2970 {
+    <name not found> = ArrayList@2971[1] { ResolutionCandidate@2972 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2973 {
     <name not found> = ArrayList@2974[1] { ResolutionCandidate@2975 }
-    <name not found> = ArrayList@2976[1] { ResolutionCandidate@2975 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2977 {
-    <name not found> = ArrayList@2978[1] { ResolutionCandidate@2979 }
-    <name not found> = ArrayList@2980[1] { ResolutionCandidate@2979 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2976 {
+    <name not found> = ArrayList@2977[1] { ResolutionCandidate@2978 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2981 {
-    <name not found> = ArrayList@2982[1] { ResolutionCandidate@2983 }
-    <name not found> = ArrayList@2984[1] { ResolutionCandidate@2983 }
+ResolutionTaskHolder@2979 {
+    <name not found> = ArrayList@2980[1] { ResolutionCandidate@2981 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2982 {
+    <name not found> = ArrayList@2983[1] { ResolutionCandidate@2984 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2985 {
     <name not found> = ArrayList@2986[1] { ResolutionCandidate@2987 }
-    <name not found> = ArrayList@2988[1] { ResolutionCandidate@2987 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2989 {
-    <name not found> = ArrayList@2990[1] { ResolutionCandidate@2991 }
-    <name not found> = ArrayList@2992[1] { ResolutionCandidate@2991 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@2988 {
+    <name not found> = ArrayList@2989[1] { ResolutionCandidate@2990 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@2993 {
-    <name not found> = ArrayList@2994[1] { ResolutionCandidate@2995 }
-    <name not found> = ArrayList@2996[1] { ResolutionCandidate@2995 }
+ResolutionTaskHolder@2991 {
+    <name not found> = ArrayList@2992[1] { ResolutionCandidate@2993 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2994 {
+    <name not found> = ArrayList@2995[1] { ResolutionCandidate@2996 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@2997 {
     <name not found> = ArrayList@2998[1] { ResolutionCandidate@2999 }
-    <name not found> = ArrayList@3000[1] { ResolutionCandidate@2999 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3001 {
-    <name not found> = ArrayList@3002[1] { ResolutionCandidate@3003 }
-    <name not found> = ArrayList@3004[1] { ResolutionCandidate@3003 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3000 {
+    <name not found> = ArrayList@3001[1] { ResolutionCandidate@3002 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3005 {
-    <name not found> = ArrayList@3006[1] { ResolutionCandidate@3007 }
-    <name not found> = ArrayList@3008[1] { ResolutionCandidate@3007 }
+ResolutionTaskHolder@3003 {
+    <name not found> = ArrayList@3004[1] { ResolutionCandidate@3005 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3006 {
+    <name not found> = ArrayList@3007[1] { ResolutionCandidate@3008 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3009 {
     <name not found> = ArrayList@3010[1] { ResolutionCandidate@3011 }
-    <name not found> = ArrayList@3012[1] { ResolutionCandidate@3011 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3013 {
-    <name not found> = ArrayList@3014[1] { ResolutionCandidate@3015 }
-    <name not found> = ArrayList@3016[1] { ResolutionCandidate@3015 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3012 {
+    <name not found> = ArrayList@3013[1] { ResolutionCandidate@3014 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3017 {
-    <name not found> = ArrayList@3018[1] { ResolutionCandidate@3019 }
-    <name not found> = ArrayList@3020[1] { ResolutionCandidate@3019 }
+ResolutionTaskHolder@3015 {
+    <name not found> = ArrayList@3016[1] { ResolutionCandidate@3017 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3018 {
+    <name not found> = ArrayList@3019[1] { ResolutionCandidate@3020 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3021 {
     <name not found> = ArrayList@3022[1] { ResolutionCandidate@3023 }
-    <name not found> = ArrayList@3024[1] { ResolutionCandidate@3023 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3025 {
-    <name not found> = ArrayList@3026[1] { ResolutionCandidate@3027 }
-    <name not found> = ArrayList@3028[1] { ResolutionCandidate@3027 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3024 {
+    <name not found> = ArrayList@3025[1] { ResolutionCandidate@3026 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3029 {
-    <name not found> = ArrayList@3030[1] { ResolutionCandidate@3031 }
-    <name not found> = ArrayList@3032[1] { ResolutionCandidate@3031 }
+ResolutionTaskHolder@3027 {
+    <name not found> = ArrayList@3028[1] { ResolutionCandidate@3029 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3030 {
+    <name not found> = ArrayList@3031[1] { ResolutionCandidate@3032 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3033 {
     <name not found> = ArrayList@3034[1] { ResolutionCandidate@3035 }
-    <name not found> = ArrayList@3036[1] { ResolutionCandidate@3035 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3037 {
-    <name not found> = ArrayList@3038[1] { ResolutionCandidate@3039 }
-    <name not found> = ArrayList@3040[1] { ResolutionCandidate@3039 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3036 {
+    <name not found> = ArrayList@3037[1] { ResolutionCandidate@3038 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3041 {
-    <name not found> = ArrayList@3042[1] { ResolutionCandidate@3043 }
-    <name not found> = ArrayList@3044[1] { ResolutionCandidate@3043 }
+ResolutionTaskHolder@3039 {
+    <name not found> = ArrayList@3040[1] { ResolutionCandidate@3041 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3042 {
+    <name not found> = ArrayList@3043[1] { ResolutionCandidate@3044 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3045 {
     <name not found> = ArrayList@3046[1] { ResolutionCandidate@3047 }
-    <name not found> = ArrayList@3048[1] { ResolutionCandidate@3047 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3049 {
-    <name not found> = ArrayList@3050[1] { ResolutionCandidate@3051 }
-    <name not found> = ArrayList@3052[1] { ResolutionCandidate@3051 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3048 {
+    <name not found> = ArrayList@3049[1] { ResolutionCandidate@3050 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3053 {
-    <name not found> = ArrayList@3054[1] { ResolutionCandidate@3055 }
-    <name not found> = ArrayList@3056[1] { ResolutionCandidate@3055 }
+ResolutionTaskHolder@3051 {
+    <name not found> = ArrayList@3052[1] { ResolutionCandidate@3053 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3054 {
+    <name not found> = ArrayList@3055[1] { ResolutionCandidate@3056 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3057 {
     <name not found> = ArrayList@3058[1] { ResolutionCandidate@3059 }
-    <name not found> = ArrayList@3060[1] { ResolutionCandidate@3059 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3061 {
-    <name not found> = ArrayList@3062[1] { ResolutionCandidate@3063 }
-    <name not found> = ArrayList@3064[1] { ResolutionCandidate@3063 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3060 {
+    <name not found> = ArrayList@3061[1] { ResolutionCandidate@3062 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3065 {
-    <name not found> = ArrayList@3066[1] { ResolutionCandidate@3067 }
-    <name not found> = ArrayList@3068[1] { ResolutionCandidate@3067 }
+ResolutionTaskHolder@3063 {
+    <name not found> = ArrayList@3064[1] { ResolutionCandidate@3065 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3066 {
+    <name not found> = ArrayList@3067[1] { ResolutionCandidate@3068 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3069 {
     <name not found> = ArrayList@3070[1] { ResolutionCandidate@3071 }
-    <name not found> = ArrayList@3072[1] { ResolutionCandidate@3071 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3073 {
-    <name not found> = ArrayList@3074[1] { ResolutionCandidate@3075 }
-    <name not found> = ArrayList@3076[1] { ResolutionCandidate@3075 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3072 {
+    <name not found> = ArrayList@3073[1] { ResolutionCandidate@3074 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3077 {
-    <name not found> = ArrayList@3078[1] { ResolutionCandidate@3079 }
-    <name not found> = ArrayList@3080[1] { ResolutionCandidate@3079 }
+ResolutionTaskHolder@3075 {
+    <name not found> = ArrayList@3076[1] { ResolutionCandidate@3077 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3078 {
+    <name not found> = ArrayList@3079[1] { ResolutionCandidate@3080 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3081 {
     <name not found> = ArrayList@3082[1] { ResolutionCandidate@3083 }
-    <name not found> = ArrayList@3084[1] { ResolutionCandidate@3083 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3085 {
-    <name not found> = ArrayList@3086[1] { ResolutionCandidate@3087 }
-    <name not found> = ArrayList@3088[1] { ResolutionCandidate@3087 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3084 {
+    <name not found> = ArrayList@3085[1] { ResolutionCandidate@3086 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3089 {
-    <name not found> = ArrayList@3090[1] { ResolutionCandidate@3091 }
-    <name not found> = ArrayList@3092[1] { ResolutionCandidate@3091 }
+ResolutionTaskHolder@3087 {
+    <name not found> = ArrayList@3088[1] { ResolutionCandidate@3089 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3090 {
+    <name not found> = ArrayList@3091[1] { ResolutionCandidate@3092 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3093 {
     <name not found> = ArrayList@3094[1] { ResolutionCandidate@3095 }
-    <name not found> = ArrayList@3096[1] { ResolutionCandidate@3095 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3097 {
-    <name not found> = ArrayList@3098[1] { ResolutionCandidate@3099 }
-    <name not found> = ArrayList@3100[1] { ResolutionCandidate@3099 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3096 {
+    <name not found> = ArrayList@3097[1] { ResolutionCandidate@3098 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3101 {
-    <name not found> = ArrayList@3102[1] { ResolutionCandidate@3103 }
-    <name not found> = ArrayList@3104[1] { ResolutionCandidate@3103 }
+ResolutionTaskHolder@3099 {
+    <name not found> = ArrayList@3100[1] { ResolutionCandidate@3101 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3102 {
+    <name not found> = ArrayList@3103[1] { ResolutionCandidate@3104 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3105 {
     <name not found> = ArrayList@3106[1] { ResolutionCandidate@3107 }
-    <name not found> = ArrayList@3108[1] { ResolutionCandidate@3107 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3109 {
-    <name not found> = ArrayList@3110[1] { ResolutionCandidate@3111 }
-    <name not found> = ArrayList@3112[1] { ResolutionCandidate@3111 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3108 {
+    <name not found> = ArrayList@3109[1] { ResolutionCandidate@3110 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3113 {
-    <name not found> = ArrayList@3114[1] { ResolutionCandidate@3115 }
-    <name not found> = ArrayList@3116[1] { ResolutionCandidate@3115 }
+ResolutionTaskHolder@3111 {
+    <name not found> = ArrayList@3112[1] { ResolutionCandidate@3113 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3114 {
+    <name not found> = ArrayList@3115[1] { ResolutionCandidate@3116 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3117 {
     <name not found> = ArrayList@3118[1] { ResolutionCandidate@3119 }
-    <name not found> = ArrayList@3120[1] { ResolutionCandidate@3119 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3121 {
-    <name not found> = ArrayList@3122[1] { ResolutionCandidate@3123 }
-    <name not found> = ArrayList@3124[1] { ResolutionCandidate@3123 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3120 {
+    <name not found> = ArrayList@3121[1] { ResolutionCandidate@3122 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3125 {
-    <name not found> = ArrayList@3126[1] { ResolutionCandidate@3127 }
-    <name not found> = ArrayList@3128[1] { ResolutionCandidate@3127 }
+ResolutionTaskHolder@3123 {
+    <name not found> = ArrayList@3124[1] { ResolutionCandidate@3125 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3126 {
+    <name not found> = ArrayList@3127[1] { ResolutionCandidate@3128 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3129 {
     <name not found> = ArrayList@3130[1] { ResolutionCandidate@3131 }
-    <name not found> = ArrayList@3132[1] { ResolutionCandidate@3131 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3133 {
-    <name not found> = ArrayList@3134[1] { ResolutionCandidate@3135 }
-    <name not found> = ArrayList@3136[1] { ResolutionCandidate@3135 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3132 {
+    <name not found> = ArrayList@3133[1] { ResolutionCandidate@3134 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3137 {
-    <name not found> = ArrayList@3138[1] { ResolutionCandidate@3139 }
-    <name not found> = ArrayList@3140[1] { ResolutionCandidate@3139 }
+ResolutionTaskHolder@3135 {
+    <name not found> = ArrayList@3136[1] { ResolutionCandidate@3137 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3138 {
+    <name not found> = ArrayList@3139[1] { ResolutionCandidate@3140 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3141 {
     <name not found> = ArrayList@3142[1] { ResolutionCandidate@3143 }
-    <name not found> = ArrayList@3144[1] { ResolutionCandidate@3143 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3145 {
-    <name not found> = ArrayList@3146[1] { ResolutionCandidate@3147 }
-    <name not found> = ArrayList@3148[1] { ResolutionCandidate@3147 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3144 {
+    <name not found> = ArrayList@3145[1] { ResolutionCandidate@3146 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3149 {
-    <name not found> = ArrayList@3150[1] { ResolutionCandidate@3151 }
-    <name not found> = ArrayList@3152[1] { ResolutionCandidate@3151 }
+ResolutionTaskHolder@3147 {
+    <name not found> = ArrayList@3148[1] { ResolutionCandidate@3149 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3150 {
+    <name not found> = ArrayList@3151[1] { ResolutionCandidate@3152 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3153 {
     <name not found> = ArrayList@3154[1] { ResolutionCandidate@3155 }
-    <name not found> = ArrayList@3156[1] { ResolutionCandidate@3155 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3157 {
-    <name not found> = ArrayList@3158[1] { ResolutionCandidate@3159 }
-    <name not found> = ArrayList@3160[1] { ResolutionCandidate@3159 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3156 {
+    <name not found> = ArrayList@3157[1] { ResolutionCandidate@3158 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3161 {
-    <name not found> = ArrayList@3162[1] { ResolutionCandidate@3163 }
-    <name not found> = ArrayList@3164[1] { ResolutionCandidate@3163 }
+ResolutionTaskHolder@3159 {
+    <name not found> = ArrayList@3160[1] { ResolutionCandidate@3161 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3162 {
+    <name not found> = ArrayList@3163[1] { ResolutionCandidate@3164 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3165 {
     <name not found> = ArrayList@3166[1] { ResolutionCandidate@3167 }
-    <name not found> = ArrayList@3168[1] { ResolutionCandidate@3167 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3169 {
-    <name not found> = ArrayList@3170[1] { ResolutionCandidate@3171 }
-    <name not found> = ArrayList@3172[1] { ResolutionCandidate@3171 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3168 {
+    <name not found> = ArrayList@3169[1] { ResolutionCandidate@3170 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3173 {
-    <name not found> = ArrayList@3174[1] { ResolutionCandidate@3175 }
-    <name not found> = ArrayList@3176[1] { ResolutionCandidate@3175 }
+ResolutionTaskHolder@3171 {
+    <name not found> = ArrayList@3172[1] { ResolutionCandidate@3173 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3174 {
+    <name not found> = ArrayList@3175[1] { ResolutionCandidate@3176 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3177 {
     <name not found> = ArrayList@3178[1] { ResolutionCandidate@3179 }
-    <name not found> = ArrayList@3180[1] { ResolutionCandidate@3179 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3181 {
-    <name not found> = ArrayList@3182[1] { ResolutionCandidate@3183 }
-    <name not found> = ArrayList@3184[1] { ResolutionCandidate@3183 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3180 {
+    <name not found> = ArrayList@3181[1] { ResolutionCandidate@3182 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3185 {
-    <name not found> = ArrayList@3186[1] { ResolutionCandidate@3187 }
-    <name not found> = ArrayList@3188[1] { ResolutionCandidate@3187 }
+ResolutionTaskHolder@3183 {
+    <name not found> = ArrayList@3184[1] { ResolutionCandidate@3185 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3186 {
+    <name not found> = ArrayList@3187[1] { ResolutionCandidate@3188 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3189 {
     <name not found> = ArrayList@3190[1] { ResolutionCandidate@3191 }
-    <name not found> = ArrayList@3192[1] { ResolutionCandidate@3191 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3193 {
-    <name not found> = ArrayList@3194[1] { ResolutionCandidate@3195 }
-    <name not found> = ArrayList@3196[1] { ResolutionCandidate@3195 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3192 {
+    <name not found> = ArrayList@3193[1] { ResolutionCandidate@3194 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3197 {
-    <name not found> = ArrayList@3198[1] { ResolutionCandidate@3199 }
-    <name not found> = ArrayList@3200[1] { ResolutionCandidate@3199 }
+ResolutionTaskHolder@3195 {
+    <name not found> = ArrayList@3196[1] { ResolutionCandidate@3197 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3198 {
+    <name not found> = ArrayList@3199[1] { ResolutionCandidate@3200 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3201 {
     <name not found> = ArrayList@3202[1] { ResolutionCandidate@3203 }
-    <name not found> = ArrayList@3204[1] { ResolutionCandidate@3203 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3205 {
-    <name not found> = ArrayList@3206[1] { ResolutionCandidate@3207 }
-    <name not found> = ArrayList@3208[1] { ResolutionCandidate@3207 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3204 {
+    <name not found> = ArrayList@3205[1] { ResolutionCandidate@3206 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3209 {
-    <name not found> = ArrayList@3210[1] { ResolutionCandidate@3211 }
-    <name not found> = ArrayList@3212[1] { ResolutionCandidate@3211 }
+ResolutionTaskHolder@3207 {
+    <name not found> = ArrayList@3208[1] { ResolutionCandidate@3209 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3210 {
+    <name not found> = ArrayList@3211[1] { ResolutionCandidate@3212 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3213 {
     <name not found> = ArrayList@3214[1] { ResolutionCandidate@3215 }
-    <name not found> = ArrayList@3216[1] { ResolutionCandidate@3215 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3217 {
-    <name not found> = ArrayList@3218[1] { ResolutionCandidate@3219 }
-    <name not found> = ArrayList@3220[1] { ResolutionCandidate@3219 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3216 {
+    <name not found> = ArrayList@3217[1] { ResolutionCandidate@3218 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3221 {
-    <name not found> = ArrayList@3222[1] { ResolutionCandidate@3223 }
-    <name not found> = ArrayList@3224[1] { ResolutionCandidate@3223 }
+ResolutionTaskHolder@3219 {
+    <name not found> = ArrayList@3220[1] { ResolutionCandidate@3221 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3222 {
+    <name not found> = ArrayList@3223[1] { ResolutionCandidate@3224 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3225 {
     <name not found> = ArrayList@3226[1] { ResolutionCandidate@3227 }
-    <name not found> = ArrayList@3228[1] { ResolutionCandidate@3227 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3229 {
-    <name not found> = ArrayList@3230[1] { ResolutionCandidate@3231 }
-    <name not found> = ArrayList@3232[1] { ResolutionCandidate@3231 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3228 {
+    <name not found> = ArrayList@3229[1] { ResolutionCandidate@3230 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3233 {
-    <name not found> = ArrayList@3234[1] { ResolutionCandidate@3235 }
-    <name not found> = ArrayList@3236[1] { ResolutionCandidate@3235 }
+ResolutionTaskHolder@3231 {
+    <name not found> = ArrayList@3232[1] { ResolutionCandidate@3233 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3234 {
+    <name not found> = ArrayList@3235[1] { ResolutionCandidate@3236 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3237 {
     <name not found> = ArrayList@3238[1] { ResolutionCandidate@3239 }
-    <name not found> = ArrayList@3240[1] { ResolutionCandidate@3239 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3241 {
-    <name not found> = ArrayList@3242[1] { ResolutionCandidate@3243 }
-    <name not found> = ArrayList@3244[1] { ResolutionCandidate@3243 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3240 {
+    <name not found> = ArrayList@3241[1] { ResolutionCandidate@3242 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3245 {
-    <name not found> = ArrayList@3246[1] { ResolutionCandidate@3247 }
-    <name not found> = ArrayList@3248[1] { ResolutionCandidate@3247 }
+ResolutionTaskHolder@3243 {
+    <name not found> = ArrayList@3244[1] { ResolutionCandidate@3245 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3246 {
+    <name not found> = ArrayList@3247[1] { ResolutionCandidate@3248 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3249 {
     <name not found> = ArrayList@3250[1] { ResolutionCandidate@3251 }
-    <name not found> = ArrayList@3252[1] { ResolutionCandidate@3251 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3253 {
-    <name not found> = ArrayList@3254[1] { ResolutionCandidate@3255 }
-    <name not found> = ArrayList@3256[1] { ResolutionCandidate@3255 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3252 {
+    <name not found> = ArrayList@3253[1] { ResolutionCandidate@3254 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3257 {
-    <name not found> = ArrayList@3258[1] { ResolutionCandidate@3259 }
-    <name not found> = ArrayList@3260[1] { ResolutionCandidate@3259 }
+ResolutionTaskHolder@3255 {
+    <name not found> = ArrayList@3256[1] { ResolutionCandidate@3257 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3258 {
+    <name not found> = ArrayList@3259[1] { ResolutionCandidate@3260 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3261 {
     <name not found> = ArrayList@3262[1] { ResolutionCandidate@3263 }
-    <name not found> = ArrayList@3264[1] { ResolutionCandidate@3263 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3265 {
-    <name not found> = ArrayList@3266[1] { ResolutionCandidate@3267 }
-    <name not found> = ArrayList@3268[1] { ResolutionCandidate@3267 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3264 {
+    <name not found> = ArrayList@3265[1] { ResolutionCandidate@3266 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3269 {
-    <name not found> = ArrayList@3270[1] { ResolutionCandidate@3271 }
-    <name not found> = ArrayList@3272[1] { ResolutionCandidate@3271 }
+ResolutionTaskHolder@3267 {
+    <name not found> = ArrayList@3268[1] { ResolutionCandidate@3269 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3270 {
+    <name not found> = ArrayList@3271[1] { ResolutionCandidate@3272 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3273 {
     <name not found> = ArrayList@3274[1] { ResolutionCandidate@3275 }
-    <name not found> = ArrayList@3276[1] { ResolutionCandidate@3275 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3277 {
-    <name not found> = ArrayList@3278[1] { ResolutionCandidate@3279 }
-    <name not found> = ArrayList@3280[1] { ResolutionCandidate@3279 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3276 {
+    <name not found> = ArrayList@3277[1] { ResolutionCandidate@3278 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3281 {
-    <name not found> = ArrayList@3282[1] { ResolutionCandidate@3283 }
-    <name not found> = ArrayList@3284[1] { ResolutionCandidate@3283 }
+ResolutionTaskHolder@3279 {
+    <name not found> = ArrayList@3280[1] { ResolutionCandidate@3281 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3282 {
+    <name not found> = ArrayList@3283[1] { ResolutionCandidate@3284 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3285 {
     <name not found> = ArrayList@3286[1] { ResolutionCandidate@3287 }
-    <name not found> = ArrayList@3288[1] { ResolutionCandidate@3287 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3289 {
-    <name not found> = ArrayList@3290[1] { ResolutionCandidate@3291 }
-    <name not found> = ArrayList@3292[1] { ResolutionCandidate@3291 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3288 {
+    <name not found> = ArrayList@3289[1] { ResolutionCandidate@3290 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3293 {
-    <name not found> = ArrayList@3294[1] { ResolutionCandidate@3295 }
-    <name not found> = ArrayList@3296[1] { ResolutionCandidate@3295 }
+ResolutionTaskHolder@3291 {
+    <name not found> = ArrayList@3292[1] { ResolutionCandidate@3293 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3294 {
+    <name not found> = ArrayList@3295[1] { ResolutionCandidate@3296 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3297 {
     <name not found> = ArrayList@3298[1] { ResolutionCandidate@3299 }
-    <name not found> = ArrayList@3300[1] { ResolutionCandidate@3299 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3301 {
-    <name not found> = ArrayList@3302[1] { ResolutionCandidate@3303 }
-    <name not found> = ArrayList@3304[1] { ResolutionCandidate@3303 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3300 {
+    <name not found> = ArrayList@3301[1] { ResolutionCandidate@3302 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3305 {
-    <name not found> = ArrayList@3306[1] { ResolutionCandidate@3307 }
-    <name not found> = ArrayList@3308[1] { ResolutionCandidate@3307 }
+ResolutionTaskHolder@3303 {
+    <name not found> = ArrayList@3304[1] { ResolutionCandidate@3305 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3306 {
+    <name not found> = ArrayList@3307[1] { ResolutionCandidate@3308 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3309 {
     <name not found> = ArrayList@3310[1] { ResolutionCandidate@3311 }
-    <name not found> = ArrayList@3312[1] { ResolutionCandidate@3311 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3313 {
-    <name not found> = ArrayList@3314[1] { ResolutionCandidate@3315 }
-    <name not found> = ArrayList@3316[1] { ResolutionCandidate@3315 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3312 {
+    <name not found> = ArrayList@3313[1] { ResolutionCandidate@3314 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3317 {
-    <name not found> = ArrayList@3318[1] { ResolutionCandidate@3319 }
-    <name not found> = ArrayList@3320[1] { ResolutionCandidate@3319 }
+ResolutionTaskHolder@3315 {
+    <name not found> = ArrayList@3316[1] { ResolutionCandidate@3317 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3318 {
+    <name not found> = ArrayList@3319[1] { ResolutionCandidate@3320 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3321 {
     <name not found> = ArrayList@3322[1] { ResolutionCandidate@3323 }
-    <name not found> = ArrayList@3324[1] { ResolutionCandidate@3323 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3325 {
-    <name not found> = ArrayList@3326[1] { ResolutionCandidate@3327 }
-    <name not found> = ArrayList@3328[1] { ResolutionCandidate@3327 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3324 {
+    <name not found> = ArrayList@3325[1] { ResolutionCandidate@3326 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3329 {
-    <name not found> = ArrayList@3330[1] { ResolutionCandidate@3331 }
-    <name not found> = ArrayList@3332[1] { ResolutionCandidate@3331 }
+ResolutionTaskHolder@3327 {
+    <name not found> = ArrayList@3328[1] { ResolutionCandidate@3329 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3330 {
+    <name not found> = ArrayList@3331[1] { ResolutionCandidate@3332 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3333 {
     <name not found> = ArrayList@3334[1] { ResolutionCandidate@3335 }
-    <name not found> = ArrayList@3336[1] { ResolutionCandidate@3335 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3337 {
-    <name not found> = ArrayList@3338[1] { ResolutionCandidate@3339 }
-    <name not found> = ArrayList@3340[1] { ResolutionCandidate@3339 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3336 {
+    <name not found> = ArrayList@3337[1] { ResolutionCandidate@3338 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3341 {
-    <name not found> = ArrayList@3342[1] { ResolutionCandidate@3343 }
-    <name not found> = ArrayList@3344[1] { ResolutionCandidate@3343 }
+ResolutionTaskHolder@3339 {
+    <name not found> = ArrayList@3340[1] { ResolutionCandidate@3341 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3342 {
+    <name not found> = ArrayList@3343[1] { ResolutionCandidate@3344 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3345 {
     <name not found> = ArrayList@3346[1] { ResolutionCandidate@3347 }
-    <name not found> = ArrayList@3348[1] { ResolutionCandidate@3347 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3349 {
-    <name not found> = ArrayList@3350[1] { ResolutionCandidate@3351 }
-    <name not found> = ArrayList@3352[1] { ResolutionCandidate@3351 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3348 {
+    <name not found> = ArrayList@3349[1] { ResolutionCandidate@3350 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3353 {
-    <name not found> = ArrayList@3354[1] { ResolutionCandidate@3355 }
-    <name not found> = ArrayList@3356[1] { ResolutionCandidate@3355 }
+ResolutionTaskHolder@3351 {
+    <name not found> = ArrayList@3352[1] { ResolutionCandidate@3353 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3354 {
+    <name not found> = ArrayList@3355[1] { ResolutionCandidate@3356 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3357 {
     <name not found> = ArrayList@3358[1] { ResolutionCandidate@3359 }
-    <name not found> = ArrayList@3360[1] { ResolutionCandidate@3359 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3361 {
-    <name not found> = ArrayList@3362[1] { ResolutionCandidate@3363 }
-    <name not found> = ArrayList@3364[1] { ResolutionCandidate@3363 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3360 {
+    <name not found> = ArrayList@3361[1] { ResolutionCandidate@3362 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3365 {
-    <name not found> = ArrayList@3366[1] { ResolutionCandidate@3367 }
-    <name not found> = ArrayList@3368[1] { ResolutionCandidate@3367 }
+ResolutionTaskHolder@3363 {
+    <name not found> = ArrayList@3364[1] { ResolutionCandidate@3365 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3366 {
+    <name not found> = ArrayList@3367[1] { ResolutionCandidate@3368 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3369 {
     <name not found> = ArrayList@3370[1] { ResolutionCandidate@3371 }
-    <name not found> = ArrayList@3372[1] { ResolutionCandidate@3371 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3373 {
-    <name not found> = ArrayList@3374[1] { ResolutionCandidate@3375 }
-    <name not found> = ArrayList@3376[1] { ResolutionCandidate@3375 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3372 {
+    <name not found> = ArrayList@3373[1] { ResolutionCandidate@3374 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3377 {
-    <name not found> = ArrayList@3378[1] { ResolutionCandidate@3379 }
-    <name not found> = ArrayList@3380[1] { ResolutionCandidate@3379 }
+ResolutionTaskHolder@3375 {
+    <name not found> = ArrayList@3376[1] { ResolutionCandidate@3377 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3378 {
+    <name not found> = ArrayList@3379[1] { ResolutionCandidate@3380 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3381 {
     <name not found> = ArrayList@3382[1] { ResolutionCandidate@3383 }
-    <name not found> = ArrayList@3384[1] { ResolutionCandidate@3383 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3385 {
-    <name not found> = ArrayList@3386[1] { ResolutionCandidate@3387 }
-    <name not found> = ArrayList@3388[1] { ResolutionCandidate@3387 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3384 {
+    <name not found> = ArrayList@3385[1] { ResolutionCandidate@3386 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3389 {
-    <name not found> = ArrayList@3390[1] { ResolutionCandidate@3391 }
-    <name not found> = ArrayList@3392[1] { ResolutionCandidate@3391 }
+ResolutionTaskHolder@3387 {
+    <name not found> = ArrayList@3388[1] { ResolutionCandidate@3389 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3390 {
+    <name not found> = ArrayList@3391[1] { ResolutionCandidate@3392 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3393 {
     <name not found> = ArrayList@3394[1] { ResolutionCandidate@3395 }
-    <name not found> = ArrayList@3396[1] { ResolutionCandidate@3395 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3397 {
-    <name not found> = ArrayList@3398[1] { ResolutionCandidate@3399 }
-    <name not found> = ArrayList@3400[1] { ResolutionCandidate@3399 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3396 {
+    <name not found> = ArrayList@3397[1] { ResolutionCandidate@3398 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3401 {
-    <name not found> = ArrayList@3402[1] { ResolutionCandidate@3403 }
-    <name not found> = ArrayList@3404[1] { ResolutionCandidate@3403 }
+ResolutionTaskHolder@3399 {
+    <name not found> = ArrayList@3400[1] { ResolutionCandidate@3401 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3402 {
+    <name not found> = ArrayList@3403[1] { ResolutionCandidate@3404 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3405 {
     <name not found> = ArrayList@3406[1] { ResolutionCandidate@3407 }
-    <name not found> = ArrayList@3408[1] { ResolutionCandidate@3407 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3409 {
-    <name not found> = ArrayList@3410[1] { ResolutionCandidate@3411 }
-    <name not found> = ArrayList@3412[1] { ResolutionCandidate@3411 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3408 {
+    <name not found> = ArrayList@3409[1] { ResolutionCandidate@3410 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3413 {
-    <name not found> = ArrayList@3414[1] { ResolutionCandidate@3415 }
-    <name not found> = ArrayList@3416[1] { ResolutionCandidate@3415 }
+ResolutionTaskHolder@3411 {
+    <name not found> = ArrayList@3412[1] { ResolutionCandidate@3413 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3414 {
+    <name not found> = ArrayList@3415[1] { ResolutionCandidate@3416 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3417 {
     <name not found> = ArrayList@3418[1] { ResolutionCandidate@3419 }
-    <name not found> = ArrayList@3420[1] { ResolutionCandidate@3419 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3421 {
-    <name not found> = ArrayList@3422[1] { ResolutionCandidate@3423 }
-    <name not found> = ArrayList@3424[1] { ResolutionCandidate@3423 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3420 {
+    <name not found> = ArrayList@3421[1] { ResolutionCandidate@3422 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3425 {
-    <name not found> = ArrayList@3426[1] { ResolutionCandidate@3427 }
-    <name not found> = ArrayList@3428[1] { ResolutionCandidate@3427 }
+ResolutionTaskHolder@3423 {
+    <name not found> = ArrayList@3424[1] { ResolutionCandidate@3425 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3426 {
+    <name not found> = ArrayList@3427[1] { ResolutionCandidate@3428 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3429 {
     <name not found> = ArrayList@3430[1] { ResolutionCandidate@3431 }
-    <name not found> = ArrayList@3432[1] { ResolutionCandidate@3431 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3433 {
-    <name not found> = ArrayList@3434[1] { ResolutionCandidate@3435 }
-    <name not found> = ArrayList@3436[1] { ResolutionCandidate@3435 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3432 {
+    <name not found> = ArrayList@3433[1] { ResolutionCandidate@3434 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3437 {
-    <name not found> = ArrayList@3438[1] { ResolutionCandidate@3439 }
-    <name not found> = ArrayList@3440[1] { ResolutionCandidate@3439 }
+ResolutionTaskHolder@3435 {
+    <name not found> = ArrayList@3436[1] { ResolutionCandidate@3437 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3438 {
+    <name not found> = ArrayList@3439[1] { ResolutionCandidate@3440 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3441 {
     <name not found> = ArrayList@3442[1] { ResolutionCandidate@3443 }
-    <name not found> = ArrayList@3444[1] { ResolutionCandidate@3443 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3445 {
-    <name not found> = ArrayList@3446[1] { ResolutionCandidate@3447 }
-    <name not found> = ArrayList@3448[1] { ResolutionCandidate@3447 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3444 {
+    <name not found> = ArrayList@3445[1] { ResolutionCandidate@3446 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3449 {
-    <name not found> = ArrayList@3450[1] { ResolutionCandidate@3451 }
-    <name not found> = ArrayList@3452[1] { ResolutionCandidate@3451 }
+ResolutionTaskHolder@3447 {
+    <name not found> = ArrayList@3448[1] { ResolutionCandidate@3449 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3450 {
+    <name not found> = ArrayList@3451[1] { ResolutionCandidate@3452 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3453 {
     <name not found> = ArrayList@3454[1] { ResolutionCandidate@3455 }
-    <name not found> = ArrayList@3456[1] { ResolutionCandidate@3455 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3457 {
-    <name not found> = ArrayList@3458[1] { ResolutionCandidate@3459 }
-    <name not found> = ArrayList@3460[1] { ResolutionCandidate@3459 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3456 {
+    <name not found> = ArrayList@3457[1] { ResolutionCandidate@3458 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3461 {
-    <name not found> = ArrayList@3462[1] { ResolutionCandidate@3463 }
-    <name not found> = ArrayList@3464[1] { ResolutionCandidate@3463 }
+ResolutionTaskHolder@3459 {
+    <name not found> = ArrayList@3460[1] { ResolutionCandidate@3461 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3462 {
+    <name not found> = ArrayList@3463[1] { ResolutionCandidate@3464 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3465 {
     <name not found> = ArrayList@3466[1] { ResolutionCandidate@3467 }
-    <name not found> = ArrayList@3468[1] { ResolutionCandidate@3467 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3469 {
-    <name not found> = ArrayList@3470[1] { ResolutionCandidate@3471 }
-    <name not found> = ArrayList@3472[1] { ResolutionCandidate@3471 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3468 {
+    <name not found> = ArrayList@3469[1] { ResolutionCandidate@3470 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3473 {
-    <name not found> = ArrayList@3474[1] { ResolutionCandidate@3475 }
-    <name not found> = ArrayList@3476[1] { ResolutionCandidate@3475 }
+ResolutionTaskHolder@3471 {
+    <name not found> = ArrayList@3472[1] { ResolutionCandidate@3473 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3474 {
+    <name not found> = ArrayList@3475[1] { ResolutionCandidate@3476 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3477 {
     <name not found> = ArrayList@3478[1] { ResolutionCandidate@3479 }
-    <name not found> = ArrayList@3480[1] { ResolutionCandidate@3479 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3481 {
-    <name not found> = ArrayList@3482[1] { ResolutionCandidate@3483 }
-    <name not found> = ArrayList@3484[1] { ResolutionCandidate@3483 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3480 {
+    <name not found> = ArrayList@3481[1] { ResolutionCandidate@3482 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3485 {
-    <name not found> = ArrayList@3486[1] { ResolutionCandidate@3487 }
-    <name not found> = ArrayList@3488[1] { ResolutionCandidate@3487 }
+ResolutionTaskHolder@3483 {
+    <name not found> = ArrayList@3484[1] { ResolutionCandidate@3485 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3486 {
+    <name not found> = ArrayList@3487[1] { ResolutionCandidate@3488 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3489 {
     <name not found> = ArrayList@3490[1] { ResolutionCandidate@3491 }
-    <name not found> = ArrayList@3492[1] { ResolutionCandidate@3491 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3493 {
-    <name not found> = ArrayList@3494[1] { ResolutionCandidate@3495 }
-    <name not found> = ArrayList@3496[1] { ResolutionCandidate@3495 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3492 {
+    <name not found> = ArrayList@3493[1] { ResolutionCandidate@3494 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3497 {
-    <name not found> = ArrayList@3498[1] { ResolutionCandidate@3499 }
-    <name not found> = ArrayList@3500[1] { ResolutionCandidate@3499 }
+ResolutionTaskHolder@3495 {
+    <name not found> = ArrayList@3496[1] { ResolutionCandidate@3497 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3498 {
+    <name not found> = ArrayList@3499[1] { ResolutionCandidate@3500 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3501 {
     <name not found> = ArrayList@3502[1] { ResolutionCandidate@3503 }
-    <name not found> = ArrayList@3504[1] { ResolutionCandidate@3503 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3505 {
-    <name not found> = ArrayList@3506[1] { ResolutionCandidate@3507 }
-    <name not found> = ArrayList@3508[1] { ResolutionCandidate@3507 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3504 {
+    <name not found> = ArrayList@3505[1] { ResolutionCandidate@3506 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3509 {
-    <name not found> = ArrayList@3510[1] { ResolutionCandidate@3511 }
-    <name not found> = ArrayList@3512[1] { ResolutionCandidate@3511 }
+ResolutionTaskHolder@3507 {
+    <name not found> = ArrayList@3508[1] { ResolutionCandidate@3509 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3510 {
+    <name not found> = ArrayList@3511[1] { ResolutionCandidate@3512 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3513 {
     <name not found> = ArrayList@3514[1] { ResolutionCandidate@3515 }
-    <name not found> = ArrayList@3516[1] { ResolutionCandidate@3515 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3517 {
-    <name not found> = ArrayList@3518[1] { ResolutionCandidate@3519 }
-    <name not found> = ArrayList@3520[1] { ResolutionCandidate@3519 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3516 {
+    <name not found> = ArrayList@3517[1] { ResolutionCandidate@3518 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3521 {
-    <name not found> = ArrayList@3522[1] { ResolutionCandidate@3523 }
-    <name not found> = ArrayList@3524[1] { ResolutionCandidate@3523 }
+ResolutionTaskHolder@3519 {
+    <name not found> = ArrayList@3520[1] { ResolutionCandidate@3521 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3522 {
+    <name not found> = ArrayList@3523[1] { ResolutionCandidate@3524 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3525 {
     <name not found> = ArrayList@3526[1] { ResolutionCandidate@3527 }
-    <name not found> = ArrayList@3528[1] { ResolutionCandidate@3527 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3529 {
-    <name not found> = ArrayList@3530[1] { ResolutionCandidate@3531 }
-    <name not found> = ArrayList@3532[1] { ResolutionCandidate@3531 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3528 {
+    <name not found> = ArrayList@3529[1] { ResolutionCandidate@3530 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3533 {
-    <name not found> = ArrayList@3534[1] { ResolutionCandidate@3535 }
-    <name not found> = ArrayList@3536[1] { ResolutionCandidate@3535 }
+ResolutionTaskHolder@3531 {
+    <name not found> = ArrayList@3532[1] { ResolutionCandidate@3533 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3534 {
+    <name not found> = ArrayList@3535[1] { ResolutionCandidate@3536 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3537 {
     <name not found> = ArrayList@3538[1] { ResolutionCandidate@3539 }
-    <name not found> = ArrayList@3540[1] { ResolutionCandidate@3539 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3541 {
-    <name not found> = ArrayList@3542[1] { ResolutionCandidate@3543 }
-    <name not found> = ArrayList@3544[1] { ResolutionCandidate@3543 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3540 {
+    <name not found> = ArrayList@3541[1] { ResolutionCandidate@3542 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3545 {
-    <name not found> = ArrayList@3546[1] { ResolutionCandidate@3547 }
-    <name not found> = ArrayList@3548[1] { ResolutionCandidate@3547 }
+ResolutionTaskHolder@3543 {
+    <name not found> = ArrayList@3544[1] { ResolutionCandidate@3545 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3546 {
+    <name not found> = ArrayList@3547[1] { ResolutionCandidate@3548 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3549 {
     <name not found> = ArrayList@3550[1] { ResolutionCandidate@3551 }
-    <name not found> = ArrayList@3552[1] { ResolutionCandidate@3551 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3553 {
-    <name not found> = ArrayList@3554[1] { ResolutionCandidate@3555 }
-    <name not found> = ArrayList@3556[1] { ResolutionCandidate@3555 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3552 {
+    <name not found> = ArrayList@3553[1] { ResolutionCandidate@3554 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3557 {
-    <name not found> = ArrayList@3558[1] { ResolutionCandidate@3559 }
-    <name not found> = ArrayList@3560[1] { ResolutionCandidate@3559 }
+ResolutionTaskHolder@3555 {
+    <name not found> = ArrayList@3556[1] { ResolutionCandidate@3557 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3558 {
+    <name not found> = ArrayList@3559[1] { ResolutionCandidate@3560 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3561 {
     <name not found> = ArrayList@3562[1] { ResolutionCandidate@3563 }
-    <name not found> = ArrayList@3564[1] { ResolutionCandidate@3563 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3565 {
-    <name not found> = ArrayList@3566[1] { ResolutionCandidate@3567 }
-    <name not found> = ArrayList@3568[1] { ResolutionCandidate@3567 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3564 {
+    <name not found> = ArrayList@3565[1] { ResolutionCandidate@3566 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3569 {
-    <name not found> = ArrayList@3570[1] { ResolutionCandidate@3571 }
-    <name not found> = ArrayList@3572[1] { ResolutionCandidate@3571 }
+ResolutionTaskHolder@3567 {
+    <name not found> = ArrayList@3568[1] { ResolutionCandidate@3569 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3570 {
+    <name not found> = ArrayList@3571[1] { ResolutionCandidate@3572 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3573 {
     <name not found> = ArrayList@3574[1] { ResolutionCandidate@3575 }
-    <name not found> = ArrayList@3576[1] { ResolutionCandidate@3575 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3577 {
-    <name not found> = ArrayList@3578[1] { ResolutionCandidate@3579 }
-    <name not found> = ArrayList@3580[1] { ResolutionCandidate@3579 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3576 {
+    <name not found> = ArrayList@3577[1] { ResolutionCandidate@3578 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3581 {
-    <name not found> = ArrayList@3582[1] { ResolutionCandidate@3583 }
-    <name not found> = ArrayList@3584[1] { ResolutionCandidate@3583 }
+ResolutionTaskHolder@3579 {
+    <name not found> = ArrayList@3580[1] { ResolutionCandidate@3581 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3582 {
+    <name not found> = ArrayList@3583[1] { ResolutionCandidate@3584 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3585 {
     <name not found> = ArrayList@3586[1] { ResolutionCandidate@3587 }
-    <name not found> = ArrayList@3588[1] { ResolutionCandidate@3587 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3589 {
-    <name not found> = ArrayList@3590[1] { ResolutionCandidate@3591 }
-    <name not found> = ArrayList@3592[1] { ResolutionCandidate@3591 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3588 {
+    <name not found> = ArrayList@3589[1] { ResolutionCandidate@3590 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3593 {
-    <name not found> = ArrayList@3594[1] { ResolutionCandidate@3595 }
-    <name not found> = ArrayList@3596[1] { ResolutionCandidate@3595 }
+ResolutionTaskHolder@3591 {
+    <name not found> = ArrayList@3592[1] { ResolutionCandidate@3593 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3594 {
+    <name not found> = ArrayList@3595[1] { ResolutionCandidate@3596 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3597 {
     <name not found> = ArrayList@3598[1] { ResolutionCandidate@3599 }
-    <name not found> = ArrayList@3600[1] { ResolutionCandidate@3599 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3601 {
-    <name not found> = ArrayList@3602[1] { ResolutionCandidate@3603 }
-    <name not found> = ArrayList@3604[1] { ResolutionCandidate@3603 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3600 {
+    <name not found> = ArrayList@3601[1] { ResolutionCandidate@3602 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3605 {
-    <name not found> = ArrayList@3606[1] { ResolutionCandidate@3607 }
-    <name not found> = ArrayList@3608[1] { ResolutionCandidate@3607 }
+ResolutionTaskHolder@3603 {
+    <name not found> = ArrayList@3604[1] { ResolutionCandidate@3605 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3606 {
+    <name not found> = ArrayList@3607[1] { ResolutionCandidate@3608 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3609 {
     <name not found> = ArrayList@3610[1] { ResolutionCandidate@3611 }
-    <name not found> = ArrayList@3612[1] { ResolutionCandidate@3611 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3613 {
-    <name not found> = ArrayList@3614[1] { ResolutionCandidate@3615 }
-    <name not found> = ArrayList@3616[1] { ResolutionCandidate@3615 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3612 {
+    <name not found> = ArrayList@3613[1] { ResolutionCandidate@3614 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3617 {
-    <name not found> = ArrayList@3618[1] { ResolutionCandidate@3619 }
-    <name not found> = ArrayList@3620[1] { ResolutionCandidate@3619 }
+ResolutionTaskHolder@3615 {
+    <name not found> = ArrayList@3616[1] { ResolutionCandidate@3617 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3618 {
+    <name not found> = ArrayList@3619[1] { ResolutionCandidate@3620 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3621 {
     <name not found> = ArrayList@3622[1] { ResolutionCandidate@3623 }
-    <name not found> = ArrayList@3624[1] { ResolutionCandidate@3623 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3625 {
-    <name not found> = ArrayList@3626[1] { ResolutionCandidate@3627 }
-    <name not found> = ArrayList@3628[1] { ResolutionCandidate@3627 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3624 {
+    <name not found> = ArrayList@3625[1] { ResolutionCandidate@3626 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3629 {
-    <name not found> = ArrayList@3630[1] { ResolutionCandidate@3631 }
-    <name not found> = ArrayList@3632[1] { ResolutionCandidate@3631 }
+ResolutionTaskHolder@3627 {
+    <name not found> = ArrayList@3628[1] { ResolutionCandidate@3629 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3630 {
+    <name not found> = ArrayList@3631[1] { ResolutionCandidate@3632 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3633 {
     <name not found> = ArrayList@3634[1] { ResolutionCandidate@3635 }
-    <name not found> = ArrayList@3636[1] { ResolutionCandidate@3635 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3637 {
-    <name not found> = ArrayList@3638[1] { ResolutionCandidate@3639 }
-    <name not found> = ArrayList@3640[1] { ResolutionCandidate@3639 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3636 {
+    <name not found> = ArrayList@3637[1] { ResolutionCandidate@3638 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3641 {
-    <name not found> = ArrayList@3642[1] { ResolutionCandidate@3643 }
-    <name not found> = ArrayList@3644[1] { ResolutionCandidate@3643 }
+ResolutionTaskHolder@3639 {
+    <name not found> = ArrayList@3640[1] { ResolutionCandidate@3641 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3642 {
+    <name not found> = ArrayList@3643[1] { ResolutionCandidate@3644 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3645 {
     <name not found> = ArrayList@3646[1] { ResolutionCandidate@3647 }
-    <name not found> = ArrayList@3648[1] { ResolutionCandidate@3647 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3649 {
-    <name not found> = ArrayList@3650[1] { ResolutionCandidate@3651 }
-    <name not found> = ArrayList@3652[1] { ResolutionCandidate@3651 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3648 {
+    <name not found> = ArrayList@3649[1] { ResolutionCandidate@3650 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3653 {
-    <name not found> = ArrayList@3654[1] { ResolutionCandidate@3655 }
-    <name not found> = ArrayList@3656[1] { ResolutionCandidate@3655 }
+ResolutionTaskHolder@3651 {
+    <name not found> = ArrayList@3652[1] { ResolutionCandidate@3653 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3654 {
+    <name not found> = ArrayList@3655[1] { ResolutionCandidate@3656 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3657 {
     <name not found> = ArrayList@3658[1] { ResolutionCandidate@3659 }
-    <name not found> = ArrayList@3660[1] { ResolutionCandidate@3659 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3661 {
-    <name not found> = ArrayList@3662[1] { ResolutionCandidate@3663 }
-    <name not found> = ArrayList@3664[1] { ResolutionCandidate@3663 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3660 {
+    <name not found> = ArrayList@3661[1] { ResolutionCandidate@3662 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3665 {
-    <name not found> = ArrayList@3666[1] { ResolutionCandidate@3667 }
-    <name not found> = ArrayList@3668[1] { ResolutionCandidate@3667 }
+ResolutionTaskHolder@3663 {
+    <name not found> = ArrayList@3664[1] { ResolutionCandidate@3665 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3666 {
+    <name not found> = ArrayList@3667[1] { ResolutionCandidate@3668 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3669 {
     <name not found> = ArrayList@3670[1] { ResolutionCandidate@3671 }
-    <name not found> = ArrayList@3672[1] { ResolutionCandidate@3671 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3673 {
-    <name not found> = ArrayList@3674[1] { ResolutionCandidate@3675 }
-    <name not found> = ArrayList@3676[1] { ResolutionCandidate@3675 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3672 {
+    <name not found> = ArrayList@3673[1] { ResolutionCandidate@3674 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3677 {
-    <name not found> = ArrayList@3678[1] { ResolutionCandidate@3679 }
-    <name not found> = ArrayList@3680[1] { ResolutionCandidate@3679 }
+ResolutionTaskHolder@3675 {
+    <name not found> = ArrayList@3676[1] { ResolutionCandidate@3677 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3678 {
+    <name not found> = ArrayList@3679[1] { ResolutionCandidate@3680 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3681 {
     <name not found> = ArrayList@3682[1] { ResolutionCandidate@3683 }
-    <name not found> = ArrayList@3684[1] { ResolutionCandidate@3683 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3685 {
-    <name not found> = ArrayList@3686[1] { ResolutionCandidate@3687 }
-    <name not found> = ArrayList@3688[1] { ResolutionCandidate@3687 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3684 {
+    <name not found> = ArrayList@3685[1] { ResolutionCandidate@3686 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3689 {
-    <name not found> = ArrayList@3690[1] { ResolutionCandidate@3691 }
-    <name not found> = ArrayList@3692[1] { ResolutionCandidate@3691 }
+ResolutionTaskHolder@3687 {
+    <name not found> = ArrayList@3688[1] { ResolutionCandidate@3689 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3690 {
+    <name not found> = ArrayList@3691[1] { ResolutionCandidate@3692 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3693 {
     <name not found> = ArrayList@3694[1] { ResolutionCandidate@3695 }
-    <name not found> = ArrayList@3696[1] { ResolutionCandidate@3695 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3697 {
-    <name not found> = ArrayList@3698[1] { ResolutionCandidate@3699 }
-    <name not found> = ArrayList@3700[1] { ResolutionCandidate@3699 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3696 {
+    <name not found> = ArrayList@3697[1] { ResolutionCandidate@3698 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3701 {
-    <name not found> = ArrayList@3702[1] { ResolutionCandidate@3703 }
-    <name not found> = ArrayList@3704[1] { ResolutionCandidate@3703 }
+ResolutionTaskHolder@3699 {
+    <name not found> = ArrayList@3700[1] { ResolutionCandidate@3701 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3702 {
+    <name not found> = ArrayList@3703[1] { ResolutionCandidate@3704 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3705 {
     <name not found> = ArrayList@3706[1] { ResolutionCandidate@3707 }
-    <name not found> = ArrayList@3708[1] { ResolutionCandidate@3707 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3709 {
-    <name not found> = ArrayList@3710[1] { ResolutionCandidate@3711 }
-    <name not found> = ArrayList@3712[1] { ResolutionCandidate@3711 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3708 {
+    <name not found> = ArrayList@3709[1] { ResolutionCandidate@3710 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3713 {
-    <name not found> = ArrayList@3714[1] { ResolutionCandidate@3715 }
-    <name not found> = ArrayList@3716[1] { ResolutionCandidate@3715 }
+ResolutionTaskHolder@3711 {
+    <name not found> = ArrayList@3712[1] { ResolutionCandidate@3713 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3714 {
+    <name not found> = ArrayList@3715[1] { ResolutionCandidate@3716 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3717 {
     <name not found> = ArrayList@3718[1] { ResolutionCandidate@3719 }
-    <name not found> = ArrayList@3720[1] { ResolutionCandidate@3719 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3721 {
-    <name not found> = ArrayList@3722[1] { ResolutionCandidate@3723 }
-    <name not found> = ArrayList@3724[1] { ResolutionCandidate@3723 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3720 {
+    <name not found> = ArrayList@3721[1] { ResolutionCandidate@3722 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3725 {
-    <name not found> = ArrayList@3726[1] { ResolutionCandidate@3727 }
-    <name not found> = ArrayList@3728[1] { ResolutionCandidate@3727 }
+ResolutionTaskHolder@3723 {
+    <name not found> = ArrayList@3724[1] { ResolutionCandidate@3725 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3726 {
+    <name not found> = ArrayList@3727[1] { ResolutionCandidate@3728 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3729 {
     <name not found> = ArrayList@3730[1] { ResolutionCandidate@3731 }
-    <name not found> = ArrayList@3732[1] { ResolutionCandidate@3731 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3733 {
-    <name not found> = ArrayList@3734[1] { ResolutionCandidate@3735 }
-    <name not found> = ArrayList@3736[1] { ResolutionCandidate@3735 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3732 {
+    <name not found> = ArrayList@3733[1] { ResolutionCandidate@3734 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3737 {
-    <name not found> = ArrayList@3738[1] { ResolutionCandidate@3739 }
-    <name not found> = ArrayList@3740[1] { ResolutionCandidate@3739 }
+ResolutionTaskHolder@3735 {
+    <name not found> = ArrayList@3736[1] { ResolutionCandidate@3737 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3738 {
+    <name not found> = ArrayList@3739[1] { ResolutionCandidate@3740 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3741 {
     <name not found> = ArrayList@3742[1] { ResolutionCandidate@3743 }
-    <name not found> = ArrayList@3744[1] { ResolutionCandidate@3743 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3745 {
-    <name not found> = ArrayList@3746[1] { ResolutionCandidate@3747 }
-    <name not found> = ArrayList@3748[1] { ResolutionCandidate@3747 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3744 {
+    <name not found> = ArrayList@3745[1] { ResolutionCandidate@3746 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3749 {
-    <name not found> = ArrayList@3750[1] { ResolutionCandidate@3751 }
-    <name not found> = ArrayList@3752[1] { ResolutionCandidate@3751 }
+ResolutionTaskHolder@3747 {
+    <name not found> = ArrayList@3748[1] { ResolutionCandidate@3749 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3750 {
+    <name not found> = ArrayList@3751[1] { ResolutionCandidate@3752 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3753 {
     <name not found> = ArrayList@3754[1] { ResolutionCandidate@3755 }
-    <name not found> = ArrayList@3756[1] { ResolutionCandidate@3755 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3757 {
-    <name not found> = ArrayList@3758[1] { ResolutionCandidate@3759 }
-    <name not found> = ArrayList@3760[1] { ResolutionCandidate@3759 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3756 {
+    <name not found> = ArrayList@3757[1] { ResolutionCandidate@3758 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3761 {
-    <name not found> = ArrayList@3762[1] { ResolutionCandidate@3763 }
-    <name not found> = ArrayList@3764[1] { ResolutionCandidate@3763 }
+ResolutionTaskHolder@3759 {
+    <name not found> = ArrayList@3760[1] { ResolutionCandidate@3761 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3762 {
+    <name not found> = ArrayList@3763[1] { ResolutionCandidate@3764 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3765 {
     <name not found> = ArrayList@3766[1] { ResolutionCandidate@3767 }
-    <name not found> = ArrayList@3768[1] { ResolutionCandidate@3767 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3769 {
-    <name not found> = ArrayList@3770[1] { ResolutionCandidate@3771 }
-    <name not found> = ArrayList@3772[1] { ResolutionCandidate@3771 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3768 {
+    <name not found> = ArrayList@3769[1] { ResolutionCandidate@3770 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3773 {
-    <name not found> = ArrayList@3774[1] { ResolutionCandidate@3775 }
-    <name not found> = ArrayList@3776[1] { ResolutionCandidate@3775 }
+ResolutionTaskHolder@3771 {
+    <name not found> = ArrayList@3772[1] { ResolutionCandidate@3773 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3774 {
+    <name not found> = ArrayList@3775[1] { ResolutionCandidate@3776 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3777 {
     <name not found> = ArrayList@3778[1] { ResolutionCandidate@3779 }
-    <name not found> = ArrayList@3780[1] { ResolutionCandidate@3779 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3781 {
-    <name not found> = ArrayList@3782[1] { ResolutionCandidate@3783 }
-    <name not found> = ArrayList@3784[1] { ResolutionCandidate@3783 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3780 {
+    <name not found> = ArrayList@3781[1] { ResolutionCandidate@3782 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3785 {
-    <name not found> = ArrayList@3786[1] { ResolutionCandidate@3787 }
-    <name not found> = ArrayList@3788[1] { ResolutionCandidate@3787 }
+ResolutionTaskHolder@3783 {
+    <name not found> = ArrayList@3784[1] { ResolutionCandidate@3785 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3786 {
+    <name not found> = ArrayList@3787[1] { ResolutionCandidate@3788 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3789 {
     <name not found> = ArrayList@3790[1] { ResolutionCandidate@3791 }
-    <name not found> = ArrayList@3792[1] { ResolutionCandidate@3791 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3793 {
-    <name not found> = ArrayList@3794[1] { ResolutionCandidate@3795 }
-    <name not found> = ArrayList@3796[1] { ResolutionCandidate@3795 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3792 {
+    <name not found> = ArrayList@3793[1] { ResolutionCandidate@3794 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3797 {
-    <name not found> = ArrayList@3798[1] { ResolutionCandidate@3799 }
-    <name not found> = ArrayList@3800[1] { ResolutionCandidate@3799 }
+ResolutionTaskHolder@3795 {
+    <name not found> = ArrayList@3796[1] { ResolutionCandidate@3797 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3798 {
+    <name not found> = ArrayList@3799[1] { ResolutionCandidate@3800 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3801 {
     <name not found> = ArrayList@3802[1] { ResolutionCandidate@3803 }
-    <name not found> = ArrayList@3804[1] { ResolutionCandidate@3803 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3805 {
-    <name not found> = ArrayList@3806[1] { ResolutionCandidate@3807 }
-    <name not found> = ArrayList@3808[1] { ResolutionCandidate@3807 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3804 {
+    <name not found> = ArrayList@3805[1] { ResolutionCandidate@3806 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3809 {
-    <name not found> = ArrayList@3810[1] { ResolutionCandidate@3811 }
-    <name not found> = ArrayList@3812[1] { ResolutionCandidate@3811 }
+ResolutionTaskHolder@3807 {
+    <name not found> = ArrayList@3808[1] { ResolutionCandidate@3809 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3810 {
+    <name not found> = ArrayList@3811[1] { ResolutionCandidate@3812 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3813 {
     <name not found> = ArrayList@3814[1] { ResolutionCandidate@3815 }
-    <name not found> = ArrayList@3816[1] { ResolutionCandidate@3815 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3817 {
-    <name not found> = ArrayList@3818[1] { ResolutionCandidate@3819 }
-    <name not found> = ArrayList@3820[1] { ResolutionCandidate@3819 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3816 {
+    <name not found> = ArrayList@3817[1] { ResolutionCandidate@3818 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3821 {
-    <name not found> = ArrayList@3822[1] { ResolutionCandidate@3823 }
-    <name not found> = ArrayList@3824[1] { ResolutionCandidate@3823 }
+ResolutionTaskHolder@3819 {
+    <name not found> = ArrayList@3820[1] { ResolutionCandidate@3821 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3822 {
+    <name not found> = ArrayList@3823[1] { ResolutionCandidate@3824 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3825 {
     <name not found> = ArrayList@3826[1] { ResolutionCandidate@3827 }
-    <name not found> = ArrayList@3828[1] { ResolutionCandidate@3827 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3829 {
-    <name not found> = ArrayList@3830[1] { ResolutionCandidate@3831 }
-    <name not found> = ArrayList@3832[1] { ResolutionCandidate@3831 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3828 {
+    <name not found> = ArrayList@3829[1] { ResolutionCandidate@3830 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3833 {
-    <name not found> = ArrayList@3834[1] { ResolutionCandidate@3835 }
-    <name not found> = ArrayList@3836[1] { ResolutionCandidate@3835 }
+ResolutionTaskHolder@3831 {
+    <name not found> = ArrayList@3832[1] { ResolutionCandidate@3833 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3834 {
+    <name not found> = ArrayList@3835[1] { ResolutionCandidate@3836 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3837 {
     <name not found> = ArrayList@3838[1] { ResolutionCandidate@3839 }
-    <name not found> = ArrayList@3840[1] { ResolutionCandidate@3839 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3841 {
-    <name not found> = ArrayList@3842[1] { ResolutionCandidate@3843 }
-    <name not found> = ArrayList@3844[1] { ResolutionCandidate@3843 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3840 {
+    <name not found> = ArrayList@3841[1] { ResolutionCandidate@3842 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3845 {
-    <name not found> = ArrayList@3846[1] { ResolutionCandidate@3847 }
-    <name not found> = ArrayList@3848[1] { ResolutionCandidate@3847 }
+ResolutionTaskHolder@3843 {
+    <name not found> = ArrayList@3844[1] { ResolutionCandidate@3845 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3846 {
+    <name not found> = ArrayList@3847[1] { ResolutionCandidate@3848 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3849 {
     <name not found> = ArrayList@3850[1] { ResolutionCandidate@3851 }
-    <name not found> = ArrayList@3852[1] { ResolutionCandidate@3851 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3853 {
-    <name not found> = ArrayList@3854[1] { ResolutionCandidate@3855 }
-    <name not found> = ArrayList@3856[1] { ResolutionCandidate@3855 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3852 {
+    <name not found> = ArrayList@3853[1] { ResolutionCandidate@3854 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3857 {
-    <name not found> = ArrayList@3858[1] { ResolutionCandidate@3859 }
-    <name not found> = ArrayList@3860[1] { ResolutionCandidate@3859 }
+ResolutionTaskHolder@3855 {
+    <name not found> = ArrayList@3856[1] { ResolutionCandidate@3857 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3858 {
+    <name not found> = ArrayList@3859[1] { ResolutionCandidate@3860 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3861 {
     <name not found> = ArrayList@3862[1] { ResolutionCandidate@3863 }
-    <name not found> = ArrayList@3864[1] { ResolutionCandidate@3863 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3865 {
-    <name not found> = ArrayList@3866[1] { ResolutionCandidate@3867 }
-    <name not found> = ArrayList@3868[1] { ResolutionCandidate@3867 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3864 {
+    <name not found> = ArrayList@3865[1] { ResolutionCandidate@3866 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3869 {
-    <name not found> = ArrayList@3870[1] { ResolutionCandidate@3871 }
-    <name not found> = ArrayList@3872[1] { ResolutionCandidate@3871 }
+ResolutionTaskHolder@3867 {
+    <name not found> = ArrayList@3868[1] { ResolutionCandidate@3869 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3870 {
+    <name not found> = ArrayList@3871[1] { ResolutionCandidate@3872 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3873 {
     <name not found> = ArrayList@3874[1] { ResolutionCandidate@3875 }
-    <name not found> = ArrayList@3876[1] { ResolutionCandidate@3875 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3877 {
-    <name not found> = ArrayList@3878[1] { ResolutionCandidate@3879 }
-    <name not found> = ArrayList@3880[1] { ResolutionCandidate@3879 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3876 {
+    <name not found> = ArrayList@3877[1] { ResolutionCandidate@3878 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3881 {
-    <name not found> = ArrayList@3882[1] { ResolutionCandidate@3883 }
-    <name not found> = ArrayList@3884[1] { ResolutionCandidate@3883 }
+ResolutionTaskHolder@3879 {
+    <name not found> = ArrayList@3880[1] { ResolutionCandidate@3881 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3882 {
+    <name not found> = ArrayList@3883[1] { ResolutionCandidate@3884 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3885 {
     <name not found> = ArrayList@3886[1] { ResolutionCandidate@3887 }
-    <name not found> = ArrayList@3888[1] { ResolutionCandidate@3887 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3889 {
-    <name not found> = ArrayList@3890[1] { ResolutionCandidate@3891 }
-    <name not found> = ArrayList@3892[1] { ResolutionCandidate@3891 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3888 {
+    <name not found> = ArrayList@3889[1] { ResolutionCandidate@3890 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3893 {
-    <name not found> = ArrayList@3894[1] { ResolutionCandidate@3895 }
-    <name not found> = ArrayList@3896[1] { ResolutionCandidate@3895 }
+ResolutionTaskHolder@3891 {
+    <name not found> = ArrayList@3892[1] { ResolutionCandidate@3893 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3894 {
+    <name not found> = ArrayList@3895[1] { ResolutionCandidate@3896 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3897 {
     <name not found> = ArrayList@3898[1] { ResolutionCandidate@3899 }
-    <name not found> = ArrayList@3900[1] { ResolutionCandidate@3899 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3901 {
-    <name not found> = ArrayList@3902[1] { ResolutionCandidate@3903 }
-    <name not found> = ArrayList@3904[1] { ResolutionCandidate@3903 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3900 {
+    <name not found> = ArrayList@3901[1] { ResolutionCandidate@3902 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3905 {
-    <name not found> = ArrayList@3906[1] { ResolutionCandidate@3907 }
-    <name not found> = ArrayList@3908[1] { ResolutionCandidate@3907 }
+ResolutionTaskHolder@3903 {
+    <name not found> = ArrayList@3904[1] { ResolutionCandidate@3905 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3906 {
+    <name not found> = ArrayList@3907[1] { ResolutionCandidate@3908 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3909 {
     <name not found> = ArrayList@3910[1] { ResolutionCandidate@3911 }
-    <name not found> = ArrayList@3912[1] { ResolutionCandidate@3911 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3913 {
-    <name not found> = ArrayList@3914[1] { ResolutionCandidate@3915 }
-    <name not found> = ArrayList@3916[1] { ResolutionCandidate@3915 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3912 {
+    <name not found> = ArrayList@3913[1] { ResolutionCandidate@3914 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3917 {
-    <name not found> = ArrayList@3918[1] { ResolutionCandidate@3919 }
-    <name not found> = ArrayList@3920[1] { ResolutionCandidate@3919 }
+ResolutionTaskHolder@3915 {
+    <name not found> = ArrayList@3916[1] { ResolutionCandidate@3917 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3918 {
+    <name not found> = ArrayList@3919[1] { ResolutionCandidate@3920 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3921 {
     <name not found> = ArrayList@3922[1] { ResolutionCandidate@3923 }
-    <name not found> = ArrayList@3924[1] { ResolutionCandidate@3923 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3925 {
-    <name not found> = ArrayList@3926[1] { ResolutionCandidate@3927 }
-    <name not found> = ArrayList@3928[1] { ResolutionCandidate@3927 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3924 {
+    <name not found> = ArrayList@3925[1] { ResolutionCandidate@3926 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3929 {
-    <name not found> = ArrayList@3930[1] { ResolutionCandidate@3931 }
-    <name not found> = ArrayList@3932[1] { ResolutionCandidate@3931 }
+ResolutionTaskHolder@3927 {
+    <name not found> = ArrayList@3928[1] { ResolutionCandidate@3929 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3930 {
+    <name not found> = ArrayList@3931[1] { ResolutionCandidate@3932 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3933 {
     <name not found> = ArrayList@3934[1] { ResolutionCandidate@3935 }
-    <name not found> = ArrayList@3936[1] { ResolutionCandidate@3935 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3937 {
-    <name not found> = ArrayList@3938[1] { ResolutionCandidate@3939 }
-    <name not found> = ArrayList@3940[1] { ResolutionCandidate@3939 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3936 {
+    <name not found> = ArrayList@3937[1] { ResolutionCandidate@3938 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3941 {
-    <name not found> = ArrayList@3942[1] { ResolutionCandidate@3943 }
-    <name not found> = ArrayList@3944[1] { ResolutionCandidate@3943 }
+ResolutionTaskHolder@3939 {
+    <name not found> = ArrayList@3940[1] { ResolutionCandidate@3941 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3942 {
+    <name not found> = ArrayList@3943[1] { ResolutionCandidate@3944 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3945 {
     <name not found> = ArrayList@3946[1] { ResolutionCandidate@3947 }
-    <name not found> = ArrayList@3948[1] { ResolutionCandidate@3947 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3949 {
-    <name not found> = ArrayList@3950[1] { ResolutionCandidate@3951 }
-    <name not found> = ArrayList@3952[1] { ResolutionCandidate@3951 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3948 {
+    <name not found> = ArrayList@3949[1] { ResolutionCandidate@3950 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3953 {
-    <name not found> = ArrayList@3954[1] { ResolutionCandidate@3955 }
-    <name not found> = ArrayList@3956[1] { ResolutionCandidate@3955 }
+ResolutionTaskHolder@3951 {
+    <name not found> = ArrayList@3952[1] { ResolutionCandidate@3953 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3954 {
+    <name not found> = ArrayList@3955[1] { ResolutionCandidate@3956 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3957 {
     <name not found> = ArrayList@3958[1] { ResolutionCandidate@3959 }
-    <name not found> = ArrayList@3960[1] { ResolutionCandidate@3959 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3961 {
-    <name not found> = ArrayList@3962[1] { ResolutionCandidate@3963 }
-    <name not found> = ArrayList@3964[1] { ResolutionCandidate@3963 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3960 {
+    <name not found> = ArrayList@3961[1] { ResolutionCandidate@3962 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3965 {
-    <name not found> = ArrayList@3966[1] { ResolutionCandidate@3967 }
-    <name not found> = ArrayList@3968[1] { ResolutionCandidate@3967 }
+ResolutionTaskHolder@3963 {
+    <name not found> = ArrayList@3964[1] { ResolutionCandidate@3965 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3966 {
+    <name not found> = ArrayList@3967[1] { ResolutionCandidate@3968 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3969 {
     <name not found> = ArrayList@3970[1] { ResolutionCandidate@3971 }
-    <name not found> = ArrayList@3972[1] { ResolutionCandidate@3971 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3973 {
-    <name not found> = ArrayList@3974[1] { ResolutionCandidate@3975 }
-    <name not found> = ArrayList@3976[1] { ResolutionCandidate@3975 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3972 {
+    <name not found> = ArrayList@3973[1] { ResolutionCandidate@3974 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3977 {
-    <name not found> = ArrayList@3978[1] { ResolutionCandidate@3979 }
-    <name not found> = ArrayList@3980[1] { ResolutionCandidate@3979 }
+ResolutionTaskHolder@3975 {
+    <name not found> = ArrayList@3976[1] { ResolutionCandidate@3977 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3978 {
+    <name not found> = ArrayList@3979[1] { ResolutionCandidate@3980 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3981 {
     <name not found> = ArrayList@3982[1] { ResolutionCandidate@3983 }
-    <name not found> = ArrayList@3984[1] { ResolutionCandidate@3983 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3985 {
-    <name not found> = ArrayList@3986[1] { ResolutionCandidate@3987 }
-    <name not found> = ArrayList@3988[1] { ResolutionCandidate@3987 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3984 {
+    <name not found> = ArrayList@3985[1] { ResolutionCandidate@3986 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3989 {
-    <name not found> = ArrayList@3990[1] { ResolutionCandidate@3991 }
-    <name not found> = ArrayList@3992[1] { ResolutionCandidate@3991 }
+ResolutionTaskHolder@3987 {
+    <name not found> = ArrayList@3988[1] { ResolutionCandidate@3989 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3990 {
+    <name not found> = ArrayList@3991[1] { ResolutionCandidate@3992 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@3993 {
     <name not found> = ArrayList@3994[1] { ResolutionCandidate@3995 }
-    <name not found> = ArrayList@3996[1] { ResolutionCandidate@3995 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@3997 {
-    <name not found> = ArrayList@3998[1] { ResolutionCandidate@3999 }
-    <name not found> = ArrayList@4000[1] { ResolutionCandidate@3999 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@3996 {
+    <name not found> = ArrayList@3997[1] { ResolutionCandidate@3998 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4001 {
-    <name not found> = ArrayList@4002[1] { ResolutionCandidate@4003 }
-    <name not found> = ArrayList@4004[1] { ResolutionCandidate@4003 }
+ResolutionTaskHolder@3999 {
+    <name not found> = ArrayList@4000[1] { ResolutionCandidate@4001 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4002 {
+    <name not found> = ArrayList@4003[1] { ResolutionCandidate@4004 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@4005 {
     <name not found> = ArrayList@4006[1] { ResolutionCandidate@4007 }
-    <name not found> = ArrayList@4008[1] { ResolutionCandidate@4007 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4009 {
-    <name not found> = ArrayList@4010[1] { ResolutionCandidate@4011 }
-    <name not found> = ArrayList@4012[1] { ResolutionCandidate@4011 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4008 {
+    <name not found> = ArrayList@4009[1] { ResolutionCandidate@4010 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4013 {
-    <name not found> = ArrayList@4014[1] { ResolutionCandidate@4015 }
-    <name not found> = ArrayList@4016[1] { ResolutionCandidate@4015 }
+ResolutionTaskHolder@4011 {
+    <name not found> = ArrayList@4012[1] { ResolutionCandidate@4013 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4014 {
+    <name not found> = ArrayList@4015[1] { ResolutionCandidate@4016 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@4017 {
     <name not found> = ArrayList@4018[1] { ResolutionCandidate@4019 }
-    <name not found> = ArrayList@4020[1] { ResolutionCandidate@4019 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4021 {
-    <name not found> = ArrayList@4022[1] { ResolutionCandidate@4023 }
-    <name not found> = ArrayList@4024[1] { ResolutionCandidate@4023 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4020 {
+    <name not found> = ArrayList@4021[1] { ResolutionCandidate@4022 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4025 {
-    <name not found> = ArrayList@4026[1] { ResolutionCandidate@4027 }
-    <name not found> = ArrayList@4028[1] { ResolutionCandidate@4027 }
+ResolutionTaskHolder@4023 {
+    <name not found> = ArrayList@4024[1] { ResolutionCandidate@4025 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4026 {
+    <name not found> = ArrayList@4027[1] { ResolutionCandidate@4028 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@4029 {
     <name not found> = ArrayList@4030[1] { ResolutionCandidate@4031 }
-    <name not found> = ArrayList@4032[1] { ResolutionCandidate@4031 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4033 {
-    <name not found> = ArrayList@4034[1] { ResolutionCandidate@4035 }
-    <name not found> = ArrayList@4036[1] { ResolutionCandidate@4035 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4032 {
+    <name not found> = ArrayList@4033[1] { ResolutionCandidate@4034 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4037 {
-    <name not found> = ArrayList@4038[1] { ResolutionCandidate@4039 }
-    <name not found> = ArrayList@4040[1] { ResolutionCandidate@4039 }
+ResolutionTaskHolder@4035 {
+    <name not found> = ArrayList@4036[1] { ResolutionCandidate@4037 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4038 {
+    <name not found> = ArrayList@4039[1] { ResolutionCandidate@4040 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@4041 {
     <name not found> = ArrayList@4042[1] { ResolutionCandidate@4043 }
-    <name not found> = ArrayList@4044[1] { ResolutionCandidate@4043 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4045 {
-    <name not found> = ArrayList@4046[1] { ResolutionCandidate@4047 }
-    <name not found> = ArrayList@4048[1] { ResolutionCandidate@4047 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4044 {
+    <name not found> = ArrayList@4045[1] { ResolutionCandidate@4046 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4049 {
-    <name not found> = ArrayList@4050[1] { ResolutionCandidate@4051 }
-    <name not found> = ArrayList@4052[1] { ResolutionCandidate@4051 }
+ResolutionTaskHolder@4047 {
+    <name not found> = ArrayList@4048[1] { ResolutionCandidate@4049 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4050 {
+    <name not found> = ArrayList@4051[1] { ResolutionCandidate@4052 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@4053 {
     <name not found> = ArrayList@4054[1] { ResolutionCandidate@4055 }
-    <name not found> = ArrayList@4056[1] { ResolutionCandidate@4055 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4057 {
-    <name not found> = ArrayList@4058[1] { ResolutionCandidate@4059 }
-    <name not found> = ArrayList@4060[1] { ResolutionCandidate@4059 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4056 {
+    <name not found> = ArrayList@4057[1] { ResolutionCandidate@4058 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4061 {
-    <name not found> = ArrayList@4062[1] { ResolutionCandidate@4063 }
-    <name not found> = ArrayList@4064[1] { ResolutionCandidate@4063 }
+ResolutionTaskHolder@4059 {
+    <name not found> = ArrayList@4060[1] { ResolutionCandidate@4061 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4062 {
+    <name not found> = ArrayList@4063[1] { ResolutionCandidate@4064 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@4065 {
     <name not found> = ArrayList@4066[1] { ResolutionCandidate@4067 }
-    <name not found> = ArrayList@4068[1] { ResolutionCandidate@4067 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4069 {
-    <name not found> = ArrayList@4070[1] { ResolutionCandidate@4071 }
-    <name not found> = ArrayList@4072[1] { ResolutionCandidate@4071 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4068 {
+    <name not found> = ArrayList@4069[1] { ResolutionCandidate@4070 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4073 {
-    <name not found> = ArrayList@4074[1] { ResolutionCandidate@4075 }
-    <name not found> = ArrayList@4076[1] { ResolutionCandidate@4075 }
+ResolutionTaskHolder@4071 {
+    <name not found> = ArrayList@4072[1] { ResolutionCandidate@4073 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4074 {
+    <name not found> = ArrayList@4075[1] { ResolutionCandidate@4076 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@4077 {
     <name not found> = ArrayList@4078[1] { ResolutionCandidate@4079 }
-    <name not found> = ArrayList@4080[1] { ResolutionCandidate@4079 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4081 {
-    <name not found> = ArrayList@4082[1] { ResolutionCandidate@4083 }
-    <name not found> = ArrayList@4084[1] { ResolutionCandidate@4083 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4080 {
+    <name not found> = ArrayList@4081[1] { ResolutionCandidate@4082 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4085 {
-    <name not found> = ArrayList@4086[1] { ResolutionCandidate@4087 }
-    <name not found> = ArrayList@4088[1] { ResolutionCandidate@4087 }
+ResolutionTaskHolder@4083 {
+    <name not found> = ArrayList@4084[1] { ResolutionCandidate@4085 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4086 {
+    <name not found> = ArrayList@4087[1] { ResolutionCandidate@4088 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@4089 {
     <name not found> = ArrayList@4090[1] { ResolutionCandidate@4091 }
-    <name not found> = ArrayList@4092[1] { ResolutionCandidate@4091 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4093 {
-    <name not found> = ArrayList@4094[1] { ResolutionCandidate@4095 }
-    <name not found> = ArrayList@4096[1] { ResolutionCandidate@4095 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4092 {
+    <name not found> = ArrayList@4093[1] { ResolutionCandidate@4094 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4097 {
-    <name not found> = ArrayList@4098[1] { ResolutionCandidate@4099 }
-    <name not found> = ArrayList@4100[1] { ResolutionCandidate@4099 }
+ResolutionTaskHolder@4095 {
+    <name not found> = ArrayList@4096[1] { ResolutionCandidate@4097 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4098 {
+    <name not found> = ArrayList@4099[1] { ResolutionCandidate@4100 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@4101 {
     <name not found> = ArrayList@4102[1] { ResolutionCandidate@4103 }
-    <name not found> = ArrayList@4104[1] { ResolutionCandidate@4103 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4105 {
-    <name not found> = ArrayList@4106[1] { ResolutionCandidate@4107 }
-    <name not found> = ArrayList@4108[1] { ResolutionCandidate@4107 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4104 {
+    <name not found> = ArrayList@4105[1] { ResolutionCandidate@4106 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4109 {
-    <name not found> = ArrayList@4110[1] { ResolutionCandidate@4111 }
-    <name not found> = ArrayList@4112[1] { ResolutionCandidate@4111 }
+ResolutionTaskHolder@4107 {
+    <name not found> = ArrayList@4108[1] { ResolutionCandidate@4109 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4110 {
+    <name not found> = ArrayList@4111[1] { ResolutionCandidate@4112 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@4113 {
     <name not found> = ArrayList@4114[1] { ResolutionCandidate@4115 }
-    <name not found> = ArrayList@4116[1] { ResolutionCandidate@4115 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4117 {
-    <name not found> = ArrayList@4118[1] { ResolutionCandidate@4119 }
-    <name not found> = ArrayList@4120[1] { ResolutionCandidate@4119 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4116 {
+    <name not found> = ArrayList@4117[1] { ResolutionCandidate@4118 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4121 {
-    <name not found> = ArrayList@4122[1] { ResolutionCandidate@4123 }
-    <name not found> = ArrayList@4124[1] { ResolutionCandidate@4123 }
+ResolutionTaskHolder@4119 {
+    <name not found> = ArrayList@4120[1] { ResolutionCandidate@4121 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4122 {
+    <name not found> = ArrayList@4123[1] { ResolutionCandidate@4124 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@4125 {
     <name not found> = ArrayList@4126[1] { ResolutionCandidate@4127 }
-    <name not found> = ArrayList@4128[1] { ResolutionCandidate@4127 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4129 {
-    <name not found> = ArrayList@4130[1] { ResolutionCandidate@4131 }
-    <name not found> = ArrayList@4132[1] { ResolutionCandidate@4131 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4128 {
+    <name not found> = ArrayList@4129[1] { ResolutionCandidate@4130 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4133 {
-    <name not found> = ArrayList@4134[1] { ResolutionCandidate@4135 }
-    <name not found> = ArrayList@4136[1] { ResolutionCandidate@4135 }
+ResolutionTaskHolder@4131 {
+    <name not found> = ArrayList@4132[1] { ResolutionCandidate@4133 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4134 {
+    <name not found> = ArrayList@4135[1] { ResolutionCandidate@4136 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@4137 {
     <name not found> = ArrayList@4138[1] { ResolutionCandidate@4139 }
-    <name not found> = ArrayList@4140[1] { ResolutionCandidate@4139 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4141 {
-    <name not found> = ArrayList@4142[1] { ResolutionCandidate@4143 }
-    <name not found> = ArrayList@4144[1] { ResolutionCandidate@4143 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4140 {
+    <name not found> = ArrayList@4141[1] { ResolutionCandidate@4142 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4145 {
-    <name not found> = ArrayList@4146[1] { ResolutionCandidate@4147 }
-    <name not found> = ArrayList@4148[1] { ResolutionCandidate@4147 }
+ResolutionTaskHolder@4143 {
+    <name not found> = ArrayList@4144[1] { ResolutionCandidate@4145 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4146 {
+    <name not found> = ArrayList@4147[1] { ResolutionCandidate@4148 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@4149 {
     <name not found> = ArrayList@4150[1] { ResolutionCandidate@4151 }
-    <name not found> = ArrayList@4152[1] { ResolutionCandidate@4151 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4153 {
-    <name not found> = ArrayList@4154[1] { ResolutionCandidate@4155 }
-    <name not found> = ArrayList@4156[1] { ResolutionCandidate@4155 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4152 {
+    <name not found> = ArrayList@4153[1] { ResolutionCandidate@4154 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4157 {
-    <name not found> = ArrayList@4158[1] { ResolutionCandidate@4159 }
-    <name not found> = ArrayList@4160[1] { ResolutionCandidate@4159 }
+ResolutionTaskHolder@4155 {
+    <name not found> = ArrayList@4156[1] { ResolutionCandidate@4157 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4158 {
+    <name not found> = ArrayList@4159[1] { ResolutionCandidate@4160 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@4161 {
     <name not found> = ArrayList@4162[1] { ResolutionCandidate@4163 }
-    <name not found> = ArrayList@4164[1] { ResolutionCandidate@4163 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4165 {
-    <name not found> = ArrayList@4166[1] { ResolutionCandidate@4167 }
-    <name not found> = ArrayList@4168[1] { ResolutionCandidate@4167 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4164 {
+    <name not found> = ArrayList@4165[1] { ResolutionCandidate@4166 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4169 {
-    <name not found> = ArrayList@4170[1] { ResolutionCandidate@4171 }
-    <name not found> = ArrayList@4172[1] { ResolutionCandidate@4171 }
+ResolutionTaskHolder@4167 {
+    <name not found> = ArrayList@4168[1] { ResolutionCandidate@4169 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4170 {
+    <name not found> = ArrayList@4171[1] { ResolutionCandidate@4172 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@4173 {
     <name not found> = ArrayList@4174[1] { ResolutionCandidate@4175 }
-    <name not found> = ArrayList@4176[1] { ResolutionCandidate@4175 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4177 {
-    <name not found> = ArrayList@4178[1] { ResolutionCandidate@4179 }
-    <name not found> = ArrayList@4180[1] { ResolutionCandidate@4179 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4176 {
+    <name not found> = ArrayList@4177[1] { ResolutionCandidate@4178 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4181 {
-    <name not found> = ArrayList@4182[1] { ResolutionCandidate@4183 }
-    <name not found> = ArrayList@4184[1] { ResolutionCandidate@4183 }
+ResolutionTaskHolder@4179 {
+    <name not found> = ArrayList@4180[1] { ResolutionCandidate@4181 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4182 {
+    <name not found> = ArrayList@4183[1] { ResolutionCandidate@4184 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@4185 {
     <name not found> = ArrayList@4186[1] { ResolutionCandidate@4187 }
-    <name not found> = ArrayList@4188[1] { ResolutionCandidate@4187 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4189 {
-    <name not found> = ArrayList@4190[1] { ResolutionCandidate@4191 }
-    <name not found> = ArrayList@4192[1] { ResolutionCandidate@4191 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4188 {
+    <name not found> = ArrayList@4189[1] { ResolutionCandidate@4190 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4193 {
-    <name not found> = ArrayList@4194[1] { ResolutionCandidate@4195 }
-    <name not found> = ArrayList@4196[1] { ResolutionCandidate@4195 }
+ResolutionTaskHolder@4191 {
+    <name not found> = ArrayList@4192[1] { ResolutionCandidate@4193 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4194 {
+    <name not found> = ArrayList@4195[1] { ResolutionCandidate@4196 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@4197 {
     <name not found> = ArrayList@4198[1] { ResolutionCandidate@4199 }
-    <name not found> = ArrayList@4200[1] { ResolutionCandidate@4199 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4201 {
-    <name not found> = ArrayList@4202[1] { ResolutionCandidate@4203 }
-    <name not found> = ArrayList@4204[1] { ResolutionCandidate@4203 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4200 {
+    <name not found> = ArrayList@4201[1] { ResolutionCandidate@4202 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4205 {
-    <name not found> = ArrayList@4206[1] { ResolutionCandidate@4207 }
-    <name not found> = ArrayList@4208[1] { ResolutionCandidate@4207 }
+ResolutionTaskHolder@4203 {
+    <name not found> = ArrayList@4204[1] { ResolutionCandidate@4205 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4206 {
+    <name not found> = ArrayList@4207[1] { ResolutionCandidate@4208 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@4209 {
     <name not found> = ArrayList@4210[1] { ResolutionCandidate@4211 }
-    <name not found> = ArrayList@4212[1] { ResolutionCandidate@4211 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4213 {
-    <name not found> = ArrayList@4214[1] { ResolutionCandidate@4215 }
-    <name not found> = ArrayList@4216[1] { ResolutionCandidate@4215 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4212 {
+    <name not found> = ArrayList@4213[1] { ResolutionCandidate@4214 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4217 {
-    <name not found> = ArrayList@4218[1] { ResolutionCandidate@4219 }
-    <name not found> = ArrayList@4220[1] { ResolutionCandidate@4219 }
+ResolutionTaskHolder@4215 {
+    <name not found> = ArrayList@4216[1] { ResolutionCandidate@4217 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4218 {
+    <name not found> = ArrayList@4219[1] { ResolutionCandidate@4220 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@4221 {
     <name not found> = ArrayList@4222[1] { ResolutionCandidate@4223 }
-    <name not found> = ArrayList@4224[1] { ResolutionCandidate@4223 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4225 {
-    <name not found> = ArrayList@4226[1] { ResolutionCandidate@4227 }
-    <name not found> = ArrayList@4228[1] { ResolutionCandidate@4227 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4224 {
+    <name not found> = ArrayList@4225[1] { ResolutionCandidate@4226 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4229 {
-    <name not found> = ArrayList@4230[1] { ResolutionCandidate@4231 }
-    <name not found> = ArrayList@4232[1] { ResolutionCandidate@4231 }
+ResolutionTaskHolder@4227 {
+    <name not found> = ArrayList@4228[1] { ResolutionCandidate@4229 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4230 {
+    <name not found> = ArrayList@4231[1] { ResolutionCandidate@4232 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@4233 {
     <name not found> = ArrayList@4234[1] { ResolutionCandidate@4235 }
-    <name not found> = ArrayList@4236[1] { ResolutionCandidate@4235 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4237 {
-    <name not found> = ArrayList@4238[1] { ResolutionCandidate@4239 }
-    <name not found> = ArrayList@4240[1] { ResolutionCandidate@4239 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4236 {
+    <name not found> = ArrayList@4237[1] { ResolutionCandidate@4238 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4241 {
-    <name not found> = ArrayList@4242[1] { ResolutionCandidate@4243 }
-    <name not found> = ArrayList@4244[1] { ResolutionCandidate@4243 }
+ResolutionTaskHolder@4239 {
+    <name not found> = ArrayList@4240[1] { ResolutionCandidate@4241 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4242 {
+    <name not found> = ArrayList@4243[1] { ResolutionCandidate@4244 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@4245 {
     <name not found> = ArrayList@4246[1] { ResolutionCandidate@4247 }
-    <name not found> = ArrayList@4248[1] { ResolutionCandidate@4247 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4249 {
-    <name not found> = ArrayList@4250[1] { ResolutionCandidate@4251 }
-    <name not found> = ArrayList@4252[1] { ResolutionCandidate@4251 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4248 {
+    <name not found> = ArrayList@4249[1] { ResolutionCandidate@4250 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4253 {
-    <name not found> = ArrayList@4254[1] { ResolutionCandidate@4255 }
-    <name not found> = ArrayList@4256[1] { ResolutionCandidate@4255 }
+ResolutionTaskHolder@4251 {
+    <name not found> = ArrayList@4252[1] { ResolutionCandidate@4253 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4254 {
+    <name not found> = ArrayList@4255[1] { ResolutionCandidate@4256 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@4257 {
     <name not found> = ArrayList@4258[1] { ResolutionCandidate@4259 }
-    <name not found> = ArrayList@4260[1] { ResolutionCandidate@4259 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4261 {
-    <name not found> = ArrayList@4262[1] { ResolutionCandidate@4263 }
-    <name not found> = ArrayList@4264[1] { ResolutionCandidate@4263 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4260 {
+    <name not found> = ArrayList@4261[1] { ResolutionCandidate@4262 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4265 {
-    <name not found> = ArrayList@4266[1] { ResolutionCandidate@4267 }
-    <name not found> = ArrayList@4268[1] { ResolutionCandidate@4267 }
+ResolutionTaskHolder@4263 {
+    <name not found> = ArrayList@4264[1] { ResolutionCandidate@4265 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4266 {
+    <name not found> = ArrayList@4267[1] { ResolutionCandidate@4268 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@4269 {
     <name not found> = ArrayList@4270[1] { ResolutionCandidate@4271 }
-    <name not found> = ArrayList@4272[1] { ResolutionCandidate@4271 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4273 {
-    <name not found> = ArrayList@4274[1] { ResolutionCandidate@4275 }
-    <name not found> = ArrayList@4276[1] { ResolutionCandidate@4275 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4272 {
+    <name not found> = ArrayList@4273[1] { ResolutionCandidate@4274 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4277 {
-    <name not found> = ArrayList@4278[1] { ResolutionCandidate@4279 }
-    <name not found> = ArrayList@4280[1] { ResolutionCandidate@4279 }
+ResolutionTaskHolder@4275 {
+    <name not found> = ArrayList@4276[1] { ResolutionCandidate@4277 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4278 {
+    <name not found> = ArrayList@4279[1] { ResolutionCandidate@4280 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@4281 {
     <name not found> = ArrayList@4282[1] { ResolutionCandidate@4283 }
-    <name not found> = ArrayList@4284[1] { ResolutionCandidate@4283 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4285 {
-    <name not found> = ArrayList@4286[1] { ResolutionCandidate@4287 }
-    <name not found> = ArrayList@4288[1] { ResolutionCandidate@4287 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4284 {
+    <name not found> = ArrayList@4285[1] { ResolutionCandidate@4286 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4289 {
-    <name not found> = ArrayList@4290[1] { ResolutionCandidate@4291 }
-    <name not found> = ArrayList@4292[1] { ResolutionCandidate@4291 }
+ResolutionTaskHolder@4287 {
+    <name not found> = ArrayList@4288[1] { ResolutionCandidate@4289 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4290 {
+    <name not found> = ArrayList@4291[1] { ResolutionCandidate@4292 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@4293 {
     <name not found> = ArrayList@4294[1] { ResolutionCandidate@4295 }
-    <name not found> = ArrayList@4296[1] { ResolutionCandidate@4295 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4297 {
-    <name not found> = ArrayList@4298[1] { ResolutionCandidate@4299 }
-    <name not found> = ArrayList@4300[1] { ResolutionCandidate@4299 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4296 {
+    <name not found> = ArrayList@4297[1] { ResolutionCandidate@4298 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4301 {
-    <name not found> = ArrayList@4302[1] { ResolutionCandidate@4303 }
-    <name not found> = ArrayList@4304[1] { ResolutionCandidate@4303 }
+ResolutionTaskHolder@4299 {
+    <name not found> = ArrayList@4300[1] { ResolutionCandidate@4301 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4302 {
+    <name not found> = ArrayList@4303[1] { ResolutionCandidate@4304 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@4305 {
     <name not found> = ArrayList@4306[1] { ResolutionCandidate@4307 }
-    <name not found> = ArrayList@4308[1] { ResolutionCandidate@4307 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4309 {
-    <name not found> = ArrayList@4310[1] { ResolutionCandidate@4311 }
-    <name not found> = ArrayList@4312[1] { ResolutionCandidate@4311 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4308 {
+    <name not found> = ArrayList@4309[1] { ResolutionCandidate@4310 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4313 {
-    <name not found> = ArrayList@4314[1] { ResolutionCandidate@4315 }
-    <name not found> = ArrayList@4316[1] { ResolutionCandidate@4315 }
+ResolutionTaskHolder@4311 {
+    <name not found> = ArrayList@4312[1] { ResolutionCandidate@4313 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4314 {
+    <name not found> = ArrayList@4315[1] { ResolutionCandidate@4316 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@4317 {
     <name not found> = ArrayList@4318[1] { ResolutionCandidate@4319 }
-    <name not found> = ArrayList@4320[1] { ResolutionCandidate@4319 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4321 {
-    <name not found> = ArrayList@4322[1] { ResolutionCandidate@4323 }
-    <name not found> = ArrayList@4324[1] { ResolutionCandidate@4323 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4320 {
+    <name not found> = ArrayList@4321[1] { ResolutionCandidate@4322 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4325 {
-    <name not found> = ArrayList@4326[1] { ResolutionCandidate@4327 }
-    <name not found> = ArrayList@4328[1] { ResolutionCandidate@4327 }
+ResolutionTaskHolder@4323 {
+    <name not found> = ArrayList@4324[1] { ResolutionCandidate@4325 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4326 {
+    <name not found> = ArrayList@4327[1] { ResolutionCandidate@4328 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@4329 {
     <name not found> = ArrayList@4330[1] { ResolutionCandidate@4331 }
-    <name not found> = ArrayList@4332[1] { ResolutionCandidate@4331 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4333 {
-    <name not found> = ArrayList@4334[1] { ResolutionCandidate@4335 }
-    <name not found> = ArrayList@4336[1] { ResolutionCandidate@4335 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4332 {
+    <name not found> = ArrayList@4333[1] { ResolutionCandidate@4334 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4337 {
-    <name not found> = ArrayList@4338[1] { ResolutionCandidate@4339 }
-    <name not found> = ArrayList@4340[1] { ResolutionCandidate@4339 }
+ResolutionTaskHolder@4335 {
+    <name not found> = ArrayList@4336[1] { ResolutionCandidate@4337 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4338 {
+    <name not found> = ArrayList@4339[1] { ResolutionCandidate@4340 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@4341 {
     <name not found> = ArrayList@4342[1] { ResolutionCandidate@4343 }
-    <name not found> = ArrayList@4344[1] { ResolutionCandidate@4343 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4345 {
-    <name not found> = ArrayList@4346[1] { ResolutionCandidate@4347 }
-    <name not found> = ArrayList@4348[1] { ResolutionCandidate@4347 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4344 {
+    <name not found> = ArrayList@4345[1] { ResolutionCandidate@4346 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4349 {
-    <name not found> = ArrayList@4350[1] { ResolutionCandidate@4351 }
-    <name not found> = ArrayList@4352[1] { ResolutionCandidate@4351 }
+ResolutionTaskHolder@4347 {
+    <name not found> = ArrayList@4348[1] { ResolutionCandidate@4349 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4350 {
+    <name not found> = ArrayList@4351[1] { ResolutionCandidate@4352 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@4353 {
     <name not found> = ArrayList@4354[1] { ResolutionCandidate@4355 }
-    <name not found> = ArrayList@4356[1] { ResolutionCandidate@4355 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4357 {
-    <name not found> = ArrayList@4358[1] { ResolutionCandidate@4359 }
-    <name not found> = ArrayList@4360[1] { ResolutionCandidate@4359 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4356 {
+    <name not found> = ArrayList@4357[1] { ResolutionCandidate@4358 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4361 {
-    <name not found> = ArrayList@4362[1] { ResolutionCandidate@4363 }
-    <name not found> = ArrayList@4364[1] { ResolutionCandidate@4363 }
+ResolutionTaskHolder@4359 {
+    <name not found> = ArrayList@4360[1] { ResolutionCandidate@4361 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4362 {
+    <name not found> = ArrayList@4363[1] { ResolutionCandidate@4364 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@4365 {
     <name not found> = ArrayList@4366[1] { ResolutionCandidate@4367 }
-    <name not found> = ArrayList@4368[1] { ResolutionCandidate@4367 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4369 {
-    <name not found> = ArrayList@4370[1] { ResolutionCandidate@4371 }
-    <name not found> = ArrayList@4372[1] { ResolutionCandidate@4371 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4368 {
+    <name not found> = ArrayList@4369[1] { ResolutionCandidate@4370 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4373 {
-    <name not found> = ArrayList@4374[1] { ResolutionCandidate@4375 }
-    <name not found> = ArrayList@4376[1] { ResolutionCandidate@4375 }
+ResolutionTaskHolder@4371 {
+    <name not found> = ArrayList@4372[1] { ResolutionCandidate@4373 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4374 {
+    <name not found> = ArrayList@4375[1] { ResolutionCandidate@4376 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@4377 {
     <name not found> = ArrayList@4378[1] { ResolutionCandidate@4379 }
-    <name not found> = ArrayList@4380[1] { ResolutionCandidate@4379 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4381 {
-    <name not found> = ArrayList@4382[1] { ResolutionCandidate@4383 }
-    <name not found> = ArrayList@4384[1] { ResolutionCandidate@4383 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4380 {
+    <name not found> = ArrayList@4381[1] { ResolutionCandidate@4382 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4385 {
-    <name not found> = ArrayList@4386[1] { ResolutionCandidate@4387 }
-    <name not found> = ArrayList@4388[1] { ResolutionCandidate@4387 }
+ResolutionTaskHolder@4383 {
+    <name not found> = ArrayList@4384[1] { ResolutionCandidate@4385 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4386 {
+    <name not found> = ArrayList@4387[1] { ResolutionCandidate@4388 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@4389 {
     <name not found> = ArrayList@4390[1] { ResolutionCandidate@4391 }
-    <name not found> = ArrayList@4392[1] { ResolutionCandidate@4391 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4393 {
-    <name not found> = ArrayList@4394[1] { ResolutionCandidate@4395 }
-    <name not found> = ArrayList@4396[1] { ResolutionCandidate@4395 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4392 {
+    <name not found> = ArrayList@4393[1] { ResolutionCandidate@4394 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4397 {
-    <name not found> = ArrayList@4398[1] { ResolutionCandidate@4399 }
-    <name not found> = ArrayList@4400[1] { ResolutionCandidate@4399 }
+ResolutionTaskHolder@4395 {
+    <name not found> = ArrayList@4396[1] { ResolutionCandidate@4397 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4398 {
+    <name not found> = ArrayList@4399[1] { ResolutionCandidate@4400 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@4401 {
     <name not found> = ArrayList@4402[1] { ResolutionCandidate@4403 }
-    <name not found> = ArrayList@4404[1] { ResolutionCandidate@4403 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4405 {
-    <name not found> = ArrayList@4406[1] { ResolutionCandidate@4407 }
-    <name not found> = ArrayList@4408[1] { ResolutionCandidate@4407 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4404 {
+    <name not found> = ArrayList@4405[1] { ResolutionCandidate@4406 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4409 {
-    <name not found> = ArrayList@4410[1] { ResolutionCandidate@4411 }
-    <name not found> = ArrayList@4412[1] { ResolutionCandidate@4411 }
+ResolutionTaskHolder@4407 {
+    <name not found> = ArrayList@4408[1] { ResolutionCandidate@4409 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4410 {
+    <name not found> = ArrayList@4411[1] { ResolutionCandidate@4412 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@4413 {
     <name not found> = ArrayList@4414[1] { ResolutionCandidate@4415 }
-    <name not found> = ArrayList@4416[1] { ResolutionCandidate@4415 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4417 {
-    <name not found> = ArrayList@4418[1] { ResolutionCandidate@4419 }
-    <name not found> = ArrayList@4420[1] { ResolutionCandidate@4419 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4416 {
+    <name not found> = ArrayList@4417[1] { ResolutionCandidate@4418 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4421 {
-    <name not found> = ArrayList@4422[1] { ResolutionCandidate@4423 }
-    <name not found> = ArrayList@4424[1] { ResolutionCandidate@4423 }
+ResolutionTaskHolder@4419 {
+    <name not found> = ArrayList@4420[1] { ResolutionCandidate@4421 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4422 {
+    <name not found> = ArrayList@4423[1] { ResolutionCandidate@4424 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@4425 {
     <name not found> = ArrayList@4426[1] { ResolutionCandidate@4427 }
-    <name not found> = ArrayList@4428[1] { ResolutionCandidate@4427 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4429 {
-    <name not found> = ArrayList@4430[1] { ResolutionCandidate@4431 }
-    <name not found> = ArrayList@4432[1] { ResolutionCandidate@4431 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4428 {
+    <name not found> = ArrayList@4429[1] { ResolutionCandidate@4430 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4433 {
-    <name not found> = ArrayList@4434[1] { ResolutionCandidate@4435 }
-    <name not found> = ArrayList@4436[1] { ResolutionCandidate@4435 }
+ResolutionTaskHolder@4431 {
+    <name not found> = ArrayList@4432[1] { ResolutionCandidate@4433 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4434 {
+    <name not found> = ArrayList@4435[1] { ResolutionCandidate@4436 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@4437 {
     <name not found> = ArrayList@4438[1] { ResolutionCandidate@4439 }
-    <name not found> = ArrayList@4440[1] { ResolutionCandidate@4439 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4441 {
-    <name not found> = ArrayList@4442[1] { ResolutionCandidate@4443 }
-    <name not found> = ArrayList@4444[1] { ResolutionCandidate@4443 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4440 {
+    <name not found> = ArrayList@4441[1] { ResolutionCandidate@4442 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4445 {
-    <name not found> = ArrayList@4446[1] { ResolutionCandidate@4447 }
-    <name not found> = ArrayList@4448[1] { ResolutionCandidate@4447 }
+ResolutionTaskHolder@4443 {
+    <name not found> = ArrayList@4444[1] { ResolutionCandidate@4445 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4446 {
+    <name not found> = ArrayList@4447[1] { ResolutionCandidate@4448 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@4449 {
     <name not found> = ArrayList@4450[1] { ResolutionCandidate@4451 }
-    <name not found> = ArrayList@4452[1] { ResolutionCandidate@4451 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4453 {
-    <name not found> = ArrayList@4454[1] { ResolutionCandidate@4455 }
-    <name not found> = ArrayList@4456[1] { ResolutionCandidate@4455 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4452 {
+    <name not found> = ArrayList@4453[1] { ResolutionCandidate@4454 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4457 {
-    <name not found> = ArrayList@4458[1] { ResolutionCandidate@4459 }
-    <name not found> = ArrayList@4460[1] { ResolutionCandidate@4459 }
+ResolutionTaskHolder@4455 {
+    <name not found> = ArrayList@4456[1] { ResolutionCandidate@4457 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4458 {
+    <name not found> = ArrayList@4459[1] { ResolutionCandidate@4460 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@4461 {
     <name not found> = ArrayList@4462[1] { ResolutionCandidate@4463 }
-    <name not found> = ArrayList@4464[1] { ResolutionCandidate@4463 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4465 {
-    <name not found> = ArrayList@4466[1] { ResolutionCandidate@4467 }
-    <name not found> = ArrayList@4468[1] { ResolutionCandidate@4467 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4464 {
+    <name not found> = ArrayList@4465[1] { ResolutionCandidate@4466 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4469 {
-    <name not found> = ArrayList@4470[1] { ResolutionCandidate@4471 }
-    <name not found> = ArrayList@4472[1] { ResolutionCandidate@4471 }
+ResolutionTaskHolder@4467 {
+    <name not found> = ArrayList@4468[1] { ResolutionCandidate@4469 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4470 {
+    <name not found> = ArrayList@4471[1] { ResolutionCandidate@4472 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@4473 {
     <name not found> = ArrayList@4474[1] { ResolutionCandidate@4475 }
-    <name not found> = ArrayList@4476[1] { ResolutionCandidate@4475 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4477 {
-    <name not found> = ArrayList@4478[1] { ResolutionCandidate@4479 }
-    <name not found> = ArrayList@4480[1] { ResolutionCandidate@4479 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4476 {
+    <name not found> = ArrayList@4477[1] { ResolutionCandidate@4478 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4481 {
-    <name not found> = ArrayList@4482[1] { ResolutionCandidate@4483 }
-    <name not found> = ArrayList@4484[1] { ResolutionCandidate@4483 }
+ResolutionTaskHolder@4479 {
+    <name not found> = ArrayList@4480[1] { ResolutionCandidate@4481 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4482 {
+    <name not found> = ArrayList@4483[1] { ResolutionCandidate@4484 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@4485 {
     <name not found> = ArrayList@4486[1] { ResolutionCandidate@4487 }
-    <name not found> = ArrayList@4488[1] { ResolutionCandidate@4487 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4489 {
-    <name not found> = ArrayList@4490[1] { ResolutionCandidate@4491 }
-    <name not found> = ArrayList@4492[1] { ResolutionCandidate@4491 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4488 {
+    <name not found> = ArrayList@4489[1] { ResolutionCandidate@4490 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4493 {
-    <name not found> = ArrayList@4494[1] { ResolutionCandidate@4495 }
-    <name not found> = ArrayList@4496[1] { ResolutionCandidate@4495 }
+ResolutionTaskHolder@4491 {
+    <name not found> = ArrayList@4492[1] { ResolutionCandidate@4493 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4494 {
+    <name not found> = ArrayList@4495[1] { ResolutionCandidate@4496 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@4497 {
     <name not found> = ArrayList@4498[1] { ResolutionCandidate@4499 }
-    <name not found> = ArrayList@4500[1] { ResolutionCandidate@4499 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4501 {
-    <name not found> = ArrayList@4502[1] { ResolutionCandidate@4503 }
-    <name not found> = ArrayList@4504[1] { ResolutionCandidate@4503 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4500 {
+    <name not found> = ArrayList@4501[1] { ResolutionCandidate@4502 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4505 {
-    <name not found> = ArrayList@4506[1] { ResolutionCandidate@4507 }
-    <name not found> = ArrayList@4508[1] { ResolutionCandidate@4507 }
+ResolutionTaskHolder@4503 {
+    <name not found> = ArrayList@4504[1] { ResolutionCandidate@4505 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4506 {
+    <name not found> = ArrayList@4507[1] { ResolutionCandidate@4508 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@4509 {
     <name not found> = ArrayList@4510[1] { ResolutionCandidate@4511 }
-    <name not found> = ArrayList@4512[1] { ResolutionCandidate@4511 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4513 {
-    <name not found> = ArrayList@4514[1] { ResolutionCandidate@4515 }
-    <name not found> = ArrayList@4516[1] { ResolutionCandidate@4515 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4512 {
+    <name not found> = ArrayList@4513[1] { ResolutionCandidate@4514 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4517 {
-    <name not found> = ArrayList@4518[1] { ResolutionCandidate@4519 }
-    <name not found> = ArrayList@4520[1] { ResolutionCandidate@4519 }
+ResolutionTaskHolder@4515 {
+    <name not found> = ArrayList@4516[1] { ResolutionCandidate@4517 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4518 {
+    <name not found> = ArrayList@4519[1] { ResolutionCandidate@4520 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@4521 {
     <name not found> = ArrayList@4522[1] { ResolutionCandidate@4523 }
-    <name not found> = ArrayList@4524[1] { ResolutionCandidate@4523 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4525 {
-    <name not found> = ArrayList@4526[1] { ResolutionCandidate@4527 }
-    <name not found> = ArrayList@4528[1] { ResolutionCandidate@4527 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4524 {
+    <name not found> = ArrayList@4525[1] { ResolutionCandidate@4526 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4529 {
-    <name not found> = ArrayList@4530[1] { ResolutionCandidate@4531 }
-    <name not found> = ArrayList@4532[1] { ResolutionCandidate@4531 }
+ResolutionTaskHolder@4527 {
+    <name not found> = ArrayList@4528[1] { ResolutionCandidate@4529 }
     <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4530 {
+    <name not found> = ArrayList@4531[1] { ResolutionCandidate@4532 }
     <name not found> = EmptyList@299[empty]
 }
 
 ResolutionTaskHolder@4533 {
     <name not found> = ArrayList@4534[1] { ResolutionCandidate@4535 }
-    <name not found> = ArrayList@4536[1] { ResolutionCandidate@4535 }
-    <name not found> = EmptyList@299[empty]
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4537 {
-    <name not found> = ArrayList@4538[1] { ResolutionCandidate@4539 }
-    <name not found> = ArrayList@4540[1] { ResolutionCandidate@4539 }
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4536 {
+    <name not found> = ArrayList@4537[1] { ResolutionCandidate@4538 }
     <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4541 {
-    <name not found> = ArrayList@4542[1] { ResolutionCandidate@4543 }
-    <name not found> = ArrayList@4544[1] { ResolutionCandidate@4543 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4539 {
+    <name not found> = ArrayList@4540[1] { ResolutionCandidate@4541 }
+}
+
+ResolutionTaskHolder@4542 {
+    <name not found> = ArrayList@4543[1] { ResolutionCandidate@4544 }
 }
 
 ResolutionTaskHolder@4545 {
     <name not found> = ArrayList@4546[1] { ResolutionCandidate@4547 }
-    <name not found> = ArrayList@4548[1] { ResolutionCandidate@4547 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4549 {
-    <name not found> = ArrayList@4550[1] { ResolutionCandidate@4551 }
-    <name not found> = ArrayList@4552[1] { ResolutionCandidate@4551 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4548 {
+    <name not found> = ArrayList@4549[1] { ResolutionCandidate@4550 }
 }
 
-ResolutionTaskHolder@4553 {
-    <name not found> = ArrayList@4554[1] { ResolutionCandidate@4555 }
-    <name not found> = ArrayList@4556[1] { ResolutionCandidate@4555 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4551 {
+    <name not found> = ArrayList@4552[1] { ResolutionCandidate@4553 }
+}
+
+ResolutionTaskHolder@4554 {
+    <name not found> = ArrayList@4555[1] { ResolutionCandidate@4556 }
 }
 
 ResolutionTaskHolder@4557 {
     <name not found> = ArrayList@4558[1] { ResolutionCandidate@4559 }
-    <name not found> = ArrayList@4560[1] { ResolutionCandidate@4559 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4561 {
-    <name not found> = ArrayList@4562[1] { ResolutionCandidate@4563 }
-    <name not found> = ArrayList@4564[1] { ResolutionCandidate@4563 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4560 {
+    <name not found> = ArrayList@4561[1] { ResolutionCandidate@4562 }
 }
 
-ResolutionTaskHolder@4565 {
-    <name not found> = ArrayList@4566[1] { ResolutionCandidate@4567 }
-    <name not found> = ArrayList@4568[1] { ResolutionCandidate@4567 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4563 {
+    <name not found> = ArrayList@4564[1] { ResolutionCandidate@4565 }
+}
+
+ResolutionTaskHolder@4566 {
+    <name not found> = ArrayList@4567[1] { ResolutionCandidate@4568 }
 }
 
 ResolutionTaskHolder@4569 {
     <name not found> = ArrayList@4570[1] { ResolutionCandidate@4571 }
-    <name not found> = ArrayList@4572[1] { ResolutionCandidate@4571 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4573 {
-    <name not found> = ArrayList@4574[1] { ResolutionCandidate@4575 }
-    <name not found> = ArrayList@4576[1] { ResolutionCandidate@4575 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4572 {
+    <name not found> = ArrayList@4573[1] { ResolutionCandidate@4574 }
 }
 
-ResolutionTaskHolder@4577 {
-    <name not found> = ArrayList@4578[1] { ResolutionCandidate@4579 }
-    <name not found> = ArrayList@4580[1] { ResolutionCandidate@4579 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4575 {
+    <name not found> = ArrayList@4576[1] { ResolutionCandidate@4577 }
+}
+
+ResolutionTaskHolder@4578 {
+    <name not found> = ArrayList@4579[1] { ResolutionCandidate@4580 }
 }
 
 ResolutionTaskHolder@4581 {
     <name not found> = ArrayList@4582[1] { ResolutionCandidate@4583 }
-    <name not found> = ArrayList@4584[1] { ResolutionCandidate@4583 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4585 {
-    <name not found> = ArrayList@4586[1] { ResolutionCandidate@4587 }
-    <name not found> = ArrayList@4588[1] { ResolutionCandidate@4587 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4584 {
+    <name not found> = ArrayList@4585[1] { ResolutionCandidate@4586 }
 }
 
-ResolutionTaskHolder@4589 {
-    <name not found> = ArrayList@4590[1] { ResolutionCandidate@4591 }
-    <name not found> = ArrayList@4592[1] { ResolutionCandidate@4591 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4587 {
+    <name not found> = ArrayList@4588[1] { ResolutionCandidate@4589 }
+}
+
+ResolutionTaskHolder@4590 {
+    <name not found> = ArrayList@4591[1] { ResolutionCandidate@4592 }
 }
 
 ResolutionTaskHolder@4593 {
     <name not found> = ArrayList@4594[1] { ResolutionCandidate@4595 }
-    <name not found> = ArrayList@4596[1] { ResolutionCandidate@4595 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4597 {
-    <name not found> = ArrayList@4598[1] { ResolutionCandidate@4599 }
-    <name not found> = ArrayList@4600[1] { ResolutionCandidate@4599 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4596 {
+    <name not found> = ArrayList@4597[1] { ResolutionCandidate@4598 }
 }
 
-ResolutionTaskHolder@4601 {
-    <name not found> = ArrayList@4602[1] { ResolutionCandidate@4603 }
-    <name not found> = ArrayList@4604[1] { ResolutionCandidate@4603 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4599 {
+    <name not found> = ArrayList@4600[1] { ResolutionCandidate@4601 }
+}
+
+ResolutionTaskHolder@4602 {
+    <name not found> = ArrayList@4603[1] { ResolutionCandidate@4604 }
 }
 
 ResolutionTaskHolder@4605 {
     <name not found> = ArrayList@4606[1] { ResolutionCandidate@4607 }
-    <name not found> = ArrayList@4608[1] { ResolutionCandidate@4607 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4609 {
-    <name not found> = ArrayList@4610[1] { ResolutionCandidate@4611 }
-    <name not found> = ArrayList@4612[1] { ResolutionCandidate@4611 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4608 {
+    <name not found> = ArrayList@4609[1] { ResolutionCandidate@4610 }
 }
 
-ResolutionTaskHolder@4613 {
-    <name not found> = ArrayList@4614[1] { ResolutionCandidate@4615 }
-    <name not found> = ArrayList@4616[1] { ResolutionCandidate@4615 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4611 {
+    <name not found> = ArrayList@4612[1] { ResolutionCandidate@4613 }
+}
+
+ResolutionTaskHolder@4614 {
+    <name not found> = ArrayList@4615[1] { ResolutionCandidate@4616 }
 }
 
 ResolutionTaskHolder@4617 {
     <name not found> = ArrayList@4618[1] { ResolutionCandidate@4619 }
-    <name not found> = ArrayList@4620[1] { ResolutionCandidate@4619 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4621 {
-    <name not found> = ArrayList@4622[1] { ResolutionCandidate@4623 }
-    <name not found> = ArrayList@4624[1] { ResolutionCandidate@4623 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4620 {
+    <name not found> = ArrayList@4621[1] { ResolutionCandidate@4622 }
 }
 
-ResolutionTaskHolder@4625 {
-    <name not found> = ArrayList@4626[1] { ResolutionCandidate@4627 }
-    <name not found> = ArrayList@4628[1] { ResolutionCandidate@4627 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4623 {
+    <name not found> = ArrayList@4624[1] { ResolutionCandidate@4625 }
+}
+
+ResolutionTaskHolder@4626 {
+    <name not found> = ArrayList@4627[1] { ResolutionCandidate@4628 }
 }
 
 ResolutionTaskHolder@4629 {
     <name not found> = ArrayList@4630[1] { ResolutionCandidate@4631 }
-    <name not found> = ArrayList@4632[1] { ResolutionCandidate@4631 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4633 {
-    <name not found> = ArrayList@4634[1] { ResolutionCandidate@4635 }
-    <name not found> = ArrayList@4636[1] { ResolutionCandidate@4635 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4632 {
+    <name not found> = ArrayList@4633[1] { ResolutionCandidate@4634 }
 }
 
-ResolutionTaskHolder@4637 {
-    <name not found> = ArrayList@4638[1] { ResolutionCandidate@4639 }
-    <name not found> = ArrayList@4640[1] { ResolutionCandidate@4639 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4635 {
+    <name not found> = ArrayList@4636[1] { ResolutionCandidate@4637 }
+}
+
+ResolutionTaskHolder@4638 {
+    <name not found> = ArrayList@4639[1] { ResolutionCandidate@4640 }
 }
 
 ResolutionTaskHolder@4641 {
     <name not found> = ArrayList@4642[1] { ResolutionCandidate@4643 }
-    <name not found> = ArrayList@4644[1] { ResolutionCandidate@4643 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4645 {
-    <name not found> = ArrayList@4646[1] { ResolutionCandidate@4647 }
-    <name not found> = ArrayList@4648[1] { ResolutionCandidate@4647 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4644 {
+    <name not found> = ArrayList@4645[1] { ResolutionCandidate@4646 }
 }
 
-ResolutionTaskHolder@4649 {
-    <name not found> = ArrayList@4650[1] { ResolutionCandidate@4651 }
-    <name not found> = ArrayList@4652[1] { ResolutionCandidate@4651 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4647 {
+    <name not found> = ArrayList@4648[1] { ResolutionCandidate@4649 }
+}
+
+ResolutionTaskHolder@4650 {
+    <name not found> = ArrayList@4651[1] { ResolutionCandidate@4652 }
 }
 
 ResolutionTaskHolder@4653 {
     <name not found> = ArrayList@4654[1] { ResolutionCandidate@4655 }
-    <name not found> = ArrayList@4656[1] { ResolutionCandidate@4655 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4657 {
-    <name not found> = ArrayList@4658[1] { ResolutionCandidate@4659 }
-    <name not found> = ArrayList@4660[1] { ResolutionCandidate@4659 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4656 {
+    <name not found> = ArrayList@4657[1] { ResolutionCandidate@4658 }
 }
 
-ResolutionTaskHolder@4661 {
-    <name not found> = ArrayList@4662[1] { ResolutionCandidate@4663 }
-    <name not found> = ArrayList@4664[1] { ResolutionCandidate@4663 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4659 {
+    <name not found> = ArrayList@4660[1] { ResolutionCandidate@4661 }
+}
+
+ResolutionTaskHolder@4662 {
+    <name not found> = ArrayList@4663[1] { ResolutionCandidate@4664 }
 }
 
 ResolutionTaskHolder@4665 {
     <name not found> = ArrayList@4666[1] { ResolutionCandidate@4667 }
-    <name not found> = ArrayList@4668[1] { ResolutionCandidate@4667 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4669 {
-    <name not found> = ArrayList@4670[1] { ResolutionCandidate@4671 }
-    <name not found> = ArrayList@4672[1] { ResolutionCandidate@4671 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4668 {
+    <name not found> = ArrayList@4669[1] { ResolutionCandidate@4670 }
 }
 
-ResolutionTaskHolder@4673 {
-    <name not found> = ArrayList@4674[1] { ResolutionCandidate@4675 }
-    <name not found> = ArrayList@4676[1] { ResolutionCandidate@4675 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4671 {
+    <name not found> = ArrayList@4672[1] { ResolutionCandidate@4673 }
+}
+
+ResolutionTaskHolder@4674 {
+    <name not found> = ArrayList@4675[1] { ResolutionCandidate@4676 }
 }
 
 ResolutionTaskHolder@4677 {
     <name not found> = ArrayList@4678[1] { ResolutionCandidate@4679 }
-    <name not found> = ArrayList@4680[1] { ResolutionCandidate@4679 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4681 {
-    <name not found> = ArrayList@4682[1] { ResolutionCandidate@4683 }
-    <name not found> = ArrayList@4684[1] { ResolutionCandidate@4683 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4680 {
+    <name not found> = ArrayList@4681[1] { ResolutionCandidate@4682 }
 }
 
-ResolutionTaskHolder@4685 {
-    <name not found> = ArrayList@4686[1] { ResolutionCandidate@4687 }
-    <name not found> = ArrayList@4688[1] { ResolutionCandidate@4687 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4683 {
+    <name not found> = ArrayList@4684[1] { ResolutionCandidate@4685 }
+}
+
+ResolutionTaskHolder@4686 {
+    <name not found> = ArrayList@4687[1] { ResolutionCandidate@4688 }
 }
 
 ResolutionTaskHolder@4689 {
     <name not found> = ArrayList@4690[1] { ResolutionCandidate@4691 }
-    <name not found> = ArrayList@4692[1] { ResolutionCandidate@4691 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4693 {
-    <name not found> = ArrayList@4694[1] { ResolutionCandidate@4695 }
-    <name not found> = ArrayList@4696[1] { ResolutionCandidate@4695 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4692 {
+    <name not found> = ArrayList@4693[1] { ResolutionCandidate@4694 }
 }
 
-ResolutionTaskHolder@4697 {
-    <name not found> = ArrayList@4698[1] { ResolutionCandidate@4699 }
-    <name not found> = ArrayList@4700[1] { ResolutionCandidate@4699 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4695 {
+    <name not found> = ArrayList@4696[1] { ResolutionCandidate@4697 }
+}
+
+ResolutionTaskHolder@4698 {
+    <name not found> = ArrayList@4699[1] { ResolutionCandidate@4700 }
 }
 
 ResolutionTaskHolder@4701 {
     <name not found> = ArrayList@4702[1] { ResolutionCandidate@4703 }
-    <name not found> = ArrayList@4704[1] { ResolutionCandidate@4703 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4705 {
-    <name not found> = ArrayList@4706[1] { ResolutionCandidate@4707 }
-    <name not found> = ArrayList@4708[1] { ResolutionCandidate@4707 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4704 {
+    <name not found> = ArrayList@4705[1] { ResolutionCandidate@4706 }
 }
 
-ResolutionTaskHolder@4709 {
-    <name not found> = ArrayList@4710[1] { ResolutionCandidate@4711 }
-    <name not found> = ArrayList@4712[1] { ResolutionCandidate@4711 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4707 {
+    <name not found> = ArrayList@4708[1] { ResolutionCandidate@4709 }
+}
+
+ResolutionTaskHolder@4710 {
+    <name not found> = ArrayList@4711[1] { ResolutionCandidate@4712 }
 }
 
 ResolutionTaskHolder@4713 {
     <name not found> = ArrayList@4714[1] { ResolutionCandidate@4715 }
-    <name not found> = ArrayList@4716[1] { ResolutionCandidate@4715 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4717 {
-    <name not found> = ArrayList@4718[1] { ResolutionCandidate@4719 }
-    <name not found> = ArrayList@4720[1] { ResolutionCandidate@4719 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4716 {
+    <name not found> = ArrayList@4717[1] { ResolutionCandidate@4718 }
 }
 
-ResolutionTaskHolder@4721 {
-    <name not found> = ArrayList@4722[1] { ResolutionCandidate@4723 }
-    <name not found> = ArrayList@4724[1] { ResolutionCandidate@4723 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4719 {
+    <name not found> = ArrayList@4720[1] { ResolutionCandidate@4721 }
+}
+
+ResolutionTaskHolder@4722 {
+    <name not found> = ArrayList@4723[1] { ResolutionCandidate@4724 }
 }
 
 ResolutionTaskHolder@4725 {
     <name not found> = ArrayList@4726[1] { ResolutionCandidate@4727 }
-    <name not found> = ArrayList@4728[1] { ResolutionCandidate@4727 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4729 {
-    <name not found> = ArrayList@4730[1] { ResolutionCandidate@4731 }
-    <name not found> = ArrayList@4732[1] { ResolutionCandidate@4731 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4728 {
+    <name not found> = ArrayList@4729[1] { ResolutionCandidate@4730 }
 }
 
-ResolutionTaskHolder@4733 {
-    <name not found> = ArrayList@4734[1] { ResolutionCandidate@4735 }
-    <name not found> = ArrayList@4736[1] { ResolutionCandidate@4735 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4731 {
+    <name not found> = ArrayList@4732[1] { ResolutionCandidate@4733 }
+}
+
+ResolutionTaskHolder@4734 {
+    <name not found> = ArrayList@4735[1] { ResolutionCandidate@4736 }
 }
 
 ResolutionTaskHolder@4737 {
     <name not found> = ArrayList@4738[1] { ResolutionCandidate@4739 }
-    <name not found> = ArrayList@4740[1] { ResolutionCandidate@4739 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4741 {
-    <name not found> = ArrayList@4742[1] { ResolutionCandidate@4743 }
-    <name not found> = ArrayList@4744[1] { ResolutionCandidate@4743 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4740 {
+    <name not found> = ArrayList@4741[1] { ResolutionCandidate@4742 }
 }
 
-ResolutionTaskHolder@4745 {
-    <name not found> = ArrayList@4746[1] { ResolutionCandidate@4747 }
-    <name not found> = ArrayList@4748[1] { ResolutionCandidate@4747 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4743 {
+    <name not found> = ArrayList@4744[1] { ResolutionCandidate@4745 }
+}
+
+ResolutionTaskHolder@4746 {
+    <name not found> = ArrayList@4747[1] { ResolutionCandidate@4748 }
 }
 
 ResolutionTaskHolder@4749 {
     <name not found> = ArrayList@4750[1] { ResolutionCandidate@4751 }
-    <name not found> = ArrayList@4752[1] { ResolutionCandidate@4751 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4753 {
-    <name not found> = ArrayList@4754[1] { ResolutionCandidate@4755 }
-    <name not found> = ArrayList@4756[1] { ResolutionCandidate@4755 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4752 {
+    <name not found> = ArrayList@4753[1] { ResolutionCandidate@4754 }
 }
 
-ResolutionTaskHolder@4757 {
-    <name not found> = ArrayList@4758[1] { ResolutionCandidate@4759 }
-    <name not found> = ArrayList@4760[1] { ResolutionCandidate@4759 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4755 {
+    <name not found> = ArrayList@4756[1] { ResolutionCandidate@4757 }
+}
+
+ResolutionTaskHolder@4758 {
+    <name not found> = ArrayList@4759[1] { ResolutionCandidate@4760 }
 }
 
 ResolutionTaskHolder@4761 {
     <name not found> = ArrayList@4762[1] { ResolutionCandidate@4763 }
-    <name not found> = ArrayList@4764[1] { ResolutionCandidate@4763 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4765 {
-    <name not found> = ArrayList@4766[1] { ResolutionCandidate@4767 }
-    <name not found> = ArrayList@4768[1] { ResolutionCandidate@4767 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4764 {
+    <name not found> = ArrayList@4765[1] { ResolutionCandidate@4766 }
 }
 
-ResolutionTaskHolder@4769 {
-    <name not found> = ArrayList@4770[1] { ResolutionCandidate@4771 }
-    <name not found> = ArrayList@4772[1] { ResolutionCandidate@4771 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4767 {
+    <name not found> = ArrayList@4768[1] { ResolutionCandidate@4769 }
+}
+
+ResolutionTaskHolder@4770 {
+    <name not found> = ArrayList@4771[1] { ResolutionCandidate@4772 }
 }
 
 ResolutionTaskHolder@4773 {
     <name not found> = ArrayList@4774[1] { ResolutionCandidate@4775 }
-    <name not found> = ArrayList@4776[1] { ResolutionCandidate@4775 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4777 {
-    <name not found> = ArrayList@4778[1] { ResolutionCandidate@4779 }
-    <name not found> = ArrayList@4780[1] { ResolutionCandidate@4779 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4776 {
+    <name not found> = ArrayList@4777[1] { ResolutionCandidate@4778 }
 }
 
-ResolutionTaskHolder@4781 {
-    <name not found> = ArrayList@4782[1] { ResolutionCandidate@4783 }
-    <name not found> = ArrayList@4784[1] { ResolutionCandidate@4783 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4779 {
+    <name not found> = ArrayList@4780[1] { ResolutionCandidate@4781 }
+}
+
+ResolutionTaskHolder@4782 {
+    <name not found> = ArrayList@4783[1] { ResolutionCandidate@4784 }
 }
 
 ResolutionTaskHolder@4785 {
     <name not found> = ArrayList@4786[1] { ResolutionCandidate@4787 }
-    <name not found> = ArrayList@4788[1] { ResolutionCandidate@4787 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4789 {
-    <name not found> = ArrayList@4790[1] { ResolutionCandidate@4791 }
-    <name not found> = ArrayList@4792[1] { ResolutionCandidate@4791 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4788 {
+    <name not found> = ArrayList@4789[1] { ResolutionCandidate@4790 }
 }
 
-ResolutionTaskHolder@4793 {
-    <name not found> = ArrayList@4794[1] { ResolutionCandidate@4795 }
-    <name not found> = ArrayList@4796[1] { ResolutionCandidate@4795 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4791 {
+    <name not found> = ArrayList@4792[1] { ResolutionCandidate@4793 }
+}
+
+ResolutionTaskHolder@4794 {
+    <name not found> = ArrayList@4795[1] { ResolutionCandidate@4796 }
 }
 
 ResolutionTaskHolder@4797 {
     <name not found> = ArrayList@4798[1] { ResolutionCandidate@4799 }
-    <name not found> = ArrayList@4800[1] { ResolutionCandidate@4799 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4801 {
-    <name not found> = ArrayList@4802[1] { ResolutionCandidate@4803 }
-    <name not found> = ArrayList@4804[1] { ResolutionCandidate@4803 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4800 {
+    <name not found> = ArrayList@4801[1] { ResolutionCandidate@4802 }
 }
 
-ResolutionTaskHolder@4805 {
-    <name not found> = ArrayList@4806[1] { ResolutionCandidate@4807 }
-    <name not found> = ArrayList@4808[1] { ResolutionCandidate@4807 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4803 {
+    <name not found> = ArrayList@4804[1] { ResolutionCandidate@4805 }
+}
+
+ResolutionTaskHolder@4806 {
+    <name not found> = ArrayList@4807[1] { ResolutionCandidate@4808 }
 }
 
 ResolutionTaskHolder@4809 {
     <name not found> = ArrayList@4810[1] { ResolutionCandidate@4811 }
-    <name not found> = ArrayList@4812[1] { ResolutionCandidate@4811 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4813 {
-    <name not found> = ArrayList@4814[1] { ResolutionCandidate@4815 }
-    <name not found> = ArrayList@4816[1] { ResolutionCandidate@4815 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4812 {
+    <name not found> = ArrayList@4813[1] { ResolutionCandidate@4814 }
 }
 
-ResolutionTaskHolder@4817 {
-    <name not found> = ArrayList@4818[1] { ResolutionCandidate@4819 }
-    <name not found> = ArrayList@4820[1] { ResolutionCandidate@4819 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4815 {
+    <name not found> = ArrayList@4816[1] { ResolutionCandidate@4817 }
+}
+
+ResolutionTaskHolder@4818 {
+    <name not found> = ArrayList@4819[1] { ResolutionCandidate@4820 }
 }
 
 ResolutionTaskHolder@4821 {
     <name not found> = ArrayList@4822[1] { ResolutionCandidate@4823 }
-    <name not found> = ArrayList@4824[1] { ResolutionCandidate@4823 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4825 {
-    <name not found> = ArrayList@4826[1] { ResolutionCandidate@4827 }
-    <name not found> = ArrayList@4828[1] { ResolutionCandidate@4827 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4824 {
+    <name not found> = ArrayList@4825[1] { ResolutionCandidate@4826 }
 }
 
-ResolutionTaskHolder@4829 {
-    <name not found> = ArrayList@4830[1] { ResolutionCandidate@4831 }
-    <name not found> = ArrayList@4832[1] { ResolutionCandidate@4831 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4827 {
+    <name not found> = ArrayList@4828[1] { ResolutionCandidate@4829 }
+}
+
+ResolutionTaskHolder@4830 {
+    <name not found> = ArrayList@4831[1] { ResolutionCandidate@4832 }
 }
 
 ResolutionTaskHolder@4833 {
     <name not found> = ArrayList@4834[1] { ResolutionCandidate@4835 }
-    <name not found> = ArrayList@4836[1] { ResolutionCandidate@4835 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4837 {
-    <name not found> = ArrayList@4838[1] { ResolutionCandidate@4839 }
-    <name not found> = ArrayList@4840[1] { ResolutionCandidate@4839 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4836 {
+    <name not found> = ArrayList@4837[1] { ResolutionCandidate@4838 }
 }
 
-ResolutionTaskHolder@4841 {
-    <name not found> = ArrayList@4842[1] { ResolutionCandidate@4843 }
-    <name not found> = ArrayList@4844[1] { ResolutionCandidate@4843 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4839 {
+    <name not found> = ArrayList@4840[1] { ResolutionCandidate@4841 }
+}
+
+ResolutionTaskHolder@4842 {
+    <name not found> = ArrayList@4843[1] { ResolutionCandidate@4844 }
 }
 
 ResolutionTaskHolder@4845 {
     <name not found> = ArrayList@4846[1] { ResolutionCandidate@4847 }
-    <name not found> = ArrayList@4848[1] { ResolutionCandidate@4847 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4849 {
-    <name not found> = ArrayList@4850[1] { ResolutionCandidate@4851 }
-    <name not found> = ArrayList@4852[1] { ResolutionCandidate@4851 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4848 {
+    <name not found> = ArrayList@4849[1] { ResolutionCandidate@4850 }
 }
 
-ResolutionTaskHolder@4853 {
-    <name not found> = ArrayList@4854[1] { ResolutionCandidate@4855 }
-    <name not found> = ArrayList@4856[1] { ResolutionCandidate@4855 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4851 {
+    <name not found> = ArrayList@4852[1] { ResolutionCandidate@4853 }
+}
+
+ResolutionTaskHolder@4854 {
+    <name not found> = ArrayList@4855[1] { ResolutionCandidate@4856 }
 }
 
 ResolutionTaskHolder@4857 {
     <name not found> = ArrayList@4858[1] { ResolutionCandidate@4859 }
-    <name not found> = ArrayList@4860[1] { ResolutionCandidate@4859 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4861 {
-    <name not found> = ArrayList@4862[1] { ResolutionCandidate@4863 }
-    <name not found> = ArrayList@4864[1] { ResolutionCandidate@4863 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4860 {
+    <name not found> = ArrayList@4861[1] { ResolutionCandidate@4862 }
 }
 
-ResolutionTaskHolder@4865 {
-    <name not found> = ArrayList@4866[1] { ResolutionCandidate@4867 }
-    <name not found> = ArrayList@4868[1] { ResolutionCandidate@4867 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4863 {
+    <name not found> = ArrayList@4864[1] { ResolutionCandidate@4865 }
+}
+
+ResolutionTaskHolder@4866 {
+    <name not found> = ArrayList@4867[1] { ResolutionCandidate@4868 }
 }
 
 ResolutionTaskHolder@4869 {
     <name not found> = ArrayList@4870[1] { ResolutionCandidate@4871 }
-    <name not found> = ArrayList@4872[1] { ResolutionCandidate@4871 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4873 {
-    <name not found> = ArrayList@4874[1] { ResolutionCandidate@4875 }
-    <name not found> = ArrayList@4876[1] { ResolutionCandidate@4875 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4872 {
+    <name not found> = ArrayList@4873[1] { ResolutionCandidate@4874 }
 }
 
-ResolutionTaskHolder@4877 {
-    <name not found> = ArrayList@4878[1] { ResolutionCandidate@4879 }
-    <name not found> = ArrayList@4880[1] { ResolutionCandidate@4879 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4875 {
+    <name not found> = ArrayList@4876[1] { ResolutionCandidate@4877 }
+}
+
+ResolutionTaskHolder@4878 {
+    <name not found> = ArrayList@4879[1] { ResolutionCandidate@4880 }
 }
 
 ResolutionTaskHolder@4881 {
     <name not found> = ArrayList@4882[1] { ResolutionCandidate@4883 }
-    <name not found> = ArrayList@4884[1] { ResolutionCandidate@4883 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4885 {
-    <name not found> = ArrayList@4886[1] { ResolutionCandidate@4887 }
-    <name not found> = ArrayList@4888[1] { ResolutionCandidate@4887 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4884 {
+    <name not found> = ArrayList@4885[1] { ResolutionCandidate@4886 }
 }
 
-ResolutionTaskHolder@4889 {
-    <name not found> = ArrayList@4890[1] { ResolutionCandidate@4891 }
-    <name not found> = ArrayList@4892[1] { ResolutionCandidate@4891 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4887 {
+    <name not found> = ArrayList@4888[1] { ResolutionCandidate@4889 }
+}
+
+ResolutionTaskHolder@4890 {
+    <name not found> = ArrayList@4891[1] { ResolutionCandidate@4892 }
 }
 
 ResolutionTaskHolder@4893 {
     <name not found> = ArrayList@4894[1] { ResolutionCandidate@4895 }
-    <name not found> = ArrayList@4896[1] { ResolutionCandidate@4895 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4897 {
-    <name not found> = ArrayList@4898[1] { ResolutionCandidate@4899 }
-    <name not found> = ArrayList@4900[1] { ResolutionCandidate@4899 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4896 {
+    <name not found> = ArrayList@4897[1] { ResolutionCandidate@4898 }
 }
 
-ResolutionTaskHolder@4901 {
-    <name not found> = ArrayList@4902[1] { ResolutionCandidate@4903 }
-    <name not found> = ArrayList@4904[1] { ResolutionCandidate@4903 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4899 {
+    <name not found> = ArrayList@4900[1] { ResolutionCandidate@4901 }
+}
+
+ResolutionTaskHolder@4902 {
+    <name not found> = ArrayList@4903[1] { ResolutionCandidate@4904 }
 }
 
 ResolutionTaskHolder@4905 {
     <name not found> = ArrayList@4906[1] { ResolutionCandidate@4907 }
-    <name not found> = ArrayList@4908[1] { ResolutionCandidate@4907 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4909 {
-    <name not found> = ArrayList@4910[1] { ResolutionCandidate@4911 }
-    <name not found> = ArrayList@4912[1] { ResolutionCandidate@4911 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4908 {
+    <name not found> = ArrayList@4909[1] { ResolutionCandidate@4910 }
 }
 
-ResolutionTaskHolder@4913 {
-    <name not found> = ArrayList@4914[1] { ResolutionCandidate@4915 }
-    <name not found> = ArrayList@4916[1] { ResolutionCandidate@4915 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4911 {
+    <name not found> = ArrayList@4912[1] { ResolutionCandidate@4913 }
+}
+
+ResolutionTaskHolder@4914 {
+    <name not found> = ArrayList@4915[1] { ResolutionCandidate@4916 }
 }
 
 ResolutionTaskHolder@4917 {
     <name not found> = ArrayList@4918[1] { ResolutionCandidate@4919 }
-    <name not found> = ArrayList@4920[1] { ResolutionCandidate@4919 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4921 {
-    <name not found> = ArrayList@4922[1] { ResolutionCandidate@4923 }
-    <name not found> = ArrayList@4924[1] { ResolutionCandidate@4923 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4920 {
+    <name not found> = ArrayList@4921[1] { ResolutionCandidate@4922 }
 }
 
-ResolutionTaskHolder@4925 {
-    <name not found> = ArrayList@4926[1] { ResolutionCandidate@4927 }
-    <name not found> = ArrayList@4928[1] { ResolutionCandidate@4927 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4923 {
+    <name not found> = ArrayList@4924[1] { ResolutionCandidate@4925 }
+}
+
+ResolutionTaskHolder@4926 {
+    <name not found> = ArrayList@4927[1] { ResolutionCandidate@4928 }
 }
 
 ResolutionTaskHolder@4929 {
     <name not found> = ArrayList@4930[1] { ResolutionCandidate@4931 }
-    <name not found> = ArrayList@4932[1] { ResolutionCandidate@4931 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4933 {
-    <name not found> = ArrayList@4934[1] { ResolutionCandidate@4935 }
-    <name not found> = ArrayList@4936[1] { ResolutionCandidate@4935 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4932 {
+    <name not found> = ArrayList@4933[1] { ResolutionCandidate@4934 }
 }
 
-ResolutionTaskHolder@4937 {
-    <name not found> = ArrayList@4938[1] { ResolutionCandidate@4939 }
-    <name not found> = ArrayList@4940[1] { ResolutionCandidate@4939 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4935 {
+    <name not found> = ArrayList@4936[1] { ResolutionCandidate@4937 }
+}
+
+ResolutionTaskHolder@4938 {
+    <name not found> = ArrayList@4939[1] { ResolutionCandidate@4940 }
 }
 
 ResolutionTaskHolder@4941 {
     <name not found> = ArrayList@4942[1] { ResolutionCandidate@4943 }
-    <name not found> = ArrayList@4944[1] { ResolutionCandidate@4943 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4945 {
-    <name not found> = ArrayList@4946[1] { ResolutionCandidate@4947 }
-    <name not found> = ArrayList@4948[1] { ResolutionCandidate@4947 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4944 {
+    <name not found> = ArrayList@4945[1] { ResolutionCandidate@4946 }
 }
 
-ResolutionTaskHolder@4949 {
-    <name not found> = ArrayList@4950[1] { ResolutionCandidate@4951 }
-    <name not found> = ArrayList@4952[1] { ResolutionCandidate@4951 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4947 {
+    <name not found> = ArrayList@4948[1] { ResolutionCandidate@4949 }
+}
+
+ResolutionTaskHolder@4950 {
+    <name not found> = ArrayList@4951[1] { ResolutionCandidate@4952 }
 }
 
 ResolutionTaskHolder@4953 {
     <name not found> = ArrayList@4954[1] { ResolutionCandidate@4955 }
-    <name not found> = ArrayList@4956[1] { ResolutionCandidate@4955 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4957 {
-    <name not found> = ArrayList@4958[1] { ResolutionCandidate@4959 }
-    <name not found> = ArrayList@4960[1] { ResolutionCandidate@4959 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4956 {
+    <name not found> = ArrayList@4957[1] { ResolutionCandidate@4958 }
 }
 
-ResolutionTaskHolder@4961 {
-    <name not found> = ArrayList@4962[1] { ResolutionCandidate@4963 }
-    <name not found> = ArrayList@4964[1] { ResolutionCandidate@4963 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4959 {
+    <name not found> = ArrayList@4960[1] { ResolutionCandidate@4961 }
+}
+
+ResolutionTaskHolder@4962 {
+    <name not found> = ArrayList@4963[1] { ResolutionCandidate@4964 }
 }
 
 ResolutionTaskHolder@4965 {
     <name not found> = ArrayList@4966[1] { ResolutionCandidate@4967 }
-    <name not found> = ArrayList@4968[1] { ResolutionCandidate@4967 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4969 {
-    <name not found> = ArrayList@4970[1] { ResolutionCandidate@4971 }
-    <name not found> = ArrayList@4972[1] { ResolutionCandidate@4971 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4968 {
+    <name not found> = ArrayList@4969[1] { ResolutionCandidate@4970 }
 }
 
-ResolutionTaskHolder@4973 {
-    <name not found> = ArrayList@4974[1] { ResolutionCandidate@4975 }
-    <name not found> = ArrayList@4976[1] { ResolutionCandidate@4975 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4971 {
+    <name not found> = ArrayList@4972[1] { ResolutionCandidate@4973 }
+}
+
+ResolutionTaskHolder@4974 {
+    <name not found> = ArrayList@4975[1] { ResolutionCandidate@4976 }
 }
 
 ResolutionTaskHolder@4977 {
     <name not found> = ArrayList@4978[1] { ResolutionCandidate@4979 }
-    <name not found> = ArrayList@4980[1] { ResolutionCandidate@4979 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4981 {
-    <name not found> = ArrayList@4982[1] { ResolutionCandidate@4983 }
-    <name not found> = ArrayList@4984[1] { ResolutionCandidate@4983 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4980 {
+    <name not found> = ArrayList@4981[1] { ResolutionCandidate@4982 }
 }
 
-ResolutionTaskHolder@4985 {
-    <name not found> = ArrayList@4986[1] { ResolutionCandidate@4987 }
-    <name not found> = ArrayList@4988[1] { ResolutionCandidate@4987 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4983 {
+    <name not found> = ArrayList@4984[1] { ResolutionCandidate@4985 }
+}
+
+ResolutionTaskHolder@4986 {
+    <name not found> = ArrayList@4987[1] { ResolutionCandidate@4988 }
 }
 
 ResolutionTaskHolder@4989 {
     <name not found> = ArrayList@4990[1] { ResolutionCandidate@4991 }
-    <name not found> = ArrayList@4992[1] { ResolutionCandidate@4991 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@4993 {
-    <name not found> = ArrayList@4994[1] { ResolutionCandidate@4995 }
-    <name not found> = ArrayList@4996[1] { ResolutionCandidate@4995 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4992 {
+    <name not found> = ArrayList@4993[1] { ResolutionCandidate@4994 }
 }
 
-ResolutionTaskHolder@4997 {
-    <name not found> = ArrayList@4998[1] { ResolutionCandidate@4999 }
-    <name not found> = ArrayList@5000[1] { ResolutionCandidate@4999 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@4995 {
+    <name not found> = ArrayList@4996[1] { ResolutionCandidate@4997 }
+}
+
+ResolutionTaskHolder@4998 {
+    <name not found> = ArrayList@4999[1] { ResolutionCandidate@5000 }
 }
 
 ResolutionTaskHolder@5001 {
     <name not found> = ArrayList@5002[1] { ResolutionCandidate@5003 }
-    <name not found> = ArrayList@5004[1] { ResolutionCandidate@5003 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5005 {
-    <name not found> = ArrayList@5006[1] { ResolutionCandidate@5007 }
-    <name not found> = ArrayList@5008[1] { ResolutionCandidate@5007 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5004 {
+    <name not found> = ArrayList@5005[1] { ResolutionCandidate@5006 }
 }
 
-ResolutionTaskHolder@5009 {
-    <name not found> = ArrayList@5010[1] { ResolutionCandidate@5011 }
-    <name not found> = ArrayList@5012[1] { ResolutionCandidate@5011 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5007 {
+    <name not found> = ArrayList@5008[1] { ResolutionCandidate@5009 }
+}
+
+ResolutionTaskHolder@5010 {
+    <name not found> = ArrayList@5011[1] { ResolutionCandidate@5012 }
 }
 
 ResolutionTaskHolder@5013 {
     <name not found> = ArrayList@5014[1] { ResolutionCandidate@5015 }
-    <name not found> = ArrayList@5016[1] { ResolutionCandidate@5015 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5017 {
-    <name not found> = ArrayList@5018[1] { ResolutionCandidate@5019 }
-    <name not found> = ArrayList@5020[1] { ResolutionCandidate@5019 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5016 {
+    <name not found> = ArrayList@5017[1] { ResolutionCandidate@5018 }
 }
 
-ResolutionTaskHolder@5021 {
-    <name not found> = ArrayList@5022[1] { ResolutionCandidate@5023 }
-    <name not found> = ArrayList@5024[1] { ResolutionCandidate@5023 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5019 {
+    <name not found> = ArrayList@5020[1] { ResolutionCandidate@5021 }
+}
+
+ResolutionTaskHolder@5022 {
+    <name not found> = ArrayList@5023[1] { ResolutionCandidate@5024 }
 }
 
 ResolutionTaskHolder@5025 {
     <name not found> = ArrayList@5026[1] { ResolutionCandidate@5027 }
-    <name not found> = ArrayList@5028[1] { ResolutionCandidate@5027 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5029 {
-    <name not found> = ArrayList@5030[1] { ResolutionCandidate@5031 }
-    <name not found> = ArrayList@5032[1] { ResolutionCandidate@5031 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5028 {
+    <name not found> = ArrayList@5029[1] { ResolutionCandidate@5030 }
 }
 
-ResolutionTaskHolder@5033 {
-    <name not found> = ArrayList@5034[1] { ResolutionCandidate@5035 }
-    <name not found> = ArrayList@5036[1] { ResolutionCandidate@5035 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5031 {
+    <name not found> = ArrayList@5032[1] { ResolutionCandidate@5033 }
+}
+
+ResolutionTaskHolder@5034 {
+    <name not found> = ArrayList@5035[1] { ResolutionCandidate@5036 }
 }
 
 ResolutionTaskHolder@5037 {
     <name not found> = ArrayList@5038[1] { ResolutionCandidate@5039 }
-    <name not found> = ArrayList@5040[1] { ResolutionCandidate@5039 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5041 {
-    <name not found> = ArrayList@5042[1] { ResolutionCandidate@5043 }
-    <name not found> = ArrayList@5044[1] { ResolutionCandidate@5043 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5040 {
+    <name not found> = ArrayList@5041[1] { ResolutionCandidate@5042 }
 }
 
-ResolutionTaskHolder@5045 {
-    <name not found> = ArrayList@5046[1] { ResolutionCandidate@5047 }
-    <name not found> = ArrayList@5048[1] { ResolutionCandidate@5047 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5043 {
+    <name not found> = ArrayList@5044[1] { ResolutionCandidate@5045 }
+}
+
+ResolutionTaskHolder@5046 {
+    <name not found> = ArrayList@5047[1] { ResolutionCandidate@5048 }
 }
 
 ResolutionTaskHolder@5049 {
     <name not found> = ArrayList@5050[1] { ResolutionCandidate@5051 }
-    <name not found> = ArrayList@5052[1] { ResolutionCandidate@5051 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5053 {
-    <name not found> = ArrayList@5054[1] { ResolutionCandidate@5055 }
-    <name not found> = ArrayList@5056[1] { ResolutionCandidate@5055 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5052 {
+    <name not found> = ArrayList@5053[1] { ResolutionCandidate@5054 }
 }
 
-ResolutionTaskHolder@5057 {
-    <name not found> = ArrayList@5058[1] { ResolutionCandidate@5059 }
-    <name not found> = ArrayList@5060[1] { ResolutionCandidate@5059 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5055 {
+    <name not found> = ArrayList@5056[1] { ResolutionCandidate@5057 }
+}
+
+ResolutionTaskHolder@5058 {
+    <name not found> = ArrayList@5059[1] { ResolutionCandidate@5060 }
 }
 
 ResolutionTaskHolder@5061 {
     <name not found> = ArrayList@5062[1] { ResolutionCandidate@5063 }
-    <name not found> = ArrayList@5064[1] { ResolutionCandidate@5063 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5065 {
-    <name not found> = ArrayList@5066[1] { ResolutionCandidate@5067 }
-    <name not found> = ArrayList@5068[1] { ResolutionCandidate@5067 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5064 {
+    <name not found> = ArrayList@5065[1] { ResolutionCandidate@5066 }
 }
 
-ResolutionTaskHolder@5069 {
-    <name not found> = ArrayList@5070[1] { ResolutionCandidate@5071 }
-    <name not found> = ArrayList@5072[1] { ResolutionCandidate@5071 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5067 {
+    <name not found> = ArrayList@5068[1] { ResolutionCandidate@5069 }
+}
+
+ResolutionTaskHolder@5070 {
+    <name not found> = ArrayList@5071[1] { ResolutionCandidate@5072 }
 }
 
 ResolutionTaskHolder@5073 {
     <name not found> = ArrayList@5074[1] { ResolutionCandidate@5075 }
-    <name not found> = ArrayList@5076[1] { ResolutionCandidate@5075 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5077 {
-    <name not found> = ArrayList@5078[1] { ResolutionCandidate@5079 }
-    <name not found> = ArrayList@5080[1] { ResolutionCandidate@5079 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5076 {
+    <name not found> = ArrayList@5077[1] { ResolutionCandidate@5078 }
 }
 
-ResolutionTaskHolder@5081 {
-    <name not found> = ArrayList@5082[1] { ResolutionCandidate@5083 }
-    <name not found> = ArrayList@5084[1] { ResolutionCandidate@5083 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5079 {
+    <name not found> = ArrayList@5080[1] { ResolutionCandidate@5081 }
+}
+
+ResolutionTaskHolder@5082 {
+    <name not found> = ArrayList@5083[1] { ResolutionCandidate@5084 }
 }
 
 ResolutionTaskHolder@5085 {
     <name not found> = ArrayList@5086[1] { ResolutionCandidate@5087 }
-    <name not found> = ArrayList@5088[1] { ResolutionCandidate@5087 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5089 {
-    <name not found> = ArrayList@5090[1] { ResolutionCandidate@5091 }
-    <name not found> = ArrayList@5092[1] { ResolutionCandidate@5091 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5088 {
+    <name not found> = ArrayList@5089[1] { ResolutionCandidate@5090 }
 }
 
-ResolutionTaskHolder@5093 {
-    <name not found> = ArrayList@5094[1] { ResolutionCandidate@5095 }
-    <name not found> = ArrayList@5096[1] { ResolutionCandidate@5095 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5091 {
+    <name not found> = ArrayList@5092[1] { ResolutionCandidate@5093 }
+}
+
+ResolutionTaskHolder@5094 {
+    <name not found> = ArrayList@5095[1] { ResolutionCandidate@5096 }
 }
 
 ResolutionTaskHolder@5097 {
     <name not found> = ArrayList@5098[1] { ResolutionCandidate@5099 }
-    <name not found> = ArrayList@5100[1] { ResolutionCandidate@5099 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5101 {
-    <name not found> = ArrayList@5102[1] { ResolutionCandidate@5103 }
-    <name not found> = ArrayList@5104[1] { ResolutionCandidate@5103 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5100 {
+    <name not found> = ArrayList@5101[1] { ResolutionCandidate@5102 }
 }
 
-ResolutionTaskHolder@5105 {
-    <name not found> = ArrayList@5106[1] { ResolutionCandidate@5107 }
-    <name not found> = ArrayList@5108[1] { ResolutionCandidate@5107 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5103 {
+    <name not found> = ArrayList@5104[1] { ResolutionCandidate@5105 }
+}
+
+ResolutionTaskHolder@5106 {
+    <name not found> = ArrayList@5107[1] { ResolutionCandidate@5108 }
 }
 
 ResolutionTaskHolder@5109 {
     <name not found> = ArrayList@5110[1] { ResolutionCandidate@5111 }
-    <name not found> = ArrayList@5112[1] { ResolutionCandidate@5111 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5113 {
-    <name not found> = ArrayList@5114[1] { ResolutionCandidate@5115 }
-    <name not found> = ArrayList@5116[1] { ResolutionCandidate@5115 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5112 {
+    <name not found> = ArrayList@5113[1] { ResolutionCandidate@5114 }
 }
 
-ResolutionTaskHolder@5117 {
-    <name not found> = ArrayList@5118[1] { ResolutionCandidate@5119 }
-    <name not found> = ArrayList@5120[1] { ResolutionCandidate@5119 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5115 {
+    <name not found> = ArrayList@5116[1] { ResolutionCandidate@5117 }
+}
+
+ResolutionTaskHolder@5118 {
+    <name not found> = ArrayList@5119[1] { ResolutionCandidate@5120 }
 }
 
 ResolutionTaskHolder@5121 {
     <name not found> = ArrayList@5122[1] { ResolutionCandidate@5123 }
-    <name not found> = ArrayList@5124[1] { ResolutionCandidate@5123 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5125 {
-    <name not found> = ArrayList@5126[1] { ResolutionCandidate@5127 }
-    <name not found> = ArrayList@5128[1] { ResolutionCandidate@5127 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5124 {
+    <name not found> = ArrayList@5125[1] { ResolutionCandidate@5126 }
 }
 
-ResolutionTaskHolder@5129 {
-    <name not found> = ArrayList@5130[1] { ResolutionCandidate@5131 }
-    <name not found> = ArrayList@5132[1] { ResolutionCandidate@5131 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5127 {
+    <name not found> = ArrayList@5128[1] { ResolutionCandidate@5129 }
+}
+
+ResolutionTaskHolder@5130 {
+    <name not found> = ArrayList@5131[1] { ResolutionCandidate@5132 }
 }
 
 ResolutionTaskHolder@5133 {
     <name not found> = ArrayList@5134[1] { ResolutionCandidate@5135 }
-    <name not found> = ArrayList@5136[1] { ResolutionCandidate@5135 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5137 {
-    <name not found> = ArrayList@5138[1] { ResolutionCandidate@5139 }
-    <name not found> = ArrayList@5140[1] { ResolutionCandidate@5139 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5136 {
+    <name not found> = ArrayList@5137[1] { ResolutionCandidate@5138 }
 }
 
-ResolutionTaskHolder@5141 {
-    <name not found> = ArrayList@5142[1] { ResolutionCandidate@5143 }
-    <name not found> = ArrayList@5144[1] { ResolutionCandidate@5143 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5139 {
+    <name not found> = ArrayList@5140[1] { ResolutionCandidate@5141 }
+}
+
+ResolutionTaskHolder@5142 {
+    <name not found> = ArrayList@5143[1] { ResolutionCandidate@5144 }
 }
 
 ResolutionTaskHolder@5145 {
     <name not found> = ArrayList@5146[1] { ResolutionCandidate@5147 }
-    <name not found> = ArrayList@5148[1] { ResolutionCandidate@5147 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5149 {
-    <name not found> = ArrayList@5150[1] { ResolutionCandidate@5151 }
-    <name not found> = ArrayList@5152[1] { ResolutionCandidate@5151 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5148 {
+    <name not found> = ArrayList@5149[1] { ResolutionCandidate@5150 }
 }
 
-ResolutionTaskHolder@5153 {
-    <name not found> = ArrayList@5154[1] { ResolutionCandidate@5155 }
-    <name not found> = ArrayList@5156[1] { ResolutionCandidate@5155 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5151 {
+    <name not found> = ArrayList@5152[1] { ResolutionCandidate@5153 }
+}
+
+ResolutionTaskHolder@5154 {
+    <name not found> = ArrayList@5155[1] { ResolutionCandidate@5156 }
 }
 
 ResolutionTaskHolder@5157 {
     <name not found> = ArrayList@5158[1] { ResolutionCandidate@5159 }
-    <name not found> = ArrayList@5160[1] { ResolutionCandidate@5159 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5161 {
-    <name not found> = ArrayList@5162[1] { ResolutionCandidate@5163 }
-    <name not found> = ArrayList@5164[1] { ResolutionCandidate@5163 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5160 {
+    <name not found> = ArrayList@5161[1] { ResolutionCandidate@5162 }
 }
 
-ResolutionTaskHolder@5165 {
-    <name not found> = ArrayList@5166[1] { ResolutionCandidate@5167 }
-    <name not found> = ArrayList@5168[1] { ResolutionCandidate@5167 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5163 {
+    <name not found> = ArrayList@5164[1] { ResolutionCandidate@5165 }
+}
+
+ResolutionTaskHolder@5166 {
+    <name not found> = ArrayList@5167[1] { ResolutionCandidate@5168 }
 }
 
 ResolutionTaskHolder@5169 {
     <name not found> = ArrayList@5170[1] { ResolutionCandidate@5171 }
-    <name not found> = ArrayList@5172[1] { ResolutionCandidate@5171 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5173 {
-    <name not found> = ArrayList@5174[1] { ResolutionCandidate@5175 }
-    <name not found> = ArrayList@5176[1] { ResolutionCandidate@5175 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5172 {
+    <name not found> = ArrayList@5173[1] { ResolutionCandidate@5174 }
 }
 
-ResolutionTaskHolder@5177 {
-    <name not found> = ArrayList@5178[1] { ResolutionCandidate@5179 }
-    <name not found> = ArrayList@5180[1] { ResolutionCandidate@5179 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5175 {
+    <name not found> = ArrayList@5176[1] { ResolutionCandidate@5177 }
+}
+
+ResolutionTaskHolder@5178 {
+    <name not found> = ArrayList@5179[1] { ResolutionCandidate@5180 }
 }
 
 ResolutionTaskHolder@5181 {
     <name not found> = ArrayList@5182[1] { ResolutionCandidate@5183 }
-    <name not found> = ArrayList@5184[1] { ResolutionCandidate@5183 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5185 {
-    <name not found> = ArrayList@5186[1] { ResolutionCandidate@5187 }
-    <name not found> = ArrayList@5188[1] { ResolutionCandidate@5187 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5184 {
+    <name not found> = ArrayList@5185[1] { ResolutionCandidate@5186 }
 }
 
-ResolutionTaskHolder@5189 {
-    <name not found> = ArrayList@5190[1] { ResolutionCandidate@5191 }
-    <name not found> = ArrayList@5192[1] { ResolutionCandidate@5191 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5187 {
+    <name not found> = ArrayList@5188[1] { ResolutionCandidate@5189 }
+}
+
+ResolutionTaskHolder@5190 {
+    <name not found> = ArrayList@5191[1] { ResolutionCandidate@5192 }
 }
 
 ResolutionTaskHolder@5193 {
     <name not found> = ArrayList@5194[1] { ResolutionCandidate@5195 }
-    <name not found> = ArrayList@5196[1] { ResolutionCandidate@5195 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5197 {
-    <name not found> = ArrayList@5198[1] { ResolutionCandidate@5199 }
-    <name not found> = ArrayList@5200[1] { ResolutionCandidate@5199 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5196 {
+    <name not found> = ArrayList@5197[1] { ResolutionCandidate@5198 }
 }
 
-ResolutionTaskHolder@5201 {
-    <name not found> = ArrayList@5202[1] { ResolutionCandidate@5203 }
-    <name not found> = ArrayList@5204[1] { ResolutionCandidate@5203 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5199 {
+    <name not found> = ArrayList@5200[1] { ResolutionCandidate@5201 }
+}
+
+ResolutionTaskHolder@5202 {
+    <name not found> = ArrayList@5203[1] { ResolutionCandidate@5204 }
 }
 
 ResolutionTaskHolder@5205 {
     <name not found> = ArrayList@5206[1] { ResolutionCandidate@5207 }
-    <name not found> = ArrayList@5208[1] { ResolutionCandidate@5207 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5209 {
-    <name not found> = ArrayList@5210[1] { ResolutionCandidate@5211 }
-    <name not found> = ArrayList@5212[1] { ResolutionCandidate@5211 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5208 {
+    <name not found> = ArrayList@5209[1] { ResolutionCandidate@5210 }
 }
 
-ResolutionTaskHolder@5213 {
-    <name not found> = ArrayList@5214[1] { ResolutionCandidate@5215 }
-    <name not found> = ArrayList@5216[1] { ResolutionCandidate@5215 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5211 {
+    <name not found> = ArrayList@5212[1] { ResolutionCandidate@5213 }
+}
+
+ResolutionTaskHolder@5214 {
+    <name not found> = ArrayList@5215[1] { ResolutionCandidate@5216 }
 }
 
 ResolutionTaskHolder@5217 {
     <name not found> = ArrayList@5218[1] { ResolutionCandidate@5219 }
-    <name not found> = ArrayList@5220[1] { ResolutionCandidate@5219 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5221 {
-    <name not found> = ArrayList@5222[1] { ResolutionCandidate@5223 }
-    <name not found> = ArrayList@5224[1] { ResolutionCandidate@5223 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5220 {
+    <name not found> = ArrayList@5221[1] { ResolutionCandidate@5222 }
 }
 
-ResolutionTaskHolder@5225 {
-    <name not found> = ArrayList@5226[1] { ResolutionCandidate@5227 }
-    <name not found> = ArrayList@5228[1] { ResolutionCandidate@5227 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5223 {
+    <name not found> = ArrayList@5224[1] { ResolutionCandidate@5225 }
+}
+
+ResolutionTaskHolder@5226 {
+    <name not found> = ArrayList@5227[1] { ResolutionCandidate@5228 }
 }
 
 ResolutionTaskHolder@5229 {
     <name not found> = ArrayList@5230[1] { ResolutionCandidate@5231 }
-    <name not found> = ArrayList@5232[1] { ResolutionCandidate@5231 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5233 {
-    <name not found> = ArrayList@5234[1] { ResolutionCandidate@5235 }
-    <name not found> = ArrayList@5236[1] { ResolutionCandidate@5235 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5232 {
+    <name not found> = ArrayList@5233[1] { ResolutionCandidate@5234 }
 }
 
-ResolutionTaskHolder@5237 {
-    <name not found> = ArrayList@5238[1] { ResolutionCandidate@5239 }
-    <name not found> = ArrayList@5240[1] { ResolutionCandidate@5239 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5235 {
+    <name not found> = ArrayList@5236[1] { ResolutionCandidate@5237 }
+}
+
+ResolutionTaskHolder@5238 {
+    <name not found> = ArrayList@5239[1] { ResolutionCandidate@5240 }
 }
 
 ResolutionTaskHolder@5241 {
     <name not found> = ArrayList@5242[1] { ResolutionCandidate@5243 }
-    <name not found> = ArrayList@5244[1] { ResolutionCandidate@5243 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5245 {
-    <name not found> = ArrayList@5246[1] { ResolutionCandidate@5247 }
-    <name not found> = ArrayList@5248[1] { ResolutionCandidate@5247 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5244 {
+    <name not found> = ArrayList@5245[1] { ResolutionCandidate@5246 }
 }
 
-ResolutionTaskHolder@5249 {
-    <name not found> = ArrayList@5250[1] { ResolutionCandidate@5251 }
-    <name not found> = ArrayList@5252[1] { ResolutionCandidate@5251 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5247 {
+    <name not found> = ArrayList@5248[1] { ResolutionCandidate@5249 }
+}
+
+ResolutionTaskHolder@5250 {
+    <name not found> = ArrayList@5251[1] { ResolutionCandidate@5252 }
 }
 
 ResolutionTaskHolder@5253 {
     <name not found> = ArrayList@5254[1] { ResolutionCandidate@5255 }
-    <name not found> = ArrayList@5256[1] { ResolutionCandidate@5255 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5257 {
-    <name not found> = ArrayList@5258[1] { ResolutionCandidate@5259 }
-    <name not found> = ArrayList@5260[1] { ResolutionCandidate@5259 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5256 {
+    <name not found> = ArrayList@5257[1] { ResolutionCandidate@5258 }
 }
 
-ResolutionTaskHolder@5261 {
-    <name not found> = ArrayList@5262[1] { ResolutionCandidate@5263 }
-    <name not found> = ArrayList@5264[1] { ResolutionCandidate@5263 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5259 {
+    <name not found> = ArrayList@5260[1] { ResolutionCandidate@5261 }
+}
+
+ResolutionTaskHolder@5262 {
+    <name not found> = ArrayList@5263[1] { ResolutionCandidate@5264 }
 }
 
 ResolutionTaskHolder@5265 {
     <name not found> = ArrayList@5266[1] { ResolutionCandidate@5267 }
-    <name not found> = ArrayList@5268[1] { ResolutionCandidate@5267 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5269 {
-    <name not found> = ArrayList@5270[1] { ResolutionCandidate@5271 }
-    <name not found> = ArrayList@5272[1] { ResolutionCandidate@5271 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5268 {
+    <name not found> = ArrayList@5269[1] { ResolutionCandidate@5270 }
 }
 
-ResolutionTaskHolder@5273 {
-    <name not found> = ArrayList@5274[1] { ResolutionCandidate@5275 }
-    <name not found> = ArrayList@5276[1] { ResolutionCandidate@5275 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5271 {
+    <name not found> = ArrayList@5272[1] { ResolutionCandidate@5273 }
+}
+
+ResolutionTaskHolder@5274 {
+    <name not found> = ArrayList@5275[1] { ResolutionCandidate@5276 }
 }
 
 ResolutionTaskHolder@5277 {
     <name not found> = ArrayList@5278[1] { ResolutionCandidate@5279 }
-    <name not found> = ArrayList@5280[1] { ResolutionCandidate@5279 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5281 {
-    <name not found> = ArrayList@5282[1] { ResolutionCandidate@5283 }
-    <name not found> = ArrayList@5284[1] { ResolutionCandidate@5283 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5280 {
+    <name not found> = ArrayList@5281[1] { ResolutionCandidate@5282 }
 }
 
-ResolutionTaskHolder@5285 {
-    <name not found> = ArrayList@5286[1] { ResolutionCandidate@5287 }
-    <name not found> = ArrayList@5288[1] { ResolutionCandidate@5287 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5283 {
+    <name not found> = ArrayList@5284[1] { ResolutionCandidate@5285 }
+}
+
+ResolutionTaskHolder@5286 {
+    <name not found> = ArrayList@5287[1] { ResolutionCandidate@5288 }
 }
 
 ResolutionTaskHolder@5289 {
     <name not found> = ArrayList@5290[1] { ResolutionCandidate@5291 }
-    <name not found> = ArrayList@5292[1] { ResolutionCandidate@5291 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5293 {
-    <name not found> = ArrayList@5294[1] { ResolutionCandidate@5295 }
-    <name not found> = ArrayList@5296[1] { ResolutionCandidate@5295 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5292 {
+    <name not found> = ArrayList@5293[1] { ResolutionCandidate@5294 }
 }
 
-ResolutionTaskHolder@5297 {
-    <name not found> = ArrayList@5298[1] { ResolutionCandidate@5299 }
-    <name not found> = ArrayList@5300[1] { ResolutionCandidate@5299 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5295 {
+    <name not found> = ArrayList@5296[1] { ResolutionCandidate@5297 }
+}
+
+ResolutionTaskHolder@5298 {
+    <name not found> = ArrayList@5299[1] { ResolutionCandidate@5300 }
 }
 
 ResolutionTaskHolder@5301 {
     <name not found> = ArrayList@5302[1] { ResolutionCandidate@5303 }
-    <name not found> = ArrayList@5304[1] { ResolutionCandidate@5303 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5305 {
-    <name not found> = ArrayList@5306[1] { ResolutionCandidate@5307 }
-    <name not found> = ArrayList@5308[1] { ResolutionCandidate@5307 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5304 {
+    <name not found> = ArrayList@5305[1] { ResolutionCandidate@5306 }
 }
 
-ResolutionTaskHolder@5309 {
-    <name not found> = ArrayList@5310[1] { ResolutionCandidate@5311 }
-    <name not found> = ArrayList@5312[1] { ResolutionCandidate@5311 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5307 {
+    <name not found> = ArrayList@5308[1] { ResolutionCandidate@5309 }
+}
+
+ResolutionTaskHolder@5310 {
+    <name not found> = ArrayList@5311[1] { ResolutionCandidate@5312 }
 }
 
 ResolutionTaskHolder@5313 {
     <name not found> = ArrayList@5314[1] { ResolutionCandidate@5315 }
-    <name not found> = ArrayList@5316[1] { ResolutionCandidate@5315 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5317 {
-    <name not found> = ArrayList@5318[1] { ResolutionCandidate@5319 }
-    <name not found> = ArrayList@5320[1] { ResolutionCandidate@5319 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5316 {
+    <name not found> = ArrayList@5317[1] { ResolutionCandidate@5318 }
 }
 
-ResolutionTaskHolder@5321 {
-    <name not found> = ArrayList@5322[1] { ResolutionCandidate@5323 }
-    <name not found> = ArrayList@5324[1] { ResolutionCandidate@5323 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5319 {
+    <name not found> = ArrayList@5320[1] { ResolutionCandidate@5321 }
+}
+
+ResolutionTaskHolder@5322 {
+    <name not found> = ArrayList@5323[1] { ResolutionCandidate@5324 }
 }
 
 ResolutionTaskHolder@5325 {
     <name not found> = ArrayList@5326[1] { ResolutionCandidate@5327 }
-    <name not found> = ArrayList@5328[1] { ResolutionCandidate@5327 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5329 {
-    <name not found> = ArrayList@5330[1] { ResolutionCandidate@5331 }
-    <name not found> = ArrayList@5332[1] { ResolutionCandidate@5331 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5328 {
+    <name not found> = ArrayList@5329[1] { ResolutionCandidate@5330 }
 }
 
-ResolutionTaskHolder@5333 {
-    <name not found> = ArrayList@5334[1] { ResolutionCandidate@5335 }
-    <name not found> = ArrayList@5336[1] { ResolutionCandidate@5335 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5331 {
+    <name not found> = ArrayList@5332[1] { ResolutionCandidate@5333 }
+}
+
+ResolutionTaskHolder@5334 {
+    <name not found> = ArrayList@5335[1] { ResolutionCandidate@5336 }
 }
 
 ResolutionTaskHolder@5337 {
     <name not found> = ArrayList@5338[1] { ResolutionCandidate@5339 }
-    <name not found> = ArrayList@5340[1] { ResolutionCandidate@5339 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5341 {
-    <name not found> = ArrayList@5342[1] { ResolutionCandidate@5343 }
-    <name not found> = ArrayList@5344[1] { ResolutionCandidate@5343 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5340 {
+    <name not found> = ArrayList@5341[1] { ResolutionCandidate@5342 }
 }
 
-ResolutionTaskHolder@5345 {
-    <name not found> = ArrayList@5346[1] { ResolutionCandidate@5347 }
-    <name not found> = ArrayList@5348[1] { ResolutionCandidate@5347 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5343 {
+    <name not found> = ArrayList@5344[1] { ResolutionCandidate@5345 }
+}
+
+ResolutionTaskHolder@5346 {
+    <name not found> = ArrayList@5347[1] { ResolutionCandidate@5348 }
 }
 
 ResolutionTaskHolder@5349 {
     <name not found> = ArrayList@5350[1] { ResolutionCandidate@5351 }
-    <name not found> = ArrayList@5352[1] { ResolutionCandidate@5351 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5353 {
-    <name not found> = ArrayList@5354[1] { ResolutionCandidate@5355 }
-    <name not found> = ArrayList@5356[1] { ResolutionCandidate@5355 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5352 {
+    <name not found> = ArrayList@5353[1] { ResolutionCandidate@5354 }
 }
 
-ResolutionTaskHolder@5357 {
-    <name not found> = ArrayList@5358[1] { ResolutionCandidate@5359 }
-    <name not found> = ArrayList@5360[1] { ResolutionCandidate@5359 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5355 {
+    <name not found> = ArrayList@5356[1] { ResolutionCandidate@5357 }
+}
+
+ResolutionTaskHolder@5358 {
+    <name not found> = ArrayList@5359[1] { ResolutionCandidate@5360 }
 }
 
 ResolutionTaskHolder@5361 {
     <name not found> = ArrayList@5362[1] { ResolutionCandidate@5363 }
-    <name not found> = ArrayList@5364[1] { ResolutionCandidate@5363 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5365 {
-    <name not found> = ArrayList@5366[1] { ResolutionCandidate@5367 }
-    <name not found> = ArrayList@5368[1] { ResolutionCandidate@5367 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5364 {
+    <name not found> = ArrayList@5365[1] { ResolutionCandidate@5366 }
 }
 
-ResolutionTaskHolder@5369 {
-    <name not found> = ArrayList@5370[1] { ResolutionCandidate@5371 }
-    <name not found> = ArrayList@5372[1] { ResolutionCandidate@5371 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5367 {
+    <name not found> = ArrayList@5368[1] { ResolutionCandidate@5369 }
+}
+
+ResolutionTaskHolder@5370 {
+    <name not found> = ArrayList@5371[1] { ResolutionCandidate@5372 }
 }
 
 ResolutionTaskHolder@5373 {
     <name not found> = ArrayList@5374[1] { ResolutionCandidate@5375 }
-    <name not found> = ArrayList@5376[1] { ResolutionCandidate@5375 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5377 {
-    <name not found> = ArrayList@5378[1] { ResolutionCandidate@5379 }
-    <name not found> = ArrayList@5380[1] { ResolutionCandidate@5379 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5376 {
+    <name not found> = ArrayList@5377[1] { ResolutionCandidate@5378 }
 }
 
-ResolutionTaskHolder@5381 {
-    <name not found> = ArrayList@5382[1] { ResolutionCandidate@5383 }
-    <name not found> = ArrayList@5384[1] { ResolutionCandidate@5383 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5379 {
+    <name not found> = ArrayList@5380[1] { ResolutionCandidate@5381 }
+}
+
+ResolutionTaskHolder@5382 {
+    <name not found> = ArrayList@5383[1] { ResolutionCandidate@5384 }
 }
 
 ResolutionTaskHolder@5385 {
     <name not found> = ArrayList@5386[1] { ResolutionCandidate@5387 }
-    <name not found> = ArrayList@5388[1] { ResolutionCandidate@5387 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5389 {
-    <name not found> = ArrayList@5390[1] { ResolutionCandidate@5391 }
-    <name not found> = ArrayList@5392[1] { ResolutionCandidate@5391 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5388 {
+    <name not found> = ArrayList@5389[1] { ResolutionCandidate@5390 }
 }
 
-ResolutionTaskHolder@5393 {
-    <name not found> = ArrayList@5394[1] { ResolutionCandidate@5395 }
-    <name not found> = ArrayList@5396[1] { ResolutionCandidate@5395 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5391 {
+    <name not found> = ArrayList@5392[1] { ResolutionCandidate@5393 }
+}
+
+ResolutionTaskHolder@5394 {
+    <name not found> = ArrayList@5395[1] { ResolutionCandidate@5396 }
 }
 
 ResolutionTaskHolder@5397 {
     <name not found> = ArrayList@5398[1] { ResolutionCandidate@5399 }
-    <name not found> = ArrayList@5400[1] { ResolutionCandidate@5399 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5401 {
-    <name not found> = ArrayList@5402[1] { ResolutionCandidate@5403 }
-    <name not found> = ArrayList@5404[1] { ResolutionCandidate@5403 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5400 {
+    <name not found> = ArrayList@5401[1] { ResolutionCandidate@5402 }
 }
 
-ResolutionTaskHolder@5405 {
-    <name not found> = ArrayList@5406[1] { ResolutionCandidate@5407 }
-    <name not found> = ArrayList@5408[1] { ResolutionCandidate@5407 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5403 {
+    <name not found> = ArrayList@5404[1] { ResolutionCandidate@5405 }
+}
+
+ResolutionTaskHolder@5406 {
+    <name not found> = ArrayList@5407[1] { ResolutionCandidate@5408 }
 }
 
 ResolutionTaskHolder@5409 {
     <name not found> = ArrayList@5410[1] { ResolutionCandidate@5411 }
-    <name not found> = ArrayList@5412[1] { ResolutionCandidate@5411 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5413 {
-    <name not found> = ArrayList@5414[1] { ResolutionCandidate@5415 }
-    <name not found> = ArrayList@5416[1] { ResolutionCandidate@5415 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5412 {
+    <name not found> = ArrayList@5413[1] { ResolutionCandidate@5414 }
 }
 
-ResolutionTaskHolder@5417 {
-    <name not found> = ArrayList@5418[1] { ResolutionCandidate@5419 }
-    <name not found> = ArrayList@5420[1] { ResolutionCandidate@5419 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5415 {
+    <name not found> = ArrayList@5416[1] { ResolutionCandidate@5417 }
+}
+
+ResolutionTaskHolder@5418 {
+    <name not found> = ArrayList@5419[1] { ResolutionCandidate@5420 }
 }
 
 ResolutionTaskHolder@5421 {
     <name not found> = ArrayList@5422[1] { ResolutionCandidate@5423 }
-    <name not found> = ArrayList@5424[1] { ResolutionCandidate@5423 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5425 {
-    <name not found> = ArrayList@5426[1] { ResolutionCandidate@5427 }
-    <name not found> = ArrayList@5428[1] { ResolutionCandidate@5427 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5424 {
+    <name not found> = ArrayList@5425[1] { ResolutionCandidate@5426 }
 }
 
-ResolutionTaskHolder@5429 {
-    <name not found> = ArrayList@5430[1] { ResolutionCandidate@5431 }
-    <name not found> = ArrayList@5432[1] { ResolutionCandidate@5431 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5427 {
+    <name not found> = ArrayList@5428[1] { ResolutionCandidate@5429 }
+}
+
+ResolutionTaskHolder@5430 {
+    <name not found> = ArrayList@5431[1] { ResolutionCandidate@5432 }
 }
 
 ResolutionTaskHolder@5433 {
     <name not found> = ArrayList@5434[1] { ResolutionCandidate@5435 }
-    <name not found> = ArrayList@5436[1] { ResolutionCandidate@5435 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5437 {
-    <name not found> = ArrayList@5438[1] { ResolutionCandidate@5439 }
-    <name not found> = ArrayList@5440[1] { ResolutionCandidate@5439 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5436 {
+    <name not found> = ArrayList@5437[1] { ResolutionCandidate@5438 }
 }
 
-ResolutionTaskHolder@5441 {
-    <name not found> = ArrayList@5442[1] { ResolutionCandidate@5443 }
-    <name not found> = ArrayList@5444[1] { ResolutionCandidate@5443 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5439 {
+    <name not found> = ArrayList@5440[1] { ResolutionCandidate@5441 }
+}
+
+ResolutionTaskHolder@5442 {
+    <name not found> = ArrayList@5443[1] { ResolutionCandidate@5444 }
 }
 
 ResolutionTaskHolder@5445 {
     <name not found> = ArrayList@5446[1] { ResolutionCandidate@5447 }
-    <name not found> = ArrayList@5448[1] { ResolutionCandidate@5447 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5449 {
-    <name not found> = ArrayList@5450[1] { ResolutionCandidate@5451 }
-    <name not found> = ArrayList@5452[1] { ResolutionCandidate@5451 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5448 {
+    <name not found> = ArrayList@5449[1] { ResolutionCandidate@5450 }
 }
 
-ResolutionTaskHolder@5453 {
-    <name not found> = ArrayList@5454[1] { ResolutionCandidate@5455 }
-    <name not found> = ArrayList@5456[1] { ResolutionCandidate@5455 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5451 {
+    <name not found> = ArrayList@5452[1] { ResolutionCandidate@5453 }
+}
+
+ResolutionTaskHolder@5454 {
+    <name not found> = ArrayList@5455[1] { ResolutionCandidate@5456 }
 }
 
 ResolutionTaskHolder@5457 {
     <name not found> = ArrayList@5458[1] { ResolutionCandidate@5459 }
-    <name not found> = ArrayList@5460[1] { ResolutionCandidate@5459 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5461 {
-    <name not found> = ArrayList@5462[1] { ResolutionCandidate@5463 }
-    <name not found> = ArrayList@5464[1] { ResolutionCandidate@5463 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5460 {
+    <name not found> = ArrayList@5461[1] { ResolutionCandidate@5462 }
 }
 
-ResolutionTaskHolder@5465 {
-    <name not found> = ArrayList@5466[1] { ResolutionCandidate@5467 }
-    <name not found> = ArrayList@5468[1] { ResolutionCandidate@5467 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5463 {
+    <name not found> = ArrayList@5464[1] { ResolutionCandidate@5465 }
+}
+
+ResolutionTaskHolder@5466 {
+    <name not found> = ArrayList@5467[1] { ResolutionCandidate@5468 }
 }
 
 ResolutionTaskHolder@5469 {
     <name not found> = ArrayList@5470[1] { ResolutionCandidate@5471 }
-    <name not found> = ArrayList@5472[1] { ResolutionCandidate@5471 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5473 {
-    <name not found> = ArrayList@5474[1] { ResolutionCandidate@5475 }
-    <name not found> = ArrayList@5476[1] { ResolutionCandidate@5475 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5472 {
+    <name not found> = ArrayList@5473[1] { ResolutionCandidate@5474 }
 }
 
-ResolutionTaskHolder@5477 {
-    <name not found> = ArrayList@5478[1] { ResolutionCandidate@5479 }
-    <name not found> = ArrayList@5480[1] { ResolutionCandidate@5479 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5475 {
+    <name not found> = ArrayList@5476[1] { ResolutionCandidate@5477 }
+}
+
+ResolutionTaskHolder@5478 {
+    <name not found> = ArrayList@5479[1] { ResolutionCandidate@5480 }
 }
 
 ResolutionTaskHolder@5481 {
     <name not found> = ArrayList@5482[1] { ResolutionCandidate@5483 }
-    <name not found> = ArrayList@5484[1] { ResolutionCandidate@5483 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5485 {
-    <name not found> = ArrayList@5486[1] { ResolutionCandidate@5487 }
-    <name not found> = ArrayList@5488[1] { ResolutionCandidate@5487 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5484 {
+    <name not found> = ArrayList@5485[1] { ResolutionCandidate@5486 }
 }
 
-ResolutionTaskHolder@5489 {
-    <name not found> = ArrayList@5490[1] { ResolutionCandidate@5491 }
-    <name not found> = ArrayList@5492[1] { ResolutionCandidate@5491 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5487 {
+    <name not found> = ArrayList@5488[1] { ResolutionCandidate@5489 }
+}
+
+ResolutionTaskHolder@5490 {
+    <name not found> = ArrayList@5491[1] { ResolutionCandidate@5492 }
 }
 
 ResolutionTaskHolder@5493 {
     <name not found> = ArrayList@5494[1] { ResolutionCandidate@5495 }
-    <name not found> = ArrayList@5496[1] { ResolutionCandidate@5495 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5497 {
-    <name not found> = ArrayList@5498[1] { ResolutionCandidate@5499 }
-    <name not found> = ArrayList@5500[1] { ResolutionCandidate@5499 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5496 {
+    <name not found> = ArrayList@5497[1] { ResolutionCandidate@5498 }
 }
 
-ResolutionTaskHolder@5501 {
-    <name not found> = ArrayList@5502[1] { ResolutionCandidate@5503 }
-    <name not found> = ArrayList@5504[1] { ResolutionCandidate@5503 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5499 {
+    <name not found> = ArrayList@5500[1] { ResolutionCandidate@5501 }
+}
+
+ResolutionTaskHolder@5502 {
+    <name not found> = ArrayList@5503[1] { ResolutionCandidate@5504 }
 }
 
 ResolutionTaskHolder@5505 {
     <name not found> = ArrayList@5506[1] { ResolutionCandidate@5507 }
-    <name not found> = ArrayList@5508[1] { ResolutionCandidate@5507 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5509 {
-    <name not found> = ArrayList@5510[1] { ResolutionCandidate@5511 }
-    <name not found> = ArrayList@5512[1] { ResolutionCandidate@5511 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5508 {
+    <name not found> = ArrayList@5509[1] { ResolutionCandidate@5510 }
 }
 
-ResolutionTaskHolder@5513 {
-    <name not found> = ArrayList@5514[1] { ResolutionCandidate@5515 }
-    <name not found> = ArrayList@5516[1] { ResolutionCandidate@5515 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5511 {
+    <name not found> = ArrayList@5512[1] { ResolutionCandidate@5513 }
+}
+
+ResolutionTaskHolder@5514 {
+    <name not found> = ArrayList@5515[1] { ResolutionCandidate@5516 }
 }
 
 ResolutionTaskHolder@5517 {
     <name not found> = ArrayList@5518[1] { ResolutionCandidate@5519 }
-    <name not found> = ArrayList@5520[1] { ResolutionCandidate@5519 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5521 {
-    <name not found> = ArrayList@5522[1] { ResolutionCandidate@5523 }
-    <name not found> = ArrayList@5524[1] { ResolutionCandidate@5523 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5520 {
+    <name not found> = ArrayList@5521[1] { ResolutionCandidate@5522 }
 }
 
-ResolutionTaskHolder@5525 {
-    <name not found> = ArrayList@5526[1] { ResolutionCandidate@5527 }
-    <name not found> = ArrayList@5528[1] { ResolutionCandidate@5527 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5523 {
+    <name not found> = ArrayList@5524[1] { ResolutionCandidate@5525 }
+}
+
+ResolutionTaskHolder@5526 {
+    <name not found> = ArrayList@5527[1] { ResolutionCandidate@5528 }
 }
 
 ResolutionTaskHolder@5529 {
     <name not found> = ArrayList@5530[1] { ResolutionCandidate@5531 }
-    <name not found> = ArrayList@5532[1] { ResolutionCandidate@5531 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5533 {
-    <name not found> = ArrayList@5534[1] { ResolutionCandidate@5535 }
-    <name not found> = ArrayList@5536[1] { ResolutionCandidate@5535 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5532 {
+    <name not found> = ArrayList@5533[1] { ResolutionCandidate@5534 }
 }
 
-ResolutionTaskHolder@5537 {
-    <name not found> = ArrayList@5538[1] { ResolutionCandidate@5539 }
-    <name not found> = ArrayList@5540[1] { ResolutionCandidate@5539 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5535 {
+    <name not found> = ArrayList@5536[1] { ResolutionCandidate@5537 }
+}
+
+ResolutionTaskHolder@5538 {
+    <name not found> = ArrayList@5539[1] { ResolutionCandidate@5540 }
 }
 
 ResolutionTaskHolder@5541 {
     <name not found> = ArrayList@5542[1] { ResolutionCandidate@5543 }
-    <name not found> = ArrayList@5544[1] { ResolutionCandidate@5543 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5545 {
-    <name not found> = ArrayList@5546[1] { ResolutionCandidate@5547 }
-    <name not found> = ArrayList@5548[1] { ResolutionCandidate@5547 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5544 {
+    <name not found> = ArrayList@5545[1] { ResolutionCandidate@5546 }
 }
 
-ResolutionTaskHolder@5549 {
-    <name not found> = ArrayList@5550[1] { ResolutionCandidate@5551 }
-    <name not found> = ArrayList@5552[1] { ResolutionCandidate@5551 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5547 {
+    <name not found> = ArrayList@5548[1] { ResolutionCandidate@5549 }
+}
+
+ResolutionTaskHolder@5550 {
+    <name not found> = ArrayList@5551[1] { ResolutionCandidate@5552 }
 }
 
 ResolutionTaskHolder@5553 {
     <name not found> = ArrayList@5554[1] { ResolutionCandidate@5555 }
-    <name not found> = ArrayList@5556[1] { ResolutionCandidate@5555 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5557 {
-    <name not found> = ArrayList@5558[1] { ResolutionCandidate@5559 }
-    <name not found> = ArrayList@5560[1] { ResolutionCandidate@5559 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5556 {
+    <name not found> = ArrayList@5557[1] { ResolutionCandidate@5558 }
 }
 
-ResolutionTaskHolder@5561 {
-    <name not found> = ArrayList@5562[1] { ResolutionCandidate@5563 }
-    <name not found> = ArrayList@5564[1] { ResolutionCandidate@5563 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5559 {
+    <name not found> = ArrayList@5560[1] { ResolutionCandidate@5561 }
+}
+
+ResolutionTaskHolder@5562 {
+    <name not found> = ArrayList@5563[1] { ResolutionCandidate@5564 }
 }
 
 ResolutionTaskHolder@5565 {
     <name not found> = ArrayList@5566[1] { ResolutionCandidate@5567 }
-    <name not found> = ArrayList@5568[1] { ResolutionCandidate@5567 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5569 {
-    <name not found> = ArrayList@5570[1] { ResolutionCandidate@5571 }
-    <name not found> = ArrayList@5572[1] { ResolutionCandidate@5571 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5568 {
+    <name not found> = ArrayList@5569[1] { ResolutionCandidate@5570 }
 }
 
-ResolutionTaskHolder@5573 {
-    <name not found> = ArrayList@5574[1] { ResolutionCandidate@5575 }
-    <name not found> = ArrayList@5576[1] { ResolutionCandidate@5575 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5571 {
+    <name not found> = ArrayList@5572[1] { ResolutionCandidate@5573 }
+}
+
+ResolutionTaskHolder@5574 {
+    <name not found> = ArrayList@5575[1] { ResolutionCandidate@5576 }
 }
 
 ResolutionTaskHolder@5577 {
     <name not found> = ArrayList@5578[1] { ResolutionCandidate@5579 }
-    <name not found> = ArrayList@5580[1] { ResolutionCandidate@5579 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5581 {
-    <name not found> = ArrayList@5582[1] { ResolutionCandidate@5583 }
-    <name not found> = ArrayList@5584[1] { ResolutionCandidate@5583 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5580 {
+    <name not found> = ArrayList@5581[1] { ResolutionCandidate@5582 }
 }
 
-ResolutionTaskHolder@5585 {
-    <name not found> = ArrayList@5586[1] { ResolutionCandidate@5587 }
-    <name not found> = ArrayList@5588[1] { ResolutionCandidate@5587 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5583 {
+    <name not found> = ArrayList@5584[1] { ResolutionCandidate@5585 }
+}
+
+ResolutionTaskHolder@5586 {
+    <name not found> = ArrayList@5587[1] { ResolutionCandidate@5588 }
 }
 
 ResolutionTaskHolder@5589 {
     <name not found> = ArrayList@5590[1] { ResolutionCandidate@5591 }
-    <name not found> = ArrayList@5592[1] { ResolutionCandidate@5591 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5593 {
-    <name not found> = ArrayList@5594[1] { ResolutionCandidate@5595 }
-    <name not found> = ArrayList@5596[1] { ResolutionCandidate@5595 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5592 {
+    <name not found> = ArrayList@5593[1] { ResolutionCandidate@5594 }
 }
 
-ResolutionTaskHolder@5597 {
-    <name not found> = ArrayList@5598[1] { ResolutionCandidate@5599 }
-    <name not found> = ArrayList@5600[1] { ResolutionCandidate@5599 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5595 {
+    <name not found> = ArrayList@5596[1] { ResolutionCandidate@5597 }
+}
+
+ResolutionTaskHolder@5598 {
+    <name not found> = ArrayList@5599[1] { ResolutionCandidate@5600 }
 }
 
 ResolutionTaskHolder@5601 {
     <name not found> = ArrayList@5602[1] { ResolutionCandidate@5603 }
-    <name not found> = ArrayList@5604[1] { ResolutionCandidate@5603 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5605 {
-    <name not found> = ArrayList@5606[1] { ResolutionCandidate@5607 }
-    <name not found> = ArrayList@5608[1] { ResolutionCandidate@5607 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5604 {
+    <name not found> = ArrayList@5605[1] { ResolutionCandidate@5606 }
 }
 
-ResolutionTaskHolder@5609 {
-    <name not found> = ArrayList@5610[1] { ResolutionCandidate@5611 }
-    <name not found> = ArrayList@5612[1] { ResolutionCandidate@5611 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5607 {
+    <name not found> = ArrayList@5608[1] { ResolutionCandidate@5609 }
+}
+
+ResolutionTaskHolder@5610 {
+    <name not found> = ArrayList@5611[1] { ResolutionCandidate@5612 }
 }
 
 ResolutionTaskHolder@5613 {
     <name not found> = ArrayList@5614[1] { ResolutionCandidate@5615 }
-    <name not found> = ArrayList@5616[1] { ResolutionCandidate@5615 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5617 {
-    <name not found> = ArrayList@5618[1] { ResolutionCandidate@5619 }
-    <name not found> = ArrayList@5620[1] { ResolutionCandidate@5619 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5616 {
+    <name not found> = ArrayList@5617[1] { ResolutionCandidate@5618 }
 }
 
-ResolutionTaskHolder@5621 {
-    <name not found> = ArrayList@5622[1] { ResolutionCandidate@5623 }
-    <name not found> = ArrayList@5624[1] { ResolutionCandidate@5623 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5619 {
+    <name not found> = ArrayList@5620[1] { ResolutionCandidate@5621 }
+}
+
+ResolutionTaskHolder@5622 {
+    <name not found> = ArrayList@5623[1] { ResolutionCandidate@5624 }
 }
 
 ResolutionTaskHolder@5625 {
     <name not found> = ArrayList@5626[1] { ResolutionCandidate@5627 }
-    <name not found> = ArrayList@5628[1] { ResolutionCandidate@5627 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5629 {
-    <name not found> = ArrayList@5630[1] { ResolutionCandidate@5631 }
-    <name not found> = ArrayList@5632[1] { ResolutionCandidate@5631 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5628 {
+    <name not found> = ArrayList@5629[1] { ResolutionCandidate@5630 }
 }
 
-ResolutionTaskHolder@5633 {
-    <name not found> = ArrayList@5634[1] { ResolutionCandidate@5635 }
-    <name not found> = ArrayList@5636[1] { ResolutionCandidate@5635 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5631 {
+    <name not found> = ArrayList@5632[1] { ResolutionCandidate@5633 }
+}
+
+ResolutionTaskHolder@5634 {
+    <name not found> = ArrayList@5635[1] { ResolutionCandidate@5636 }
 }
 
 ResolutionTaskHolder@5637 {
     <name not found> = ArrayList@5638[1] { ResolutionCandidate@5639 }
-    <name not found> = ArrayList@5640[1] { ResolutionCandidate@5639 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5641 {
-    <name not found> = ArrayList@5642[1] { ResolutionCandidate@5643 }
-    <name not found> = ArrayList@5644[1] { ResolutionCandidate@5643 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5640 {
+    <name not found> = ArrayList@5641[1] { ResolutionCandidate@5642 }
 }
 
-ResolutionTaskHolder@5645 {
-    <name not found> = ArrayList@5646[1] { ResolutionCandidate@5647 }
-    <name not found> = ArrayList@5648[1] { ResolutionCandidate@5647 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5643 {
+    <name not found> = ArrayList@5644[1] { ResolutionCandidate@5645 }
+}
+
+ResolutionTaskHolder@5646 {
+    <name not found> = ArrayList@5647[1] { ResolutionCandidate@5648 }
 }
 
 ResolutionTaskHolder@5649 {
     <name not found> = ArrayList@5650[1] { ResolutionCandidate@5651 }
-    <name not found> = ArrayList@5652[1] { ResolutionCandidate@5651 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5653 {
-    <name not found> = ArrayList@5654[1] { ResolutionCandidate@5655 }
-    <name not found> = ArrayList@5656[1] { ResolutionCandidate@5655 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5652 {
+    <name not found> = ArrayList@5653[1] { ResolutionCandidate@5654 }
 }
 
-ResolutionTaskHolder@5657 {
-    <name not found> = ArrayList@5658[1] { ResolutionCandidate@5659 }
-    <name not found> = ArrayList@5660[1] { ResolutionCandidate@5659 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5655 {
+    <name not found> = ArrayList@5656[1] { ResolutionCandidate@5657 }
+}
+
+ResolutionTaskHolder@5658 {
+    <name not found> = ArrayList@5659[1] { ResolutionCandidate@5660 }
 }
 
 ResolutionTaskHolder@5661 {
     <name not found> = ArrayList@5662[1] { ResolutionCandidate@5663 }
-    <name not found> = ArrayList@5664[1] { ResolutionCandidate@5663 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5665 {
-    <name not found> = ArrayList@5666[1] { ResolutionCandidate@5667 }
-    <name not found> = ArrayList@5668[1] { ResolutionCandidate@5667 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5664 {
+    <name not found> = ArrayList@5665[1] { ResolutionCandidate@5666 }
 }
 
-ResolutionTaskHolder@5669 {
-    <name not found> = ArrayList@5670[1] { ResolutionCandidate@5671 }
-    <name not found> = ArrayList@5672[1] { ResolutionCandidate@5671 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5667 {
+    <name not found> = ArrayList@5668[1] { ResolutionCandidate@5669 }
+}
+
+ResolutionTaskHolder@5670 {
+    <name not found> = ArrayList@5671[1] { ResolutionCandidate@5672 }
 }
 
 ResolutionTaskHolder@5673 {
     <name not found> = ArrayList@5674[1] { ResolutionCandidate@5675 }
-    <name not found> = ArrayList@5676[1] { ResolutionCandidate@5675 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5677 {
-    <name not found> = ArrayList@5678[1] { ResolutionCandidate@5679 }
-    <name not found> = ArrayList@5680[1] { ResolutionCandidate@5679 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5676 {
+    <name not found> = ArrayList@5677[1] { ResolutionCandidate@5678 }
 }
 
-ResolutionTaskHolder@5681 {
-    <name not found> = ArrayList@5682[1] { ResolutionCandidate@5683 }
-    <name not found> = ArrayList@5684[1] { ResolutionCandidate@5683 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5679 {
+    <name not found> = ArrayList@5680[1] { ResolutionCandidate@5681 }
+}
+
+ResolutionTaskHolder@5682 {
+    <name not found> = ArrayList@5683[1] { ResolutionCandidate@5684 }
 }
 
 ResolutionTaskHolder@5685 {
     <name not found> = ArrayList@5686[1] { ResolutionCandidate@5687 }
-    <name not found> = ArrayList@5688[1] { ResolutionCandidate@5687 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5689 {
-    <name not found> = ArrayList@5690[1] { ResolutionCandidate@5691 }
-    <name not found> = ArrayList@5692[1] { ResolutionCandidate@5691 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5688 {
+    <name not found> = ArrayList@5689[1] { ResolutionCandidate@5690 }
 }
 
-ResolutionTaskHolder@5693 {
-    <name not found> = ArrayList@5694[1] { ResolutionCandidate@5695 }
-    <name not found> = ArrayList@5696[1] { ResolutionCandidate@5695 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5691 {
+    <name not found> = ArrayList@5692[1] { ResolutionCandidate@5693 }
+}
+
+ResolutionTaskHolder@5694 {
+    <name not found> = ArrayList@5695[1] { ResolutionCandidate@5696 }
 }
 
 ResolutionTaskHolder@5697 {
     <name not found> = ArrayList@5698[1] { ResolutionCandidate@5699 }
-    <name not found> = ArrayList@5700[1] { ResolutionCandidate@5699 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5701 {
-    <name not found> = ArrayList@5702[1] { ResolutionCandidate@5703 }
-    <name not found> = ArrayList@5704[1] { ResolutionCandidate@5703 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5700 {
+    <name not found> = ArrayList@5701[1] { ResolutionCandidate@5702 }
 }
 
-ResolutionTaskHolder@5705 {
-    <name not found> = ArrayList@5706[1] { ResolutionCandidate@5707 }
-    <name not found> = ArrayList@5708[1] { ResolutionCandidate@5707 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5703 {
+    <name not found> = ArrayList@5704[1] { ResolutionCandidate@5705 }
+}
+
+ResolutionTaskHolder@5706 {
+    <name not found> = ArrayList@5707[1] { ResolutionCandidate@5708 }
 }
 
 ResolutionTaskHolder@5709 {
     <name not found> = ArrayList@5710[1] { ResolutionCandidate@5711 }
-    <name not found> = ArrayList@5712[1] { ResolutionCandidate@5711 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5713 {
-    <name not found> = ArrayList@5714[1] { ResolutionCandidate@5715 }
-    <name not found> = ArrayList@5716[1] { ResolutionCandidate@5715 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5712 {
+    <name not found> = ArrayList@5713[1] { ResolutionCandidate@5714 }
 }
 
-ResolutionTaskHolder@5717 {
-    <name not found> = ArrayList@5718[1] { ResolutionCandidate@5719 }
-    <name not found> = ArrayList@5720[1] { ResolutionCandidate@5719 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5715 {
+    <name not found> = ArrayList@5716[1] { ResolutionCandidate@5717 }
+}
+
+ResolutionTaskHolder@5718 {
+    <name not found> = ArrayList@5719[1] { ResolutionCandidate@5720 }
 }
 
 ResolutionTaskHolder@5721 {
     <name not found> = ArrayList@5722[1] { ResolutionCandidate@5723 }
-    <name not found> = ArrayList@5724[1] { ResolutionCandidate@5723 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5725 {
-    <name not found> = ArrayList@5726[1] { ResolutionCandidate@5727 }
-    <name not found> = ArrayList@5728[1] { ResolutionCandidate@5727 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5724 {
+    <name not found> = ArrayList@5725[1] { ResolutionCandidate@5726 }
 }
 
-ResolutionTaskHolder@5729 {
-    <name not found> = ArrayList@5730[1] { ResolutionCandidate@5731 }
-    <name not found> = ArrayList@5732[1] { ResolutionCandidate@5731 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5727 {
+    <name not found> = ArrayList@5728[1] { ResolutionCandidate@5729 }
+}
+
+ResolutionTaskHolder@5730 {
+    <name not found> = ArrayList@5731[1] { ResolutionCandidate@5732 }
 }
 
 ResolutionTaskHolder@5733 {
     <name not found> = ArrayList@5734[1] { ResolutionCandidate@5735 }
-    <name not found> = ArrayList@5736[1] { ResolutionCandidate@5735 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5737 {
-    <name not found> = ArrayList@5738[1] { ResolutionCandidate@5739 }
-    <name not found> = ArrayList@5740[1] { ResolutionCandidate@5739 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5736 {
+    <name not found> = ArrayList@5737[1] { ResolutionCandidate@5738 }
 }
 
-ResolutionTaskHolder@5741 {
-    <name not found> = ArrayList@5742[1] { ResolutionCandidate@5743 }
-    <name not found> = ArrayList@5744[1] { ResolutionCandidate@5743 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5739 {
+    <name not found> = ArrayList@5740[1] { ResolutionCandidate@5741 }
+}
+
+ResolutionTaskHolder@5742 {
+    <name not found> = ArrayList@5743[1] { ResolutionCandidate@5744 }
 }
 
 ResolutionTaskHolder@5745 {
     <name not found> = ArrayList@5746[1] { ResolutionCandidate@5747 }
-    <name not found> = ArrayList@5748[1] { ResolutionCandidate@5747 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5749 {
-    <name not found> = ArrayList@5750[1] { ResolutionCandidate@5751 }
-    <name not found> = ArrayList@5752[1] { ResolutionCandidate@5751 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5748 {
+    <name not found> = ArrayList@5749[1] { ResolutionCandidate@5750 }
 }
 
-ResolutionTaskHolder@5753 {
-    <name not found> = ArrayList@5754[1] { ResolutionCandidate@5755 }
-    <name not found> = ArrayList@5756[1] { ResolutionCandidate@5755 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5751 {
+    <name not found> = ArrayList@5752[1] { ResolutionCandidate@5753 }
+}
+
+ResolutionTaskHolder@5754 {
+    <name not found> = ArrayList@5755[1] { ResolutionCandidate@5756 }
 }
 
 ResolutionTaskHolder@5757 {
     <name not found> = ArrayList@5758[1] { ResolutionCandidate@5759 }
-    <name not found> = ArrayList@5760[1] { ResolutionCandidate@5759 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5761 {
-    <name not found> = ArrayList@5762[1] { ResolutionCandidate@5763 }
-    <name not found> = ArrayList@5764[1] { ResolutionCandidate@5763 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5760 {
+    <name not found> = ArrayList@5761[1] { ResolutionCandidate@5762 }
 }
 
-ResolutionTaskHolder@5765 {
-    <name not found> = ArrayList@5766[1] { ResolutionCandidate@5767 }
-    <name not found> = ArrayList@5768[1] { ResolutionCandidate@5767 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5763 {
+    <name not found> = ArrayList@5764[1] { ResolutionCandidate@5765 }
+}
+
+ResolutionTaskHolder@5766 {
+    <name not found> = ArrayList@5767[1] { ResolutionCandidate@5768 }
 }
 
 ResolutionTaskHolder@5769 {
     <name not found> = ArrayList@5770[1] { ResolutionCandidate@5771 }
-    <name not found> = ArrayList@5772[1] { ResolutionCandidate@5771 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5773 {
-    <name not found> = ArrayList@5774[1] { ResolutionCandidate@5775 }
-    <name not found> = ArrayList@5776[1] { ResolutionCandidate@5775 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5772 {
+    <name not found> = ArrayList@5773[1] { ResolutionCandidate@5774 }
 }
 
-ResolutionTaskHolder@5777 {
-    <name not found> = ArrayList@5778[1] { ResolutionCandidate@5779 }
-    <name not found> = ArrayList@5780[1] { ResolutionCandidate@5779 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5775 {
+    <name not found> = ArrayList@5776[1] { ResolutionCandidate@5777 }
+}
+
+ResolutionTaskHolder@5778 {
+    <name not found> = ArrayList@5779[1] { ResolutionCandidate@5780 }
 }
 
 ResolutionTaskHolder@5781 {
     <name not found> = ArrayList@5782[1] { ResolutionCandidate@5783 }
-    <name not found> = ArrayList@5784[1] { ResolutionCandidate@5783 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5785 {
-    <name not found> = ArrayList@5786[1] { ResolutionCandidate@5787 }
-    <name not found> = ArrayList@5788[1] { ResolutionCandidate@5787 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5784 {
+    <name not found> = ArrayList@5785[1] { ResolutionCandidate@5786 }
 }
 
-ResolutionTaskHolder@5789 {
-    <name not found> = ArrayList@5790[1] { ResolutionCandidate@5791 }
-    <name not found> = ArrayList@5792[1] { ResolutionCandidate@5791 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5787 {
+    <name not found> = ArrayList@5788[1] { ResolutionCandidate@5789 }
+}
+
+ResolutionTaskHolder@5790 {
+    <name not found> = ArrayList@5791[1] { ResolutionCandidate@5792 }
 }
 
 ResolutionTaskHolder@5793 {
     <name not found> = ArrayList@5794[1] { ResolutionCandidate@5795 }
-    <name not found> = ArrayList@5796[1] { ResolutionCandidate@5795 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5797 {
-    <name not found> = ArrayList@5798[1] { ResolutionCandidate@5799 }
-    <name not found> = ArrayList@5800[1] { ResolutionCandidate@5799 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5796 {
+    <name not found> = ArrayList@5797[1] { ResolutionCandidate@5798 }
 }
 
-ResolutionTaskHolder@5801 {
-    <name not found> = ArrayList@5802[1] { ResolutionCandidate@5803 }
-    <name not found> = ArrayList@5804[1] { ResolutionCandidate@5803 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5799 {
+    <name not found> = ArrayList@5800[1] { ResolutionCandidate@5801 }
+}
+
+ResolutionTaskHolder@5802 {
+    <name not found> = ArrayList@5803[1] { ResolutionCandidate@5804 }
 }
 
 ResolutionTaskHolder@5805 {
     <name not found> = ArrayList@5806[1] { ResolutionCandidate@5807 }
-    <name not found> = ArrayList@5808[1] { ResolutionCandidate@5807 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5809 {
-    <name not found> = ArrayList@5810[1] { ResolutionCandidate@5811 }
-    <name not found> = ArrayList@5812[1] { ResolutionCandidate@5811 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5808 {
+    <name not found> = ArrayList@5809[1] { ResolutionCandidate@5810 }
 }
 
-ResolutionTaskHolder@5813 {
-    <name not found> = ArrayList@5814[1] { ResolutionCandidate@5815 }
-    <name not found> = ArrayList@5816[1] { ResolutionCandidate@5815 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5811 {
+    <name not found> = ArrayList@5812[1] { ResolutionCandidate@5813 }
+}
+
+ResolutionTaskHolder@5814 {
+    <name not found> = ArrayList@5815[1] { ResolutionCandidate@5816 }
 }
 
 ResolutionTaskHolder@5817 {
     <name not found> = ArrayList@5818[1] { ResolutionCandidate@5819 }
-    <name not found> = ArrayList@5820[1] { ResolutionCandidate@5819 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5821 {
-    <name not found> = ArrayList@5822[1] { ResolutionCandidate@5823 }
-    <name not found> = ArrayList@5824[1] { ResolutionCandidate@5823 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5820 {
+    <name not found> = ArrayList@5821[1] { ResolutionCandidate@5822 }
 }
 
-ResolutionTaskHolder@5825 {
-    <name not found> = ArrayList@5826[1] { ResolutionCandidate@5827 }
-    <name not found> = ArrayList@5828[1] { ResolutionCandidate@5827 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5823 {
+    <name not found> = ArrayList@5824[1] { ResolutionCandidate@5825 }
+}
+
+ResolutionTaskHolder@5826 {
+    <name not found> = ArrayList@5827[1] { ResolutionCandidate@5828 }
 }
 
 ResolutionTaskHolder@5829 {
     <name not found> = ArrayList@5830[1] { ResolutionCandidate@5831 }
-    <name not found> = ArrayList@5832[1] { ResolutionCandidate@5831 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5833 {
-    <name not found> = ArrayList@5834[1] { ResolutionCandidate@5835 }
-    <name not found> = ArrayList@5836[1] { ResolutionCandidate@5835 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5832 {
+    <name not found> = ArrayList@5833[1] { ResolutionCandidate@5834 }
 }
 
-ResolutionTaskHolder@5837 {
-    <name not found> = ArrayList@5838[1] { ResolutionCandidate@5839 }
-    <name not found> = ArrayList@5840[1] { ResolutionCandidate@5839 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5835 {
+    <name not found> = ArrayList@5836[1] { ResolutionCandidate@5837 }
+}
+
+ResolutionTaskHolder@5838 {
+    <name not found> = ArrayList@5839[1] { ResolutionCandidate@5840 }
 }
 
 ResolutionTaskHolder@5841 {
     <name not found> = ArrayList@5842[1] { ResolutionCandidate@5843 }
-    <name not found> = ArrayList@5844[1] { ResolutionCandidate@5843 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5845 {
-    <name not found> = ArrayList@5846[1] { ResolutionCandidate@5847 }
-    <name not found> = ArrayList@5848[1] { ResolutionCandidate@5847 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5844 {
+    <name not found> = ArrayList@5845[1] { ResolutionCandidate@5846 }
 }
 
-ResolutionTaskHolder@5849 {
-    <name not found> = ArrayList@5850[1] { ResolutionCandidate@5851 }
-    <name not found> = ArrayList@5852[1] { ResolutionCandidate@5851 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5847 {
+    <name not found> = ArrayList@5848[1] { ResolutionCandidate@5849 }
+}
+
+ResolutionTaskHolder@5850 {
+    <name not found> = ArrayList@5851[1] { ResolutionCandidate@5852 }
 }
 
 ResolutionTaskHolder@5853 {
     <name not found> = ArrayList@5854[1] { ResolutionCandidate@5855 }
-    <name not found> = ArrayList@5856[1] { ResolutionCandidate@5855 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5857 {
-    <name not found> = ArrayList@5858[1] { ResolutionCandidate@5859 }
-    <name not found> = ArrayList@5860[1] { ResolutionCandidate@5859 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5856 {
+    <name not found> = ArrayList@5857[1] { ResolutionCandidate@5858 }
 }
 
-ResolutionTaskHolder@5861 {
-    <name not found> = ArrayList@5862[1] { ResolutionCandidate@5863 }
-    <name not found> = ArrayList@5864[1] { ResolutionCandidate@5863 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5859 {
+    <name not found> = ArrayList@5860[1] { ResolutionCandidate@5861 }
+}
+
+ResolutionTaskHolder@5862 {
+    <name not found> = ArrayList@5863[1] { ResolutionCandidate@5864 }
 }
 
 ResolutionTaskHolder@5865 {
     <name not found> = ArrayList@5866[1] { ResolutionCandidate@5867 }
-    <name not found> = ArrayList@5868[1] { ResolutionCandidate@5867 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5869 {
-    <name not found> = ArrayList@5870[1] { ResolutionCandidate@5871 }
-    <name not found> = ArrayList@5872[1] { ResolutionCandidate@5871 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5868 {
+    <name not found> = ArrayList@5869[1] { ResolutionCandidate@5870 }
 }
 
-ResolutionTaskHolder@5873 {
-    <name not found> = ArrayList@5874[1] { ResolutionCandidate@5875 }
-    <name not found> = ArrayList@5876[1] { ResolutionCandidate@5875 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5871 {
+    <name not found> = ArrayList@5872[1] { ResolutionCandidate@5873 }
+}
+
+ResolutionTaskHolder@5874 {
+    <name not found> = ArrayList@5875[1] { ResolutionCandidate@5876 }
 }
 
 ResolutionTaskHolder@5877 {
     <name not found> = ArrayList@5878[1] { ResolutionCandidate@5879 }
-    <name not found> = ArrayList@5880[1] { ResolutionCandidate@5879 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5881 {
-    <name not found> = ArrayList@5882[1] { ResolutionCandidate@5883 }
-    <name not found> = ArrayList@5884[1] { ResolutionCandidate@5883 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5880 {
+    <name not found> = ArrayList@5881[1] { ResolutionCandidate@5882 }
 }
 
-ResolutionTaskHolder@5885 {
-    <name not found> = ArrayList@5886[1] { ResolutionCandidate@5887 }
-    <name not found> = ArrayList@5888[1] { ResolutionCandidate@5887 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5883 {
+    <name not found> = ArrayList@5884[1] { ResolutionCandidate@5885 }
+}
+
+ResolutionTaskHolder@5886 {
+    <name not found> = ArrayList@5887[1] { ResolutionCandidate@5888 }
 }
 
 ResolutionTaskHolder@5889 {
     <name not found> = ArrayList@5890[1] { ResolutionCandidate@5891 }
-    <name not found> = ArrayList@5892[1] { ResolutionCandidate@5891 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5893 {
-    <name not found> = ArrayList@5894[1] { ResolutionCandidate@5895 }
-    <name not found> = ArrayList@5896[1] { ResolutionCandidate@5895 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5892 {
+    <name not found> = ArrayList@5893[1] { ResolutionCandidate@5894 }
 }
 
-ResolutionTaskHolder@5897 {
-    <name not found> = ArrayList@5898[1] { ResolutionCandidate@5899 }
-    <name not found> = ArrayList@5900[1] { ResolutionCandidate@5899 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5895 {
+    <name not found> = ArrayList@5896[1] { ResolutionCandidate@5897 }
+}
+
+ResolutionTaskHolder@5898 {
+    <name not found> = ArrayList@5899[1] { ResolutionCandidate@5900 }
 }
 
 ResolutionTaskHolder@5901 {
     <name not found> = ArrayList@5902[1] { ResolutionCandidate@5903 }
-    <name not found> = ArrayList@5904[1] { ResolutionCandidate@5903 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5905 {
-    <name not found> = ArrayList@5906[1] { ResolutionCandidate@5907 }
-    <name not found> = ArrayList@5908[1] { ResolutionCandidate@5907 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5904 {
+    <name not found> = ArrayList@5905[1] { ResolutionCandidate@5906 }
 }
 
-ResolutionTaskHolder@5909 {
-    <name not found> = ArrayList@5910[1] { ResolutionCandidate@5911 }
-    <name not found> = ArrayList@5912[1] { ResolutionCandidate@5911 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5907 {
+    <name not found> = ArrayList@5908[1] { ResolutionCandidate@5909 }
+}
+
+ResolutionTaskHolder@5910 {
+    <name not found> = ArrayList@5911[1] { ResolutionCandidate@5912 }
 }
 
 ResolutionTaskHolder@5913 {
     <name not found> = ArrayList@5914[1] { ResolutionCandidate@5915 }
-    <name not found> = ArrayList@5916[1] { ResolutionCandidate@5915 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5917 {
-    <name not found> = ArrayList@5918[1] { ResolutionCandidate@5919 }
-    <name not found> = ArrayList@5920[1] { ResolutionCandidate@5919 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5916 {
+    <name not found> = ArrayList@5917[1] { ResolutionCandidate@5918 }
 }
 
-ResolutionTaskHolder@5921 {
-    <name not found> = ArrayList@5922[1] { ResolutionCandidate@5923 }
-    <name not found> = ArrayList@5924[1] { ResolutionCandidate@5923 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5919 {
+    <name not found> = ArrayList@5920[1] { ResolutionCandidate@5921 }
+}
+
+ResolutionTaskHolder@5922 {
+    <name not found> = ArrayList@5923[1] { ResolutionCandidate@5924 }
 }
 
 ResolutionTaskHolder@5925 {
     <name not found> = ArrayList@5926[1] { ResolutionCandidate@5927 }
-    <name not found> = ArrayList@5928[1] { ResolutionCandidate@5927 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
 }
 
-ResolutionTaskHolder@5929 {
-    <name not found> = ArrayList@5930[1] { ResolutionCandidate@5931 }
-    <name not found> = ArrayList@5932[1] { ResolutionCandidate@5931 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5928 {
+    <name not found> = ArrayList@5929[1] { ResolutionCandidate@5930 }
 }
 
-ResolutionTaskHolder@5933 {
-    <name not found> = ArrayList@5934[1] { ResolutionCandidate@5935 }
-    <name not found> = ArrayList@5936[1] { ResolutionCandidate@5935 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
+ResolutionTaskHolder@5931 {
+    <name not found> = ArrayList@5932[1] { ResolutionCandidate@5933 }
+}
+
+ResolutionTaskHolder@5934 {
+    <name not found> = ArrayList@5935[1] { ResolutionCandidate@5936 }
 }
 
 ResolutionTaskHolder@5937 {
     <name not found> = ArrayList@5938[1] { ResolutionCandidate@5939 }
-    <name not found> = ArrayList@5940[1] { ResolutionCandidate@5939 }
 }
 
-ResolutionTaskHolder@5941 {
-    <name not found> = ArrayList@5942[1] { ResolutionCandidate@5943 }
-    <name not found> = ArrayList@5944[1] { ResolutionCandidate@5943 }
+ResolutionTaskHolder@5940 {
+    <name not found> = ArrayList@5941[1] { ResolutionCandidate@5942 }
 }
 
-ResolutionTaskHolder@5945 {
-    <name not found> = ArrayList@5946[1] { ResolutionCandidate@5947 }
-    <name not found> = ArrayList@5948[1] { ResolutionCandidate@5947 }
+ResolutionTaskHolder@5943 {
+    <name not found> = ArrayList@5944[1] { ResolutionCandidate@5945 }
+}
+
+ResolutionTaskHolder@5946 {
+    <name not found> = ArrayList@5947[1] { ResolutionCandidate@5948 }
 }
 
 ResolutionTaskHolder@5949 {
     <name not found> = ArrayList@5950[1] { ResolutionCandidate@5951 }
-    <name not found> = ArrayList@5952[1] { ResolutionCandidate@5951 }
 }
 
-ResolutionTaskHolder@5953 {
-    <name not found> = ArrayList@5954[1] { ResolutionCandidate@5955 }
-    <name not found> = ArrayList@5956[1] { ResolutionCandidate@5955 }
+ResolutionTaskHolder@5952 {
+    <name not found> = ArrayList@5953[1] { ResolutionCandidate@5954 }
 }
 
-ResolutionTaskHolder@5957 {
-    <name not found> = ArrayList@5958[1] { ResolutionCandidate@5959 }
-    <name not found> = ArrayList@5960[1] { ResolutionCandidate@5959 }
+ResolutionTaskHolder@5955 {
+    <name not found> = ArrayList@5956[1] { ResolutionCandidate@5957 }
+}
+
+ResolutionTaskHolder@5958 {
+    <name not found> = ArrayList@5959[1] { ResolutionCandidate@5960 }
 }
 
 ResolutionTaskHolder@5961 {
     <name not found> = ArrayList@5962[1] { ResolutionCandidate@5963 }
-    <name not found> = ArrayList@5964[1] { ResolutionCandidate@5963 }
 }
 
-ResolutionTaskHolder@5965 {
-    <name not found> = ArrayList@5966[1] { ResolutionCandidate@5967 }
-    <name not found> = ArrayList@5968[1] { ResolutionCandidate@5967 }
+ResolutionTaskHolder@5964 {
+    <name not found> = ArrayList@5965[1] { ResolutionCandidate@5966 }
 }
 
-ResolutionTaskHolder@5969 {
-    <name not found> = ArrayList@5970[1] { ResolutionCandidate@5971 }
-    <name not found> = ArrayList@5972[1] { ResolutionCandidate@5971 }
+ResolutionTaskHolder@5967 {
+    <name not found> = ArrayList@5968[1] { ResolutionCandidate@5969 }
+}
+
+ResolutionTaskHolder@5970 {
+    <name not found> = ArrayList@5971[1] { ResolutionCandidate@5972 }
 }
 
 ResolutionTaskHolder@5973 {
     <name not found> = ArrayList@5974[1] { ResolutionCandidate@5975 }
-    <name not found> = ArrayList@5976[1] { ResolutionCandidate@5975 }
 }
 
-ResolutionTaskHolder@5977 {
-    <name not found> = ArrayList@5978[1] { ResolutionCandidate@5979 }
-    <name not found> = ArrayList@5980[1] { ResolutionCandidate@5979 }
+ResolutionTaskHolder@5976 {
+    <name not found> = ArrayList@5977[1] { ResolutionCandidate@5978 }
 }
 
-ResolutionTaskHolder@5981 {
-    <name not found> = ArrayList@5982[1] { ResolutionCandidate@5983 }
-    <name not found> = ArrayList@5984[1] { ResolutionCandidate@5983 }
+ResolutionTaskHolder@5979 {
+    <name not found> = ArrayList@5980[1] { ResolutionCandidate@5981 }
+}
+
+ResolutionTaskHolder@5982 {
+    <name not found> = ArrayList@5983[1] { ResolutionCandidate@5984 }
 }
 
 ResolutionTaskHolder@5985 {
     <name not found> = ArrayList@5986[1] { ResolutionCandidate@5987 }
-    <name not found> = ArrayList@5988[1] { ResolutionCandidate@5987 }
 }
 
-ResolutionTaskHolder@5989 {
-    <name not found> = ArrayList@5990[1] { ResolutionCandidate@5991 }
-    <name not found> = ArrayList@5992[1] { ResolutionCandidate@5991 }
+ResolutionTaskHolder@5988 {
+    <name not found> = ArrayList@5989[1] { ResolutionCandidate@5990 }
 }
 
-ResolutionTaskHolder@5993 {
-    <name not found> = ArrayList@5994[1] { ResolutionCandidate@5995 }
-    <name not found> = ArrayList@5996[1] { ResolutionCandidate@5995 }
+ResolutionTaskHolder@5991 {
+    <name not found> = ArrayList@5992[1] { ResolutionCandidate@5993 }
+}
+
+ResolutionTaskHolder@5994 {
+    <name not found> = ArrayList@5995[1] { ResolutionCandidate@5996 }
 }
 
 ResolutionTaskHolder@5997 {
     <name not found> = ArrayList@5998[1] { ResolutionCandidate@5999 }
-    <name not found> = ArrayList@6000[1] { ResolutionCandidate@5999 }
 }
 
-ResolutionTaskHolder@6001 {
-    <name not found> = ArrayList@6002[1] { ResolutionCandidate@6003 }
-    <name not found> = ArrayList@6004[1] { ResolutionCandidate@6003 }
+ResolutionTaskHolder@6000 {
+    <name not found> = ArrayList@6001[1] { ResolutionCandidate@6002 }
 }
 
-ResolutionTaskHolder@6005 {
-    <name not found> = ArrayList@6006[1] { ResolutionCandidate@6007 }
-    <name not found> = ArrayList@6008[1] { ResolutionCandidate@6007 }
+ResolutionTaskHolder@6003 {
+    <name not found> = ArrayList@6004[1] { ResolutionCandidate@6005 }
+}
+
+ResolutionTaskHolder@6006 {
+    <name not found> = ArrayList@6007[1] { ResolutionCandidate@6008 }
 }
 
 ResolutionTaskHolder@6009 {
     <name not found> = ArrayList@6010[1] { ResolutionCandidate@6011 }
-    <name not found> = ArrayList@6012[1] { ResolutionCandidate@6011 }
 }
 
-ResolutionTaskHolder@6013 {
-    <name not found> = ArrayList@6014[1] { ResolutionCandidate@6015 }
-    <name not found> = ArrayList@6016[1] { ResolutionCandidate@6015 }
+ResolutionTaskHolder@6012 {
+    <name not found> = ArrayList@6013[1] { ResolutionCandidate@6014 }
 }
 
-ResolutionTaskHolder@6017 {
-    <name not found> = ArrayList@6018[1] { ResolutionCandidate@6019 }
-    <name not found> = ArrayList@6020[1] { ResolutionCandidate@6019 }
+ResolutionTaskHolder@6015 {
+    <name not found> = ArrayList@6016[1] { ResolutionCandidate@6017 }
+}
+
+ResolutionTaskHolder@6018 {
+    <name not found> = ArrayList@6019[1] { ResolutionCandidate@6020 }
 }
 
 ResolutionTaskHolder@6021 {
     <name not found> = ArrayList@6022[1] { ResolutionCandidate@6023 }
-    <name not found> = ArrayList@6024[1] { ResolutionCandidate@6023 }
 }
 
-ResolutionTaskHolder@6025 {
-    <name not found> = ArrayList@6026[1] { ResolutionCandidate@6027 }
-    <name not found> = ArrayList@6028[1] { ResolutionCandidate@6027 }
+ResolutionTaskHolder@6024 {
+    <name not found> = ArrayList@6025[1] { ResolutionCandidate@6026 }
 }
 
-ResolutionTaskHolder@6029 {
-    <name not found> = ArrayList@6030[1] { ResolutionCandidate@6031 }
-    <name not found> = ArrayList@6032[1] { ResolutionCandidate@6031 }
+ResolutionTaskHolder@6027 {
+    <name not found> = ArrayList@6028[1] { ResolutionCandidate@6029 }
+}
+
+ResolutionTaskHolder@6030 {
+    <name not found> = ArrayList@6031[1] { ResolutionCandidate@6032 }
 }
 
 ResolutionTaskHolder@6033 {
     <name not found> = ArrayList@6034[1] { ResolutionCandidate@6035 }
-    <name not found> = ArrayList@6036[1] { ResolutionCandidate@6035 }
 }
 
-ResolutionTaskHolder@6037 {
-    <name not found> = ArrayList@6038[1] { ResolutionCandidate@6039 }
-    <name not found> = ArrayList@6040[1] { ResolutionCandidate@6039 }
+ResolutionTaskHolder@6036 {
+    <name not found> = ArrayList@6037[1] { ResolutionCandidate@6038 }
 }
 
-ResolutionTaskHolder@6041 {
-    <name not found> = ArrayList@6042[1] { ResolutionCandidate@6043 }
-    <name not found> = ArrayList@6044[1] { ResolutionCandidate@6043 }
+ResolutionTaskHolder@6039 {
+    <name not found> = ArrayList@6040[1] { ResolutionCandidate@6041 }
+}
+
+ResolutionTaskHolder@6042 {
+    <name not found> = ArrayList@6043[1] { ResolutionCandidate@6044 }
 }
 
 ResolutionTaskHolder@6045 {
     <name not found> = ArrayList@6046[1] { ResolutionCandidate@6047 }
-    <name not found> = ArrayList@6048[1] { ResolutionCandidate@6047 }
 }
 
-ResolutionTaskHolder@6049 {
-    <name not found> = ArrayList@6050[1] { ResolutionCandidate@6051 }
-    <name not found> = ArrayList@6052[1] { ResolutionCandidate@6051 }
+ResolutionTaskHolder@6048 {
+    <name not found> = ArrayList@6049[1] { ResolutionCandidate@6050 }
 }
 
-ResolutionTaskHolder@6053 {
-    <name not found> = ArrayList@6054[1] { ResolutionCandidate@6055 }
-    <name not found> = ArrayList@6056[1] { ResolutionCandidate@6055 }
+ResolutionTaskHolder@6051 {
+    <name not found> = ArrayList@6052[1] { ResolutionCandidate@6053 }
+}
+
+ResolutionTaskHolder@6054 {
+    <name not found> = ArrayList@6055[1] { ResolutionCandidate@6056 }
 }
 
 ResolutionTaskHolder@6057 {
     <name not found> = ArrayList@6058[1] { ResolutionCandidate@6059 }
-    <name not found> = ArrayList@6060[1] { ResolutionCandidate@6059 }
 }
 
-ResolutionTaskHolder@6061 {
-    <name not found> = ArrayList@6062[1] { ResolutionCandidate@6063 }
-    <name not found> = ArrayList@6064[1] { ResolutionCandidate@6063 }
+ResolutionTaskHolder@6060 {
+    <name not found> = ArrayList@6061[1] { ResolutionCandidate@6062 }
 }
 
-ResolutionTaskHolder@6065 {
-    <name not found> = ArrayList@6066[1] { ResolutionCandidate@6067 }
-    <name not found> = ArrayList@6068[1] { ResolutionCandidate@6067 }
+ResolutionTaskHolder@6063 {
+    <name not found> = ArrayList@6064[1] { ResolutionCandidate@6065 }
+}
+
+ResolutionTaskHolder@6066 {
+    <name not found> = ArrayList@6067[1] { ResolutionCandidate@6068 }
 }
 
 ResolutionTaskHolder@6069 {
     <name not found> = ArrayList@6070[1] { ResolutionCandidate@6071 }
-    <name not found> = ArrayList@6072[1] { ResolutionCandidate@6071 }
 }
 
-ResolutionTaskHolder@6073 {
-    <name not found> = ArrayList@6074[1] { ResolutionCandidate@6075 }
-    <name not found> = ArrayList@6076[1] { ResolutionCandidate@6075 }
+ResolutionTaskHolder@6072 {
+    <name not found> = ArrayList@6073[1] { ResolutionCandidate@6074 }
 }
 
-ResolutionTaskHolder@6077 {
-    <name not found> = ArrayList@6078[1] { ResolutionCandidate@6079 }
-    <name not found> = ArrayList@6080[1] { ResolutionCandidate@6079 }
+ResolutionTaskHolder@6075 {
+    <name not found> = ArrayList@6076[1] { ResolutionCandidate@6077 }
+}
+
+ResolutionTaskHolder@6078 {
+    <name not found> = ArrayList@6079[1] { ResolutionCandidate@6080 }
 }
 
 ResolutionTaskHolder@6081 {
     <name not found> = ArrayList@6082[1] { ResolutionCandidate@6083 }
-    <name not found> = ArrayList@6084[1] { ResolutionCandidate@6083 }
 }
 
-ResolutionTaskHolder@6085 {
-    <name not found> = ArrayList@6086[1] { ResolutionCandidate@6087 }
-    <name not found> = ArrayList@6088[1] { ResolutionCandidate@6087 }
+ResolutionTaskHolder@6084 {
+    <name not found> = ArrayList@6085[1] { ResolutionCandidate@6086 }
 }
 
-ResolutionTaskHolder@6089 {
-    <name not found> = ArrayList@6090[1] { ResolutionCandidate@6091 }
-    <name not found> = ArrayList@6092[1] { ResolutionCandidate@6091 }
+ResolutionTaskHolder@6087 {
+    <name not found> = ArrayList@6088[1] { ResolutionCandidate@6089 }
+}
+
+ResolutionTaskHolder@6090 {
+    <name not found> = ArrayList@6091[1] { ResolutionCandidate@6092 }
 }
 
 ResolutionTaskHolder@6093 {
     <name not found> = ArrayList@6094[1] { ResolutionCandidate@6095 }
-    <name not found> = ArrayList@6096[1] { ResolutionCandidate@6095 }
 }
 
-ResolutionTaskHolder@6097 {
-    <name not found> = ArrayList@6098[1] { ResolutionCandidate@6099 }
-    <name not found> = ArrayList@6100[1] { ResolutionCandidate@6099 }
+ResolutionTaskHolder@6096 {
+    <name not found> = ArrayList@6097[1] { ResolutionCandidate@6098 }
 }
 
-ResolutionTaskHolder@6101 {
-    <name not found> = ArrayList@6102[1] { ResolutionCandidate@6103 }
-    <name not found> = ArrayList@6104[1] { ResolutionCandidate@6103 }
+ResolutionTaskHolder@6099 {
+    <name not found> = ArrayList@6100[1] { ResolutionCandidate@6101 }
+}
+
+ResolutionTaskHolder@6102 {
+    <name not found> = ArrayList@6103[1] { ResolutionCandidate@6104 }
 }
 
 ResolutionTaskHolder@6105 {
     <name not found> = ArrayList@6106[1] { ResolutionCandidate@6107 }
-    <name not found> = ArrayList@6108[1] { ResolutionCandidate@6107 }
 }
 
-ResolutionTaskHolder@6109 {
-    <name not found> = ArrayList@6110[1] { ResolutionCandidate@6111 }
-    <name not found> = ArrayList@6112[1] { ResolutionCandidate@6111 }
+ResolutionTaskHolder@6108 {
+    <name not found> = ArrayList@6109[1] { ResolutionCandidate@6110 }
 }
 
-ResolutionTaskHolder@6113 {
-    <name not found> = ArrayList@6114[1] { ResolutionCandidate@6115 }
-    <name not found> = ArrayList@6116[1] { ResolutionCandidate@6115 }
+ResolutionTaskHolder@6111 {
+    <name not found> = ArrayList@6112[1] { ResolutionCandidate@6113 }
+}
+
+ResolutionTaskHolder@6114 {
+    <name not found> = ArrayList@6115[1] { ResolutionCandidate@6116 }
 }
 
 ResolutionTaskHolder@6117 {
     <name not found> = ArrayList@6118[1] { ResolutionCandidate@6119 }
-    <name not found> = ArrayList@6120[1] { ResolutionCandidate@6119 }
 }
 
-ResolutionTaskHolder@6121 {
-    <name not found> = ArrayList@6122[1] { ResolutionCandidate@6123 }
-    <name not found> = ArrayList@6124[1] { ResolutionCandidate@6123 }
+ResolutionTaskHolder@6120 {
+    <name not found> = ArrayList@6121[1] { ResolutionCandidate@6122 }
 }
 
-ResolutionTaskHolder@6125 {
-    <name not found> = ArrayList@6126[1] { ResolutionCandidate@6127 }
-    <name not found> = ArrayList@6128[1] { ResolutionCandidate@6127 }
+ResolutionTaskHolder@6123 {
+    <name not found> = ArrayList@6124[1] { ResolutionCandidate@6125 }
+}
+
+ResolutionTaskHolder@6126 {
+    <name not found> = ArrayList@6127[1] { ResolutionCandidate@6128 }
 }
 
 ResolutionTaskHolder@6129 {
     <name not found> = ArrayList@6130[1] { ResolutionCandidate@6131 }
-    <name not found> = ArrayList@6132[1] { ResolutionCandidate@6131 }
 }
 
-ResolutionTaskHolder@6133 {
-    <name not found> = ArrayList@6134[1] { ResolutionCandidate@6135 }
-    <name not found> = ArrayList@6136[1] { ResolutionCandidate@6135 }
+ResolutionTaskHolder@6132 {
+    <name not found> = ArrayList@6133[1] { ResolutionCandidate@6134 }
 }
 
-ResolutionTaskHolder@6137 {
-    <name not found> = ArrayList@6138[1] { ResolutionCandidate@6139 }
-    <name not found> = ArrayList@6140[1] { ResolutionCandidate@6139 }
+ResolutionTaskHolder@6135 {
+    <name not found> = ArrayList@6136[1] { ResolutionCandidate@6137 }
+}
+
+ResolutionTaskHolder@6138 {
+    <name not found> = ArrayList@6139[1] { ResolutionCandidate@6140 }
 }
 
 ResolutionTaskHolder@6141 {
     <name not found> = ArrayList@6142[1] { ResolutionCandidate@6143 }
-    <name not found> = ArrayList@6144[1] { ResolutionCandidate@6143 }
 }
 
-ResolutionTaskHolder@6145 {
-    <name not found> = ArrayList@6146[1] { ResolutionCandidate@6147 }
-    <name not found> = ArrayList@6148[1] { ResolutionCandidate@6147 }
+ResolutionTaskHolder@6144 {
+    <name not found> = ArrayList@6145[1] { ResolutionCandidate@6146 }
 }
 
-ResolutionTaskHolder@6149 {
-    <name not found> = ArrayList@6150[1] { ResolutionCandidate@6151 }
-    <name not found> = ArrayList@6152[1] { ResolutionCandidate@6151 }
+ResolutionTaskHolder@6147 {
+    <name not found> = ArrayList@6148[1] { ResolutionCandidate@6149 }
+}
+
+ResolutionTaskHolder@6150 {
+    <name not found> = ArrayList@6151[1] { ResolutionCandidate@6152 }
 }
 
 ResolutionTaskHolder@6153 {
     <name not found> = ArrayList@6154[1] { ResolutionCandidate@6155 }
-    <name not found> = ArrayList@6156[1] { ResolutionCandidate@6155 }
 }
 
-ResolutionTaskHolder@6157 {
-    <name not found> = ArrayList@6158[1] { ResolutionCandidate@6159 }
-    <name not found> = ArrayList@6160[1] { ResolutionCandidate@6159 }
+ResolutionTaskHolder@6156 {
+    <name not found> = ArrayList@6157[1] { ResolutionCandidate@6158 }
 }
 
-ResolutionTaskHolder@6161 {
-    <name not found> = ArrayList@6162[1] { ResolutionCandidate@6163 }
-    <name not found> = ArrayList@6164[1] { ResolutionCandidate@6163 }
+ResolutionTaskHolder@6159 {
+    <name not found> = ArrayList@6160[1] { ResolutionCandidate@6161 }
+}
+
+ResolutionTaskHolder@6162 {
+    <name not found> = ArrayList@6163[1] { ResolutionCandidate@6164 }
 }
 
 ResolutionTaskHolder@6165 {
     <name not found> = ArrayList@6166[1] { ResolutionCandidate@6167 }
-    <name not found> = ArrayList@6168[1] { ResolutionCandidate@6167 }
 }
 
-ResolutionTaskHolder@6169 {
-    <name not found> = ArrayList@6170[1] { ResolutionCandidate@6171 }
-    <name not found> = ArrayList@6172[1] { ResolutionCandidate@6171 }
+ResolutionTaskHolder@6168 {
+    <name not found> = ArrayList@6169[1] { ResolutionCandidate@6170 }
 }
 
-ResolutionTaskHolder@6173 {
-    <name not found> = ArrayList@6174[1] { ResolutionCandidate@6175 }
-    <name not found> = ArrayList@6176[1] { ResolutionCandidate@6175 }
+ResolutionTaskHolder@6171 {
+    <name not found> = ArrayList@6172[1] { ResolutionCandidate@6173 }
+}
+
+ResolutionTaskHolder@6174 {
+    <name not found> = ArrayList@6175[1] { ResolutionCandidate@6176 }
 }
 
 ResolutionTaskHolder@6177 {
     <name not found> = ArrayList@6178[1] { ResolutionCandidate@6179 }
-    <name not found> = ArrayList@6180[1] { ResolutionCandidate@6179 }
 }
 
-ResolutionTaskHolder@6181 {
-    <name not found> = ArrayList@6182[1] { ResolutionCandidate@6183 }
-    <name not found> = ArrayList@6184[1] { ResolutionCandidate@6183 }
+ResolutionTaskHolder@6180 {
+    <name not found> = ArrayList@6181[1] { ResolutionCandidate@6182 }
 }
 
-ResolutionTaskHolder@6185 {
-    <name not found> = ArrayList@6186[1] { ResolutionCandidate@6187 }
-    <name not found> = ArrayList@6188[1] { ResolutionCandidate@6187 }
+ResolutionTaskHolder@6183 {
+    <name not found> = ArrayList@6184[1] { ResolutionCandidate@6185 }
+}
+
+ResolutionTaskHolder@6186 {
+    <name not found> = ArrayList@6187[1] { ResolutionCandidate@6188 }
 }
 
 ResolutionTaskHolder@6189 {
     <name not found> = ArrayList@6190[1] { ResolutionCandidate@6191 }
-    <name not found> = ArrayList@6192[1] { ResolutionCandidate@6191 }
 }
 
-ResolutionTaskHolder@6193 {
-    <name not found> = ArrayList@6194[1] { ResolutionCandidate@6195 }
-    <name not found> = ArrayList@6196[1] { ResolutionCandidate@6195 }
+ResolutionTaskHolder@6192 {
+    <name not found> = ArrayList@6193[1] { ResolutionCandidate@6194 }
 }
 
-ResolutionTaskHolder@6197 {
-    <name not found> = ArrayList@6198[1] { ResolutionCandidate@6199 }
-    <name not found> = ArrayList@6200[1] { ResolutionCandidate@6199 }
+ResolutionTaskHolder@6195 {
+    <name not found> = ArrayList@6196[1] { ResolutionCandidate@6197 }
+}
+
+ResolutionTaskHolder@6198 {
+    <name not found> = ArrayList@6199[1] { ResolutionCandidate@6200 }
 }
 
 ResolutionTaskHolder@6201 {
     <name not found> = ArrayList@6202[1] { ResolutionCandidate@6203 }
-    <name not found> = ArrayList@6204[1] { ResolutionCandidate@6203 }
 }
 
-ResolutionTaskHolder@6205 {
-    <name not found> = ArrayList@6206[1] { ResolutionCandidate@6207 }
-    <name not found> = ArrayList@6208[1] { ResolutionCandidate@6207 }
+ResolutionTaskHolder@6204 {
+    <name not found> = ArrayList@6205[1] { ResolutionCandidate@6206 }
 }
 
-ResolutionTaskHolder@6209 {
-    <name not found> = ArrayList@6210[1] { ResolutionCandidate@6211 }
-    <name not found> = ArrayList@6212[1] { ResolutionCandidate@6211 }
+ResolutionTaskHolder@6207 {
+    <name not found> = ArrayList@6208[1] { ResolutionCandidate@6209 }
+}
+
+ResolutionTaskHolder@6210 {
+    <name not found> = ArrayList@6211[1] { ResolutionCandidate@6212 }
 }
 
 ResolutionTaskHolder@6213 {
     <name not found> = ArrayList@6214[1] { ResolutionCandidate@6215 }
-    <name not found> = ArrayList@6216[1] { ResolutionCandidate@6215 }
 }
 
-ResolutionTaskHolder@6217 {
-    <name not found> = ArrayList@6218[1] { ResolutionCandidate@6219 }
-    <name not found> = ArrayList@6220[1] { ResolutionCandidate@6219 }
+ResolutionTaskHolder@6216 {
+    <name not found> = ArrayList@6217[1] { ResolutionCandidate@6218 }
 }
 
-ResolutionTaskHolder@6221 {
-    <name not found> = ArrayList@6222[1] { ResolutionCandidate@6223 }
-    <name not found> = ArrayList@6224[1] { ResolutionCandidate@6223 }
+ResolutionTaskHolder@6219 {
+    <name not found> = ArrayList@6220[1] { ResolutionCandidate@6221 }
+}
+
+ResolutionTaskHolder@6222 {
+    <name not found> = ArrayList@6223[1] { ResolutionCandidate@6224 }
 }
 
 ResolutionTaskHolder@6225 {
     <name not found> = ArrayList@6226[1] { ResolutionCandidate@6227 }
-    <name not found> = ArrayList@6228[1] { ResolutionCandidate@6227 }
 }
 
-ResolutionTaskHolder@6229 {
-    <name not found> = ArrayList@6230[1] { ResolutionCandidate@6231 }
-    <name not found> = ArrayList@6232[1] { ResolutionCandidate@6231 }
+ResolutionTaskHolder@6228 {
+    <name not found> = ArrayList@6229[1] { ResolutionCandidate@6230 }
 }
 
-ResolutionTaskHolder@6233 {
-    <name not found> = ArrayList@6234[1] { ResolutionCandidate@6235 }
-    <name not found> = ArrayList@6236[1] { ResolutionCandidate@6235 }
+ResolutionTaskHolder@6231 {
+    <name not found> = ArrayList@6232[1] { ResolutionCandidate@6233 }
+}
+
+ResolutionTaskHolder@6234 {
+    <name not found> = ArrayList@6235[1] { ResolutionCandidate@6236 }
 }
 
 ResolutionTaskHolder@6237 {
     <name not found> = ArrayList@6238[1] { ResolutionCandidate@6239 }
-    <name not found> = ArrayList@6240[1] { ResolutionCandidate@6239 }
 }
 
-ResolutionTaskHolder@6241 {
-    <name not found> = ArrayList@6242[1] { ResolutionCandidate@6243 }
-    <name not found> = ArrayList@6244[1] { ResolutionCandidate@6243 }
+ResolutionTaskHolder@6240 {
+    <name not found> = ArrayList@6241[1] { ResolutionCandidate@6242 }
 }
 
-ResolutionTaskHolder@6245 {
-    <name not found> = ArrayList@6246[1] { ResolutionCandidate@6247 }
-    <name not found> = ArrayList@6248[1] { ResolutionCandidate@6247 }
+ResolutionTaskHolder@6243 {
+    <name not found> = ArrayList@6244[1] { ResolutionCandidate@6245 }
+}
+
+ResolutionTaskHolder@6246 {
+    <name not found> = ArrayList@6247[1] { ResolutionCandidate@6248 }
 }
 
 ResolutionTaskHolder@6249 {
     <name not found> = ArrayList@6250[1] { ResolutionCandidate@6251 }
-    <name not found> = ArrayList@6252[1] { ResolutionCandidate@6251 }
 }
 
-ResolutionTaskHolder@6253 {
-    <name not found> = ArrayList@6254[1] { ResolutionCandidate@6255 }
-    <name not found> = ArrayList@6256[1] { ResolutionCandidate@6255 }
+ResolutionTaskHolder@6252 {
+    <name not found> = ArrayList@6253[1] { ResolutionCandidate@6254 }
 }
 
-ResolutionTaskHolder@6257 {
-    <name not found> = ArrayList@6258[1] { ResolutionCandidate@6259 }
-    <name not found> = ArrayList@6260[1] { ResolutionCandidate@6259 }
+ResolutionTaskHolder@6255 {
+    <name not found> = ArrayList@6256[1] { ResolutionCandidate@6257 }
+}
+
+ResolutionTaskHolder@6258 {
+    <name not found> = ArrayList@6259[1] { ResolutionCandidate@6260 }
 }
 
 ResolutionTaskHolder@6261 {
     <name not found> = ArrayList@6262[1] { ResolutionCandidate@6263 }
-    <name not found> = ArrayList@6264[1] { ResolutionCandidate@6263 }
 }
 
-ResolutionTaskHolder@6265 {
-    <name not found> = ArrayList@6266[1] { ResolutionCandidate@6267 }
-    <name not found> = ArrayList@6268[1] { ResolutionCandidate@6267 }
+ResolutionTaskHolder@6264 {
+    <name not found> = ArrayList@6265[1] { ResolutionCandidate@6266 }
 }
 
-ResolutionTaskHolder@6269 {
-    <name not found> = ArrayList@6270[1] { ResolutionCandidate@6271 }
-    <name not found> = ArrayList@6272[1] { ResolutionCandidate@6271 }
+ResolutionTaskHolder@6267 {
+    <name not found> = ArrayList@6268[1] { ResolutionCandidate@6269 }
+}
+
+ResolutionTaskHolder@6270 {
+    <name not found> = ArrayList@6271[1] { ResolutionCandidate@6272 }
 }
 
 ResolutionTaskHolder@6273 {
     <name not found> = ArrayList@6274[1] { ResolutionCandidate@6275 }
-    <name not found> = ArrayList@6276[1] { ResolutionCandidate@6275 }
 }
 
-ResolutionTaskHolder@6277 {
-    <name not found> = ArrayList@6278[1] { ResolutionCandidate@6279 }
-    <name not found> = ArrayList@6280[1] { ResolutionCandidate@6279 }
+ResolutionTaskHolder@6276 {
+    <name not found> = ArrayList@6277[1] { ResolutionCandidate@6278 }
 }
 
-ResolutionTaskHolder@6281 {
-    <name not found> = ArrayList@6282[1] { ResolutionCandidate@6283 }
-    <name not found> = ArrayList@6284[1] { ResolutionCandidate@6283 }
+ResolutionTaskHolder@6279 {
+    <name not found> = ArrayList@6280[1] { ResolutionCandidate@6281 }
+}
+
+ResolutionTaskHolder@6282 {
+    <name not found> = ArrayList@6283[1] { ResolutionCandidate@6284 }
 }
 
 ResolutionTaskHolder@6285 {
     <name not found> = ArrayList@6286[1] { ResolutionCandidate@6287 }
-    <name not found> = ArrayList@6288[1] { ResolutionCandidate@6287 }
 }
 
-ResolutionTaskHolder@6289 {
-    <name not found> = ArrayList@6290[1] { ResolutionCandidate@6291 }
-    <name not found> = ArrayList@6292[1] { ResolutionCandidate@6291 }
+ResolutionTaskHolder@6288 {
+    <name not found> = ArrayList@6289[1] { ResolutionCandidate@6290 }
 }
 
-ResolutionTaskHolder@6293 {
-    <name not found> = ArrayList@6294[1] { ResolutionCandidate@6295 }
-    <name not found> = ArrayList@6296[1] { ResolutionCandidate@6295 }
+ResolutionTaskHolder@6291 {
+    <name not found> = ArrayList@6292[1] { ResolutionCandidate@6293 }
+}
+
+ResolutionTaskHolder@6294 {
+    <name not found> = ArrayList@6295[1] { ResolutionCandidate@6296 }
 }
 
 ResolutionTaskHolder@6297 {
     <name not found> = ArrayList@6298[1] { ResolutionCandidate@6299 }
-    <name not found> = ArrayList@6300[1] { ResolutionCandidate@6299 }
 }
 
-ResolutionTaskHolder@6301 {
-    <name not found> = ArrayList@6302[1] { ResolutionCandidate@6303 }
-    <name not found> = ArrayList@6304[1] { ResolutionCandidate@6303 }
+ResolutionTaskHolder@6300 {
+    <name not found> = ArrayList@6301[1] { ResolutionCandidate@6302 }
 }
 
-ResolutionTaskHolder@6305 {
-    <name not found> = ArrayList@6306[1] { ResolutionCandidate@6307 }
-    <name not found> = ArrayList@6308[1] { ResolutionCandidate@6307 }
+ResolutionTaskHolder@6303 {
+    <name not found> = ArrayList@6304[1] { ResolutionCandidate@6305 }
+}
+
+ResolutionTaskHolder@6306 {
+    <name not found> = ArrayList@6307[1] { ResolutionCandidate@6308 }
 }
 
 ResolutionTaskHolder@6309 {
     <name not found> = ArrayList@6310[1] { ResolutionCandidate@6311 }
-    <name not found> = ArrayList@6312[1] { ResolutionCandidate@6311 }
 }
 
-ResolutionTaskHolder@6313 {
-    <name not found> = ArrayList@6314[1] { ResolutionCandidate@6315 }
-    <name not found> = ArrayList@6316[1] { ResolutionCandidate@6315 }
+ResolutionTaskHolder@6312 {
+    <name not found> = ArrayList@6313[1] { ResolutionCandidate@6314 }
 }
 
-ResolutionTaskHolder@6317 {
-    <name not found> = ArrayList@6318[1] { ResolutionCandidate@6319 }
-    <name not found> = ArrayList@6320[1] { ResolutionCandidate@6319 }
+ResolutionTaskHolder@6315 {
+    <name not found> = ArrayList@6316[1] { ResolutionCandidate@6317 }
+}
+
+ResolutionTaskHolder@6318 {
+    <name not found> = ArrayList@6319[1] { ResolutionCandidate@6320 }
 }
 
 ResolutionTaskHolder@6321 {
     <name not found> = ArrayList@6322[1] { ResolutionCandidate@6323 }
-    <name not found> = ArrayList@6324[1] { ResolutionCandidate@6323 }
 }
 
-ResolutionTaskHolder@6325 {
-    <name not found> = ArrayList@6326[1] { ResolutionCandidate@6327 }
-    <name not found> = ArrayList@6328[1] { ResolutionCandidate@6327 }
+ResolutionTaskHolder@6324 {
+    <name not found> = ArrayList@6325[1] { ResolutionCandidate@6326 }
 }
 
-ResolutionTaskHolder@6329 {
-    <name not found> = ArrayList@6330[1] { ResolutionCandidate@6331 }
-    <name not found> = ArrayList@6332[1] { ResolutionCandidate@6331 }
+ResolutionTaskHolder@6327 {
+    <name not found> = ArrayList@6328[1] { ResolutionCandidate@6329 }
+}
+
+ResolutionTaskHolder@6330 {
+    <name not found> = ArrayList@6331[1] { ResolutionCandidate@6332 }
 }
 
 ResolutionTaskHolder@6333 {
     <name not found> = ArrayList@6334[1] { ResolutionCandidate@6335 }
-    <name not found> = ArrayList@6336[1] { ResolutionCandidate@6335 }
 }
 
-ResolutionTaskHolder@6337 {
-    <name not found> = ArrayList@6338[1] { ResolutionCandidate@6339 }
-    <name not found> = ArrayList@6340[1] { ResolutionCandidate@6339 }
+ResolutionTaskHolder@6336 {
+    <name not found> = ArrayList@6337[1] { ResolutionCandidate@6338 }
 }
 
-ResolutionTaskHolder@6341 {
-    <name not found> = ArrayList@6342[1] { ResolutionCandidate@6343 }
-    <name not found> = ArrayList@6344[1] { ResolutionCandidate@6343 }
+ResolutionTaskHolder@6339 {
+    <name not found> = ArrayList@6340[1] { ResolutionCandidate@6341 }
+}
+
+ResolutionTaskHolder@6342 {
+    <name not found> = ArrayList@6343[1] { ResolutionCandidate@6344 }
 }
 
 ResolutionTaskHolder@6345 {
     <name not found> = ArrayList@6346[1] { ResolutionCandidate@6347 }
-    <name not found> = ArrayList@6348[1] { ResolutionCandidate@6347 }
 }
 
-ResolutionTaskHolder@6349 {
-    <name not found> = ArrayList@6350[1] { ResolutionCandidate@6351 }
-    <name not found> = ArrayList@6352[1] { ResolutionCandidate@6351 }
+ResolutionTaskHolder@6348 {
+    <name not found> = ArrayList@6349[1] { ResolutionCandidate@6350 }
 }
 
-ResolutionTaskHolder@6353 {
-    <name not found> = ArrayList@6354[1] { ResolutionCandidate@6355 }
-    <name not found> = ArrayList@6356[1] { ResolutionCandidate@6355 }
+ResolutionTaskHolder@6351 {
+    <name not found> = ArrayList@6352[1] { ResolutionCandidate@6353 }
+}
+
+ResolutionTaskHolder@6354 {
+    <name not found> = ArrayList@6355[1] { ResolutionCandidate@6356 }
 }
 
 ResolutionTaskHolder@6357 {
     <name not found> = ArrayList@6358[1] { ResolutionCandidate@6359 }
-    <name not found> = ArrayList@6360[1] { ResolutionCandidate@6359 }
 }
 
-ResolutionTaskHolder@6361 {
-    <name not found> = ArrayList@6362[1] { ResolutionCandidate@6363 }
-    <name not found> = ArrayList@6364[1] { ResolutionCandidate@6363 }
+ResolutionTaskHolder@6360 {
+    <name not found> = ArrayList@6361[1] { ResolutionCandidate@6362 }
 }
 
-ResolutionTaskHolder@6365 {
-    <name not found> = ArrayList@6366[1] { ResolutionCandidate@6367 }
-    <name not found> = ArrayList@6368[1] { ResolutionCandidate@6367 }
+ResolutionTaskHolder@6363 {
+    <name not found> = ArrayList@6364[1] { ResolutionCandidate@6365 }
+}
+
+ResolutionTaskHolder@6366 {
+    <name not found> = ArrayList@6367[1] { ResolutionCandidate@6368 }
 }
 
 ResolutionTaskHolder@6369 {
     <name not found> = ArrayList@6370[1] { ResolutionCandidate@6371 }
-    <name not found> = ArrayList@6372[1] { ResolutionCandidate@6371 }
 }
 
-ResolutionTaskHolder@6373 {
-    <name not found> = ArrayList@6374[1] { ResolutionCandidate@6375 }
-    <name not found> = ArrayList@6376[1] { ResolutionCandidate@6375 }
+ResolutionTaskHolder@6372 {
+    <name not found> = ArrayList@6373[1] { ResolutionCandidate@6374 }
 }
 
-ResolutionTaskHolder@6377 {
-    <name not found> = ArrayList@6378[1] { ResolutionCandidate@6379 }
-    <name not found> = ArrayList@6380[1] { ResolutionCandidate@6379 }
+ResolutionTaskHolder@6375 {
+    <name not found> = ArrayList@6376[1] { ResolutionCandidate@6377 }
+}
+
+ResolutionTaskHolder@6378 {
+    <name not found> = ArrayList@6379[1] { ResolutionCandidate@6380 }
 }
 
 ResolutionTaskHolder@6381 {
     <name not found> = ArrayList@6382[1] { ResolutionCandidate@6383 }
-    <name not found> = ArrayList@6384[1] { ResolutionCandidate@6383 }
 }
 
-ResolutionTaskHolder@6385 {
-    <name not found> = ArrayList@6386[1] { ResolutionCandidate@6387 }
-    <name not found> = ArrayList@6388[1] { ResolutionCandidate@6387 }
+ResolutionTaskHolder@6384 {
+    <name not found> = ArrayList@6385[1] { ResolutionCandidate@6386 }
 }
 
-ResolutionTaskHolder@6389 {
-    <name not found> = ArrayList@6390[1] { ResolutionCandidate@6391 }
-    <name not found> = ArrayList@6392[1] { ResolutionCandidate@6391 }
+ResolutionTaskHolder@6387 {
+    <name not found> = ArrayList@6388[1] { ResolutionCandidate@6389 }
+}
+
+ResolutionTaskHolder@6390 {
+    <name not found> = ArrayList@6391[1] { ResolutionCandidate@6392 }
 }
 
 ResolutionTaskHolder@6393 {
     <name not found> = ArrayList@6394[1] { ResolutionCandidate@6395 }
-    <name not found> = ArrayList@6396[1] { ResolutionCandidate@6395 }
 }
 
-ResolutionTaskHolder@6397 {
-    <name not found> = ArrayList@6398[1] { ResolutionCandidate@6399 }
-    <name not found> = ArrayList@6400[1] { ResolutionCandidate@6399 }
+ResolutionTaskHolder@6396 {
+    <name not found> = ArrayList@6397[1] { ResolutionCandidate@6398 }
 }
 
-ResolutionTaskHolder@6401 {
-    <name not found> = ArrayList@6402[1] { ResolutionCandidate@6403 }
-    <name not found> = ArrayList@6404[1] { ResolutionCandidate@6403 }
+ResolutionTaskHolder@6399 {
+    <name not found> = ArrayList@6400[1] { ResolutionCandidate@6401 }
+}
+
+ResolutionTaskHolder@6402 {
+    <name not found> = ArrayList@6403[1] { ResolutionCandidate@6404 }
 }
 
 ResolutionTaskHolder@6405 {
     <name not found> = ArrayList@6406[1] { ResolutionCandidate@6407 }
-    <name not found> = ArrayList@6408[1] { ResolutionCandidate@6407 }
 }
 
-ResolutionTaskHolder@6409 {
-    <name not found> = ArrayList@6410[1] { ResolutionCandidate@6411 }
-    <name not found> = ArrayList@6412[1] { ResolutionCandidate@6411 }
+ResolutionTaskHolder@6408 {
+    <name not found> = ArrayList@6409[1] { ResolutionCandidate@6410 }
 }
 
-ResolutionTaskHolder@6413 {
-    <name not found> = ArrayList@6414[1] { ResolutionCandidate@6415 }
-    <name not found> = ArrayList@6416[1] { ResolutionCandidate@6415 }
+ResolutionTaskHolder@6411 {
+    <name not found> = ArrayList@6412[1] { ResolutionCandidate@6413 }
+}
+
+ResolutionTaskHolder@6414 {
+    <name not found> = ArrayList@6415[1] { ResolutionCandidate@6416 }
 }
 
 ResolutionTaskHolder@6417 {
     <name not found> = ArrayList@6418[1] { ResolutionCandidate@6419 }
-    <name not found> = ArrayList@6420[1] { ResolutionCandidate@6419 }
 }
 
-ResolutionTaskHolder@6421 {
-    <name not found> = ArrayList@6422[1] { ResolutionCandidate@6423 }
-    <name not found> = ArrayList@6424[1] { ResolutionCandidate@6423 }
+ResolutionTaskHolder@6420 {
+    <name not found> = ArrayList@6421[1] { ResolutionCandidate@6422 }
 }
 
-ResolutionTaskHolder@6425 {
-    <name not found> = ArrayList@6426[1] { ResolutionCandidate@6427 }
-    <name not found> = ArrayList@6428[1] { ResolutionCandidate@6427 }
+ResolutionTaskHolder@6423 {
+    <name not found> = ArrayList@6424[1] { ResolutionCandidate@6425 }
+}
+
+ResolutionTaskHolder@6426 {
+    <name not found> = ArrayList@6427[1] { ResolutionCandidate@6428 }
 }
 
 ResolutionTaskHolder@6429 {
     <name not found> = ArrayList@6430[1] { ResolutionCandidate@6431 }
-    <name not found> = ArrayList@6432[1] { ResolutionCandidate@6431 }
 }
 
-ResolutionTaskHolder@6433 {
-    <name not found> = ArrayList@6434[1] { ResolutionCandidate@6435 }
-    <name not found> = ArrayList@6436[1] { ResolutionCandidate@6435 }
+ResolutionTaskHolder@6432 {
+    <name not found> = ArrayList@6433[1] { ResolutionCandidate@6434 }
 }
 
-ResolutionTaskHolder@6437 {
-    <name not found> = ArrayList@6438[1] { ResolutionCandidate@6439 }
-    <name not found> = ArrayList@6440[1] { ResolutionCandidate@6439 }
+ResolutionTaskHolder@6435 {
+    <name not found> = ArrayList@6436[1] { ResolutionCandidate@6437 }
+}
+
+ResolutionTaskHolder@6438 {
+    <name not found> = ArrayList@6439[1] { ResolutionCandidate@6440 }
 }
 
 ResolutionTaskHolder@6441 {
     <name not found> = ArrayList@6442[1] { ResolutionCandidate@6443 }
-    <name not found> = ArrayList@6444[1] { ResolutionCandidate@6443 }
 }
 
-ResolutionTaskHolder@6445 {
-    <name not found> = ArrayList@6446[1] { ResolutionCandidate@6447 }
-    <name not found> = ArrayList@6448[1] { ResolutionCandidate@6447 }
+ResolutionTaskHolder@6444 {
+    <name not found> = ArrayList@6445[1] { ResolutionCandidate@6446 }
 }
 
-ResolutionTaskHolder@6449 {
-    <name not found> = ArrayList@6450[1] { ResolutionCandidate@6451 }
-    <name not found> = ArrayList@6452[1] { ResolutionCandidate@6451 }
+ResolutionTaskHolder@6447 {
+    <name not found> = ArrayList@6448[1] { ResolutionCandidate@6449 }
+}
+
+ResolutionTaskHolder@6450 {
+    <name not found> = ArrayList@6451[1] { ResolutionCandidate@6452 }
 }
 
 ResolutionTaskHolder@6453 {
     <name not found> = ArrayList@6454[1] { ResolutionCandidate@6455 }
-    <name not found> = ArrayList@6456[1] { ResolutionCandidate@6455 }
 }
 
-ResolutionTaskHolder@6457 {
-    <name not found> = ArrayList@6458[1] { ResolutionCandidate@6459 }
-    <name not found> = ArrayList@6460[1] { ResolutionCandidate@6459 }
+ResolutionTaskHolder@6456 {
+    <name not found> = ArrayList@6457[1] { ResolutionCandidate@6458 }
 }
 
-ResolutionTaskHolder@6461 {
-    <name not found> = ArrayList@6462[1] { ResolutionCandidate@6463 }
-    <name not found> = ArrayList@6464[1] { ResolutionCandidate@6463 }
+ResolutionTaskHolder@6459 {
+    <name not found> = ArrayList@6460[1] { ResolutionCandidate@6461 }
+}
+
+ResolutionTaskHolder@6462 {
+    <name not found> = ArrayList@6463[1] { ResolutionCandidate@6464 }
 }
 
 ResolutionTaskHolder@6465 {
     <name not found> = ArrayList@6466[1] { ResolutionCandidate@6467 }
-    <name not found> = ArrayList@6468[1] { ResolutionCandidate@6467 }
 }
 
-ResolutionTaskHolder@6469 {
-    <name not found> = ArrayList@6470[1] { ResolutionCandidate@6471 }
-    <name not found> = ArrayList@6472[1] { ResolutionCandidate@6471 }
+ResolutionTaskHolder@6468 {
+    <name not found> = ArrayList@6469[1] { ResolutionCandidate@6470 }
 }
 
-ResolutionTaskHolder@6473 {
-    <name not found> = ArrayList@6474[1] { ResolutionCandidate@6475 }
-    <name not found> = ArrayList@6476[1] { ResolutionCandidate@6475 }
+ResolutionTaskHolder@6471 {
+    <name not found> = ArrayList@6472[1] { ResolutionCandidate@6473 }
+}
+
+ResolutionTaskHolder@6474 {
+    <name not found> = ArrayList@6475[1] { ResolutionCandidate@6476 }
 }
 
 ResolutionTaskHolder@6477 {
     <name not found> = ArrayList@6478[1] { ResolutionCandidate@6479 }
-    <name not found> = ArrayList@6480[1] { ResolutionCandidate@6479 }
 }
 
-ResolutionTaskHolder@6481 {
-    <name not found> = ArrayList@6482[1] { ResolutionCandidate@6483 }
-    <name not found> = ArrayList@6484[1] { ResolutionCandidate@6483 }
+ResolutionTaskHolder@6480 {
+    <name not found> = ArrayList@6481[1] { ResolutionCandidate@6482 }
 }
 
-ResolutionTaskHolder@6485 {
-    <name not found> = ArrayList@6486[1] { ResolutionCandidate@6487 }
-    <name not found> = ArrayList@6488[1] { ResolutionCandidate@6487 }
+ResolutionTaskHolder@6483 {
+    <name not found> = ArrayList@6484[1] { ResolutionCandidate@6485 }
+}
+
+ResolutionTaskHolder@6486 {
+    <name not found> = ArrayList@6487[1] { ResolutionCandidate@6488 }
 }
 
 ResolutionTaskHolder@6489 {
     <name not found> = ArrayList@6490[1] { ResolutionCandidate@6491 }
-    <name not found> = ArrayList@6492[1] { ResolutionCandidate@6491 }
 }
 
-ResolutionTaskHolder@6493 {
-    <name not found> = ArrayList@6494[1] { ResolutionCandidate@6495 }
-    <name not found> = ArrayList@6496[1] { ResolutionCandidate@6495 }
+ResolutionTaskHolder@6492 {
+    <name not found> = ArrayList@6493[1] { ResolutionCandidate@6494 }
 }
 
-ResolutionTaskHolder@6497 {
-    <name not found> = ArrayList@6498[1] { ResolutionCandidate@6499 }
-    <name not found> = ArrayList@6500[1] { ResolutionCandidate@6499 }
+ResolutionTaskHolder@6495 {
+    <name not found> = ArrayList@6496[1] { ResolutionCandidate@6497 }
+}
+
+ResolutionTaskHolder@6498 {
+    <name not found> = ArrayList@6499[1] { ResolutionCandidate@6500 }
 }
 
 ResolutionTaskHolder@6501 {
     <name not found> = ArrayList@6502[1] { ResolutionCandidate@6503 }
-    <name not found> = ArrayList@6504[1] { ResolutionCandidate@6503 }
 }
 
-ResolutionTaskHolder@6505 {
-    <name not found> = ArrayList@6506[1] { ResolutionCandidate@6507 }
-    <name not found> = ArrayList@6508[1] { ResolutionCandidate@6507 }
+ResolutionTaskHolder@6504 {
+    <name not found> = ArrayList@6505[1] { ResolutionCandidate@6506 }
 }
 
-ResolutionTaskHolder@6509 {
-    <name not found> = ArrayList@6510[1] { ResolutionCandidate@6511 }
-    <name not found> = ArrayList@6512[1] { ResolutionCandidate@6511 }
+ResolutionTaskHolder@6507 {
+    <name not found> = ArrayList@6508[1] { ResolutionCandidate@6509 }
+}
+
+ResolutionTaskHolder@6510 {
+    <name not found> = ArrayList@6511[1] { ResolutionCandidate@6512 }
 }
 
 ResolutionTaskHolder@6513 {
     <name not found> = ArrayList@6514[1] { ResolutionCandidate@6515 }
-    <name not found> = ArrayList@6516[1] { ResolutionCandidate@6515 }
 }
 
-ResolutionTaskHolder@6517 {
-    <name not found> = ArrayList@6518[1] { ResolutionCandidate@6519 }
-    <name not found> = ArrayList@6520[1] { ResolutionCandidate@6519 }
+ResolutionTaskHolder@6516 {
+    <name not found> = ArrayList@6517[1] { ResolutionCandidate@6518 }
 }
 
-ResolutionTaskHolder@6521 {
-    <name not found> = ArrayList@6522[1] { ResolutionCandidate@6523 }
-    <name not found> = ArrayList@6524[1] { ResolutionCandidate@6523 }
+ResolutionTaskHolder@6519 {
+    <name not found> = ArrayList@6520[1] { ResolutionCandidate@6521 }
+}
+
+ResolutionTaskHolder@6522 {
+    <name not found> = ArrayList@6523[1] { ResolutionCandidate@6524 }
 }
 
 ResolutionTaskHolder@6525 {
     <name not found> = ArrayList@6526[1] { ResolutionCandidate@6527 }
-    <name not found> = ArrayList@6528[1] { ResolutionCandidate@6527 }
 }
 
-ResolutionTaskHolder@6529 {
-    <name not found> = ArrayList@6530[1] { ResolutionCandidate@6531 }
-    <name not found> = ArrayList@6532[1] { ResolutionCandidate@6531 }
+ResolutionTaskHolder@6528 {
+    <name not found> = ArrayList@6529[1] { ResolutionCandidate@6530 }
 }
 
-ResolutionTaskHolder@6533 {
-    <name not found> = ArrayList@6534[1] { ResolutionCandidate@6535 }
-    <name not found> = ArrayList@6536[1] { ResolutionCandidate@6535 }
+ResolutionTaskHolder@6531 {
+    <name not found> = ArrayList@6532[1] { ResolutionCandidate@6533 }
+}
+
+ResolutionTaskHolder@6534 {
+    <name not found> = ArrayList@6535[1] { ResolutionCandidate@6536 }
 }
 
 ResolutionTaskHolder@6537 {
     <name not found> = ArrayList@6538[1] { ResolutionCandidate@6539 }
-    <name not found> = ArrayList@6540[1] { ResolutionCandidate@6539 }
 }
 
-ResolutionTaskHolder@6541 {
-    <name not found> = ArrayList@6542[1] { ResolutionCandidate@6543 }
-    <name not found> = ArrayList@6544[1] { ResolutionCandidate@6543 }
+ResolutionTaskHolder@6540 {
+    <name not found> = ArrayList@6541[1] { ResolutionCandidate@6542 }
 }
 
-ResolutionTaskHolder@6545 {
-    <name not found> = ArrayList@6546[1] { ResolutionCandidate@6547 }
-    <name not found> = ArrayList@6548[1] { ResolutionCandidate@6547 }
+ResolutionTaskHolder@6543 {
+    <name not found> = ArrayList@6544[1] { ResolutionCandidate@6545 }
+}
+
+ResolutionTaskHolder@6546 {
+    <name not found> = ArrayList@6547[1] { ResolutionCandidate@6548 }
 }
 
 ResolutionTaskHolder@6549 {
     <name not found> = ArrayList@6550[1] { ResolutionCandidate@6551 }
-    <name not found> = ArrayList@6552[1] { ResolutionCandidate@6551 }
 }
 
-ResolutionTaskHolder@6553 {
-    <name not found> = ArrayList@6554[1] { ResolutionCandidate@6555 }
-    <name not found> = ArrayList@6556[1] { ResolutionCandidate@6555 }
+ResolutionTaskHolder@6552 {
+    <name not found> = ArrayList@6553[1] { ResolutionCandidate@6554 }
 }
 
-ResolutionTaskHolder@6557 {
-    <name not found> = ArrayList@6558[1] { ResolutionCandidate@6559 }
-    <name not found> = ArrayList@6560[1] { ResolutionCandidate@6559 }
+ResolutionTaskHolder@6555 {
+    <name not found> = ArrayList@6556[1] { ResolutionCandidate@6557 }
+}
+
+ResolutionTaskHolder@6558 {
+    <name not found> = ArrayList@6559[1] { ResolutionCandidate@6560 }
 }
 
 ResolutionTaskHolder@6561 {
     <name not found> = ArrayList@6562[1] { ResolutionCandidate@6563 }
-    <name not found> = ArrayList@6564[1] { ResolutionCandidate@6563 }
 }
 
-ResolutionTaskHolder@6565 {
-    <name not found> = ArrayList@6566[1] { ResolutionCandidate@6567 }
-    <name not found> = ArrayList@6568[1] { ResolutionCandidate@6567 }
+ResolutionTaskHolder@6564 {
+    <name not found> = ArrayList@6565[1] { ResolutionCandidate@6566 }
 }
 
-ResolutionTaskHolder@6569 {
-    <name not found> = ArrayList@6570[1] { ResolutionCandidate@6571 }
-    <name not found> = ArrayList@6572[1] { ResolutionCandidate@6571 }
+ResolutionTaskHolder@6567 {
+    <name not found> = ArrayList@6568[1] { ResolutionCandidate@6569 }
+}
+
+ResolutionTaskHolder@6570 {
+    <name not found> = ArrayList@6571[1] { ResolutionCandidate@6572 }
 }
 
 ResolutionTaskHolder@6573 {
     <name not found> = ArrayList@6574[1] { ResolutionCandidate@6575 }
-    <name not found> = ArrayList@6576[1] { ResolutionCandidate@6575 }
 }
 
-ResolutionTaskHolder@6577 {
-    <name not found> = ArrayList@6578[1] { ResolutionCandidate@6579 }
-    <name not found> = ArrayList@6580[1] { ResolutionCandidate@6579 }
+ResolutionTaskHolder@6576 {
+    <name not found> = ArrayList@6577[1] { ResolutionCandidate@6578 }
 }
 
-ResolutionTaskHolder@6581 {
-    <name not found> = ArrayList@6582[1] { ResolutionCandidate@6583 }
-    <name not found> = ArrayList@6584[1] { ResolutionCandidate@6583 }
+ResolutionTaskHolder@6579 {
+    <name not found> = ArrayList@6580[1] { ResolutionCandidate@6581 }
+}
+
+ResolutionTaskHolder@6582 {
+    <name not found> = ArrayList@6583[1] { ResolutionCandidate@6584 }
 }
 
 ResolutionTaskHolder@6585 {
     <name not found> = ArrayList@6586[1] { ResolutionCandidate@6587 }
-    <name not found> = ArrayList@6588[1] { ResolutionCandidate@6587 }
 }
 
-ResolutionTaskHolder@6589 {
-    <name not found> = ArrayList@6590[1] { ResolutionCandidate@6591 }
-    <name not found> = ArrayList@6592[1] { ResolutionCandidate@6591 }
+ResolutionTaskHolder@6588 {
+    <name not found> = ArrayList@6589[1] { ResolutionCandidate@6590 }
 }
 
-ResolutionTaskHolder@6593 {
-    <name not found> = ArrayList@6594[1] { ResolutionCandidate@6595 }
-    <name not found> = ArrayList@6596[1] { ResolutionCandidate@6595 }
+ResolutionTaskHolder@6591 {
+    <name not found> = ArrayList@6592[1] { ResolutionCandidate@6593 }
+}
+
+ResolutionTaskHolder@6594 {
+    <name not found> = ArrayList@6595[1] { ResolutionCandidate@6596 }
 }
 
 ResolutionTaskHolder@6597 {
     <name not found> = ArrayList@6598[1] { ResolutionCandidate@6599 }
-    <name not found> = ArrayList@6600[1] { ResolutionCandidate@6599 }
 }
 
-ResolutionTaskHolder@6601 {
-    <name not found> = ArrayList@6602[1] { ResolutionCandidate@6603 }
-    <name not found> = ArrayList@6604[1] { ResolutionCandidate@6603 }
+ResolutionTaskHolder@6600 {
+    <name not found> = ArrayList@6601[1] { ResolutionCandidate@6602 }
 }
 
-ResolutionTaskHolder@6605 {
-    <name not found> = ArrayList@6606[1] { ResolutionCandidate@6607 }
-    <name not found> = ArrayList@6608[1] { ResolutionCandidate@6607 }
+ResolutionTaskHolder@6603 {
+    <name not found> = ArrayList@6604[1] { ResolutionCandidate@6605 }
+}
+
+ResolutionTaskHolder@6606 {
+    <name not found> = ArrayList@6607[1] { ResolutionCandidate@6608 }
 }
 
 ResolutionTaskHolder@6609 {
     <name not found> = ArrayList@6610[1] { ResolutionCandidate@6611 }
-    <name not found> = ArrayList@6612[1] { ResolutionCandidate@6611 }
 }
 
-ResolutionTaskHolder@6613 {
-    <name not found> = ArrayList@6614[1] { ResolutionCandidate@6615 }
-    <name not found> = ArrayList@6616[1] { ResolutionCandidate@6615 }
+ResolutionTaskHolder@6612 {
+    <name not found> = ArrayList@6613[1] { ResolutionCandidate@6614 }
 }
 
-ResolutionTaskHolder@6617 {
-    <name not found> = ArrayList@6618[1] { ResolutionCandidate@6619 }
-    <name not found> = ArrayList@6620[1] { ResolutionCandidate@6619 }
+ResolutionTaskHolder@6615 {
+    <name not found> = ArrayList@6616[1] { ResolutionCandidate@6617 }
+}
+
+ResolutionTaskHolder@6618 {
+    <name not found> = ArrayList@6619[1] { ResolutionCandidate@6620 }
 }
 
 ResolutionTaskHolder@6621 {
     <name not found> = ArrayList@6622[1] { ResolutionCandidate@6623 }
-    <name not found> = ArrayList@6624[1] { ResolutionCandidate@6623 }
 }
 
-ResolutionTaskHolder@6625 {
-    <name not found> = ArrayList@6626[1] { ResolutionCandidate@6627 }
-    <name not found> = ArrayList@6628[1] { ResolutionCandidate@6627 }
+ResolutionTaskHolder@6624 {
+    <name not found> = ArrayList@6625[1] { ResolutionCandidate@6626 }
 }
 
-ResolutionTaskHolder@6629 {
-    <name not found> = ArrayList@6630[1] { ResolutionCandidate@6631 }
-    <name not found> = ArrayList@6632[1] { ResolutionCandidate@6631 }
+ResolutionTaskHolder@6627 {
+    <name not found> = ArrayList@6628[1] { ResolutionCandidate@6629 }
+}
+
+ResolutionTaskHolder@6630 {
+    <name not found> = ArrayList@6631[1] { ResolutionCandidate@6632 }
 }
 
 ResolutionTaskHolder@6633 {
     <name not found> = ArrayList@6634[1] { ResolutionCandidate@6635 }
-    <name not found> = ArrayList@6636[1] { ResolutionCandidate@6635 }
 }
 
-ResolutionTaskHolder@6637 {
-    <name not found> = ArrayList@6638[1] { ResolutionCandidate@6639 }
-    <name not found> = ArrayList@6640[1] { ResolutionCandidate@6639 }
+ResolutionTaskHolder@6636 {
+    <name not found> = ArrayList@6637[1] { ResolutionCandidate@6638 }
 }
 
-ResolutionTaskHolder@6641 {
-    <name not found> = ArrayList@6642[1] { ResolutionCandidate@6643 }
-    <name not found> = ArrayList@6644[1] { ResolutionCandidate@6643 }
+ResolutionTaskHolder@6639 {
+    <name not found> = ArrayList@6640[1] { ResolutionCandidate@6641 }
+}
+
+ResolutionTaskHolder@6642 {
+    <name not found> = ArrayList@6643[1] { ResolutionCandidate@6644 }
 }
 
 ResolutionTaskHolder@6645 {
     <name not found> = ArrayList@6646[1] { ResolutionCandidate@6647 }
-    <name not found> = ArrayList@6648[1] { ResolutionCandidate@6647 }
 }
 
-ResolutionTaskHolder@6649 {
-    <name not found> = ArrayList@6650[1] { ResolutionCandidate@6651 }
-    <name not found> = ArrayList@6652[1] { ResolutionCandidate@6651 }
+ResolutionTaskHolder@6648 {
+    <name not found> = ArrayList@6649[1] { ResolutionCandidate@6650 }
 }
 
-ResolutionTaskHolder@6653 {
-    <name not found> = ArrayList@6654[1] { ResolutionCandidate@6655 }
-    <name not found> = ArrayList@6656[1] { ResolutionCandidate@6655 }
+ResolutionTaskHolder@6651 {
+    <name not found> = ArrayList@6652[1] { ResolutionCandidate@6653 }
+}
+
+ResolutionTaskHolder@6654 {
+    <name not found> = ArrayList@6655[1] { ResolutionCandidate@6656 }
 }
 
 ResolutionTaskHolder@6657 {
     <name not found> = ArrayList@6658[1] { ResolutionCandidate@6659 }
-    <name not found> = ArrayList@6660[1] { ResolutionCandidate@6659 }
 }
 
-ResolutionTaskHolder@6661 {
-    <name not found> = ArrayList@6662[1] { ResolutionCandidate@6663 }
-    <name not found> = ArrayList@6664[1] { ResolutionCandidate@6663 }
+ResolutionTaskHolder@6660 {
+    <name not found> = ArrayList@6661[1] { ResolutionCandidate@6662 }
 }
 
-ResolutionTaskHolder@6665 {
-    <name not found> = ArrayList@6666[1] { ResolutionCandidate@6667 }
-    <name not found> = ArrayList@6668[1] { ResolutionCandidate@6667 }
+ResolutionTaskHolder@6663 {
+    <name not found> = ArrayList@6664[1] { ResolutionCandidate@6665 }
+}
+
+ResolutionTaskHolder@6666 {
+    <name not found> = ArrayList@6667[1] { ResolutionCandidate@6668 }
 }
 
 ResolutionTaskHolder@6669 {
     <name not found> = ArrayList@6670[1] { ResolutionCandidate@6671 }
-    <name not found> = ArrayList@6672[1] { ResolutionCandidate@6671 }
 }
 
-ResolutionTaskHolder@6673 {
-    <name not found> = ArrayList@6674[1] { ResolutionCandidate@6675 }
-    <name not found> = ArrayList@6676[1] { ResolutionCandidate@6675 }
+ResolutionTaskHolder@6672 {
+    <name not found> = ArrayList@6673[1] { ResolutionCandidate@6674 }
 }
 
-ResolutionTaskHolder@6677 {
-    <name not found> = ArrayList@6678[1] { ResolutionCandidate@6679 }
-    <name not found> = ArrayList@6680[1] { ResolutionCandidate@6679 }
+ResolutionTaskHolder@6675 {
+    <name not found> = ArrayList@6676[1] { ResolutionCandidate@6677 }
+}
+
+ResolutionTaskHolder@6678 {
+    <name not found> = ArrayList@6679[1] { ResolutionCandidate@6680 }
 }
 
 ResolutionTaskHolder@6681 {
     <name not found> = ArrayList@6682[1] { ResolutionCandidate@6683 }
-    <name not found> = ArrayList@6684[1] { ResolutionCandidate@6683 }
 }
 
-ResolutionTaskHolder@6685 {
-    <name not found> = ArrayList@6686[1] { ResolutionCandidate@6687 }
-    <name not found> = ArrayList@6688[1] { ResolutionCandidate@6687 }
+ResolutionTaskHolder@6684 {
+    <name not found> = ArrayList@6685[1] { ResolutionCandidate@6686 }
 }
 
-ResolutionTaskHolder@6689 {
-    <name not found> = ArrayList@6690[1] { ResolutionCandidate@6691 }
-    <name not found> = ArrayList@6692[1] { ResolutionCandidate@6691 }
+ResolutionTaskHolder@6687 {
+    <name not found> = ArrayList@6688[1] { ResolutionCandidate@6689 }
+}
+
+ResolutionTaskHolder@6690 {
+    <name not found> = ArrayList@6691[1] { ResolutionCandidate@6692 }
 }
 
 ResolutionTaskHolder@6693 {
     <name not found> = ArrayList@6694[1] { ResolutionCandidate@6695 }
-    <name not found> = ArrayList@6696[1] { ResolutionCandidate@6695 }
 }
 
-ResolutionTaskHolder@6697 {
-    <name not found> = ArrayList@6698[1] { ResolutionCandidate@6699 }
-    <name not found> = ArrayList@6700[1] { ResolutionCandidate@6699 }
+ResolutionTaskHolder@6696 {
+    <name not found> = ArrayList@6697[1] { ResolutionCandidate@6698 }
 }
 
-ResolutionTaskHolder@6701 {
-    <name not found> = ArrayList@6702[1] { ResolutionCandidate@6703 }
-    <name not found> = ArrayList@6704[1] { ResolutionCandidate@6703 }
+ResolutionTaskHolder@6699 {
+    <name not found> = ArrayList@6700[1] { ResolutionCandidate@6701 }
+}
+
+ResolutionTaskHolder@6702 {
+    <name not found> = ArrayList@6703[1] { ResolutionCandidate@6704 }
 }
 
 ResolutionTaskHolder@6705 {
     <name not found> = ArrayList@6706[1] { ResolutionCandidate@6707 }
-    <name not found> = ArrayList@6708[1] { ResolutionCandidate@6707 }
 }
 
-ResolutionTaskHolder@6709 {
-    <name not found> = ArrayList@6710[1] { ResolutionCandidate@6711 }
-    <name not found> = ArrayList@6712[1] { ResolutionCandidate@6711 }
+ResolutionTaskHolder@6708 {
+    <name not found> = ArrayList@6709[1] { ResolutionCandidate@6710 }
 }
 
-ResolutionTaskHolder@6713 {
-    <name not found> = ArrayList@6714[1] { ResolutionCandidate@6715 }
-    <name not found> = ArrayList@6716[1] { ResolutionCandidate@6715 }
+ResolutionTaskHolder@6711 {
+    <name not found> = ArrayList@6712[1] { ResolutionCandidate@6713 }
+}
+
+ResolutionTaskHolder@6714 {
+    <name not found> = ArrayList@6715[1] { ResolutionCandidate@6716 }
 }
 
 ResolutionTaskHolder@6717 {
     <name not found> = ArrayList@6718[1] { ResolutionCandidate@6719 }
-    <name not found> = ArrayList@6720[1] { ResolutionCandidate@6719 }
 }
 
-ResolutionTaskHolder@6721 {
-    <name not found> = ArrayList@6722[1] { ResolutionCandidate@6723 }
-    <name not found> = ArrayList@6724[1] { ResolutionCandidate@6723 }
+ResolutionTaskHolder@6720 {
+    <name not found> = ArrayList@6721[1] { ResolutionCandidate@6722 }
 }
 
-ResolutionTaskHolder@6725 {
-    <name not found> = ArrayList@6726[1] { ResolutionCandidate@6727 }
-    <name not found> = ArrayList@6728[1] { ResolutionCandidate@6727 }
+ResolutionTaskHolder@6723 {
+    <name not found> = ArrayList@6724[1] { ResolutionCandidate@6725 }
+}
+
+ResolutionTaskHolder@6726 {
+    <name not found> = ArrayList@6727[1] { ResolutionCandidate@6728 }
 }
 
 ResolutionTaskHolder@6729 {
     <name not found> = ArrayList@6730[1] { ResolutionCandidate@6731 }
-    <name not found> = ArrayList@6732[1] { ResolutionCandidate@6731 }
 }
 
-ResolutionTaskHolder@6733 {
-    <name not found> = ArrayList@6734[1] { ResolutionCandidate@6735 }
-    <name not found> = ArrayList@6736[1] { ResolutionCandidate@6735 }
+ResolutionTaskHolder@6732 {
+    <name not found> = ArrayList@6733[1] { ResolutionCandidate@6734 }
 }
 
-ResolutionTaskHolder@6737 {
-    <name not found> = ArrayList@6738[1] { ResolutionCandidate@6739 }
-    <name not found> = ArrayList@6740[1] { ResolutionCandidate@6739 }
+ResolutionTaskHolder@6735 {
+    <name not found> = ArrayList@6736[1] { ResolutionCandidate@6737 }
+}
+
+ResolutionTaskHolder@6738 {
+    <name not found> = ArrayList@6739[1] { ResolutionCandidate@6740 }
 }
 
 ResolutionTaskHolder@6741 {
     <name not found> = ArrayList@6742[1] { ResolutionCandidate@6743 }
-    <name not found> = ArrayList@6744[1] { ResolutionCandidate@6743 }
 }
 
-ResolutionTaskHolder@6745 {
-    <name not found> = ArrayList@6746[1] { ResolutionCandidate@6747 }
-    <name not found> = ArrayList@6748[1] { ResolutionCandidate@6747 }
+ResolutionTaskHolder@6744 {
+    <name not found> = ArrayList@6745[1] { ResolutionCandidate@6746 }
 }
 
-ResolutionTaskHolder@6749 {
-    <name not found> = ArrayList@6750[1] { ResolutionCandidate@6751 }
-    <name not found> = ArrayList@6752[1] { ResolutionCandidate@6751 }
+ResolutionTaskHolder@6747 {
+    <name not found> = ArrayList@6748[1] { ResolutionCandidate@6749 }
+}
+
+ResolutionTaskHolder@6750 {
+    <name not found> = ArrayList@6751[1] { ResolutionCandidate@6752 }
 }
 
 ResolutionTaskHolder@6753 {
     <name not found> = ArrayList@6754[1] { ResolutionCandidate@6755 }
-    <name not found> = ArrayList@6756[1] { ResolutionCandidate@6755 }
 }
 
-ResolutionTaskHolder@6757 {
-    <name not found> = ArrayList@6758[1] { ResolutionCandidate@6759 }
-    <name not found> = ArrayList@6760[1] { ResolutionCandidate@6759 }
+ResolutionTaskHolder@6756 {
+    <name not found> = ArrayList@6757[1] { ResolutionCandidate@6758 }
 }
 
-ResolutionTaskHolder@6761 {
-    <name not found> = ArrayList@6762[1] { ResolutionCandidate@6763 }
-    <name not found> = ArrayList@6764[1] { ResolutionCandidate@6763 }
+ResolutionTaskHolder@6759 {
+    <name not found> = ArrayList@6760[1] { ResolutionCandidate@6761 }
+}
+
+ResolutionTaskHolder@6762 {
+    <name not found> = ArrayList@6763[1] { ResolutionCandidate@6764 }
 }
 
 ResolutionTaskHolder@6765 {
     <name not found> = ArrayList@6766[1] { ResolutionCandidate@6767 }
-    <name not found> = ArrayList@6768[1] { ResolutionCandidate@6767 }
 }
 
-ResolutionTaskHolder@6769 {
-    <name not found> = ArrayList@6770[1] { ResolutionCandidate@6771 }
-    <name not found> = ArrayList@6772[1] { ResolutionCandidate@6771 }
+ResolutionTaskHolder@6768 {
+    <name not found> = ArrayList@6769[1] { ResolutionCandidate@6770 }
 }
 
-ResolutionTaskHolder@6773 {
-    <name not found> = ArrayList@6774[1] { ResolutionCandidate@6775 }
-    <name not found> = ArrayList@6776[1] { ResolutionCandidate@6775 }
+ResolutionTaskHolder@6771 {
+    <name not found> = ArrayList@6772[1] { ResolutionCandidate@6773 }
+}
+
+ResolutionTaskHolder@6774 {
+    <name not found> = ArrayList@6775[1] { ResolutionCandidate@6776 }
 }
 
 ResolutionTaskHolder@6777 {
     <name not found> = ArrayList@6778[1] { ResolutionCandidate@6779 }
-    <name not found> = ArrayList@6780[1] { ResolutionCandidate@6779 }
 }
 
-ResolutionTaskHolder@6781 {
-    <name not found> = ArrayList@6782[1] { ResolutionCandidate@6783 }
-    <name not found> = ArrayList@6784[1] { ResolutionCandidate@6783 }
+ResolutionTaskHolder@6780 {
+    <name not found> = ArrayList@6781[1] { ResolutionCandidate@6782 }
 }
 
-ResolutionTaskHolder@6785 {
-    <name not found> = ArrayList@6786[1] { ResolutionCandidate@6787 }
-    <name not found> = ArrayList@6788[1] { ResolutionCandidate@6787 }
+ResolutionTaskHolder@6783 {
+    <name not found> = ArrayList@6784[1] { ResolutionCandidate@6785 }
+}
+
+ResolutionTaskHolder@6786 {
+    <name not found> = ArrayList@6787[1] { ResolutionCandidate@6788 }
 }
 
 ResolutionTaskHolder@6789 {
     <name not found> = ArrayList@6790[1] { ResolutionCandidate@6791 }
-    <name not found> = ArrayList@6792[1] { ResolutionCandidate@6791 }
 }
 
-ResolutionTaskHolder@6793 {
-    <name not found> = ArrayList@6794[1] { ResolutionCandidate@6795 }
-    <name not found> = ArrayList@6796[1] { ResolutionCandidate@6795 }
+ResolutionTaskHolder@6792 {
+    <name not found> = ArrayList@6793[1] { ResolutionCandidate@6794 }
 }
 
-ResolutionTaskHolder@6797 {
-    <name not found> = ArrayList@6798[1] { ResolutionCandidate@6799 }
-    <name not found> = ArrayList@6800[1] { ResolutionCandidate@6799 }
+ResolutionTaskHolder@6795 {
+    <name not found> = ArrayList@6796[1] { ResolutionCandidate@6797 }
+}
+
+ResolutionTaskHolder@6798 {
+    <name not found> = ArrayList@6799[1] { ResolutionCandidate@6800 }
 }
 
 ResolutionTaskHolder@6801 {
     <name not found> = ArrayList@6802[1] { ResolutionCandidate@6803 }
-    <name not found> = ArrayList@6804[1] { ResolutionCandidate@6803 }
 }
 
-ResolutionTaskHolder@6805 {
-    <name not found> = ArrayList@6806[1] { ResolutionCandidate@6807 }
-    <name not found> = ArrayList@6808[1] { ResolutionCandidate@6807 }
+ResolutionTaskHolder@6804 {
+    <name not found> = ArrayList@6805[1] { ResolutionCandidate@6806 }
 }
 
-ResolutionTaskHolder@6809 {
-    <name not found> = ArrayList@6810[1] { ResolutionCandidate@6811 }
-    <name not found> = ArrayList@6812[1] { ResolutionCandidate@6811 }
+ResolutionTaskHolder@6807 {
+    <name not found> = ArrayList@6808[1] { ResolutionCandidate@6809 }
+}
+
+ResolutionTaskHolder@6810 {
+    <name not found> = ArrayList@6811[1] { ResolutionCandidate@6812 }
 }
 
 ResolutionTaskHolder@6813 {
     <name not found> = ArrayList@6814[1] { ResolutionCandidate@6815 }
-    <name not found> = ArrayList@6816[1] { ResolutionCandidate@6815 }
 }
 
-ResolutionTaskHolder@6817 {
-    <name not found> = ArrayList@6818[1] { ResolutionCandidate@6819 }
-    <name not found> = ArrayList@6820[1] { ResolutionCandidate@6819 }
+ResolutionTaskHolder@6816 {
+    <name not found> = ArrayList@6817[1] { ResolutionCandidate@6818 }
 }
 
-ResolutionTaskHolder@6821 {
-    <name not found> = ArrayList@6822[1] { ResolutionCandidate@6823 }
-    <name not found> = ArrayList@6824[1] { ResolutionCandidate@6823 }
+ResolutionTaskHolder@6819 {
+    <name not found> = ArrayList@6820[1] { ResolutionCandidate@6821 }
+}
+
+ResolutionTaskHolder@6822 {
+    <name not found> = ArrayList@6823[1] { ResolutionCandidate@6824 }
 }
 
 ResolutionTaskHolder@6825 {
     <name not found> = ArrayList@6826[1] { ResolutionCandidate@6827 }
-    <name not found> = ArrayList@6828[1] { ResolutionCandidate@6827 }
 }
 
-ResolutionTaskHolder@6829 {
-    <name not found> = ArrayList@6830[1] { ResolutionCandidate@6831 }
-    <name not found> = ArrayList@6832[1] { ResolutionCandidate@6831 }
+ResolutionTaskHolder@6828 {
+    <name not found> = ArrayList@6829[1] { ResolutionCandidate@6830 }
 }
 
-ResolutionTaskHolder@6833 {
-    <name not found> = ArrayList@6834[1] { ResolutionCandidate@6835 }
-    <name not found> = ArrayList@6836[1] { ResolutionCandidate@6835 }
+ResolutionTaskHolder@6831 {
+    <name not found> = ArrayList@6832[1] { ResolutionCandidate@6833 }
+}
+
+ResolutionTaskHolder@6834 {
+    <name not found> = ArrayList@6835[1] { ResolutionCandidate@6836 }
 }
 
 ResolutionTaskHolder@6837 {
     <name not found> = ArrayList@6838[1] { ResolutionCandidate@6839 }
-    <name not found> = ArrayList@6840[1] { ResolutionCandidate@6839 }
 }
 
-ResolutionTaskHolder@6841 {
-    <name not found> = ArrayList@6842[1] { ResolutionCandidate@6843 }
-    <name not found> = ArrayList@6844[1] { ResolutionCandidate@6843 }
+ResolutionTaskHolder@6840 {
+    <name not found> = ArrayList@6841[1] { ResolutionCandidate@6842 }
 }
 
-ResolutionTaskHolder@6845 {
-    <name not found> = ArrayList@6846[1] { ResolutionCandidate@6847 }
-    <name not found> = ArrayList@6848[1] { ResolutionCandidate@6847 }
+ResolutionTaskHolder@6843 {
+    <name not found> = ArrayList@6844[1] { ResolutionCandidate@6845 }
+}
+
+ResolutionTaskHolder@6846 {
+    <name not found> = ArrayList@6847[1] { ResolutionCandidate@6848 }
 }
 
 ResolutionTaskHolder@6849 {
     <name not found> = ArrayList@6850[1] { ResolutionCandidate@6851 }
-    <name not found> = ArrayList@6852[1] { ResolutionCandidate@6851 }
 }
 
-ResolutionTaskHolder@6853 {
-    <name not found> = ArrayList@6854[1] { ResolutionCandidate@6855 }
-    <name not found> = ArrayList@6856[1] { ResolutionCandidate@6855 }
+ResolutionTaskHolder@6852 {
+    <name not found> = ArrayList@6853[1] { ResolutionCandidate@6854 }
 }
 
-ResolutionTaskHolder@6857 {
-    <name not found> = ArrayList@6858[1] { ResolutionCandidate@6859 }
-    <name not found> = ArrayList@6860[1] { ResolutionCandidate@6859 }
+ResolutionTaskHolder@6855 {
+    <name not found> = ArrayList@6856[1] { ResolutionCandidate@6857 }
+}
+
+ResolutionTaskHolder@6858 {
+    <name not found> = ArrayList@6859[1] { ResolutionCandidate@6860 }
 }
 
 ResolutionTaskHolder@6861 {
     <name not found> = ArrayList@6862[1] { ResolutionCandidate@6863 }
-    <name not found> = ArrayList@6864[1] { ResolutionCandidate@6863 }
 }
 
-ResolutionTaskHolder@6865 {
-    <name not found> = ArrayList@6866[1] { ResolutionCandidate@6867 }
-    <name not found> = ArrayList@6868[1] { ResolutionCandidate@6867 }
+ResolutionTaskHolder@6864 {
+    <name not found> = ArrayList@6865[1] { ResolutionCandidate@6866 }
 }
 
-ResolutionTaskHolder@6869 {
-    <name not found> = ArrayList@6870[1] { ResolutionCandidate@6871 }
-    <name not found> = ArrayList@6872[1] { ResolutionCandidate@6871 }
+ResolutionTaskHolder@6867 {
+    <name not found> = ArrayList@6868[1] { ResolutionCandidate@6869 }
+}
+
+ResolutionTaskHolder@6870 {
+    <name not found> = ArrayList@6871[1] { ResolutionCandidate@6872 }
 }
 
 ResolutionTaskHolder@6873 {
     <name not found> = ArrayList@6874[1] { ResolutionCandidate@6875 }
-    <name not found> = ArrayList@6876[1] { ResolutionCandidate@6875 }
 }
 
-ResolutionTaskHolder@6877 {
-    <name not found> = ArrayList@6878[1] { ResolutionCandidate@6879 }
-    <name not found> = ArrayList@6880[1] { ResolutionCandidate@6879 }
+ResolutionTaskHolder@6876 {
+    <name not found> = ArrayList@6877[1] { ResolutionCandidate@6878 }
 }
 
-ResolutionTaskHolder@6881 {
-    <name not found> = ArrayList@6882[1] { ResolutionCandidate@6883 }
-    <name not found> = ArrayList@6884[1] { ResolutionCandidate@6883 }
+ResolutionTaskHolder@6879 {
+    <name not found> = ArrayList@6880[1] { ResolutionCandidate@6881 }
+}
+
+ResolutionTaskHolder@6882 {
+    <name not found> = ArrayList@6883[1] { ResolutionCandidate@6884 }
 }
 
 ResolutionTaskHolder@6885 {
     <name not found> = ArrayList@6886[1] { ResolutionCandidate@6887 }
-    <name not found> = ArrayList@6888[1] { ResolutionCandidate@6887 }
 }
 
-ResolutionTaskHolder@6889 {
-    <name not found> = ArrayList@6890[1] { ResolutionCandidate@6891 }
-    <name not found> = ArrayList@6892[1] { ResolutionCandidate@6891 }
+ResolutionTaskHolder@6888 {
+    <name not found> = ArrayList@6889[1] { ResolutionCandidate@6890 }
 }
 
-ResolutionTaskHolder@6893 {
-    <name not found> = ArrayList@6894[1] { ResolutionCandidate@6895 }
-    <name not found> = ArrayList@6896[1] { ResolutionCandidate@6895 }
+ResolutionTaskHolder@6891 {
+    <name not found> = ArrayList@6892[1] { ResolutionCandidate@6893 }
+}
+
+ResolutionTaskHolder@6894 {
+    <name not found> = ArrayList@6895[1] { ResolutionCandidate@6896 }
 }
 
 ResolutionTaskHolder@6897 {
     <name not found> = ArrayList@6898[1] { ResolutionCandidate@6899 }
-    <name not found> = ArrayList@6900[1] { ResolutionCandidate@6899 }
 }
 
-ResolutionTaskHolder@6901 {
-    <name not found> = ArrayList@6902[1] { ResolutionCandidate@6903 }
-    <name not found> = ArrayList@6904[1] { ResolutionCandidate@6903 }
+ResolutionTaskHolder@6900 {
+    <name not found> = ArrayList@6901[1] { ResolutionCandidate@6902 }
 }
 
-ResolutionTaskHolder@6905 {
-    <name not found> = ArrayList@6906[1] { ResolutionCandidate@6907 }
-    <name not found> = ArrayList@6908[1] { ResolutionCandidate@6907 }
+ResolutionTaskHolder@6903 {
+    <name not found> = ArrayList@6904[1] { ResolutionCandidate@6905 }
+}
+
+ResolutionTaskHolder@6906 {
+    <name not found> = ArrayList@6907[1] { ResolutionCandidate@6908 }
 }
 
 ResolutionTaskHolder@6909 {
     <name not found> = ArrayList@6910[1] { ResolutionCandidate@6911 }
-    <name not found> = ArrayList@6912[1] { ResolutionCandidate@6911 }
 }
 
-ResolutionTaskHolder@6913 {
-    <name not found> = ArrayList@6914[1] { ResolutionCandidate@6915 }
-    <name not found> = ArrayList@6916[1] { ResolutionCandidate@6915 }
+ResolutionTaskHolder@6912 {
+    <name not found> = ArrayList@6913[1] { ResolutionCandidate@6914 }
 }
 
-ResolutionTaskHolder@6917 {
-    <name not found> = ArrayList@6918[1] { ResolutionCandidate@6919 }
-    <name not found> = ArrayList@6920[1] { ResolutionCandidate@6919 }
+ResolutionTaskHolder@6915 {
+    <name not found> = ArrayList@6916[1] { ResolutionCandidate@6917 }
+}
+
+ResolutionTaskHolder@6918 {
+    <name not found> = ArrayList@6919[1] { ResolutionCandidate@6920 }
 }
 
 ResolutionTaskHolder@6921 {
     <name not found> = ArrayList@6922[1] { ResolutionCandidate@6923 }
-    <name not found> = ArrayList@6924[1] { ResolutionCandidate@6923 }
 }
 
-ResolutionTaskHolder@6925 {
-    <name not found> = ArrayList@6926[1] { ResolutionCandidate@6927 }
-    <name not found> = ArrayList@6928[1] { ResolutionCandidate@6927 }
+ResolutionTaskHolder@6924 {
+    <name not found> = ArrayList@6925[1] { ResolutionCandidate@6926 }
 }
 
-ResolutionTaskHolder@6929 {
-    <name not found> = ArrayList@6930[1] { ResolutionCandidate@6931 }
-    <name not found> = ArrayList@6932[1] { ResolutionCandidate@6931 }
+ResolutionTaskHolder@6927 {
+    <name not found> = ArrayList@6928[1] { ResolutionCandidate@6929 }
+}
+
+ResolutionTaskHolder@6930 {
+    <name not found> = ArrayList@6931[1] { ResolutionCandidate@6932 }
 }
 
 ResolutionTaskHolder@6933 {
     <name not found> = ArrayList@6934[1] { ResolutionCandidate@6935 }
-    <name not found> = ArrayList@6936[1] { ResolutionCandidate@6935 }
 }
 
-ResolutionTaskHolder@6937 {
-    <name not found> = ArrayList@6938[1] { ResolutionCandidate@6939 }
-    <name not found> = ArrayList@6940[1] { ResolutionCandidate@6939 }
+ResolutionTaskHolder@6936 {
+    <name not found> = ArrayList@6937[1] { ResolutionCandidate@6938 }
 }
 
-ResolutionTaskHolder@6941 {
-    <name not found> = ArrayList@6942[1] { ResolutionCandidate@6943 }
-    <name not found> = ArrayList@6944[1] { ResolutionCandidate@6943 }
+ResolutionTaskHolder@6939 {
+    <name not found> = ArrayList@6940[1] { ResolutionCandidate@6941 }
+}
+
+ResolutionTaskHolder@6942 {
+    <name not found> = ArrayList@6943[1] { ResolutionCandidate@6944 }
 }
 
 ResolutionTaskHolder@6945 {
     <name not found> = ArrayList@6946[1] { ResolutionCandidate@6947 }
-    <name not found> = ArrayList@6948[1] { ResolutionCandidate@6947 }
 }
 
-ResolutionTaskHolder@6949 {
-    <name not found> = ArrayList@6950[1] { ResolutionCandidate@6951 }
-    <name not found> = ArrayList@6952[1] { ResolutionCandidate@6951 }
+ResolutionTaskHolder@6948 {
+    <name not found> = ArrayList@6949[1] { ResolutionCandidate@6950 }
 }
 
-ResolutionTaskHolder@6953 {
-    <name not found> = ArrayList@6954[1] { ResolutionCandidate@6955 }
-    <name not found> = ArrayList@6956[1] { ResolutionCandidate@6955 }
+ResolutionTaskHolder@6951 {
+    <name not found> = ArrayList@6952[1] { ResolutionCandidate@6953 }
+}
+
+ResolutionTaskHolder@6954 {
+    <name not found> = ArrayList@6955[1] { ResolutionCandidate@6956 }
 }
 
 ResolutionTaskHolder@6957 {
     <name not found> = ArrayList@6958[1] { ResolutionCandidate@6959 }
-    <name not found> = ArrayList@6960[1] { ResolutionCandidate@6959 }
 }
 
-ResolutionTaskHolder@6961 {
-    <name not found> = ArrayList@6962[1] { ResolutionCandidate@6963 }
-    <name not found> = ArrayList@6964[1] { ResolutionCandidate@6963 }
+ResolutionTaskHolder@6960 {
+    <name not found> = ArrayList@6961[1] { ResolutionCandidate@6962 }
 }
 
-ResolutionTaskHolder@6965 {
-    <name not found> = ArrayList@6966[1] { ResolutionCandidate@6967 }
-    <name not found> = ArrayList@6968[1] { ResolutionCandidate@6967 }
+ResolutionTaskHolder@6963 {
+    <name not found> = ArrayList@6964[1] { ResolutionCandidate@6965 }
+}
+
+ResolutionTaskHolder@6966 {
+    <name not found> = ArrayList@6967[1] { ResolutionCandidate@6968 }
 }
 
 ResolutionTaskHolder@6969 {
     <name not found> = ArrayList@6970[1] { ResolutionCandidate@6971 }
-    <name not found> = ArrayList@6972[1] { ResolutionCandidate@6971 }
 }
 
-ResolutionTaskHolder@6973 {
-    <name not found> = ArrayList@6974[1] { ResolutionCandidate@6975 }
-    <name not found> = ArrayList@6976[1] { ResolutionCandidate@6975 }
+ResolutionTaskHolder@6972 {
+    <name not found> = ArrayList@6973[1] { ResolutionCandidate@6974 }
 }
 
-ResolutionTaskHolder@6977 {
-    <name not found> = ArrayList@6978[1] { ResolutionCandidate@6979 }
-    <name not found> = ArrayList@6980[1] { ResolutionCandidate@6979 }
+ResolutionTaskHolder@6975 {
+    <name not found> = ArrayList@6976[1] { ResolutionCandidate@6977 }
+}
+
+ResolutionTaskHolder@6978 {
+    <name not found> = ArrayList@6979[1] { ResolutionCandidate@6980 }
 }
 
 ResolutionTaskHolder@6981 {
     <name not found> = ArrayList@6982[1] { ResolutionCandidate@6983 }
-    <name not found> = ArrayList@6984[1] { ResolutionCandidate@6983 }
 }
 
-ResolutionTaskHolder@6985 {
-    <name not found> = ArrayList@6986[1] { ResolutionCandidate@6987 }
-    <name not found> = ArrayList@6988[1] { ResolutionCandidate@6987 }
+ResolutionTaskHolder@6984 {
+    <name not found> = ArrayList@6985[1] { ResolutionCandidate@6986 }
 }
 
-ResolutionTaskHolder@6989 {
-    <name not found> = ArrayList@6990[1] { ResolutionCandidate@6991 }
-    <name not found> = ArrayList@6992[1] { ResolutionCandidate@6991 }
+ResolutionTaskHolder@6987 {
+    <name not found> = ArrayList@6988[1] { ResolutionCandidate@6989 }
+}
+
+ResolutionTaskHolder@6990 {
+    <name not found> = ArrayList@6991[1] { ResolutionCandidate@6992 }
 }
 
 ResolutionTaskHolder@6993 {
     <name not found> = ArrayList@6994[1] { ResolutionCandidate@6995 }
-    <name not found> = ArrayList@6996[1] { ResolutionCandidate@6995 }
 }
 
-ResolutionTaskHolder@6997 {
-    <name not found> = ArrayList@6998[1] { ResolutionCandidate@6999 }
-    <name not found> = ArrayList@7000[1] { ResolutionCandidate@6999 }
+ResolutionTaskHolder@6996 {
+    <name not found> = ArrayList@6997[1] { ResolutionCandidate@6998 }
 }
 
-ResolutionTaskHolder@7001 {
-    <name not found> = ArrayList@7002[1] { ResolutionCandidate@7003 }
-    <name not found> = ArrayList@7004[1] { ResolutionCandidate@7003 }
+ResolutionTaskHolder@6999 {
+    <name not found> = ArrayList@7000[1] { ResolutionCandidate@7001 }
+}
+
+ResolutionTaskHolder@7002 {
+    <name not found> = ArrayList@7003[1] { ResolutionCandidate@7004 }
 }
 
 ResolutionTaskHolder@7005 {
     <name not found> = ArrayList@7006[1] { ResolutionCandidate@7007 }
-    <name not found> = ArrayList@7008[1] { ResolutionCandidate@7007 }
 }
 
-ResolutionTaskHolder@7009 {
-    <name not found> = ArrayList@7010[1] { ResolutionCandidate@7011 }
-    <name not found> = ArrayList@7012[1] { ResolutionCandidate@7011 }
+ResolutionTaskHolder@7008 {
+    <name not found> = ArrayList@7009[1] { ResolutionCandidate@7010 }
 }
 
-ResolutionTaskHolder@7013 {
-    <name not found> = ArrayList@7014[1] { ResolutionCandidate@7015 }
-    <name not found> = ArrayList@7016[1] { ResolutionCandidate@7015 }
+ResolutionTaskHolder@7011 {
+    <name not found> = ArrayList@7012[1] { ResolutionCandidate@7013 }
+}
+
+ResolutionTaskHolder@7014 {
+    <name not found> = ArrayList@7015[1] { ResolutionCandidate@7016 }
 }
 
 ResolutionTaskHolder@7017 {
     <name not found> = ArrayList@7018[1] { ResolutionCandidate@7019 }
-    <name not found> = ArrayList@7020[1] { ResolutionCandidate@7019 }
 }
 
-ResolutionTaskHolder@7021 {
-    <name not found> = ArrayList@7022[1] { ResolutionCandidate@7023 }
-    <name not found> = ArrayList@7024[1] { ResolutionCandidate@7023 }
+ResolutionTaskHolder@7020 {
+    <name not found> = ArrayList@7021[1] { ResolutionCandidate@7022 }
 }
 
-ResolutionTaskHolder@7025 {
-    <name not found> = ArrayList@7026[1] { ResolutionCandidate@7027 }
-    <name not found> = ArrayList@7028[1] { ResolutionCandidate@7027 }
+ResolutionTaskHolder@7023 {
+    <name not found> = ArrayList@7024[1] { ResolutionCandidate@7025 }
+}
+
+ResolutionTaskHolder@7026 {
+    <name not found> = ArrayList@7027[1] { ResolutionCandidate@7028 }
 }
 
 ResolutionTaskHolder@7029 {
     <name not found> = ArrayList@7030[1] { ResolutionCandidate@7031 }
-    <name not found> = ArrayList@7032[1] { ResolutionCandidate@7031 }
 }
 
-ResolutionTaskHolder@7033 {
-    <name not found> = ArrayList@7034[1] { ResolutionCandidate@7035 }
-    <name not found> = ArrayList@7036[1] { ResolutionCandidate@7035 }
+ResolutionTaskHolder@7032 {
+    <name not found> = ArrayList@7033[1] { ResolutionCandidate@7034 }
 }
 
-ResolutionTaskHolder@7037 {
-    <name not found> = ArrayList@7038[1] { ResolutionCandidate@7039 }
-    <name not found> = ArrayList@7040[1] { ResolutionCandidate@7039 }
+ResolutionTaskHolder@7035 {
+    <name not found> = ArrayList@7036[1] { ResolutionCandidate@7037 }
+}
+
+ResolutionTaskHolder@7038 {
+    <name not found> = ArrayList@7039[1] { ResolutionCandidate@7040 }
 }
 
 ResolutionTaskHolder@7041 {
     <name not found> = ArrayList@7042[1] { ResolutionCandidate@7043 }
-    <name not found> = ArrayList@7044[1] { ResolutionCandidate@7043 }
 }
 
-ResolutionTaskHolder@7045 {
-    <name not found> = ArrayList@7046[1] { ResolutionCandidate@7047 }
-    <name not found> = ArrayList@7048[1] { ResolutionCandidate@7047 }
+ResolutionTaskHolder@7044 {
+    <name not found> = ArrayList@7045[1] { ResolutionCandidate@7046 }
 }
 
-ResolutionTaskHolder@7049 {
-    <name not found> = ArrayList@7050[1] { ResolutionCandidate@7051 }
-    <name not found> = ArrayList@7052[1] { ResolutionCandidate@7051 }
+ResolutionTaskHolder@7047 {
+    <name not found> = ArrayList@7048[1] { ResolutionCandidate@7049 }
+}
+
+ResolutionTaskHolder@7050 {
+    <name not found> = ArrayList@7051[1] { ResolutionCandidate@7052 }
 }
 
 ResolutionTaskHolder@7053 {
     <name not found> = ArrayList@7054[1] { ResolutionCandidate@7055 }
-    <name not found> = ArrayList@7056[1] { ResolutionCandidate@7055 }
 }
 
-ResolutionTaskHolder@7057 {
-    <name not found> = ArrayList@7058[1] { ResolutionCandidate@7059 }
-    <name not found> = ArrayList@7060[1] { ResolutionCandidate@7059 }
+ResolutionTaskHolder@7056 {
+    <name not found> = ArrayList@7057[1] { ResolutionCandidate@7058 }
 }
 
-ResolutionTaskHolder@7061 {
-    <name not found> = ArrayList@7062[1] { ResolutionCandidate@7063 }
-    <name not found> = ArrayList@7064[1] { ResolutionCandidate@7063 }
+ResolutionTaskHolder@7059 {
+    <name not found> = ArrayList@7060[1] { ResolutionCandidate@7061 }
+}
+
+ResolutionTaskHolder@7062 {
+    <name not found> = ArrayList@7063[1] { ResolutionCandidate@7064 }
 }
 
 ResolutionTaskHolder@7065 {
     <name not found> = ArrayList@7066[1] { ResolutionCandidate@7067 }
-    <name not found> = ArrayList@7068[1] { ResolutionCandidate@7067 }
 }
 
-ResolutionTaskHolder@7069 {
-    <name not found> = ArrayList@7070[1] { ResolutionCandidate@7071 }
-    <name not found> = ArrayList@7072[1] { ResolutionCandidate@7071 }
+ResolutionTaskHolder@7068 {
+    <name not found> = ArrayList@7069[1] { ResolutionCandidate@7070 }
 }
 
-ResolutionTaskHolder@7073 {
-    <name not found> = ArrayList@7074[1] { ResolutionCandidate@7075 }
-    <name not found> = ArrayList@7076[1] { ResolutionCandidate@7075 }
+ResolutionTaskHolder@7071 {
+    <name not found> = ArrayList@7072[1] { ResolutionCandidate@7073 }
+}
+
+ResolutionTaskHolder@7074 {
+    <name not found> = ArrayList@7075[1] { ResolutionCandidate@7076 }
 }
 
 ResolutionTaskHolder@7077 {
     <name not found> = ArrayList@7078[1] { ResolutionCandidate@7079 }
-    <name not found> = ArrayList@7080[1] { ResolutionCandidate@7079 }
 }
 
-ResolutionTaskHolder@7081 {
-    <name not found> = ArrayList@7082[1] { ResolutionCandidate@7083 }
-    <name not found> = ArrayList@7084[1] { ResolutionCandidate@7083 }
+ResolutionTaskHolder@7080 {
+    <name not found> = ArrayList@7081[1] { ResolutionCandidate@7082 }
 }
 
-ResolutionTaskHolder@7085 {
-    <name not found> = ArrayList@7086[1] { ResolutionCandidate@7087 }
-    <name not found> = ArrayList@7088[1] { ResolutionCandidate@7087 }
+ResolutionTaskHolder@7083 {
+    <name not found> = ArrayList@7084[1] { ResolutionCandidate@7085 }
+}
+
+ResolutionTaskHolder@7086 {
+    <name not found> = ArrayList@7087[1] { ResolutionCandidate@7088 }
 }
 
 ResolutionTaskHolder@7089 {
     <name not found> = ArrayList@7090[1] { ResolutionCandidate@7091 }
-    <name not found> = ArrayList@7092[1] { ResolutionCandidate@7091 }
 }
 
-ResolutionTaskHolder@7093 {
-    <name not found> = ArrayList@7094[1] { ResolutionCandidate@7095 }
-    <name not found> = ArrayList@7096[1] { ResolutionCandidate@7095 }
+ResolutionTaskHolder@7092 {
+    <name not found> = ArrayList@7093[1] { ResolutionCandidate@7094 }
 }
 
-ResolutionTaskHolder@7097 {
-    <name not found> = ArrayList@7098[1] { ResolutionCandidate@7099 }
-    <name not found> = ArrayList@7100[1] { ResolutionCandidate@7099 }
+ResolutionTaskHolder@7095 {
+    <name not found> = ArrayList@7096[1] { ResolutionCandidate@7097 }
+}
+
+ResolutionTaskHolder@7098 {
+    <name not found> = ArrayList@7099[1] { ResolutionCandidate@7100 }
 }
 
 ResolutionTaskHolder@7101 {
     <name not found> = ArrayList@7102[1] { ResolutionCandidate@7103 }
-    <name not found> = ArrayList@7104[1] { ResolutionCandidate@7103 }
 }
 
-ResolutionTaskHolder@7105 {
-    <name not found> = ArrayList@7106[1] { ResolutionCandidate@7107 }
-    <name not found> = ArrayList@7108[1] { ResolutionCandidate@7107 }
+ResolutionTaskHolder@7104 {
+    <name not found> = ArrayList@7105[1] { ResolutionCandidate@7106 }
 }
 
-ResolutionTaskHolder@7109 {
-    <name not found> = ArrayList@7110[1] { ResolutionCandidate@7111 }
-    <name not found> = ArrayList@7112[1] { ResolutionCandidate@7111 }
+ResolutionTaskHolder@7107 {
+    <name not found> = ArrayList@7108[1] { ResolutionCandidate@7109 }
+}
+
+ResolutionTaskHolder@7110 {
+    <name not found> = ArrayList@7111[1] { ResolutionCandidate@7112 }
 }
 
 ResolutionTaskHolder@7113 {
     <name not found> = ArrayList@7114[1] { ResolutionCandidate@7115 }
-    <name not found> = ArrayList@7116[1] { ResolutionCandidate@7115 }
 }
 
-ResolutionTaskHolder@7117 {
-    <name not found> = ArrayList@7118[1] { ResolutionCandidate@7119 }
-    <name not found> = ArrayList@7120[1] { ResolutionCandidate@7119 }
+ResolutionTaskHolder@7116 {
+    <name not found> = ArrayList@7117[1] { ResolutionCandidate@7118 }
 }
 
-ResolutionTaskHolder@7121 {
-    <name not found> = ArrayList@7122[1] { ResolutionCandidate@7123 }
-    <name not found> = ArrayList@7124[1] { ResolutionCandidate@7123 }
+ResolutionTaskHolder@7119 {
+    <name not found> = ArrayList@7120[1] { ResolutionCandidate@7121 }
+}
+
+ResolutionTaskHolder@7122 {
+    <name not found> = ArrayList@7123[1] { ResolutionCandidate@7124 }
 }
 
 ResolutionTaskHolder@7125 {
     <name not found> = ArrayList@7126[1] { ResolutionCandidate@7127 }
-    <name not found> = ArrayList@7128[1] { ResolutionCandidate@7127 }
 }
 
-ResolutionTaskHolder@7129 {
-    <name not found> = ArrayList@7130[1] { ResolutionCandidate@7131 }
-    <name not found> = ArrayList@7132[1] { ResolutionCandidate@7131 }
+ResolutionTaskHolder@7128 {
+    <name not found> = ArrayList@7129[1] { ResolutionCandidate@7130 }
 }
 
-ResolutionTaskHolder@7133 {
-    <name not found> = ArrayList@7134[1] { ResolutionCandidate@7135 }
-    <name not found> = ArrayList@7136[1] { ResolutionCandidate@7135 }
+ResolutionTaskHolder@7131 {
+    <name not found> = ArrayList@7132[1] { ResolutionCandidate@7133 }
+}
+
+ResolutionTaskHolder@7134 {
+    <name not found> = ArrayList@7135[1] { ResolutionCandidate@7136 }
 }
 
 ResolutionTaskHolder@7137 {
     <name not found> = ArrayList@7138[1] { ResolutionCandidate@7139 }
-    <name not found> = ArrayList@7140[1] { ResolutionCandidate@7139 }
 }
 
-ResolutionTaskHolder@7141 {
-    <name not found> = ArrayList@7142[1] { ResolutionCandidate@7143 }
-    <name not found> = ArrayList@7144[1] { ResolutionCandidate@7143 }
+ResolutionTaskHolder@7140 {
+    <name not found> = ArrayList@7141[1] { ResolutionCandidate@7142 }
 }
 
-ResolutionTaskHolder@7145 {
-    <name not found> = ArrayList@7146[1] { ResolutionCandidate@7147 }
-    <name not found> = ArrayList@7148[1] { ResolutionCandidate@7147 }
+ResolutionTaskHolder@7143 {
+    <name not found> = ArrayList@7144[1] { ResolutionCandidate@7145 }
+}
+
+ResolutionTaskHolder@7146 {
+    <name not found> = ArrayList@7147[1] { ResolutionCandidate@7148 }
 }
 
 ResolutionTaskHolder@7149 {
     <name not found> = ArrayList@7150[1] { ResolutionCandidate@7151 }
-    <name not found> = ArrayList@7152[1] { ResolutionCandidate@7151 }
 }
 
-ResolutionTaskHolder@7153 {
-    <name not found> = ArrayList@7154[1] { ResolutionCandidate@7155 }
-    <name not found> = ArrayList@7156[1] { ResolutionCandidate@7155 }
+ResolutionTaskHolder@7152 {
+    <name not found> = ArrayList@7153[1] { ResolutionCandidate@7154 }
 }
 
-ResolutionTaskHolder@7157 {
-    <name not found> = ArrayList@7158[1] { ResolutionCandidate@7159 }
-    <name not found> = ArrayList@7160[1] { ResolutionCandidate@7159 }
+ResolutionTaskHolder@7155 {
+    <name not found> = ArrayList@7156[1] { ResolutionCandidate@7157 }
+}
+
+ResolutionTaskHolder@7158 {
+    <name not found> = ArrayList@7159[1] { ResolutionCandidate@7160 }
 }
 
 ResolutionTaskHolder@7161 {
     <name not found> = ArrayList@7162[1] { ResolutionCandidate@7163 }
-    <name not found> = ArrayList@7164[1] { ResolutionCandidate@7163 }
 }
 
-ResolutionTaskHolder@7165 {
-    <name not found> = ArrayList@7166[1] { ResolutionCandidate@7167 }
-    <name not found> = ArrayList@7168[1] { ResolutionCandidate@7167 }
+ResolutionTaskHolder@7164 {
+    <name not found> = ArrayList@7165[1] { ResolutionCandidate@7166 }
 }
 
-ResolutionTaskHolder@7169 {
-    <name not found> = ArrayList@7170[1] { ResolutionCandidate@7171 }
-    <name not found> = ArrayList@7172[1] { ResolutionCandidate@7171 }
+ResolutionTaskHolder@7167 {
+    <name not found> = ArrayList@7168[1] { ResolutionCandidate@7169 }
+}
+
+ResolutionTaskHolder@7170 {
+    <name not found> = ArrayList@7171[1] { ResolutionCandidate@7172 }
 }
 
 ResolutionTaskHolder@7173 {
     <name not found> = ArrayList@7174[1] { ResolutionCandidate@7175 }
-    <name not found> = ArrayList@7176[1] { ResolutionCandidate@7175 }
 }
 
-ResolutionTaskHolder@7177 {
-    <name not found> = ArrayList@7178[1] { ResolutionCandidate@7179 }
-    <name not found> = ArrayList@7180[1] { ResolutionCandidate@7179 }
+ResolutionTaskHolder@7176 {
+    <name not found> = ArrayList@7177[1] { ResolutionCandidate@7178 }
 }
 
-ResolutionTaskHolder@7181 {
-    <name not found> = ArrayList@7182[1] { ResolutionCandidate@7183 }
-    <name not found> = ArrayList@7184[1] { ResolutionCandidate@7183 }
+ResolutionTaskHolder@7179 {
+    <name not found> = ArrayList@7180[1] { ResolutionCandidate@7181 }
+}
+
+ResolutionTaskHolder@7182 {
+    <name not found> = ArrayList@7183[1] { ResolutionCandidate@7184 }
 }
 
 ResolutionTaskHolder@7185 {
     <name not found> = ArrayList@7186[1] { ResolutionCandidate@7187 }
-    <name not found> = ArrayList@7188[1] { ResolutionCandidate@7187 }
 }
 
-ResolutionTaskHolder@7189 {
-    <name not found> = ArrayList@7190[1] { ResolutionCandidate@7191 }
-    <name not found> = ArrayList@7192[1] { ResolutionCandidate@7191 }
+ResolutionTaskHolder@7188 {
+    <name not found> = ArrayList@7189[1] { ResolutionCandidate@7190 }
 }
 
-ResolutionTaskHolder@7193 {
-    <name not found> = ArrayList@7194[1] { ResolutionCandidate@7195 }
-    <name not found> = ArrayList@7196[1] { ResolutionCandidate@7195 }
+ResolutionTaskHolder@7191 {
+    <name not found> = ArrayList@7192[1] { ResolutionCandidate@7193 }
+}
+
+ResolutionTaskHolder@7194 {
+    <name not found> = ArrayList@7195[1] { ResolutionCandidate@7196 }
 }
 
 ResolutionTaskHolder@7197 {
     <name not found> = ArrayList@7198[1] { ResolutionCandidate@7199 }
-    <name not found> = ArrayList@7200[1] { ResolutionCandidate@7199 }
 }
 
-ResolutionTaskHolder@7201 {
-    <name not found> = ArrayList@7202[1] { ResolutionCandidate@7203 }
-    <name not found> = ArrayList@7204[1] { ResolutionCandidate@7203 }
+ResolutionTaskHolder@7200 {
+    <name not found> = ArrayList@7201[1] { ResolutionCandidate@7202 }
 }
 
-ResolutionTaskHolder@7205 {
-    <name not found> = ArrayList@7206[1] { ResolutionCandidate@7207 }
-    <name not found> = ArrayList@7208[1] { ResolutionCandidate@7207 }
+ResolutionTaskHolder@7203 {
+    <name not found> = ArrayList@7204[1] { ResolutionCandidate@7205 }
+}
+
+ResolutionTaskHolder@7206 {
+    <name not found> = ArrayList@7207[1] { ResolutionCandidate@7208 }
 }
 
 ResolutionTaskHolder@7209 {
     <name not found> = ArrayList@7210[1] { ResolutionCandidate@7211 }
-    <name not found> = ArrayList@7212[1] { ResolutionCandidate@7211 }
 }
 
-ResolutionTaskHolder@7213 {
-    <name not found> = ArrayList@7214[1] { ResolutionCandidate@7215 }
-    <name not found> = ArrayList@7216[1] { ResolutionCandidate@7215 }
+ResolutionTaskHolder@7212 {
+    <name not found> = ArrayList@7213[1] { ResolutionCandidate@7214 }
 }
 
-ResolutionTaskHolder@7217 {
-    <name not found> = ArrayList@7218[1] { ResolutionCandidate@7219 }
-    <name not found> = ArrayList@7220[1] { ResolutionCandidate@7219 }
+ResolutionTaskHolder@7215 {
+    <name not found> = ArrayList@7216[1] { ResolutionCandidate@7217 }
+}
+
+ResolutionTaskHolder@7218 {
+    <name not found> = ArrayList@7219[1] { ResolutionCandidate@7220 }
 }
 
 ResolutionTaskHolder@7221 {
     <name not found> = ArrayList@7222[1] { ResolutionCandidate@7223 }
-    <name not found> = ArrayList@7224[1] { ResolutionCandidate@7223 }
 }
 
-ResolutionTaskHolder@7225 {
-    <name not found> = ArrayList@7226[1] { ResolutionCandidate@7227 }
-    <name not found> = ArrayList@7228[1] { ResolutionCandidate@7227 }
+ResolutionTaskHolder@7224 {
+    <name not found> = ArrayList@7225[1] { ResolutionCandidate@7226 }
 }
 
-ResolutionTaskHolder@7229 {
-    <name not found> = ArrayList@7230[1] { ResolutionCandidate@7231 }
-    <name not found> = ArrayList@7232[1] { ResolutionCandidate@7231 }
+ResolutionTaskHolder@7227 {
+    <name not found> = ArrayList@7228[1] { ResolutionCandidate@7229 }
+}
+
+ResolutionTaskHolder@7230 {
+    <name not found> = ArrayList@7231[1] { ResolutionCandidate@7232 }
 }
 
 ResolutionTaskHolder@7233 {
     <name not found> = ArrayList@7234[1] { ResolutionCandidate@7235 }
-    <name not found> = ArrayList@7236[1] { ResolutionCandidate@7235 }
 }
 
-ResolutionTaskHolder@7237 {
-    <name not found> = ArrayList@7238[1] { ResolutionCandidate@7239 }
-    <name not found> = ArrayList@7240[1] { ResolutionCandidate@7239 }
+ResolutionTaskHolder@7236 {
+    <name not found> = ArrayList@7237[1] { ResolutionCandidate@7238 }
 }
 
-ResolutionTaskHolder@7241 {
-    <name not found> = ArrayList@7242[1] { ResolutionCandidate@7243 }
-    <name not found> = ArrayList@7244[1] { ResolutionCandidate@7243 }
+ResolutionTaskHolder@7239 {
+    <name not found> = ArrayList@7240[1] { ResolutionCandidate@7241 }
+}
+
+ResolutionTaskHolder@7242 {
+    <name not found> = ArrayList@7243[1] { ResolutionCandidate@7244 }
 }
 
 ResolutionTaskHolder@7245 {
     <name not found> = ArrayList@7246[1] { ResolutionCandidate@7247 }
-    <name not found> = ArrayList@7248[1] { ResolutionCandidate@7247 }
 }
 
-ResolutionTaskHolder@7249 {
-    <name not found> = ArrayList@7250[1] { ResolutionCandidate@7251 }
-    <name not found> = ArrayList@7252[1] { ResolutionCandidate@7251 }
+ResolutionTaskHolder@7248 {
+    <name not found> = ArrayList@7249[1] { ResolutionCandidate@7250 }
 }
 
-ResolutionTaskHolder@7253 {
-    <name not found> = ArrayList@7254[1] { ResolutionCandidate@7255 }
-    <name not found> = ArrayList@7256[1] { ResolutionCandidate@7255 }
+ResolutionTaskHolder@7251 {
+    <name not found> = ArrayList@7252[1] { ResolutionCandidate@7253 }
+}
+
+ResolutionTaskHolder@7254 {
+    <name not found> = ArrayList@7255[1] { ResolutionCandidate@7256 }
 }
 
 ResolutionTaskHolder@7257 {
     <name not found> = ArrayList@7258[1] { ResolutionCandidate@7259 }
-    <name not found> = ArrayList@7260[1] { ResolutionCandidate@7259 }
 }
 
-ResolutionTaskHolder@7261 {
-    <name not found> = ArrayList@7262[1] { ResolutionCandidate@7263 }
-    <name not found> = ArrayList@7264[1] { ResolutionCandidate@7263 }
+ResolutionTaskHolder@7260 {
+    <name not found> = ArrayList@7261[1] { ResolutionCandidate@7262 }
 }
 
-ResolutionTaskHolder@7265 {
-    <name not found> = ArrayList@7266[1] { ResolutionCandidate@7267 }
-    <name not found> = ArrayList@7268[1] { ResolutionCandidate@7267 }
+ResolutionTaskHolder@7263 {
+    <name not found> = ArrayList@7264[1] { ResolutionCandidate@7265 }
+}
+
+ResolutionTaskHolder@7266 {
+    <name not found> = ArrayList@7267[1] { ResolutionCandidate@7268 }
 }
 
 ResolutionTaskHolder@7269 {
     <name not found> = ArrayList@7270[1] { ResolutionCandidate@7271 }
-    <name not found> = ArrayList@7272[1] { ResolutionCandidate@7271 }
 }
 
-ResolutionTaskHolder@7273 {
-    <name not found> = ArrayList@7274[1] { ResolutionCandidate@7275 }
-    <name not found> = ArrayList@7276[1] { ResolutionCandidate@7275 }
+ResolutionTaskHolder@7272 {
+    <name not found> = ArrayList@7273[1] { ResolutionCandidate@7274 }
 }
 
-ResolutionTaskHolder@7277 {
-    <name not found> = ArrayList@7278[1] { ResolutionCandidate@7279 }
-    <name not found> = ArrayList@7280[1] { ResolutionCandidate@7279 }
+ResolutionTaskHolder@7275 {
+    <name not found> = ArrayList@7276[1] { ResolutionCandidate@7277 }
+}
+
+ResolutionTaskHolder@7278 {
+    <name not found> = ArrayList@7279[1] { ResolutionCandidate@7280 }
 }
 
 ResolutionTaskHolder@7281 {
     <name not found> = ArrayList@7282[1] { ResolutionCandidate@7283 }
-    <name not found> = ArrayList@7284[1] { ResolutionCandidate@7283 }
 }
 
-ResolutionTaskHolder@7285 {
-    <name not found> = ArrayList@7286[1] { ResolutionCandidate@7287 }
-    <name not found> = ArrayList@7288[1] { ResolutionCandidate@7287 }
+ResolutionTaskHolder@7284 {
+    <name not found> = ArrayList@7285[1] { ResolutionCandidate@7286 }
 }
 
-ResolutionTaskHolder@7289 {
-    <name not found> = ArrayList@7290[1] { ResolutionCandidate@7291 }
-    <name not found> = ArrayList@7292[1] { ResolutionCandidate@7291 }
+ResolutionTaskHolder@7287 {
+    <name not found> = ArrayList@7288[1] { ResolutionCandidate@7289 }
+}
+
+ResolutionTaskHolder@7290 {
+    <name not found> = ArrayList@7291[1] { ResolutionCandidate@7292 }
 }
 
 ResolutionTaskHolder@7293 {
     <name not found> = ArrayList@7294[1] { ResolutionCandidate@7295 }
-    <name not found> = ArrayList@7296[1] { ResolutionCandidate@7295 }
 }
 
-ResolutionTaskHolder@7297 {
-    <name not found> = ArrayList@7298[1] { ResolutionCandidate@7299 }
-    <name not found> = ArrayList@7300[1] { ResolutionCandidate@7299 }
+ResolutionTaskHolder@7296 {
+    <name not found> = ArrayList@7297[1] { ResolutionCandidate@7298 }
 }
 
-ResolutionTaskHolder@7301 {
-    <name not found> = ArrayList@7302[1] { ResolutionCandidate@7303 }
-    <name not found> = ArrayList@7304[1] { ResolutionCandidate@7303 }
+ResolutionTaskHolder@7299 {
+    <name not found> = ArrayList@7300[1] { ResolutionCandidate@7301 }
+}
+
+ResolutionTaskHolder@7302 {
+    <name not found> = ArrayList@7303[1] { ResolutionCandidate@7304 }
 }
 
 ResolutionTaskHolder@7305 {
     <name not found> = ArrayList@7306[1] { ResolutionCandidate@7307 }
-    <name not found> = ArrayList@7308[1] { ResolutionCandidate@7307 }
 }
 
-ResolutionTaskHolder@7309 {
-    <name not found> = ArrayList@7310[1] { ResolutionCandidate@7311 }
-    <name not found> = ArrayList@7312[1] { ResolutionCandidate@7311 }
+ResolutionTaskHolder@7308 {
+    <name not found> = ArrayList@7309[1] { ResolutionCandidate@7310 }
 }
 
-ResolutionTaskHolder@7313 {
-    <name not found> = ArrayList@7314[1] { ResolutionCandidate@7315 }
-    <name not found> = ArrayList@7316[1] { ResolutionCandidate@7315 }
+ResolutionTaskHolder@7311 {
+    <name not found> = ArrayList@7312[1] { ResolutionCandidate@7313 }
+}
+
+ResolutionTaskHolder@7314 {
+    <name not found> = ArrayList@7315[1] { ResolutionCandidate@7316 }
 }
 
 ResolutionTaskHolder@7317 {
     <name not found> = ArrayList@7318[1] { ResolutionCandidate@7319 }
-    <name not found> = ArrayList@7320[1] { ResolutionCandidate@7319 }
 }
 
-ResolutionTaskHolder@7321 {
-    <name not found> = ArrayList@7322[1] { ResolutionCandidate@7323 }
-    <name not found> = ArrayList@7324[1] { ResolutionCandidate@7323 }
+ResolutionTaskHolder@7320 {
+    <name not found> = ArrayList@7321[1] { ResolutionCandidate@7322 }
 }
 
-ResolutionTaskHolder@7325 {
-    <name not found> = ArrayList@7326[1] { ResolutionCandidate@7327 }
-    <name not found> = ArrayList@7328[1] { ResolutionCandidate@7327 }
+ResolutionTaskHolder@7323 {
+    <name not found> = ArrayList@7324[1] { ResolutionCandidate@7325 }
+}
+
+ResolutionTaskHolder@7326 {
+    <name not found> = ArrayList@7327[1] { ResolutionCandidate@7328 }
 }
 
 ResolutionTaskHolder@7329 {
     <name not found> = ArrayList@7330[1] { ResolutionCandidate@7331 }
-    <name not found> = ArrayList@7332[1] { ResolutionCandidate@7331 }
 }
 
-ResolutionTaskHolder@7333 {
-    <name not found> = ArrayList@7334[1] { ResolutionCandidate@7335 }
-    <name not found> = ArrayList@7336[1] { ResolutionCandidate@7335 }
+ResolutionTaskHolder@7332 {
+    <name not found> = ArrayList@7333[1] { ResolutionCandidate@7334 }
 }
 
-ResolutionTaskHolder@7337 {
-    <name not found> = ArrayList@7338[1] { ResolutionCandidate@7339 }
-    <name not found> = ArrayList@7340[1] { ResolutionCandidate@7339 }
+ResolutionTaskHolder@7335 {
+    <name not found> = ArrayList@7336[1] { ResolutionCandidate@7337 }
+}
+
+ResolutionTaskHolder@7338 {
+    <name not found> = ArrayList@7339[1] { ResolutionCandidate@7340 }
 }
 
 ResolutionTaskHolder@7341 {
     <name not found> = ArrayList@7342[1] { ResolutionCandidate@7343 }
-    <name not found> = ArrayList@7344[1] { ResolutionCandidate@7343 }
 }
 
-ResolutionTaskHolder@7345 {
-    <name not found> = ArrayList@7346[1] { ResolutionCandidate@7347 }
-    <name not found> = ArrayList@7348[1] { ResolutionCandidate@7347 }
+ResolutionTaskHolder@7344 {
+    <name not found> = ArrayList@7345[1] { ResolutionCandidate@7346 }
 }
 
-ResolutionTaskHolder@7349 {
-    <name not found> = ArrayList@7350[1] { ResolutionCandidate@7351 }
-    <name not found> = ArrayList@7352[1] { ResolutionCandidate@7351 }
+ResolutionTaskHolder@7347 {
+    <name not found> = ArrayList@7348[1] { ResolutionCandidate@7349 }
+}
+
+ResolutionTaskHolder@7350 {
+    <name not found> = ArrayList@7351[1] { ResolutionCandidate@7352 }
 }
 
 ResolutionTaskHolder@7353 {
     <name not found> = ArrayList@7354[1] { ResolutionCandidate@7355 }
-    <name not found> = ArrayList@7356[1] { ResolutionCandidate@7355 }
 }
 
-ResolutionTaskHolder@7357 {
-    <name not found> = ArrayList@7358[1] { ResolutionCandidate@7359 }
-    <name not found> = ArrayList@7360[1] { ResolutionCandidate@7359 }
+ResolutionTaskHolder@7356 {
+    <name not found> = ArrayList@7357[1] { ResolutionCandidate@7358 }
 }
 
-ResolutionTaskHolder@7361 {
-    <name not found> = ArrayList@7362[1] { ResolutionCandidate@7363 }
-    <name not found> = ArrayList@7364[1] { ResolutionCandidate@7363 }
+ResolutionTaskHolder@7359 {
+    <name not found> = ArrayList@7360[1] { ResolutionCandidate@7361 }
+}
+
+ResolutionTaskHolder@7362 {
+    <name not found> = ArrayList@7363[1] { ResolutionCandidate@7364 }
 }
 
 ResolutionTaskHolder@7365 {
     <name not found> = ArrayList@7366[1] { ResolutionCandidate@7367 }
-    <name not found> = ArrayList@7368[1] { ResolutionCandidate@7367 }
 }
 
-ResolutionTaskHolder@7369 {
-    <name not found> = ArrayList@7370[1] { ResolutionCandidate@7371 }
-    <name not found> = ArrayList@7372[1] { ResolutionCandidate@7371 }
+ResolutionTaskHolder@7368 {
+    <name not found> = ArrayList@7369[1] { ResolutionCandidate@7370 }
 }
 
-ResolutionTaskHolder@7373 {
-    <name not found> = ArrayList@7374[1] { ResolutionCandidate@7375 }
-    <name not found> = ArrayList@7376[1] { ResolutionCandidate@7375 }
+ResolutionTaskHolder@7371 {
+    <name not found> = ArrayList@7372[1] { ResolutionCandidate@7373 }
+}
+
+ResolutionTaskHolder@7374 {
+    <name not found> = ArrayList@7375[1] { ResolutionCandidate@7376 }
 }
 
 ResolutionTaskHolder@7377 {
     <name not found> = ArrayList@7378[1] { ResolutionCandidate@7379 }
-    <name not found> = ArrayList@7380[1] { ResolutionCandidate@7379 }
 }
 
-ResolutionTaskHolder@7381 {
-    <name not found> = ArrayList@7382[1] { ResolutionCandidate@7383 }
-    <name not found> = ArrayList@7384[1] { ResolutionCandidate@7383 }
+ResolutionTaskHolder@7380 {
+    <name not found> = ArrayList@7381[1] { ResolutionCandidate@7382 }
 }
 
-ResolutionTaskHolder@7385 {
-    <name not found> = ArrayList@7386[1] { ResolutionCandidate@7387 }
-    <name not found> = ArrayList@7388[1] { ResolutionCandidate@7387 }
+ResolutionTaskHolder@7383 {
+    <name not found> = ArrayList@7384[1] { ResolutionCandidate@7385 }
+}
+
+ResolutionTaskHolder@7386 {
+    <name not found> = ArrayList@7387[1] { ResolutionCandidate@7388 }
 }
 
 ResolutionTaskHolder@7389 {
     <name not found> = ArrayList@7390[1] { ResolutionCandidate@7391 }
-    <name not found> = ArrayList@7392[1] { ResolutionCandidate@7391 }
 }
 
-ResolutionTaskHolder@7393 {
-    <name not found> = ArrayList@7394[1] { ResolutionCandidate@7395 }
-    <name not found> = ArrayList@7396[1] { ResolutionCandidate@7395 }
+ResolutionTaskHolder@7392 {
+    <name not found> = ArrayList@7393[1] { ResolutionCandidate@7394 }
 }
 
-ResolutionTaskHolder@7397 {
-    <name not found> = ArrayList@7398[1] { ResolutionCandidate@7399 }
-    <name not found> = ArrayList@7400[1] { ResolutionCandidate@7399 }
+ResolutionTaskHolder@7395 {
+    <name not found> = ArrayList@7396[1] { ResolutionCandidate@7397 }
+}
+
+ResolutionTaskHolder@7398 {
+    <name not found> = ArrayList@7399[1] { ResolutionCandidate@7400 }
 }
 
 ResolutionTaskHolder@7401 {
     <name not found> = ArrayList@7402[1] { ResolutionCandidate@7403 }
-    <name not found> = ArrayList@7404[1] { ResolutionCandidate@7403 }
 }
 
-ResolutionTaskHolder@7405 {
-    <name not found> = ArrayList@7406[1] { ResolutionCandidate@7407 }
-    <name not found> = ArrayList@7408[1] { ResolutionCandidate@7407 }
+ResolutionTaskHolder@7404 {
+    <name not found> = ArrayList@7405[1] { ResolutionCandidate@7406 }
 }
 
-ResolutionTaskHolder@7409 {
-    <name not found> = ArrayList@7410[1] { ResolutionCandidate@7411 }
-    <name not found> = ArrayList@7412[1] { ResolutionCandidate@7411 }
+ResolutionTaskHolder@7407 {
+    <name not found> = ArrayList@7408[1] { ResolutionCandidate@7409 }
+}
+
+ResolutionTaskHolder@7410 {
+    <name not found> = ArrayList@7411[1] { ResolutionCandidate@7412 }
 }
 
 ResolutionTaskHolder@7413 {
     <name not found> = ArrayList@7414[1] { ResolutionCandidate@7415 }
-    <name not found> = ArrayList@7416[1] { ResolutionCandidate@7415 }
 }
 
-ResolutionTaskHolder@7417 {
-    <name not found> = ArrayList@7418[1] { ResolutionCandidate@7419 }
-    <name not found> = ArrayList@7420[1] { ResolutionCandidate@7419 }
+ResolutionTaskHolder@7416 {
+    <name not found> = ArrayList@7417[1] { ResolutionCandidate@7418 }
 }
 
-ResolutionTaskHolder@7421 {
-    <name not found> = ArrayList@7422[1] { ResolutionCandidate@7423 }
-    <name not found> = ArrayList@7424[1] { ResolutionCandidate@7423 }
+ResolutionTaskHolder@7419 {
+    <name not found> = ArrayList@7420[1] { ResolutionCandidate@7421 }
+}
+
+ResolutionTaskHolder@7422 {
+    <name not found> = ArrayList@7423[1] { ResolutionCandidate@7424 }
 }
 
 ResolutionTaskHolder@7425 {
     <name not found> = ArrayList@7426[1] { ResolutionCandidate@7427 }
-    <name not found> = ArrayList@7428[1] { ResolutionCandidate@7427 }
 }
 
-ResolutionTaskHolder@7429 {
-    <name not found> = ArrayList@7430[1] { ResolutionCandidate@7431 }
-    <name not found> = ArrayList@7432[1] { ResolutionCandidate@7431 }
+ResolutionTaskHolder@7428 {
+    <name not found> = ArrayList@7429[1] { ResolutionCandidate@7430 }
 }
 
-ResolutionTaskHolder@7433 {
-    <name not found> = ArrayList@7434[1] { ResolutionCandidate@7435 }
-    <name not found> = ArrayList@7436[1] { ResolutionCandidate@7435 }
+ResolutionTaskHolder@7431 {
+    <name not found> = ArrayList@7432[1] { ResolutionCandidate@7433 }
+}
+
+ResolutionTaskHolder@7434 {
+    <name not found> = ArrayList@7435[1] { ResolutionCandidate@7436 }
 }
 
 ResolutionTaskHolder@7437 {
     <name not found> = ArrayList@7438[1] { ResolutionCandidate@7439 }
-    <name not found> = ArrayList@7440[1] { ResolutionCandidate@7439 }
 }
 
-ResolutionTaskHolder@7441 {
-    <name not found> = ArrayList@7442[1] { ResolutionCandidate@7443 }
-    <name not found> = ArrayList@7444[1] { ResolutionCandidate@7443 }
+ResolutionTaskHolder@7440 {
+    <name not found> = ArrayList@7441[1] { ResolutionCandidate@7442 }
 }
 
-ResolutionTaskHolder@7445 {
-    <name not found> = ArrayList@7446[1] { ResolutionCandidate@7447 }
-    <name not found> = ArrayList@7448[1] { ResolutionCandidate@7447 }
+ResolutionTaskHolder@7443 {
+    <name not found> = ArrayList@7444[1] { ResolutionCandidate@7445 }
+}
+
+ResolutionTaskHolder@7446 {
+    <name not found> = ArrayList@7447[1] { ResolutionCandidate@7448 }
 }
 
 ResolutionTaskHolder@7449 {
     <name not found> = ArrayList@7450[1] { ResolutionCandidate@7451 }
-    <name not found> = ArrayList@7452[1] { ResolutionCandidate@7451 }
 }
 
-ResolutionTaskHolder@7453 {
-    <name not found> = ArrayList@7454[1] { ResolutionCandidate@7455 }
-    <name not found> = ArrayList@7456[1] { ResolutionCandidate@7455 }
+ResolutionTaskHolder@7452 {
+    <name not found> = ArrayList@7453[1] { ResolutionCandidate@7454 }
 }
 
-ResolutionTaskHolder@7457 {
-    <name not found> = ArrayList@7458[1] { ResolutionCandidate@7459 }
-    <name not found> = ArrayList@7460[1] { ResolutionCandidate@7459 }
+ResolutionTaskHolder@7455 {
+    <name not found> = ArrayList@7456[1] { ResolutionCandidate@7457 }
+}
+
+ResolutionTaskHolder@7458 {
+    <name not found> = ArrayList@7459[1] { ResolutionCandidate@7460 }
 }
 
 ResolutionTaskHolder@7461 {
     <name not found> = ArrayList@7462[1] { ResolutionCandidate@7463 }
-    <name not found> = ArrayList@7464[1] { ResolutionCandidate@7463 }
 }
 
-ResolutionTaskHolder@7465 {
-    <name not found> = ArrayList@7466[1] { ResolutionCandidate@7467 }
-    <name not found> = ArrayList@7468[1] { ResolutionCandidate@7467 }
+ResolutionTaskHolder@7464 {
+    <name not found> = ArrayList@7465[1] { ResolutionCandidate@7466 }
 }
 
-ResolutionTaskHolder@7469 {
-    <name not found> = ArrayList@7470[1] { ResolutionCandidate@7471 }
-    <name not found> = ArrayList@7472[1] { ResolutionCandidate@7471 }
+ResolutionTaskHolder@7467 {
+    <name not found> = ArrayList@7468[1] { ResolutionCandidate@7469 }
+}
+
+ResolutionTaskHolder@7470 {
+    <name not found> = ArrayList@7471[1] { ResolutionCandidate@7472 }
 }
 
 ResolutionTaskHolder@7473 {
     <name not found> = ArrayList@7474[1] { ResolutionCandidate@7475 }
-    <name not found> = ArrayList@7476[1] { ResolutionCandidate@7475 }
 }
 
-ResolutionTaskHolder@7477 {
-    <name not found> = ArrayList@7478[1] { ResolutionCandidate@7479 }
-    <name not found> = ArrayList@7480[1] { ResolutionCandidate@7479 }
+ResolutionTaskHolder@7476 {
+    <name not found> = ArrayList@7477[1] { ResolutionCandidate@7478 }
 }
 
-ResolutionTaskHolder@7481 {
-    <name not found> = ArrayList@7482[1] { ResolutionCandidate@7483 }
-    <name not found> = ArrayList@7484[1] { ResolutionCandidate@7483 }
+ResolutionTaskHolder@7479 {
+    <name not found> = ArrayList@7480[1] { ResolutionCandidate@7481 }
+}
+
+ResolutionTaskHolder@7482 {
+    <name not found> = ArrayList@7483[1] { ResolutionCandidate@7484 }
 }
 
 ResolutionTaskHolder@7485 {
     <name not found> = ArrayList@7486[1] { ResolutionCandidate@7487 }
-    <name not found> = ArrayList@7488[1] { ResolutionCandidate@7487 }
 }
 
-ResolutionTaskHolder@7489 {
-    <name not found> = ArrayList@7490[1] { ResolutionCandidate@7491 }
-    <name not found> = ArrayList@7492[1] { ResolutionCandidate@7491 }
+ResolutionTaskHolder@7488 {
+    <name not found> = ArrayList@7489[1] { ResolutionCandidate@7490 }
 }
 
-ResolutionTaskHolder@7493 {
-    <name not found> = ArrayList@7494[1] { ResolutionCandidate@7495 }
-    <name not found> = ArrayList@7496[1] { ResolutionCandidate@7495 }
+ResolutionTaskHolder@7491 {
+    <name not found> = ArrayList@7492[1] { ResolutionCandidate@7493 }
+}
+
+ResolutionTaskHolder@7494 {
+    <name not found> = ArrayList@7495[1] { ResolutionCandidate@7496 }
 }
 
 ResolutionTaskHolder@7497 {
     <name not found> = ArrayList@7498[1] { ResolutionCandidate@7499 }
-    <name not found> = ArrayList@7500[1] { ResolutionCandidate@7499 }
 }
 
-ResolutionTaskHolder@7501 {
-    <name not found> = ArrayList@7502[1] { ResolutionCandidate@7503 }
-    <name not found> = ArrayList@7504[1] { ResolutionCandidate@7503 }
+ResolutionTaskHolder@7500 {
+    <name not found> = ArrayList@7501[1] { ResolutionCandidate@7502 }
 }
 
-ResolutionTaskHolder@7505 {
-    <name not found> = ArrayList@7506[1] { ResolutionCandidate@7507 }
-    <name not found> = ArrayList@7508[1] { ResolutionCandidate@7507 }
+ResolutionTaskHolder@7503 {
+    <name not found> = ArrayList@7504[1] { ResolutionCandidate@7505 }
+}
+
+ResolutionTaskHolder@7506 {
+    <name not found> = ArrayList@7507[1] { ResolutionCandidate@7508 }
 }
 
 ResolutionTaskHolder@7509 {
     <name not found> = ArrayList@7510[1] { ResolutionCandidate@7511 }
-    <name not found> = ArrayList@7512[1] { ResolutionCandidate@7511 }
 }
 
-ResolutionTaskHolder@7513 {
-    <name not found> = ArrayList@7514[1] { ResolutionCandidate@7515 }
-    <name not found> = ArrayList@7516[1] { ResolutionCandidate@7515 }
+ResolutionTaskHolder@7512 {
+    <name not found> = ArrayList@7513[1] { ResolutionCandidate@7514 }
 }
 
-ResolutionTaskHolder@7517 {
-    <name not found> = ArrayList@7518[1] { ResolutionCandidate@7519 }
-    <name not found> = ArrayList@7520[1] { ResolutionCandidate@7519 }
+ResolutionTaskHolder@7515 {
+    <name not found> = ArrayList@7516[1] { ResolutionCandidate@7517 }
+}
+
+ResolutionTaskHolder@7518 {
+    <name not found> = ArrayList@7519[1] { ResolutionCandidate@7520 }
 }
 
 ResolutionTaskHolder@7521 {
     <name not found> = ArrayList@7522[1] { ResolutionCandidate@7523 }
-    <name not found> = ArrayList@7524[1] { ResolutionCandidate@7523 }
 }
 
-ResolutionTaskHolder@7525 {
-    <name not found> = ArrayList@7526[1] { ResolutionCandidate@7527 }
-    <name not found> = ArrayList@7528[1] { ResolutionCandidate@7527 }
+ResolutionTaskHolder@7524 {
+    <name not found> = ArrayList@7525[1] { ResolutionCandidate@7526 }
 }
 
-ResolutionTaskHolder@7529 {
-    <name not found> = ArrayList@7530[1] { ResolutionCandidate@7531 }
-    <name not found> = ArrayList@7532[1] { ResolutionCandidate@7531 }
+ResolutionTaskHolder@7527 {
+    <name not found> = ArrayList@7528[1] { ResolutionCandidate@7529 }
+}
+
+ResolutionTaskHolder@7530 {
+    <name not found> = ArrayList@7531[1] { ResolutionCandidate@7532 }
 }
 
 ResolutionTaskHolder@7533 {
     <name not found> = ArrayList@7534[1] { ResolutionCandidate@7535 }
-    <name not found> = ArrayList@7536[1] { ResolutionCandidate@7535 }
 }
 
-ResolutionTaskHolder@7537 {
-    <name not found> = ArrayList@7538[1] { ResolutionCandidate@7539 }
-    <name not found> = ArrayList@7540[1] { ResolutionCandidate@7539 }
+ResolutionTaskHolder@7536 {
+    <name not found> = ArrayList@7537[1] { ResolutionCandidate@7538 }
 }
 
-ResolutionTaskHolder@7541 {
-    <name not found> = ArrayList@7542[1] { ResolutionCandidate@7543 }
-    <name not found> = ArrayList@7544[1] { ResolutionCandidate@7543 }
+ResolutionTaskHolder@7539 {
+    <name not found> = ArrayList@7540[1] { ResolutionCandidate@7541 }
+}
+
+ResolutionTaskHolder@7542 {
+    <name not found> = ArrayList@7543[1] { ResolutionCandidate@7544 }
 }
 
 ResolutionTaskHolder@7545 {
     <name not found> = ArrayList@7546[1] { ResolutionCandidate@7547 }
-    <name not found> = ArrayList@7548[1] { ResolutionCandidate@7547 }
 }
 
-ResolutionTaskHolder@7549 {
-    <name not found> = ArrayList@7550[1] { ResolutionCandidate@7551 }
-    <name not found> = ArrayList@7552[1] { ResolutionCandidate@7551 }
+ResolutionTaskHolder@7548 {
+    <name not found> = ArrayList@7549[1] { ResolutionCandidate@7550 }
 }
 
-ResolutionTaskHolder@7553 {
-    <name not found> = ArrayList@7554[1] { ResolutionCandidate@7555 }
-    <name not found> = ArrayList@7556[1] { ResolutionCandidate@7555 }
+ResolutionTaskHolder@7551 {
+    <name not found> = ArrayList@7552[1] { ResolutionCandidate@7553 }
+}
+
+ResolutionTaskHolder@7554 {
+    <name not found> = ArrayList@7555[1] { ResolutionCandidate@7556 }
 }
 
 ResolutionTaskHolder@7557 {
     <name not found> = ArrayList@7558[1] { ResolutionCandidate@7559 }
-    <name not found> = ArrayList@7560[1] { ResolutionCandidate@7559 }
 }
 
-ResolutionTaskHolder@7561 {
-    <name not found> = ArrayList@7562[1] { ResolutionCandidate@7563 }
-    <name not found> = ArrayList@7564[1] { ResolutionCandidate@7563 }
+ResolutionTaskHolder@7560 {
+    <name not found> = ArrayList@7561[1] { ResolutionCandidate@7562 }
 }
 
-ResolutionTaskHolder@7565 {
-    <name not found> = ArrayList@7566[1] { ResolutionCandidate@7567 }
-    <name not found> = ArrayList@7568[1] { ResolutionCandidate@7567 }
+ResolutionTaskHolder@7563 {
+    <name not found> = ArrayList@7564[1] { ResolutionCandidate@7565 }
+}
+
+ResolutionTaskHolder@7566 {
+    <name not found> = ArrayList@7567[1] { ResolutionCandidate@7568 }
 }
 
 ResolutionTaskHolder@7569 {
     <name not found> = ArrayList@7570[1] { ResolutionCandidate@7571 }
-    <name not found> = ArrayList@7572[1] { ResolutionCandidate@7571 }
 }
 
-ResolutionTaskHolder@7573 {
-    <name not found> = ArrayList@7574[1] { ResolutionCandidate@7575 }
-    <name not found> = ArrayList@7576[1] { ResolutionCandidate@7575 }
+ResolutionTaskHolder@7572 {
+    <name not found> = ArrayList@7573[1] { ResolutionCandidate@7574 }
 }
 
-ResolutionTaskHolder@7577 {
-    <name not found> = ArrayList@7578[1] { ResolutionCandidate@7579 }
-    <name not found> = ArrayList@7580[1] { ResolutionCandidate@7579 }
+ResolutionTaskHolder@7575 {
+    <name not found> = ArrayList@7576[1] { ResolutionCandidate@7577 }
+}
+
+ResolutionTaskHolder@7578 {
+    <name not found> = ArrayList@7579[1] { ResolutionCandidate@7580 }
 }
 
 ResolutionTaskHolder@7581 {
     <name not found> = ArrayList@7582[1] { ResolutionCandidate@7583 }
-    <name not found> = ArrayList@7584[1] { ResolutionCandidate@7583 }
 }
 
-ResolutionTaskHolder@7585 {
-    <name not found> = ArrayList@7586[1] { ResolutionCandidate@7587 }
-    <name not found> = ArrayList@7588[1] { ResolutionCandidate@7587 }
+ResolutionTaskHolder@7584 {
+    <name not found> = ArrayList@7585[1] { ResolutionCandidate@7586 }
 }
 
-ResolutionTaskHolder@7589 {
-    <name not found> = ArrayList@7590[1] { ResolutionCandidate@7591 }
-    <name not found> = ArrayList@7592[1] { ResolutionCandidate@7591 }
+ResolutionTaskHolder@7587 {
+    <name not found> = ArrayList@7588[1] { ResolutionCandidate@7589 }
+}
+
+ResolutionTaskHolder@7590 {
+    <name not found> = ArrayList@7591[1] { ResolutionCandidate@7592 }
 }
 
 ResolutionTaskHolder@7593 {
     <name not found> = ArrayList@7594[1] { ResolutionCandidate@7595 }
-    <name not found> = ArrayList@7596[1] { ResolutionCandidate@7595 }
 }
 
-ResolutionTaskHolder@7597 {
-    <name not found> = ArrayList@7598[1] { ResolutionCandidate@7599 }
-    <name not found> = ArrayList@7600[1] { ResolutionCandidate@7599 }
+ResolutionTaskHolder@7596 {
+    <name not found> = ArrayList@7597[1] { ResolutionCandidate@7598 }
 }
 
-ResolutionTaskHolder@7601 {
-    <name not found> = ArrayList@7602[1] { ResolutionCandidate@7603 }
-    <name not found> = ArrayList@7604[1] { ResolutionCandidate@7603 }
+ResolutionTaskHolder@7599 {
+    <name not found> = ArrayList@7600[1] { ResolutionCandidate@7601 }
+}
+
+ResolutionTaskHolder@7602 {
+    <name not found> = ArrayList@7603[1] { ResolutionCandidate@7604 }
 }
 
 ResolutionTaskHolder@7605 {
     <name not found> = ArrayList@7606[1] { ResolutionCandidate@7607 }
-    <name not found> = ArrayList@7608[1] { ResolutionCandidate@7607 }
 }
 
-ResolutionTaskHolder@7609 {
-    <name not found> = ArrayList@7610[1] { ResolutionCandidate@7611 }
-    <name not found> = ArrayList@7612[1] { ResolutionCandidate@7611 }
+ResolutionTaskHolder@7608 {
+    <name not found> = ArrayList@7609[1] { ResolutionCandidate@7610 }
 }
 
-ResolutionTaskHolder@7613 {
-    <name not found> = ArrayList@7614[1] { ResolutionCandidate@7615 }
-    <name not found> = ArrayList@7616[1] { ResolutionCandidate@7615 }
+ResolutionTaskHolder@7611 {
+    <name not found> = ArrayList@7612[1] { ResolutionCandidate@7613 }
+}
+
+ResolutionTaskHolder@7614 {
+    <name not found> = ArrayList@7615[1] { ResolutionCandidate@7616 }
 }
 
 ResolutionTaskHolder@7617 {
     <name not found> = ArrayList@7618[1] { ResolutionCandidate@7619 }
-    <name not found> = ArrayList@7620[1] { ResolutionCandidate@7619 }
 }
 
-ResolutionTaskHolder@7621 {
-    <name not found> = ArrayList@7622[1] { ResolutionCandidate@7623 }
-    <name not found> = ArrayList@7624[1] { ResolutionCandidate@7623 }
+ResolutionTaskHolder@7620 {
+    <name not found> = ArrayList@7621[1] { ResolutionCandidate@7622 }
 }
 
-ResolutionTaskHolder@7625 {
-    <name not found> = ArrayList@7626[1] { ResolutionCandidate@7627 }
-    <name not found> = ArrayList@7628[1] { ResolutionCandidate@7627 }
+ResolutionTaskHolder@7623 {
+    <name not found> = ArrayList@7624[1] { ResolutionCandidate@7625 }
+}
+
+ResolutionTaskHolder@7626 {
+    <name not found> = ArrayList@7627[1] { ResolutionCandidate@7628 }
 }
 
 ResolutionTaskHolder@7629 {
     <name not found> = ArrayList@7630[1] { ResolutionCandidate@7631 }
-    <name not found> = ArrayList@7632[1] { ResolutionCandidate@7631 }
 }
 
-ResolutionTaskHolder@7633 {
-    <name not found> = ArrayList@7634[1] { ResolutionCandidate@7635 }
-    <name not found> = ArrayList@7636[1] { ResolutionCandidate@7635 }
+ResolutionTaskHolder@7632 {
+    <name not found> = ArrayList@7633[1] { ResolutionCandidate@7634 }
 }
 
-ResolutionTaskHolder@7637 {
-    <name not found> = ArrayList@7638[1] { ResolutionCandidate@7639 }
-    <name not found> = ArrayList@7640[1] { ResolutionCandidate@7639 }
+ResolutionTaskHolder@7635 {
+    <name not found> = ArrayList@7636[1] { ResolutionCandidate@7637 }
+}
+
+ResolutionTaskHolder@7638 {
+    <name not found> = ArrayList@7639[1] { ResolutionCandidate@7640 }
 }
 
 ResolutionTaskHolder@7641 {
     <name not found> = ArrayList@7642[1] { ResolutionCandidate@7643 }
-    <name not found> = ArrayList@7644[1] { ResolutionCandidate@7643 }
 }
 
-ResolutionTaskHolder@7645 {
-    <name not found> = ArrayList@7646[1] { ResolutionCandidate@7647 }
-    <name not found> = ArrayList@7648[1] { ResolutionCandidate@7647 }
+ResolutionTaskHolder@7644 {
+    <name not found> = ArrayList@7645[1] { ResolutionCandidate@7646 }
 }
 
-ResolutionTaskHolder@7649 {
-    <name not found> = ArrayList@7650[1] { ResolutionCandidate@7651 }
-    <name not found> = ArrayList@7652[1] { ResolutionCandidate@7651 }
+ResolutionTaskHolder@7647 {
+    <name not found> = ArrayList@7648[1] { ResolutionCandidate@7649 }
+}
+
+ResolutionTaskHolder@7650 {
+    <name not found> = ArrayList@7651[1] { ResolutionCandidate@7652 }
 }
 
 ResolutionTaskHolder@7653 {
     <name not found> = ArrayList@7654[1] { ResolutionCandidate@7655 }
-    <name not found> = ArrayList@7656[1] { ResolutionCandidate@7655 }
 }
 
-ResolutionTaskHolder@7657 {
-    <name not found> = ArrayList@7658[1] { ResolutionCandidate@7659 }
-    <name not found> = ArrayList@7660[1] { ResolutionCandidate@7659 }
+ResolutionTaskHolder@7656 {
+    <name not found> = ArrayList@7657[1] { ResolutionCandidate@7658 }
 }
 
-ResolutionTaskHolder@7661 {
-    <name not found> = ArrayList@7662[1] { ResolutionCandidate@7663 }
-    <name not found> = ArrayList@7664[1] { ResolutionCandidate@7663 }
+ResolutionTaskHolder@7659 {
+    <name not found> = ArrayList@7660[1] { ResolutionCandidate@7661 }
+}
+
+ResolutionTaskHolder@7662 {
+    <name not found> = ArrayList@7663[1] { ResolutionCandidate@7664 }
 }
 
 ResolutionTaskHolder@7665 {
     <name not found> = ArrayList@7666[1] { ResolutionCandidate@7667 }
-    <name not found> = ArrayList@7668[1] { ResolutionCandidate@7667 }
 }
 
-ResolutionTaskHolder@7669 {
-    <name not found> = ArrayList@7670[1] { ResolutionCandidate@7671 }
-    <name not found> = ArrayList@7672[1] { ResolutionCandidate@7671 }
+ResolutionTaskHolder@7668 {
+    <name not found> = ArrayList@7669[1] { ResolutionCandidate@7670 }
 }
 
-ResolutionTaskHolder@7673 {
-    <name not found> = ArrayList@7674[1] { ResolutionCandidate@7675 }
-    <name not found> = ArrayList@7676[1] { ResolutionCandidate@7675 }
+ResolutionTaskHolder@7671 {
+    <name not found> = ArrayList@7672[1] { ResolutionCandidate@7673 }
+}
+
+ResolutionTaskHolder@7674 {
+    <name not found> = ArrayList@7675[1] { ResolutionCandidate@7676 }
 }
 
 ResolutionTaskHolder@7677 {
     <name not found> = ArrayList@7678[1] { ResolutionCandidate@7679 }
-    <name not found> = ArrayList@7680[1] { ResolutionCandidate@7679 }
 }
 
-ResolutionTaskHolder@7681 {
-    <name not found> = ArrayList@7682[1] { ResolutionCandidate@7683 }
-    <name not found> = ArrayList@7684[1] { ResolutionCandidate@7683 }
+ResolutionTaskHolder@7680 {
+    <name not found> = ArrayList@7681[1] { ResolutionCandidate@7682 }
 }
 
-ResolutionTaskHolder@7685 {
-    <name not found> = ArrayList@7686[1] { ResolutionCandidate@7687 }
-    <name not found> = ArrayList@7688[1] { ResolutionCandidate@7687 }
+ResolutionTaskHolder@7683 {
+    <name not found> = ArrayList@7684[1] { ResolutionCandidate@7685 }
+}
+
+ResolutionTaskHolder@7686 {
+    <name not found> = ArrayList@7687[1] { ResolutionCandidate@7688 }
 }
 
 ResolutionTaskHolder@7689 {
     <name not found> = ArrayList@7690[1] { ResolutionCandidate@7691 }
-    <name not found> = ArrayList@7692[1] { ResolutionCandidate@7691 }
 }
 
-ResolutionTaskHolder@7693 {
-    <name not found> = ArrayList@7694[1] { ResolutionCandidate@7695 }
-    <name not found> = ArrayList@7696[1] { ResolutionCandidate@7695 }
+ResolutionTaskHolder@7692 {
+    <name not found> = ArrayList@7693[1] { ResolutionCandidate@7694 }
 }
 
-ResolutionTaskHolder@7697 {
-    <name not found> = ArrayList@7698[1] { ResolutionCandidate@7699 }
-    <name not found> = ArrayList@7700[1] { ResolutionCandidate@7699 }
+ResolutionTaskHolder@7695 {
+    <name not found> = ArrayList@7696[1] { ResolutionCandidate@7697 }
+}
+
+ResolutionTaskHolder@7698 {
+    <name not found> = ArrayList@7699[1] { ResolutionCandidate@7700 }
 }
 
 ResolutionTaskHolder@7701 {
     <name not found> = ArrayList@7702[1] { ResolutionCandidate@7703 }
-    <name not found> = ArrayList@7704[1] { ResolutionCandidate@7703 }
 }
 
-ResolutionTaskHolder@7705 {
-    <name not found> = ArrayList@7706[1] { ResolutionCandidate@7707 }
-    <name not found> = ArrayList@7708[1] { ResolutionCandidate@7707 }
+ResolutionTaskHolder@7704 {
+    <name not found> = ArrayList@7705[1] { ResolutionCandidate@7706 }
 }
 
-ResolutionTaskHolder@7709 {
-    <name not found> = ArrayList@7710[1] { ResolutionCandidate@7711 }
-    <name not found> = ArrayList@7712[1] { ResolutionCandidate@7711 }
+ResolutionTaskHolder@7707 {
+    <name not found> = ArrayList@7708[1] { ResolutionCandidate@7709 }
+}
+
+ResolutionTaskHolder@7710 {
+    <name not found> = ArrayList@7711[1] { ResolutionCandidate@7712 }
 }
 
 ResolutionTaskHolder@7713 {
     <name not found> = ArrayList@7714[1] { ResolutionCandidate@7715 }
-    <name not found> = ArrayList@7716[1] { ResolutionCandidate@7715 }
 }
 
-ResolutionTaskHolder@7717 {
-    <name not found> = ArrayList@7718[1] { ResolutionCandidate@7719 }
-    <name not found> = ArrayList@7720[1] { ResolutionCandidate@7719 }
+ResolutionTaskHolder@7716 {
+    <name not found> = ArrayList@7717[1] { ResolutionCandidate@7718 }
 }
 
-ResolutionTaskHolder@7721 {
-    <name not found> = ArrayList@7722[1] { ResolutionCandidate@7723 }
-    <name not found> = ArrayList@7724[1] { ResolutionCandidate@7723 }
+ResolutionTaskHolder@7719 {
+    <name not found> = ArrayList@7720[1] { ResolutionCandidate@7721 }
+}
+
+ResolutionTaskHolder@7722 {
+    <name not found> = ArrayList@7723[1] { ResolutionCandidate@7724 }
 }
 
 ResolutionTaskHolder@7725 {
     <name not found> = ArrayList@7726[1] { ResolutionCandidate@7727 }
-    <name not found> = ArrayList@7728[1] { ResolutionCandidate@7727 }
 }
 
-ResolutionTaskHolder@7729 {
-    <name not found> = ArrayList@7730[1] { ResolutionCandidate@7731 }
-    <name not found> = ArrayList@7732[1] { ResolutionCandidate@7731 }
+ResolutionTaskHolder@7728 {
+    <name not found> = ArrayList@7729[1] { ResolutionCandidate@7730 }
 }
 
-ResolutionTaskHolder@7733 {
-    <name not found> = ArrayList@7734[1] { ResolutionCandidate@7735 }
-    <name not found> = ArrayList@7736[1] { ResolutionCandidate@7735 }
+ResolutionTaskHolder@7731 {
+    <name not found> = ArrayList@7732[6] { ResolutionCandidate@7733, ResolutionCandidate@7734, ResolutionCandidate@7735, ... }
 }
 
-ResolutionTaskHolder@7737 {
-    <name not found> = ArrayList@7738[1] { ResolutionCandidate@7739 }
-    <name not found> = ArrayList@7740[1] { ResolutionCandidate@7739 }
+ResolutionTaskHolder@7736 {
+    <name not found> = ArrayList@7737[6] { ResolutionCandidate@7738, ResolutionCandidate@7739, ResolutionCandidate@7740, ... }
 }
 
 ResolutionTaskHolder@7741 {
-    <name not found> = ArrayList@7742[1] { ResolutionCandidate@7743 }
-    <name not found> = ArrayList@7744[1] { ResolutionCandidate@7743 }
+    <name not found> = ArrayList@7742[6] { ResolutionCandidate@7743, ResolutionCandidate@7744, ResolutionCandidate@7745, ... }
 }
 
-ResolutionTaskHolder@7745 {
-    <name not found> = ArrayList@7746[1] { ResolutionCandidate@7747 }
-    <name not found> = ArrayList@7748[1] { ResolutionCandidate@7747 }
+ResolutionTaskHolder@7746 {
+    <name not found> = ArrayList@7747[6] { ResolutionCandidate@7748, ResolutionCandidate@7749, ResolutionCandidate@7750, ... }
 }
 
-ResolutionTaskHolder@7749 {
-    <name not found> = ArrayList@7750[1] { ResolutionCandidate@7751 }
-    <name not found> = ArrayList@7752[1] { ResolutionCandidate@7751 }
+ResolutionTaskHolder@7751 {
+    <name not found> = ArrayList@7752[6] { ResolutionCandidate@7753, ResolutionCandidate@7754, ResolutionCandidate@7755, ... }
 }
 
-ResolutionTaskHolder@7753 {
-    <name not found> = ArrayList@7754[1] { ResolutionCandidate@7755 }
-    <name not found> = ArrayList@7756[1] { ResolutionCandidate@7755 }
-}
-
-ResolutionTaskHolder@7757 {
-    <name not found> = ArrayList@7758[1] { ResolutionCandidate@7759 }
-    <name not found> = ArrayList@7760[1] { ResolutionCandidate@7759 }
+ResolutionTaskHolder@7756 {
+    <name not found> = ArrayList@7757[6] { ResolutionCandidate@7758, ResolutionCandidate@7759, ResolutionCandidate@7760, ... }
 }
 
 ResolutionTaskHolder@7761 {
-    <name not found> = ArrayList@7762[1] { ResolutionCandidate@7763 }
-    <name not found> = ArrayList@7764[1] { ResolutionCandidate@7763 }
+    <name not found> = ArrayList@7762[6] { ResolutionCandidate@7763, ResolutionCandidate@7764, ResolutionCandidate@7765, ... }
 }
 
-ResolutionTaskHolder@7765 {
-    <name not found> = ArrayList@7766[1] { ResolutionCandidate@7767 }
-    <name not found> = ArrayList@7768[1] { ResolutionCandidate@7767 }
+ResolutionTaskHolder@7766 {
+    <name not found> = ArrayList@7767[6] { ResolutionCandidate@7768, ResolutionCandidate@7769, ResolutionCandidate@7770, ... }
 }
 
-ResolutionTaskHolder@7769 {
-    <name not found> = ArrayList@7770[1] { ResolutionCandidate@7771 }
-    <name not found> = ArrayList@7772[1] { ResolutionCandidate@7771 }
+ResolutionTaskHolder@7771 {
+    <name not found> = ArrayList@7772[6] { ResolutionCandidate@7773, ResolutionCandidate@7774, ResolutionCandidate@7775, ... }
 }
 
-ResolutionTaskHolder@7773 {
-    <name not found> = ArrayList@7774[1] { ResolutionCandidate@7775 }
-    <name not found> = ArrayList@7776[1] { ResolutionCandidate@7775 }
-}
-
-ResolutionTaskHolder@7777 {
-    <name not found> = ArrayList@7778[1] { ResolutionCandidate@7779 }
-    <name not found> = ArrayList@7780[1] { ResolutionCandidate@7779 }
+ResolutionTaskHolder@7776 {
+    <name not found> = ArrayList@7777[6] { ResolutionCandidate@7778, ResolutionCandidate@7779, ResolutionCandidate@7780, ... }
 }
 
 ResolutionTaskHolder@7781 {
-    <name not found> = ArrayList@7782[1] { ResolutionCandidate@7783 }
-    <name not found> = ArrayList@7784[1] { ResolutionCandidate@7783 }
+    <name not found> = ArrayList@7782[6] { ResolutionCandidate@7783, ResolutionCandidate@7784, ResolutionCandidate@7785, ... }
 }
 
-ResolutionTaskHolder@7785 {
-    <name not found> = ArrayList@7786[1] { ResolutionCandidate@7787 }
-    <name not found> = ArrayList@7788[1] { ResolutionCandidate@7787 }
+ResolutionTaskHolder@7786 {
+    <name not found> = ArrayList@7787[6] { ResolutionCandidate@7788, ResolutionCandidate@7789, ResolutionCandidate@7790, ... }
 }
 
-ResolutionTaskHolder@7789 {
-    <name not found> = ArrayList@7790[1] { ResolutionCandidate@7791 }
-    <name not found> = ArrayList@7792[1] { ResolutionCandidate@7791 }
+ResolutionTaskHolder@7791 {
+    <name not found> = ArrayList@7792[6] { ResolutionCandidate@7793, ResolutionCandidate@7794, ResolutionCandidate@7795, ... }
 }
 
-ResolutionTaskHolder@7793 {
-    <name not found> = ArrayList@7794[1] { ResolutionCandidate@7795 }
-    <name not found> = ArrayList@7796[1] { ResolutionCandidate@7795 }
-}
-
-ResolutionTaskHolder@7797 {
-    <name not found> = ArrayList@7798[1] { ResolutionCandidate@7799 }
-    <name not found> = ArrayList@7800[1] { ResolutionCandidate@7799 }
+ResolutionTaskHolder@7796 {
+    <name not found> = ArrayList@7797[6] { ResolutionCandidate@7798, ResolutionCandidate@7799, ResolutionCandidate@7800, ... }
 }
 
 ResolutionTaskHolder@7801 {
-    <name not found> = ArrayList@7802[1] { ResolutionCandidate@7803 }
-    <name not found> = ArrayList@7804[1] { ResolutionCandidate@7803 }
+    <name not found> = ArrayList@7802[6] { ResolutionCandidate@7803, ResolutionCandidate@7804, ResolutionCandidate@7805, ... }
 }
 
-ResolutionTaskHolder@7805 {
-    <name not found> = ArrayList@7806[1] { ResolutionCandidate@7807 }
-    <name not found> = ArrayList@7808[1] { ResolutionCandidate@7807 }
+ResolutionTaskHolder@7806 {
+    <name not found> = ArrayList@7807[6] { ResolutionCandidate@7808, ResolutionCandidate@7809, ResolutionCandidate@7810, ... }
 }
 
-ResolutionTaskHolder@7809 {
-    <name not found> = ArrayList@7810[1] { ResolutionCandidate@7811 }
-    <name not found> = ArrayList@7812[1] { ResolutionCandidate@7811 }
+ResolutionTaskHolder@7811 {
+    <name not found> = ArrayList@7812[6] { ResolutionCandidate@7813, ResolutionCandidate@7814, ResolutionCandidate@7815, ... }
 }
 
-ResolutionTaskHolder@7813 {
-    <name not found> = ArrayList@7814[1] { ResolutionCandidate@7815 }
-    <name not found> = ArrayList@7816[1] { ResolutionCandidate@7815 }
-}
-
-ResolutionTaskHolder@7817 {
-    <name not found> = ArrayList@7818[1] { ResolutionCandidate@7819 }
-    <name not found> = ArrayList@7820[1] { ResolutionCandidate@7819 }
+ResolutionTaskHolder@7816 {
+    <name not found> = ArrayList@7817[6] { ResolutionCandidate@7818, ResolutionCandidate@7819, ResolutionCandidate@7820, ... }
 }
 
 ResolutionTaskHolder@7821 {
-    <name not found> = ArrayList@7822[1] { ResolutionCandidate@7823 }
-    <name not found> = ArrayList@7824[1] { ResolutionCandidate@7823 }
+    <name not found> = ArrayList@7822[6] { ResolutionCandidate@7823, ResolutionCandidate@7824, ResolutionCandidate@7825, ... }
 }
 
-ResolutionTaskHolder@7825 {
-    <name not found> = ArrayList@7826[1] { ResolutionCandidate@7827 }
-    <name not found> = ArrayList@7828[1] { ResolutionCandidate@7827 }
+ResolutionTaskHolder@7826 {
+    <name not found> = ArrayList@7827[6] { ResolutionCandidate@7828, ResolutionCandidate@7829, ResolutionCandidate@7830, ... }
 }
 
-ResolutionTaskHolder@7829 {
-    <name not found> = ArrayList@7830[1] { ResolutionCandidate@7831 }
-    <name not found> = ArrayList@7832[1] { ResolutionCandidate@7831 }
+ResolutionTaskHolder@7831 {
+    <name not found> = ArrayList@7832[6] { ResolutionCandidate@7833, ResolutionCandidate@7834, ResolutionCandidate@7835, ... }
 }
 
-ResolutionTaskHolder@7833 {
-    <name not found> = ArrayList@7834[1] { ResolutionCandidate@7835 }
-    <name not found> = ArrayList@7836[1] { ResolutionCandidate@7835 }
-}
-
-ResolutionTaskHolder@7837 {
-    <name not found> = ArrayList@7838[1] { ResolutionCandidate@7839 }
-    <name not found> = ArrayList@7840[1] { ResolutionCandidate@7839 }
+ResolutionTaskHolder@7836 {
+    <name not found> = ArrayList@7837[6] { ResolutionCandidate@7838, ResolutionCandidate@7839, ResolutionCandidate@7840, ... }
 }
 
 ResolutionTaskHolder@7841 {
-    <name not found> = ArrayList@7842[1] { ResolutionCandidate@7843 }
-    <name not found> = ArrayList@7844[1] { ResolutionCandidate@7843 }
+    <name not found> = ArrayList@7842[6] { ResolutionCandidate@7843, ResolutionCandidate@7844, ResolutionCandidate@7845, ... }
 }
 
-ResolutionTaskHolder@7845 {
-    <name not found> = ArrayList@7846[1] { ResolutionCandidate@7847 }
-    <name not found> = ArrayList@7848[1] { ResolutionCandidate@7847 }
+ResolutionTaskHolder@7846 {
+    <name not found> = ArrayList@7847[6] { ResolutionCandidate@7848, ResolutionCandidate@7849, ResolutionCandidate@7850, ... }
 }
 
-ResolutionTaskHolder@7849 {
-    <name not found> = ArrayList@7850[1] { ResolutionCandidate@7851 }
-    <name not found> = ArrayList@7852[1] { ResolutionCandidate@7851 }
+ResolutionTaskHolder@7851 {
+    <name not found> = ArrayList@7852[7] { ResolutionCandidate@7853, ResolutionCandidate@7854, ResolutionCandidate@7855, ... }
 }
 
-ResolutionTaskHolder@7853 {
-    <name not found> = ArrayList@7854[1] { ResolutionCandidate@7855 }
-    <name not found> = ArrayList@7856[1] { ResolutionCandidate@7855 }
-}
-
-ResolutionTaskHolder@7857 {
-    <name not found> = ArrayList@7858[1] { ResolutionCandidate@7859 }
-    <name not found> = ArrayList@7860[1] { ResolutionCandidate@7859 }
+ResolutionTaskHolder@7856 {
+    <name not found> = ArrayList@7857[7] { ResolutionCandidate@7858, ResolutionCandidate@7859, ResolutionCandidate@7860, ... }
 }
 
 ResolutionTaskHolder@7861 {
-    <name not found> = ArrayList@7862[1] { ResolutionCandidate@7863 }
-    <name not found> = ArrayList@7864[1] { ResolutionCandidate@7863 }
+    <name not found> = ArrayList@7862[7] { ResolutionCandidate@7863, ResolutionCandidate@7864, ResolutionCandidate@7865, ... }
 }
 
-ResolutionTaskHolder@7865 {
-    <name not found> = ArrayList@7866[1] { ResolutionCandidate@7867 }
-    <name not found> = ArrayList@7868[1] { ResolutionCandidate@7867 }
+ResolutionTaskHolder@7866 {
+    <name not found> = ArrayList@7867[7] { ResolutionCandidate@7868, ResolutionCandidate@7869, ResolutionCandidate@7870, ... }
 }
 
-ResolutionTaskHolder@7869 {
-    <name not found> = ArrayList@7870[1] { ResolutionCandidate@7871 }
-    <name not found> = ArrayList@7872[1] { ResolutionCandidate@7871 }
+ResolutionTaskHolder@7871 {
+    <name not found> = ArrayList@7872[7] { ResolutionCandidate@7873, ResolutionCandidate@7874, ResolutionCandidate@7875, ... }
 }
 
-ResolutionTaskHolder@7873 {
-    <name not found> = ArrayList@7874[1] { ResolutionCandidate@7875 }
-    <name not found> = ArrayList@7876[1] { ResolutionCandidate@7875 }
-}
-
-ResolutionTaskHolder@7877 {
-    <name not found> = ArrayList@7878[1] { ResolutionCandidate@7879 }
-    <name not found> = ArrayList@7880[1] { ResolutionCandidate@7879 }
+ResolutionTaskHolder@7876 {
+    <name not found> = ArrayList@7877[7] { ResolutionCandidate@7878, ResolutionCandidate@7879, ResolutionCandidate@7880, ... }
 }
 
 ResolutionTaskHolder@7881 {
-    <name not found> = ArrayList@7882[1] { ResolutionCandidate@7883 }
-    <name not found> = ArrayList@7884[1] { ResolutionCandidate@7883 }
+    <name not found> = ArrayList@7882[7] { ResolutionCandidate@7883, ResolutionCandidate@7884, ResolutionCandidate@7885, ... }
 }
 
-ResolutionTaskHolder@7885 {
-    <name not found> = ArrayList@7886[1] { ResolutionCandidate@7887 }
-    <name not found> = ArrayList@7888[1] { ResolutionCandidate@7887 }
+ResolutionTaskHolder@7886 {
+    <name not found> = ArrayList@7887[7] { ResolutionCandidate@7888, ResolutionCandidate@7889, ResolutionCandidate@7890, ... }
 }
 
-ResolutionTaskHolder@7889 {
-    <name not found> = ArrayList@7890[1] { ResolutionCandidate@7891 }
-    <name not found> = ArrayList@7892[1] { ResolutionCandidate@7891 }
+ResolutionTaskHolder@7891 {
+    <name not found> = ArrayList@7892[7] { ResolutionCandidate@7893, ResolutionCandidate@7894, ResolutionCandidate@7895, ... }
 }
 
-ResolutionTaskHolder@7893 {
-    <name not found> = ArrayList@7894[1] { ResolutionCandidate@7895 }
-    <name not found> = ArrayList@7896[1] { ResolutionCandidate@7895 }
-}
-
-ResolutionTaskHolder@7897 {
-    <name not found> = ArrayList@7898[1] { ResolutionCandidate@7899 }
-    <name not found> = ArrayList@7900[1] { ResolutionCandidate@7899 }
+ResolutionTaskHolder@7896 {
+    <name not found> = ArrayList@7897[7] { ResolutionCandidate@7898, ResolutionCandidate@7899, ResolutionCandidate@7900, ... }
 }
 
 ResolutionTaskHolder@7901 {
-    <name not found> = ArrayList@7902[1] { ResolutionCandidate@7903 }
-    <name not found> = ArrayList@7904[1] { ResolutionCandidate@7903 }
+    <name not found> = ArrayList@7902[7] { ResolutionCandidate@7903, ResolutionCandidate@7904, ResolutionCandidate@7905, ... }
 }
 
-ResolutionTaskHolder@7905 {
-    <name not found> = ArrayList@7906[1] { ResolutionCandidate@7907 }
-    <name not found> = ArrayList@7908[1] { ResolutionCandidate@7907 }
+ResolutionTaskHolder@7906 {
+    <name not found> = ArrayList@7907[7] { ResolutionCandidate@7908, ResolutionCandidate@7909, ResolutionCandidate@7910, ... }
 }
 
-ResolutionTaskHolder@7909 {
-    <name not found> = ArrayList@7910[1] { ResolutionCandidate@7911 }
-    <name not found> = ArrayList@7912[1] { ResolutionCandidate@7911 }
+ResolutionTaskHolder@7911 {
+    <name not found> = ArrayList@7912[7] { ResolutionCandidate@7913, ResolutionCandidate@7914, ResolutionCandidate@7915, ... }
 }
 
-ResolutionTaskHolder@7913 {
-    <name not found> = ArrayList@7914[1] { ResolutionCandidate@7915 }
-    <name not found> = ArrayList@7916[1] { ResolutionCandidate@7915 }
-}
-
-ResolutionTaskHolder@7917 {
-    <name not found> = ArrayList@7918[1] { ResolutionCandidate@7919 }
-    <name not found> = ArrayList@7920[1] { ResolutionCandidate@7919 }
+ResolutionTaskHolder@7916 {
+    <name not found> = ArrayList@7917[7] { ResolutionCandidate@7918, ResolutionCandidate@7919, ResolutionCandidate@7920, ... }
 }
 
 ResolutionTaskHolder@7921 {
-    <name not found> = ArrayList@7922[1] { ResolutionCandidate@7923 }
-    <name not found> = ArrayList@7924[1] { ResolutionCandidate@7923 }
+    <name not found> = ArrayList@7922[7] { ResolutionCandidate@7923, ResolutionCandidate@7924, ResolutionCandidate@7925, ... }
 }
 
-ResolutionTaskHolder@7925 {
-    <name not found> = ArrayList@7926[1] { ResolutionCandidate@7927 }
-    <name not found> = ArrayList@7928[1] { ResolutionCandidate@7927 }
+ResolutionTaskHolder@7926 {
+    <name not found> = ArrayList@7927[7] { ResolutionCandidate@7928, ResolutionCandidate@7929, ResolutionCandidate@7930, ... }
 }
 
-ResolutionTaskHolder@7929 {
-    <name not found> = ArrayList@7930[1] { ResolutionCandidate@7931 }
-    <name not found> = ArrayList@7932[1] { ResolutionCandidate@7931 }
+ResolutionTaskHolder@7931 {
+    <name not found> = ArrayList@7932[7] { ResolutionCandidate@7933, ResolutionCandidate@7934, ResolutionCandidate@7935, ... }
 }
 
-ResolutionTaskHolder@7933 {
-    <name not found> = ArrayList@7934[1] { ResolutionCandidate@7935 }
-    <name not found> = ArrayList@7936[1] { ResolutionCandidate@7935 }
-}
-
-ResolutionTaskHolder@7937 {
-    <name not found> = ArrayList@7938[1] { ResolutionCandidate@7939 }
-    <name not found> = ArrayList@7940[1] { ResolutionCandidate@7939 }
+ResolutionTaskHolder@7936 {
+    <name not found> = ArrayList@7937[7] { ResolutionCandidate@7938, ResolutionCandidate@7939, ResolutionCandidate@7940, ... }
 }
 
 ResolutionTaskHolder@7941 {
-    <name not found> = ArrayList@7942[1] { ResolutionCandidate@7943 }
-    <name not found> = ArrayList@7944[1] { ResolutionCandidate@7943 }
+    <name not found> = ArrayList@7942[7] { ResolutionCandidate@7943, ResolutionCandidate@7944, ResolutionCandidate@7945, ... }
 }
 
-ResolutionTaskHolder@7945 {
-    <name not found> = ArrayList@7946[1] { ResolutionCandidate@7947 }
-    <name not found> = ArrayList@7948[1] { ResolutionCandidate@7947 }
+ResolutionTaskHolder@7946 {
+    <name not found> = ArrayList@7947[7] { ResolutionCandidate@7948, ResolutionCandidate@7949, ResolutionCandidate@7950, ... }
 }
 
-ResolutionTaskHolder@7949 {
-    <name not found> = ArrayList@7950[1] { ResolutionCandidate@7951 }
-    <name not found> = ArrayList@7952[1] { ResolutionCandidate@7951 }
+ResolutionTaskHolder@7951 {
+    <name not found> = ArrayList@7952[7] { ResolutionCandidate@7953, ResolutionCandidate@7954, ResolutionCandidate@7955, ... }
 }
 
-ResolutionTaskHolder@7953 {
-    <name not found> = ArrayList@7954[1] { ResolutionCandidate@7955 }
-    <name not found> = ArrayList@7956[1] { ResolutionCandidate@7955 }
-}
-
-ResolutionTaskHolder@7957 {
-    <name not found> = ArrayList@7958[1] { ResolutionCandidate@7959 }
-    <name not found> = ArrayList@7960[1] { ResolutionCandidate@7959 }
+ResolutionTaskHolder@7956 {
+    <name not found> = ArrayList@7957[7] { ResolutionCandidate@7958, ResolutionCandidate@7959, ResolutionCandidate@7960, ... }
 }
 
 ResolutionTaskHolder@7961 {
-    <name not found> = ArrayList@7962[1] { ResolutionCandidate@7963 }
-    <name not found> = ArrayList@7964[1] { ResolutionCandidate@7963 }
+    <name not found> = ArrayList@7962[7] { ResolutionCandidate@7963, ResolutionCandidate@7964, ResolutionCandidate@7965, ... }
 }
 
-ResolutionTaskHolder@7965 {
-    <name not found> = ArrayList@7966[1] { ResolutionCandidate@7967 }
-    <name not found> = ArrayList@7968[1] { ResolutionCandidate@7967 }
+ResolutionTaskHolder@7966 {
+    <name not found> = ArrayList@7967[7] { ResolutionCandidate@7968, ResolutionCandidate@7969, ResolutionCandidate@7970, ... }
 }
 
-ResolutionTaskHolder@7969 {
-    <name not found> = ArrayList@7970[1] { ResolutionCandidate@7971 }
-    <name not found> = ArrayList@7972[1] { ResolutionCandidate@7971 }
+ResolutionTaskHolder@7971 {
+    <name not found> = ArrayList@7972[7] { ResolutionCandidate@7973, ResolutionCandidate@7974, ResolutionCandidate@7975, ... }
 }
 
-ResolutionTaskHolder@7973 {
-    <name not found> = ArrayList@7974[1] { ResolutionCandidate@7975 }
-    <name not found> = ArrayList@7976[1] { ResolutionCandidate@7975 }
-}
-
-ResolutionTaskHolder@7977 {
-    <name not found> = ArrayList@7978[1] { ResolutionCandidate@7979 }
-    <name not found> = ArrayList@7980[1] { ResolutionCandidate@7979 }
+ResolutionTaskHolder@7976 {
+    <name not found> = ArrayList@7977[7] { ResolutionCandidate@7978, ResolutionCandidate@7979, ResolutionCandidate@7980, ... }
 }
 
 ResolutionTaskHolder@7981 {
-    <name not found> = ArrayList@7982[1] { ResolutionCandidate@7983 }
-    <name not found> = ArrayList@7984[1] { ResolutionCandidate@7983 }
+    <name not found> = ArrayList@7982[7] { ResolutionCandidate@7983, ResolutionCandidate@7984, ResolutionCandidate@7985, ... }
 }
 
-ResolutionTaskHolder@7985 {
-    <name not found> = ArrayList@7986[1] { ResolutionCandidate@7987 }
-    <name not found> = ArrayList@7988[1] { ResolutionCandidate@7987 }
+ResolutionTaskHolder@7986 {
+    <name not found> = ArrayList@7987[7] { ResolutionCandidate@7988, ResolutionCandidate@7989, ResolutionCandidate@7990, ... }
 }
 
-ResolutionTaskHolder@7989 {
-    <name not found> = ArrayList@7990[1] { ResolutionCandidate@7991 }
-    <name not found> = ArrayList@7992[1] { ResolutionCandidate@7991 }
+ResolutionTaskHolder@7991 {
+    <name not found> = ArrayList@7992[7] { ResolutionCandidate@7993, ResolutionCandidate@7994, ResolutionCandidate@7995, ... }
 }
 
-ResolutionTaskHolder@7993 {
-    <name not found> = ArrayList@7994[1] { ResolutionCandidate@7995 }
-    <name not found> = ArrayList@7996[1] { ResolutionCandidate@7995 }
-}
-
-ResolutionTaskHolder@7997 {
-    <name not found> = ArrayList@7998[1] { ResolutionCandidate@7999 }
-    <name not found> = ArrayList@8000[1] { ResolutionCandidate@7999 }
+ResolutionTaskHolder@7996 {
+    <name not found> = ArrayList@7997[7] { ResolutionCandidate@7998, ResolutionCandidate@7999, ResolutionCandidate@8000, ... }
 }
 
 ResolutionTaskHolder@8001 {
-    <name not found> = ArrayList@8002[1] { ResolutionCandidate@8003 }
-    <name not found> = ArrayList@8004[1] { ResolutionCandidate@8003 }
+    <name not found> = ArrayList@8002[7] { ResolutionCandidate@8003, ResolutionCandidate@8004, ResolutionCandidate@8005, ... }
 }
 
-ResolutionTaskHolder@8005 {
-    <name not found> = ArrayList@8006[1] { ResolutionCandidate@8007 }
-    <name not found> = ArrayList@8008[1] { ResolutionCandidate@8007 }
+ResolutionTaskHolder@8006 {
+    <name not found> = ArrayList@8007[7] { ResolutionCandidate@8008, ResolutionCandidate@8009, ResolutionCandidate@8010, ... }
 }
 
-ResolutionTaskHolder@8009 {
-    <name not found> = ArrayList@8010[1] { ResolutionCandidate@8011 }
-    <name not found> = ArrayList@8012[1] { ResolutionCandidate@8011 }
+ResolutionTaskHolder@8011 {
+    <name not found> = ArrayList@8012[7] { ResolutionCandidate@8013, ResolutionCandidate@8014, ResolutionCandidate@8015, ... }
 }
 
-ResolutionTaskHolder@8013 {
-    <name not found> = ArrayList@8014[1] { ResolutionCandidate@8015 }
-    <name not found> = ArrayList@8016[1] { ResolutionCandidate@8015 }
-}
-
-ResolutionTaskHolder@8017 {
-    <name not found> = ArrayList@8018[1] { ResolutionCandidate@8019 }
-    <name not found> = ArrayList@8020[1] { ResolutionCandidate@8019 }
+ResolutionTaskHolder@8016 {
+    <name not found> = ArrayList@8017[7] { ResolutionCandidate@8018, ResolutionCandidate@8019, ResolutionCandidate@8020, ... }
 }
 
 ResolutionTaskHolder@8021 {
-    <name not found> = ArrayList@8022[1] { ResolutionCandidate@8023 }
-    <name not found> = ArrayList@8024[1] { ResolutionCandidate@8023 }
+    <name not found> = ArrayList@8022[7] { ResolutionCandidate@8023, ResolutionCandidate@8024, ResolutionCandidate@8025, ... }
 }
 
-ResolutionTaskHolder@8025 {
-    <name not found> = ArrayList@8026[1] { ResolutionCandidate@8027 }
-    <name not found> = ArrayList@8028[1] { ResolutionCandidate@8027 }
+ResolutionTaskHolder@8026 {
+    <name not found> = ArrayList@8027[7] { ResolutionCandidate@8028, ResolutionCandidate@8029, ResolutionCandidate@8030, ... }
 }
 
-ResolutionTaskHolder@8029 {
-    <name not found> = ArrayList@8030[1] { ResolutionCandidate@8031 }
-    <name not found> = ArrayList@8032[1] { ResolutionCandidate@8031 }
+ResolutionTaskHolder@8031 {
+    <name not found> = ArrayList@8032[7] { ResolutionCandidate@8033, ResolutionCandidate@8034, ResolutionCandidate@8035, ... }
 }
 
-ResolutionTaskHolder@8033 {
-    <name not found> = ArrayList@8034[1] { ResolutionCandidate@8035 }
-    <name not found> = ArrayList@8036[1] { ResolutionCandidate@8035 }
-}
-
-ResolutionTaskHolder@8037 {
-    <name not found> = ArrayList@8038[1] { ResolutionCandidate@8039 }
-    <name not found> = ArrayList@8040[1] { ResolutionCandidate@8039 }
+ResolutionTaskHolder@8036 {
+    <name not found> = ArrayList@8037[7] { ResolutionCandidate@8038, ResolutionCandidate@8039, ResolutionCandidate@8040, ... }
 }
 
 ResolutionTaskHolder@8041 {
-    <name not found> = ArrayList@8042[1] { ResolutionCandidate@8043 }
-    <name not found> = ArrayList@8044[1] { ResolutionCandidate@8043 }
+    <name not found> = ArrayList@8042[7] { ResolutionCandidate@8043, ResolutionCandidate@8044, ResolutionCandidate@8045, ... }
 }
 
-ResolutionTaskHolder@8045 {
-    <name not found> = ArrayList@8046[1] { ResolutionCandidate@8047 }
-    <name not found> = ArrayList@8048[1] { ResolutionCandidate@8047 }
+ResolutionTaskHolder@8046 {
+    <name not found> = ArrayList@8047[7] { ResolutionCandidate@8048, ResolutionCandidate@8049, ResolutionCandidate@8050, ... }
 }
 
-ResolutionTaskHolder@8049 {
-    <name not found> = ArrayList@8050[1] { ResolutionCandidate@8051 }
-    <name not found> = ArrayList@8052[1] { ResolutionCandidate@8051 }
+ResolutionTaskHolder@8051 {
+    <name not found> = ArrayList@8052[7] { ResolutionCandidate@8053, ResolutionCandidate@8054, ResolutionCandidate@8055, ... }
 }
 
-ResolutionTaskHolder@8053 {
-    <name not found> = ArrayList@8054[1] { ResolutionCandidate@8055 }
-    <name not found> = ArrayList@8056[1] { ResolutionCandidate@8055 }
-}
-
-ResolutionTaskHolder@8057 {
-    <name not found> = ArrayList@8058[1] { ResolutionCandidate@8059 }
-    <name not found> = ArrayList@8060[1] { ResolutionCandidate@8059 }
+ResolutionTaskHolder@8056 {
+    <name not found> = ArrayList@8057[7] { ResolutionCandidate@8058, ResolutionCandidate@8059, ResolutionCandidate@8060, ... }
 }
 
 ResolutionTaskHolder@8061 {
-    <name not found> = ArrayList@8062[1] { ResolutionCandidate@8063 }
-    <name not found> = ArrayList@8064[1] { ResolutionCandidate@8063 }
+    <name not found> = ArrayList@8062[7] { ResolutionCandidate@8063, ResolutionCandidate@8064, ResolutionCandidate@8065, ... }
 }
 
-ResolutionTaskHolder@8065 {
-    <name not found> = ArrayList@8066[1] { ResolutionCandidate@8067 }
-    <name not found> = ArrayList@8068[1] { ResolutionCandidate@8067 }
+ResolutionTaskHolder@8066 {
+    <name not found> = ArrayList@8067[7] { ResolutionCandidate@8068, ResolutionCandidate@8069, ResolutionCandidate@8070, ... }
 }
 
-ResolutionTaskHolder@8069 {
-    <name not found> = ArrayList@8070[1] { ResolutionCandidate@8071 }
-    <name not found> = ArrayList@8072[1] { ResolutionCandidate@8071 }
+ResolutionTaskHolder@8071 {
+    <name not found> = ArrayList@8072[7] { ResolutionCandidate@8073, ResolutionCandidate@8074, ResolutionCandidate@8075, ... }
 }
 
-ResolutionTaskHolder@8073 {
-    <name not found> = ArrayList@8074[1] { ResolutionCandidate@8075 }
-    <name not found> = ArrayList@8076[1] { ResolutionCandidate@8075 }
-}
-
-ResolutionTaskHolder@8077 {
-    <name not found> = ArrayList@8078[1] { ResolutionCandidate@8079 }
-    <name not found> = ArrayList@8080[1] { ResolutionCandidate@8079 }
+ResolutionTaskHolder@8076 {
+    <name not found> = ArrayList@8077[7] { ResolutionCandidate@8078, ResolutionCandidate@8079, ResolutionCandidate@8080, ... }
 }
 
 ResolutionTaskHolder@8081 {
-    <name not found> = ArrayList@8082[1] { ResolutionCandidate@8083 }
-    <name not found> = ArrayList@8084[1] { ResolutionCandidate@8083 }
+    <name not found> = ArrayList@8082[7] { ResolutionCandidate@8083, ResolutionCandidate@8084, ResolutionCandidate@8085, ... }
 }
 
-ResolutionTaskHolder@8085 {
-    <name not found> = ArrayList@8086[1] { ResolutionCandidate@8087 }
-    <name not found> = ArrayList@8088[1] { ResolutionCandidate@8087 }
+ResolutionTaskHolder@8086 {
+    <name not found> = ArrayList@8087[7] { ResolutionCandidate@8088, ResolutionCandidate@8089, ResolutionCandidate@8090, ... }
 }
 
-ResolutionTaskHolder@8089 {
-    <name not found> = ArrayList@8090[1] { ResolutionCandidate@8091 }
-    <name not found> = ArrayList@8092[1] { ResolutionCandidate@8091 }
+ResolutionTaskHolder@8091 {
+    <name not found> = ArrayList@8092[7] { ResolutionCandidate@8093, ResolutionCandidate@8094, ResolutionCandidate@8095, ... }
 }
 
-ResolutionTaskHolder@8093 {
-    <name not found> = ArrayList@8094[1] { ResolutionCandidate@8095 }
-    <name not found> = ArrayList@8096[1] { ResolutionCandidate@8095 }
-}
-
-ResolutionTaskHolder@8097 {
-    <name not found> = ArrayList@8098[1] { ResolutionCandidate@8099 }
-    <name not found> = ArrayList@8100[1] { ResolutionCandidate@8099 }
+ResolutionTaskHolder@8096 {
+    <name not found> = ArrayList@8097[7] { ResolutionCandidate@8098, ResolutionCandidate@8099, ResolutionCandidate@8100, ... }
 }
 
 ResolutionTaskHolder@8101 {
-    <name not found> = ArrayList@8102[1] { ResolutionCandidate@8103 }
-    <name not found> = ArrayList@8104[1] { ResolutionCandidate@8103 }
+    <name not found> = ArrayList@8102[7] { ResolutionCandidate@8103, ResolutionCandidate@8104, ResolutionCandidate@8105, ... }
 }
 
-ResolutionTaskHolder@8105 {
-    <name not found> = ArrayList@8106[1] { ResolutionCandidate@8107 }
-    <name not found> = ArrayList@8108[1] { ResolutionCandidate@8107 }
+ResolutionTaskHolder@8106 {
+    <name not found> = ArrayList@8107[7] { ResolutionCandidate@8108, ResolutionCandidate@8109, ResolutionCandidate@8110, ... }
 }
 
-ResolutionTaskHolder@8109 {
-    <name not found> = ArrayList@8110[1] { ResolutionCandidate@8111 }
-    <name not found> = ArrayList@8112[1] { ResolutionCandidate@8111 }
+ResolutionTaskHolder@8111 {
+    <name not found> = ArrayList@8112[7] { ResolutionCandidate@8113, ResolutionCandidate@8114, ResolutionCandidate@8115, ... }
 }
 
-ResolutionTaskHolder@8113 {
-    <name not found> = ArrayList@8114[1] { ResolutionCandidate@8115 }
-    <name not found> = ArrayList@8116[1] { ResolutionCandidate@8115 }
-}
-
-ResolutionTaskHolder@8117 {
-    <name not found> = ArrayList@8118[1] { ResolutionCandidate@8119 }
-    <name not found> = ArrayList@8120[1] { ResolutionCandidate@8119 }
+ResolutionTaskHolder@8116 {
+    <name not found> = ArrayList@8117[7] { ResolutionCandidate@8118, ResolutionCandidate@8119, ResolutionCandidate@8120, ... }
 }
 
 ResolutionTaskHolder@8121 {
-    <name not found> = ArrayList@8122[1] { ResolutionCandidate@8123 }
-    <name not found> = ArrayList@8124[1] { ResolutionCandidate@8123 }
+    <name not found> = ArrayList@8122[7] { ResolutionCandidate@8123, ResolutionCandidate@8124, ResolutionCandidate@8125, ... }
 }
 
-ResolutionTaskHolder@8125 {
-    <name not found> = ArrayList@8126[1] { ResolutionCandidate@8127 }
-    <name not found> = ArrayList@8128[1] { ResolutionCandidate@8127 }
+ResolutionTaskHolder@8126 {
+    <name not found> = ArrayList@8127[7] { ResolutionCandidate@8128, ResolutionCandidate@8129, ResolutionCandidate@8130, ... }
 }
 
-ResolutionTaskHolder@8129 {
-    <name not found> = ArrayList@8130[1] { ResolutionCandidate@8131 }
-    <name not found> = ArrayList@8132[1] { ResolutionCandidate@8131 }
+ResolutionTaskHolder@8131 {
+    <name not found> = ArrayList@8132[7] { ResolutionCandidate@8133, ResolutionCandidate@8134, ResolutionCandidate@8135, ... }
 }
 
-ResolutionTaskHolder@8133 {
-    <name not found> = ArrayList@8134[1] { ResolutionCandidate@8135 }
-    <name not found> = ArrayList@8136[1] { ResolutionCandidate@8135 }
-}
-
-ResolutionTaskHolder@8137 {
-    <name not found> = ArrayList@8138[1] { ResolutionCandidate@8139 }
-    <name not found> = ArrayList@8140[1] { ResolutionCandidate@8139 }
+ResolutionTaskHolder@8136 {
+    <name not found> = ArrayList@8137[7] { ResolutionCandidate@8138, ResolutionCandidate@8139, ResolutionCandidate@8140, ... }
 }
 
 ResolutionTaskHolder@8141 {
-    <name not found> = ArrayList@8142[1] { ResolutionCandidate@8143 }
-    <name not found> = ArrayList@8144[1] { ResolutionCandidate@8143 }
+    <name not found> = ArrayList@8142[7] { ResolutionCandidate@8143, ResolutionCandidate@8144, ResolutionCandidate@8145, ... }
 }
 
-ResolutionTaskHolder@8145 {
-    <name not found> = ArrayList@8146[1] { ResolutionCandidate@8147 }
-    <name not found> = ArrayList@8148[1] { ResolutionCandidate@8147 }
+ResolutionTaskHolder@8146 {
+    <name not found> = ArrayList@8147[7] { ResolutionCandidate@8148, ResolutionCandidate@8149, ResolutionCandidate@8150, ... }
 }
 
-ResolutionTaskHolder@8149 {
-    <name not found> = ArrayList@8150[1] { ResolutionCandidate@8151 }
-    <name not found> = ArrayList@8152[1] { ResolutionCandidate@8151 }
+ResolutionTaskHolder@8151 {
+    <name not found> = ArrayList@8152[7] { ResolutionCandidate@8153, ResolutionCandidate@8154, ResolutionCandidate@8155, ... }
 }
 
-ResolutionTaskHolder@8153 {
-    <name not found> = ArrayList@8154[1] { ResolutionCandidate@8155 }
-    <name not found> = ArrayList@8156[1] { ResolutionCandidate@8155 }
-}
-
-ResolutionTaskHolder@8157 {
-    <name not found> = ArrayList@8158[1] { ResolutionCandidate@8159 }
-    <name not found> = ArrayList@8160[1] { ResolutionCandidate@8159 }
+ResolutionTaskHolder@8156 {
+    <name not found> = ArrayList@8157[7] { ResolutionCandidate@8158, ResolutionCandidate@8159, ResolutionCandidate@8160, ... }
 }
 
 ResolutionTaskHolder@8161 {
-    <name not found> = ArrayList@8162[1] { ResolutionCandidate@8163 }
-    <name not found> = ArrayList@8164[1] { ResolutionCandidate@8163 }
+    <name not found> = ArrayList@8162[7] { ResolutionCandidate@8163, ResolutionCandidate@8164, ResolutionCandidate@8165, ... }
 }
 
-ResolutionTaskHolder@8165 {
-    <name not found> = ArrayList@8166[1] { ResolutionCandidate@8167 }
-    <name not found> = ArrayList@8168[1] { ResolutionCandidate@8167 }
+ResolutionTaskHolder@8166 {
+    <name not found> = ArrayList@8167[7] { ResolutionCandidate@8168, ResolutionCandidate@8169, ResolutionCandidate@8170, ... }
 }
 
-ResolutionTaskHolder@8169 {
-    <name not found> = ArrayList@8170[1] { ResolutionCandidate@8171 }
-    <name not found> = ArrayList@8172[1] { ResolutionCandidate@8171 }
+ResolutionTaskHolder@8171 {
+    <name not found> = ArrayList@8172[7] { ResolutionCandidate@8173, ResolutionCandidate@8174, ResolutionCandidate@8175, ... }
 }
 
-ResolutionTaskHolder@8173 {
-    <name not found> = ArrayList@8174[1] { ResolutionCandidate@8175 }
-    <name not found> = ArrayList@8176[1] { ResolutionCandidate@8175 }
-}
-
-ResolutionTaskHolder@8177 {
-    <name not found> = ArrayList@8178[1] { ResolutionCandidate@8179 }
-    <name not found> = ArrayList@8180[1] { ResolutionCandidate@8179 }
+ResolutionTaskHolder@8176 {
+    <name not found> = ArrayList@8177[7] { ResolutionCandidate@8178, ResolutionCandidate@8179, ResolutionCandidate@8180, ... }
 }
 
 ResolutionTaskHolder@8181 {
-    <name not found> = ArrayList@8182[1] { ResolutionCandidate@8183 }
-    <name not found> = ArrayList@8184[1] { ResolutionCandidate@8183 }
+    <name not found> = ArrayList@8182[7] { ResolutionCandidate@8183, ResolutionCandidate@8184, ResolutionCandidate@8185, ... }
 }
 
-ResolutionTaskHolder@8185 {
-    <name not found> = ArrayList@8186[1] { ResolutionCandidate@8187 }
-    <name not found> = ArrayList@8188[1] { ResolutionCandidate@8187 }
+ResolutionTaskHolder@8186 {
+    <name not found> = ArrayList@8187[7] { ResolutionCandidate@8188, ResolutionCandidate@8189, ResolutionCandidate@8190, ... }
 }
 
-ResolutionTaskHolder@8189 {
-    <name not found> = ArrayList@8190[1] { ResolutionCandidate@8191 }
-    <name not found> = ArrayList@8192[1] { ResolutionCandidate@8191 }
+ResolutionTaskHolder@8191 {
+    <name not found> = ArrayList@8192[7] { ResolutionCandidate@8193, ResolutionCandidate@8194, ResolutionCandidate@8195, ... }
 }
 
-ResolutionTaskHolder@8193 {
-    <name not found> = ArrayList@8194[1] { ResolutionCandidate@8195 }
-    <name not found> = ArrayList@8196[1] { ResolutionCandidate@8195 }
-}
-
-ResolutionTaskHolder@8197 {
-    <name not found> = ArrayList@8198[1] { ResolutionCandidate@8199 }
-    <name not found> = ArrayList@8200[1] { ResolutionCandidate@8199 }
+ResolutionTaskHolder@8196 {
+    <name not found> = ArrayList@8197[7] { ResolutionCandidate@8198, ResolutionCandidate@8199, ResolutionCandidate@8200, ... }
 }
 
 ResolutionTaskHolder@8201 {
-    <name not found> = ArrayList@8202[1] { ResolutionCandidate@8203 }
-    <name not found> = ArrayList@8204[1] { ResolutionCandidate@8203 }
+    <name not found> = ArrayList@8202[7] { ResolutionCandidate@8203, ResolutionCandidate@8204, ResolutionCandidate@8205, ... }
 }
 
-ResolutionTaskHolder@8205 {
-    <name not found> = ArrayList@8206[1] { ResolutionCandidate@8207 }
-    <name not found> = ArrayList@8208[1] { ResolutionCandidate@8207 }
+ResolutionTaskHolder@8206 {
+    <name not found> = ArrayList@8207[7] { ResolutionCandidate@8208, ResolutionCandidate@8209, ResolutionCandidate@8210, ... }
 }
 
-ResolutionTaskHolder@8209 {
-    <name not found> = ArrayList@8210[1] { ResolutionCandidate@8211 }
-    <name not found> = ArrayList@8212[1] { ResolutionCandidate@8211 }
+ResolutionTaskHolder@8211 {
+    <name not found> = ArrayList@8212[7] { ResolutionCandidate@8213, ResolutionCandidate@8214, ResolutionCandidate@8215, ... }
 }
 
-ResolutionTaskHolder@8213 {
-    <name not found> = ArrayList@8214[1] { ResolutionCandidate@8215 }
-    <name not found> = ArrayList@8216[1] { ResolutionCandidate@8215 }
-}
-
-ResolutionTaskHolder@8217 {
-    <name not found> = ArrayList@8218[1] { ResolutionCandidate@8219 }
-    <name not found> = ArrayList@8220[1] { ResolutionCandidate@8219 }
+ResolutionTaskHolder@8216 {
+    <name not found> = ArrayList@8217[7] { ResolutionCandidate@8218, ResolutionCandidate@8219, ResolutionCandidate@8220, ... }
 }
 
 ResolutionTaskHolder@8221 {
-    <name not found> = ArrayList@8222[1] { ResolutionCandidate@8223 }
-    <name not found> = ArrayList@8224[1] { ResolutionCandidate@8223 }
+    <name not found> = ArrayList@8222[7] { ResolutionCandidate@8223, ResolutionCandidate@8224, ResolutionCandidate@8225, ... }
 }
 
-ResolutionTaskHolder@8225 {
-    <name not found> = ArrayList@8226[1] { ResolutionCandidate@8227 }
-    <name not found> = ArrayList@8228[1] { ResolutionCandidate@8227 }
+ResolutionTaskHolder@8226 {
+    <name not found> = ArrayList@8227[7] { ResolutionCandidate@8228, ResolutionCandidate@8229, ResolutionCandidate@8230, ... }
 }
 
-ResolutionTaskHolder@8229 {
-    <name not found> = ArrayList@8230[1] { ResolutionCandidate@8231 }
-    <name not found> = ArrayList@8232[1] { ResolutionCandidate@8231 }
+ResolutionTaskHolder@8231 {
+    <name not found> = ArrayList@8232[7] { ResolutionCandidate@8233, ResolutionCandidate@8234, ResolutionCandidate@8235, ... }
 }
 
-ResolutionTaskHolder@8233 {
-    <name not found> = ArrayList@8234[1] { ResolutionCandidate@8235 }
-    <name not found> = ArrayList@8236[1] { ResolutionCandidate@8235 }
-}
-
-ResolutionTaskHolder@8237 {
-    <name not found> = ArrayList@8238[1] { ResolutionCandidate@8239 }
-    <name not found> = ArrayList@8240[1] { ResolutionCandidate@8239 }
+ResolutionTaskHolder@8236 {
+    <name not found> = ArrayList@8237[7] { ResolutionCandidate@8238, ResolutionCandidate@8239, ResolutionCandidate@8240, ... }
 }
 
 ResolutionTaskHolder@8241 {
-    <name not found> = ArrayList@8242[1] { ResolutionCandidate@8243 }
-    <name not found> = ArrayList@8244[1] { ResolutionCandidate@8243 }
+    <name not found> = ArrayList@8242[7] { ResolutionCandidate@8243, ResolutionCandidate@8244, ResolutionCandidate@8245, ... }
 }
 
-ResolutionTaskHolder@8245 {
-    <name not found> = ArrayList@8246[1] { ResolutionCandidate@8247 }
-    <name not found> = ArrayList@8248[1] { ResolutionCandidate@8247 }
+ResolutionTaskHolder@8246 {
+    <name not found> = ArrayList@8247[7] { ResolutionCandidate@8248, ResolutionCandidate@8249, ResolutionCandidate@8250, ... }
 }
 
-ResolutionTaskHolder@8249 {
-    <name not found> = ArrayList@8250[1] { ResolutionCandidate@8251 }
-    <name not found> = ArrayList@8252[1] { ResolutionCandidate@8251 }
+ResolutionTaskHolder@8251 {
+    <name not found> = ArrayList@8252[7] { ResolutionCandidate@8253, ResolutionCandidate@8254, ResolutionCandidate@8255, ... }
 }
 
-ResolutionTaskHolder@8253 {
-    <name not found> = ArrayList@8254[1] { ResolutionCandidate@8255 }
-    <name not found> = ArrayList@8256[1] { ResolutionCandidate@8255 }
-}
-
-ResolutionTaskHolder@8257 {
-    <name not found> = ArrayList@8258[1] { ResolutionCandidate@8259 }
-    <name not found> = ArrayList@8260[1] { ResolutionCandidate@8259 }
+ResolutionTaskHolder@8256 {
+    <name not found> = ArrayList@8257[7] { ResolutionCandidate@8258, ResolutionCandidate@8259, ResolutionCandidate@8260, ... }
 }
 
 ResolutionTaskHolder@8261 {
-    <name not found> = ArrayList@8262[1] { ResolutionCandidate@8263 }
-    <name not found> = ArrayList@8264[1] { ResolutionCandidate@8263 }
+    <name not found> = ArrayList@8262[7] { ResolutionCandidate@8263, ResolutionCandidate@8264, ResolutionCandidate@8265, ... }
 }
 
-ResolutionTaskHolder@8265 {
-    <name not found> = ArrayList@8266[1] { ResolutionCandidate@8267 }
-    <name not found> = ArrayList@8268[1] { ResolutionCandidate@8267 }
+ResolutionTaskHolder@8266 {
+    <name not found> = ArrayList@8267[7] { ResolutionCandidate@8268, ResolutionCandidate@8269, ResolutionCandidate@8270, ... }
 }
 
-ResolutionTaskHolder@8269 {
-    <name not found> = ArrayList@8270[1] { ResolutionCandidate@8271 }
-    <name not found> = ArrayList@8272[1] { ResolutionCandidate@8271 }
+ResolutionTaskHolder@8271 {
+    <name not found> = ArrayList@8272[7] { ResolutionCandidate@8273, ResolutionCandidate@8274, ResolutionCandidate@8275, ... }
 }
 
-ResolutionTaskHolder@8273 {
-    <name not found> = ArrayList@8274[1] { ResolutionCandidate@8275 }
-    <name not found> = ArrayList@8276[1] { ResolutionCandidate@8275 }
-}
-
-ResolutionTaskHolder@8277 {
-    <name not found> = ArrayList@8278[1] { ResolutionCandidate@8279 }
-    <name not found> = ArrayList@8280[1] { ResolutionCandidate@8279 }
+ResolutionTaskHolder@8276 {
+    <name not found> = ArrayList@8277[7] { ResolutionCandidate@8278, ResolutionCandidate@8279, ResolutionCandidate@8280, ... }
 }
 
 ResolutionTaskHolder@8281 {
-    <name not found> = ArrayList@8282[1] { ResolutionCandidate@8283 }
-    <name not found> = ArrayList@8284[1] { ResolutionCandidate@8283 }
+    <name not found> = ArrayList@8282[7] { ResolutionCandidate@8283, ResolutionCandidate@8284, ResolutionCandidate@8285, ... }
 }
 
-ResolutionTaskHolder@8285 {
-    <name not found> = ArrayList@8286[1] { ResolutionCandidate@8287 }
-    <name not found> = ArrayList@8288[1] { ResolutionCandidate@8287 }
+ResolutionTaskHolder@8286 {
+    <name not found> = ArrayList@8287[7] { ResolutionCandidate@8288, ResolutionCandidate@8289, ResolutionCandidate@8290, ... }
 }
 
-ResolutionTaskHolder@8289 {
-    <name not found> = ArrayList@8290[1] { ResolutionCandidate@8291 }
-    <name not found> = ArrayList@8292[1] { ResolutionCandidate@8291 }
+ResolutionTaskHolder@8291 {
+    <name not found> = ArrayList@8292[7] { ResolutionCandidate@8293, ResolutionCandidate@8294, ResolutionCandidate@8295, ... }
 }
 
-ResolutionTaskHolder@8293 {
-    <name not found> = ArrayList@8294[1] { ResolutionCandidate@8295 }
-    <name not found> = ArrayList@8296[1] { ResolutionCandidate@8295 }
-}
-
-ResolutionTaskHolder@8297 {
-    <name not found> = ArrayList@8298[1] { ResolutionCandidate@8299 }
-    <name not found> = ArrayList@8300[1] { ResolutionCandidate@8299 }
+ResolutionTaskHolder@8296 {
+    <name not found> = ArrayList@8297[7] { ResolutionCandidate@8298, ResolutionCandidate@8299, ResolutionCandidate@8300, ... }
 }
 
 ResolutionTaskHolder@8301 {
-    <name not found> = ArrayList@8302[1] { ResolutionCandidate@8303 }
-    <name not found> = ArrayList@8304[1] { ResolutionCandidate@8303 }
+    <name not found> = ArrayList@8302[7] { ResolutionCandidate@8303, ResolutionCandidate@8304, ResolutionCandidate@8305, ... }
 }
 
-ResolutionTaskHolder@8305 {
-    <name not found> = ArrayList@8306[1] { ResolutionCandidate@8307 }
-    <name not found> = ArrayList@8308[1] { ResolutionCandidate@8307 }
+ResolutionTaskHolder@8306 {
+    <name not found> = ArrayList@8307[7] { ResolutionCandidate@8308, ResolutionCandidate@8309, ResolutionCandidate@8310, ... }
 }
 
-ResolutionTaskHolder@8309 {
-    <name not found> = ArrayList@8310[1] { ResolutionCandidate@8311 }
-    <name not found> = ArrayList@8312[1] { ResolutionCandidate@8311 }
+ResolutionTaskHolder@8311 {
+    <name not found> = ArrayList@8312[7] { ResolutionCandidate@8313, ResolutionCandidate@8314, ResolutionCandidate@8315, ... }
 }
 
-ResolutionTaskHolder@8313 {
-    <name not found> = ArrayList@8314[1] { ResolutionCandidate@8315 }
-    <name not found> = ArrayList@8316[1] { ResolutionCandidate@8315 }
-}
-
-ResolutionTaskHolder@8317 {
-    <name not found> = ArrayList@8318[1] { ResolutionCandidate@8319 }
-    <name not found> = ArrayList@8320[1] { ResolutionCandidate@8319 }
+ResolutionTaskHolder@8316 {
+    <name not found> = ArrayList@8317[7] { ResolutionCandidate@8318, ResolutionCandidate@8319, ResolutionCandidate@8320, ... }
 }
 
 ResolutionTaskHolder@8321 {
-    <name not found> = ArrayList@8322[1] { ResolutionCandidate@8323 }
-    <name not found> = ArrayList@8324[1] { ResolutionCandidate@8323 }
+    <name not found> = ArrayList@8322[7] { ResolutionCandidate@8323, ResolutionCandidate@8324, ResolutionCandidate@8325, ... }
 }
 
-ResolutionTaskHolder@8325 {
-    <name not found> = ArrayList@8326[1] { ResolutionCandidate@8327 }
-    <name not found> = ArrayList@8328[1] { ResolutionCandidate@8327 }
+ResolutionTaskHolder@8326 {
+    <name not found> = ArrayList@8327[7] { ResolutionCandidate@8328, ResolutionCandidate@8329, ResolutionCandidate@8330, ... }
 }
 
-ResolutionTaskHolder@8329 {
-    <name not found> = ArrayList@8330[1] { ResolutionCandidate@8331 }
-    <name not found> = ArrayList@8332[1] { ResolutionCandidate@8331 }
+ResolutionTaskHolder@8331 {
+    <name not found> = ArrayList@8332[7] { ResolutionCandidate@8333, ResolutionCandidate@8334, ResolutionCandidate@8335, ... }
 }
 
-ResolutionTaskHolder@8333 {
-    <name not found> = ArrayList@8334[1] { ResolutionCandidate@8335 }
-    <name not found> = ArrayList@8336[1] { ResolutionCandidate@8335 }
-}
-
-ResolutionTaskHolder@8337 {
-    <name not found> = ArrayList@8338[1] { ResolutionCandidate@8339 }
-    <name not found> = ArrayList@8340[1] { ResolutionCandidate@8339 }
+ResolutionTaskHolder@8336 {
+    <name not found> = ArrayList@8337[7] { ResolutionCandidate@8338, ResolutionCandidate@8339, ResolutionCandidate@8340, ... }
 }
 
 ResolutionTaskHolder@8341 {
-    <name not found> = ArrayList@8342[1] { ResolutionCandidate@8343 }
-    <name not found> = ArrayList@8344[1] { ResolutionCandidate@8343 }
+    <name not found> = ArrayList@8342[7] { ResolutionCandidate@8343, ResolutionCandidate@8344, ResolutionCandidate@8345, ... }
 }
 
-ResolutionTaskHolder@8345 {
-    <name not found> = ArrayList@8346[1] { ResolutionCandidate@8347 }
-    <name not found> = ArrayList@8348[1] { ResolutionCandidate@8347 }
+ResolutionTaskHolder@8346 {
+    <name not found> = ArrayList@8347[7] { ResolutionCandidate@8348, ResolutionCandidate@8349, ResolutionCandidate@8350, ... }
 }
 
-ResolutionTaskHolder@8349 {
-    <name not found> = ArrayList@8350[1] { ResolutionCandidate@8351 }
-    <name not found> = ArrayList@8352[1] { ResolutionCandidate@8351 }
+ResolutionTaskHolder@8351 {
+    <name not found> = ArrayList@8352[7] { ResolutionCandidate@8353, ResolutionCandidate@8354, ResolutionCandidate@8355, ... }
 }
 
-ResolutionTaskHolder@8353 {
-    <name not found> = ArrayList@8354[1] { ResolutionCandidate@8355 }
-    <name not found> = ArrayList@8356[1] { ResolutionCandidate@8355 }
-}
-
-ResolutionTaskHolder@8357 {
-    <name not found> = ArrayList@8358[1] { ResolutionCandidate@8359 }
-    <name not found> = ArrayList@8360[1] { ResolutionCandidate@8359 }
+ResolutionTaskHolder@8356 {
+    <name not found> = ArrayList@8357[7] { ResolutionCandidate@8358, ResolutionCandidate@8359, ResolutionCandidate@8360, ... }
 }
 
 ResolutionTaskHolder@8361 {
-    <name not found> = ArrayList@8362[1] { ResolutionCandidate@8363 }
-    <name not found> = ArrayList@8364[1] { ResolutionCandidate@8363 }
+    <name not found> = ArrayList@8362[7] { ResolutionCandidate@8363, ResolutionCandidate@8364, ResolutionCandidate@8365, ... }
 }
 
-ResolutionTaskHolder@8365 {
-    <name not found> = ArrayList@8366[1] { ResolutionCandidate@8367 }
-    <name not found> = ArrayList@8368[1] { ResolutionCandidate@8367 }
+ResolutionTaskHolder@8366 {
+    <name not found> = ArrayList@8367[7] { ResolutionCandidate@8368, ResolutionCandidate@8369, ResolutionCandidate@8370, ... }
 }
 
-ResolutionTaskHolder@8369 {
-    <name not found> = ArrayList@8370[1] { ResolutionCandidate@8371 }
-    <name not found> = ArrayList@8372[1] { ResolutionCandidate@8371 }
+ResolutionTaskHolder@8371 {
+    <name not found> = ArrayList@8372[7] { ResolutionCandidate@8373, ResolutionCandidate@8374, ResolutionCandidate@8375, ... }
 }
 
-ResolutionTaskHolder@8373 {
-    <name not found> = ArrayList@8374[1] { ResolutionCandidate@8375 }
-    <name not found> = ArrayList@8376[1] { ResolutionCandidate@8375 }
-}
-
-ResolutionTaskHolder@8377 {
-    <name not found> = ArrayList@8378[1] { ResolutionCandidate@8379 }
-    <name not found> = ArrayList@8380[1] { ResolutionCandidate@8379 }
+ResolutionTaskHolder@8376 {
+    <name not found> = ArrayList@8377[7] { ResolutionCandidate@8378, ResolutionCandidate@8379, ResolutionCandidate@8380, ... }
 }
 
 ResolutionTaskHolder@8381 {
-    <name not found> = ArrayList@8382[1] { ResolutionCandidate@8383 }
-    <name not found> = ArrayList@8384[1] { ResolutionCandidate@8383 }
+    <name not found> = ArrayList@8382[7] { ResolutionCandidate@8383, ResolutionCandidate@8384, ResolutionCandidate@8385, ... }
 }
 
-ResolutionTaskHolder@8385 {
-    <name not found> = ArrayList@8386[1] { ResolutionCandidate@8387 }
-    <name not found> = ArrayList@8388[1] { ResolutionCandidate@8387 }
+ResolutionTaskHolder@8386 {
+    <name not found> = ArrayList@8387[7] { ResolutionCandidate@8388, ResolutionCandidate@8389, ResolutionCandidate@8390, ... }
 }
 
-ResolutionTaskHolder@8389 {
-    <name not found> = ArrayList@8390[1] { ResolutionCandidate@8391 }
-    <name not found> = ArrayList@8392[1] { ResolutionCandidate@8391 }
+ResolutionTaskHolder@8391 {
+    <name not found> = ArrayList@8392[7] { ResolutionCandidate@8393, ResolutionCandidate@8394, ResolutionCandidate@8395, ... }
 }
 
-ResolutionTaskHolder@8393 {
-    <name not found> = ArrayList@8394[1] { ResolutionCandidate@8395 }
-    <name not found> = ArrayList@8396[1] { ResolutionCandidate@8395 }
-}
-
-ResolutionTaskHolder@8397 {
-    <name not found> = ArrayList@8398[1] { ResolutionCandidate@8399 }
-    <name not found> = ArrayList@8400[1] { ResolutionCandidate@8399 }
+ResolutionTaskHolder@8396 {
+    <name not found> = ArrayList@8397[7] { ResolutionCandidate@8398, ResolutionCandidate@8399, ResolutionCandidate@8400, ... }
 }
 
 ResolutionTaskHolder@8401 {
-    <name not found> = ArrayList@8402[1] { ResolutionCandidate@8403 }
-    <name not found> = ArrayList@8404[1] { ResolutionCandidate@8403 }
+    <name not found> = ArrayList@8402[7] { ResolutionCandidate@8403, ResolutionCandidate@8404, ResolutionCandidate@8405, ... }
 }
 
-ResolutionTaskHolder@8405 {
-    <name not found> = ArrayList@8406[1] { ResolutionCandidate@8407 }
-    <name not found> = ArrayList@8408[1] { ResolutionCandidate@8407 }
+ResolutionTaskHolder@8406 {
+    <name not found> = ArrayList@8407[7] { ResolutionCandidate@8408, ResolutionCandidate@8409, ResolutionCandidate@8410, ... }
 }
 
-ResolutionTaskHolder@8409 {
-    <name not found> = ArrayList@8410[1] { ResolutionCandidate@8411 }
-    <name not found> = ArrayList@8412[1] { ResolutionCandidate@8411 }
+ResolutionTaskHolder@8411 {
+    <name not found> = ArrayList@8412[7] { ResolutionCandidate@8413, ResolutionCandidate@8414, ResolutionCandidate@8415, ... }
 }
 
-ResolutionTaskHolder@8413 {
-    <name not found> = ArrayList@8414[1] { ResolutionCandidate@8415 }
-    <name not found> = ArrayList@8416[1] { ResolutionCandidate@8415 }
-}
-
-ResolutionTaskHolder@8417 {
-    <name not found> = ArrayList@8418[1] { ResolutionCandidate@8419 }
-    <name not found> = ArrayList@8420[1] { ResolutionCandidate@8419 }
+ResolutionTaskHolder@8416 {
+    <name not found> = ArrayList@8417[7] { ResolutionCandidate@8418, ResolutionCandidate@8419, ResolutionCandidate@8420, ... }
 }
 
 ResolutionTaskHolder@8421 {
-    <name not found> = ArrayList@8422[1] { ResolutionCandidate@8423 }
-    <name not found> = ArrayList@8424[1] { ResolutionCandidate@8423 }
+    <name not found> = ArrayList@8422[7] { ResolutionCandidate@8423, ResolutionCandidate@8424, ResolutionCandidate@8425, ... }
 }
 
-ResolutionTaskHolder@8425 {
-    <name not found> = ArrayList@8426[1] { ResolutionCandidate@8427 }
-    <name not found> = ArrayList@8428[1] { ResolutionCandidate@8427 }
+ResolutionTaskHolder@8426 {
+    <name not found> = ArrayList@8427[7] { ResolutionCandidate@8428, ResolutionCandidate@8429, ResolutionCandidate@8430, ... }
 }
 
-ResolutionTaskHolder@8429 {
-    <name not found> = ArrayList@8430[1] { ResolutionCandidate@8431 }
-    <name not found> = ArrayList@8432[1] { ResolutionCandidate@8431 }
+ResolutionTaskHolder@8431 {
+    <name not found> = ArrayList@8432[7] { ResolutionCandidate@8433, ResolutionCandidate@8434, ResolutionCandidate@8435, ... }
 }
 
-ResolutionTaskHolder@8433 {
-    <name not found> = ArrayList@8434[1] { ResolutionCandidate@8435 }
-    <name not found> = ArrayList@8436[1] { ResolutionCandidate@8435 }
-}
-
-ResolutionTaskHolder@8437 {
-    <name not found> = ArrayList@8438[1] { ResolutionCandidate@8439 }
-    <name not found> = ArrayList@8440[1] { ResolutionCandidate@8439 }
+ResolutionTaskHolder@8436 {
+    <name not found> = ArrayList@8437[7] { ResolutionCandidate@8438, ResolutionCandidate@8439, ResolutionCandidate@8440, ... }
 }
 
 ResolutionTaskHolder@8441 {
-    <name not found> = ArrayList@8442[1] { ResolutionCandidate@8443 }
-    <name not found> = ArrayList@8444[1] { ResolutionCandidate@8443 }
+    <name not found> = ArrayList@8442[7] { ResolutionCandidate@8443, ResolutionCandidate@8444, ResolutionCandidate@8445, ... }
 }
 
-ResolutionTaskHolder@8445 {
-    <name not found> = ArrayList@8446[1] { ResolutionCandidate@8447 }
-    <name not found> = ArrayList@8448[1] { ResolutionCandidate@8447 }
+ResolutionTaskHolder@8446 {
+    <name not found> = ArrayList@8447[7] { ResolutionCandidate@8448, ResolutionCandidate@8449, ResolutionCandidate@8450, ... }
 }
 
-ResolutionTaskHolder@8449 {
-    <name not found> = ArrayList@8450[1] { ResolutionCandidate@8451 }
-    <name not found> = ArrayList@8452[1] { ResolutionCandidate@8451 }
+ResolutionTaskHolder@8451 {
+    <name not found> = ArrayList@8452[7] { ResolutionCandidate@8453, ResolutionCandidate@8454, ResolutionCandidate@8455, ... }
 }
 
-ResolutionTaskHolder@8453 {
-    <name not found> = ArrayList@8454[1] { ResolutionCandidate@8455 }
-    <name not found> = ArrayList@8456[1] { ResolutionCandidate@8455 }
-}
-
-ResolutionTaskHolder@8457 {
-    <name not found> = ArrayList@8458[1] { ResolutionCandidate@8459 }
-    <name not found> = ArrayList@8460[1] { ResolutionCandidate@8459 }
+ResolutionTaskHolder@8456 {
+    <name not found> = ArrayList@8457[7] { ResolutionCandidate@8458, ResolutionCandidate@8459, ResolutionCandidate@8460, ... }
 }
 
 ResolutionTaskHolder@8461 {
-    <name not found> = ArrayList@8462[1] { ResolutionCandidate@8463 }
-    <name not found> = ArrayList@8464[1] { ResolutionCandidate@8463 }
+    <name not found> = ArrayList@8462[7] { ResolutionCandidate@8463, ResolutionCandidate@8464, ResolutionCandidate@8465, ... }
 }
 
-ResolutionTaskHolder@8465 {
-    <name not found> = ArrayList@8466[1] { ResolutionCandidate@8467 }
-    <name not found> = ArrayList@8468[1] { ResolutionCandidate@8467 }
+ResolutionTaskHolder@8466 {
+    <name not found> = ArrayList@8467[7] { ResolutionCandidate@8468, ResolutionCandidate@8469, ResolutionCandidate@8470, ... }
 }
 
-ResolutionTaskHolder@8469 {
-    <name not found> = ArrayList@8470[1] { ResolutionCandidate@8471 }
-    <name not found> = ArrayList@8472[1] { ResolutionCandidate@8471 }
+ResolutionTaskHolder@8471 {
+    <name not found> = ArrayList@8472[7] { ResolutionCandidate@8473, ResolutionCandidate@8474, ResolutionCandidate@8475, ... }
 }
 
-ResolutionTaskHolder@8473 {
-    <name not found> = ArrayList@8474[1] { ResolutionCandidate@8475 }
-    <name not found> = ArrayList@8476[1] { ResolutionCandidate@8475 }
-}
-
-ResolutionTaskHolder@8477 {
-    <name not found> = ArrayList@8478[1] { ResolutionCandidate@8479 }
-    <name not found> = ArrayList@8480[1] { ResolutionCandidate@8479 }
+ResolutionTaskHolder@8476 {
+    <name not found> = ArrayList@8477[7] { ResolutionCandidate@8478, ResolutionCandidate@8479, ResolutionCandidate@8480, ... }
 }
 
 ResolutionTaskHolder@8481 {
-    <name not found> = ArrayList@8482[1] { ResolutionCandidate@8483 }
-    <name not found> = ArrayList@8484[1] { ResolutionCandidate@8483 }
+    <name not found> = ArrayList@8482[7] { ResolutionCandidate@8483, ResolutionCandidate@8484, ResolutionCandidate@8485, ... }
 }
 
-ResolutionTaskHolder@8485 {
-    <name not found> = ArrayList@8486[1] { ResolutionCandidate@8487 }
-    <name not found> = ArrayList@8488[1] { ResolutionCandidate@8487 }
+ResolutionTaskHolder@8486 {
+    <name not found> = ArrayList@8487[7] { ResolutionCandidate@8488, ResolutionCandidate@8489, ResolutionCandidate@8490, ... }
 }
 
-ResolutionTaskHolder@8489 {
-    <name not found> = ArrayList@8490[1] { ResolutionCandidate@8491 }
-    <name not found> = ArrayList@8492[1] { ResolutionCandidate@8491 }
+ResolutionTaskHolder@8491 {
+    <name not found> = ArrayList@8492[7] { ResolutionCandidate@8493, ResolutionCandidate@8494, ResolutionCandidate@8495, ... }
 }
 
-ResolutionTaskHolder@8493 {
-    <name not found> = ArrayList@8494[1] { ResolutionCandidate@8495 }
-    <name not found> = ArrayList@8496[1] { ResolutionCandidate@8495 }
-}
-
-ResolutionTaskHolder@8497 {
-    <name not found> = ArrayList@8498[1] { ResolutionCandidate@8499 }
-    <name not found> = ArrayList@8500[1] { ResolutionCandidate@8499 }
+ResolutionTaskHolder@8496 {
+    <name not found> = ArrayList@8497[7] { ResolutionCandidate@8498, ResolutionCandidate@8499, ResolutionCandidate@8500, ... }
 }
 
 ResolutionTaskHolder@8501 {
-    <name not found> = ArrayList@8502[1] { ResolutionCandidate@8503 }
-    <name not found> = ArrayList@8504[1] { ResolutionCandidate@8503 }
+    <name not found> = ArrayList@8502[7] { ResolutionCandidate@8503, ResolutionCandidate@8504, ResolutionCandidate@8505, ... }
 }
 
-ResolutionTaskHolder@8505 {
-    <name not found> = ArrayList@8506[1] { ResolutionCandidate@8507 }
-    <name not found> = ArrayList@8508[1] { ResolutionCandidate@8507 }
+ResolutionTaskHolder@8506 {
+    <name not found> = ArrayList@8507[7] { ResolutionCandidate@8508, ResolutionCandidate@8509, ResolutionCandidate@8510, ... }
 }
 
-ResolutionTaskHolder@8509 {
-    <name not found> = ArrayList@8510[1] { ResolutionCandidate@8511 }
-    <name not found> = ArrayList@8512[1] { ResolutionCandidate@8511 }
+ResolutionTaskHolder@8511 {
+    <name not found> = ArrayList@8512[7] { ResolutionCandidate@8513, ResolutionCandidate@8514, ResolutionCandidate@8515, ... }
 }
 
-ResolutionTaskHolder@8513 {
-    <name not found> = ArrayList@8514[1] { ResolutionCandidate@8515 }
-    <name not found> = ArrayList@8516[1] { ResolutionCandidate@8515 }
-}
-
-ResolutionTaskHolder@8517 {
-    <name not found> = ArrayList@8518[1] { ResolutionCandidate@8519 }
-    <name not found> = ArrayList@8520[1] { ResolutionCandidate@8519 }
+ResolutionTaskHolder@8516 {
+    <name not found> = ArrayList@8517[7] { ResolutionCandidate@8518, ResolutionCandidate@8519, ResolutionCandidate@8520, ... }
 }
 
 ResolutionTaskHolder@8521 {
-    <name not found> = ArrayList@8522[1] { ResolutionCandidate@8523 }
-    <name not found> = ArrayList@8524[1] { ResolutionCandidate@8523 }
+    <name not found> = ArrayList@8522[7] { ResolutionCandidate@8523, ResolutionCandidate@8524, ResolutionCandidate@8525, ... }
 }
 
-ResolutionTaskHolder@8525 {
-    <name not found> = ArrayList@8526[1] { ResolutionCandidate@8527 }
-    <name not found> = ArrayList@8528[1] { ResolutionCandidate@8527 }
+ResolutionTaskHolder@8526 {
+    <name not found> = ArrayList@8527[7] { ResolutionCandidate@8528, ResolutionCandidate@8529, ResolutionCandidate@8530, ... }
 }
 
-ResolutionTaskHolder@8529 {
-    <name not found> = ArrayList@8530[1] { ResolutionCandidate@8531 }
-    <name not found> = ArrayList@8532[1] { ResolutionCandidate@8531 }
+ResolutionTaskHolder@8531 {
+    <name not found> = ArrayList@8532[7] { ResolutionCandidate@8533, ResolutionCandidate@8534, ResolutionCandidate@8535, ... }
 }
 
-ResolutionTaskHolder@8533 {
-    <name not found> = ArrayList@8534[1] { ResolutionCandidate@8535 }
-    <name not found> = ArrayList@8536[1] { ResolutionCandidate@8535 }
-}
-
-ResolutionTaskHolder@8537 {
-    <name not found> = ArrayList@8538[1] { ResolutionCandidate@8539 }
-    <name not found> = ArrayList@8540[1] { ResolutionCandidate@8539 }
+ResolutionTaskHolder@8536 {
+    <name not found> = ArrayList@8537[7] { ResolutionCandidate@8538, ResolutionCandidate@8539, ResolutionCandidate@8540, ... }
 }
 
 ResolutionTaskHolder@8541 {
-    <name not found> = ArrayList@8542[1] { ResolutionCandidate@8543 }
-    <name not found> = ArrayList@8544[1] { ResolutionCandidate@8543 }
+    <name not found> = ArrayList@8542[7] { ResolutionCandidate@8543, ResolutionCandidate@8544, ResolutionCandidate@8545, ... }
 }
 
-ResolutionTaskHolder@8545 {
-    <name not found> = ArrayList@8546[1] { ResolutionCandidate@8547 }
-    <name not found> = ArrayList@8548[1] { ResolutionCandidate@8547 }
+ResolutionTaskHolder@8546 {
+    <name not found> = ArrayList@8547[7] { ResolutionCandidate@8548, ResolutionCandidate@8549, ResolutionCandidate@8550, ... }
 }
 
-ResolutionTaskHolder@8549 {
-    <name not found> = ArrayList@8550[1] { ResolutionCandidate@8551 }
-    <name not found> = ArrayList@8552[1] { ResolutionCandidate@8551 }
+ResolutionTaskHolder@8551 {
+    <name not found> = ArrayList@8552[7] { ResolutionCandidate@8553, ResolutionCandidate@8554, ResolutionCandidate@8555, ... }
 }
 
-ResolutionTaskHolder@8553 {
-    <name not found> = ArrayList@8554[1] { ResolutionCandidate@8555 }
-    <name not found> = ArrayList@8556[1] { ResolutionCandidate@8555 }
-}
-
-ResolutionTaskHolder@8557 {
-    <name not found> = ArrayList@8558[1] { ResolutionCandidate@8559 }
-    <name not found> = ArrayList@8560[1] { ResolutionCandidate@8559 }
+ResolutionTaskHolder@8556 {
+    <name not found> = ArrayList@8557[7] { ResolutionCandidate@8558, ResolutionCandidate@8559, ResolutionCandidate@8560, ... }
 }
 
 ResolutionTaskHolder@8561 {
-    <name not found> = ArrayList@8562[1] { ResolutionCandidate@8563 }
-    <name not found> = ArrayList@8564[1] { ResolutionCandidate@8563 }
+    <name not found> = ArrayList@8562[7] { ResolutionCandidate@8563, ResolutionCandidate@8564, ResolutionCandidate@8565, ... }
 }
 
-ResolutionTaskHolder@8565 {
-    <name not found> = ArrayList@8566[1] { ResolutionCandidate@8567 }
-    <name not found> = ArrayList@8568[1] { ResolutionCandidate@8567 }
+ResolutionTaskHolder@8566 {
+    <name not found> = ArrayList@8567[7] { ResolutionCandidate@8568, ResolutionCandidate@8569, ResolutionCandidate@8570, ... }
 }
 
-ResolutionTaskHolder@8569 {
-    <name not found> = ArrayList@8570[1] { ResolutionCandidate@8571 }
-    <name not found> = ArrayList@8572[1] { ResolutionCandidate@8571 }
+ResolutionTaskHolder@8571 {
+    <name not found> = ArrayList@8572[7] { ResolutionCandidate@8573, ResolutionCandidate@8574, ResolutionCandidate@8575, ... }
 }
 
-ResolutionTaskHolder@8573 {
-    <name not found> = ArrayList@8574[1] { ResolutionCandidate@8575 }
-    <name not found> = ArrayList@8576[1] { ResolutionCandidate@8575 }
-}
-
-ResolutionTaskHolder@8577 {
-    <name not found> = ArrayList@8578[1] { ResolutionCandidate@8579 }
-    <name not found> = ArrayList@8580[1] { ResolutionCandidate@8579 }
+ResolutionTaskHolder@8576 {
+    <name not found> = ArrayList@8577[7] { ResolutionCandidate@8578, ResolutionCandidate@8579, ResolutionCandidate@8580, ... }
 }
 
 ResolutionTaskHolder@8581 {
-    <name not found> = ArrayList@8582[1] { ResolutionCandidate@8583 }
-    <name not found> = ArrayList@8584[1] { ResolutionCandidate@8583 }
+    <name not found> = ArrayList@8582[7] { ResolutionCandidate@8583, ResolutionCandidate@8584, ResolutionCandidate@8585, ... }
 }
 
-ResolutionTaskHolder@8585 {
-    <name not found> = ArrayList@8586[1] { ResolutionCandidate@8587 }
-    <name not found> = ArrayList@8588[1] { ResolutionCandidate@8587 }
+ResolutionTaskHolder@8586 {
+    <name not found> = ArrayList@8587[7] { ResolutionCandidate@8588, ResolutionCandidate@8589, ResolutionCandidate@8590, ... }
 }
 
-ResolutionTaskHolder@8589 {
-    <name not found> = ArrayList@8590[1] { ResolutionCandidate@8591 }
-    <name not found> = ArrayList@8592[1] { ResolutionCandidate@8591 }
+ResolutionTaskHolder@8591 {
+    <name not found> = ArrayList@8592[7] { ResolutionCandidate@8593, ResolutionCandidate@8594, ResolutionCandidate@8595, ... }
 }
 
-ResolutionTaskHolder@8593 {
-    <name not found> = ArrayList@8594[1] { ResolutionCandidate@8595 }
-    <name not found> = ArrayList@8596[1] { ResolutionCandidate@8595 }
-}
-
-ResolutionTaskHolder@8597 {
-    <name not found> = ArrayList@8598[1] { ResolutionCandidate@8599 }
-    <name not found> = ArrayList@8600[1] { ResolutionCandidate@8599 }
+ResolutionTaskHolder@8596 {
+    <name not found> = ArrayList@8597[7] { ResolutionCandidate@8598, ResolutionCandidate@8599, ResolutionCandidate@8600, ... }
 }
 
 ResolutionTaskHolder@8601 {
-    <name not found> = ArrayList@8602[1] { ResolutionCandidate@8603 }
-    <name not found> = ArrayList@8604[1] { ResolutionCandidate@8603 }
+    <name not found> = ArrayList@8602[7] { ResolutionCandidate@8603, ResolutionCandidate@8604, ResolutionCandidate@8605, ... }
 }
 
-ResolutionTaskHolder@8605 {
-    <name not found> = ArrayList@8606[1] { ResolutionCandidate@8607 }
-    <name not found> = ArrayList@8608[1] { ResolutionCandidate@8607 }
+ResolutionTaskHolder@8606 {
+    <name not found> = ArrayList@8607[7] { ResolutionCandidate@8608, ResolutionCandidate@8609, ResolutionCandidate@8610, ... }
 }
 
-ResolutionTaskHolder@8609 {
-    <name not found> = ArrayList@8610[1] { ResolutionCandidate@8611 }
-    <name not found> = ArrayList@8612[1] { ResolutionCandidate@8611 }
+ResolutionTaskHolder@8611 {
+    <name not found> = ArrayList@8612[7] { ResolutionCandidate@8613, ResolutionCandidate@8614, ResolutionCandidate@8615, ... }
 }
 
-ResolutionTaskHolder@8613 {
-    <name not found> = ArrayList@8614[1] { ResolutionCandidate@8615 }
-    <name not found> = ArrayList@8616[1] { ResolutionCandidate@8615 }
-}
-
-ResolutionTaskHolder@8617 {
-    <name not found> = ArrayList@8618[1] { ResolutionCandidate@8619 }
-    <name not found> = ArrayList@8620[1] { ResolutionCandidate@8619 }
+ResolutionTaskHolder@8616 {
+    <name not found> = ArrayList@8617[7] { ResolutionCandidate@8618, ResolutionCandidate@8619, ResolutionCandidate@8620, ... }
 }
 
 ResolutionTaskHolder@8621 {
-    <name not found> = ArrayList@8622[1] { ResolutionCandidate@8623 }
-    <name not found> = ArrayList@8624[1] { ResolutionCandidate@8623 }
+    <name not found> = ArrayList@8622[7] { ResolutionCandidate@8623, ResolutionCandidate@8624, ResolutionCandidate@8625, ... }
 }
 
-ResolutionTaskHolder@8625 {
-    <name not found> = ArrayList@8626[1] { ResolutionCandidate@8627 }
-    <name not found> = ArrayList@8628[1] { ResolutionCandidate@8627 }
+ResolutionTaskHolder@8626 {
+    <name not found> = ArrayList@8627[7] { ResolutionCandidate@8628, ResolutionCandidate@8629, ResolutionCandidate@8630, ... }
 }
 
-ResolutionTaskHolder@8629 {
-    <name not found> = ArrayList@8630[1] { ResolutionCandidate@8631 }
-    <name not found> = ArrayList@8632[1] { ResolutionCandidate@8631 }
+ResolutionTaskHolder@8631 {
+    <name not found> = ArrayList@8632[7] { ResolutionCandidate@8633, ResolutionCandidate@8634, ResolutionCandidate@8635, ... }
 }
 
-ResolutionTaskHolder@8633 {
-    <name not found> = ArrayList@8634[1] { ResolutionCandidate@8635 }
-    <name not found> = ArrayList@8636[1] { ResolutionCandidate@8635 }
-}
-
-ResolutionTaskHolder@8637 {
-    <name not found> = ArrayList@8638[1] { ResolutionCandidate@8639 }
-    <name not found> = ArrayList@8640[1] { ResolutionCandidate@8639 }
+ResolutionTaskHolder@8636 {
+    <name not found> = ArrayList@8637[7] { ResolutionCandidate@8638, ResolutionCandidate@8639, ResolutionCandidate@8640, ... }
 }
 
 ResolutionTaskHolder@8641 {
-    <name not found> = ArrayList@8642[1] { ResolutionCandidate@8643 }
-    <name not found> = ArrayList@8644[1] { ResolutionCandidate@8643 }
+    <name not found> = ArrayList@8642[7] { ResolutionCandidate@8643, ResolutionCandidate@8644, ResolutionCandidate@8645, ... }
 }
 
-ResolutionTaskHolder@8645 {
-    <name not found> = ArrayList@8646[1] { ResolutionCandidate@8647 }
-    <name not found> = ArrayList@8648[1] { ResolutionCandidate@8647 }
+ResolutionTaskHolder@8646 {
+    <name not found> = ArrayList@8647[7] { ResolutionCandidate@8648, ResolutionCandidate@8649, ResolutionCandidate@8650, ... }
 }
 
-ResolutionTaskHolder@8649 {
-    <name not found> = ArrayList@8650[1] { ResolutionCandidate@8651 }
-    <name not found> = ArrayList@8652[1] { ResolutionCandidate@8651 }
+ResolutionTaskHolder@8651 {
+    <name not found> = ArrayList@8652[7] { ResolutionCandidate@8653, ResolutionCandidate@8654, ResolutionCandidate@8655, ... }
 }
 
-ResolutionTaskHolder@8653 {
-    <name not found> = ArrayList@8654[1] { ResolutionCandidate@8655 }
-    <name not found> = ArrayList@8656[1] { ResolutionCandidate@8655 }
-}
-
-ResolutionTaskHolder@8657 {
-    <name not found> = ArrayList@8658[1] { ResolutionCandidate@8659 }
-    <name not found> = ArrayList@8660[1] { ResolutionCandidate@8659 }
+ResolutionTaskHolder@8656 {
+    <name not found> = ArrayList@8657[7] { ResolutionCandidate@8658, ResolutionCandidate@8659, ResolutionCandidate@8660, ... }
 }
 
 ResolutionTaskHolder@8661 {
-    <name not found> = ArrayList@8662[1] { ResolutionCandidate@8663 }
-    <name not found> = ArrayList@8664[1] { ResolutionCandidate@8663 }
+    <name not found> = ArrayList@8662[7] { ResolutionCandidate@8663, ResolutionCandidate@8664, ResolutionCandidate@8665, ... }
 }
 
-ResolutionTaskHolder@8665 {
-    <name not found> = ArrayList@8666[1] { ResolutionCandidate@8667 }
-    <name not found> = ArrayList@8668[1] { ResolutionCandidate@8667 }
+ResolutionTaskHolder@8666 {
+    <name not found> = ArrayList@8667[7] { ResolutionCandidate@8668, ResolutionCandidate@8669, ResolutionCandidate@8670, ... }
 }
 
-ResolutionTaskHolder@8669 {
-    <name not found> = ArrayList@8670[1] { ResolutionCandidate@8671 }
-    <name not found> = ArrayList@8672[1] { ResolutionCandidate@8671 }
+ResolutionTaskHolder@8671 {
+    <name not found> = ArrayList@8672[7] { ResolutionCandidate@8673, ResolutionCandidate@8674, ResolutionCandidate@8675, ... }
 }
 
-ResolutionTaskHolder@8673 {
-    <name not found> = ArrayList@8674[1] { ResolutionCandidate@8675 }
-    <name not found> = ArrayList@8676[1] { ResolutionCandidate@8675 }
-}
-
-ResolutionTaskHolder@8677 {
-    <name not found> = ArrayList@8678[1] { ResolutionCandidate@8679 }
-    <name not found> = ArrayList@8680[1] { ResolutionCandidate@8679 }
+ResolutionTaskHolder@8676 {
+    <name not found> = ArrayList@8677[7] { ResolutionCandidate@8678, ResolutionCandidate@8679, ResolutionCandidate@8680, ... }
 }
 
 ResolutionTaskHolder@8681 {
-    <name not found> = ArrayList@8682[1] { ResolutionCandidate@8683 }
-    <name not found> = ArrayList@8684[1] { ResolutionCandidate@8683 }
+    <name not found> = ArrayList@8682[7] { ResolutionCandidate@8683, ResolutionCandidate@8684, ResolutionCandidate@8685, ... }
 }
 
-ResolutionTaskHolder@8685 {
-    <name not found> = ArrayList@8686[1] { ResolutionCandidate@8687 }
-    <name not found> = ArrayList@8688[1] { ResolutionCandidate@8687 }
+ResolutionTaskHolder@8686 {
+    <name not found> = ArrayList@8687[7] { ResolutionCandidate@8688, ResolutionCandidate@8689, ResolutionCandidate@8690, ... }
 }
 
-ResolutionTaskHolder@8689 {
-    <name not found> = ArrayList@8690[1] { ResolutionCandidate@8691 }
-    <name not found> = ArrayList@8692[1] { ResolutionCandidate@8691 }
+ResolutionTaskHolder@8691 {
+    <name not found> = ArrayList@8692[7] { ResolutionCandidate@8693, ResolutionCandidate@8694, ResolutionCandidate@8695, ... }
 }
 
-ResolutionTaskHolder@8693 {
-    <name not found> = ArrayList@8694[1] { ResolutionCandidate@8695 }
-    <name not found> = ArrayList@8696[1] { ResolutionCandidate@8695 }
-}
-
-ResolutionTaskHolder@8697 {
-    <name not found> = ArrayList@8698[1] { ResolutionCandidate@8699 }
-    <name not found> = ArrayList@8700[1] { ResolutionCandidate@8699 }
+ResolutionTaskHolder@8696 {
+    <name not found> = ArrayList@8697[7] { ResolutionCandidate@8698, ResolutionCandidate@8699, ResolutionCandidate@8700, ... }
 }
 
 ResolutionTaskHolder@8701 {
-    <name not found> = ArrayList@8702[1] { ResolutionCandidate@8703 }
-    <name not found> = ArrayList@8704[1] { ResolutionCandidate@8703 }
+    <name not found> = ArrayList@8702[7] { ResolutionCandidate@8703, ResolutionCandidate@8704, ResolutionCandidate@8705, ... }
 }
 
-ResolutionTaskHolder@8705 {
-    <name not found> = ArrayList@8706[1] { ResolutionCandidate@8707 }
-    <name not found> = ArrayList@8708[1] { ResolutionCandidate@8707 }
+ResolutionTaskHolder@8706 {
+    <name not found> = ArrayList@8707[7] { ResolutionCandidate@8708, ResolutionCandidate@8709, ResolutionCandidate@8710, ... }
 }
 
-ResolutionTaskHolder@8709 {
-    <name not found> = ArrayList@8710[1] { ResolutionCandidate@8711 }
-    <name not found> = ArrayList@8712[1] { ResolutionCandidate@8711 }
+ResolutionTaskHolder@8711 {
+    <name not found> = ArrayList@8712[7] { ResolutionCandidate@8713, ResolutionCandidate@8714, ResolutionCandidate@8715, ... }
 }
 
-ResolutionTaskHolder@8713 {
-    <name not found> = ArrayList@8714[1] { ResolutionCandidate@8715 }
-    <name not found> = ArrayList@8716[1] { ResolutionCandidate@8715 }
-}
-
-ResolutionTaskHolder@8717 {
-    <name not found> = ArrayList@8718[1] { ResolutionCandidate@8719 }
-    <name not found> = ArrayList@8720[1] { ResolutionCandidate@8719 }
+ResolutionTaskHolder@8716 {
+    <name not found> = ArrayList@8717[7] { ResolutionCandidate@8718, ResolutionCandidate@8719, ResolutionCandidate@8720, ... }
 }
 
 ResolutionTaskHolder@8721 {
-    <name not found> = ArrayList@8722[1] { ResolutionCandidate@8723 }
-    <name not found> = ArrayList@8724[1] { ResolutionCandidate@8723 }
+    <name not found> = ArrayList@8722[7] { ResolutionCandidate@8723, ResolutionCandidate@8724, ResolutionCandidate@8725, ... }
 }
 
-ResolutionTaskHolder@8725 {
-    <name not found> = ArrayList@8726[1] { ResolutionCandidate@8727 }
-    <name not found> = ArrayList@8728[1] { ResolutionCandidate@8727 }
+ResolutionTaskHolder@8726 {
+    <name not found> = ArrayList@8727[8] { ResolutionCandidate@8728, ResolutionCandidate@8729, ResolutionCandidate@8730, ... }
 }
 
-ResolutionTaskHolder@8729 {
-    <name not found> = ArrayList@8730[1] { ResolutionCandidate@8731 }
-    <name not found> = ArrayList@8732[1] { ResolutionCandidate@8731 }
+ResolutionTaskHolder@8731 {
+    <name not found> = ArrayList@8732[8] { ResolutionCandidate@8733, ResolutionCandidate@8734, ResolutionCandidate@8735, ... }
 }
 
-ResolutionTaskHolder@8733 {
-    <name not found> = ArrayList@8734[1] { ResolutionCandidate@8735 }
-    <name not found> = ArrayList@8736[1] { ResolutionCandidate@8735 }
-}
-
-ResolutionTaskHolder@8737 {
-    <name not found> = ArrayList@8738[1] { ResolutionCandidate@8739 }
-    <name not found> = ArrayList@8740[1] { ResolutionCandidate@8739 }
+ResolutionTaskHolder@8736 {
+    <name not found> = ArrayList@8737[8] { ResolutionCandidate@8738, ResolutionCandidate@8739, ResolutionCandidate@8740, ... }
 }
 
 ResolutionTaskHolder@8741 {
-    <name not found> = ArrayList@8742[1] { ResolutionCandidate@8743 }
-    <name not found> = ArrayList@8744[1] { ResolutionCandidate@8743 }
+    <name not found> = ArrayList@8742[8] { ResolutionCandidate@8743, ResolutionCandidate@8744, ResolutionCandidate@8745, ... }
 }
 
-ResolutionTaskHolder@8745 {
-    <name not found> = ArrayList@8746[1] { ResolutionCandidate@8747 }
-    <name not found> = ArrayList@8748[1] { ResolutionCandidate@8747 }
+ResolutionTaskHolder@8746 {
+    <name not found> = ArrayList@8747[8] { ResolutionCandidate@8748, ResolutionCandidate@8749, ResolutionCandidate@8750, ... }
 }
 
-ResolutionTaskHolder@8749 {
-    <name not found> = ArrayList@8750[1] { ResolutionCandidate@8751 }
-    <name not found> = ArrayList@8752[1] { ResolutionCandidate@8751 }
+ResolutionTaskHolder@8751 {
+    <name not found> = ArrayList@8752[8] { ResolutionCandidate@8753, ResolutionCandidate@8754, ResolutionCandidate@8755, ... }
 }
 
-ResolutionTaskHolder@8753 {
-    <name not found> = ArrayList@8754[1] { ResolutionCandidate@8755 }
-    <name not found> = ArrayList@8756[1] { ResolutionCandidate@8755 }
-}
-
-ResolutionTaskHolder@8757 {
-    <name not found> = ArrayList@8758[1] { ResolutionCandidate@8759 }
-    <name not found> = ArrayList@8760[1] { ResolutionCandidate@8759 }
+ResolutionTaskHolder@8756 {
+    <name not found> = ArrayList@8757[8] { ResolutionCandidate@8758, ResolutionCandidate@8759, ResolutionCandidate@8760, ... }
 }
 
 ResolutionTaskHolder@8761 {
-    <name not found> = ArrayList@8762[1] { ResolutionCandidate@8763 }
-    <name not found> = ArrayList@8764[1] { ResolutionCandidate@8763 }
+    <name not found> = ArrayList@8762[8] { ResolutionCandidate@8763, ResolutionCandidate@8764, ResolutionCandidate@8765, ... }
 }
 
-ResolutionTaskHolder@8765 {
-    <name not found> = ArrayList@8766[1] { ResolutionCandidate@8767 }
-    <name not found> = ArrayList@8768[1] { ResolutionCandidate@8767 }
+ResolutionTaskHolder@8766 {
+    <name not found> = ArrayList@8767[8] { ResolutionCandidate@8768, ResolutionCandidate@8769, ResolutionCandidate@8770, ... }
 }
 
-ResolutionTaskHolder@8769 {
-    <name not found> = ArrayList@8770[1] { ResolutionCandidate@8771 }
-    <name not found> = ArrayList@8772[1] { ResolutionCandidate@8771 }
+ResolutionTaskHolder@8771 {
+    <name not found> = ArrayList@8772[8] { ResolutionCandidate@8773, ResolutionCandidate@8774, ResolutionCandidate@8775, ... }
 }
 
-ResolutionTaskHolder@8773 {
-    <name not found> = ArrayList@8774[1] { ResolutionCandidate@8775 }
-    <name not found> = ArrayList@8776[1] { ResolutionCandidate@8775 }
-}
-
-ResolutionTaskHolder@8777 {
-    <name not found> = ArrayList@8778[1] { ResolutionCandidate@8779 }
-    <name not found> = ArrayList@8780[1] { ResolutionCandidate@8779 }
+ResolutionTaskHolder@8776 {
+    <name not found> = ArrayList@8777[8] { ResolutionCandidate@8778, ResolutionCandidate@8779, ResolutionCandidate@8780, ... }
 }
 
 ResolutionTaskHolder@8781 {
-    <name not found> = ArrayList@8782[1] { ResolutionCandidate@8783 }
-    <name not found> = ArrayList@8784[1] { ResolutionCandidate@8783 }
+    <name not found> = ArrayList@8782[8] { ResolutionCandidate@8783, ResolutionCandidate@8784, ResolutionCandidate@8785, ... }
 }
 
-ResolutionTaskHolder@8785 {
-    <name not found> = ArrayList@8786[1] { ResolutionCandidate@8787 }
-    <name not found> = ArrayList@8788[1] { ResolutionCandidate@8787 }
+ResolutionTaskHolder@8786 {
+    <name not found> = ArrayList@8787[8] { ResolutionCandidate@8788, ResolutionCandidate@8789, ResolutionCandidate@8790, ... }
 }
 
-ResolutionTaskHolder@8789 {
-    <name not found> = ArrayList@8790[1] { ResolutionCandidate@8791 }
-    <name not found> = ArrayList@8792[1] { ResolutionCandidate@8791 }
+ResolutionTaskHolder@8791 {
+    <name not found> = ArrayList@8792[8] { ResolutionCandidate@8793, ResolutionCandidate@8794, ResolutionCandidate@8795, ... }
 }
 
-ResolutionTaskHolder@8793 {
-    <name not found> = ArrayList@8794[1] { ResolutionCandidate@8795 }
-    <name not found> = ArrayList@8796[1] { ResolutionCandidate@8795 }
-}
-
-ResolutionTaskHolder@8797 {
-    <name not found> = ArrayList@8798[1] { ResolutionCandidate@8799 }
-    <name not found> = ArrayList@8800[1] { ResolutionCandidate@8799 }
+ResolutionTaskHolder@8796 {
+    <name not found> = ArrayList@8797[8] { ResolutionCandidate@8798, ResolutionCandidate@8799, ResolutionCandidate@8800, ... }
 }
 
 ResolutionTaskHolder@8801 {
-    <name not found> = ArrayList@8802[1] { ResolutionCandidate@8803 }
-    <name not found> = ArrayList@8804[1] { ResolutionCandidate@8803 }
+    <name not found> = ArrayList@8802[8] { ResolutionCandidate@8803, ResolutionCandidate@8804, ResolutionCandidate@8805, ... }
 }
 
-ResolutionTaskHolder@8805 {
-    <name not found> = ArrayList@8806[1] { ResolutionCandidate@8807 }
-    <name not found> = ArrayList@8808[1] { ResolutionCandidate@8807 }
+ResolutionTaskHolder@8806 {
+    <name not found> = ArrayList@8807[8] { ResolutionCandidate@8808, ResolutionCandidate@8809, ResolutionCandidate@8810, ... }
 }
 
-ResolutionTaskHolder@8809 {
-    <name not found> = ArrayList@8810[1] { ResolutionCandidate@8811 }
-    <name not found> = ArrayList@8812[1] { ResolutionCandidate@8811 }
+ResolutionTaskHolder@8811 {
+    <name not found> = ArrayList@8812[8] { ResolutionCandidate@8813, ResolutionCandidate@8814, ResolutionCandidate@8815, ... }
 }
 
-ResolutionTaskHolder@8813 {
-    <name not found> = ArrayList@8814[1] { ResolutionCandidate@8815 }
-    <name not found> = ArrayList@8816[1] { ResolutionCandidate@8815 }
-}
-
-ResolutionTaskHolder@8817 {
-    <name not found> = ArrayList@8818[1] { ResolutionCandidate@8819 }
-    <name not found> = ArrayList@8820[1] { ResolutionCandidate@8819 }
+ResolutionTaskHolder@8816 {
+    <name not found> = ArrayList@8817[8] { ResolutionCandidate@8818, ResolutionCandidate@8819, ResolutionCandidate@8820, ... }
 }
 
 ResolutionTaskHolder@8821 {
-    <name not found> = ArrayList@8822[1] { ResolutionCandidate@8823 }
-    <name not found> = ArrayList@8824[1] { ResolutionCandidate@8823 }
+    <name not found> = ArrayList@8822[8] { ResolutionCandidate@8823, ResolutionCandidate@8824, ResolutionCandidate@8825, ... }
 }
 
-ResolutionTaskHolder@8825 {
-    <name not found> = ArrayList@8826[1] { ResolutionCandidate@8827 }
-    <name not found> = ArrayList@8828[1] { ResolutionCandidate@8827 }
+ResolutionTaskHolder@8826 {
+    <name not found> = ArrayList@8827[8] { ResolutionCandidate@8828, ResolutionCandidate@8829, ResolutionCandidate@8830, ... }
 }
 
-ResolutionTaskHolder@8829 {
-    <name not found> = ArrayList@8830[1] { ResolutionCandidate@8831 }
-    <name not found> = ArrayList@8832[1] { ResolutionCandidate@8831 }
+ResolutionTaskHolder@8831 {
+    <name not found> = ArrayList@8832[8] { ResolutionCandidate@8833, ResolutionCandidate@8834, ResolutionCandidate@8835, ... }
 }
 
-ResolutionTaskHolder@8833 {
-    <name not found> = ArrayList@8834[1] { ResolutionCandidate@8835 }
-    <name not found> = ArrayList@8836[1] { ResolutionCandidate@8835 }
-}
-
-ResolutionTaskHolder@8837 {
-    <name not found> = ArrayList@8838[1] { ResolutionCandidate@8839 }
-    <name not found> = ArrayList@8840[1] { ResolutionCandidate@8839 }
+ResolutionTaskHolder@8836 {
+    <name not found> = ArrayList@8837[8] { ResolutionCandidate@8838, ResolutionCandidate@8839, ResolutionCandidate@8840, ... }
 }
 
 ResolutionTaskHolder@8841 {
-    <name not found> = ArrayList@8842[1] { ResolutionCandidate@8843 }
-    <name not found> = ArrayList@8844[1] { ResolutionCandidate@8843 }
+    <name not found> = ArrayList@8842[8] { ResolutionCandidate@8843, ResolutionCandidate@8844, ResolutionCandidate@8845, ... }
 }
 
-ResolutionTaskHolder@8845 {
-    <name not found> = ArrayList@8846[1] { ResolutionCandidate@8847 }
-    <name not found> = ArrayList@8848[1] { ResolutionCandidate@8847 }
+ResolutionTaskHolder@8846 {
+    <name not found> = ArrayList@8847[8] { ResolutionCandidate@8848, ResolutionCandidate@8849, ResolutionCandidate@8850, ... }
 }
 
-ResolutionTaskHolder@8849 {
-    <name not found> = ArrayList@8850[1] { ResolutionCandidate@8851 }
-    <name not found> = ArrayList@8852[1] { ResolutionCandidate@8851 }
+ResolutionTaskHolder@8851 {
+    <name not found> = ArrayList@8852[8] { ResolutionCandidate@8853, ResolutionCandidate@8854, ResolutionCandidate@8855, ... }
 }
 
-ResolutionTaskHolder@8853 {
-    <name not found> = ArrayList@8854[1] { ResolutionCandidate@8855 }
-    <name not found> = ArrayList@8856[1] { ResolutionCandidate@8855 }
-}
-
-ResolutionTaskHolder@8857 {
-    <name not found> = ArrayList@8858[1] { ResolutionCandidate@8859 }
-    <name not found> = ArrayList@8860[1] { ResolutionCandidate@8859 }
+ResolutionTaskHolder@8856 {
+    <name not found> = ArrayList@8857[8] { ResolutionCandidate@8858, ResolutionCandidate@8859, ResolutionCandidate@8860, ... }
 }
 
 ResolutionTaskHolder@8861 {
-    <name not found> = ArrayList@8862[1] { ResolutionCandidate@8863 }
-    <name not found> = ArrayList@8864[1] { ResolutionCandidate@8863 }
+    <name not found> = ArrayList@8862[8] { ResolutionCandidate@8863, ResolutionCandidate@8864, ResolutionCandidate@8865, ... }
 }
 
-ResolutionTaskHolder@8865 {
-    <name not found> = ArrayList@8866[1] { ResolutionCandidate@8867 }
-    <name not found> = ArrayList@8868[1] { ResolutionCandidate@8867 }
+ResolutionTaskHolder@8866 {
+    <name not found> = ArrayList@8867[8] { ResolutionCandidate@8868, ResolutionCandidate@8869, ResolutionCandidate@8870, ... }
 }
 
-ResolutionTaskHolder@8869 {
-    <name not found> = ArrayList@8870[1] { ResolutionCandidate@8871 }
-    <name not found> = ArrayList@8872[1] { ResolutionCandidate@8871 }
+ResolutionTaskHolder@8871 {
+    <name not found> = ArrayList@8872[8] { ResolutionCandidate@8873, ResolutionCandidate@8874, ResolutionCandidate@8875, ... }
 }
 
-ResolutionTaskHolder@8873 {
-    <name not found> = ArrayList@8874[1] { ResolutionCandidate@8875 }
-    <name not found> = ArrayList@8876[1] { ResolutionCandidate@8875 }
-}
-
-ResolutionTaskHolder@8877 {
-    <name not found> = ArrayList@8878[1] { ResolutionCandidate@8879 }
-    <name not found> = ArrayList@8880[1] { ResolutionCandidate@8879 }
+ResolutionTaskHolder@8876 {
+    <name not found> = ArrayList@8877[8] { ResolutionCandidate@8878, ResolutionCandidate@8879, ResolutionCandidate@8880, ... }
 }
 
 ResolutionTaskHolder@8881 {
-    <name not found> = ArrayList@8882[1] { ResolutionCandidate@8883 }
-    <name not found> = ArrayList@8884[1] { ResolutionCandidate@8883 }
+    <name not found> = ArrayList@8882[8] { ResolutionCandidate@8883, ResolutionCandidate@8884, ResolutionCandidate@8885, ... }
 }
 
-ResolutionTaskHolder@8885 {
-    <name not found> = ArrayList@8886[1] { ResolutionCandidate@8887 }
-    <name not found> = ArrayList@8888[1] { ResolutionCandidate@8887 }
+ResolutionTaskHolder@8886 {
+    <name not found> = ArrayList@8887[8] { ResolutionCandidate@8888, ResolutionCandidate@8889, ResolutionCandidate@8890, ... }
 }
 
-ResolutionTaskHolder@8889 {
-    <name not found> = ArrayList@8890[1] { ResolutionCandidate@8891 }
-    <name not found> = ArrayList@8892[1] { ResolutionCandidate@8891 }
+ResolutionTaskHolder@8891 {
+    <name not found> = ArrayList@8892[8] { ResolutionCandidate@8893, ResolutionCandidate@8894, ResolutionCandidate@8895, ... }
 }
 
-ResolutionTaskHolder@8893 {
-    <name not found> = ArrayList@8894[1] { ResolutionCandidate@8895 }
-    <name not found> = ArrayList@8896[1] { ResolutionCandidate@8895 }
-}
-
-ResolutionTaskHolder@8897 {
-    <name not found> = ArrayList@8898[1] { ResolutionCandidate@8899 }
-    <name not found> = ArrayList@8900[1] { ResolutionCandidate@8899 }
+ResolutionTaskHolder@8896 {
+    <name not found> = ArrayList@8897[8] { ResolutionCandidate@8898, ResolutionCandidate@8899, ResolutionCandidate@8900, ... }
 }
 
 ResolutionTaskHolder@8901 {
-    <name not found> = ArrayList@8902[1] { ResolutionCandidate@8903 }
-    <name not found> = ArrayList@8904[1] { ResolutionCandidate@8903 }
+    <name not found> = ArrayList@8902[8] { ResolutionCandidate@8903, ResolutionCandidate@8904, ResolutionCandidate@8905, ... }
 }
 
-ResolutionTaskHolder@8905 {
-    <name not found> = ArrayList@8906[1] { ResolutionCandidate@8907 }
-    <name not found> = ArrayList@8908[1] { ResolutionCandidate@8907 }
+ResolutionTaskHolder@8906 {
+    <name not found> = ArrayList@8907[8] { ResolutionCandidate@8908, ResolutionCandidate@8909, ResolutionCandidate@8910, ... }
 }
 
-ResolutionTaskHolder@8909 {
-    <name not found> = ArrayList@8910[1] { ResolutionCandidate@8911 }
-    <name not found> = ArrayList@8912[1] { ResolutionCandidate@8911 }
+ResolutionTaskHolder@8911 {
+    <name not found> = ArrayList@8912[8] { ResolutionCandidate@8913, ResolutionCandidate@8914, ResolutionCandidate@8915, ... }
 }
 
-ResolutionTaskHolder@8913 {
-    <name not found> = ArrayList@8914[1] { ResolutionCandidate@8915 }
-    <name not found> = ArrayList@8916[1] { ResolutionCandidate@8915 }
-}
-
-ResolutionTaskHolder@8917 {
-    <name not found> = ArrayList@8918[1] { ResolutionCandidate@8919 }
-    <name not found> = ArrayList@8920[1] { ResolutionCandidate@8919 }
+ResolutionTaskHolder@8916 {
+    <name not found> = ArrayList@8917[8] { ResolutionCandidate@8918, ResolutionCandidate@8919, ResolutionCandidate@8920, ... }
 }
 
 ResolutionTaskHolder@8921 {
-    <name not found> = ArrayList@8922[1] { ResolutionCandidate@8923 }
-    <name not found> = ArrayList@8924[1] { ResolutionCandidate@8923 }
+    <name not found> = ArrayList@8922[8] { ResolutionCandidate@8923, ResolutionCandidate@8924, ResolutionCandidate@8925, ... }
 }
 
-ResolutionTaskHolder@8925 {
-    <name not found> = ArrayList@8926[1] { ResolutionCandidate@8927 }
-    <name not found> = ArrayList@8928[1] { ResolutionCandidate@8927 }
+ResolutionTaskHolder@8926 {
+    <name not found> = ArrayList@8927[8] { ResolutionCandidate@8928, ResolutionCandidate@8929, ResolutionCandidate@8930, ... }
 }
 
-ResolutionTaskHolder@8929 {
-    <name not found> = ArrayList@8930[1] { ResolutionCandidate@8931 }
-    <name not found> = ArrayList@8932[1] { ResolutionCandidate@8931 }
+ResolutionTaskHolder@8931 {
+    <name not found> = ArrayList@8932[8] { ResolutionCandidate@8933, ResolutionCandidate@8934, ResolutionCandidate@8935, ... }
 }
 
-ResolutionTaskHolder@8933 {
-    <name not found> = ArrayList@8934[1] { ResolutionCandidate@8935 }
-    <name not found> = ArrayList@8936[1] { ResolutionCandidate@8935 }
-}
-
-ResolutionTaskHolder@8937 {
-    <name not found> = ArrayList@8938[1] { ResolutionCandidate@8939 }
-    <name not found> = ArrayList@8940[1] { ResolutionCandidate@8939 }
+ResolutionTaskHolder@8936 {
+    <name not found> = ArrayList@8937[8] { ResolutionCandidate@8938, ResolutionCandidate@8939, ResolutionCandidate@8940, ... }
 }
 
 ResolutionTaskHolder@8941 {
-    <name not found> = ArrayList@8942[1] { ResolutionCandidate@8943 }
-    <name not found> = ArrayList@8944[1] { ResolutionCandidate@8943 }
+    <name not found> = ArrayList@8942[8] { ResolutionCandidate@8943, ResolutionCandidate@8944, ResolutionCandidate@8945, ... }
 }
 
-ResolutionTaskHolder@8945 {
-    <name not found> = ArrayList@8946[1] { ResolutionCandidate@8947 }
-    <name not found> = ArrayList@8948[1] { ResolutionCandidate@8947 }
+ResolutionTaskHolder@8946 {
+    <name not found> = ArrayList@8947[8] { ResolutionCandidate@8948, ResolutionCandidate@8949, ResolutionCandidate@8950, ... }
 }
 
-ResolutionTaskHolder@8949 {
-    <name not found> = ArrayList@8950[1] { ResolutionCandidate@8951 }
-    <name not found> = ArrayList@8952[1] { ResolutionCandidate@8951 }
+ResolutionTaskHolder@8951 {
+    <name not found> = ArrayList@8952[8] { ResolutionCandidate@8953, ResolutionCandidate@8954, ResolutionCandidate@8955, ... }
 }
 
-ResolutionTaskHolder@8953 {
-    <name not found> = ArrayList@8954[1] { ResolutionCandidate@8955 }
-    <name not found> = ArrayList@8956[1] { ResolutionCandidate@8955 }
-}
-
-ResolutionTaskHolder@8957 {
-    <name not found> = ArrayList@8958[1] { ResolutionCandidate@8959 }
-    <name not found> = ArrayList@8960[1] { ResolutionCandidate@8959 }
+ResolutionTaskHolder@8956 {
+    <name not found> = ArrayList@8957[8] { ResolutionCandidate@8958, ResolutionCandidate@8959, ResolutionCandidate@8960, ... }
 }
 
 ResolutionTaskHolder@8961 {
-    <name not found> = ArrayList@8962[1] { ResolutionCandidate@8963 }
-    <name not found> = ArrayList@8964[1] { ResolutionCandidate@8963 }
+    <name not found> = ArrayList@8962[8] { ResolutionCandidate@8963, ResolutionCandidate@8964, ResolutionCandidate@8965, ... }
 }
 
-ResolutionTaskHolder@8965 {
-    <name not found> = ArrayList@8966[1] { ResolutionCandidate@8967 }
-    <name not found> = ArrayList@8968[1] { ResolutionCandidate@8967 }
+ResolutionTaskHolder@8966 {
+    <name not found> = ArrayList@8967[8] { ResolutionCandidate@8968, ResolutionCandidate@8969, ResolutionCandidate@8970, ... }
 }
 
-ResolutionTaskHolder@8969 {
-    <name not found> = ArrayList@8970[1] { ResolutionCandidate@8971 }
-    <name not found> = ArrayList@8972[1] { ResolutionCandidate@8971 }
+ResolutionTaskHolder@8971 {
+    <name not found> = ArrayList@8972[8] { ResolutionCandidate@8973, ResolutionCandidate@8974, ResolutionCandidate@8975, ... }
 }
 
-ResolutionTaskHolder@8973 {
-    <name not found> = ArrayList@8974[1] { ResolutionCandidate@8975 }
-    <name not found> = ArrayList@8976[1] { ResolutionCandidate@8975 }
-}
-
-ResolutionTaskHolder@8977 {
-    <name not found> = ArrayList@8978[1] { ResolutionCandidate@8979 }
-    <name not found> = ArrayList@8980[1] { ResolutionCandidate@8979 }
+ResolutionTaskHolder@8976 {
+    <name not found> = ArrayList@8977[8] { ResolutionCandidate@8978, ResolutionCandidate@8979, ResolutionCandidate@8980, ... }
 }
 
 ResolutionTaskHolder@8981 {
-    <name not found> = ArrayList@8982[1] { ResolutionCandidate@8983 }
-    <name not found> = ArrayList@8984[1] { ResolutionCandidate@8983 }
+    <name not found> = ArrayList@8982[8] { ResolutionCandidate@8983, ResolutionCandidate@8984, ResolutionCandidate@8985, ... }
 }
 
-ResolutionTaskHolder@8985 {
-    <name not found> = ArrayList@8986[1] { ResolutionCandidate@8987 }
-    <name not found> = ArrayList@8988[1] { ResolutionCandidate@8987 }
+ResolutionTaskHolder@8986 {
+    <name not found> = ArrayList@8987[8] { ResolutionCandidate@8988, ResolutionCandidate@8989, ResolutionCandidate@8990, ... }
 }
 
-ResolutionTaskHolder@8989 {
-    <name not found> = ArrayList@8990[1] { ResolutionCandidate@8991 }
-    <name not found> = ArrayList@8992[1] { ResolutionCandidate@8991 }
+ResolutionTaskHolder@8991 {
+    <name not found> = ArrayList@8992[8] { ResolutionCandidate@8993, ResolutionCandidate@8994, ResolutionCandidate@8995, ... }
 }
 
-ResolutionTaskHolder@8993 {
-    <name not found> = ArrayList@8994[1] { ResolutionCandidate@8995 }
-    <name not found> = ArrayList@8996[1] { ResolutionCandidate@8995 }
-}
-
-ResolutionTaskHolder@8997 {
-    <name not found> = ArrayList@8998[1] { ResolutionCandidate@8999 }
-    <name not found> = ArrayList@9000[1] { ResolutionCandidate@8999 }
+ResolutionTaskHolder@8996 {
+    <name not found> = ArrayList@8997[8] { ResolutionCandidate@8998, ResolutionCandidate@8999, ResolutionCandidate@9000, ... }
 }
 
 ResolutionTaskHolder@9001 {
-    <name not found> = ArrayList@9002[1] { ResolutionCandidate@9003 }
-    <name not found> = ArrayList@9004[1] { ResolutionCandidate@9003 }
+    <name not found> = ArrayList@9002[8] { ResolutionCandidate@9003, ResolutionCandidate@9004, ResolutionCandidate@9005, ... }
 }
 
-ResolutionTaskHolder@9005 {
-    <name not found> = ArrayList@9006[1] { ResolutionCandidate@9007 }
-    <name not found> = ArrayList@9008[1] { ResolutionCandidate@9007 }
+ResolutionTaskHolder@9006 {
+    <name not found> = ArrayList@9007[8] { ResolutionCandidate@9008, ResolutionCandidate@9009, ResolutionCandidate@9010, ... }
 }
 
-ResolutionTaskHolder@9009 {
-    <name not found> = ArrayList@9010[1] { ResolutionCandidate@9011 }
-    <name not found> = ArrayList@9012[1] { ResolutionCandidate@9011 }
+ResolutionTaskHolder@9011 {
+    <name not found> = ArrayList@9012[8] { ResolutionCandidate@9013, ResolutionCandidate@9014, ResolutionCandidate@9015, ... }
 }
 
-ResolutionTaskHolder@9013 {
-    <name not found> = ArrayList@9014[1] { ResolutionCandidate@9015 }
-    <name not found> = ArrayList@9016[1] { ResolutionCandidate@9015 }
-}
-
-ResolutionTaskHolder@9017 {
-    <name not found> = ArrayList@9018[1] { ResolutionCandidate@9019 }
-    <name not found> = ArrayList@9020[1] { ResolutionCandidate@9019 }
+ResolutionTaskHolder@9016 {
+    <name not found> = ArrayList@9017[8] { ResolutionCandidate@9018, ResolutionCandidate@9019, ResolutionCandidate@9020, ... }
 }
 
 ResolutionTaskHolder@9021 {
-    <name not found> = ArrayList@9022[1] { ResolutionCandidate@9023 }
-    <name not found> = ArrayList@9024[1] { ResolutionCandidate@9023 }
+    <name not found> = ArrayList@9022[8] { ResolutionCandidate@9023, ResolutionCandidate@9024, ResolutionCandidate@9025, ... }
 }
 
-ResolutionTaskHolder@9025 {
-    <name not found> = ArrayList@9026[1] { ResolutionCandidate@9027 }
-    <name not found> = ArrayList@9028[1] { ResolutionCandidate@9027 }
+ResolutionTaskHolder@9026 {
+    <name not found> = ArrayList@9027[8] { ResolutionCandidate@9028, ResolutionCandidate@9029, ResolutionCandidate@9030, ... }
 }
 
-ResolutionTaskHolder@9029 {
-    <name not found> = ArrayList@9030[1] { ResolutionCandidate@9031 }
-    <name not found> = ArrayList@9032[1] { ResolutionCandidate@9031 }
+ResolutionTaskHolder@9031 {
+    <name not found> = ArrayList@9032[8] { ResolutionCandidate@9033, ResolutionCandidate@9034, ResolutionCandidate@9035, ... }
 }
 
-ResolutionTaskHolder@9033 {
-    <name not found> = ArrayList@9034[1] { ResolutionCandidate@9035 }
-    <name not found> = ArrayList@9036[1] { ResolutionCandidate@9035 }
-}
-
-ResolutionTaskHolder@9037 {
-    <name not found> = ArrayList@9038[1] { ResolutionCandidate@9039 }
-    <name not found> = ArrayList@9040[1] { ResolutionCandidate@9039 }
+ResolutionTaskHolder@9036 {
+    <name not found> = ArrayList@9037[8] { ResolutionCandidate@9038, ResolutionCandidate@9039, ResolutionCandidate@9040, ... }
 }
 
 ResolutionTaskHolder@9041 {
-    <name not found> = ArrayList@9042[1] { ResolutionCandidate@9043 }
-    <name not found> = ArrayList@9044[1] { ResolutionCandidate@9043 }
+    <name not found> = ArrayList@9042[8] { ResolutionCandidate@9043, ResolutionCandidate@9044, ResolutionCandidate@9045, ... }
 }
 
-ResolutionTaskHolder@9045 {
-    <name not found> = ArrayList@9046[1] { ResolutionCandidate@9047 }
-    <name not found> = ArrayList@9048[1] { ResolutionCandidate@9047 }
+ResolutionTaskHolder@9046 {
+    <name not found> = ArrayList@9047[8] { ResolutionCandidate@9048, ResolutionCandidate@9049, ResolutionCandidate@9050, ... }
 }
 
-ResolutionTaskHolder@9049 {
-    <name not found> = ArrayList@9050[1] { ResolutionCandidate@9051 }
-    <name not found> = ArrayList@9052[1] { ResolutionCandidate@9051 }
+ResolutionTaskHolder@9051 {
+    <name not found> = ArrayList@9052[8] { ResolutionCandidate@9053, ResolutionCandidate@9054, ResolutionCandidate@9055, ... }
 }
 
-ResolutionTaskHolder@9053 {
-    <name not found> = ArrayList@9054[1] { ResolutionCandidate@9055 }
-    <name not found> = ArrayList@9056[1] { ResolutionCandidate@9055 }
-}
-
-ResolutionTaskHolder@9057 {
-    <name not found> = ArrayList@9058[1] { ResolutionCandidate@9059 }
-    <name not found> = ArrayList@9060[1] { ResolutionCandidate@9059 }
+ResolutionTaskHolder@9056 {
+    <name not found> = ArrayList@9057[8] { ResolutionCandidate@9058, ResolutionCandidate@9059, ResolutionCandidate@9060, ... }
 }
 
 ResolutionTaskHolder@9061 {
-    <name not found> = ArrayList@9062[1] { ResolutionCandidate@9063 }
-    <name not found> = ArrayList@9064[1] { ResolutionCandidate@9063 }
+    <name not found> = ArrayList@9062[8] { ResolutionCandidate@9063, ResolutionCandidate@9064, ResolutionCandidate@9065, ... }
 }
 
-ResolutionTaskHolder@9065 {
-    <name not found> = ArrayList@9066[1] { ResolutionCandidate@9067 }
-    <name not found> = ArrayList@9068[1] { ResolutionCandidate@9067 }
+ResolutionTaskHolder@9066 {
+    <name not found> = ArrayList@9067[8] { ResolutionCandidate@9068, ResolutionCandidate@9069, ResolutionCandidate@9070, ... }
 }
 
-ResolutionTaskHolder@9069 {
-    <name not found> = ArrayList@9070[1] { ResolutionCandidate@9071 }
-    <name not found> = ArrayList@9072[1] { ResolutionCandidate@9071 }
+ResolutionTaskHolder@9071 {
+    <name not found> = ArrayList@9072[8] { ResolutionCandidate@9073, ResolutionCandidate@9074, ResolutionCandidate@9075, ... }
 }
 
-ResolutionTaskHolder@9073 {
-    <name not found> = ArrayList@9074[1] { ResolutionCandidate@9075 }
-    <name not found> = ArrayList@9076[1] { ResolutionCandidate@9075 }
-}
-
-ResolutionTaskHolder@9077 {
-    <name not found> = ArrayList@9078[1] { ResolutionCandidate@9079 }
-    <name not found> = ArrayList@9080[1] { ResolutionCandidate@9079 }
+ResolutionTaskHolder@9076 {
+    <name not found> = ArrayList@9077[8] { ResolutionCandidate@9078, ResolutionCandidate@9079, ResolutionCandidate@9080, ... }
 }
 
 ResolutionTaskHolder@9081 {
-    <name not found> = ArrayList@9082[1] { ResolutionCandidate@9083 }
-    <name not found> = ArrayList@9084[1] { ResolutionCandidate@9083 }
+    <name not found> = ArrayList@9082[8] { ResolutionCandidate@9083, ResolutionCandidate@9084, ResolutionCandidate@9085, ... }
 }
 
-ResolutionTaskHolder@9085 {
-    <name not found> = ArrayList@9086[1] { ResolutionCandidate@9087 }
-    <name not found> = ArrayList@9088[1] { ResolutionCandidate@9087 }
+ResolutionTaskHolder@9086 {
+    <name not found> = ArrayList@9087[8] { ResolutionCandidate@9088, ResolutionCandidate@9089, ResolutionCandidate@9090, ... }
 }
 
-ResolutionTaskHolder@9089 {
-    <name not found> = ArrayList@9090[1] { ResolutionCandidate@9091 }
-    <name not found> = ArrayList@9092[1] { ResolutionCandidate@9091 }
+ResolutionTaskHolder@9091 {
+    <name not found> = ArrayList@9092[8] { ResolutionCandidate@9093, ResolutionCandidate@9094, ResolutionCandidate@9095, ... }
 }
 
-ResolutionTaskHolder@9093 {
-    <name not found> = ArrayList@9094[1] { ResolutionCandidate@9095 }
-    <name not found> = ArrayList@9096[1] { ResolutionCandidate@9095 }
-}
-
-ResolutionTaskHolder@9097 {
-    <name not found> = ArrayList@9098[1] { ResolutionCandidate@9099 }
-    <name not found> = ArrayList@9100[1] { ResolutionCandidate@9099 }
+ResolutionTaskHolder@9096 {
+    <name not found> = ArrayList@9097[8] { ResolutionCandidate@9098, ResolutionCandidate@9099, ResolutionCandidate@9100, ... }
 }
 
 ResolutionTaskHolder@9101 {
-    <name not found> = ArrayList@9102[1] { ResolutionCandidate@9103 }
-    <name not found> = ArrayList@9104[1] { ResolutionCandidate@9103 }
+    <name not found> = ArrayList@9102[8] { ResolutionCandidate@9103, ResolutionCandidate@9104, ResolutionCandidate@9105, ... }
 }
 
-ResolutionTaskHolder@9105 {
-    <name not found> = ArrayList@9106[1] { ResolutionCandidate@9107 }
-    <name not found> = ArrayList@9108[1] { ResolutionCandidate@9107 }
+ResolutionTaskHolder@9106 {
+    <name not found> = ArrayList@9107[8] { ResolutionCandidate@9108, ResolutionCandidate@9109, ResolutionCandidate@9110, ... }
 }
 
-ResolutionTaskHolder@9109 {
-    <name not found> = ArrayList@9110[1] { ResolutionCandidate@9111 }
-    <name not found> = ArrayList@9112[1] { ResolutionCandidate@9111 }
+ResolutionTaskHolder@9111 {
+    <name not found> = ArrayList@9112[8] { ResolutionCandidate@9113, ResolutionCandidate@9114, ResolutionCandidate@9115, ... }
 }
 
-ResolutionTaskHolder@9113 {
-    <name not found> = ArrayList@9114[1] { ResolutionCandidate@9115 }
-    <name not found> = ArrayList@9116[1] { ResolutionCandidate@9115 }
-}
-
-ResolutionTaskHolder@9117 {
-    <name not found> = ArrayList@9118[1] { ResolutionCandidate@9119 }
-    <name not found> = ArrayList@9120[1] { ResolutionCandidate@9119 }
+ResolutionTaskHolder@9116 {
+    <name not found> = ArrayList@9117[8] { ResolutionCandidate@9118, ResolutionCandidate@9119, ResolutionCandidate@9120, ... }
 }
 
 ResolutionTaskHolder@9121 {
-    <name not found> = ArrayList@9122[1] { ResolutionCandidate@9123 }
-    <name not found> = ArrayList@9124[1] { ResolutionCandidate@9123 }
+    <name not found> = ArrayList@9122[8] { ResolutionCandidate@9123, ResolutionCandidate@9124, ResolutionCandidate@9125, ... }
 }
 
-ResolutionTaskHolder@9125 {
-    <name not found> = ArrayList@9126[1] { ResolutionCandidate@9127 }
-    <name not found> = ArrayList@9128[1] { ResolutionCandidate@9127 }
+ResolutionTaskHolder@9126 {
+    <name not found> = ArrayList@9127[8] { ResolutionCandidate@9128, ResolutionCandidate@9129, ResolutionCandidate@9130, ... }
 }
 
-ResolutionTaskHolder@9129 {
-    <name not found> = ArrayList@9130[1] { ResolutionCandidate@9131 }
-    <name not found> = ArrayList@9132[1] { ResolutionCandidate@9131 }
+ResolutionTaskHolder@9131 {
+    <name not found> = ArrayList@9132[8] { ResolutionCandidate@9133, ResolutionCandidate@9134, ResolutionCandidate@9135, ... }
 }
 
-ResolutionTaskHolder@9133 {
-    <name not found> = ArrayList@9134[1] { ResolutionCandidate@9135 }
-    <name not found> = ArrayList@9136[1] { ResolutionCandidate@9135 }
-}
-
-ResolutionTaskHolder@9137 {
-    <name not found> = ArrayList@9138[1] { ResolutionCandidate@9139 }
-    <name not found> = ArrayList@9140[1] { ResolutionCandidate@9139 }
+ResolutionTaskHolder@9136 {
+    <name not found> = ArrayList@9137[8] { ResolutionCandidate@9138, ResolutionCandidate@9139, ResolutionCandidate@9140, ... }
 }
 
 ResolutionTaskHolder@9141 {
-    <name not found> = ArrayList@9142[1] { ResolutionCandidate@9143 }
-    <name not found> = ArrayList@9144[1] { ResolutionCandidate@9143 }
+    <name not found> = ArrayList@9142[8] { ResolutionCandidate@9143, ResolutionCandidate@9144, ResolutionCandidate@9145, ... }
 }
 
-ResolutionTaskHolder@9145 {
-    <name not found> = ArrayList@9146[1] { ResolutionCandidate@9147 }
-    <name not found> = ArrayList@9148[1] { ResolutionCandidate@9147 }
+ResolutionTaskHolder@9146 {
+    <name not found> = ArrayList@9147[8] { ResolutionCandidate@9148, ResolutionCandidate@9149, ResolutionCandidate@9150, ... }
 }
 
-ResolutionTaskHolder@9149 {
-    <name not found> = ArrayList@9150[1] { ResolutionCandidate@9151 }
-    <name not found> = ArrayList@9152[1] { ResolutionCandidate@9151 }
+ResolutionTaskHolder@9151 {
+    <name not found> = ArrayList@9152[8] { ResolutionCandidate@9153, ResolutionCandidate@9154, ResolutionCandidate@9155, ... }
 }
 
-ResolutionTaskHolder@9153 {
-    <name not found> = ArrayList@9154[1] { ResolutionCandidate@9155 }
-    <name not found> = ArrayList@9156[1] { ResolutionCandidate@9155 }
-}
-
-ResolutionTaskHolder@9157 {
-    <name not found> = ArrayList@9158[1] { ResolutionCandidate@9159 }
-    <name not found> = ArrayList@9160[1] { ResolutionCandidate@9159 }
+ResolutionTaskHolder@9156 {
+    <name not found> = ArrayList@9157[8] { ResolutionCandidate@9158, ResolutionCandidate@9159, ResolutionCandidate@9160, ... }
 }
 
 ResolutionTaskHolder@9161 {
-    <name not found> = ArrayList@9162[1] { ResolutionCandidate@9163 }
-    <name not found> = ArrayList@9164[1] { ResolutionCandidate@9163 }
+    <name not found> = ArrayList@9162[8] { ResolutionCandidate@9163, ResolutionCandidate@9164, ResolutionCandidate@9165, ... }
 }
 
-ResolutionTaskHolder@9165 {
-    <name not found> = ArrayList@9166[1] { ResolutionCandidate@9167 }
-    <name not found> = ArrayList@9168[1] { ResolutionCandidate@9167 }
+ResolutionTaskHolder@9166 {
+    <name not found> = ArrayList@9167[8] { ResolutionCandidate@9168, ResolutionCandidate@9169, ResolutionCandidate@9170, ... }
 }
 
-ResolutionTaskHolder@9169 {
-    <name not found> = ArrayList@9170[1] { ResolutionCandidate@9171 }
-    <name not found> = ArrayList@9172[1] { ResolutionCandidate@9171 }
+ResolutionTaskHolder@9171 {
+    <name not found> = ArrayList@9172[8] { ResolutionCandidate@9173, ResolutionCandidate@9174, ResolutionCandidate@9175, ... }
 }
 
-ResolutionTaskHolder@9173 {
-    <name not found> = ArrayList@9174[1] { ResolutionCandidate@9175 }
-    <name not found> = ArrayList@9176[1] { ResolutionCandidate@9175 }
-}
-
-ResolutionTaskHolder@9177 {
-    <name not found> = ArrayList@9178[1] { ResolutionCandidate@9179 }
-    <name not found> = ArrayList@9180[1] { ResolutionCandidate@9179 }
+ResolutionTaskHolder@9176 {
+    <name not found> = ArrayList@9177[8] { ResolutionCandidate@9178, ResolutionCandidate@9179, ResolutionCandidate@9180, ... }
 }
 
 ResolutionTaskHolder@9181 {
-    <name not found> = ArrayList@9182[1] { ResolutionCandidate@9183 }
-    <name not found> = ArrayList@9184[1] { ResolutionCandidate@9183 }
+    <name not found> = ArrayList@9182[8] { ResolutionCandidate@9183, ResolutionCandidate@9184, ResolutionCandidate@9185, ... }
 }
 
-ResolutionTaskHolder@9185 {
-    <name not found> = ArrayList@9186[1] { ResolutionCandidate@9187 }
-    <name not found> = ArrayList@9188[1] { ResolutionCandidate@9187 }
+ResolutionTaskHolder@9186 {
+    <name not found> = ArrayList@9187[8] { ResolutionCandidate@9188, ResolutionCandidate@9189, ResolutionCandidate@9190, ... }
 }
 
-ResolutionTaskHolder@9189 {
-    <name not found> = ArrayList@9190[1] { ResolutionCandidate@9191 }
-    <name not found> = ArrayList@9192[1] { ResolutionCandidate@9191 }
+ResolutionTaskHolder@9191 {
+    <name not found> = ArrayList@9192[8] { ResolutionCandidate@9193, ResolutionCandidate@9194, ResolutionCandidate@9195, ... }
 }
 
-ResolutionTaskHolder@9193 {
-    <name not found> = ArrayList@9194[1] { ResolutionCandidate@9195 }
-    <name not found> = ArrayList@9196[1] { ResolutionCandidate@9195 }
-}
-
-ResolutionTaskHolder@9197 {
-    <name not found> = ArrayList@9198[1] { ResolutionCandidate@9199 }
-    <name not found> = ArrayList@9200[1] { ResolutionCandidate@9199 }
+ResolutionTaskHolder@9196 {
+    <name not found> = ArrayList@9197[8] { ResolutionCandidate@9198, ResolutionCandidate@9199, ResolutionCandidate@9200, ... }
 }
 
 ResolutionTaskHolder@9201 {
-    <name not found> = ArrayList@9202[1] { ResolutionCandidate@9203 }
-    <name not found> = ArrayList@9204[1] { ResolutionCandidate@9203 }
+    <name not found> = ArrayList@9202[8] { ResolutionCandidate@9203, ResolutionCandidate@9204, ResolutionCandidate@9205, ... }
 }
 
-ResolutionTaskHolder@9205 {
-    <name not found> = ArrayList@9206[1] { ResolutionCandidate@9207 }
-    <name not found> = ArrayList@9208[1] { ResolutionCandidate@9207 }
+ResolutionTaskHolder@9206 {
+    <name not found> = ArrayList@9207[8] { ResolutionCandidate@9208, ResolutionCandidate@9209, ResolutionCandidate@9210, ... }
 }
 
-ResolutionTaskHolder@9209 {
-    <name not found> = ArrayList@9210[1] { ResolutionCandidate@9211 }
-    <name not found> = ArrayList@9212[1] { ResolutionCandidate@9211 }
+ResolutionTaskHolder@9211 {
+    <name not found> = ArrayList@9212[8] { ResolutionCandidate@9213, ResolutionCandidate@9214, ResolutionCandidate@9215, ... }
 }
 
-ResolutionTaskHolder@9213 {
-    <name not found> = ArrayList@9214[1] { ResolutionCandidate@9215 }
-    <name not found> = ArrayList@9216[1] { ResolutionCandidate@9215 }
-}
-
-ResolutionTaskHolder@9217 {
-    <name not found> = ArrayList@9218[1] { ResolutionCandidate@9219 }
-    <name not found> = ArrayList@9220[1] { ResolutionCandidate@9219 }
+ResolutionTaskHolder@9216 {
+    <name not found> = ArrayList@9217[8] { ResolutionCandidate@9218, ResolutionCandidate@9219, ResolutionCandidate@9220, ... }
 }
 
 ResolutionTaskHolder@9221 {
-    <name not found> = ArrayList@9222[1] { ResolutionCandidate@9223 }
-    <name not found> = ArrayList@9224[1] { ResolutionCandidate@9223 }
+    <name not found> = ArrayList@9222[8] { ResolutionCandidate@9223, ResolutionCandidate@9224, ResolutionCandidate@9225, ... }
 }
 
-ResolutionTaskHolder@9225 {
-    <name not found> = ArrayList@9226[1] { ResolutionCandidate@9227 }
-    <name not found> = ArrayList@9228[1] { ResolutionCandidate@9227 }
+ResolutionTaskHolder@9226 {
+    <name not found> = ArrayList@9227[8] { ResolutionCandidate@9228, ResolutionCandidate@9229, ResolutionCandidate@9230, ... }
 }
 
-ResolutionTaskHolder@9229 {
-    <name not found> = ArrayList@9230[1] { ResolutionCandidate@9231 }
-    <name not found> = ArrayList@9232[1] { ResolutionCandidate@9231 }
+ResolutionTaskHolder@9231 {
+    <name not found> = ArrayList@9232[8] { ResolutionCandidate@9233, ResolutionCandidate@9234, ResolutionCandidate@9235, ... }
 }
 
-ResolutionTaskHolder@9233 {
-    <name not found> = ArrayList@9234[1] { ResolutionCandidate@9235 }
-    <name not found> = ArrayList@9236[1] { ResolutionCandidate@9235 }
-}
-
-ResolutionTaskHolder@9237 {
-    <name not found> = ArrayList@9238[1] { ResolutionCandidate@9239 }
-    <name not found> = ArrayList@9240[1] { ResolutionCandidate@9239 }
+ResolutionTaskHolder@9236 {
+    <name not found> = ArrayList@9237[8] { ResolutionCandidate@9238, ResolutionCandidate@9239, ResolutionCandidate@9240, ... }
 }
 
 ResolutionTaskHolder@9241 {
-    <name not found> = ArrayList@9242[1] { ResolutionCandidate@9243 }
-    <name not found> = ArrayList@9244[1] { ResolutionCandidate@9243 }
+    <name not found> = ArrayList@9242[8] { ResolutionCandidate@9243, ResolutionCandidate@9244, ResolutionCandidate@9245, ... }
 }
 
-ResolutionTaskHolder@9245 {
-    <name not found> = ArrayList@9246[1] { ResolutionCandidate@9247 }
-    <name not found> = ArrayList@9248[1] { ResolutionCandidate@9247 }
+ResolutionTaskHolder@9246 {
+    <name not found> = ArrayList@9247[8] { ResolutionCandidate@9248, ResolutionCandidate@9249, ResolutionCandidate@9250, ... }
 }
 
-ResolutionTaskHolder@9249 {
-    <name not found> = ArrayList@9250[1] { ResolutionCandidate@9251 }
-    <name not found> = ArrayList@9252[1] { ResolutionCandidate@9251 }
+ResolutionTaskHolder@9251 {
+    <name not found> = ArrayList@9252[8] { ResolutionCandidate@9253, ResolutionCandidate@9254, ResolutionCandidate@9255, ... }
 }
 
-ResolutionTaskHolder@9253 {
-    <name not found> = ArrayList@9254[1] { ResolutionCandidate@9255 }
-    <name not found> = ArrayList@9256[1] { ResolutionCandidate@9255 }
-}
-
-ResolutionTaskHolder@9257 {
-    <name not found> = ArrayList@9258[1] { ResolutionCandidate@9259 }
-    <name not found> = ArrayList@9260[1] { ResolutionCandidate@9259 }
+ResolutionTaskHolder@9256 {
+    <name not found> = ArrayList@9257[8] { ResolutionCandidate@9258, ResolutionCandidate@9259, ResolutionCandidate@9260, ... }
 }
 
 ResolutionTaskHolder@9261 {
-    <name not found> = ArrayList@9262[1] { ResolutionCandidate@9263 }
-    <name not found> = ArrayList@9264[1] { ResolutionCandidate@9263 }
-}
-
-ResolutionTaskHolder@9265 {
-    <name not found> = ArrayList@9266[1] { ResolutionCandidate@9267 }
-    <name not found> = ArrayList@9268[1] { ResolutionCandidate@9267 }
-}
-
-ResolutionTaskHolder@9269 {
-    <name not found> = ArrayList@9270[1] { ResolutionCandidate@9271 }
-    <name not found> = ArrayList@9272[1] { ResolutionCandidate@9271 }
-}
-
-ResolutionTaskHolder@9273 {
-    <name not found> = ArrayList@9274[1] { ResolutionCandidate@9275 }
-    <name not found> = ArrayList@9276[1] { ResolutionCandidate@9275 }
-}
-
-ResolutionTaskHolder@9277 {
-    <name not found> = ArrayList@9278[1] { ResolutionCandidate@9279 }
-    <name not found> = ArrayList@9280[1] { ResolutionCandidate@9279 }
-}
-
-ResolutionTaskHolder@9281 {
-    <name not found> = ArrayList@9282[1] { ResolutionCandidate@9283 }
-    <name not found> = ArrayList@9284[1] { ResolutionCandidate@9283 }
-}
-
-ResolutionTaskHolder@9285 {
-    <name not found> = ArrayList@9286[1] { ResolutionCandidate@9287 }
-    <name not found> = ArrayList@9288[1] { ResolutionCandidate@9287 }
-}
-
-ResolutionTaskHolder@9289 {
-    <name not found> = ArrayList@9290[1] { ResolutionCandidate@9291 }
-    <name not found> = ArrayList@9292[1] { ResolutionCandidate@9291 }
-}
-
-ResolutionTaskHolder@9293 {
-    <name not found> = ArrayList@9294[1] { ResolutionCandidate@9295 }
-    <name not found> = ArrayList@9296[1] { ResolutionCandidate@9295 }
-}
-
-ResolutionTaskHolder@9297 {
-    <name not found> = ArrayList@9298[1] { ResolutionCandidate@9299 }
-    <name not found> = ArrayList@9300[1] { ResolutionCandidate@9299 }
-}
-
-ResolutionTaskHolder@9301 {
-    <name not found> = ArrayList@9302[1] { ResolutionCandidate@9303 }
-    <name not found> = ArrayList@9304[1] { ResolutionCandidate@9303 }
-}
-
-ResolutionTaskHolder@9305 {
-    <name not found> = ArrayList@9306[1] { ResolutionCandidate@9307 }
-    <name not found> = ArrayList@9308[1] { ResolutionCandidate@9307 }
-}
-
-ResolutionTaskHolder@9309 {
-    <name not found> = ArrayList@9310[1] { ResolutionCandidate@9311 }
-    <name not found> = ArrayList@9312[1] { ResolutionCandidate@9311 }
-}
-
-ResolutionTaskHolder@9313 {
-    <name not found> = ArrayList@9314[1] { ResolutionCandidate@9315 }
-    <name not found> = ArrayList@9316[1] { ResolutionCandidate@9315 }
-}
-
-ResolutionTaskHolder@9317 {
-    <name not found> = ArrayList@9318[1] { ResolutionCandidate@9319 }
-    <name not found> = ArrayList@9320[1] { ResolutionCandidate@9319 }
-}
-
-ResolutionTaskHolder@9321 {
-    <name not found> = ArrayList@9322[1] { ResolutionCandidate@9323 }
-    <name not found> = ArrayList@9324[1] { ResolutionCandidate@9323 }
-}
-
-ResolutionTaskHolder@9325 {
-    <name not found> = ArrayList@9326[1] { ResolutionCandidate@9327 }
-    <name not found> = ArrayList@9328[1] { ResolutionCandidate@9327 }
-}
-
-ResolutionTaskHolder@9329 {
-    <name not found> = ArrayList@9330[1] { ResolutionCandidate@9331 }
-    <name not found> = ArrayList@9332[1] { ResolutionCandidate@9331 }
-}
-
-ResolutionTaskHolder@9333 {
-    <name not found> = ArrayList@9334[1] { ResolutionCandidate@9335 }
-    <name not found> = ArrayList@9336[1] { ResolutionCandidate@9335 }
-}
-
-ResolutionTaskHolder@9337 {
-    <name not found> = ArrayList@9338[1] { ResolutionCandidate@9339 }
-    <name not found> = ArrayList@9340[1] { ResolutionCandidate@9339 }
-}
-
-ResolutionTaskHolder@9341 {
-    <name not found> = ArrayList@9342[1] { ResolutionCandidate@9343 }
-    <name not found> = ArrayList@9344[1] { ResolutionCandidate@9343 }
-}
-
-ResolutionTaskHolder@9345 {
-    <name not found> = ArrayList@9346[1] { ResolutionCandidate@9347 }
-    <name not found> = ArrayList@9348[1] { ResolutionCandidate@9347 }
-}
-
-ResolutionTaskHolder@9349 {
-    <name not found> = ArrayList@9350[1] { ResolutionCandidate@9351 }
-    <name not found> = ArrayList@9352[1] { ResolutionCandidate@9351 }
-}
-
-ResolutionTaskHolder@9353 {
-    <name not found> = ArrayList@9354[1] { ResolutionCandidate@9355 }
-    <name not found> = ArrayList@9356[1] { ResolutionCandidate@9355 }
-}
-
-ResolutionTaskHolder@9357 {
-    <name not found> = ArrayList@9358[1] { ResolutionCandidate@9359 }
-    <name not found> = ArrayList@9360[1] { ResolutionCandidate@9359 }
-}
-
-ResolutionTaskHolder@9361 {
-    <name not found> = ArrayList@9362[1] { ResolutionCandidate@9363 }
-    <name not found> = ArrayList@9364[1] { ResolutionCandidate@9363 }
-}
-
-ResolutionTaskHolder@9365 {
-    <name not found> = ArrayList@9366[1] { ResolutionCandidate@9367 }
-    <name not found> = ArrayList@9368[1] { ResolutionCandidate@9367 }
-}
-
-ResolutionTaskHolder@9369 {
-    <name not found> = ArrayList@9370[1] { ResolutionCandidate@9371 }
-    <name not found> = ArrayList@9372[1] { ResolutionCandidate@9371 }
-}
-
-ResolutionTaskHolder@9373 {
-    <name not found> = ArrayList@9374[1] { ResolutionCandidate@9375 }
-    <name not found> = ArrayList@9376[1] { ResolutionCandidate@9375 }
-}
-
-ResolutionTaskHolder@9377 {
-    <name not found> = ArrayList@9378[1] { ResolutionCandidate@9379 }
-    <name not found> = ArrayList@9380[1] { ResolutionCandidate@9379 }
-}
-
-ResolutionTaskHolder@9381 {
-    <name not found> = ArrayList@9382[1] { ResolutionCandidate@9383 }
-    <name not found> = ArrayList@9384[1] { ResolutionCandidate@9383 }
-}
-
-ResolutionTaskHolder@9385 {
-    <name not found> = ArrayList@9386[1] { ResolutionCandidate@9387 }
-    <name not found> = ArrayList@9388[1] { ResolutionCandidate@9387 }
-}
-
-ResolutionTaskHolder@9389 {
-    <name not found> = ArrayList@9390[1] { ResolutionCandidate@9391 }
-    <name not found> = ArrayList@9392[1] { ResolutionCandidate@9391 }
-}
-
-ResolutionTaskHolder@9393 {
-    <name not found> = ArrayList@9394[1] { ResolutionCandidate@9395 }
-    <name not found> = ArrayList@9396[1] { ResolutionCandidate@9395 }
-}
-
-ResolutionTaskHolder@9397 {
-    <name not found> = ArrayList@9398[1] { ResolutionCandidate@9399 }
-    <name not found> = ArrayList@9400[1] { ResolutionCandidate@9399 }
-}
-
-ResolutionTaskHolder@9401 {
-    <name not found> = ArrayList@9402[1] { ResolutionCandidate@9403 }
-    <name not found> = ArrayList@9404[1] { ResolutionCandidate@9403 }
-}
-
-ResolutionTaskHolder@9405 {
-    <name not found> = ArrayList@9406[1] { ResolutionCandidate@9407 }
-    <name not found> = ArrayList@9408[1] { ResolutionCandidate@9407 }
-}
-
-ResolutionTaskHolder@9409 {
-    <name not found> = ArrayList@9410[1] { ResolutionCandidate@9411 }
-    <name not found> = ArrayList@9412[1] { ResolutionCandidate@9411 }
-}
-
-ResolutionTaskHolder@9413 {
-    <name not found> = ArrayList@9414[1] { ResolutionCandidate@9415 }
-    <name not found> = ArrayList@9416[1] { ResolutionCandidate@9415 }
-}
-
-ResolutionTaskHolder@9417 {
-    <name not found> = ArrayList@9418[1] { ResolutionCandidate@9419 }
-    <name not found> = ArrayList@9420[1] { ResolutionCandidate@9419 }
-}
-
-ResolutionTaskHolder@9421 {
-    <name not found> = ArrayList@9422[1] { ResolutionCandidate@9423 }
-    <name not found> = ArrayList@9424[1] { ResolutionCandidate@9423 }
-}
-
-ResolutionTaskHolder@9425 {
-    <name not found> = ArrayList@9426[1] { ResolutionCandidate@9427 }
-    <name not found> = ArrayList@9428[1] { ResolutionCandidate@9427 }
-}
-
-ResolutionTaskHolder@9429 {
-    <name not found> = ArrayList@9430[1] { ResolutionCandidate@9431 }
-    <name not found> = ArrayList@9432[1] { ResolutionCandidate@9431 }
-}
-
-ResolutionTaskHolder@9433 {
-    <name not found> = ArrayList@9434[1] { ResolutionCandidate@9435 }
-    <name not found> = ArrayList@9436[1] { ResolutionCandidate@9435 }
-}
-
-ResolutionTaskHolder@9437 {
-    <name not found> = ArrayList@9438[1] { ResolutionCandidate@9439 }
-    <name not found> = ArrayList@9440[1] { ResolutionCandidate@9439 }
-}
-
-ResolutionTaskHolder@9441 {
-    <name not found> = ArrayList@9442[1] { ResolutionCandidate@9443 }
-    <name not found> = ArrayList@9444[1] { ResolutionCandidate@9443 }
-}
-
-ResolutionTaskHolder@9445 {
-    <name not found> = ArrayList@9446[1] { ResolutionCandidate@9447 }
-    <name not found> = ArrayList@9448[1] { ResolutionCandidate@9447 }
-}
-
-ResolutionTaskHolder@9449 {
-    <name not found> = ArrayList@9450[1] { ResolutionCandidate@9451 }
-    <name not found> = ArrayList@9452[1] { ResolutionCandidate@9451 }
-}
-
-ResolutionTaskHolder@9453 {
-    <name not found> = ArrayList@9454[1] { ResolutionCandidate@9455 }
-    <name not found> = ArrayList@9456[1] { ResolutionCandidate@9455 }
-}
-
-ResolutionTaskHolder@9457 {
-    <name not found> = ArrayList@9458[1] { ResolutionCandidate@9459 }
-    <name not found> = ArrayList@9460[1] { ResolutionCandidate@9459 }
-}
-
-ResolutionTaskHolder@9461 {
-    <name not found> = ArrayList@9462[1] { ResolutionCandidate@9463 }
-    <name not found> = ArrayList@9464[1] { ResolutionCandidate@9463 }
-}
-
-ResolutionTaskHolder@9465 {
-    <name not found> = ArrayList@9466[1] { ResolutionCandidate@9467 }
-    <name not found> = ArrayList@9468[1] { ResolutionCandidate@9467 }
-}
-
-ResolutionTaskHolder@9469 {
-    <name not found> = ArrayList@9470[1] { ResolutionCandidate@9471 }
-    <name not found> = ArrayList@9472[1] { ResolutionCandidate@9471 }
-}
-
-ResolutionTaskHolder@9473 {
-    <name not found> = ArrayList@9474[1] { ResolutionCandidate@9475 }
-    <name not found> = ArrayList@9476[1] { ResolutionCandidate@9475 }
-}
-
-ResolutionTaskHolder@9477 {
-    <name not found> = ArrayList@9478[1] { ResolutionCandidate@9479 }
-    <name not found> = ArrayList@9480[1] { ResolutionCandidate@9479 }
-}
-
-ResolutionTaskHolder@9481 {
-    <name not found> = ArrayList@9482[1] { ResolutionCandidate@9483 }
-    <name not found> = ArrayList@9484[1] { ResolutionCandidate@9483 }
-}
-
-ResolutionTaskHolder@9485 {
-    <name not found> = ArrayList@9486[1] { ResolutionCandidate@9487 }
-    <name not found> = ArrayList@9488[1] { ResolutionCandidate@9487 }
-}
-
-ResolutionTaskHolder@9489 {
-    <name not found> = ArrayList@9490[1] { ResolutionCandidate@9491 }
-    <name not found> = ArrayList@9492[1] { ResolutionCandidate@9491 }
-}
-
-ResolutionTaskHolder@9493 {
-    <name not found> = ArrayList@9494[1] { ResolutionCandidate@9495 }
-    <name not found> = ArrayList@9496[1] { ResolutionCandidate@9495 }
-}
-
-ResolutionTaskHolder@9497 {
-    <name not found> = ArrayList@9498[1] { ResolutionCandidate@9499 }
-    <name not found> = ArrayList@9500[1] { ResolutionCandidate@9499 }
-}
-
-ResolutionTaskHolder@9501 {
-    <name not found> = ArrayList@9502[1] { ResolutionCandidate@9503 }
-    <name not found> = ArrayList@9504[1] { ResolutionCandidate@9503 }
-}
-
-ResolutionTaskHolder@9505 {
-    <name not found> = ArrayList@9506[1] { ResolutionCandidate@9507 }
-    <name not found> = ArrayList@9508[1] { ResolutionCandidate@9507 }
-}
-
-ResolutionTaskHolder@9509 {
-    <name not found> = ArrayList@9510[1] { ResolutionCandidate@9511 }
-    <name not found> = ArrayList@9512[1] { ResolutionCandidate@9511 }
-}
-
-ResolutionTaskHolder@9513 {
-    <name not found> = ArrayList@9514[1] { ResolutionCandidate@9515 }
-    <name not found> = ArrayList@9516[1] { ResolutionCandidate@9515 }
-}
-
-ResolutionTaskHolder@9517 {
-    <name not found> = ArrayList@9518[1] { ResolutionCandidate@9519 }
-    <name not found> = ArrayList@9520[1] { ResolutionCandidate@9519 }
-}
-
-ResolutionTaskHolder@9521 {
-    <name not found> = ArrayList@9522[1] { ResolutionCandidate@9523 }
-    <name not found> = ArrayList@9524[1] { ResolutionCandidate@9523 }
-}
-
-ResolutionTaskHolder@9525 {
-    <name not found> = ArrayList@9526[1] { ResolutionCandidate@9527 }
-    <name not found> = ArrayList@9528[1] { ResolutionCandidate@9527 }
-}
-
-ResolutionTaskHolder@9529 {
-    <name not found> = ArrayList@9530[1] { ResolutionCandidate@9531 }
-    <name not found> = ArrayList@9532[1] { ResolutionCandidate@9531 }
-}
-
-ResolutionTaskHolder@9533 {
-    <name not found> = ArrayList@9534[1] { ResolutionCandidate@9535 }
-    <name not found> = ArrayList@9536[1] { ResolutionCandidate@9535 }
-}
-
-ResolutionTaskHolder@9537 {
-    <name not found> = ArrayList@9538[1] { ResolutionCandidate@9539 }
-    <name not found> = ArrayList@9540[1] { ResolutionCandidate@9539 }
-}
-
-ResolutionTaskHolder@9541 {
-    <name not found> = ArrayList@9542[1] { ResolutionCandidate@9543 }
-    <name not found> = ArrayList@9544[1] { ResolutionCandidate@9543 }
-}
-
-ResolutionTaskHolder@9545 {
-    <name not found> = ArrayList@9546[1] { ResolutionCandidate@9547 }
-    <name not found> = ArrayList@9548[1] { ResolutionCandidate@9547 }
-}
-
-ResolutionTaskHolder@9549 {
-    <name not found> = ArrayList@9550[1] { ResolutionCandidate@9551 }
-    <name not found> = ArrayList@9552[1] { ResolutionCandidate@9551 }
-}
-
-ResolutionTaskHolder@9553 {
-    <name not found> = ArrayList@9554[1] { ResolutionCandidate@9555 }
-    <name not found> = ArrayList@9556[1] { ResolutionCandidate@9555 }
-}
-
-ResolutionTaskHolder@9557 {
-    <name not found> = ArrayList@9558[1] { ResolutionCandidate@9559 }
-    <name not found> = ArrayList@9560[1] { ResolutionCandidate@9559 }
-}
-
-ResolutionTaskHolder@9561 {
-    <name not found> = ArrayList@9562[1] { ResolutionCandidate@9563 }
-    <name not found> = ArrayList@9564[1] { ResolutionCandidate@9563 }
-}
-
-ResolutionTaskHolder@9565 {
-    <name not found> = ArrayList@9566[1] { ResolutionCandidate@9567 }
-    <name not found> = ArrayList@9568[1] { ResolutionCandidate@9567 }
-}
-
-ResolutionTaskHolder@9569 {
-    <name not found> = ArrayList@9570[1] { ResolutionCandidate@9571 }
-    <name not found> = ArrayList@9572[1] { ResolutionCandidate@9571 }
-}
-
-ResolutionTaskHolder@9573 {
-    <name not found> = ArrayList@9574[1] { ResolutionCandidate@9575 }
-    <name not found> = ArrayList@9576[1] { ResolutionCandidate@9575 }
-}
-
-ResolutionTaskHolder@9577 {
-    <name not found> = ArrayList@9578[1] { ResolutionCandidate@9579 }
-    <name not found> = ArrayList@9580[1] { ResolutionCandidate@9579 }
-}
-
-ResolutionTaskHolder@9581 {
-    <name not found> = ArrayList@9582[1] { ResolutionCandidate@9583 }
-    <name not found> = ArrayList@9584[1] { ResolutionCandidate@9583 }
-}
-
-ResolutionTaskHolder@9585 {
-    <name not found> = ArrayList@9586[1] { ResolutionCandidate@9587 }
-    <name not found> = ArrayList@9588[1] { ResolutionCandidate@9587 }
-}
-
-ResolutionTaskHolder@9589 {
-    <name not found> = ArrayList@9590[1] { ResolutionCandidate@9591 }
-    <name not found> = ArrayList@9592[1] { ResolutionCandidate@9591 }
-}
-
-ResolutionTaskHolder@9593 {
-    <name not found> = ArrayList@9594[1] { ResolutionCandidate@9595 }
-    <name not found> = ArrayList@9596[1] { ResolutionCandidate@9595 }
-}
-
-ResolutionTaskHolder@9597 {
-    <name not found> = ArrayList@9598[1] { ResolutionCandidate@9599 }
-    <name not found> = ArrayList@9600[1] { ResolutionCandidate@9599 }
-}
-
-ResolutionTaskHolder@9601 {
-    <name not found> = ArrayList@9602[1] { ResolutionCandidate@9603 }
-    <name not found> = ArrayList@9604[1] { ResolutionCandidate@9603 }
-}
-
-ResolutionTaskHolder@9605 {
-    <name not found> = ArrayList@9606[1] { ResolutionCandidate@9607 }
-    <name not found> = ArrayList@9608[1] { ResolutionCandidate@9607 }
-}
-
-ResolutionTaskHolder@9609 {
-    <name not found> = ArrayList@9610[1] { ResolutionCandidate@9611 }
-    <name not found> = ArrayList@9612[1] { ResolutionCandidate@9611 }
-}
-
-ResolutionTaskHolder@9613 {
-    <name not found> = ArrayList@9614[1] { ResolutionCandidate@9615 }
-    <name not found> = ArrayList@9616[1] { ResolutionCandidate@9615 }
-}
-
-ResolutionTaskHolder@9617 {
-    <name not found> = ArrayList@9618[1] { ResolutionCandidate@9619 }
-    <name not found> = ArrayList@9620[1] { ResolutionCandidate@9619 }
-}
-
-ResolutionTaskHolder@9621 {
-    <name not found> = ArrayList@9622[1] { ResolutionCandidate@9623 }
-    <name not found> = ArrayList@9624[1] { ResolutionCandidate@9623 }
-}
-
-ResolutionTaskHolder@9625 {
-    <name not found> = ArrayList@9626[1] { ResolutionCandidate@9627 }
-    <name not found> = ArrayList@9628[1] { ResolutionCandidate@9627 }
-}
-
-ResolutionTaskHolder@9629 {
-    <name not found> = ArrayList@9630[1] { ResolutionCandidate@9631 }
-    <name not found> = ArrayList@9632[1] { ResolutionCandidate@9631 }
-}
-
-ResolutionTaskHolder@9633 {
-    <name not found> = ArrayList@9634[1] { ResolutionCandidate@9635 }
-    <name not found> = ArrayList@9636[1] { ResolutionCandidate@9635 }
-}
-
-ResolutionTaskHolder@9637 {
-    <name not found> = ArrayList@9638[1] { ResolutionCandidate@9639 }
-    <name not found> = ArrayList@9640[1] { ResolutionCandidate@9639 }
-}
-
-ResolutionTaskHolder@9641 {
-    <name not found> = ArrayList@9642[1] { ResolutionCandidate@9643 }
-    <name not found> = ArrayList@9644[1] { ResolutionCandidate@9643 }
-}
-
-ResolutionTaskHolder@9645 {
-    <name not found> = ArrayList@9646[1] { ResolutionCandidate@9647 }
-    <name not found> = ArrayList@9648[1] { ResolutionCandidate@9647 }
-}
-
-ResolutionTaskHolder@9649 {
-    <name not found> = ArrayList@9650[1] { ResolutionCandidate@9651 }
-    <name not found> = ArrayList@9652[1] { ResolutionCandidate@9651 }
-}
-
-ResolutionTaskHolder@9653 {
-    <name not found> = ArrayList@9654[1] { ResolutionCandidate@9655 }
-    <name not found> = ArrayList@9656[1] { ResolutionCandidate@9655 }
-}
-
-ResolutionTaskHolder@9657 {
-    <name not found> = ArrayList@9658[1] { ResolutionCandidate@9659 }
-    <name not found> = ArrayList@9660[1] { ResolutionCandidate@9659 }
-}
-
-ResolutionTaskHolder@9661 {
-    <name not found> = ArrayList@9662[1] { ResolutionCandidate@9663 }
-    <name not found> = ArrayList@9664[1] { ResolutionCandidate@9663 }
-}
-
-ResolutionTaskHolder@9665 {
-    <name not found> = ArrayList@9666[1] { ResolutionCandidate@9667 }
-    <name not found> = ArrayList@9668[1] { ResolutionCandidate@9667 }
-}
-
-ResolutionTaskHolder@9669 {
-    <name not found> = ArrayList@9670[1] { ResolutionCandidate@9671 }
-    <name not found> = ArrayList@9672[1] { ResolutionCandidate@9671 }
-}
-
-ResolutionTaskHolder@9673 {
-    <name not found> = ArrayList@9674[1] { ResolutionCandidate@9675 }
-    <name not found> = ArrayList@9676[1] { ResolutionCandidate@9675 }
-}
-
-ResolutionTaskHolder@9677 {
-    <name not found> = ArrayList@9678[1] { ResolutionCandidate@9679 }
-    <name not found> = ArrayList@9680[1] { ResolutionCandidate@9679 }
-}
-
-ResolutionTaskHolder@9681 {
-    <name not found> = ArrayList@9682[1] { ResolutionCandidate@9683 }
-    <name not found> = ArrayList@9684[1] { ResolutionCandidate@9683 }
-}
-
-ResolutionTaskHolder@9685 {
-    <name not found> = ArrayList@9686[1] { ResolutionCandidate@9687 }
-    <name not found> = ArrayList@9688[1] { ResolutionCandidate@9687 }
-}
-
-ResolutionTaskHolder@9689 {
-    <name not found> = ArrayList@9690[1] { ResolutionCandidate@9691 }
-    <name not found> = ArrayList@9692[1] { ResolutionCandidate@9691 }
-}
-
-ResolutionTaskHolder@9693 {
-    <name not found> = ArrayList@9694[1] { ResolutionCandidate@9695 }
-    <name not found> = ArrayList@9696[1] { ResolutionCandidate@9695 }
-}
-
-ResolutionTaskHolder@9697 {
-    <name not found> = ArrayList@9698[1] { ResolutionCandidate@9699 }
-    <name not found> = ArrayList@9700[1] { ResolutionCandidate@9699 }
-}
-
-ResolutionTaskHolder@9701 {
-    <name not found> = ArrayList@9702[1] { ResolutionCandidate@9703 }
-    <name not found> = ArrayList@9704[1] { ResolutionCandidate@9703 }
-}
-
-ResolutionTaskHolder@9705 {
-    <name not found> = ArrayList@9706[1] { ResolutionCandidate@9707 }
-    <name not found> = ArrayList@9708[1] { ResolutionCandidate@9707 }
-}
-
-ResolutionTaskHolder@9709 {
-    <name not found> = ArrayList@9710[1] { ResolutionCandidate@9711 }
-    <name not found> = ArrayList@9712[1] { ResolutionCandidate@9711 }
-}
-
-ResolutionTaskHolder@9713 {
-    <name not found> = ArrayList@9714[1] { ResolutionCandidate@9715 }
-    <name not found> = ArrayList@9716[1] { ResolutionCandidate@9715 }
-}
-
-ResolutionTaskHolder@9717 {
-    <name not found> = ArrayList@9718[1] { ResolutionCandidate@9719 }
-    <name not found> = ArrayList@9720[1] { ResolutionCandidate@9719 }
-}
-
-ResolutionTaskHolder@9721 {
-    <name not found> = ArrayList@9722[1] { ResolutionCandidate@9723 }
-    <name not found> = ArrayList@9724[1] { ResolutionCandidate@9723 }
-}
-
-ResolutionTaskHolder@9725 {
-    <name not found> = ArrayList@9726[1] { ResolutionCandidate@9727 }
-    <name not found> = ArrayList@9728[1] { ResolutionCandidate@9727 }
-}
-
-ResolutionTaskHolder@9729 {
-    <name not found> = ArrayList@9730[1] { ResolutionCandidate@9731 }
-    <name not found> = ArrayList@9732[1] { ResolutionCandidate@9731 }
-}
-
-ResolutionTaskHolder@9733 {
-    <name not found> = ArrayList@9734[1] { ResolutionCandidate@9735 }
-    <name not found> = ArrayList@9736[1] { ResolutionCandidate@9735 }
-}
-
-ResolutionTaskHolder@9737 {
-    <name not found> = ArrayList@9738[1] { ResolutionCandidate@9739 }
-    <name not found> = ArrayList@9740[1] { ResolutionCandidate@9739 }
-}
-
-ResolutionTaskHolder@9741 {
-    <name not found> = ArrayList@9742[1] { ResolutionCandidate@9743 }
-    <name not found> = ArrayList@9744[1] { ResolutionCandidate@9743 }
-}
-
-ResolutionTaskHolder@9745 {
-    <name not found> = ArrayList@9746[1] { ResolutionCandidate@9747 }
-    <name not found> = ArrayList@9748[1] { ResolutionCandidate@9747 }
-}
-
-ResolutionTaskHolder@9749 {
-    <name not found> = ArrayList@9750[1] { ResolutionCandidate@9751 }
-    <name not found> = ArrayList@9752[1] { ResolutionCandidate@9751 }
-}
-
-ResolutionTaskHolder@9753 {
-    <name not found> = ArrayList@9754[1] { ResolutionCandidate@9755 }
-    <name not found> = ArrayList@9756[1] { ResolutionCandidate@9755 }
-}
-
-ResolutionTaskHolder@9757 {
-    <name not found> = ArrayList@9758[1] { ResolutionCandidate@9759 }
-    <name not found> = ArrayList@9760[1] { ResolutionCandidate@9759 }
-}
-
-ResolutionTaskHolder@9761 {
-    <name not found> = ArrayList@9762[1] { ResolutionCandidate@9763 }
-    <name not found> = ArrayList@9764[1] { ResolutionCandidate@9763 }
-}
-
-ResolutionTaskHolder@9765 {
-    <name not found> = ArrayList@9766[1] { ResolutionCandidate@9767 }
-    <name not found> = ArrayList@9768[1] { ResolutionCandidate@9767 }
-}
-
-ResolutionTaskHolder@9769 {
-    <name not found> = ArrayList@9770[1] { ResolutionCandidate@9771 }
-    <name not found> = ArrayList@9772[1] { ResolutionCandidate@9771 }
-}
-
-ResolutionTaskHolder@9773 {
-    <name not found> = ArrayList@9774[1] { ResolutionCandidate@9775 }
-    <name not found> = ArrayList@9776[1] { ResolutionCandidate@9775 }
-}
-
-ResolutionTaskHolder@9777 {
-    <name not found> = ArrayList@9778[1] { ResolutionCandidate@9779 }
-    <name not found> = ArrayList@9780[1] { ResolutionCandidate@9779 }
-}
-
-ResolutionTaskHolder@9781 {
-    <name not found> = ArrayList@9782[1] { ResolutionCandidate@9783 }
-    <name not found> = ArrayList@9784[1] { ResolutionCandidate@9783 }
-}
-
-ResolutionTaskHolder@9785 {
-    <name not found> = ArrayList@9786[1] { ResolutionCandidate@9787 }
-    <name not found> = ArrayList@9788[1] { ResolutionCandidate@9787 }
-}
-
-ResolutionTaskHolder@9789 {
-    <name not found> = ArrayList@9790[1] { ResolutionCandidate@9791 }
-    <name not found> = ArrayList@9792[1] { ResolutionCandidate@9791 }
-}
-
-ResolutionTaskHolder@9793 {
-    <name not found> = ArrayList@9794[1] { ResolutionCandidate@9795 }
-    <name not found> = ArrayList@9796[1] { ResolutionCandidate@9795 }
-}
-
-ResolutionTaskHolder@9797 {
-    <name not found> = ArrayList@9798[1] { ResolutionCandidate@9799 }
-    <name not found> = ArrayList@9800[1] { ResolutionCandidate@9799 }
-}
-
-ResolutionTaskHolder@9801 {
-    <name not found> = ArrayList@9802[1] { ResolutionCandidate@9803 }
-    <name not found> = ArrayList@9804[1] { ResolutionCandidate@9803 }
-}
-
-ResolutionTaskHolder@9805 {
-    <name not found> = ArrayList@9806[1] { ResolutionCandidate@9807 }
-    <name not found> = ArrayList@9808[1] { ResolutionCandidate@9807 }
-}
-
-ResolutionTaskHolder@9809 {
-    <name not found> = ArrayList@9810[1] { ResolutionCandidate@9811 }
-    <name not found> = ArrayList@9812[1] { ResolutionCandidate@9811 }
-}
-
-ResolutionTaskHolder@9813 {
-    <name not found> = ArrayList@9814[1] { ResolutionCandidate@9815 }
-    <name not found> = ArrayList@9816[1] { ResolutionCandidate@9815 }
-}
-
-ResolutionTaskHolder@9817 {
-    <name not found> = ArrayList@9818[1] { ResolutionCandidate@9819 }
-    <name not found> = ArrayList@9820[1] { ResolutionCandidate@9819 }
-}
-
-ResolutionTaskHolder@9821 {
-    <name not found> = ArrayList@9822[1] { ResolutionCandidate@9823 }
-    <name not found> = ArrayList@9824[1] { ResolutionCandidate@9823 }
-}
-
-ResolutionTaskHolder@9825 {
-    <name not found> = ArrayList@9826[1] { ResolutionCandidate@9827 }
-    <name not found> = ArrayList@9828[1] { ResolutionCandidate@9827 }
-}
-
-ResolutionTaskHolder@9829 {
-    <name not found> = ArrayList@9830[1] { ResolutionCandidate@9831 }
-    <name not found> = ArrayList@9832[1] { ResolutionCandidate@9831 }
-}
-
-ResolutionTaskHolder@9833 {
-    <name not found> = ArrayList@9834[1] { ResolutionCandidate@9835 }
-    <name not found> = ArrayList@9836[1] { ResolutionCandidate@9835 }
-}
-
-ResolutionTaskHolder@9837 {
-    <name not found> = ArrayList@9838[1] { ResolutionCandidate@9839 }
-    <name not found> = ArrayList@9840[1] { ResolutionCandidate@9839 }
-}
-
-ResolutionTaskHolder@9841 {
-    <name not found> = ArrayList@9842[1] { ResolutionCandidate@9843 }
-    <name not found> = ArrayList@9844[1] { ResolutionCandidate@9843 }
-}
-
-ResolutionTaskHolder@9845 {
-    <name not found> = ArrayList@9846[1] { ResolutionCandidate@9847 }
-    <name not found> = ArrayList@9848[1] { ResolutionCandidate@9847 }
-}
-
-ResolutionTaskHolder@9849 {
-    <name not found> = ArrayList@9850[1] { ResolutionCandidate@9851 }
-    <name not found> = ArrayList@9852[1] { ResolutionCandidate@9851 }
-}
-
-ResolutionTaskHolder@9853 {
-    <name not found> = ArrayList@9854[1] { ResolutionCandidate@9855 }
-    <name not found> = ArrayList@9856[1] { ResolutionCandidate@9855 }
-}
-
-ResolutionTaskHolder@9857 {
-    <name not found> = ArrayList@9858[1] { ResolutionCandidate@9859 }
-    <name not found> = ArrayList@9860[1] { ResolutionCandidate@9859 }
-}
-
-ResolutionTaskHolder@9861 {
-    <name not found> = ArrayList@9862[1] { ResolutionCandidate@9863 }
-    <name not found> = ArrayList@9864[1] { ResolutionCandidate@9863 }
-}
-
-ResolutionTaskHolder@9865 {
-    <name not found> = ArrayList@9866[1] { ResolutionCandidate@9867 }
-    <name not found> = ArrayList@9868[1] { ResolutionCandidate@9867 }
-}
-
-ResolutionTaskHolder@9869 {
-    <name not found> = ArrayList@9870[1] { ResolutionCandidate@9871 }
-    <name not found> = ArrayList@9872[1] { ResolutionCandidate@9871 }
-}
-
-ResolutionTaskHolder@9873 {
-    <name not found> = ArrayList@9874[1] { ResolutionCandidate@9875 }
-    <name not found> = ArrayList@9876[1] { ResolutionCandidate@9875 }
-}
-
-ResolutionTaskHolder@9877 {
-    <name not found> = ArrayList@9878[1] { ResolutionCandidate@9879 }
-    <name not found> = ArrayList@9880[1] { ResolutionCandidate@9879 }
-}
-
-ResolutionTaskHolder@9881 {
-    <name not found> = ArrayList@9882[1] { ResolutionCandidate@9883 }
-    <name not found> = ArrayList@9884[1] { ResolutionCandidate@9883 }
-}
-
-ResolutionTaskHolder@9885 {
-    <name not found> = ArrayList@9886[1] { ResolutionCandidate@9887 }
-    <name not found> = ArrayList@9888[1] { ResolutionCandidate@9887 }
-}
-
-ResolutionTaskHolder@9889 {
-    <name not found> = ArrayList@9890[1] { ResolutionCandidate@9891 }
-    <name not found> = ArrayList@9892[1] { ResolutionCandidate@9891 }
-}
-
-ResolutionTaskHolder@9893 {
-    <name not found> = ArrayList@9894[1] { ResolutionCandidate@9895 }
-    <name not found> = ArrayList@9896[1] { ResolutionCandidate@9895 }
-}
-
-ResolutionTaskHolder@9897 {
-    <name not found> = ArrayList@9898[1] { ResolutionCandidate@9899 }
-    <name not found> = ArrayList@9900[1] { ResolutionCandidate@9899 }
-}
-
-ResolutionTaskHolder@9901 {
-    <name not found> = ArrayList@9902[1] { ResolutionCandidate@9903 }
-    <name not found> = ArrayList@9904[1] { ResolutionCandidate@9903 }
-}
-
-ResolutionTaskHolder@9905 {
-    <name not found> = ArrayList@9906[1] { ResolutionCandidate@9907 }
-    <name not found> = ArrayList@9908[1] { ResolutionCandidate@9907 }
-}
-
-ResolutionTaskHolder@9909 {
-    <name not found> = ArrayList@9910[1] { ResolutionCandidate@9911 }
-    <name not found> = ArrayList@9912[1] { ResolutionCandidate@9911 }
-}
-
-ResolutionTaskHolder@9913 {
-    <name not found> = ArrayList@9914[1] { ResolutionCandidate@9915 }
-    <name not found> = ArrayList@9916[1] { ResolutionCandidate@9915 }
-}
-
-ResolutionTaskHolder@9917 {
-    <name not found> = ArrayList@9918[1] { ResolutionCandidate@9919 }
-    <name not found> = ArrayList@9920[1] { ResolutionCandidate@9919 }
-}
-
-ResolutionTaskHolder@9921 {
-    <name not found> = ArrayList@9922[1] { ResolutionCandidate@9923 }
-    <name not found> = ArrayList@9924[1] { ResolutionCandidate@9923 }
-}
-
-ResolutionTaskHolder@9925 {
-    <name not found> = ArrayList@9926[1] { ResolutionCandidate@9927 }
-    <name not found> = ArrayList@9928[1] { ResolutionCandidate@9927 }
-}
-
-ResolutionTaskHolder@9929 {
-    <name not found> = ArrayList@9930[1] { ResolutionCandidate@9931 }
-    <name not found> = ArrayList@9932[1] { ResolutionCandidate@9931 }
-}
-
-ResolutionTaskHolder@9933 {
-    <name not found> = ArrayList@9934[1] { ResolutionCandidate@9935 }
-    <name not found> = ArrayList@9936[1] { ResolutionCandidate@9935 }
-}
-
-ResolutionTaskHolder@9937 {
-    <name not found> = ArrayList@9938[1] { ResolutionCandidate@9939 }
-    <name not found> = ArrayList@9940[1] { ResolutionCandidate@9939 }
-}
-
-ResolutionTaskHolder@9941 {
-    <name not found> = ArrayList@9942[1] { ResolutionCandidate@9943 }
-    <name not found> = ArrayList@9944[1] { ResolutionCandidate@9943 }
-}
-
-ResolutionTaskHolder@9945 {
-    <name not found> = ArrayList@9946[1] { ResolutionCandidate@9947 }
-    <name not found> = ArrayList@9948[1] { ResolutionCandidate@9947 }
-}
-
-ResolutionTaskHolder@9949 {
-    <name not found> = ArrayList@9950[1] { ResolutionCandidate@9951 }
-    <name not found> = ArrayList@9952[1] { ResolutionCandidate@9951 }
-}
-
-ResolutionTaskHolder@9953 {
-    <name not found> = ArrayList@9954[1] { ResolutionCandidate@9955 }
-    <name not found> = ArrayList@9956[1] { ResolutionCandidate@9955 }
-}
-
-ResolutionTaskHolder@9957 {
-    <name not found> = ArrayList@9958[1] { ResolutionCandidate@9959 }
-    <name not found> = ArrayList@9960[1] { ResolutionCandidate@9959 }
-}
-
-ResolutionTaskHolder@9961 {
-    <name not found> = ArrayList@9962[1] { ResolutionCandidate@9963 }
-    <name not found> = ArrayList@9964[1] { ResolutionCandidate@9963 }
-}
-
-ResolutionTaskHolder@9965 {
-    <name not found> = ArrayList@9966[1] { ResolutionCandidate@9967 }
-    <name not found> = ArrayList@9968[1] { ResolutionCandidate@9967 }
-}
-
-ResolutionTaskHolder@9969 {
-    <name not found> = ArrayList@9970[1] { ResolutionCandidate@9971 }
-    <name not found> = ArrayList@9972[1] { ResolutionCandidate@9971 }
-}
-
-ResolutionTaskHolder@9973 {
-    <name not found> = ArrayList@9974[1] { ResolutionCandidate@9975 }
-    <name not found> = ArrayList@9976[1] { ResolutionCandidate@9975 }
-}
-
-ResolutionTaskHolder@9977 {
-    <name not found> = ArrayList@9978[1] { ResolutionCandidate@9979 }
-    <name not found> = ArrayList@9980[1] { ResolutionCandidate@9979 }
-}
-
-ResolutionTaskHolder@9981 {
-    <name not found> = ArrayList@9982[1] { ResolutionCandidate@9983 }
-    <name not found> = ArrayList@9984[1] { ResolutionCandidate@9983 }
-}
-
-ResolutionTaskHolder@9985 {
-    <name not found> = ArrayList@9986[1] { ResolutionCandidate@9987 }
-    <name not found> = ArrayList@9988[1] { ResolutionCandidate@9987 }
-}
-
-ResolutionTaskHolder@9989 {
-    <name not found> = ArrayList@9990[1] { ResolutionCandidate@9991 }
-    <name not found> = ArrayList@9992[1] { ResolutionCandidate@9991 }
-}
-
-ResolutionTaskHolder@9993 {
-    <name not found> = ArrayList@9994[1] { ResolutionCandidate@9995 }
-    <name not found> = ArrayList@9996[1] { ResolutionCandidate@9995 }
-}
-
-ResolutionTaskHolder@9997 {
-    <name not found> = ArrayList@9998[1] { ResolutionCandidate@9999 }
-    <name not found> = ArrayList@10000[1] { ResolutionCandidate@9999 }
-}
-
-ResolutionTaskHolder@10001 {
-    <name not found> = ArrayList@10002[1] { ResolutionCandidate@10003 }
-    <name not found> = ArrayList@10004[1] { ResolutionCandidate@10003 }
-}
-
-ResolutionTaskHolder@10005 {
-    <name not found> = ArrayList@10006[1] { ResolutionCandidate@10007 }
-    <name not found> = ArrayList@10008[1] { ResolutionCandidate@10007 }
-}
-
-ResolutionTaskHolder@10009 {
-    <name not found> = ArrayList@10010[1] { ResolutionCandidate@10011 }
-    <name not found> = ArrayList@10012[1] { ResolutionCandidate@10011 }
-}
-
-ResolutionTaskHolder@10013 {
-    <name not found> = ArrayList@10014[1] { ResolutionCandidate@10015 }
-    <name not found> = ArrayList@10016[1] { ResolutionCandidate@10015 }
-}
-
-ResolutionTaskHolder@10017 {
-    <name not found> = ArrayList@10018[1] { ResolutionCandidate@10019 }
-    <name not found> = ArrayList@10020[1] { ResolutionCandidate@10019 }
-}
-
-ResolutionTaskHolder@10021 {
-    <name not found> = ArrayList@10022[1] { ResolutionCandidate@10023 }
-    <name not found> = ArrayList@10024[1] { ResolutionCandidate@10023 }
-}
-
-ResolutionTaskHolder@10025 {
-    <name not found> = ArrayList@10026[1] { ResolutionCandidate@10027 }
-    <name not found> = ArrayList@10028[1] { ResolutionCandidate@10027 }
-}
-
-ResolutionTaskHolder@10029 {
-    <name not found> = ArrayList@10030[1] { ResolutionCandidate@10031 }
-    <name not found> = ArrayList@10032[1] { ResolutionCandidate@10031 }
-}
-
-ResolutionTaskHolder@10033 {
-    <name not found> = ArrayList@10034[1] { ResolutionCandidate@10035 }
-    <name not found> = ArrayList@10036[1] { ResolutionCandidate@10035 }
-}
-
-ResolutionTaskHolder@10037 {
-    <name not found> = ArrayList@10038[1] { ResolutionCandidate@10039 }
-    <name not found> = ArrayList@10040[1] { ResolutionCandidate@10039 }
-}
-
-ResolutionTaskHolder@10041 {
-    <name not found> = ArrayList@10042[1] { ResolutionCandidate@10043 }
-    <name not found> = ArrayList@10044[1] { ResolutionCandidate@10043 }
-}
-
-ResolutionTaskHolder@10045 {
-    <name not found> = ArrayList@10046[1] { ResolutionCandidate@10047 }
-    <name not found> = ArrayList@10048[1] { ResolutionCandidate@10047 }
-}
-
-ResolutionTaskHolder@10049 {
-    <name not found> = ArrayList@10050[1] { ResolutionCandidate@10051 }
-    <name not found> = ArrayList@10052[1] { ResolutionCandidate@10051 }
-}
-
-ResolutionTaskHolder@10053 {
-    <name not found> = ArrayList@10054[1] { ResolutionCandidate@10055 }
-    <name not found> = ArrayList@10056[1] { ResolutionCandidate@10055 }
-}
-
-ResolutionTaskHolder@10057 {
-    <name not found> = ArrayList@10058[1] { ResolutionCandidate@10059 }
-    <name not found> = ArrayList@10060[1] { ResolutionCandidate@10059 }
-}
-
-ResolutionTaskHolder@10061 {
-    <name not found> = ArrayList@10062[1] { ResolutionCandidate@10063 }
-    <name not found> = ArrayList@10064[1] { ResolutionCandidate@10063 }
-}
-
-ResolutionTaskHolder@10065 {
-    <name not found> = ArrayList@10066[1] { ResolutionCandidate@10067 }
-    <name not found> = ArrayList@10068[1] { ResolutionCandidate@10067 }
-}
-
-ResolutionTaskHolder@10069 {
-    <name not found> = ArrayList@10070[1] { ResolutionCandidate@10071 }
-    <name not found> = ArrayList@10072[1] { ResolutionCandidate@10071 }
-}
-
-ResolutionTaskHolder@10073 {
-    <name not found> = ArrayList@10074[1] { ResolutionCandidate@10075 }
-    <name not found> = ArrayList@10076[1] { ResolutionCandidate@10075 }
-}
-
-ResolutionTaskHolder@10077 {
-    <name not found> = ArrayList@10078[1] { ResolutionCandidate@10079 }
-    <name not found> = ArrayList@10080[1] { ResolutionCandidate@10079 }
-}
-
-ResolutionTaskHolder@10081 {
-    <name not found> = ArrayList@10082[1] { ResolutionCandidate@10083 }
-    <name not found> = ArrayList@10084[1] { ResolutionCandidate@10083 }
-}
-
-ResolutionTaskHolder@10085 {
-    <name not found> = ArrayList@10086[1] { ResolutionCandidate@10087 }
-    <name not found> = ArrayList@10088[1] { ResolutionCandidate@10087 }
-}
-
-ResolutionTaskHolder@10089 {
-    <name not found> = ArrayList@10090[1] { ResolutionCandidate@10091 }
-    <name not found> = ArrayList@10092[1] { ResolutionCandidate@10091 }
-}
-
-ResolutionTaskHolder@10093 {
-    <name not found> = ArrayList@10094[1] { ResolutionCandidate@10095 }
-    <name not found> = ArrayList@10096[1] { ResolutionCandidate@10095 }
-}
-
-ResolutionTaskHolder@10097 {
-    <name not found> = ArrayList@10098[1] { ResolutionCandidate@10099 }
-    <name not found> = ArrayList@10100[1] { ResolutionCandidate@10099 }
-}
-
-ResolutionTaskHolder@10101 {
-    <name not found> = ArrayList@10102[1] { ResolutionCandidate@10103 }
-    <name not found> = ArrayList@10104[1] { ResolutionCandidate@10103 }
-}
-
-ResolutionTaskHolder@10105 {
-    <name not found> = ArrayList@10106[1] { ResolutionCandidate@10107 }
-    <name not found> = ArrayList@10108[1] { ResolutionCandidate@10107 }
-}
-
-ResolutionTaskHolder@10109 {
-    <name not found> = ArrayList@10110[1] { ResolutionCandidate@10111 }
-    <name not found> = ArrayList@10112[1] { ResolutionCandidate@10111 }
-}
-
-ResolutionTaskHolder@10113 {
-    <name not found> = ArrayList@10114[1] { ResolutionCandidate@10115 }
-    <name not found> = ArrayList@10116[1] { ResolutionCandidate@10115 }
-}
-
-ResolutionTaskHolder@10117 {
-    <name not found> = ArrayList@10118[1] { ResolutionCandidate@10119 }
-    <name not found> = ArrayList@10120[1] { ResolutionCandidate@10119 }
-}
-
-ResolutionTaskHolder@10121 {
-    <name not found> = ArrayList@10122[1] { ResolutionCandidate@10123 }
-    <name not found> = ArrayList@10124[1] { ResolutionCandidate@10123 }
-}
-
-ResolutionTaskHolder@10125 {
-    <name not found> = ArrayList@10126[1] { ResolutionCandidate@10127 }
-    <name not found> = ArrayList@10128[1] { ResolutionCandidate@10127 }
-}
-
-ResolutionTaskHolder@10129 {
-    <name not found> = ArrayList@10130[1] { ResolutionCandidate@10131 }
-    <name not found> = ArrayList@10132[1] { ResolutionCandidate@10131 }
-}
-
-ResolutionTaskHolder@10133 {
-    <name not found> = ArrayList@10134[1] { ResolutionCandidate@10135 }
-    <name not found> = ArrayList@10136[1] { ResolutionCandidate@10135 }
-}
-
-ResolutionTaskHolder@10137 {
-    <name not found> = ArrayList@10138[1] { ResolutionCandidate@10139 }
-    <name not found> = ArrayList@10140[1] { ResolutionCandidate@10139 }
-}
-
-ResolutionTaskHolder@10141 {
-    <name not found> = ArrayList@10142[1] { ResolutionCandidate@10143 }
-    <name not found> = ArrayList@10144[1] { ResolutionCandidate@10143 }
-}
-
-ResolutionTaskHolder@10145 {
-    <name not found> = ArrayList@10146[1] { ResolutionCandidate@10147 }
-    <name not found> = ArrayList@10148[1] { ResolutionCandidate@10147 }
-}
-
-ResolutionTaskHolder@10149 {
-    <name not found> = ArrayList@10150[1] { ResolutionCandidate@10151 }
-    <name not found> = ArrayList@10152[1] { ResolutionCandidate@10151 }
-}
-
-ResolutionTaskHolder@10153 {
-    <name not found> = ArrayList@10154[1] { ResolutionCandidate@10155 }
-    <name not found> = ArrayList@10156[1] { ResolutionCandidate@10155 }
-}
-
-ResolutionTaskHolder@10157 {
-    <name not found> = ArrayList@10158[1] { ResolutionCandidate@10159 }
-    <name not found> = ArrayList@10160[1] { ResolutionCandidate@10159 }
-}
-
-ResolutionTaskHolder@10161 {
-    <name not found> = ArrayList@10162[1] { ResolutionCandidate@10163 }
-    <name not found> = ArrayList@10164[1] { ResolutionCandidate@10163 }
-}
-
-ResolutionTaskHolder@10165 {
-    <name not found> = ArrayList@10166[1] { ResolutionCandidate@10167 }
-    <name not found> = ArrayList@10168[1] { ResolutionCandidate@10167 }
-}
-
-ResolutionTaskHolder@10169 {
-    <name not found> = ArrayList@10170[1] { ResolutionCandidate@10171 }
-    <name not found> = ArrayList@10172[1] { ResolutionCandidate@10171 }
-}
-
-ResolutionTaskHolder@10173 {
-    <name not found> = ArrayList@10174[1] { ResolutionCandidate@10175 }
-    <name not found> = ArrayList@10176[1] { ResolutionCandidate@10175 }
-}
-
-ResolutionTaskHolder@10177 {
-    <name not found> = ArrayList@10178[1] { ResolutionCandidate@10179 }
-    <name not found> = ArrayList@10180[1] { ResolutionCandidate@10179 }
-}
-
-ResolutionTaskHolder@10181 {
-    <name not found> = ArrayList@10182[1] { ResolutionCandidate@10183 }
-    <name not found> = ArrayList@10184[1] { ResolutionCandidate@10183 }
-}
-
-ResolutionTaskHolder@10185 {
-    <name not found> = ArrayList@10186[1] { ResolutionCandidate@10187 }
-    <name not found> = ArrayList@10188[1] { ResolutionCandidate@10187 }
-}
-
-ResolutionTaskHolder@10189 {
-    <name not found> = ArrayList@10190[1] { ResolutionCandidate@10191 }
-    <name not found> = ArrayList@10192[1] { ResolutionCandidate@10191 }
-}
-
-ResolutionTaskHolder@10193 {
-    <name not found> = ArrayList@10194[6] { ResolutionCandidate@10195, ResolutionCandidate@10196, ResolutionCandidate@10197, ... }
-    <name not found> = ArrayList@10198[6] { ResolutionCandidate@10195, ResolutionCandidate@10196, ResolutionCandidate@10197, ... }
-}
-
-ResolutionTaskHolder@10199 {
-    <name not found> = ArrayList@10200[6] { ResolutionCandidate@10201, ResolutionCandidate@10202, ResolutionCandidate@10203, ... }
-    <name not found> = ArrayList@10204[6] { ResolutionCandidate@10201, ResolutionCandidate@10202, ResolutionCandidate@10203, ... }
-}
-
-ResolutionTaskHolder@10205 {
-    <name not found> = ArrayList@10206[6] { ResolutionCandidate@10207, ResolutionCandidate@10208, ResolutionCandidate@10209, ... }
-    <name not found> = ArrayList@10210[6] { ResolutionCandidate@10207, ResolutionCandidate@10208, ResolutionCandidate@10209, ... }
-}
-
-ResolutionTaskHolder@10211 {
-    <name not found> = ArrayList@10212[6] { ResolutionCandidate@10213, ResolutionCandidate@10214, ResolutionCandidate@10215, ... }
-    <name not found> = ArrayList@10216[6] { ResolutionCandidate@10213, ResolutionCandidate@10214, ResolutionCandidate@10215, ... }
-}
-
-ResolutionTaskHolder@10217 {
-    <name not found> = ArrayList@10218[6] { ResolutionCandidate@10219, ResolutionCandidate@10220, ResolutionCandidate@10221, ... }
-    <name not found> = ArrayList@10222[6] { ResolutionCandidate@10219, ResolutionCandidate@10220, ResolutionCandidate@10221, ... }
-}
-
-ResolutionTaskHolder@10223 {
-    <name not found> = ArrayList@10224[6] { ResolutionCandidate@10225, ResolutionCandidate@10226, ResolutionCandidate@10227, ... }
-    <name not found> = ArrayList@10228[6] { ResolutionCandidate@10225, ResolutionCandidate@10226, ResolutionCandidate@10227, ... }
-}
-
-ResolutionTaskHolder@10229 {
-    <name not found> = ArrayList@10230[6] { ResolutionCandidate@10231, ResolutionCandidate@10232, ResolutionCandidate@10233, ... }
-    <name not found> = ArrayList@10234[6] { ResolutionCandidate@10231, ResolutionCandidate@10232, ResolutionCandidate@10233, ... }
-}
-
-ResolutionTaskHolder@10235 {
-    <name not found> = ArrayList@10236[6] { ResolutionCandidate@10237, ResolutionCandidate@10238, ResolutionCandidate@10239, ... }
-    <name not found> = ArrayList@10240[6] { ResolutionCandidate@10237, ResolutionCandidate@10238, ResolutionCandidate@10239, ... }
-}
-
-ResolutionTaskHolder@10241 {
-    <name not found> = ArrayList@10242[6] { ResolutionCandidate@10243, ResolutionCandidate@10244, ResolutionCandidate@10245, ... }
-    <name not found> = ArrayList@10246[6] { ResolutionCandidate@10243, ResolutionCandidate@10244, ResolutionCandidate@10245, ... }
-}
-
-ResolutionTaskHolder@10247 {
-    <name not found> = ArrayList@10248[6] { ResolutionCandidate@10249, ResolutionCandidate@10250, ResolutionCandidate@10251, ... }
-    <name not found> = ArrayList@10252[6] { ResolutionCandidate@10249, ResolutionCandidate@10250, ResolutionCandidate@10251, ... }
-}
-
-ResolutionTaskHolder@10253 {
-    <name not found> = ArrayList@10254[6] { ResolutionCandidate@10255, ResolutionCandidate@10256, ResolutionCandidate@10257, ... }
-    <name not found> = ArrayList@10258[6] { ResolutionCandidate@10255, ResolutionCandidate@10256, ResolutionCandidate@10257, ... }
-}
-
-ResolutionTaskHolder@10259 {
-    <name not found> = ArrayList@10260[6] { ResolutionCandidate@10261, ResolutionCandidate@10262, ResolutionCandidate@10263, ... }
-    <name not found> = ArrayList@10264[6] { ResolutionCandidate@10261, ResolutionCandidate@10262, ResolutionCandidate@10263, ... }
-}
-
-ResolutionTaskHolder@10265 {
-    <name not found> = ArrayList@10266[6] { ResolutionCandidate@10267, ResolutionCandidate@10268, ResolutionCandidate@10269, ... }
-    <name not found> = ArrayList@10270[6] { ResolutionCandidate@10267, ResolutionCandidate@10268, ResolutionCandidate@10269, ... }
-}
-
-ResolutionTaskHolder@10271 {
-    <name not found> = ArrayList@10272[6] { ResolutionCandidate@10273, ResolutionCandidate@10274, ResolutionCandidate@10275, ... }
-    <name not found> = ArrayList@10276[6] { ResolutionCandidate@10273, ResolutionCandidate@10274, ResolutionCandidate@10275, ... }
-}
-
-ResolutionTaskHolder@10277 {
-    <name not found> = ArrayList@10278[6] { ResolutionCandidate@10279, ResolutionCandidate@10280, ResolutionCandidate@10281, ... }
-    <name not found> = ArrayList@10282[6] { ResolutionCandidate@10279, ResolutionCandidate@10280, ResolutionCandidate@10281, ... }
-}
-
-ResolutionTaskHolder@10283 {
-    <name not found> = ArrayList@10284[6] { ResolutionCandidate@10285, ResolutionCandidate@10286, ResolutionCandidate@10287, ... }
-    <name not found> = ArrayList@10288[6] { ResolutionCandidate@10285, ResolutionCandidate@10286, ResolutionCandidate@10287, ... }
-}
-
-ResolutionTaskHolder@10289 {
-    <name not found> = ArrayList@10290[6] { ResolutionCandidate@10291, ResolutionCandidate@10292, ResolutionCandidate@10293, ... }
-    <name not found> = ArrayList@10294[6] { ResolutionCandidate@10291, ResolutionCandidate@10292, ResolutionCandidate@10293, ... }
-}
-
-ResolutionTaskHolder@10295 {
-    <name not found> = ArrayList@10296[6] { ResolutionCandidate@10297, ResolutionCandidate@10298, ResolutionCandidate@10299, ... }
-    <name not found> = ArrayList@10300[6] { ResolutionCandidate@10297, ResolutionCandidate@10298, ResolutionCandidate@10299, ... }
-}
-
-ResolutionTaskHolder@10301 {
-    <name not found> = ArrayList@10302[6] { ResolutionCandidate@10303, ResolutionCandidate@10304, ResolutionCandidate@10305, ... }
-    <name not found> = ArrayList@10306[6] { ResolutionCandidate@10303, ResolutionCandidate@10304, ResolutionCandidate@10305, ... }
-}
-
-ResolutionTaskHolder@10307 {
-    <name not found> = ArrayList@10308[6] { ResolutionCandidate@10309, ResolutionCandidate@10310, ResolutionCandidate@10311, ... }
-    <name not found> = ArrayList@10312[6] { ResolutionCandidate@10309, ResolutionCandidate@10310, ResolutionCandidate@10311, ... }
-}
-
-ResolutionTaskHolder@10313 {
-    <name not found> = ArrayList@10314[6] { ResolutionCandidate@10315, ResolutionCandidate@10316, ResolutionCandidate@10317, ... }
-    <name not found> = ArrayList@10318[6] { ResolutionCandidate@10315, ResolutionCandidate@10316, ResolutionCandidate@10317, ... }
-}
-
-ResolutionTaskHolder@10319 {
-    <name not found> = ArrayList@10320[6] { ResolutionCandidate@10321, ResolutionCandidate@10322, ResolutionCandidate@10323, ... }
-    <name not found> = ArrayList@10324[6] { ResolutionCandidate@10321, ResolutionCandidate@10322, ResolutionCandidate@10323, ... }
-}
-
-ResolutionTaskHolder@10325 {
-    <name not found> = ArrayList@10326[6] { ResolutionCandidate@10327, ResolutionCandidate@10328, ResolutionCandidate@10329, ... }
-    <name not found> = ArrayList@10330[6] { ResolutionCandidate@10327, ResolutionCandidate@10328, ResolutionCandidate@10329, ... }
-}
-
-ResolutionTaskHolder@10331 {
-    <name not found> = ArrayList@10332[6] { ResolutionCandidate@10333, ResolutionCandidate@10334, ResolutionCandidate@10335, ... }
-    <name not found> = ArrayList@10336[6] { ResolutionCandidate@10333, ResolutionCandidate@10334, ResolutionCandidate@10335, ... }
-}
-
-ResolutionTaskHolder@10337 {
-    <name not found> = ArrayList@10338[7] { ResolutionCandidate@10339, ResolutionCandidate@10340, ResolutionCandidate@10341, ... }
-    <name not found> = ArrayList@10342[7] { ResolutionCandidate@10339, ResolutionCandidate@10340, ResolutionCandidate@10341, ... }
-}
-
-ResolutionTaskHolder@10343 {
-    <name not found> = ArrayList@10344[7] { ResolutionCandidate@10345, ResolutionCandidate@10346, ResolutionCandidate@10347, ... }
-    <name not found> = ArrayList@10348[7] { ResolutionCandidate@10345, ResolutionCandidate@10346, ResolutionCandidate@10347, ... }
-}
-
-ResolutionTaskHolder@10349 {
-    <name not found> = ArrayList@10350[7] { ResolutionCandidate@10351, ResolutionCandidate@10352, ResolutionCandidate@10353, ... }
-    <name not found> = ArrayList@10354[7] { ResolutionCandidate@10351, ResolutionCandidate@10352, ResolutionCandidate@10353, ... }
-}
-
-ResolutionTaskHolder@10355 {
-    <name not found> = ArrayList@10356[7] { ResolutionCandidate@10357, ResolutionCandidate@10358, ResolutionCandidate@10359, ... }
-    <name not found> = ArrayList@10360[7] { ResolutionCandidate@10357, ResolutionCandidate@10358, ResolutionCandidate@10359, ... }
-}
-
-ResolutionTaskHolder@10361 {
-    <name not found> = ArrayList@10362[7] { ResolutionCandidate@10363, ResolutionCandidate@10364, ResolutionCandidate@10365, ... }
-    <name not found> = ArrayList@10366[7] { ResolutionCandidate@10363, ResolutionCandidate@10364, ResolutionCandidate@10365, ... }
-}
-
-ResolutionTaskHolder@10367 {
-    <name not found> = ArrayList@10368[7] { ResolutionCandidate@10369, ResolutionCandidate@10370, ResolutionCandidate@10371, ... }
-    <name not found> = ArrayList@10372[7] { ResolutionCandidate@10369, ResolutionCandidate@10370, ResolutionCandidate@10371, ... }
-}
-
-ResolutionTaskHolder@10373 {
-    <name not found> = ArrayList@10374[7] { ResolutionCandidate@10375, ResolutionCandidate@10376, ResolutionCandidate@10377, ... }
-    <name not found> = ArrayList@10378[7] { ResolutionCandidate@10375, ResolutionCandidate@10376, ResolutionCandidate@10377, ... }
-}
-
-ResolutionTaskHolder@10379 {
-    <name not found> = ArrayList@10380[7] { ResolutionCandidate@10381, ResolutionCandidate@10382, ResolutionCandidate@10383, ... }
-    <name not found> = ArrayList@10384[7] { ResolutionCandidate@10381, ResolutionCandidate@10382, ResolutionCandidate@10383, ... }
-}
-
-ResolutionTaskHolder@10385 {
-    <name not found> = ArrayList@10386[7] { ResolutionCandidate@10387, ResolutionCandidate@10388, ResolutionCandidate@10389, ... }
-    <name not found> = ArrayList@10390[7] { ResolutionCandidate@10387, ResolutionCandidate@10388, ResolutionCandidate@10389, ... }
-}
-
-ResolutionTaskHolder@10391 {
-    <name not found> = ArrayList@10392[7] { ResolutionCandidate@10393, ResolutionCandidate@10394, ResolutionCandidate@10395, ... }
-    <name not found> = ArrayList@10396[7] { ResolutionCandidate@10393, ResolutionCandidate@10394, ResolutionCandidate@10395, ... }
-}
-
-ResolutionTaskHolder@10397 {
-    <name not found> = ArrayList@10398[7] { ResolutionCandidate@10399, ResolutionCandidate@10400, ResolutionCandidate@10401, ... }
-    <name not found> = ArrayList@10402[7] { ResolutionCandidate@10399, ResolutionCandidate@10400, ResolutionCandidate@10401, ... }
-}
-
-ResolutionTaskHolder@10403 {
-    <name not found> = ArrayList@10404[7] { ResolutionCandidate@10405, ResolutionCandidate@10406, ResolutionCandidate@10407, ... }
-    <name not found> = ArrayList@10408[7] { ResolutionCandidate@10405, ResolutionCandidate@10406, ResolutionCandidate@10407, ... }
-}
-
-ResolutionTaskHolder@10409 {
-    <name not found> = ArrayList@10410[7] { ResolutionCandidate@10411, ResolutionCandidate@10412, ResolutionCandidate@10413, ... }
-    <name not found> = ArrayList@10414[7] { ResolutionCandidate@10411, ResolutionCandidate@10412, ResolutionCandidate@10413, ... }
-}
-
-ResolutionTaskHolder@10415 {
-    <name not found> = ArrayList@10416[7] { ResolutionCandidate@10417, ResolutionCandidate@10418, ResolutionCandidate@10419, ... }
-    <name not found> = ArrayList@10420[7] { ResolutionCandidate@10417, ResolutionCandidate@10418, ResolutionCandidate@10419, ... }
-}
-
-ResolutionTaskHolder@10421 {
-    <name not found> = ArrayList@10422[7] { ResolutionCandidate@10423, ResolutionCandidate@10424, ResolutionCandidate@10425, ... }
-    <name not found> = ArrayList@10426[7] { ResolutionCandidate@10423, ResolutionCandidate@10424, ResolutionCandidate@10425, ... }
-}
-
-ResolutionTaskHolder@10427 {
-    <name not found> = ArrayList@10428[7] { ResolutionCandidate@10429, ResolutionCandidate@10430, ResolutionCandidate@10431, ... }
-    <name not found> = ArrayList@10432[7] { ResolutionCandidate@10429, ResolutionCandidate@10430, ResolutionCandidate@10431, ... }
-}
-
-ResolutionTaskHolder@10433 {
-    <name not found> = ArrayList@10434[7] { ResolutionCandidate@10435, ResolutionCandidate@10436, ResolutionCandidate@10437, ... }
-    <name not found> = ArrayList@10438[7] { ResolutionCandidate@10435, ResolutionCandidate@10436, ResolutionCandidate@10437, ... }
-}
-
-ResolutionTaskHolder@10439 {
-    <name not found> = ArrayList@10440[7] { ResolutionCandidate@10441, ResolutionCandidate@10442, ResolutionCandidate@10443, ... }
-    <name not found> = ArrayList@10444[7] { ResolutionCandidate@10441, ResolutionCandidate@10442, ResolutionCandidate@10443, ... }
-}
-
-ResolutionTaskHolder@10445 {
-    <name not found> = ArrayList@10446[7] { ResolutionCandidate@10447, ResolutionCandidate@10448, ResolutionCandidate@10449, ... }
-    <name not found> = ArrayList@10450[7] { ResolutionCandidate@10447, ResolutionCandidate@10448, ResolutionCandidate@10449, ... }
-}
-
-ResolutionTaskHolder@10451 {
-    <name not found> = ArrayList@10452[7] { ResolutionCandidate@10453, ResolutionCandidate@10454, ResolutionCandidate@10455, ... }
-    <name not found> = ArrayList@10456[7] { ResolutionCandidate@10453, ResolutionCandidate@10454, ResolutionCandidate@10455, ... }
-}
-
-ResolutionTaskHolder@10457 {
-    <name not found> = ArrayList@10458[7] { ResolutionCandidate@10459, ResolutionCandidate@10460, ResolutionCandidate@10461, ... }
-    <name not found> = ArrayList@10462[7] { ResolutionCandidate@10459, ResolutionCandidate@10460, ResolutionCandidate@10461, ... }
-}
-
-ResolutionTaskHolder@10463 {
-    <name not found> = ArrayList@10464[7] { ResolutionCandidate@10465, ResolutionCandidate@10466, ResolutionCandidate@10467, ... }
-    <name not found> = ArrayList@10468[7] { ResolutionCandidate@10465, ResolutionCandidate@10466, ResolutionCandidate@10467, ... }
-}
-
-ResolutionTaskHolder@10469 {
-    <name not found> = ArrayList@10470[7] { ResolutionCandidate@10471, ResolutionCandidate@10472, ResolutionCandidate@10473, ... }
-    <name not found> = ArrayList@10474[7] { ResolutionCandidate@10471, ResolutionCandidate@10472, ResolutionCandidate@10473, ... }
-}
-
-ResolutionTaskHolder@10475 {
-    <name not found> = ArrayList@10476[7] { ResolutionCandidate@10477, ResolutionCandidate@10478, ResolutionCandidate@10479, ... }
-    <name not found> = ArrayList@10480[7] { ResolutionCandidate@10477, ResolutionCandidate@10478, ResolutionCandidate@10479, ... }
-}
-
-ResolutionTaskHolder@10481 {
-    <name not found> = ArrayList@10482[7] { ResolutionCandidate@10483, ResolutionCandidate@10484, ResolutionCandidate@10485, ... }
-    <name not found> = ArrayList@10486[7] { ResolutionCandidate@10483, ResolutionCandidate@10484, ResolutionCandidate@10485, ... }
-}
-
-ResolutionTaskHolder@10487 {
-    <name not found> = ArrayList@10488[7] { ResolutionCandidate@10489, ResolutionCandidate@10490, ResolutionCandidate@10491, ... }
-    <name not found> = ArrayList@10492[7] { ResolutionCandidate@10489, ResolutionCandidate@10490, ResolutionCandidate@10491, ... }
-}
-
-ResolutionTaskHolder@10493 {
-    <name not found> = ArrayList@10494[7] { ResolutionCandidate@10495, ResolutionCandidate@10496, ResolutionCandidate@10497, ... }
-    <name not found> = ArrayList@10498[7] { ResolutionCandidate@10495, ResolutionCandidate@10496, ResolutionCandidate@10497, ... }
-}
-
-ResolutionTaskHolder@10499 {
-    <name not found> = ArrayList@10500[7] { ResolutionCandidate@10501, ResolutionCandidate@10502, ResolutionCandidate@10503, ... }
-    <name not found> = ArrayList@10504[7] { ResolutionCandidate@10501, ResolutionCandidate@10502, ResolutionCandidate@10503, ... }
-}
-
-ResolutionTaskHolder@10505 {
-    <name not found> = ArrayList@10506[7] { ResolutionCandidate@10507, ResolutionCandidate@10508, ResolutionCandidate@10509, ... }
-    <name not found> = ArrayList@10510[7] { ResolutionCandidate@10507, ResolutionCandidate@10508, ResolutionCandidate@10509, ... }
-}
-
-ResolutionTaskHolder@10511 {
-    <name not found> = ArrayList@10512[7] { ResolutionCandidate@10513, ResolutionCandidate@10514, ResolutionCandidate@10515, ... }
-    <name not found> = ArrayList@10516[7] { ResolutionCandidate@10513, ResolutionCandidate@10514, ResolutionCandidate@10515, ... }
-}
-
-ResolutionTaskHolder@10517 {
-    <name not found> = ArrayList@10518[7] { ResolutionCandidate@10519, ResolutionCandidate@10520, ResolutionCandidate@10521, ... }
-    <name not found> = ArrayList@10522[7] { ResolutionCandidate@10519, ResolutionCandidate@10520, ResolutionCandidate@10521, ... }
-}
-
-ResolutionTaskHolder@10523 {
-    <name not found> = ArrayList@10524[7] { ResolutionCandidate@10525, ResolutionCandidate@10526, ResolutionCandidate@10527, ... }
-    <name not found> = ArrayList@10528[7] { ResolutionCandidate@10525, ResolutionCandidate@10526, ResolutionCandidate@10527, ... }
-}
-
-ResolutionTaskHolder@10529 {
-    <name not found> = ArrayList@10530[7] { ResolutionCandidate@10531, ResolutionCandidate@10532, ResolutionCandidate@10533, ... }
-    <name not found> = ArrayList@10534[7] { ResolutionCandidate@10531, ResolutionCandidate@10532, ResolutionCandidate@10533, ... }
-}
-
-ResolutionTaskHolder@10535 {
-    <name not found> = ArrayList@10536[7] { ResolutionCandidate@10537, ResolutionCandidate@10538, ResolutionCandidate@10539, ... }
-    <name not found> = ArrayList@10540[7] { ResolutionCandidate@10537, ResolutionCandidate@10538, ResolutionCandidate@10539, ... }
-}
-
-ResolutionTaskHolder@10541 {
-    <name not found> = ArrayList@10542[7] { ResolutionCandidate@10543, ResolutionCandidate@10544, ResolutionCandidate@10545, ... }
-    <name not found> = ArrayList@10546[7] { ResolutionCandidate@10543, ResolutionCandidate@10544, ResolutionCandidate@10545, ... }
-}
-
-ResolutionTaskHolder@10547 {
-    <name not found> = ArrayList@10548[7] { ResolutionCandidate@10549, ResolutionCandidate@10550, ResolutionCandidate@10551, ... }
-    <name not found> = ArrayList@10552[7] { ResolutionCandidate@10549, ResolutionCandidate@10550, ResolutionCandidate@10551, ... }
-}
-
-ResolutionTaskHolder@10553 {
-    <name not found> = ArrayList@10554[7] { ResolutionCandidate@10555, ResolutionCandidate@10556, ResolutionCandidate@10557, ... }
-    <name not found> = ArrayList@10558[7] { ResolutionCandidate@10555, ResolutionCandidate@10556, ResolutionCandidate@10557, ... }
-}
-
-ResolutionTaskHolder@10559 {
-    <name not found> = ArrayList@10560[7] { ResolutionCandidate@10561, ResolutionCandidate@10562, ResolutionCandidate@10563, ... }
-    <name not found> = ArrayList@10564[7] { ResolutionCandidate@10561, ResolutionCandidate@10562, ResolutionCandidate@10563, ... }
-}
-
-ResolutionTaskHolder@10565 {
-    <name not found> = ArrayList@10566[7] { ResolutionCandidate@10567, ResolutionCandidate@10568, ResolutionCandidate@10569, ... }
-    <name not found> = ArrayList@10570[7] { ResolutionCandidate@10567, ResolutionCandidate@10568, ResolutionCandidate@10569, ... }
-}
-
-ResolutionTaskHolder@10571 {
-    <name not found> = ArrayList@10572[7] { ResolutionCandidate@10573, ResolutionCandidate@10574, ResolutionCandidate@10575, ... }
-    <name not found> = ArrayList@10576[7] { ResolutionCandidate@10573, ResolutionCandidate@10574, ResolutionCandidate@10575, ... }
-}
-
-ResolutionTaskHolder@10577 {
-    <name not found> = ArrayList@10578[7] { ResolutionCandidate@10579, ResolutionCandidate@10580, ResolutionCandidate@10581, ... }
-    <name not found> = ArrayList@10582[7] { ResolutionCandidate@10579, ResolutionCandidate@10580, ResolutionCandidate@10581, ... }
-}
-
-ResolutionTaskHolder@10583 {
-    <name not found> = ArrayList@10584[7] { ResolutionCandidate@10585, ResolutionCandidate@10586, ResolutionCandidate@10587, ... }
-    <name not found> = ArrayList@10588[7] { ResolutionCandidate@10585, ResolutionCandidate@10586, ResolutionCandidate@10587, ... }
-}
-
-ResolutionTaskHolder@10589 {
-    <name not found> = ArrayList@10590[7] { ResolutionCandidate@10591, ResolutionCandidate@10592, ResolutionCandidate@10593, ... }
-    <name not found> = ArrayList@10594[7] { ResolutionCandidate@10591, ResolutionCandidate@10592, ResolutionCandidate@10593, ... }
-}
-
-ResolutionTaskHolder@10595 {
-    <name not found> = ArrayList@10596[7] { ResolutionCandidate@10597, ResolutionCandidate@10598, ResolutionCandidate@10599, ... }
-    <name not found> = ArrayList@10600[7] { ResolutionCandidate@10597, ResolutionCandidate@10598, ResolutionCandidate@10599, ... }
-}
-
-ResolutionTaskHolder@10601 {
-    <name not found> = ArrayList@10602[7] { ResolutionCandidate@10603, ResolutionCandidate@10604, ResolutionCandidate@10605, ... }
-    <name not found> = ArrayList@10606[7] { ResolutionCandidate@10603, ResolutionCandidate@10604, ResolutionCandidate@10605, ... }
-}
-
-ResolutionTaskHolder@10607 {
-    <name not found> = ArrayList@10608[7] { ResolutionCandidate@10609, ResolutionCandidate@10610, ResolutionCandidate@10611, ... }
-    <name not found> = ArrayList@10612[7] { ResolutionCandidate@10609, ResolutionCandidate@10610, ResolutionCandidate@10611, ... }
-}
-
-ResolutionTaskHolder@10613 {
-    <name not found> = ArrayList@10614[7] { ResolutionCandidate@10615, ResolutionCandidate@10616, ResolutionCandidate@10617, ... }
-    <name not found> = ArrayList@10618[7] { ResolutionCandidate@10615, ResolutionCandidate@10616, ResolutionCandidate@10617, ... }
-}
-
-ResolutionTaskHolder@10619 {
-    <name not found> = ArrayList@10620[7] { ResolutionCandidate@10621, ResolutionCandidate@10622, ResolutionCandidate@10623, ... }
-    <name not found> = ArrayList@10624[7] { ResolutionCandidate@10621, ResolutionCandidate@10622, ResolutionCandidate@10623, ... }
-}
-
-ResolutionTaskHolder@10625 {
-    <name not found> = ArrayList@10626[7] { ResolutionCandidate@10627, ResolutionCandidate@10628, ResolutionCandidate@10629, ... }
-    <name not found> = ArrayList@10630[7] { ResolutionCandidate@10627, ResolutionCandidate@10628, ResolutionCandidate@10629, ... }
-}
-
-ResolutionTaskHolder@10631 {
-    <name not found> = ArrayList@10632[7] { ResolutionCandidate@10633, ResolutionCandidate@10634, ResolutionCandidate@10635, ... }
-    <name not found> = ArrayList@10636[7] { ResolutionCandidate@10633, ResolutionCandidate@10634, ResolutionCandidate@10635, ... }
-}
-
-ResolutionTaskHolder@10637 {
-    <name not found> = ArrayList@10638[7] { ResolutionCandidate@10639, ResolutionCandidate@10640, ResolutionCandidate@10641, ... }
-    <name not found> = ArrayList@10642[7] { ResolutionCandidate@10639, ResolutionCandidate@10640, ResolutionCandidate@10641, ... }
-}
-
-ResolutionTaskHolder@10643 {
-    <name not found> = ArrayList@10644[7] { ResolutionCandidate@10645, ResolutionCandidate@10646, ResolutionCandidate@10647, ... }
-    <name not found> = ArrayList@10648[7] { ResolutionCandidate@10645, ResolutionCandidate@10646, ResolutionCandidate@10647, ... }
-}
-
-ResolutionTaskHolder@10649 {
-    <name not found> = ArrayList@10650[7] { ResolutionCandidate@10651, ResolutionCandidate@10652, ResolutionCandidate@10653, ... }
-    <name not found> = ArrayList@10654[7] { ResolutionCandidate@10651, ResolutionCandidate@10652, ResolutionCandidate@10653, ... }
-}
-
-ResolutionTaskHolder@10655 {
-    <name not found> = ArrayList@10656[7] { ResolutionCandidate@10657, ResolutionCandidate@10658, ResolutionCandidate@10659, ... }
-    <name not found> = ArrayList@10660[7] { ResolutionCandidate@10657, ResolutionCandidate@10658, ResolutionCandidate@10659, ... }
-}
-
-ResolutionTaskHolder@10661 {
-    <name not found> = ArrayList@10662[7] { ResolutionCandidate@10663, ResolutionCandidate@10664, ResolutionCandidate@10665, ... }
-    <name not found> = ArrayList@10666[7] { ResolutionCandidate@10663, ResolutionCandidate@10664, ResolutionCandidate@10665, ... }
-}
-
-ResolutionTaskHolder@10667 {
-    <name not found> = ArrayList@10668[7] { ResolutionCandidate@10669, ResolutionCandidate@10670, ResolutionCandidate@10671, ... }
-    <name not found> = ArrayList@10672[7] { ResolutionCandidate@10669, ResolutionCandidate@10670, ResolutionCandidate@10671, ... }
-}
-
-ResolutionTaskHolder@10673 {
-    <name not found> = ArrayList@10674[7] { ResolutionCandidate@10675, ResolutionCandidate@10676, ResolutionCandidate@10677, ... }
-    <name not found> = ArrayList@10678[7] { ResolutionCandidate@10675, ResolutionCandidate@10676, ResolutionCandidate@10677, ... }
-}
-
-ResolutionTaskHolder@10679 {
-    <name not found> = ArrayList@10680[7] { ResolutionCandidate@10681, ResolutionCandidate@10682, ResolutionCandidate@10683, ... }
-    <name not found> = ArrayList@10684[7] { ResolutionCandidate@10681, ResolutionCandidate@10682, ResolutionCandidate@10683, ... }
-}
-
-ResolutionTaskHolder@10685 {
-    <name not found> = ArrayList@10686[7] { ResolutionCandidate@10687, ResolutionCandidate@10688, ResolutionCandidate@10689, ... }
-    <name not found> = ArrayList@10690[7] { ResolutionCandidate@10687, ResolutionCandidate@10688, ResolutionCandidate@10689, ... }
-}
-
-ResolutionTaskHolder@10691 {
-    <name not found> = ArrayList@10692[7] { ResolutionCandidate@10693, ResolutionCandidate@10694, ResolutionCandidate@10695, ... }
-    <name not found> = ArrayList@10696[7] { ResolutionCandidate@10693, ResolutionCandidate@10694, ResolutionCandidate@10695, ... }
-}
-
-ResolutionTaskHolder@10697 {
-    <name not found> = ArrayList@10698[7] { ResolutionCandidate@10699, ResolutionCandidate@10700, ResolutionCandidate@10701, ... }
-    <name not found> = ArrayList@10702[7] { ResolutionCandidate@10699, ResolutionCandidate@10700, ResolutionCandidate@10701, ... }
-}
-
-ResolutionTaskHolder@10703 {
-    <name not found> = ArrayList@10704[7] { ResolutionCandidate@10705, ResolutionCandidate@10706, ResolutionCandidate@10707, ... }
-    <name not found> = ArrayList@10708[7] { ResolutionCandidate@10705, ResolutionCandidate@10706, ResolutionCandidate@10707, ... }
-}
-
-ResolutionTaskHolder@10709 {
-    <name not found> = ArrayList@10710[7] { ResolutionCandidate@10711, ResolutionCandidate@10712, ResolutionCandidate@10713, ... }
-    <name not found> = ArrayList@10714[7] { ResolutionCandidate@10711, ResolutionCandidate@10712, ResolutionCandidate@10713, ... }
-}
-
-ResolutionTaskHolder@10715 {
-    <name not found> = ArrayList@10716[7] { ResolutionCandidate@10717, ResolutionCandidate@10718, ResolutionCandidate@10719, ... }
-    <name not found> = ArrayList@10720[7] { ResolutionCandidate@10717, ResolutionCandidate@10718, ResolutionCandidate@10719, ... }
-}
-
-ResolutionTaskHolder@10721 {
-    <name not found> = ArrayList@10722[7] { ResolutionCandidate@10723, ResolutionCandidate@10724, ResolutionCandidate@10725, ... }
-    <name not found> = ArrayList@10726[7] { ResolutionCandidate@10723, ResolutionCandidate@10724, ResolutionCandidate@10725, ... }
-}
-
-ResolutionTaskHolder@10727 {
-    <name not found> = ArrayList@10728[7] { ResolutionCandidate@10729, ResolutionCandidate@10730, ResolutionCandidate@10731, ... }
-    <name not found> = ArrayList@10732[7] { ResolutionCandidate@10729, ResolutionCandidate@10730, ResolutionCandidate@10731, ... }
-}
-
-ResolutionTaskHolder@10733 {
-    <name not found> = ArrayList@10734[7] { ResolutionCandidate@10735, ResolutionCandidate@10736, ResolutionCandidate@10737, ... }
-    <name not found> = ArrayList@10738[7] { ResolutionCandidate@10735, ResolutionCandidate@10736, ResolutionCandidate@10737, ... }
-}
-
-ResolutionTaskHolder@10739 {
-    <name not found> = ArrayList@10740[7] { ResolutionCandidate@10741, ResolutionCandidate@10742, ResolutionCandidate@10743, ... }
-    <name not found> = ArrayList@10744[7] { ResolutionCandidate@10741, ResolutionCandidate@10742, ResolutionCandidate@10743, ... }
-}
-
-ResolutionTaskHolder@10745 {
-    <name not found> = ArrayList@10746[7] { ResolutionCandidate@10747, ResolutionCandidate@10748, ResolutionCandidate@10749, ... }
-    <name not found> = ArrayList@10750[7] { ResolutionCandidate@10747, ResolutionCandidate@10748, ResolutionCandidate@10749, ... }
-}
-
-ResolutionTaskHolder@10751 {
-    <name not found> = ArrayList@10752[7] { ResolutionCandidate@10753, ResolutionCandidate@10754, ResolutionCandidate@10755, ... }
-    <name not found> = ArrayList@10756[7] { ResolutionCandidate@10753, ResolutionCandidate@10754, ResolutionCandidate@10755, ... }
-}
-
-ResolutionTaskHolder@10757 {
-    <name not found> = ArrayList@10758[7] { ResolutionCandidate@10759, ResolutionCandidate@10760, ResolutionCandidate@10761, ... }
-    <name not found> = ArrayList@10762[7] { ResolutionCandidate@10759, ResolutionCandidate@10760, ResolutionCandidate@10761, ... }
-}
-
-ResolutionTaskHolder@10763 {
-    <name not found> = ArrayList@10764[7] { ResolutionCandidate@10765, ResolutionCandidate@10766, ResolutionCandidate@10767, ... }
-    <name not found> = ArrayList@10768[7] { ResolutionCandidate@10765, ResolutionCandidate@10766, ResolutionCandidate@10767, ... }
-}
-
-ResolutionTaskHolder@10769 {
-    <name not found> = ArrayList@10770[7] { ResolutionCandidate@10771, ResolutionCandidate@10772, ResolutionCandidate@10773, ... }
-    <name not found> = ArrayList@10774[7] { ResolutionCandidate@10771, ResolutionCandidate@10772, ResolutionCandidate@10773, ... }
-}
-
-ResolutionTaskHolder@10775 {
-    <name not found> = ArrayList@10776[7] { ResolutionCandidate@10777, ResolutionCandidate@10778, ResolutionCandidate@10779, ... }
-    <name not found> = ArrayList@10780[7] { ResolutionCandidate@10777, ResolutionCandidate@10778, ResolutionCandidate@10779, ... }
-}
-
-ResolutionTaskHolder@10781 {
-    <name not found> = ArrayList@10782[7] { ResolutionCandidate@10783, ResolutionCandidate@10784, ResolutionCandidate@10785, ... }
-    <name not found> = ArrayList@10786[7] { ResolutionCandidate@10783, ResolutionCandidate@10784, ResolutionCandidate@10785, ... }
-}
-
-ResolutionTaskHolder@10787 {
-    <name not found> = ArrayList@10788[7] { ResolutionCandidate@10789, ResolutionCandidate@10790, ResolutionCandidate@10791, ... }
-    <name not found> = ArrayList@10792[7] { ResolutionCandidate@10789, ResolutionCandidate@10790, ResolutionCandidate@10791, ... }
-}
-
-ResolutionTaskHolder@10793 {
-    <name not found> = ArrayList@10794[7] { ResolutionCandidate@10795, ResolutionCandidate@10796, ResolutionCandidate@10797, ... }
-    <name not found> = ArrayList@10798[7] { ResolutionCandidate@10795, ResolutionCandidate@10796, ResolutionCandidate@10797, ... }
-}
-
-ResolutionTaskHolder@10799 {
-    <name not found> = ArrayList@10800[7] { ResolutionCandidate@10801, ResolutionCandidate@10802, ResolutionCandidate@10803, ... }
-    <name not found> = ArrayList@10804[7] { ResolutionCandidate@10801, ResolutionCandidate@10802, ResolutionCandidate@10803, ... }
-}
-
-ResolutionTaskHolder@10805 {
-    <name not found> = ArrayList@10806[7] { ResolutionCandidate@10807, ResolutionCandidate@10808, ResolutionCandidate@10809, ... }
-    <name not found> = ArrayList@10810[7] { ResolutionCandidate@10807, ResolutionCandidate@10808, ResolutionCandidate@10809, ... }
-}
-
-ResolutionTaskHolder@10811 {
-    <name not found> = ArrayList@10812[7] { ResolutionCandidate@10813, ResolutionCandidate@10814, ResolutionCandidate@10815, ... }
-    <name not found> = ArrayList@10816[7] { ResolutionCandidate@10813, ResolutionCandidate@10814, ResolutionCandidate@10815, ... }
-}
-
-ResolutionTaskHolder@10817 {
-    <name not found> = ArrayList@10818[7] { ResolutionCandidate@10819, ResolutionCandidate@10820, ResolutionCandidate@10821, ... }
-    <name not found> = ArrayList@10822[7] { ResolutionCandidate@10819, ResolutionCandidate@10820, ResolutionCandidate@10821, ... }
-}
-
-ResolutionTaskHolder@10823 {
-    <name not found> = ArrayList@10824[7] { ResolutionCandidate@10825, ResolutionCandidate@10826, ResolutionCandidate@10827, ... }
-    <name not found> = ArrayList@10828[7] { ResolutionCandidate@10825, ResolutionCandidate@10826, ResolutionCandidate@10827, ... }
-}
-
-ResolutionTaskHolder@10829 {
-    <name not found> = ArrayList@10830[7] { ResolutionCandidate@10831, ResolutionCandidate@10832, ResolutionCandidate@10833, ... }
-    <name not found> = ArrayList@10834[7] { ResolutionCandidate@10831, ResolutionCandidate@10832, ResolutionCandidate@10833, ... }
-}
-
-ResolutionTaskHolder@10835 {
-    <name not found> = ArrayList@10836[7] { ResolutionCandidate@10837, ResolutionCandidate@10838, ResolutionCandidate@10839, ... }
-    <name not found> = ArrayList@10840[7] { ResolutionCandidate@10837, ResolutionCandidate@10838, ResolutionCandidate@10839, ... }
-}
-
-ResolutionTaskHolder@10841 {
-    <name not found> = ArrayList@10842[7] { ResolutionCandidate@10843, ResolutionCandidate@10844, ResolutionCandidate@10845, ... }
-    <name not found> = ArrayList@10846[7] { ResolutionCandidate@10843, ResolutionCandidate@10844, ResolutionCandidate@10845, ... }
-}
-
-ResolutionTaskHolder@10847 {
-    <name not found> = ArrayList@10848[7] { ResolutionCandidate@10849, ResolutionCandidate@10850, ResolutionCandidate@10851, ... }
-    <name not found> = ArrayList@10852[7] { ResolutionCandidate@10849, ResolutionCandidate@10850, ResolutionCandidate@10851, ... }
-}
-
-ResolutionTaskHolder@10853 {
-    <name not found> = ArrayList@10854[7] { ResolutionCandidate@10855, ResolutionCandidate@10856, ResolutionCandidate@10857, ... }
-    <name not found> = ArrayList@10858[7] { ResolutionCandidate@10855, ResolutionCandidate@10856, ResolutionCandidate@10857, ... }
-}
-
-ResolutionTaskHolder@10859 {
-    <name not found> = ArrayList@10860[7] { ResolutionCandidate@10861, ResolutionCandidate@10862, ResolutionCandidate@10863, ... }
-    <name not found> = ArrayList@10864[7] { ResolutionCandidate@10861, ResolutionCandidate@10862, ResolutionCandidate@10863, ... }
-}
-
-ResolutionTaskHolder@10865 {
-    <name not found> = ArrayList@10866[7] { ResolutionCandidate@10867, ResolutionCandidate@10868, ResolutionCandidate@10869, ... }
-    <name not found> = ArrayList@10870[7] { ResolutionCandidate@10867, ResolutionCandidate@10868, ResolutionCandidate@10869, ... }
-}
-
-ResolutionTaskHolder@10871 {
-    <name not found> = ArrayList@10872[7] { ResolutionCandidate@10873, ResolutionCandidate@10874, ResolutionCandidate@10875, ... }
-    <name not found> = ArrayList@10876[7] { ResolutionCandidate@10873, ResolutionCandidate@10874, ResolutionCandidate@10875, ... }
-}
-
-ResolutionTaskHolder@10877 {
-    <name not found> = ArrayList@10878[7] { ResolutionCandidate@10879, ResolutionCandidate@10880, ResolutionCandidate@10881, ... }
-    <name not found> = ArrayList@10882[7] { ResolutionCandidate@10879, ResolutionCandidate@10880, ResolutionCandidate@10881, ... }
-}
-
-ResolutionTaskHolder@10883 {
-    <name not found> = ArrayList@10884[7] { ResolutionCandidate@10885, ResolutionCandidate@10886, ResolutionCandidate@10887, ... }
-    <name not found> = ArrayList@10888[7] { ResolutionCandidate@10885, ResolutionCandidate@10886, ResolutionCandidate@10887, ... }
-}
-
-ResolutionTaskHolder@10889 {
-    <name not found> = ArrayList@10890[7] { ResolutionCandidate@10891, ResolutionCandidate@10892, ResolutionCandidate@10893, ... }
-    <name not found> = ArrayList@10894[7] { ResolutionCandidate@10891, ResolutionCandidate@10892, ResolutionCandidate@10893, ... }
-}
-
-ResolutionTaskHolder@10895 {
-    <name not found> = ArrayList@10896[7] { ResolutionCandidate@10897, ResolutionCandidate@10898, ResolutionCandidate@10899, ... }
-    <name not found> = ArrayList@10900[7] { ResolutionCandidate@10897, ResolutionCandidate@10898, ResolutionCandidate@10899, ... }
-}
-
-ResolutionTaskHolder@10901 {
-    <name not found> = ArrayList@10902[7] { ResolutionCandidate@10903, ResolutionCandidate@10904, ResolutionCandidate@10905, ... }
-    <name not found> = ArrayList@10906[7] { ResolutionCandidate@10903, ResolutionCandidate@10904, ResolutionCandidate@10905, ... }
-}
-
-ResolutionTaskHolder@10907 {
-    <name not found> = ArrayList@10908[7] { ResolutionCandidate@10909, ResolutionCandidate@10910, ResolutionCandidate@10911, ... }
-    <name not found> = ArrayList@10912[7] { ResolutionCandidate@10909, ResolutionCandidate@10910, ResolutionCandidate@10911, ... }
-}
-
-ResolutionTaskHolder@10913 {
-    <name not found> = ArrayList@10914[7] { ResolutionCandidate@10915, ResolutionCandidate@10916, ResolutionCandidate@10917, ... }
-    <name not found> = ArrayList@10918[7] { ResolutionCandidate@10915, ResolutionCandidate@10916, ResolutionCandidate@10917, ... }
-}
-
-ResolutionTaskHolder@10919 {
-    <name not found> = ArrayList@10920[7] { ResolutionCandidate@10921, ResolutionCandidate@10922, ResolutionCandidate@10923, ... }
-    <name not found> = ArrayList@10924[7] { ResolutionCandidate@10921, ResolutionCandidate@10922, ResolutionCandidate@10923, ... }
-}
-
-ResolutionTaskHolder@10925 {
-    <name not found> = ArrayList@10926[7] { ResolutionCandidate@10927, ResolutionCandidate@10928, ResolutionCandidate@10929, ... }
-    <name not found> = ArrayList@10930[7] { ResolutionCandidate@10927, ResolutionCandidate@10928, ResolutionCandidate@10929, ... }
-}
-
-ResolutionTaskHolder@10931 {
-    <name not found> = ArrayList@10932[7] { ResolutionCandidate@10933, ResolutionCandidate@10934, ResolutionCandidate@10935, ... }
-    <name not found> = ArrayList@10936[7] { ResolutionCandidate@10933, ResolutionCandidate@10934, ResolutionCandidate@10935, ... }
-}
-
-ResolutionTaskHolder@10937 {
-    <name not found> = ArrayList@10938[7] { ResolutionCandidate@10939, ResolutionCandidate@10940, ResolutionCandidate@10941, ... }
-    <name not found> = ArrayList@10942[7] { ResolutionCandidate@10939, ResolutionCandidate@10940, ResolutionCandidate@10941, ... }
-}
-
-ResolutionTaskHolder@10943 {
-    <name not found> = ArrayList@10944[7] { ResolutionCandidate@10945, ResolutionCandidate@10946, ResolutionCandidate@10947, ... }
-    <name not found> = ArrayList@10948[7] { ResolutionCandidate@10945, ResolutionCandidate@10946, ResolutionCandidate@10947, ... }
-}
-
-ResolutionTaskHolder@10949 {
-    <name not found> = ArrayList@10950[7] { ResolutionCandidate@10951, ResolutionCandidate@10952, ResolutionCandidate@10953, ... }
-    <name not found> = ArrayList@10954[7] { ResolutionCandidate@10951, ResolutionCandidate@10952, ResolutionCandidate@10953, ... }
-}
-
-ResolutionTaskHolder@10955 {
-    <name not found> = ArrayList@10956[7] { ResolutionCandidate@10957, ResolutionCandidate@10958, ResolutionCandidate@10959, ... }
-    <name not found> = ArrayList@10960[7] { ResolutionCandidate@10957, ResolutionCandidate@10958, ResolutionCandidate@10959, ... }
-}
-
-ResolutionTaskHolder@10961 {
-    <name not found> = ArrayList@10962[7] { ResolutionCandidate@10963, ResolutionCandidate@10964, ResolutionCandidate@10965, ... }
-    <name not found> = ArrayList@10966[7] { ResolutionCandidate@10963, ResolutionCandidate@10964, ResolutionCandidate@10965, ... }
-}
-
-ResolutionTaskHolder@10967 {
-    <name not found> = ArrayList@10968[7] { ResolutionCandidate@10969, ResolutionCandidate@10970, ResolutionCandidate@10971, ... }
-    <name not found> = ArrayList@10972[7] { ResolutionCandidate@10969, ResolutionCandidate@10970, ResolutionCandidate@10971, ... }
-}
-
-ResolutionTaskHolder@10973 {
-    <name not found> = ArrayList@10974[7] { ResolutionCandidate@10975, ResolutionCandidate@10976, ResolutionCandidate@10977, ... }
-    <name not found> = ArrayList@10978[7] { ResolutionCandidate@10975, ResolutionCandidate@10976, ResolutionCandidate@10977, ... }
-}
-
-ResolutionTaskHolder@10979 {
-    <name not found> = ArrayList@10980[7] { ResolutionCandidate@10981, ResolutionCandidate@10982, ResolutionCandidate@10983, ... }
-    <name not found> = ArrayList@10984[7] { ResolutionCandidate@10981, ResolutionCandidate@10982, ResolutionCandidate@10983, ... }
-}
-
-ResolutionTaskHolder@10985 {
-    <name not found> = ArrayList@10986[7] { ResolutionCandidate@10987, ResolutionCandidate@10988, ResolutionCandidate@10989, ... }
-    <name not found> = ArrayList@10990[7] { ResolutionCandidate@10987, ResolutionCandidate@10988, ResolutionCandidate@10989, ... }
-}
-
-ResolutionTaskHolder@10991 {
-    <name not found> = ArrayList@10992[7] { ResolutionCandidate@10993, ResolutionCandidate@10994, ResolutionCandidate@10995, ... }
-    <name not found> = ArrayList@10996[7] { ResolutionCandidate@10993, ResolutionCandidate@10994, ResolutionCandidate@10995, ... }
-}
-
-ResolutionTaskHolder@10997 {
-    <name not found> = ArrayList@10998[7] { ResolutionCandidate@10999, ResolutionCandidate@11000, ResolutionCandidate@11001, ... }
-    <name not found> = ArrayList@11002[7] { ResolutionCandidate@10999, ResolutionCandidate@11000, ResolutionCandidate@11001, ... }
-}
-
-ResolutionTaskHolder@11003 {
-    <name not found> = ArrayList@11004[7] { ResolutionCandidate@11005, ResolutionCandidate@11006, ResolutionCandidate@11007, ... }
-    <name not found> = ArrayList@11008[7] { ResolutionCandidate@11005, ResolutionCandidate@11006, ResolutionCandidate@11007, ... }
-}
-
-ResolutionTaskHolder@11009 {
-    <name not found> = ArrayList@11010[7] { ResolutionCandidate@11011, ResolutionCandidate@11012, ResolutionCandidate@11013, ... }
-    <name not found> = ArrayList@11014[7] { ResolutionCandidate@11011, ResolutionCandidate@11012, ResolutionCandidate@11013, ... }
-}
-
-ResolutionTaskHolder@11015 {
-    <name not found> = ArrayList@11016[7] { ResolutionCandidate@11017, ResolutionCandidate@11018, ResolutionCandidate@11019, ... }
-    <name not found> = ArrayList@11020[7] { ResolutionCandidate@11017, ResolutionCandidate@11018, ResolutionCandidate@11019, ... }
-}
-
-ResolutionTaskHolder@11021 {
-    <name not found> = ArrayList@11022[7] { ResolutionCandidate@11023, ResolutionCandidate@11024, ResolutionCandidate@11025, ... }
-    <name not found> = ArrayList@11026[7] { ResolutionCandidate@11023, ResolutionCandidate@11024, ResolutionCandidate@11025, ... }
-}
-
-ResolutionTaskHolder@11027 {
-    <name not found> = ArrayList@11028[7] { ResolutionCandidate@11029, ResolutionCandidate@11030, ResolutionCandidate@11031, ... }
-    <name not found> = ArrayList@11032[7] { ResolutionCandidate@11029, ResolutionCandidate@11030, ResolutionCandidate@11031, ... }
-}
-
-ResolutionTaskHolder@11033 {
-    <name not found> = ArrayList@11034[7] { ResolutionCandidate@11035, ResolutionCandidate@11036, ResolutionCandidate@11037, ... }
-    <name not found> = ArrayList@11038[7] { ResolutionCandidate@11035, ResolutionCandidate@11036, ResolutionCandidate@11037, ... }
-}
-
-ResolutionTaskHolder@11039 {
-    <name not found> = ArrayList@11040[7] { ResolutionCandidate@11041, ResolutionCandidate@11042, ResolutionCandidate@11043, ... }
-    <name not found> = ArrayList@11044[7] { ResolutionCandidate@11041, ResolutionCandidate@11042, ResolutionCandidate@11043, ... }
-}
-
-ResolutionTaskHolder@11045 {
-    <name not found> = ArrayList@11046[7] { ResolutionCandidate@11047, ResolutionCandidate@11048, ResolutionCandidate@11049, ... }
-    <name not found> = ArrayList@11050[7] { ResolutionCandidate@11047, ResolutionCandidate@11048, ResolutionCandidate@11049, ... }
-}
-
-ResolutionTaskHolder@11051 {
-    <name not found> = ArrayList@11052[7] { ResolutionCandidate@11053, ResolutionCandidate@11054, ResolutionCandidate@11055, ... }
-    <name not found> = ArrayList@11056[7] { ResolutionCandidate@11053, ResolutionCandidate@11054, ResolutionCandidate@11055, ... }
-}
-
-ResolutionTaskHolder@11057 {
-    <name not found> = ArrayList@11058[7] { ResolutionCandidate@11059, ResolutionCandidate@11060, ResolutionCandidate@11061, ... }
-    <name not found> = ArrayList@11062[7] { ResolutionCandidate@11059, ResolutionCandidate@11060, ResolutionCandidate@11061, ... }
-}
-
-ResolutionTaskHolder@11063 {
-    <name not found> = ArrayList@11064[7] { ResolutionCandidate@11065, ResolutionCandidate@11066, ResolutionCandidate@11067, ... }
-    <name not found> = ArrayList@11068[7] { ResolutionCandidate@11065, ResolutionCandidate@11066, ResolutionCandidate@11067, ... }
-}
-
-ResolutionTaskHolder@11069 {
-    <name not found> = ArrayList@11070[7] { ResolutionCandidate@11071, ResolutionCandidate@11072, ResolutionCandidate@11073, ... }
-    <name not found> = ArrayList@11074[7] { ResolutionCandidate@11071, ResolutionCandidate@11072, ResolutionCandidate@11073, ... }
-}
-
-ResolutionTaskHolder@11075 {
-    <name not found> = ArrayList@11076[7] { ResolutionCandidate@11077, ResolutionCandidate@11078, ResolutionCandidate@11079, ... }
-    <name not found> = ArrayList@11080[7] { ResolutionCandidate@11077, ResolutionCandidate@11078, ResolutionCandidate@11079, ... }
-}
-
-ResolutionTaskHolder@11081 {
-    <name not found> = ArrayList@11082[7] { ResolutionCandidate@11083, ResolutionCandidate@11084, ResolutionCandidate@11085, ... }
-    <name not found> = ArrayList@11086[7] { ResolutionCandidate@11083, ResolutionCandidate@11084, ResolutionCandidate@11085, ... }
-}
-
-ResolutionTaskHolder@11087 {
-    <name not found> = ArrayList@11088[7] { ResolutionCandidate@11089, ResolutionCandidate@11090, ResolutionCandidate@11091, ... }
-    <name not found> = ArrayList@11092[7] { ResolutionCandidate@11089, ResolutionCandidate@11090, ResolutionCandidate@11091, ... }
-}
-
-ResolutionTaskHolder@11093 {
-    <name not found> = ArrayList@11094[7] { ResolutionCandidate@11095, ResolutionCandidate@11096, ResolutionCandidate@11097, ... }
-    <name not found> = ArrayList@11098[7] { ResolutionCandidate@11095, ResolutionCandidate@11096, ResolutionCandidate@11097, ... }
-}
-
-ResolutionTaskHolder@11099 {
-    <name not found> = ArrayList@11100[7] { ResolutionCandidate@11101, ResolutionCandidate@11102, ResolutionCandidate@11103, ... }
-    <name not found> = ArrayList@11104[7] { ResolutionCandidate@11101, ResolutionCandidate@11102, ResolutionCandidate@11103, ... }
-}
-
-ResolutionTaskHolder@11105 {
-    <name not found> = ArrayList@11106[7] { ResolutionCandidate@11107, ResolutionCandidate@11108, ResolutionCandidate@11109, ... }
-    <name not found> = ArrayList@11110[7] { ResolutionCandidate@11107, ResolutionCandidate@11108, ResolutionCandidate@11109, ... }
-}
-
-ResolutionTaskHolder@11111 {
-    <name not found> = ArrayList@11112[7] { ResolutionCandidate@11113, ResolutionCandidate@11114, ResolutionCandidate@11115, ... }
-    <name not found> = ArrayList@11116[7] { ResolutionCandidate@11113, ResolutionCandidate@11114, ResolutionCandidate@11115, ... }
-}
-
-ResolutionTaskHolder@11117 {
-    <name not found> = ArrayList@11118[7] { ResolutionCandidate@11119, ResolutionCandidate@11120, ResolutionCandidate@11121, ... }
-    <name not found> = ArrayList@11122[7] { ResolutionCandidate@11119, ResolutionCandidate@11120, ResolutionCandidate@11121, ... }
-}
-
-ResolutionTaskHolder@11123 {
-    <name not found> = ArrayList@11124[7] { ResolutionCandidate@11125, ResolutionCandidate@11126, ResolutionCandidate@11127, ... }
-    <name not found> = ArrayList@11128[7] { ResolutionCandidate@11125, ResolutionCandidate@11126, ResolutionCandidate@11127, ... }
-}
-
-ResolutionTaskHolder@11129 {
-    <name not found> = ArrayList@11130[7] { ResolutionCandidate@11131, ResolutionCandidate@11132, ResolutionCandidate@11133, ... }
-    <name not found> = ArrayList@11134[7] { ResolutionCandidate@11131, ResolutionCandidate@11132, ResolutionCandidate@11133, ... }
-}
-
-ResolutionTaskHolder@11135 {
-    <name not found> = ArrayList@11136[7] { ResolutionCandidate@11137, ResolutionCandidate@11138, ResolutionCandidate@11139, ... }
-    <name not found> = ArrayList@11140[7] { ResolutionCandidate@11137, ResolutionCandidate@11138, ResolutionCandidate@11139, ... }
-}
-
-ResolutionTaskHolder@11141 {
-    <name not found> = ArrayList@11142[7] { ResolutionCandidate@11143, ResolutionCandidate@11144, ResolutionCandidate@11145, ... }
-    <name not found> = ArrayList@11146[7] { ResolutionCandidate@11143, ResolutionCandidate@11144, ResolutionCandidate@11145, ... }
-}
-
-ResolutionTaskHolder@11147 {
-    <name not found> = ArrayList@11148[7] { ResolutionCandidate@11149, ResolutionCandidate@11150, ResolutionCandidate@11151, ... }
-    <name not found> = ArrayList@11152[7] { ResolutionCandidate@11149, ResolutionCandidate@11150, ResolutionCandidate@11151, ... }
-}
-
-ResolutionTaskHolder@11153 {
-    <name not found> = ArrayList@11154[7] { ResolutionCandidate@11155, ResolutionCandidate@11156, ResolutionCandidate@11157, ... }
-    <name not found> = ArrayList@11158[7] { ResolutionCandidate@11155, ResolutionCandidate@11156, ResolutionCandidate@11157, ... }
-}
-
-ResolutionTaskHolder@11159 {
-    <name not found> = ArrayList@11160[7] { ResolutionCandidate@11161, ResolutionCandidate@11162, ResolutionCandidate@11163, ... }
-    <name not found> = ArrayList@11164[7] { ResolutionCandidate@11161, ResolutionCandidate@11162, ResolutionCandidate@11163, ... }
-}
-
-ResolutionTaskHolder@11165 {
-    <name not found> = ArrayList@11166[7] { ResolutionCandidate@11167, ResolutionCandidate@11168, ResolutionCandidate@11169, ... }
-    <name not found> = ArrayList@11170[7] { ResolutionCandidate@11167, ResolutionCandidate@11168, ResolutionCandidate@11169, ... }
-}
-
-ResolutionTaskHolder@11171 {
-    <name not found> = ArrayList@11172[7] { ResolutionCandidate@11173, ResolutionCandidate@11174, ResolutionCandidate@11175, ... }
-    <name not found> = ArrayList@11176[7] { ResolutionCandidate@11173, ResolutionCandidate@11174, ResolutionCandidate@11175, ... }
-}
-
-ResolutionTaskHolder@11177 {
-    <name not found> = ArrayList@11178[7] { ResolutionCandidate@11179, ResolutionCandidate@11180, ResolutionCandidate@11181, ... }
-    <name not found> = ArrayList@11182[7] { ResolutionCandidate@11179, ResolutionCandidate@11180, ResolutionCandidate@11181, ... }
-}
-
-ResolutionTaskHolder@11183 {
-    <name not found> = ArrayList@11184[7] { ResolutionCandidate@11185, ResolutionCandidate@11186, ResolutionCandidate@11187, ... }
-    <name not found> = ArrayList@11188[7] { ResolutionCandidate@11185, ResolutionCandidate@11186, ResolutionCandidate@11187, ... }
-}
-
-ResolutionTaskHolder@11189 {
-    <name not found> = ArrayList@11190[7] { ResolutionCandidate@11191, ResolutionCandidate@11192, ResolutionCandidate@11193, ... }
-    <name not found> = ArrayList@11194[7] { ResolutionCandidate@11191, ResolutionCandidate@11192, ResolutionCandidate@11193, ... }
-}
-
-ResolutionTaskHolder@11195 {
-    <name not found> = ArrayList@11196[7] { ResolutionCandidate@11197, ResolutionCandidate@11198, ResolutionCandidate@11199, ... }
-    <name not found> = ArrayList@11200[7] { ResolutionCandidate@11197, ResolutionCandidate@11198, ResolutionCandidate@11199, ... }
-}
-
-ResolutionTaskHolder@11201 {
-    <name not found> = ArrayList@11202[7] { ResolutionCandidate@11203, ResolutionCandidate@11204, ResolutionCandidate@11205, ... }
-    <name not found> = ArrayList@11206[7] { ResolutionCandidate@11203, ResolutionCandidate@11204, ResolutionCandidate@11205, ... }
-}
-
-ResolutionTaskHolder@11207 {
-    <name not found> = ArrayList@11208[7] { ResolutionCandidate@11209, ResolutionCandidate@11210, ResolutionCandidate@11211, ... }
-    <name not found> = ArrayList@11212[7] { ResolutionCandidate@11209, ResolutionCandidate@11210, ResolutionCandidate@11211, ... }
-}
-
-ResolutionTaskHolder@11213 {
-    <name not found> = ArrayList@11214[7] { ResolutionCandidate@11215, ResolutionCandidate@11216, ResolutionCandidate@11217, ... }
-    <name not found> = ArrayList@11218[7] { ResolutionCandidate@11215, ResolutionCandidate@11216, ResolutionCandidate@11217, ... }
-}
-
-ResolutionTaskHolder@11219 {
-    <name not found> = ArrayList@11220[7] { ResolutionCandidate@11221, ResolutionCandidate@11222, ResolutionCandidate@11223, ... }
-    <name not found> = ArrayList@11224[7] { ResolutionCandidate@11221, ResolutionCandidate@11222, ResolutionCandidate@11223, ... }
-}
-
-ResolutionTaskHolder@11225 {
-    <name not found> = ArrayList@11226[7] { ResolutionCandidate@11227, ResolutionCandidate@11228, ResolutionCandidate@11229, ... }
-    <name not found> = ArrayList@11230[7] { ResolutionCandidate@11227, ResolutionCandidate@11228, ResolutionCandidate@11229, ... }
-}
-
-ResolutionTaskHolder@11231 {
-    <name not found> = ArrayList@11232[7] { ResolutionCandidate@11233, ResolutionCandidate@11234, ResolutionCandidate@11235, ... }
-    <name not found> = ArrayList@11236[7] { ResolutionCandidate@11233, ResolutionCandidate@11234, ResolutionCandidate@11235, ... }
-}
-
-ResolutionTaskHolder@11237 {
-    <name not found> = ArrayList@11238[7] { ResolutionCandidate@11239, ResolutionCandidate@11240, ResolutionCandidate@11241, ... }
-    <name not found> = ArrayList@11242[7] { ResolutionCandidate@11239, ResolutionCandidate@11240, ResolutionCandidate@11241, ... }
-}
-
-ResolutionTaskHolder@11243 {
-    <name not found> = ArrayList@11244[7] { ResolutionCandidate@11245, ResolutionCandidate@11246, ResolutionCandidate@11247, ... }
-    <name not found> = ArrayList@11248[7] { ResolutionCandidate@11245, ResolutionCandidate@11246, ResolutionCandidate@11247, ... }
-}
-
-ResolutionTaskHolder@11249 {
-    <name not found> = ArrayList@11250[7] { ResolutionCandidate@11251, ResolutionCandidate@11252, ResolutionCandidate@11253, ... }
-    <name not found> = ArrayList@11254[7] { ResolutionCandidate@11251, ResolutionCandidate@11252, ResolutionCandidate@11253, ... }
-}
-
-ResolutionTaskHolder@11255 {
-    <name not found> = ArrayList@11256[7] { ResolutionCandidate@11257, ResolutionCandidate@11258, ResolutionCandidate@11259, ... }
-    <name not found> = ArrayList@11260[7] { ResolutionCandidate@11257, ResolutionCandidate@11258, ResolutionCandidate@11259, ... }
-}
-
-ResolutionTaskHolder@11261 {
-    <name not found> = ArrayList@11262[7] { ResolutionCandidate@11263, ResolutionCandidate@11264, ResolutionCandidate@11265, ... }
-    <name not found> = ArrayList@11266[7] { ResolutionCandidate@11263, ResolutionCandidate@11264, ResolutionCandidate@11265, ... }
-}
-
-ResolutionTaskHolder@11267 {
-    <name not found> = ArrayList@11268[7] { ResolutionCandidate@11269, ResolutionCandidate@11270, ResolutionCandidate@11271, ... }
-    <name not found> = ArrayList@11272[7] { ResolutionCandidate@11269, ResolutionCandidate@11270, ResolutionCandidate@11271, ... }
-}
-
-ResolutionTaskHolder@11273 {
-    <name not found> = ArrayList@11274[7] { ResolutionCandidate@11275, ResolutionCandidate@11276, ResolutionCandidate@11277, ... }
-    <name not found> = ArrayList@11278[7] { ResolutionCandidate@11275, ResolutionCandidate@11276, ResolutionCandidate@11277, ... }
-}
-
-ResolutionTaskHolder@11279 {
-    <name not found> = ArrayList@11280[7] { ResolutionCandidate@11281, ResolutionCandidate@11282, ResolutionCandidate@11283, ... }
-    <name not found> = ArrayList@11284[7] { ResolutionCandidate@11281, ResolutionCandidate@11282, ResolutionCandidate@11283, ... }
-}
-
-ResolutionTaskHolder@11285 {
-    <name not found> = ArrayList@11286[7] { ResolutionCandidate@11287, ResolutionCandidate@11288, ResolutionCandidate@11289, ... }
-    <name not found> = ArrayList@11290[7] { ResolutionCandidate@11287, ResolutionCandidate@11288, ResolutionCandidate@11289, ... }
-}
-
-ResolutionTaskHolder@11291 {
-    <name not found> = ArrayList@11292[7] { ResolutionCandidate@11293, ResolutionCandidate@11294, ResolutionCandidate@11295, ... }
-    <name not found> = ArrayList@11296[7] { ResolutionCandidate@11293, ResolutionCandidate@11294, ResolutionCandidate@11295, ... }
-}
-
-ResolutionTaskHolder@11297 {
-    <name not found> = ArrayList@11298[7] { ResolutionCandidate@11299, ResolutionCandidate@11300, ResolutionCandidate@11301, ... }
-    <name not found> = ArrayList@11302[7] { ResolutionCandidate@11299, ResolutionCandidate@11300, ResolutionCandidate@11301, ... }
-}
-
-ResolutionTaskHolder@11303 {
-    <name not found> = ArrayList@11304[7] { ResolutionCandidate@11305, ResolutionCandidate@11306, ResolutionCandidate@11307, ... }
-    <name not found> = ArrayList@11308[7] { ResolutionCandidate@11305, ResolutionCandidate@11306, ResolutionCandidate@11307, ... }
-}
-
-ResolutionTaskHolder@11309 {
-    <name not found> = ArrayList@11310[7] { ResolutionCandidate@11311, ResolutionCandidate@11312, ResolutionCandidate@11313, ... }
-    <name not found> = ArrayList@11314[7] { ResolutionCandidate@11311, ResolutionCandidate@11312, ResolutionCandidate@11313, ... }
-}
-
-ResolutionTaskHolder@11315 {
-    <name not found> = ArrayList@11316[7] { ResolutionCandidate@11317, ResolutionCandidate@11318, ResolutionCandidate@11319, ... }
-    <name not found> = ArrayList@11320[7] { ResolutionCandidate@11317, ResolutionCandidate@11318, ResolutionCandidate@11319, ... }
-}
-
-ResolutionTaskHolder@11321 {
-    <name not found> = ArrayList@11322[7] { ResolutionCandidate@11323, ResolutionCandidate@11324, ResolutionCandidate@11325, ... }
-    <name not found> = ArrayList@11326[7] { ResolutionCandidate@11323, ResolutionCandidate@11324, ResolutionCandidate@11325, ... }
-}
-
-ResolutionTaskHolder@11327 {
-    <name not found> = ArrayList@11328[7] { ResolutionCandidate@11329, ResolutionCandidate@11330, ResolutionCandidate@11331, ... }
-    <name not found> = ArrayList@11332[7] { ResolutionCandidate@11329, ResolutionCandidate@11330, ResolutionCandidate@11331, ... }
-}
-
-ResolutionTaskHolder@11333 {
-    <name not found> = ArrayList@11334[7] { ResolutionCandidate@11335, ResolutionCandidate@11336, ResolutionCandidate@11337, ... }
-    <name not found> = ArrayList@11338[7] { ResolutionCandidate@11335, ResolutionCandidate@11336, ResolutionCandidate@11337, ... }
-}
-
-ResolutionTaskHolder@11339 {
-    <name not found> = ArrayList@11340[7] { ResolutionCandidate@11341, ResolutionCandidate@11342, ResolutionCandidate@11343, ... }
-    <name not found> = ArrayList@11344[7] { ResolutionCandidate@11341, ResolutionCandidate@11342, ResolutionCandidate@11343, ... }
-}
-
-ResolutionTaskHolder@11345 {
-    <name not found> = ArrayList@11346[7] { ResolutionCandidate@11347, ResolutionCandidate@11348, ResolutionCandidate@11349, ... }
-    <name not found> = ArrayList@11350[7] { ResolutionCandidate@11347, ResolutionCandidate@11348, ResolutionCandidate@11349, ... }
-}
-
-ResolutionTaskHolder@11351 {
-    <name not found> = ArrayList@11352[7] { ResolutionCandidate@11353, ResolutionCandidate@11354, ResolutionCandidate@11355, ... }
-    <name not found> = ArrayList@11356[7] { ResolutionCandidate@11353, ResolutionCandidate@11354, ResolutionCandidate@11355, ... }
-}
-
-ResolutionTaskHolder@11357 {
-    <name not found> = ArrayList@11358[7] { ResolutionCandidate@11359, ResolutionCandidate@11360, ResolutionCandidate@11361, ... }
-    <name not found> = ArrayList@11362[7] { ResolutionCandidate@11359, ResolutionCandidate@11360, ResolutionCandidate@11361, ... }
-}
-
-ResolutionTaskHolder@11363 {
-    <name not found> = ArrayList@11364[7] { ResolutionCandidate@11365, ResolutionCandidate@11366, ResolutionCandidate@11367, ... }
-    <name not found> = ArrayList@11368[7] { ResolutionCandidate@11365, ResolutionCandidate@11366, ResolutionCandidate@11367, ... }
-}
-
-ResolutionTaskHolder@11369 {
-    <name not found> = ArrayList@11370[7] { ResolutionCandidate@11371, ResolutionCandidate@11372, ResolutionCandidate@11373, ... }
-    <name not found> = ArrayList@11374[7] { ResolutionCandidate@11371, ResolutionCandidate@11372, ResolutionCandidate@11373, ... }
-}
-
-ResolutionTaskHolder@11375 {
-    <name not found> = ArrayList@11376[7] { ResolutionCandidate@11377, ResolutionCandidate@11378, ResolutionCandidate@11379, ... }
-    <name not found> = ArrayList@11380[7] { ResolutionCandidate@11377, ResolutionCandidate@11378, ResolutionCandidate@11379, ... }
-}
-
-ResolutionTaskHolder@11381 {
-    <name not found> = ArrayList@11382[7] { ResolutionCandidate@11383, ResolutionCandidate@11384, ResolutionCandidate@11385, ... }
-    <name not found> = ArrayList@11386[7] { ResolutionCandidate@11383, ResolutionCandidate@11384, ResolutionCandidate@11385, ... }
-}
-
-ResolutionTaskHolder@11387 {
-    <name not found> = ArrayList@11388[8] { ResolutionCandidate@11389, ResolutionCandidate@11390, ResolutionCandidate@11391, ... }
-    <name not found> = ArrayList@11392[8] { ResolutionCandidate@11389, ResolutionCandidate@11390, ResolutionCandidate@11391, ... }
-}
-
-ResolutionTaskHolder@11393 {
-    <name not found> = ArrayList@11394[8] { ResolutionCandidate@11395, ResolutionCandidate@11396, ResolutionCandidate@11397, ... }
-    <name not found> = ArrayList@11398[8] { ResolutionCandidate@11395, ResolutionCandidate@11396, ResolutionCandidate@11397, ... }
-}
-
-ResolutionTaskHolder@11399 {
-    <name not found> = ArrayList@11400[8] { ResolutionCandidate@11401, ResolutionCandidate@11402, ResolutionCandidate@11403, ... }
-    <name not found> = ArrayList@11404[8] { ResolutionCandidate@11401, ResolutionCandidate@11402, ResolutionCandidate@11403, ... }
-}
-
-ResolutionTaskHolder@11405 {
-    <name not found> = ArrayList@11406[8] { ResolutionCandidate@11407, ResolutionCandidate@11408, ResolutionCandidate@11409, ... }
-    <name not found> = ArrayList@11410[8] { ResolutionCandidate@11407, ResolutionCandidate@11408, ResolutionCandidate@11409, ... }
-}
-
-ResolutionTaskHolder@11411 {
-    <name not found> = ArrayList@11412[8] { ResolutionCandidate@11413, ResolutionCandidate@11414, ResolutionCandidate@11415, ... }
-    <name not found> = ArrayList@11416[8] { ResolutionCandidate@11413, ResolutionCandidate@11414, ResolutionCandidate@11415, ... }
-}
-
-ResolutionTaskHolder@11417 {
-    <name not found> = ArrayList@11418[8] { ResolutionCandidate@11419, ResolutionCandidate@11420, ResolutionCandidate@11421, ... }
-    <name not found> = ArrayList@11422[8] { ResolutionCandidate@11419, ResolutionCandidate@11420, ResolutionCandidate@11421, ... }
-}
-
-ResolutionTaskHolder@11423 {
-    <name not found> = ArrayList@11424[8] { ResolutionCandidate@11425, ResolutionCandidate@11426, ResolutionCandidate@11427, ... }
-    <name not found> = ArrayList@11428[8] { ResolutionCandidate@11425, ResolutionCandidate@11426, ResolutionCandidate@11427, ... }
-}
-
-ResolutionTaskHolder@11429 {
-    <name not found> = ArrayList@11430[8] { ResolutionCandidate@11431, ResolutionCandidate@11432, ResolutionCandidate@11433, ... }
-    <name not found> = ArrayList@11434[8] { ResolutionCandidate@11431, ResolutionCandidate@11432, ResolutionCandidate@11433, ... }
-}
-
-ResolutionTaskHolder@11435 {
-    <name not found> = ArrayList@11436[8] { ResolutionCandidate@11437, ResolutionCandidate@11438, ResolutionCandidate@11439, ... }
-    <name not found> = ArrayList@11440[8] { ResolutionCandidate@11437, ResolutionCandidate@11438, ResolutionCandidate@11439, ... }
-}
-
-ResolutionTaskHolder@11441 {
-    <name not found> = ArrayList@11442[8] { ResolutionCandidate@11443, ResolutionCandidate@11444, ResolutionCandidate@11445, ... }
-    <name not found> = ArrayList@11446[8] { ResolutionCandidate@11443, ResolutionCandidate@11444, ResolutionCandidate@11445, ... }
-}
-
-ResolutionTaskHolder@11447 {
-    <name not found> = ArrayList@11448[8] { ResolutionCandidate@11449, ResolutionCandidate@11450, ResolutionCandidate@11451, ... }
-    <name not found> = ArrayList@11452[8] { ResolutionCandidate@11449, ResolutionCandidate@11450, ResolutionCandidate@11451, ... }
-}
-
-ResolutionTaskHolder@11453 {
-    <name not found> = ArrayList@11454[8] { ResolutionCandidate@11455, ResolutionCandidate@11456, ResolutionCandidate@11457, ... }
-    <name not found> = ArrayList@11458[8] { ResolutionCandidate@11455, ResolutionCandidate@11456, ResolutionCandidate@11457, ... }
-}
-
-ResolutionTaskHolder@11459 {
-    <name not found> = ArrayList@11460[8] { ResolutionCandidate@11461, ResolutionCandidate@11462, ResolutionCandidate@11463, ... }
-    <name not found> = ArrayList@11464[8] { ResolutionCandidate@11461, ResolutionCandidate@11462, ResolutionCandidate@11463, ... }
-}
-
-ResolutionTaskHolder@11465 {
-    <name not found> = ArrayList@11466[8] { ResolutionCandidate@11467, ResolutionCandidate@11468, ResolutionCandidate@11469, ... }
-    <name not found> = ArrayList@11470[8] { ResolutionCandidate@11467, ResolutionCandidate@11468, ResolutionCandidate@11469, ... }
-}
-
-ResolutionTaskHolder@11471 {
-    <name not found> = ArrayList@11472[8] { ResolutionCandidate@11473, ResolutionCandidate@11474, ResolutionCandidate@11475, ... }
-    <name not found> = ArrayList@11476[8] { ResolutionCandidate@11473, ResolutionCandidate@11474, ResolutionCandidate@11475, ... }
-}
-
-ResolutionTaskHolder@11477 {
-    <name not found> = ArrayList@11478[8] { ResolutionCandidate@11479, ResolutionCandidate@11480, ResolutionCandidate@11481, ... }
-    <name not found> = ArrayList@11482[8] { ResolutionCandidate@11479, ResolutionCandidate@11480, ResolutionCandidate@11481, ... }
-}
-
-ResolutionTaskHolder@11483 {
-    <name not found> = ArrayList@11484[8] { ResolutionCandidate@11485, ResolutionCandidate@11486, ResolutionCandidate@11487, ... }
-    <name not found> = ArrayList@11488[8] { ResolutionCandidate@11485, ResolutionCandidate@11486, ResolutionCandidate@11487, ... }
-}
-
-ResolutionTaskHolder@11489 {
-    <name not found> = ArrayList@11490[8] { ResolutionCandidate@11491, ResolutionCandidate@11492, ResolutionCandidate@11493, ... }
-    <name not found> = ArrayList@11494[8] { ResolutionCandidate@11491, ResolutionCandidate@11492, ResolutionCandidate@11493, ... }
-}
-
-ResolutionTaskHolder@11495 {
-    <name not found> = ArrayList@11496[8] { ResolutionCandidate@11497, ResolutionCandidate@11498, ResolutionCandidate@11499, ... }
-    <name not found> = ArrayList@11500[8] { ResolutionCandidate@11497, ResolutionCandidate@11498, ResolutionCandidate@11499, ... }
-}
-
-ResolutionTaskHolder@11501 {
-    <name not found> = ArrayList@11502[8] { ResolutionCandidate@11503, ResolutionCandidate@11504, ResolutionCandidate@11505, ... }
-    <name not found> = ArrayList@11506[8] { ResolutionCandidate@11503, ResolutionCandidate@11504, ResolutionCandidate@11505, ... }
-}
-
-ResolutionTaskHolder@11507 {
-    <name not found> = ArrayList@11508[8] { ResolutionCandidate@11509, ResolutionCandidate@11510, ResolutionCandidate@11511, ... }
-    <name not found> = ArrayList@11512[8] { ResolutionCandidate@11509, ResolutionCandidate@11510, ResolutionCandidate@11511, ... }
-}
-
-ResolutionTaskHolder@11513 {
-    <name not found> = ArrayList@11514[8] { ResolutionCandidate@11515, ResolutionCandidate@11516, ResolutionCandidate@11517, ... }
-    <name not found> = ArrayList@11518[8] { ResolutionCandidate@11515, ResolutionCandidate@11516, ResolutionCandidate@11517, ... }
-}
-
-ResolutionTaskHolder@11519 {
-    <name not found> = ArrayList@11520[8] { ResolutionCandidate@11521, ResolutionCandidate@11522, ResolutionCandidate@11523, ... }
-    <name not found> = ArrayList@11524[8] { ResolutionCandidate@11521, ResolutionCandidate@11522, ResolutionCandidate@11523, ... }
-}
-
-ResolutionTaskHolder@11525 {
-    <name not found> = ArrayList@11526[8] { ResolutionCandidate@11527, ResolutionCandidate@11528, ResolutionCandidate@11529, ... }
-    <name not found> = ArrayList@11530[8] { ResolutionCandidate@11527, ResolutionCandidate@11528, ResolutionCandidate@11529, ... }
-}
-
-ResolutionTaskHolder@11531 {
-    <name not found> = ArrayList@11532[8] { ResolutionCandidate@11533, ResolutionCandidate@11534, ResolutionCandidate@11535, ... }
-    <name not found> = ArrayList@11536[8] { ResolutionCandidate@11533, ResolutionCandidate@11534, ResolutionCandidate@11535, ... }
-}
-
-ResolutionTaskHolder@11537 {
-    <name not found> = ArrayList@11538[8] { ResolutionCandidate@11539, ResolutionCandidate@11540, ResolutionCandidate@11541, ... }
-    <name not found> = ArrayList@11542[8] { ResolutionCandidate@11539, ResolutionCandidate@11540, ResolutionCandidate@11541, ... }
-}
-
-ResolutionTaskHolder@11543 {
-    <name not found> = ArrayList@11544[8] { ResolutionCandidate@11545, ResolutionCandidate@11546, ResolutionCandidate@11547, ... }
-    <name not found> = ArrayList@11548[8] { ResolutionCandidate@11545, ResolutionCandidate@11546, ResolutionCandidate@11547, ... }
-}
-
-ResolutionTaskHolder@11549 {
-    <name not found> = ArrayList@11550[8] { ResolutionCandidate@11551, ResolutionCandidate@11552, ResolutionCandidate@11553, ... }
-    <name not found> = ArrayList@11554[8] { ResolutionCandidate@11551, ResolutionCandidate@11552, ResolutionCandidate@11553, ... }
-}
-
-ResolutionTaskHolder@11555 {
-    <name not found> = ArrayList@11556[8] { ResolutionCandidate@11557, ResolutionCandidate@11558, ResolutionCandidate@11559, ... }
-    <name not found> = ArrayList@11560[8] { ResolutionCandidate@11557, ResolutionCandidate@11558, ResolutionCandidate@11559, ... }
-}
-
-ResolutionTaskHolder@11561 {
-    <name not found> = ArrayList@11562[8] { ResolutionCandidate@11563, ResolutionCandidate@11564, ResolutionCandidate@11565, ... }
-    <name not found> = ArrayList@11566[8] { ResolutionCandidate@11563, ResolutionCandidate@11564, ResolutionCandidate@11565, ... }
-}
-
-ResolutionTaskHolder@11567 {
-    <name not found> = ArrayList@11568[8] { ResolutionCandidate@11569, ResolutionCandidate@11570, ResolutionCandidate@11571, ... }
-    <name not found> = ArrayList@11572[8] { ResolutionCandidate@11569, ResolutionCandidate@11570, ResolutionCandidate@11571, ... }
-}
-
-ResolutionTaskHolder@11573 {
-    <name not found> = ArrayList@11574[8] { ResolutionCandidate@11575, ResolutionCandidate@11576, ResolutionCandidate@11577, ... }
-    <name not found> = ArrayList@11578[8] { ResolutionCandidate@11575, ResolutionCandidate@11576, ResolutionCandidate@11577, ... }
-}
-
-ResolutionTaskHolder@11579 {
-    <name not found> = ArrayList@11580[8] { ResolutionCandidate@11581, ResolutionCandidate@11582, ResolutionCandidate@11583, ... }
-    <name not found> = ArrayList@11584[8] { ResolutionCandidate@11581, ResolutionCandidate@11582, ResolutionCandidate@11583, ... }
-}
-
-ResolutionTaskHolder@11585 {
-    <name not found> = ArrayList@11586[8] { ResolutionCandidate@11587, ResolutionCandidate@11588, ResolutionCandidate@11589, ... }
-    <name not found> = ArrayList@11590[8] { ResolutionCandidate@11587, ResolutionCandidate@11588, ResolutionCandidate@11589, ... }
-}
-
-ResolutionTaskHolder@11591 {
-    <name not found> = ArrayList@11592[8] { ResolutionCandidate@11593, ResolutionCandidate@11594, ResolutionCandidate@11595, ... }
-    <name not found> = ArrayList@11596[8] { ResolutionCandidate@11593, ResolutionCandidate@11594, ResolutionCandidate@11595, ... }
-}
-
-ResolutionTaskHolder@11597 {
-    <name not found> = ArrayList@11598[8] { ResolutionCandidate@11599, ResolutionCandidate@11600, ResolutionCandidate@11601, ... }
-    <name not found> = ArrayList@11602[8] { ResolutionCandidate@11599, ResolutionCandidate@11600, ResolutionCandidate@11601, ... }
-}
-
-ResolutionTaskHolder@11603 {
-    <name not found> = ArrayList@11604[8] { ResolutionCandidate@11605, ResolutionCandidate@11606, ResolutionCandidate@11607, ... }
-    <name not found> = ArrayList@11608[8] { ResolutionCandidate@11605, ResolutionCandidate@11606, ResolutionCandidate@11607, ... }
-}
-
-ResolutionTaskHolder@11609 {
-    <name not found> = ArrayList@11610[8] { ResolutionCandidate@11611, ResolutionCandidate@11612, ResolutionCandidate@11613, ... }
-    <name not found> = ArrayList@11614[8] { ResolutionCandidate@11611, ResolutionCandidate@11612, ResolutionCandidate@11613, ... }
-}
-
-ResolutionTaskHolder@11615 {
-    <name not found> = ArrayList@11616[8] { ResolutionCandidate@11617, ResolutionCandidate@11618, ResolutionCandidate@11619, ... }
-    <name not found> = ArrayList@11620[8] { ResolutionCandidate@11617, ResolutionCandidate@11618, ResolutionCandidate@11619, ... }
-}
-
-ResolutionTaskHolder@11621 {
-    <name not found> = ArrayList@11622[8] { ResolutionCandidate@11623, ResolutionCandidate@11624, ResolutionCandidate@11625, ... }
-    <name not found> = ArrayList@11626[8] { ResolutionCandidate@11623, ResolutionCandidate@11624, ResolutionCandidate@11625, ... }
-}
-
-ResolutionTaskHolder@11627 {
-    <name not found> = ArrayList@11628[8] { ResolutionCandidate@11629, ResolutionCandidate@11630, ResolutionCandidate@11631, ... }
-    <name not found> = ArrayList@11632[8] { ResolutionCandidate@11629, ResolutionCandidate@11630, ResolutionCandidate@11631, ... }
-}
-
-ResolutionTaskHolder@11633 {
-    <name not found> = ArrayList@11634[8] { ResolutionCandidate@11635, ResolutionCandidate@11636, ResolutionCandidate@11637, ... }
-    <name not found> = ArrayList@11638[8] { ResolutionCandidate@11635, ResolutionCandidate@11636, ResolutionCandidate@11637, ... }
-}
-
-ResolutionTaskHolder@11639 {
-    <name not found> = ArrayList@11640[8] { ResolutionCandidate@11641, ResolutionCandidate@11642, ResolutionCandidate@11643, ... }
-    <name not found> = ArrayList@11644[8] { ResolutionCandidate@11641, ResolutionCandidate@11642, ResolutionCandidate@11643, ... }
-}
-
-ResolutionTaskHolder@11645 {
-    <name not found> = ArrayList@11646[8] { ResolutionCandidate@11647, ResolutionCandidate@11648, ResolutionCandidate@11649, ... }
-    <name not found> = ArrayList@11650[8] { ResolutionCandidate@11647, ResolutionCandidate@11648, ResolutionCandidate@11649, ... }
-}
-
-ResolutionTaskHolder@11651 {
-    <name not found> = ArrayList@11652[8] { ResolutionCandidate@11653, ResolutionCandidate@11654, ResolutionCandidate@11655, ... }
-    <name not found> = ArrayList@11656[8] { ResolutionCandidate@11653, ResolutionCandidate@11654, ResolutionCandidate@11655, ... }
-}
-
-ResolutionTaskHolder@11657 {
-    <name not found> = ArrayList@11658[8] { ResolutionCandidate@11659, ResolutionCandidate@11660, ResolutionCandidate@11661, ... }
-    <name not found> = ArrayList@11662[8] { ResolutionCandidate@11659, ResolutionCandidate@11660, ResolutionCandidate@11661, ... }
-}
-
-ResolutionTaskHolder@11663 {
-    <name not found> = ArrayList@11664[8] { ResolutionCandidate@11665, ResolutionCandidate@11666, ResolutionCandidate@11667, ... }
-    <name not found> = ArrayList@11668[8] { ResolutionCandidate@11665, ResolutionCandidate@11666, ResolutionCandidate@11667, ... }
-}
-
-ResolutionTaskHolder@11669 {
-    <name not found> = ArrayList@11670[8] { ResolutionCandidate@11671, ResolutionCandidate@11672, ResolutionCandidate@11673, ... }
-    <name not found> = ArrayList@11674[8] { ResolutionCandidate@11671, ResolutionCandidate@11672, ResolutionCandidate@11673, ... }
-}
-
-ResolutionTaskHolder@11675 {
-    <name not found> = ArrayList@11676[8] { ResolutionCandidate@11677, ResolutionCandidate@11678, ResolutionCandidate@11679, ... }
-    <name not found> = ArrayList@11680[8] { ResolutionCandidate@11677, ResolutionCandidate@11678, ResolutionCandidate@11679, ... }
-}
-
-ResolutionTaskHolder@11681 {
-    <name not found> = ArrayList@11682[8] { ResolutionCandidate@11683, ResolutionCandidate@11684, ResolutionCandidate@11685, ... }
-    <name not found> = ArrayList@11686[8] { ResolutionCandidate@11683, ResolutionCandidate@11684, ResolutionCandidate@11685, ... }
-}
-
-ResolutionTaskHolder@11687 {
-    <name not found> = ArrayList@11688[8] { ResolutionCandidate@11689, ResolutionCandidate@11690, ResolutionCandidate@11691, ... }
-    <name not found> = ArrayList@11692[8] { ResolutionCandidate@11689, ResolutionCandidate@11690, ResolutionCandidate@11691, ... }
-}
-
-ResolutionTaskHolder@11693 {
-    <name not found> = ArrayList@11694[8] { ResolutionCandidate@11695, ResolutionCandidate@11696, ResolutionCandidate@11697, ... }
-    <name not found> = ArrayList@11698[8] { ResolutionCandidate@11695, ResolutionCandidate@11696, ResolutionCandidate@11697, ... }
-}
-
-ResolutionTaskHolder@11699 {
-    <name not found> = ArrayList@11700[8] { ResolutionCandidate@11701, ResolutionCandidate@11702, ResolutionCandidate@11703, ... }
-    <name not found> = ArrayList@11704[8] { ResolutionCandidate@11701, ResolutionCandidate@11702, ResolutionCandidate@11703, ... }
-}
-
-ResolutionTaskHolder@11705 {
-    <name not found> = ArrayList@11706[8] { ResolutionCandidate@11707, ResolutionCandidate@11708, ResolutionCandidate@11709, ... }
-    <name not found> = ArrayList@11710[8] { ResolutionCandidate@11707, ResolutionCandidate@11708, ResolutionCandidate@11709, ... }
-}
-
-ResolutionTaskHolder@11711 {
-    <name not found> = ArrayList@11712[8] { ResolutionCandidate@11713, ResolutionCandidate@11714, ResolutionCandidate@11715, ... }
-    <name not found> = ArrayList@11716[8] { ResolutionCandidate@11713, ResolutionCandidate@11714, ResolutionCandidate@11715, ... }
-}
-
-ResolutionTaskHolder@11717 {
-    <name not found> = ArrayList@11718[8] { ResolutionCandidate@11719, ResolutionCandidate@11720, ResolutionCandidate@11721, ... }
-    <name not found> = ArrayList@11722[8] { ResolutionCandidate@11719, ResolutionCandidate@11720, ResolutionCandidate@11721, ... }
-}
-
-ResolutionTaskHolder@11723 {
-    <name not found> = ArrayList@11724[8] { ResolutionCandidate@11725, ResolutionCandidate@11726, ResolutionCandidate@11727, ... }
-    <name not found> = ArrayList@11728[8] { ResolutionCandidate@11725, ResolutionCandidate@11726, ResolutionCandidate@11727, ... }
-}
-
-ResolutionTaskHolder@11729 {
-    <name not found> = ArrayList@11730[8] { ResolutionCandidate@11731, ResolutionCandidate@11732, ResolutionCandidate@11733, ... }
-    <name not found> = ArrayList@11734[8] { ResolutionCandidate@11731, ResolutionCandidate@11732, ResolutionCandidate@11733, ... }
-}
-
-ResolutionTaskHolder@11735 {
-    <name not found> = ArrayList@11736[8] { ResolutionCandidate@11737, ResolutionCandidate@11738, ResolutionCandidate@11739, ... }
-    <name not found> = ArrayList@11740[8] { ResolutionCandidate@11737, ResolutionCandidate@11738, ResolutionCandidate@11739, ... }
-}
-
-ResolutionTaskHolder@11741 {
-    <name not found> = ArrayList@11742[8] { ResolutionCandidate@11743, ResolutionCandidate@11744, ResolutionCandidate@11745, ... }
-    <name not found> = ArrayList@11746[8] { ResolutionCandidate@11743, ResolutionCandidate@11744, ResolutionCandidate@11745, ... }
-}
-
-ResolutionTaskHolder@11747 {
-    <name not found> = ArrayList@11748[8] { ResolutionCandidate@11749, ResolutionCandidate@11750, ResolutionCandidate@11751, ... }
-    <name not found> = ArrayList@11752[8] { ResolutionCandidate@11749, ResolutionCandidate@11750, ResolutionCandidate@11751, ... }
-}
-
-ResolutionTaskHolder@11753 {
-    <name not found> = ArrayList@11754[8] { ResolutionCandidate@11755, ResolutionCandidate@11756, ResolutionCandidate@11757, ... }
-    <name not found> = ArrayList@11758[8] { ResolutionCandidate@11755, ResolutionCandidate@11756, ResolutionCandidate@11757, ... }
-}
-
-ResolutionTaskHolder@11759 {
-    <name not found> = ArrayList@11760[8] { ResolutionCandidate@11761, ResolutionCandidate@11762, ResolutionCandidate@11763, ... }
-    <name not found> = ArrayList@11764[8] { ResolutionCandidate@11761, ResolutionCandidate@11762, ResolutionCandidate@11763, ... }
-}
-
-ResolutionTaskHolder@11765 {
-    <name not found> = ArrayList@11766[8] { ResolutionCandidate@11767, ResolutionCandidate@11768, ResolutionCandidate@11769, ... }
-    <name not found> = ArrayList@11770[8] { ResolutionCandidate@11767, ResolutionCandidate@11768, ResolutionCandidate@11769, ... }
-}
-
-ResolutionTaskHolder@11771 {
-    <name not found> = ArrayList@11772[8] { ResolutionCandidate@11773, ResolutionCandidate@11774, ResolutionCandidate@11775, ... }
-    <name not found> = ArrayList@11776[8] { ResolutionCandidate@11773, ResolutionCandidate@11774, ResolutionCandidate@11775, ... }
-}
-
-ResolutionTaskHolder@11777 {
-    <name not found> = ArrayList@11778[8] { ResolutionCandidate@11779, ResolutionCandidate@11780, ResolutionCandidate@11781, ... }
-    <name not found> = ArrayList@11782[8] { ResolutionCandidate@11779, ResolutionCandidate@11780, ResolutionCandidate@11781, ... }
-}
-
-ResolutionTaskHolder@11783 {
-    <name not found> = ArrayList@11784[8] { ResolutionCandidate@11785, ResolutionCandidate@11786, ResolutionCandidate@11787, ... }
-    <name not found> = ArrayList@11788[8] { ResolutionCandidate@11785, ResolutionCandidate@11786, ResolutionCandidate@11787, ... }
-}
-
-ResolutionTaskHolder@11789 {
-    <name not found> = ArrayList@11790[8] { ResolutionCandidate@11791, ResolutionCandidate@11792, ResolutionCandidate@11793, ... }
-    <name not found> = ArrayList@11794[8] { ResolutionCandidate@11791, ResolutionCandidate@11792, ResolutionCandidate@11793, ... }
-}
-
-ResolutionTaskHolder@11795 {
-    <name not found> = ArrayList@11796[8] { ResolutionCandidate@11797, ResolutionCandidate@11798, ResolutionCandidate@11799, ... }
-    <name not found> = ArrayList@11800[8] { ResolutionCandidate@11797, ResolutionCandidate@11798, ResolutionCandidate@11799, ... }
-}
-
-ResolutionTaskHolder@11801 {
-    <name not found> = ArrayList@11802[8] { ResolutionCandidate@11803, ResolutionCandidate@11804, ResolutionCandidate@11805, ... }
-    <name not found> = ArrayList@11806[8] { ResolutionCandidate@11803, ResolutionCandidate@11804, ResolutionCandidate@11805, ... }
-}
-
-ResolutionTaskHolder@11807 {
-    <name not found> = ArrayList@11808[8] { ResolutionCandidate@11809, ResolutionCandidate@11810, ResolutionCandidate@11811, ... }
-    <name not found> = ArrayList@11812[8] { ResolutionCandidate@11809, ResolutionCandidate@11810, ResolutionCandidate@11811, ... }
-}
-
-ResolutionTaskHolder@11813 {
-    <name not found> = ArrayList@11814[8] { ResolutionCandidate@11815, ResolutionCandidate@11816, ResolutionCandidate@11817, ... }
-    <name not found> = ArrayList@11818[8] { ResolutionCandidate@11815, ResolutionCandidate@11816, ResolutionCandidate@11817, ... }
-}
-
-ResolutionTaskHolder@11819 {
-    <name not found> = ArrayList@11820[8] { ResolutionCandidate@11821, ResolutionCandidate@11822, ResolutionCandidate@11823, ... }
-    <name not found> = ArrayList@11824[8] { ResolutionCandidate@11821, ResolutionCandidate@11822, ResolutionCandidate@11823, ... }
-}
-
-ResolutionTaskHolder@11825 {
-    <name not found> = ArrayList@11826[8] { ResolutionCandidate@11827, ResolutionCandidate@11828, ResolutionCandidate@11829, ... }
-    <name not found> = ArrayList@11830[8] { ResolutionCandidate@11827, ResolutionCandidate@11828, ResolutionCandidate@11829, ... }
-}
-
-ResolutionTaskHolder@11831 {
-    <name not found> = ArrayList@11832[8] { ResolutionCandidate@11833, ResolutionCandidate@11834, ResolutionCandidate@11835, ... }
-    <name not found> = ArrayList@11836[8] { ResolutionCandidate@11833, ResolutionCandidate@11834, ResolutionCandidate@11835, ... }
-}
-
-ResolutionTaskHolder@11837 {
-    <name not found> = ArrayList@11838[8] { ResolutionCandidate@11839, ResolutionCandidate@11840, ResolutionCandidate@11841, ... }
-    <name not found> = ArrayList@11842[8] { ResolutionCandidate@11839, ResolutionCandidate@11840, ResolutionCandidate@11841, ... }
-}
-
-ResolutionTaskHolder@11843 {
-    <name not found> = ArrayList@11844[8] { ResolutionCandidate@11845, ResolutionCandidate@11846, ResolutionCandidate@11847, ... }
-    <name not found> = ArrayList@11848[8] { ResolutionCandidate@11845, ResolutionCandidate@11846, ResolutionCandidate@11847, ... }
-}
-
-ResolutionTaskHolder@11849 {
-    <name not found> = ArrayList@11850[8] { ResolutionCandidate@11851, ResolutionCandidate@11852, ResolutionCandidate@11853, ... }
-    <name not found> = ArrayList@11854[8] { ResolutionCandidate@11851, ResolutionCandidate@11852, ResolutionCandidate@11853, ... }
-}
-
-ResolutionTaskHolder@11855 {
-    <name not found> = ArrayList@11856[8] { ResolutionCandidate@11857, ResolutionCandidate@11858, ResolutionCandidate@11859, ... }
-    <name not found> = ArrayList@11860[8] { ResolutionCandidate@11857, ResolutionCandidate@11858, ResolutionCandidate@11859, ... }
-}
-
-ResolutionTaskHolder@11861 {
-    <name not found> = ArrayList@11862[8] { ResolutionCandidate@11863, ResolutionCandidate@11864, ResolutionCandidate@11865, ... }
-    <name not found> = ArrayList@11866[8] { ResolutionCandidate@11863, ResolutionCandidate@11864, ResolutionCandidate@11865, ... }
-}
-
-ResolutionTaskHolder@11867 {
-    <name not found> = ArrayList@11868[8] { ResolutionCandidate@11869, ResolutionCandidate@11870, ResolutionCandidate@11871, ... }
-    <name not found> = ArrayList@11872[8] { ResolutionCandidate@11869, ResolutionCandidate@11870, ResolutionCandidate@11871, ... }
-}
-
-ResolutionTaskHolder@11873 {
-    <name not found> = ArrayList@11874[8] { ResolutionCandidate@11875, ResolutionCandidate@11876, ResolutionCandidate@11877, ... }
-    <name not found> = ArrayList@11878[8] { ResolutionCandidate@11875, ResolutionCandidate@11876, ResolutionCandidate@11877, ... }
-}
-
-ResolutionTaskHolder@11879 {
-    <name not found> = ArrayList@11880[8] { ResolutionCandidate@11881, ResolutionCandidate@11882, ResolutionCandidate@11883, ... }
-    <name not found> = ArrayList@11884[8] { ResolutionCandidate@11881, ResolutionCandidate@11882, ResolutionCandidate@11883, ... }
-}
-
-ResolutionTaskHolder@11885 {
-    <name not found> = ArrayList@11886[8] { ResolutionCandidate@11887, ResolutionCandidate@11888, ResolutionCandidate@11889, ... }
-    <name not found> = ArrayList@11890[8] { ResolutionCandidate@11887, ResolutionCandidate@11888, ResolutionCandidate@11889, ... }
-}
-
-ResolutionTaskHolder@11891 {
-    <name not found> = ArrayList@11892[8] { ResolutionCandidate@11893, ResolutionCandidate@11894, ResolutionCandidate@11895, ... }
-    <name not found> = ArrayList@11896[8] { ResolutionCandidate@11893, ResolutionCandidate@11894, ResolutionCandidate@11895, ... }
-}
-
-ResolutionTaskHolder@11897 {
-    <name not found> = ArrayList@11898[8] { ResolutionCandidate@11899, ResolutionCandidate@11900, ResolutionCandidate@11901, ... }
-    <name not found> = ArrayList@11902[8] { ResolutionCandidate@11899, ResolutionCandidate@11900, ResolutionCandidate@11901, ... }
-}
-
-ResolutionTaskHolder@11903 {
-    <name not found> = ArrayList@11904[8] { ResolutionCandidate@11905, ResolutionCandidate@11906, ResolutionCandidate@11907, ... }
-    <name not found> = ArrayList@11908[8] { ResolutionCandidate@11905, ResolutionCandidate@11906, ResolutionCandidate@11907, ... }
-}
-
-ResolutionTaskHolder@11909 {
-    <name not found> = ArrayList@11910[8] { ResolutionCandidate@11911, ResolutionCandidate@11912, ResolutionCandidate@11913, ... }
-    <name not found> = ArrayList@11914[8] { ResolutionCandidate@11911, ResolutionCandidate@11912, ResolutionCandidate@11913, ... }
-}
-
-ResolutionTaskHolder@11915 {
-    <name not found> = ArrayList@11916[8] { ResolutionCandidate@11917, ResolutionCandidate@11918, ResolutionCandidate@11919, ... }
-    <name not found> = ArrayList@11920[8] { ResolutionCandidate@11917, ResolutionCandidate@11918, ResolutionCandidate@11919, ... }
-}
-
-ResolutionTaskHolder@11921 {
-    <name not found> = ArrayList@11922[8] { ResolutionCandidate@11923, ResolutionCandidate@11924, ResolutionCandidate@11925, ... }
-    <name not found> = ArrayList@11926[8] { ResolutionCandidate@11923, ResolutionCandidate@11924, ResolutionCandidate@11925, ... }
-}
-
-ResolutionTaskHolder@11927 {
-    <name not found> = ArrayList@11928[8] { ResolutionCandidate@11929, ResolutionCandidate@11930, ResolutionCandidate@11931, ... }
-    <name not found> = ArrayList@11932[8] { ResolutionCandidate@11929, ResolutionCandidate@11930, ResolutionCandidate@11931, ... }
-}
-
-ResolutionTaskHolder@11933 {
-    <name not found> = ArrayList@11934[8] { ResolutionCandidate@11935, ResolutionCandidate@11936, ResolutionCandidate@11937, ... }
-    <name not found> = ArrayList@11938[8] { ResolutionCandidate@11935, ResolutionCandidate@11936, ResolutionCandidate@11937, ... }
-}
-
-ResolutionTaskHolder@11939 {
-    <name not found> = ArrayList@11940[8] { ResolutionCandidate@11941, ResolutionCandidate@11942, ResolutionCandidate@11943, ... }
-    <name not found> = ArrayList@11944[8] { ResolutionCandidate@11941, ResolutionCandidate@11942, ResolutionCandidate@11943, ... }
-}
-
-ResolutionTaskHolder@11945 {
-    <name not found> = ArrayList@11946[8] { ResolutionCandidate@11947, ResolutionCandidate@11948, ResolutionCandidate@11949, ... }
-    <name not found> = ArrayList@11950[8] { ResolutionCandidate@11947, ResolutionCandidate@11948, ResolutionCandidate@11949, ... }
-}
-
-ResolutionTaskHolder@11951 {
-    <name not found> = ArrayList@11952[8] { ResolutionCandidate@11953, ResolutionCandidate@11954, ResolutionCandidate@11955, ... }
-    <name not found> = ArrayList@11956[8] { ResolutionCandidate@11953, ResolutionCandidate@11954, ResolutionCandidate@11955, ... }
-}
-
-ResolutionTaskHolder@11957 {
-    <name not found> = ArrayList@11958[8] { ResolutionCandidate@11959, ResolutionCandidate@11960, ResolutionCandidate@11961, ... }
-    <name not found> = ArrayList@11962[8] { ResolutionCandidate@11959, ResolutionCandidate@11960, ResolutionCandidate@11961, ... }
-}
-
-ResolutionTaskHolder@11963 {
-    <name not found> = ArrayList@11964[8] { ResolutionCandidate@11965, ResolutionCandidate@11966, ResolutionCandidate@11967, ... }
-    <name not found> = ArrayList@11968[8] { ResolutionCandidate@11965, ResolutionCandidate@11966, ResolutionCandidate@11967, ... }
-}
-
-ResolutionTaskHolder@11969 {
-    <name not found> = ArrayList@11970[8] { ResolutionCandidate@11971, ResolutionCandidate@11972, ResolutionCandidate@11973, ... }
-    <name not found> = ArrayList@11974[8] { ResolutionCandidate@11971, ResolutionCandidate@11972, ResolutionCandidate@11973, ... }
-}
-
-ResolutionTaskHolder@11975 {
-    <name not found> = ArrayList@11976[8] { ResolutionCandidate@11977, ResolutionCandidate@11978, ResolutionCandidate@11979, ... }
-    <name not found> = ArrayList@11980[8] { ResolutionCandidate@11977, ResolutionCandidate@11978, ResolutionCandidate@11979, ... }
-}
-
-ResolutionTaskHolder@11981 {
-    <name not found> = ArrayList@11982[8] { ResolutionCandidate@11983, ResolutionCandidate@11984, ResolutionCandidate@11985, ... }
-    <name not found> = ArrayList@11986[8] { ResolutionCandidate@11983, ResolutionCandidate@11984, ResolutionCandidate@11985, ... }
-}
-
-ResolutionTaskHolder@11987 {
-    <name not found> = ArrayList@11988[8] { ResolutionCandidate@11989, ResolutionCandidate@11990, ResolutionCandidate@11991, ... }
-    <name not found> = ArrayList@11992[8] { ResolutionCandidate@11989, ResolutionCandidate@11990, ResolutionCandidate@11991, ... }
-}
-
-ResolutionTaskHolder@11993 {
-    <name not found> = ArrayList@11994[8] { ResolutionCandidate@11995, ResolutionCandidate@11996, ResolutionCandidate@11997, ... }
-    <name not found> = ArrayList@11998[8] { ResolutionCandidate@11995, ResolutionCandidate@11996, ResolutionCandidate@11997, ... }
-}
-
-ResolutionTaskHolder@11999 {
-    <name not found> = ArrayList@12000[8] { ResolutionCandidate@12001, ResolutionCandidate@12002, ResolutionCandidate@12003, ... }
-    <name not found> = ArrayList@12004[8] { ResolutionCandidate@12001, ResolutionCandidate@12002, ResolutionCandidate@12003, ... }
-}
-
-ResolutionTaskHolder@12005 {
-    <name not found> = ArrayList@12006[8] { ResolutionCandidate@12007, ResolutionCandidate@12008, ResolutionCandidate@12009, ... }
-    <name not found> = ArrayList@12010[8] { ResolutionCandidate@12007, ResolutionCandidate@12008, ResolutionCandidate@12009, ... }
-}
-
-ResolutionTaskHolder@12011 {
-    <name not found> = ArrayList@12012[8] { ResolutionCandidate@12013, ResolutionCandidate@12014, ResolutionCandidate@12015, ... }
-    <name not found> = ArrayList@12016[8] { ResolutionCandidate@12013, ResolutionCandidate@12014, ResolutionCandidate@12015, ... }
-}
-
-ResolutionTaskHolder@12017 {
-    <name not found> = ArrayList@12018[8] { ResolutionCandidate@12019, ResolutionCandidate@12020, ResolutionCandidate@12021, ... }
-    <name not found> = ArrayList@12022[8] { ResolutionCandidate@12019, ResolutionCandidate@12020, ResolutionCandidate@12021, ... }
-}
-
-ResolutionTaskHolder@12023 {
-    <name not found> = ArrayList@12024[8] { ResolutionCandidate@12025, ResolutionCandidate@12026, ResolutionCandidate@12027, ... }
-    <name not found> = ArrayList@12028[8] { ResolutionCandidate@12025, ResolutionCandidate@12026, ResolutionCandidate@12027, ... }
-}
-
-ResolutionTaskHolder@12029 {
-    <name not found> = ArrayList@12030[8] { ResolutionCandidate@12031, ResolutionCandidate@12032, ResolutionCandidate@12033, ... }
-    <name not found> = ArrayList@12034[8] { ResolutionCandidate@12031, ResolutionCandidate@12032, ResolutionCandidate@12033, ... }
-}
-
-TypeDeserializer@12035 {
-    classDescriptors('1': Integer@12036) = DeserializedClassDescriptor@6['Pair']
-}
-
-TypeDeserializer@12037 {
-    classDescriptors('2': Integer@12038) = DeserializedClassDescriptor@12039['Any']
-    classDescriptors('5': Integer@12040) = LazyJavaClassDescriptor@114['Serializable']
-}
-
-TypeDeserializer@12041 {
-    classDescriptors('2': Integer@12038) = DeserializedClassDescriptor@12039['Any']
-}
-
-TypeDeserializer@12042 {
-    classDescriptors('2': Integer@12038) = DeserializedClassDescriptor@12039['Any']
-}
-
-TypeDeserializer@12043 {
-    classDescriptors('8': Integer@12044) = DeserializedClassDescriptor@12045['Array']
-    classDescriptors('80': Integer@12046) = DeserializedClassDescriptor@6['Pair']
-    classDescriptors('81': Integer@12047) = LazyJavaClassDescriptor@113['HashMap']
-    classDescriptors('9': Integer@12048) = DeserializedClassDescriptor@12039['Any']
-}
-
-TypeDeserializer@12049 {
-    classDescriptors('80': Integer@12046) = DeserializedClassDescriptor@6['Pair']
-    classDescriptors('9': Integer@12048) = DeserializedClassDescriptor@12039['Any']
+    <name not found> = ArrayList@9262[8] { ResolutionCandidate@9263, ResolutionCandidate@9264, ResolutionCandidate@9265, ... }
+}
+
+TypeDeserializer@9266 {
+    classDescriptors('1': Integer@9267) = DeserializedClassDescriptor@6['Pair']
+}
+
+TypeDeserializer@9268 {
+    classDescriptors('2': Integer@9269) = DeserializedClassDescriptor@9270['Any']
+    classDescriptors('5': Integer@9271) = LazyJavaClassDescriptor@114['Serializable']
+}
+
+TypeDeserializer@9272 {
+    classDescriptors('2': Integer@9269) = DeserializedClassDescriptor@9270['Any']
+}
+
+TypeDeserializer@9273 {
+    classDescriptors('2': Integer@9269) = DeserializedClassDescriptor@9270['Any']
+}
+
+TypeDeserializer@9274 {
+    classDescriptors('8': Integer@9275) = DeserializedClassDescriptor@9276['Array']
+    classDescriptors('80': Integer@9277) = DeserializedClassDescriptor@6['Pair']
+    classDescriptors('81': Integer@9278) = LazyJavaClassDescriptor@113['HashMap']
+    classDescriptors('9': Integer@9279) = DeserializedClassDescriptor@9270['Any']
+}
+
+TypeDeserializer@9280 {
+    classDescriptors('80': Integer@9277) = DeserializedClassDescriptor@6['Pair']
+    classDescriptors('9': Integer@9279) = DeserializedClassDescriptor@9270['Any']
+}
+
+null {
+    <name not found> = ArrayList@9281[1] { ResolutionCandidate@617 }
+    <name not found> = ArrayList@9282[1] { ResolutionCandidate@1037 }
+    <name not found> = ArrayList@9283[1] { ResolutionCandidate@1346 }
+    <name not found> = ArrayList@9284[1] { ResolutionCandidate@1442 }
+    <name not found> = ArrayList@9285[1] { ResolutionCandidate@911 }
+    <name not found> = ArrayList@9286[1] { ResolutionCandidate@1436 }
+    <name not found> = ArrayList@9287[1] { ResolutionCandidate@1277 }
+    <name not found> = ArrayList@9288[1] { ResolutionCandidate@791 }
+    <name not found> = ArrayList@9289[1] { ResolutionCandidate@1220 }
+    <name not found> = ArrayList@9290[1] { ResolutionCandidate@593 }
+    <name not found> = ArrayList@9291[1] { ResolutionCandidate@1223 }
+    <name not found> = ArrayList@9292[1] { ResolutionCandidate@4568 }
+    <name not found> = ArrayList@9293[1] { ResolutionCandidate@1745 }
+    <name not found> = ArrayList@9294[1] { ResolutionCandidate@3395 }
+    <name not found> = ArrayList@9295[1] { ResolutionCandidate@725 }
+    <name not found> = ArrayList@9296[1] { ResolutionCandidate@7121 }
+    <name not found> = ArrayList@9297[1] { ResolutionCandidate@5465 }
+    <name not found> = ArrayList@9298[1] { ResolutionCandidate@428 }
+    <name not found> = ArrayList@9299[1] { ResolutionCandidate@6263 }
+    <name not found> = ArrayList@9300[1] { ResolutionCandidate@6443 }
+    <name not found> = ArrayList@9301[1] { ResolutionCandidate@851 }
+    <name not found> = ArrayList@9302[1] { ResolutionCandidate@875 }
+    <name not found> = ArrayList@9303[1] { ResolutionCandidate@6755 }
+    <name not found> = ArrayList@9304[1] { ResolutionCandidate@6518 }
+    <name not found> = ArrayList@9305[1] { ResolutionCandidate@3608 }
+    <name not found> = ArrayList@9306[1] { ResolutionCandidate@2516 }
+    <name not found> = ArrayList@9307[1] { ResolutionCandidate@641 }
+    <name not found> = ArrayList@9308[1] { ResolutionCandidate@7490 }
+    <name not found> = ArrayList@9309[1] { ResolutionCandidate@6242 }
+    <name not found> = ArrayList@9310[1] { ResolutionCandidate@2165 }
+    <name not found> = ArrayList@9311[1] { ResolutionCandidate@1475 }
+    <name not found> = ArrayList@9312[1] { ResolutionCandidate@7007 }
+    <name not found> = ArrayList@9313[1] { ResolutionCandidate@5711 }
+    <name not found> = ArrayList@9314[1] { ResolutionCandidate@3140 }
+    <name not found> = ArrayList@9315[1] { ResolutionCandidate@4418 }
+    <name not found> = ArrayList@9316[1] { ResolutionCandidate@419 }
+    <name not found> = ArrayList@9317[1] { ResolutionCandidate@6380 }
+    <name not found> = ArrayList@9318[1] { ResolutionCandidate@5576 }
+    <name not found> = ArrayList@9319[1] { ResolutionCandidate@1862 }
+    <name not found> = ArrayList@9320[1] { ResolutionCandidate@4181 }
+    <name not found> = ArrayList@9321[1] { ResolutionCandidate@959 }
+    <name not found> = ArrayList@9322[1] { ResolutionCandidate@7613 }
+    <name not found> = ArrayList@9323[1] { ResolutionCandidate@6527 }
+    <name not found> = ArrayList@9324[1] { ResolutionCandidate@1664 }
+    <name not found> = ArrayList@9325[1] { ResolutionCandidate@4334 }
+    <name not found> = ArrayList@9326[1] { ResolutionCandidate@584 }
+    <name not found> = ArrayList@9327[1] { ResolutionCandidate@6164 }
+    <name not found> = ArrayList@9328[1] { ResolutionCandidate@4433 }
+    <name not found> = ArrayList@9329[1] { ResolutionCandidate@4277 }
+    <name not found> = ArrayList@9330[1] { ResolutionCandidate@1514 }
+    <name not found> = ArrayList@9331[1] { ResolutionCandidate@5021 }
+    <name not found> = ArrayList@9332[1] { ResolutionCandidate@5984 }
+    <name not found> = ArrayList@9333[1] { ResolutionCandidate@2504 }
+    <name not found> = ArrayList@9334[1] { ResolutionCandidate@3554 }
+    <name not found> = ArrayList@9335[1] { ResolutionCandidate@449 }
+    <name not found> = ArrayList@9336[1] { ResolutionCandidate@4769 }
+    <name not found> = ArrayList@9337[1] { ResolutionCandidate@4784 }
+    <name not found> = ArrayList@9338[1] { ResolutionCandidate@3515 }
+    <name not found> = ArrayList@9339[1] { ResolutionCandidate@3920 }
+    <name not found> = ArrayList@9340[1] { ResolutionCandidate@1022 }
+    <name not found> = ArrayList@9341[1] { ResolutionCandidate@7397 }
+    <name not found> = ArrayList@9342[1] { ResolutionCandidate@6770 }
+    <name not found> = ArrayList@9343[1] { ResolutionCandidate@1733 }
+    <name not found> = ArrayList@9344[1] { ResolutionCandidate@2633 }
+    <name not found> = ArrayList@9345[1] { ResolutionCandidate@479 }
+    <name not found> = ArrayList@9346[1] { ResolutionCandidate@4760 }
+    <name not found> = ArrayList@9347[1] { ResolutionCandidate@5555 }
+    <name not found> = ArrayList@9348[1] { ResolutionCandidate@1781 }
+    <name not found> = ArrayList@9349[1] { ResolutionCandidate@2468 }
+    <name not found> = ArrayList@9350[1] { ResolutionCandidate@464 }
+    <name not found> = ArrayList@9351[1] { ResolutionCandidate@7271 }
+    <name not found> = ArrayList@9352[1] { ResolutionCandidate@6131 }
+    <name not found> = ArrayList@9353[1] { ResolutionCandidate@2741 }
+    <name not found> = ArrayList@9354[1] { ResolutionCandidate@3626 }
+    <name not found> = ArrayList@9355[1] { ResolutionCandidate@1274 }
+    <name not found> = ArrayList@9356[1] { ResolutionCandidate@5627 }
+    <name not found> = ArrayList@9357[1] { ResolutionCandidate@4481 }
+    <name not found> = ArrayList@9358[1] { ResolutionCandidate@3944 }
+    <name not found> = ArrayList@9359[1] { ResolutionCandidate@545 }
+    <name not found> = ArrayList@9360[1] { ResolutionCandidate@7721 }
+    <name not found> = ArrayList@9361[1] { ResolutionCandidate@6881 }
+    <name not found> = ArrayList@9362[1] { ResolutionCandidate@1676 }
+    <name not found> = ArrayList@9363[1] { ResolutionCandidate@2813 }
+    <name not found> = ArrayList@9364[1] { ResolutionCandidate@962 }
+    <name not found> = ArrayList@9365[1] { ResolutionCandidate@5135 }
+    <name not found> = ArrayList@9366[1] { ResolutionCandidate@6047 }
+    <name not found> = ArrayList@9367[1] { ResolutionCandidate@3713 }
+    <name not found> = ArrayList@9368[1] { ResolutionCandidate@4118 }
+    <name not found> = ArrayList@9369[1] { ResolutionCandidate@722 }
+    <name not found> = ArrayList@9370[1] { ResolutionCandidate@5585 }
+    <name not found> = ArrayList@9371[1] { ResolutionCandidate@3644 }
+    <name not found> = ArrayList@9372[1] { ResolutionCandidate@1577 }
+    <name not found> = ArrayList@9373[1] { ResolutionCandidate@506 }
+    <name not found> = ArrayList@9374[1] { ResolutionCandidate@5762 }
+    <name not found> = ArrayList@9375[1] { ResolutionCandidate@7640 }
+    <name not found> = ArrayList@9376[1] { ResolutionCandidate@4313 }
+    <name not found> = ArrayList@9377[1] { ResolutionCandidate@2006 }
+    <name not found> = ArrayList@9378[1] { ResolutionCandidate@491 }
+    <name not found> = ArrayList@9379[1] { ResolutionCandidate@5549 }
+    <name not found> = ArrayList@9380[1] { ResolutionCandidate@5780 }
+    <name not found> = ArrayList@9381[1] { ResolutionCandidate@3275 }
+    <name not found> = ArrayList@9382[1] { ResolutionCandidate@4070 }
+    <name not found> = ArrayList@9383[1] { ResolutionCandidate@1424 }
+    <name not found> = ArrayList@9384[1] { ResolutionCandidate@6776 }
+    <name not found> = ArrayList@9385[1] { ResolutionCandidate@5642 }
+    <name not found> = ArrayList@9386[1] { ResolutionCandidate@3623 }
+    <name not found> = ArrayList@9387[1] { ResolutionCandidate@1583 }
+    <name not found> = ArrayList@9388[1] { ResolutionCandidate@1226 }
+    <name not found> = ArrayList@9389[1] { ResolutionCandidate@5771 }
+    <name not found> = ArrayList@9390[1] { ResolutionCandidate@6470 }
+    <name not found> = ArrayList@9391[1] { ResolutionCandidate@4502 }
+    <name not found> = ArrayList@9392[1] { ResolutionCandidate@2000 }
+    <name not found> = ArrayList@9393[1] { ResolutionCandidate@1130 }
+    <name not found> = ArrayList@9394[1] { ResolutionCandidate@6257 }
+    <name not found> = ArrayList@9395[1] { ResolutionCandidate@4793 }
+    <name not found> = ArrayList@9396[1] { ResolutionCandidate@4331 }
+    <name not found> = ArrayList@9397[1] { ResolutionCandidate@3185 }
+    <name not found> = ArrayList@9398[1] { ResolutionCandidate@1184 }
+    <name not found> = ArrayList@9399[1] { ResolutionCandidate@6683 }
+    <name not found> = ArrayList@9400[1] { ResolutionCandidate@2432 }
+    <name not found> = ArrayList@9401[1] { ResolutionCandidate@2993 }
+    <name not found> = ArrayList@9402[1] { ResolutionCandidate@461 }
+    <name not found> = ArrayList@9403[1] { ResolutionCandidate@5396 }
+    <name not found> = ArrayList@9404[1] { ResolutionCandidate@5573 }
+    <name not found> = ArrayList@9405[1] { ResolutionCandidate@2300 }
+    <name not found> = ArrayList@9406[1] { ResolutionCandidate@3530 }
+    <name not found> = ArrayList@9407[1] { ResolutionCandidate@1262 }
+    <name not found> = ArrayList@9408[1] { ResolutionCandidate@5327 }
+    <name not found> = ArrayList@9409[1] { ResolutionCandidate@6509 }
+    <name not found> = ArrayList@9410[1] { ResolutionCandidate@3755 }
+    <name not found> = ArrayList@9411[1] { ResolutionCandidate@4409 }
+    <name not found> = ArrayList@9412[1] { ResolutionCandidate@1211 }
+    <name not found> = ArrayList@9413[1] { ResolutionCandidate@7004 }
+    <name not found> = ArrayList@9414[1] { ResolutionCandidate@3350 }
+    <name not found> = ArrayList@9415[1] { ResolutionCandidate@2594 }
+    <name not found> = ArrayList@9416[1] { ResolutionCandidate@1526 }
+    <name not found> = ArrayList@9417[1] { ResolutionCandidate@6110 }
+    <name not found> = ArrayList@9418[1] { ResolutionCandidate@5003 }
+    <name not found> = ArrayList@9419[1] { ResolutionCandidate@4325 }
+    <name not found> = ArrayList@9420[1] { ResolutionCandidate@1838 }
+    <name not found> = ArrayList@9421[1] { ResolutionCandidate@440 }
+    <name not found> = ArrayList@9422[1] { ResolutionCandidate@7091 }
+    <name not found> = ArrayList@9423[1] { ResolutionCandidate@5669 }
+    <name not found> = ArrayList@9424[1] { ResolutionCandidate@2435 }
+    <name not found> = ArrayList@9425[1] { ResolutionCandidate@4358 }
+    <name not found> = ArrayList@9426[1] { ResolutionCandidate@893 }
+    <name not found> = ArrayList@9427[1] { ResolutionCandidate@5522 }
+    <name not found> = ArrayList@9428[1] { ResolutionCandidate@6425 }
+    <name not found> = ArrayList@9429[1] { ResolutionCandidate@2708 }
+    <name not found> = ArrayList@9430[1] { ResolutionCandidate@1841 }
+    <name not found> = ArrayList@9431[1] { ResolutionCandidate@1544 }
+    <name not found> = ArrayList@9432[1] { ResolutionCandidate@6632 }
+    <name not found> = ArrayList@9433[1] { ResolutionCandidate@5381 }
+    <name not found> = ArrayList@9434[1] { ResolutionCandidate@1910 }
+    <name not found> = ArrayList@9435[1] { ResolutionCandidate@3260 }
+    <name not found> = ArrayList@9436[1] { ResolutionCandidate@740 }
+    <name not found> = ArrayList@9437[1] { ResolutionCandidate@5204 }
+    <name not found> = ArrayList@9438[1] { ResolutionCandidate@7634 }
+    <name not found> = ArrayList@9439[1] { ResolutionCandidate@4316 }
+    <name not found> = ArrayList@9440[1] { ResolutionCandidate@3908 }
+    <name not found> = ArrayList@9441[1] { ResolutionCandidate@365 }
+    <name not found> = ArrayList@9442[1] { ResolutionCandidate@5060 }
+    <name not found> = ArrayList@9443[1] { ResolutionCandidate@2141 }
+    <name not found> = ArrayList@9444[1] { ResolutionCandidate@1679 }
+    <name not found> = ArrayList@9445[1] { ResolutionCandidate@1373 }
+    <name not found> = ArrayList@9446[1] { ResolutionCandidate@5759 }
+    <name not found> = ArrayList@9447[1] { ResolutionCandidate@7223 }
+    <name not found> = ArrayList@9448[1] { ResolutionCandidate@1709 }
+    <name not found> = ArrayList@9449[1] { ResolutionCandidate@3359 }
+    <name not found> = ArrayList@9450[1] { ResolutionCandidate@1433 }
+    <name not found> = ArrayList@9451[1] { ResolutionCandidate@4847 }
+    <name not found> = ArrayList@9452[1] { ResolutionCandidate@5183 }
+    <name not found> = ArrayList@9453[1] { ResolutionCandidate@3362 }
+    <name not found> = ArrayList@9454[1] { ResolutionCandidate@3869 }
+    <name not found> = ArrayList@9455[1] { ResolutionCandidate@1139 }
+    <name not found> = ArrayList@9456[1] { ResolutionCandidate@7346 }
+    <name not found> = ArrayList@9457[1] { ResolutionCandidate@2090 }
+    <name not found> = ArrayList@9458[1] { ResolutionCandidate@2129 }
+    <name not found> = ArrayList@9459[1] { ResolutionCandidate@1232 }
+    <name not found> = ArrayList@9460[1] { ResolutionCandidate@6971 }
+    <name not found> = ArrayList@9461[1] { ResolutionCandidate@5123 }
+    <name not found> = ArrayList@9462[1] { ResolutionCandidate@2147 }
+    <name not found> = ArrayList@9463[1] { ResolutionCandidate@2807 }
+    <name not found> = ArrayList@9464[1] { ResolutionCandidate@878 }
+    <name not found> = ArrayList@9465[1] { ResolutionCandidate@5387 }
+    <name not found> = ArrayList@9466[1] { ResolutionCandidate@5726 }
+    <name not found> = ArrayList@9467[1] { ResolutionCandidate@3482 }
+    <name not found> = ArrayList@9468[1] { ResolutionCandidate@2363 }
+    <name not found> = ArrayList@9469[1] { ResolutionCandidate@1259 }
+    <name not found> = ArrayList@9470[1] { ResolutionCandidate@5960 }
+    <name not found> = ArrayList@9471[1] { ResolutionCandidate@6056 }
+    <name not found> = ArrayList@9472[1] { ResolutionCandidate@2261 }
+    <name not found> = ArrayList@9473[1] { ResolutionCandidate@3134 }
+    <name not found> = ArrayList@9474[1] { ResolutionCandidate@1529 }
+    <name not found> = ArrayList@9475[1] { ResolutionCandidate@7307 }
+    <name not found> = ArrayList@9476[1] { ResolutionCandidate@5612 }
+    <name not found> = ArrayList@9477[1] { ResolutionCandidate@2498 }
+    <name not found> = ArrayList@9478[1] { ResolutionCandidate@2324 }
+    <name not found> = ArrayList@9479[1] { ResolutionCandidate@749 }
+    <name not found> = ArrayList@9480[1] { ResolutionCandidate@6389 }
+    <name not found> = ArrayList@9481[1] { ResolutionCandidate@4427 }
+    <name not found> = ArrayList@9482[1] { ResolutionCandidate@3323 }
+    <name not found> = ArrayList@9483[1] { ResolutionCandidate@623 }
+    <name not found> = ArrayList@9484[1] { ResolutionCandidate@4958 }
+    <name not found> = ArrayList@9485[1] { ResolutionCandidate@5534 }
+    <name not found> = ArrayList@9486[1] { ResolutionCandidate@4025 }
+    <name not found> = ArrayList@9487[1] { ResolutionCandidate@4430 }
+    <name not found> = ArrayList@9488[1] { ResolutionCandidate@554 }
+    <name not found> = ArrayList@9489[1] { ResolutionCandidate@6872 }
+    <name not found> = ArrayList@9490[1] { ResolutionCandidate@5789 }
+    <name not found> = ArrayList@9491[1] { ResolutionCandidate@3386 }
+    <name not found> = ArrayList@9492[1] { ResolutionCandidate@1565 }
+    <name not found> = ArrayList@9493[1] { ResolutionCandidate@644 }
+    <name not found> = ArrayList@9494[1] { ResolutionCandidate@5054 }
+    <name not found> = ArrayList@9495[1] { ResolutionCandidate@7619 }
+    <name not found> = ArrayList@9496[1] { ResolutionCandidate@2810 }
+    <name not found> = ArrayList@9497[1] { ResolutionCandidate@1874 }
+    <name not found> = ArrayList@9498[1] { ResolutionCandidate@1334 }
+    <name not found> = ArrayList@9499[1] { ResolutionCandidate@7262 }
+    <name not found> = ArrayList@9500[1] { ResolutionCandidate@7319 }
+    <name not found> = ArrayList@9501[1] { ResolutionCandidate@4040 }
+    <name not found> = ArrayList@9502[1] { ResolutionCandidate@1193 }
+    <name not found> = ArrayList@9503[1] { ResolutionCandidate@6803 }
+    <name not found> = ArrayList@9504[1] { ResolutionCandidate@7715 }
+    <name not found> = ArrayList@9505[1] { ResolutionCandidate@1883 }
+    <name not found> = ArrayList@9506[1] { ResolutionCandidate@2528 }
+    <name not found> = ArrayList@9507[1] { ResolutionCandidate@800 }
+    <name not found> = ArrayList@9508[1] { ResolutionCandidate@5156 }
+    <name not found> = ArrayList@9509[1] { ResolutionCandidate@6917 }
+    <name not found> = ArrayList@9510[1] { ResolutionCandidate@2402 }
+    <name not found> = ArrayList@9511[1] { ResolutionCandidate@4442 }
+    <name not found> = ArrayList@9512[1] { ResolutionCandidate@1376 }
+    <name not found> = ArrayList@9513[1] { ResolutionCandidate@5321 }
+    <name not found> = ArrayList@9514[1] { ResolutionCandidate@7181 }
+    <name not found> = ArrayList@9515[1] { ResolutionCandidate@2393 }
+    <name not found> = ArrayList@9516[1] { ResolutionCandidate@3005 }
+    <name not found> = ArrayList@9517[1] { ResolutionCandidate@737 }
+    <name not found> = ArrayList@9518[1] { ResolutionCandidate@7172 }
+    <name not found> = ArrayList@9519[1] { ResolutionCandidate@5291 }
+    <name not found> = ArrayList@9520[1] { ResolutionCandidate@3650 }
+    <name not found> = ArrayList@9521[1] { ResolutionCandidate@2771 }
+    <name not found> = ArrayList@9522[1] { ResolutionCandidate@908 }
+    <name not found> = ArrayList@9523[1] { ResolutionCandidate@5804 }
+    <name not found> = ArrayList@9524[1] { ResolutionCandidate@5795 }
+    <name not found> = ArrayList@9525[1] { ResolutionCandidate@2051 }
+    <name not found> = ArrayList@9526[1] { ResolutionCandidate@2378 }
+    <name not found> = ArrayList@9527[1] { ResolutionCandidate@1307 }
+    <name not found> = ArrayList@9528[1] { ResolutionCandidate@6722 }
+    <name not found> = ArrayList@9529[1] { ResolutionCandidate@3131 }
+    <name not found> = ArrayList@9530[1] { ResolutionCandidate@4298 }
+    <name not found> = ArrayList@9531[1] { ResolutionCandidate@1085 }
+    <name not found> = ArrayList@9532[1] { ResolutionCandidate@7661 }
+    <name not found> = ArrayList@9533[1] { ResolutionCandidate@5102 }
+    <name not found> = ArrayList@9534[1] { ResolutionCandidate@2405 }
+    <name not found> = ArrayList@9535[1] { ResolutionCandidate@3842 }
+    <name not found> = ArrayList@9536[1] { ResolutionCandidate@1328 }
+    <name not found> = ArrayList@9537[1] { ResolutionCandidate@5831 }
+    <name not found> = ArrayList@9538[1] { ResolutionCandidate@5339 }
+    <name not found> = ArrayList@9539[1] { ResolutionCandidate@2792 }
+    <name not found> = ArrayList@9540[1] { ResolutionCandidate@3356 }
+    <name not found> = ArrayList@9541[1] { ResolutionCandidate@866 }
+    <name not found> = ArrayList@9542[1] { ResolutionCandidate@6191 }
+    <name not found> = ArrayList@9543[1] { ResolutionCandidate@6398 }
+    <name not found> = ArrayList@9544[1] { ResolutionCandidate@3578 }
+    <name not found> = ArrayList@9545[1] { ResolutionCandidate@2903 }
+    <name not found> = ArrayList@9546[1] { ResolutionCandidate@656 }
+    <name not found> = ArrayList@9547[1] { ResolutionCandidate@6326 }
+    <name not found> = ArrayList@9548[1] { ResolutionCandidate@5702 }
+    <name not found> = ArrayList@9549[1] { ResolutionCandidate@2762 }
+    <name not found> = ArrayList@9550[1] { ResolutionCandidate@563 }
+    <name not found> = ArrayList@9551[1] { ResolutionCandidate@5330 }
+    <name not found> = ArrayList@9552[1] { ResolutionCandidate@7697 }
+    <name not found> = ArrayList@9553[1] { ResolutionCandidate@1754 }
+    <name not found> = ArrayList@9554[1] { ResolutionCandidate@3668 }
+    <name not found> = ArrayList@9555[1] { ResolutionCandidate@1013 }
+    <name not found> = ArrayList@9556[1] { ResolutionCandidate@4625 }
+    <name not found> = ArrayList@9557[1] { ResolutionCandidate@6746 }
+    <name not found> = ArrayList@9558[1] { ResolutionCandidate@2549 }
+    <name not found> = ArrayList@9559[1] { ResolutionCandidate@3992 }
+    <name not found> = ArrayList@9560[1] { ResolutionCandidate@1244 }
+    <name not found> = ArrayList@9561[1] { ResolutionCandidate@6413 }
+    <name not found> = ArrayList@9562[1] { ResolutionCandidate@7541 }
+    <name not found> = ArrayList@9563[1] { ResolutionCandidate@3011 }
+    <name not found> = ArrayList@9564[1] { ResolutionCandidate@3449 }
+    <name not found> = ArrayList@9565[1] { ResolutionCandidate@1154 }
+    <name not found> = ArrayList@9566[1] { ResolutionCandidate@4754 }
+    <name not found> = ArrayList@9567[1] { ResolutionCandidate@7256 }
+    <name not found> = ArrayList@9568[1] { ResolutionCandidate@1697 }
+    <name not found> = ArrayList@9569[1] { ResolutionCandidate@1736 }
+    <name not found> = ArrayList@9570[1] { ResolutionCandidate@1043 }
+    <name not found> = ArrayList@9571[1] { ResolutionCandidate@5861 }
+    <name not found> = ArrayList@9572[1] { ResolutionCandidate@5117 }
+    <name not found> = ArrayList@9573[1] { ResolutionCandidate@2288 }
+    <name not found> = ArrayList@9574[1] { ResolutionCandidate@3830 }
+    <name not found> = ArrayList@9575[1] { ResolutionCandidate@569 }
+    <name not found> = ArrayList@9576[1] { ResolutionCandidate@5603 }
+    <name not found> = ArrayList@9577[1] { ResolutionCandidate@6035 }
+    <name not found> = ArrayList@9578[1] { ResolutionCandidate@3794 }
+    <name not found> = ArrayList@9579[1] { ResolutionCandidate@767 }
+    <name not found> = ArrayList@9580[1] { ResolutionCandidate@7406 }
+    <name not found> = ArrayList@9581[1] { ResolutionCandidate@7079 }
+    <name not found> = ArrayList@9582[1] { ResolutionCandidate@4424 }
+    <name not found> = ArrayList@9583[1] { ResolutionCandidate@2681 }
+    <name not found> = ArrayList@9584[1] { ResolutionCandidate@566 }
+    <name not found> = ArrayList@9585[1] { ResolutionCandidate@5705 }
+    <name not found> = ArrayList@9586[1] { ResolutionCandidate@5510 }
+    <name not found> = ArrayList@9587[1] { ResolutionCandidate@2144 }
+    <name not found> = ArrayList@9588[1] { ResolutionCandidate@3041 }
+    <name not found> = ArrayList@9589[1] { ResolutionCandidate@455 }
+    <name not found> = ArrayList@9590[1] { ResolutionCandidate@6515 }
+    <name not found> = ArrayList@9591[1] { ResolutionCandidate@6962 }
+    <name not found> = ArrayList@9592[1] { ResolutionCandidate@3329 }
+    <name not found> = ArrayList@9593[1] { ResolutionCandidate@1601 }
+    <name not found> = ArrayList@9594[1] { ResolutionCandidate@1076 }
+    <name not found> = ArrayList@9595[1] { ResolutionCandidate@6476 }
+    <name not found> = ArrayList@9596[1] { ResolutionCandidate@4217 }
+    <name not found> = ArrayList@9597[1] { ResolutionCandidate@1640 }
+    <name not found> = ArrayList@9598[1] { ResolutionCandidate@1286 }
+    <name not found> = ArrayList@9599[1] { ResolutionCandidate@6686 }
+    <name not found> = ArrayList@9600[1] { ResolutionCandidate@7514 }
+    <name not found> = ArrayList@9601[1] { ResolutionCandidate@2258 }
+    <name not found> = ArrayList@9602[1] { ResolutionCandidate@3020 }
+    <name not found> = ArrayList@9603[1] { ResolutionCandidate@692 }
+    <name not found> = ArrayList@9604[1] { ResolutionCandidate@6605 }
+    <name not found> = ArrayList@9605[1] { ResolutionCandidate@7520 }
+    <name not found> = ArrayList@9606[1] { ResolutionCandidate@3845 }
+    <name not found> = ArrayList@9607[1] { ResolutionCandidate@3479 }
+    <name not found> = ArrayList@9608[1] { ResolutionCandidate@1370 }
+    <name not found> = ArrayList@9609[1] { ResolutionCandidate@4628 }
+    <name not found> = ArrayList@9610[1] { ResolutionCandidate@7610 }
+    <name not found> = ArrayList@9611[1] { ResolutionCandidate@2384 }
+    <name not found> = ArrayList@9612[1] { ResolutionCandidate@2180 }
+    <name not found> = ArrayList@9613[1] { ResolutionCandidate@1136 }
+    <name not found> = ArrayList@9614[1] { ResolutionCandidate@6983 }
+    <name not found> = ArrayList@9615[1] { ResolutionCandidate@6710 }
+    <name not found> = ArrayList@9616[1] { ResolutionCandidate@2639 }
+    <name not found> = ArrayList@9617[1] { ResolutionCandidate@4073 }
+    <name not found> = ArrayList@9618[1] { ResolutionCandidate@929 }
+    <name not found> = ArrayList@9619[1] { ResolutionCandidate@6323 }
+    <name not found> = ArrayList@9620[1] { ResolutionCandidate@7580 }
+    <name not found> = ArrayList@9621[1] { ResolutionCandidate@371 }
+    <name not found> = ArrayList@9622[1] { ResolutionCandidate@4256 }
+    <name not found> = ArrayList@9623[1] { ResolutionCandidate@1988 }
+    <name not found> = ArrayList@9624[1] { ResolutionCandidate@3314 }
+    <name not found> = ArrayList@9625[1] { ResolutionCandidate@626 }
+    <name not found> = ArrayList@9626[1] { ResolutionCandidate@5342 }
+    <name not found> = ArrayList@9627[1] { ResolutionCandidate@6452 }
+    <name not found> = ArrayList@9628[1] { ResolutionCandidate@6269 }
+    <name not found> = ArrayList@9629[1] { ResolutionCandidate@968 }
+    <name not found> = ArrayList@9630[1] { ResolutionCandidate@6200 }
+    <name not found> = ArrayList@9631[1] { ResolutionCandidate@6626 }
+    <name not found> = ArrayList@9632[1] { ResolutionCandidate@515 }
+    <name not found> = ArrayList@9633[1] { ResolutionCandidate@1133 }
+    <name not found> = ArrayList@9634[1] { ResolutionCandidate@4997 }
+    <name not found> = ArrayList@9635[1] { ResolutionCandidate@5201 }
+    <name not found> = ArrayList@9636[1] { ResolutionCandidate@4661 }
+    <name not found> = ArrayList@9637[1] { ResolutionCandidate@2069 }
+    <name not found> = ArrayList@9638[1] { ResolutionCandidate@1631 }
+    <name not found> = ArrayList@9639[1] { ResolutionCandidate@2240 }
+    <name not found> = ArrayList@9640[1] { ResolutionCandidate@470 }
+    <name not found> = ArrayList@9641[1] { ResolutionCandidate@4880 }
+    <name not found> = ArrayList@9642[1] { ResolutionCandidate@4730 }
+    <name not found> = ArrayList@9643[1] { ResolutionCandidate@5138 }
+    <name not found> = ArrayList@9644[1] { ResolutionCandidate@2852 }
+    <name not found> = ArrayList@9645[1] { ResolutionCandidate@1604 }
+    <name not found> = ArrayList@9646[1] { ResolutionCandidate@4349 }
+    <name not found> = ArrayList@9647[1] { ResolutionCandidate@785 }
+    <name not found> = ArrayList@9648[1] { ResolutionCandidate@7463 }
+    <name not found> = ArrayList@9649[1] { ResolutionCandidate@7328 }
+    <name not found> = ArrayList@9650[1] { ResolutionCandidate@4901 }
+    <name not found> = ArrayList@9651[1] { ResolutionCandidate@2663 }
+    <name not found> = ArrayList@9652[1] { ResolutionCandidate@2102 }
+    <name not found> = ArrayList@9653[1] { ResolutionCandidate@2756 }
+    <name not found> = ArrayList@9654[1] { ResolutionCandidate@350 }
+    <name not found> = ArrayList@9655[1] { ResolutionCandidate@5441 }
+    <name not found> = ArrayList@9656[1] { ResolutionCandidate@5189 }
+    <name not found> = ArrayList@9657[1] { ResolutionCandidate@6986 }
+    <name not found> = ArrayList@9658[1] { ResolutionCandidate@3584 }
+    <name not found> = ArrayList@9659[1] { ResolutionCandidate@2750 }
+    <name not found> = ArrayList@9660[1] { ResolutionCandidate@2603 }
+    <name not found> = ArrayList@9661[1] { ResolutionCandidate@938 }
+    <name not found> = ArrayList@9662[1] { ResolutionCandidate@6995 }
+    <name not found> = ArrayList@9663[1] { ResolutionCandidate@7046 }
+    <name not found> = ArrayList@9664[1] { ResolutionCandidate@6833 }
+    <name not found> = ArrayList@9665[1] { ResolutionCandidate@4373 }
+    <name not found> = ArrayList@9666[1] { ResolutionCandidate@3161 }
+    <name not found> = ArrayList@9667[1] { ResolutionCandidate@1541 }
+    <name not found> = ArrayList@9668[1] { ResolutionCandidate@6947 }
+    <name not found> = ArrayList@9669[1] { ResolutionCandidate@7028 }
+    <name not found> = ArrayList@9670[1] { ResolutionCandidate@7523 }
+    <name not found> = ArrayList@9671[1] { ResolutionCandidate@6818 }
+    <name not found> = ArrayList@9672[1] { ResolutionCandidate@7718 }
+    <name not found> = ArrayList@9673[1] { ResolutionCandidate@4520 }
+    <name not found> = ArrayList@9674[1] { ResolutionCandidate@4055 }
+    <name not found> = ArrayList@9675[1] { ResolutionCandidate@4178 }
+    <name not found> = ArrayList@9676[1] { ResolutionCandidate@668 }
+    <name not found> = ArrayList@9677[1] { ResolutionCandidate@6050 }
+    <name not found> = ArrayList@9678[1] { ResolutionCandidate@4871 }
+    <name not found> = ArrayList@9679[1] { ResolutionCandidate@1991 }
+    <name not found> = ArrayList@9680[1] { ResolutionCandidate@2672 }
+    <name not found> = ArrayList@9681[1] { ResolutionCandidate@3974 }
+    <name not found> = ArrayList@9682[1] { ResolutionCandidate@1358 }
+    <name not found> = ArrayList@9683[1] { ResolutionCandidate@6650 }
+    <name not found> = ArrayList@9684[1] { ResolutionCandidate@5699 }
+    <name not found> = ArrayList@9685[1] { ResolutionCandidate@3446 }
+    <name not found> = ArrayList@9686[1] { ResolutionCandidate@4499 }
+    <name not found> = ArrayList@9687[1] { ResolutionCandidate@3956 }
+    <name not found> = ArrayList@9688[1] { ResolutionCandidate@1145 }
+    <name not found> = ArrayList@9689[1] { ResolutionCandidate@7559 }
+    <name not found> = ArrayList@9690[1] { ResolutionCandidate@7343 }
+    <name not found> = ArrayList@9691[1] { ResolutionCandidate@2132 }
+    <name not found> = ArrayList@9692[1] { ResolutionCandidate@3968 }
+    <name not found> = ArrayList@9693[1] { ResolutionCandidate@596 }
+    <name not found> = ArrayList@9694[1] { ResolutionCandidate@5915 }
+    <name not found> = ArrayList@9695[1] { ResolutionCandidate@7052 }
+    <name not found> = ArrayList@9696[1] { ResolutionCandidate@6245 }
+    <name not found> = ArrayList@9697[1] { ResolutionCandidate@6854 }
+    <name not found> = ArrayList@9698[1] { ResolutionCandidate@4688 }
+    <name not found> = ArrayList@9699[1] { ResolutionCandidate@3179 }
+    <name not found> = ArrayList@9700[1] { ResolutionCandidate@2735 }
+    <name not found> = ArrayList@9701[1] { ResolutionCandidate@674 }
+    <name not found> = ArrayList@9702[1] { ResolutionCandidate@7457 }
+    <name not found> = ArrayList@9703[1] { ResolutionCandidate@5606 }
+    <name not found> = ArrayList@9704[1] { ResolutionCandidate@6467 }
+    <name not found> = ArrayList@9705[1] { ResolutionCandidate@6533 }
+    <name not found> = ArrayList@9706[1] { ResolutionCandidate@6296 }
+    <name not found> = ArrayList@9707[1] { ResolutionCandidate@3914 }
+    <name not found> = ArrayList@9708[1] { ResolutionCandidate@1757 }
+    <name not found> = ArrayList@9709[1] { ResolutionCandidate@560 }
+    <name not found> = ArrayList@9710[1] { ResolutionCandidate@5309 }
+    <name not found> = ArrayList@9711[1] { ResolutionCandidate@7211 }
+    <name not found> = ArrayList@9712[1] { ResolutionCandidate@4727 }
+    <name not found> = ArrayList@9713[1] { ResolutionCandidate@5234 }
+    <name not found> = ArrayList@9714[1] { ResolutionCandidate@6998 }
+    <name not found> = ArrayList@9715[1] { ResolutionCandidate@1574 }
+    <name not found> = ArrayList@9716[1] { ResolutionCandidate@3029 }
+    <name not found> = ArrayList@9717[1] { ResolutionCandidate@4304 }
+    <name not found> = ArrayList@9718[1] { ResolutionCandidate@1349 }
+    <name not found> = ArrayList@9719[1] { ResolutionCandidate@4937 }
+    <name not found> = ArrayList@9720[1] { ResolutionCandidate@6455 }
+    <name not found> = ArrayList@9721[1] { ResolutionCandidate@2177 }
+    <name not found> = ArrayList@9722[1] { ResolutionCandidate@2660 }
+    <name not found> = ArrayList@9723[1] { ResolutionCandidate@2018 }
+    <name not found> = ArrayList@9724[1] { ResolutionCandidate@1391 }
+    <name not found> = ArrayList@9725[1] { ResolutionCandidate@7682 }
+    <name not found> = ArrayList@9726[1] { ResolutionCandidate@6071 }
+    <name not found> = ArrayList@9727[1] { ResolutionCandidate@3821 }
+    <name not found> = ArrayList@9728[1] { ResolutionCandidate@4523 }
+    <name not found> = ArrayList@9729[1] { ResolutionCandidate@2081 }
+    <name not found> = ArrayList@9730[1] { ResolutionCandidate@764 }
+    <name not found> = ArrayList@9731[1] { ResolutionCandidate@7649 }
+    <name not found> = ArrayList@9732[1] { ResolutionCandidate@5237 }
+    <name not found> = ArrayList@9733[1] { ResolutionCandidate@2360 }
+    <name not found> = ArrayList@9734[1] { ResolutionCandidate@2720 }
+    <name not found> = ArrayList@9735[1] { ResolutionCandidate@3839 }
+    <name not found> = ArrayList@9736[1] { ResolutionCandidate@1352 }
+    <name not found> = ArrayList@9737[1] { ResolutionCandidate@7652 }
+    <name not found> = ArrayList@9738[1] { ResolutionCandidate@5567 }
+    <name not found> = ArrayList@9739[1] { ResolutionCandidate@4376 }
+    <name not found> = ArrayList@9740[1] { ResolutionCandidate@3674 }
+    <name not found> = ArrayList@9741[1] { ResolutionCandidate@4259 }
+    <name not found> = ArrayList@9742[1] { ResolutionCandidate@1103 }
+    <name not found> = ArrayList@9743[1] { ResolutionCandidate@7220 }
+    <name not found> = ArrayList@9744[1] { ResolutionCandidate@6902 }
+    <name not found> = ArrayList@9745[1] { ResolutionCandidate@2687 }
+    <name not found> = ArrayList@9746[1] { ResolutionCandidate@3506 }
+    <name not found> = ArrayList@9747[1] { ResolutionCandidate@2396 }
+    <name not found> = ArrayList@9748[1] { ResolutionCandidate@377 }
+    <name not found> = ArrayList@9749[1] { ResolutionCandidate@6842 }
+    <name not found> = ArrayList@9750[1] { ResolutionCandidate@6896 }
+    <name not found> = ArrayList@9751[1] { ResolutionCandidate@3773 }
+    <name not found> = ArrayList@9752[1] { ResolutionCandidate@3884 }
+    <name not found> = ArrayList@9753[1] { ResolutionCandidate@3776 }
+    <name not found> = ArrayList@9754[1] { ResolutionCandidate@1451 }
+    <name not found> = ArrayList@9755[1] { ResolutionCandidate@5864 }
+    <name not found> = ArrayList@9756[1] { ResolutionCandidate@4964 }
+    <name not found> = ArrayList@9757[1] { ResolutionCandidate@3590 }
+    <name not found> = ArrayList@9758[1] { ResolutionCandidate@4451 }
+    <name not found> = ArrayList@9759[1] { ResolutionCandidate@1073 }
+    <name not found> = ArrayList@9760[1] { ResolutionCandidate@4634 }
+    <name not found> = ArrayList@9761[1] { ResolutionCandidate@6434 }
+    <name not found> = ArrayList@9762[1] { ResolutionCandidate@4631 }
+    <name not found> = ArrayList@9763[1] { ResolutionCandidate@7391 }
+    <name not found> = ArrayList@9764[1] { ResolutionCandidate@4940 }
+    <name not found> = ArrayList@9765[1] { ResolutionCandidate@2309 }
+    <name not found> = ArrayList@9766[1] { ResolutionCandidate@3272 }
+    <name not found> = ArrayList@9767[1] { ResolutionCandidate@3053 }
+    <name not found> = ArrayList@9768[1] { ResolutionCandidate@1292 }
+    <name not found> = ArrayList@9769[1] { ResolutionCandidate@4808 }
+    <name not found> = ArrayList@9770[1] { ResolutionCandidate@6806 }
+    <name not found> = ArrayList@9771[1] { ResolutionCandidate@3596 }
+    <name not found> = ArrayList@9772[1] { ResolutionCandidate@3740 }
+    <name not found> = ArrayList@9773[1] { ResolutionCandidate@3068 }
+    <name not found> = ArrayList@9774[1] { ResolutionCandidate@1187 }
+    <name not found> = ArrayList@9775[1] { ResolutionCandidate@4979 }
+    <name not found> = ArrayList@9776[1] { ResolutionCandidate@6635 }
+    <name not found> = ArrayList@9777[1] { ResolutionCandidate@2960 }
+    <name not found> = ArrayList@9778[1] { ResolutionCandidate@1826 }
+    <name not found> = ArrayList@9779[1] { ResolutionCandidate@3983 }
+    <name not found> = ArrayList@9780[1] { ResolutionCandidate@1469 }
+    <name not found> = ArrayList@9781[1] { ResolutionCandidate@7664 }
+    <name not found> = ArrayList@9782[1] { ResolutionCandidate@4691 }
+    <name not found> = ArrayList@9783[1] { ResolutionCandidate@2375 }
+    <name not found> = ArrayList@9784[1] { ResolutionCandidate@2255 }
+    <name not found> = ArrayList@9785[1] { ResolutionCandidate@830 }
+    <name not found> = ArrayList@9786[1] { ResolutionCandidate@7175 }
+    <name not found> = ArrayList@9787[1] { ResolutionCandidate@7013 }
+    <name not found> = ArrayList@9788[1] { ResolutionCandidate@6500 }
+    <name not found> = ArrayList@9789[1] { ResolutionCandidate@7616 }
+    <name not found> = ArrayList@9790[1] { ResolutionCandidate@7373 }
+    <name not found> = ArrayList@9791[1] { ResolutionCandidate@1802 }
+    <name not found> = ArrayList@9792[1] { ResolutionCandidate@3107 }
+    <name not found> = ArrayList@9793[1] { ResolutionCandidate@1142 }
+    <name not found> = ArrayList@9794[1] { ResolutionCandidate@5738 }
+    <name not found> = ArrayList@9795[1] { ResolutionCandidate@7199 }
+    <name not found> = ArrayList@9796[1] { ResolutionCandidate@6554 }
+    <name not found> = ArrayList@9797[1] { ResolutionCandidate@4574 }
+    <name not found> = ArrayList@9798[1] { ResolutionCandidate@6791 }
+    <name not found> = ArrayList@9799[1] { ResolutionCandidate@2915 }
+    <name not found> = ArrayList@9800[1] { ResolutionCandidate@3488 }
+    <name not found> = ArrayList@9801[1] { ResolutionCandidate@1061 }
+    <name not found> = ArrayList@9802[1] { ResolutionCandidate@5615 }
+    <name not found> = ArrayList@9803[1] { ResolutionCandidate@6449 }
+    <name not found> = ArrayList@9804[1] { ResolutionCandidate@7070 }
+    <name not found> = ArrayList@9805[1] { ResolutionCandidate@6077 }
+    <name not found> = ArrayList@9806[1] { ResolutionCandidate@7367 }
+    <name not found> = ArrayList@9807[1] { ResolutionCandidate@4013 }
+    <name not found> = ArrayList@9808[1] { ResolutionCandidate@3125 }
+    <name not found> = ArrayList@9809[1] { ResolutionCandidate@620 }
+    <name not found> = ArrayList@9810[1] { ResolutionCandidate@6908 }
+    <name not found> = ArrayList@9811[1] { ResolutionCandidate@4904 }
+    <name not found> = ArrayList@9812[1] { ResolutionCandidate@4781 }
+    <name not found> = ArrayList@9813[1] { ResolutionCandidate@5597 }
+    <name not found> = ArrayList@9814[1] { ResolutionCandidate@6914 }
+    <name not found> = ArrayList@9815[1] { ResolutionCandidate@2522 }
+    <name not found> = ArrayList@9816[1] { ResolutionCandidate@3080 }
+    <name not found> = ArrayList@9817[1] { ResolutionCandidate@3440 }
+    <name not found> = ArrayList@9818[1] { ResolutionCandidate@590 }
+    <name not found> = ArrayList@9819[1] { ResolutionCandidate@6959 }
+    <name not found> = ArrayList@9820[1] { ResolutionCandidate@6104 }
+    <name not found> = ArrayList@9821[1] { ResolutionCandidate@2318 }
+    <name not found> = ArrayList@9822[1] { ResolutionCandidate@1976 }
+    <name not found> = ArrayList@9823[1] { ResolutionCandidate@2063 }
+    <name not found> = ArrayList@9824[1] { ResolutionCandidate@1169 }
+    <name not found> = ArrayList@9825[1] { ResolutionCandidate@7094 }
+    <name not found> = ArrayList@9826[1] { ResolutionCandidate@5873 }
+    <name not found> = ArrayList@9827[1] { ResolutionCandidate@3197 }
+    <name not found> = ArrayList@9828[1] { ResolutionCandidate@1685 }
+    <name not found> = ArrayList@9829[1] { ResolutionCandidate@1688 }
+    <name not found> = ArrayList@9830[1] { ResolutionCandidate@1298 }
+    <name not found> = ArrayList@9831[1] { ResolutionCandidate@6347 }
+    <name not found> = ArrayList@9832[1] { ResolutionCandidate@7532 }
+    <name not found> = ArrayList@9833[1] { ResolutionCandidate@3548 }
+    <name not found> = ArrayList@9834[1] { ResolutionCandidate@4031 }
+    <name not found> = ArrayList@9835[1] { ResolutionCandidate@1163 }
+    <name not found> = ArrayList@9836[1] { ResolutionCandidate@7214 }
+    <name not found> = ArrayList@9837[1] { ResolutionCandidate@6437 }
+    <name not found> = ArrayList@9838[1] { ResolutionCandidate@5390 }
+    <name not found> = ArrayList@9839[1] { ResolutionCandidate@7238 }
+    <name not found> = ArrayList@9840[1] { ResolutionCandidate@6344 }
+    <name not found> = ArrayList@9841[1] { ResolutionCandidate@4163 }
+    <name not found> = ArrayList@9842[1] { ResolutionCandidate@3461 }
+    <name not found> = ArrayList@9843[1] { ResolutionCandidate@494 }
+    <name not found> = ArrayList@9844[1] { ResolutionCandidate@5450 }
+    <name not found> = ArrayList@9845[1] { ResolutionCandidate@6536 }
+    <name not found> = ArrayList@9846[1] { ResolutionCandidate@6788 }
+    <name not found> = ArrayList@9847[1] { ResolutionCandidate@5963 }
+    <name not found> = ArrayList@9848[1] { ResolutionCandidate@7658 }
+    <name not found> = ArrayList@9849[1] { ResolutionCandidate@3086 }
+    <name not found> = ArrayList@9850[1] { ResolutionCandidate@3716 }
+    <name not found> = ArrayList@9851[1] { ResolutionCandidate@1058 }
+    <name not found> = ArrayList@9852[1] { ResolutionCandidate@7289 }
+    <name not found> = ArrayList@9853[1] { ResolutionCandidate@6401 }
+    <name not found> = ArrayList@9854[1] { ResolutionCandidate@4814 }
+    <name not found> = ArrayList@9855[1] { ResolutionCandidate@5819 }
+    <name not found> = ArrayList@9856[1] { ResolutionCandidate@6098 }
+    <name not found> = ArrayList@9857[1] { ResolutionCandidate@2420 }
+    <name not found> = ArrayList@9858[1] { ResolutionCandidate@4085 }
+    <name not found> = ArrayList@9859[1] { ResolutionCandidate@401 }
+    <name not found> = ArrayList@9860[1] { ResolutionCandidate@5528 }
+    <name not found> = ArrayList@9861[1] { ResolutionCandidate@6884 }
+    <name not found> = ArrayList@9862[1] { ResolutionCandidate@7106 }
+    <name not found> = ArrayList@9863[1] { ResolutionCandidate@6194 }
+    <name not found> = ArrayList@9864[1] { ResolutionCandidate@6095 }
+    <name not found> = ArrayList@9865[1] { ResolutionCandidate@1751 }
+    <name not found> = ArrayList@9866[1] { ResolutionCandidate@2795 }
+    <name not found> = ArrayList@9867[1] { ResolutionCandidate@3524 }
+    <name not found> = ArrayList@9868[1] { ResolutionCandidate@362 }
+    <name not found> = ArrayList@9869[1] { ResolutionCandidate@4751 }
+    <name not found> = ArrayList@9870[1] { ResolutionCandidate@7358 }
+    <name not found> = ArrayList@9871[1] { ResolutionCandidate@2033 }
+    <name not found> = ArrayList@9872[1] { ResolutionCandidate@3266 }
+    <name not found> = ArrayList@9873[1] { ResolutionCandidate@4097 }
+    <name not found> = ArrayList@9874[1] { ResolutionCandidate@848 }
+    <name not found> = ArrayList@9875[1] { ResolutionCandidate@7040 }
+    <name not found> = ArrayList@9876[1] { ResolutionCandidate@7421 }
+    <name not found> = ArrayList@9877[1] { ResolutionCandidate@1727 }
+    <name not found> = ArrayList@9878[1] { ResolutionCandidate@2252 }
+    <name not found> = ArrayList@9879[1] { ResolutionCandidate@1616 }
+    <name not found> = ArrayList@9880[1] { ResolutionCandidate@611 }
+    <name not found> = ArrayList@9881[1] { ResolutionCandidate@4766 }
+    <name not found> = ArrayList@9882[1] { ResolutionCandidate@7127 }
+    <name not found> = ArrayList@9883[1] { ResolutionCandidate@3569 }
+    <name not found> = ArrayList@9884[1] { ResolutionCandidate@2024 }
+    <name not found> = ArrayList@9885[1] { ResolutionCandidate@734 }
+    <name not found> = ArrayList@9886[1] { ResolutionCandidate@7466 }
+    <name not found> = ArrayList@9887[1] { ResolutionCandidate@7607 }
+    <name not found> = ArrayList@9888[1] { ResolutionCandidate@6311 }
+    <name not found> = ArrayList@9889[1] { ResolutionCandidate@6719 }
+    <name not found> = ArrayList@9890[1] { ResolutionCandidate@4916 }
+    <name not found> = ArrayList@9891[1] { ResolutionCandidate@1787 }
+    <name not found> = ArrayList@9892[1] { ResolutionCandidate@4268 }
+    <name not found> = ArrayList@9893[1] { ResolutionCandidate@1343 }
+    <name not found> = ArrayList@9894[1] { ResolutionCandidate@7427 }
+    <name not found> = ArrayList@9895[1] { ResolutionCandidate@6068 }
+    <name not found> = ArrayList@9896[1] { ResolutionCandidate@6740 }
+    <name not found> = ArrayList@9897[1] { ResolutionCandidate@7472 }
+    <name not found> = ArrayList@9898[1] { ResolutionCandidate@6383 }
+    <name not found> = ArrayList@9899[1] { ResolutionCandidate@3926 }
+    <name not found> = ArrayList@9900[1] { ResolutionCandidate@4229 }
+    <name not found> = ArrayList@9901[1] { ResolutionCandidate@923 }
+    <name not found> = ArrayList@9902[1] { ResolutionCandidate@5129 }
+    <name not found> = ArrayList@9903[1] { ResolutionCandidate@5279 }
+    <name not found> = ArrayList@9904[1] { ResolutionCandidate@5837 }
+    <name not found> = ArrayList@9905[1] { ResolutionCandidate@5078 }
+    <name not found> = ArrayList@9906[1] { ResolutionCandidate@6374 }
+    <name not found> = ArrayList@9907[1] { ResolutionCandidate@3464 }
+    <name not found> = ArrayList@9908[1] { ResolutionCandidate@2243 }
+    <name not found> = ArrayList@9909[1] { ResolutionCandidate@998 }
+    <name not found> = ArrayList@9910[1] { ResolutionCandidate@5171 }
+    <name not found> = ArrayList@9911[1] { ResolutionCandidate@5939 }
+    <name not found> = ArrayList@9912[1] { ResolutionCandidate@6701 }
+    <name not found> = ArrayList@9913[1] { ResolutionCandidate@6287 }
+    <name not found> = ArrayList@9914[1] { ResolutionCandidate@5261 }
+    <name not found> = ArrayList@9915[1] { ResolutionCandidate@1898 }
+    <name not found> = ArrayList@9916[1] { ResolutionCandidate@3074 }
+    <name not found> = ArrayList@9917[1] { ResolutionCandidate@1556 }
+    <name not found> = ArrayList@9918[1] { ResolutionCandidate@1028 }
+    <name not found> = ArrayList@9919[1] { ResolutionCandidate@7061 }
+    <name not found> = ArrayList@9920[1] { ResolutionCandidate@4805 }
+    <name not found> = ArrayList@9921[1] { ResolutionCandidate@3416 }
+    <name not found> = ArrayList@9922[1] { ResolutionCandidate@4004 }
+    <name not found> = ArrayList@9923[1] { ResolutionCandidate@2075 }
+    <name not found> = ArrayList@9924[1] { ResolutionCandidate@1457 }
+    <name not found> = ArrayList@9925[1] { ResolutionCandidate@7235 }
+    <name not found> = ArrayList@9926[1] { ResolutionCandidate@6956 }
+    <name not found> = ArrayList@9927[1] { ResolutionCandidate@2183 }
+    <name not found> = ArrayList@9928[1] { ResolutionCandidate@3152 }
+    <name not found> = ArrayList@9929[1] { ResolutionCandidate@2933 }
+    <name not found> = ArrayList@9930[1] { ResolutionCandidate@587 }
+    <name not found> = ArrayList@9931[1] { ResolutionCandidate@6407 }
+    <name not found> = ArrayList@9932[1] { ResolutionCandidate@7073 }
+    <name not found> = ArrayList@9933[1] { ResolutionCandidate@3200 }
+    <name not found> = ArrayList@9934[1] { ResolutionCandidate@3401 }
+    <name not found> = ArrayList@9935[1] { ResolutionCandidate@1100 }
+    <name not found> = ArrayList@9936[1] { ResolutionCandidate@5825 }
+    <name not found> = ArrayList@9937[1] { ResolutionCandidate@6314 }
+    <name not found> = ArrayList@9938[1] { ResolutionCandidate@4559 }
+    <name not found> = ArrayList@9939[1] { ResolutionCandidate@5768 }
+    <name not found> = ArrayList@9940[1] { ResolutionCandidate@4778 }
+    <name not found> = ArrayList@9941[1] { ResolutionCandidate@2060 }
+    <name not found> = ArrayList@9942[1] { ResolutionCandidate@3491 }
+    <name not found> = ArrayList@9943[1] { ResolutionCandidate@719 }
+    <name not found> = ArrayList@9944[1] { ResolutionCandidate@6974 }
+    <name not found> = ArrayList@9945[1] { ResolutionCandidate@4775 }
+    <name not found> = ArrayList@9946[1] { ResolutionCandidate@5807 }
+    <name not found> = ArrayList@9947[1] { ResolutionCandidate@5672 }
+    <name not found> = ArrayList@9948[1] { ResolutionCandidate@6491 }
+    <name not found> = ArrayList@9949[1] { ResolutionCandidate@3089 }
+    <name not found> = ArrayList@9950[1] { ResolutionCandidate@4142 }
+    <name not found> = ArrayList@9951[1] { ResolutionCandidate@1472 }
+    <name not found> = ArrayList@9952[1] { ResolutionCandidate@6158 }
+    <name not found> = ArrayList@9953[1] { ResolutionCandidate@7322 }
+    <name not found> = ArrayList@9954[1] { ResolutionCandidate@4703 }
+    <name not found> = ArrayList@9955[1] { ResolutionCandidate@7499 }
+    <name not found> = ArrayList@9956[1] { ResolutionCandidate@7562 }
+    <name not found> = ArrayList@9957[1] { ResolutionCandidate@2540 }
+    <name not found> = ArrayList@9958[1] { ResolutionCandidate@4136 }
+    <name not found> = ArrayList@9959[1] { ResolutionCandidate@3917 }
+    <name not found> = ArrayList@9960[1] { ResolutionCandidate@1394 }
+    <name not found> = ArrayList@9961[1] { ResolutionCandidate@7160 }
+    <name not found> = ArrayList@9962[1] { ResolutionCandidate@6179 }
+    <name not found> = ArrayList@9963[1] { ResolutionCandidate@7133 }
+    <name not found> = ArrayList@9964[1] { ResolutionCandidate@2228 }
+    <name not found> = ArrayList@9965[1] { ResolutionCandidate@3347 }
+    <name not found> = ArrayList@9966[1] { ResolutionCandidate@2423 }
+    <name not found> = ArrayList@9967[1] { ResolutionCandidate@1484 }
+    <name not found> = ArrayList@9968[1] { ResolutionCandidate@6260 }
+    <name not found> = ArrayList@9969[1] { ResolutionCandidate@6860 }
+    <name not found> = ArrayList@9970[1] { ResolutionCandidate@4364 }
+    <name not found> = ArrayList@9971[1] { ResolutionCandidate@4538 }
+    <name not found> = ArrayList@9972[1] { ResolutionCandidate@4058 }
+    <name not found> = ArrayList@9973[1] { ResolutionCandidate@1511 }
+    <name not found> = ArrayList@9974[1] { ResolutionCandidate@7412 }
+    <name not found> = ArrayList@9975[1] { ResolutionCandidate@5927 }
+    <name not found> = ArrayList@9976[1] { ResolutionCandidate@2951 }
+    <name not found> = ArrayList@9977[1] { ResolutionCandidate@3560 }
+    <name not found> = ArrayList@9978[1] { ResolutionCandidate@4487 }
+    <name not found> = ArrayList@9979[1] { ResolutionCandidate@1265 }
+    <name not found> = ArrayList@9980[1] { ResolutionCandidate@4715 }
+    <name not found> = ArrayList@9981[1] { ResolutionCandidate@7598 }
+    <name not found> = ArrayList@9982[1] { ResolutionCandidate@1913 }
+    <name not found> = ArrayList@9983[1] { ResolutionCandidate@3995 }
+    <name not found> = ArrayList@9984[1] { ResolutionCandidate@1796 }
+    <name not found> = ArrayList@9985[1] { ResolutionCandidate@416 }
+    <name not found> = ArrayList@9986[1] { ResolutionCandidate@6341 }
+    <name not found> = ArrayList@9987[1] { ResolutionCandidate@5093 }
+    <name not found> = ArrayList@9988[1] { ResolutionCandidate@3731 }
+    <name not found> = ArrayList@9989[1] { ResolutionCandidate@2120 }
+    <name not found> = ArrayList@9990[1] { ResolutionCandidate@2804 }
+    <name not found> = ArrayList@9991[1] { ResolutionCandidate@659 }
+    <name not found> = ArrayList@9992[1] { ResolutionCandidate@7010 }
+    <name not found> = ArrayList@9993[1] { ResolutionCandidate@4868 }
+    <name not found> = ArrayList@9994[1] { ResolutionCandidate@4193 }
+    <name not found> = ArrayList@9995[1] { ResolutionCandidate@4292 }
+    <name not found> = ArrayList@9996[1] { ResolutionCandidate@4007 }
+    <name not found> = ArrayList@9997[1] { ResolutionCandidate@386 }
+    <name not found> = ArrayList@9998[1] { ResolutionCandidate@6236 }
+    <name not found> = ArrayList@9999[1] { ResolutionCandidate@4943 }
+    <name not found> = ArrayList@10000[1] { ResolutionCandidate@4385 }
+    <name not found> = ArrayList@10001[1] { ResolutionCandidate@2600 }
+    <name not found> = ArrayList@10002[1] { ResolutionCandidate@4160 }
+    <name not found> = ArrayList@10003[1] { ResolutionCandidate@533 }
+    <name not found> = ArrayList@10004[1] { ResolutionCandidate@5360 }
+    <name not found> = ArrayList@10005[1] { ResolutionCandidate@6968 }
+    <name not found> = ArrayList@10006[1] { ResolutionCandidate@2774 }
+    <name not found> = ArrayList@10007[1] { ResolutionCandidate@1769 }
+    <name not found> = ArrayList@10008[1] { ResolutionCandidate@3083 }
+    <name not found> = ArrayList@10009[1] { ResolutionCandidate@1010 }
+    <name not found> = ArrayList@10010[1] { ResolutionCandidate@6410 }
+    <name not found> = ArrayList@10011[1] { ResolutionCandidate@4970 }
+    <name not found> = ArrayList@10012[1] { ResolutionCandidate@2333 }
+    <name not found> = ArrayList@10013[1] { ResolutionCandidate@3494 }
+    <name not found> = ArrayList@10014[1] { ResolutionCandidate@2783 }
+    <name not found> = ArrayList@10015[1] { ResolutionCandidate@1124 }
+    <name not found> = ArrayList@10016[1] { ResolutionCandidate@4934 }
+    <name not found> = ArrayList@10017[1] { ResolutionCandidate@5765 }
+    <name not found> = ArrayList@10018[1] { ResolutionCandidate@1775 }
+    <name not found> = ArrayList@10019[1] { ResolutionCandidate@2513 }
+    <name not found> = ArrayList@10020[1] { ResolutionCandidate@3224 }
+    <name not found> = ArrayList@10021[1] { ResolutionCandidate@1508 }
+    <name not found> = ArrayList@10022[1] { ResolutionCandidate@4694 }
+    <name not found> = ArrayList@10023[1] { ResolutionCandidate@6941 }
+    <name not found> = ArrayList@10024[1] { ResolutionCandidate@3008 }
+    <name not found> = ArrayList@10025[1] { ResolutionCandidate@2426 }
+    <name not found> = ArrayList@10026[1] { ResolutionCandidate@1847 }
+    <name not found> = ArrayList@10027[1] { ResolutionCandidate@557 }
+    <name not found> = ArrayList@10028[1] { ResolutionCandidate@5270 }
+    <name not found> = ArrayList@10029[1] { ResolutionCandidate@6851 }
+    <name not found> = ArrayList@10030[1] { ResolutionCandidate@2495 }
+    <name not found> = ArrayList@10031[1] { ResolutionCandidate@1634 }
+    <name not found> = ArrayList@10032[1] { ResolutionCandidate@4262 }
+    <name not found> = ArrayList@10033[1] { ResolutionCandidate@680 }
+    <name not found> = ArrayList@10034[1] { ResolutionCandidate@5834 }
+    <name not found> = ArrayList@10035[1] { ResolutionCandidate@7433 }
+    <name not found> = ArrayList@10036[1] { ResolutionCandidate@3950 }
+    <name not found> = ArrayList@10037[1] { ResolutionCandidate@1832 }
+    <name not found> = ArrayList@10038[1] { ResolutionCandidate@2801 }
+    <name not found> = ArrayList@10039[1] { ResolutionCandidate@485 }
+    <name not found> = ArrayList@10040[1] { ResolutionCandidate@5897 }
+    <name not found> = ArrayList@10041[1] { ResolutionCandidate@5057 }
+    <name not found> = ArrayList@10042[1] { ResolutionCandidate@3233 }
+    <name not found> = ArrayList@10043[1] { ResolutionCandidate@2387 }
+    <name not found> = ArrayList@10044[1] { ResolutionCandidate@2474 }
+    <name not found> = ArrayList@10045[1] { ResolutionCandidate@1004 }
+    <name not found> = ArrayList@10046[1] { ResolutionCandidate@5252 }
+    <name not found> = ArrayList@10047[1] { ResolutionCandidate@6485 }
+    <name not found> = ArrayList@10048[1] { ResolutionCandidate@3875 }
+    <name not found> = ArrayList@10049[1] { ResolutionCandidate@2210 }
+    <name not found> = ArrayList@10050[1] { ResolutionCandidate@3242 }
+    <name not found> = ArrayList@10051[1] { ResolutionCandidate@398 }
+    <name not found> = ArrayList@10052[1] { ResolutionCandidate@6356 }
+    <name not found> = ArrayList@10053[1] { ResolutionCandidate@6185 }
+    <name not found> = ArrayList@10054[1] { ResolutionCandidate@4466 }
+    <name not found> = ArrayList@10055[1] { ResolutionCandidate@3635 }
+    <name not found> = ArrayList@10056[1] { ResolutionCandidate@1871 }
+    <name not found> = ArrayList@10057[1] { ResolutionCandidate@935 }
+    <name not found> = ArrayList@10058[1] { ResolutionCandidate@5729 }
+    <name not found> = ArrayList@10059[1] { ResolutionCandidate@5354 }
+    <name not found> = ArrayList@10060[1] { ResolutionCandidate@4295 }
+    <name not found> = ArrayList@10061[1] { ResolutionCandidate@2213 }
+    <name not found> = ArrayList@10062[1] { ResolutionCandidate@3455 }
+    <name not found> = ArrayList@10063[1] { ResolutionCandidate@857 }
+    <name not found> = ArrayList@10064[1] { ResolutionCandidate@5942 }
+    <name not found> = ArrayList@10065[1] { ResolutionCandidate@6782 }
+    <name not found> = ArrayList@10066[1] { ResolutionCandidate@2921 }
+    <name not found> = ArrayList@10067[1] { ResolutionCandidate@3308 }
+    <name not found> = ArrayList@10068[1] { ResolutionCandidate@3188 }
+    <name not found> = ArrayList@10069[1] { ResolutionCandidate@1496 }
+    <name not found> = ArrayList@10070[1] { ResolutionCandidate@5798 }
+    <name not found> = ArrayList@10071[1] { ResolutionCandidate@7709 }
+    <name not found> = ArrayList@10072[1] { ResolutionCandidate@3365 }
+    <name not found> = ArrayList@10073[1] { ResolutionCandidate@2552 }
+    <name not found> = ArrayList@10074[1] { ResolutionCandidate@3215 }
+    <name not found> = ArrayList@10075[1] { ResolutionCandidate@1217 }
+    <name not found> = ArrayList@10076[1] { ResolutionCandidate@6188 }
+    <name not found> = ArrayList@10077[1] { ResolutionCandidate@6503 }
+    <name not found> = ArrayList@10078[1] { ResolutionCandidate@2366 }
+    <name not found> = ArrayList@10079[1] { ResolutionCandidate@3971 }
+    <name not found> = ArrayList@10080[1] { ResolutionCandidate@3791 }
+    <name not found> = ArrayList@10081[1] { ResolutionCandidate@821 }
+    <name not found> = ArrayList@10082[1] { ResolutionCandidate@4586 }
+    <name not found> = ArrayList@10083[1] { ResolutionCandidate@6023 }
+    <name not found> = ArrayList@10084[1] { ResolutionCandidate@1808 }
+    <name not found> = ArrayList@10085[1] { ResolutionCandidate@2078 }
+    <name not found> = ArrayList@10086[1] { ResolutionCandidate@2642 }
+    <name not found> = ArrayList@10087[1] { ResolutionCandidate@776 }
+    <name not found> = ArrayList@10088[1] { ResolutionCandidate@6752 }
+    <name not found> = ArrayList@10089[1] { ResolutionCandidate@6332 }
+    <name not found> = ArrayList@10090[1] { ResolutionCandidate@4436 }
+    <name not found> = ArrayList@10091[1] { ResolutionCandidate@2936 }
+    <name not found> = ArrayList@10092[1] { ResolutionCandidate@3758 }
+    <name not found> = ArrayList@10093[1] { ResolutionCandidate@1205 }
+    <name not found> = ArrayList@10094[1] { ResolutionCandidate@4583 }
+    <name not found> = ArrayList@10095[1] { ResolutionCandidate@6575 }
+    <name not found> = ArrayList@10096[1] { ResolutionCandidate@1742 }
+    <name not found> = ArrayList@10097[1] { ResolutionCandidate@4328 }
+    <name not found> = ArrayList@10098[1] { ResolutionCandidate@3662 }
+    <name not found> = ArrayList@10099[1] { ResolutionCandidate@947 }
+    <name not found> = ArrayList@10100[1] { ResolutionCandidate@5480 }
+    <name not found> = ArrayList@10101[1] { ResolutionCandidate@4925 }
+    <name not found> = ArrayList@10102[1] { ResolutionCandidate@1850 }
+    <name not found> = ArrayList@10103[1] { ResolutionCandidate@2285 }
+    <name not found> = ArrayList@10104[1] { ResolutionCandidate@1865 }
+    <name not found> = ArrayList@10105[1] { ResolutionCandidate@1055 }
+    <name not found> = ArrayList@10106[1] { ResolutionCandidate@5849 }
+    <name not found> = ArrayList@10107[1] { ResolutionCandidate@5885 }
+    <name not found> = ArrayList@10108[1] { ResolutionCandidate@2192 }
+    <name not found> = ArrayList@10109[1] { ResolutionCandidate@3572 }
+    <name not found> = ArrayList@10110[1] { ResolutionCandidate@3860 }
+    <name not found> = ArrayList@10111[1] { ResolutionCandidate@608 }
+    <name not found> = ArrayList@10112[1] { ResolutionCandidate@6734 }
+    <name not found> = ArrayList@10113[1] { ResolutionCandidate@5174 }
+    <name not found> = ArrayList@10114[1] { ResolutionCandidate@3485 }
+    <name not found> = ArrayList@10115[1] { ResolutionCandidate@2390 }
+    <name not found> = ArrayList@10116[1] { ResolutionCandidate@3431 }
+    <name not found> = ArrayList@10117[1] { ResolutionCandidate@1115 }
+    <name not found> = ArrayList@10118[1] { ResolutionCandidate@5909 }
+    <name not found> = ArrayList@10119[1] { ResolutionCandidate@5930 }
+    <name not found> = ArrayList@10120[1] { ResolutionCandidate@2150 }
+    <name not found> = ArrayList@10121[1] { ResolutionCandidate@2879 }
+    <name not found> = ArrayList@10122[1] { ResolutionCandidate@3851 }
+    <name not found> = ArrayList@10123[1] { ResolutionCandidate@704 }
+    <name not found> = ArrayList@10124[1] { ResolutionCandidate@6980 }
+    <name not found> = ArrayList@10125[1] { ResolutionCandidate@7436 }
+    <name not found> = ArrayList@10126[1] { ResolutionCandidate@2282 }
+    <name not found> = ArrayList@10127[1] { ResolutionCandidate@3056 }
+    <name not found> = ArrayList@10128[1] { ResolutionCandidate@2234 }
+    <name not found> = ArrayList@10129[1] { ResolutionCandidate@482 }
+    <name not found> = ArrayList@10130[1] { ResolutionCandidate@5024 }
+    <name not found> = ArrayList@10131[1] { ResolutionCandidate@7511 }
+    <name not found> = ArrayList@10132[1] { ResolutionCandidate@4457 }
+    <name not found> = ArrayList@10133[1] { ResolutionCandidate@3155 }
+    <name not found> = ArrayList@10134[1] { ResolutionCandidate@1967 }
+    <name not found> = ArrayList@10135[1] { ResolutionCandidate@869 }
+    <name not found> = ArrayList@10136[1] { ResolutionCandidate@7706 }
+    <name not found> = ArrayList@10137[1] { ResolutionCandidate@6212 }
+    <name not found> = ArrayList@10138[1] { ResolutionCandidate@3638 }
+    <name not found> = ArrayList@10139[1] { ResolutionCandidate@3863 }
+    <name not found> = ArrayList@10140[1] { ResolutionCandidate@1607 }
+    <name not found> = ArrayList@10141[1] { ResolutionCandidate@701 }
+    <name not found> = ArrayList@10142[1] { ResolutionCandidate@7475 }
+    <name not found> = ArrayList@10143[1] { ResolutionCandidate@6551 }
+    <name not found> = ArrayList@10144[1] { ResolutionCandidate@4151 }
+    <name not found> = ArrayList@10145[1] { ResolutionCandidate@3764 }
+    <name not found> = ArrayList@10146[1] { ResolutionCandidate@1784 }
+    <name not found> = ArrayList@10147[1] { ResolutionCandidate@392 }
+    <name not found> = ArrayList@10148[1] { ResolutionCandidate@7478 }
+    <name not found> = ArrayList@10149[1] { ResolutionCandidate@5042 }
+    <name not found> = ArrayList@10150[1] { ResolutionCandidate@1799 }
+    <name not found> = ArrayList@10151[1] { ResolutionCandidate@2693 }
+    <name not found> = ArrayList@10152[1] { ResolutionCandidate@3230 }
+    <name not found> = ArrayList@10153[1] { ResolutionCandidate@581 }
+    <name not found> = ArrayList@10154[1] { ResolutionCandidate@6458 }
+    <name not found> = ArrayList@10155[1] { ResolutionCandidate@6218 }
+    <name not found> = ArrayList@10156[1] { ResolutionCandidate@2897 }
+    <name not found> = ArrayList@10157[1] { ResolutionCandidate@3728 }
+    <name not found> = ArrayList@10158[1] { ResolutionCandidate@4091 }
+    <name not found> = ArrayList@10159[1] { ResolutionCandidate@1070 }
+    <name not found> = ArrayList@10160[1] { ResolutionCandidate@4619 }
+    <name not found> = ArrayList@10161[1] { ResolutionCandidate@7703 }
+    <name not found> = ArrayList@10162[1] { ResolutionCandidate@2840 }
+    <name not found> = ArrayList@10163[1] { ResolutionCandidate@3236 }
+    <name not found> = ArrayList@10164[1] { ResolutionCandidate@2054 }
+    <name not found> = ArrayList@10165[1] { ResolutionCandidate@437 }
+    <name not found> = ArrayList@10166[1] { ResolutionCandidate@6278 }
+    <name not found> = ArrayList@10167[1] { ResolutionCandidate@7637 }
+    <name not found> = ArrayList@10168[1] { ResolutionCandidate@2654 }
+    <name not found> = ArrayList@10169[1] { ResolutionCandidate@2711 }
+    <name not found> = ArrayList@10170[1] { ResolutionCandidate@3782 }
+    <name not found> = ArrayList@10171[1] { ResolutionCandidate@860 }
+    <name not found> = ArrayList@10172[1] { ResolutionCandidate@4649 }
+    <name not found> = ArrayList@10173[1] { ResolutionCandidate@5474 }
+    <name not found> = ArrayList@10174[1] { ResolutionCandidate@3698 }
+    <name not found> = ArrayList@10175[1] { ResolutionCandidate@4139 }
+    <name not found> = ArrayList@10176[1] { ResolutionCandidate@3269 }
+    <name not found> = ArrayList@10177[1] { ResolutionCandidate@1502 }
+    <name not found> = ArrayList@10178[1] { ResolutionCandidate@5840 }
+    <name not found> = ArrayList@10179[1] { ResolutionCandidate@6620 }
+    <name not found> = ArrayList@10180[1] { ResolutionCandidate@1919 }
+    <name not found> = ArrayList@10181[1] { ResolutionCandidate@2957 }
+    <name not found> = ArrayList@10182[1] { ResolutionCandidate@1979 }
+    <name not found> = ArrayList@10183[1] { ResolutionCandidate@989 }
+    <name not found> = ArrayList@10184[1] { ResolutionCandidate@7274 }
+    <name not found> = ArrayList@10185[1] { ResolutionCandidate@5357 }
+    <name not found> = ArrayList@10186[1] { ResolutionCandidate@2948 }
+    <name not found> = ArrayList@10187[1] { ResolutionCandidate@2537 }
+    <name not found> = ArrayList@10188[1] { ResolutionCandidate@2954 }
+    <name not found> = ArrayList@10189[1] { ResolutionCandidate@1064 }
+    <name not found> = ArrayList@10190[1] { ResolutionCandidate@5063 }
+    <name not found> = ArrayList@10191[1] { ResolutionCandidate@6008 }
+    <name not found> = ArrayList@10192[1] { ResolutionCandidate@3902 }
+    <name not found> = ArrayList@10193[1] { ResolutionCandidate@2477 }
+    <name not found> = ArrayList@10194[1] { ResolutionCandidate@3953 }
+    <name not found> = ArrayList@10195[1] { ResolutionCandidate@524 }
+    <name not found> = ArrayList@10196[1] { ResolutionCandidate@6617 }
+    <name not found> = ArrayList@10197[1] { ResolutionCandidate@7193 }
+    <name not found> = ArrayList@10198[1] { ResolutionCandidate@5990 }
+    <name not found> = ArrayList@10199[1] { ResolutionCandidate@2651 }
+    <name not found> = ArrayList@10200[1] { ResolutionCandidate@3251 }
+    <name not found> = ArrayList@10201[1] { ResolutionCandidate@3587 }
+    <name not found> = ArrayList@10202[1] { ResolutionCandidate@467 }
+    <name not found> = ArrayList@10203[1] { ResolutionCandidate@7085 }
+    <name not found> = ArrayList@10204[1] { ResolutionCandidate@5195 }
+    <name not found> = ArrayList@10205[1] { ResolutionCandidate@3476 }
+    <name not found> = ArrayList@10206[1] { ResolutionCandidate@3797 }
+    <name not found> = ArrayList@10207[1] { ResolutionCandidate@2609 }
+    <name not found> = ArrayList@10208[1] { ResolutionCandidate@965 }
+    <name not found> = ArrayList@10209[1] { ResolutionCandidate@5297 }
+    <name not found> = ArrayList@10210[1] { ResolutionCandidate@5900 }
+    <name not found> = ArrayList@10211[1] { ResolutionCandidate@3686 }
+    <name not found> = ArrayList@10212[1] { ResolutionCandidate@2999 }
+    <name not found> = ArrayList@10213[1] { ResolutionCandidate@2453 }
+    <name not found> = ArrayList@10214[1] { ResolutionCandidate@824 }
+    <name not found> = ArrayList@10215[1] { ResolutionCandidate@7031 }
+    <name not found> = ArrayList@10216[1] { ResolutionCandidate@6668 }
+    <name not found> = ArrayList@10217[1] { ResolutionCandidate@3629 }
+    <name not found> = ArrayList@10218[1] { ResolutionCandidate@4145 }
+    <name not found> = ArrayList@10219[1] { ResolutionCandidate@3989 }
+    <name not found> = ArrayList@10220[1] { ResolutionCandidate@1199 }
+    <name not found> = ArrayList@10221[1] { ResolutionCandidate@6857 }
+    <name not found> = ArrayList@10222[1] { ResolutionCandidate@7313 }
+    <name not found> = ArrayList@10223[1] { ResolutionCandidate@3305 }
+    <name not found> = ArrayList@10224[1] { ResolutionCandidate@4067 }
+    <name not found> = ArrayList@10225[1] { ResolutionCandidate@3158 }
+    <name not found> = ArrayList@10226[1] { ResolutionCandidate@356 }
+    <name not found> = ArrayList@10227[1] { ResolutionCandidate@6377 }
+    <name not found> = ArrayList@10228[1] { ResolutionCandidate@5492 }
+    <name not found> = ArrayList@10229[1] { ResolutionCandidate@2198 }
+    <name not found> = ArrayList@10230[1] { ResolutionCandidate@3206 }
+    <name not found> = ArrayList@10231[1] { ResolutionCandidate@1877 }
+    <name not found> = ArrayList@10232[1] { ResolutionCandidate@1034 }
+    <name not found> = ArrayList@10233[1] { ResolutionCandidate@5636 }
+    <name not found> = ArrayList@10234[1] { ResolutionCandidate@7712 }
+    <name not found> = ArrayList@10235[1] { ResolutionCandidate@4526 }
+    <name not found> = ArrayList@10236[1] { ResolutionCandidate@2507 }
+    <name not found> = ArrayList@10237[1] { ResolutionCandidate@2891 }
+    <name not found> = ArrayList@10238[1] { ResolutionCandidate@431 }
+    <name not found> = ArrayList@10239[1] { ResolutionCandidate@7595 }
+    <name not found> = ArrayList@10240[1] { ResolutionCandidate@7643 }
+    <name not found> = ArrayList@10241[1] { ResolutionCandidate@3077 }
+    <name not found> = ArrayList@10242[1] { ResolutionCandidate@3092 }
+    <name not found> = ArrayList@10243[1] { ResolutionCandidate@1625 }
+    <name not found> = ArrayList@10244[1] { ResolutionCandidate@812 }
+    <name not found> = ArrayList@10245[1] { ResolutionCandidate@6074 }
+    <name not found> = ArrayList@10246[1] { ResolutionCandidate@7493 }
+    <name not found> = ArrayList@10247[1] { ResolutionCandidate@2036 }
+    <name not found> = ArrayList@10248[1] { ResolutionCandidate@3893 }
+    <name not found> = ArrayList@10249[1] { ResolutionCandidate@3500 }
+    <name not found> = ArrayList@10250[1] { ResolutionCandidate@914 }
+    <name not found> = ArrayList@10251[1] { ResolutionCandidate@5417 }
+    <name not found> = ArrayList@10252[1] { ResolutionCandidate@6137 }
+    <name not found> = ArrayList@10253[1] { ResolutionCandidate@3680 }
+    <name not found> = ArrayList@10254[1] { ResolutionCandidate@3173 }
+    <name not found> = ArrayList@10255[1] { ResolutionCandidate@4169 }
+    <name not found> = ArrayList@10256[1] { ResolutionCandidate@1181 }
+    <name not found> = ArrayList@10257[1] { ResolutionCandidate@7370 }
+    <name not found> = ArrayList@10258[1] { ResolutionCandidate@6992 }
+    <name not found> = ArrayList@10259[1] { ResolutionCandidate@2267 }
+    <name not found> = ArrayList@10260[1] { ResolutionCandidate@3044 }
+    <name not found> = ArrayList@10261[1] { ResolutionCandidate@4454 }
+    <name not found> = ArrayList@10262[1] { ResolutionCandidate@1049 }
+    <name not found> = ArrayList@10263[1] { ResolutionCandidate@5126 }
+    <name not found> = ArrayList@10264[1] { ResolutionCandidate@4577 }
+    <name not found> = ArrayList@10265[1] { ResolutionCandidate@2135 }
+    <name not found> = ArrayList@10266[1] { ResolutionCandidate@3377 }
+    <name not found> = ArrayList@10267[1] { ResolutionCandidate@3032 }
+    <name not found> = ArrayList@10268[1] { ResolutionCandidate@755 }
+    <name not found> = ArrayList@10269[1] { ResolutionCandidate@5468 }
+    <name not found> = ArrayList@10270[1] { ResolutionCandidate@5066 }
+    <name not found> = ArrayList@10271[1] { ResolutionCandidate@3815 }
+    <name not found> = ArrayList@10272[1] { ResolutionCandidate@3833 }
+    <name not found> = ArrayList@10273[1] { ResolutionCandidate@4133 }
+    <name not found> = ArrayList@10274[1] { ResolutionCandidate@953 }
+    <name not found> = ArrayList@10275[1] { ResolutionCandidate@5150 }
+    <name not found> = ArrayList@10276[1] { ResolutionCandidate@7316 }
+    <name not found> = ArrayList@10277[1] { ResolutionCandidate@1661 }
+    <name not found> = ArrayList@10278[1] { ResolutionCandidate@2798 }
+    <name not found> = ArrayList@10279[1] { ResolutionCandidate@1973 }
+    <name not found> = ArrayList@10280[1] { ResolutionCandidate@731 }
+    <name not found> = ArrayList@10281[1] { ResolutionCandidate@5456 }
+    <name not found> = ArrayList@10282[1] { ResolutionCandidate@7601 }
+    <name not found> = ArrayList@10283[1] { ResolutionCandidate@3332 }
+    <name not found> = ArrayList@10284[1] { ResolutionCandidate@2705 }
+    <name not found> = ArrayList@10285[1] { ResolutionCandidate@2045 }
+    <name not found> = ArrayList@10286[1] { ResolutionCandidate@542 }
+    <name not found> = ArrayList@10287[1] { ResolutionCandidate@5105 }
+    <name not found> = ArrayList@10288[1] { ResolutionCandidate@6869 }
+    <name not found> = ArrayList@10289[1] { ResolutionCandidate@2555 }
+    <name not found> = ArrayList@10290[1] { ResolutionCandidate@3113 }
+    <name not found> = ArrayList@10291[1] { ResolutionCandidate@1658 }
+    <name not found> = ArrayList@10292[1] { ResolutionCandidate@806 }
+    <name not found> = ArrayList@10293[1] { ResolutionCandidate@6560 }
+    <name not found> = ArrayList@10294[1] { ResolutionCandidate@5630 }
+    <name not found> = ArrayList@10295[1] { ResolutionCandidate@3749 }
+    <name not found> = ArrayList@10296[1] { ResolutionCandidate@4448 }
+    <name not found> = ArrayList@10297[1] { ResolutionCandidate@2978 }
+    <name not found> = ArrayList@10298[1] { ResolutionCandidate@974 }
+    <name not found> = ArrayList@10299[1] { ResolutionCandidate@6596 }
+    <name not found> = ArrayList@10300[1] { ResolutionCandidate@7229 }
+    <name not found> = ArrayList@10301[1] { ResolutionCandidate@3002 }
+    <name not found> = ArrayList@10302[1] { ResolutionCandidate@2276 }
+    <name not found> = ArrayList@10303[1] { ResolutionCandidate@2510 }
+    <name not found> = ArrayList@10304[1] { ResolutionCandidate@1538 }
+    <name not found> = ArrayList@10305[1] { ResolutionCandidate@7502 }
+    <name not found> = ArrayList@10306[1] { ResolutionCandidate@6044 }
+    <name not found> = ArrayList@10307[1] { ResolutionCandidate@3602 }
+    <name not found> = ArrayList@10308[1] { ResolutionCandidate@4514 }
+    <name not found> = ArrayList@10309[1] { ResolutionCandidate@4115 }
+    <name not found> = ArrayList@10310[1] { ResolutionCandidate@1430 }
+    <name not found> = ArrayList@10311[1] { ResolutionCandidate@6785 }
+    <name not found> = ArrayList@10312[1] { ResolutionCandidate@6800 }
+    <name not found> = ArrayList@10313[1] { ResolutionCandidate@3290 }
+    <name not found> = ArrayList@10314[1] { ResolutionCandidate@3101 }
+    <name not found> = ArrayList@10315[1] { ResolutionCandidate@1619 }
+    <name not found> = ArrayList@10316[1] { ResolutionCandidate@926 }
+    <name not found> = ArrayList@10317[1] { ResolutionCandidate@5591 }
+    <name not found> = ArrayList@10318[1] { ResolutionCandidate@6845 }
+    <name not found> = ArrayList@10319[1] { ResolutionCandidate@3368 }
+    <name not found> = ArrayList@10320[1] { ResolutionCandidate@1670 }
+    <name not found> = ArrayList@10321[1] { ResolutionCandidate@4010 }
+    <name not found> = ArrayList@10322[1] { ResolutionCandidate@917 }
+    <name not found> = ArrayList@10323[1] { ResolutionCandidate@7265 }
+    <name not found> = ArrayList@10324[1] { ResolutionCandidate@5732 }
+    <name not found> = ArrayList@10325[1] { ResolutionCandidate@3710 }
+    <name not found> = ArrayList@10326[1] { ResolutionCandidate@2072 }
+    <name not found> = ArrayList@10327[1] { ResolutionCandidate@3326 }
+    <name not found> = ArrayList@10328[1] { ResolutionCandidate@410 }
+    <name not found> = ArrayList@10329[1] { ResolutionCandidate@7190 }
+    <name not found> = ArrayList@10330[1] { ResolutionCandidate@5918 }
+    <name not found> = ArrayList@10331[1] { ResolutionCandidate@2270 }
+    <name not found> = ArrayList@10332[1] { ResolutionCandidate@2834 }
+    <name not found> = ArrayList@10333[1] { ResolutionCandidate@4187 }
+    <name not found> = ArrayList@10334[1] { ResolutionCandidate@1001 }
+    <name not found> = ArrayList@10335[1] { ResolutionCandidate@6656 }
+    <name not found> = ArrayList@10336[1] { ResolutionCandidate@6623 }
+    <name not found> = ArrayList@10337[1] { ResolutionCandidate@2273 }
+    <name not found> = ArrayList@10338[1] { ResolutionCandidate@2429 }
+    <name not found> = ArrayList@10339[1] { ResolutionCandidate@4394 }
+    <name not found> = ArrayList@10340[1] { ResolutionCandidate@836 }
+    <name not found> = ArrayList@10341[1] { ResolutionCandidate@5936 }
+    <name not found> = ArrayList@10342[1] { ResolutionCandidate@7295 }
+    <name not found> = ArrayList@10343[1] { ResolutionCandidate@2759 }
+    <name not found> = ArrayList@10344[1] { ResolutionCandidate@3566 }
+    <name not found> = ArrayList@10345[1] { ResolutionCandidate@3941 }
+    <name not found> = ArrayList@10346[1] { ResolutionCandidate@809 }
+    <name not found> = ArrayList@10347[1] { ResolutionCandidate@7166 }
+    <name not found> = ArrayList@10348[1] { ResolutionCandidate@4796 }
+    <name not found> = ArrayList@10349[1] { ResolutionCandidate@4529 }
+    <name not found> = ArrayList@10350[1] { ResolutionCandidate@2168 }
+    <name not found> = ArrayList@10351[1] { ResolutionCandidate@1703 }
+    <name not found> = ArrayList@10352[1] { ResolutionCandidate@899 }
+    <name not found> = ArrayList@10353[1] { ResolutionCandidate@7727 }
+    <name not found> = ArrayList@10354[1] { ResolutionCandidate@7673 }
+    <name not found> = ArrayList@10355[1] { ResolutionCandidate@2732 }
+    <name not found> = ArrayList@10356[1] { ResolutionCandidate@3047 }
+    <name not found> = ArrayList@10357[1] { ResolutionCandidate@4340 }
+    <name not found> = ArrayList@10358[1] { ResolutionCandidate@404 }
+    <name not found> = ArrayList@10359[1] { ResolutionCandidate@7208 }
+    <name not found> = ArrayList@10360[1] { ResolutionCandidate@7538 }
+    <name not found> = ArrayList@10361[1] { ResolutionCandidate@3827 }
+    <name not found> = ArrayList@10362[1] { ResolutionCandidate@1889 }
+    <name not found> = ArrayList@10363[1] { ResolutionCandidate@1928 }
+    <name not found> = ArrayList@10364[1] { ResolutionCandidate@1256 }
+    <name not found> = ArrayList@10365[1] { ResolutionCandidate@6965 }
+    <name not found> = ArrayList@10366[1] { ResolutionCandidate@7148 }
+    <name not found> = ArrayList@10367[1] { ResolutionCandidate@2351 }
+    <name not found> = ArrayList@10368[1] { ResolutionCandidate@1655 }
+    <name not found> = ArrayList@10369[1] { ResolutionCandidate@2303 }
+    <name not found> = ArrayList@10370[1] { ResolutionCandidate@1280 }
+    <name not found> = ArrayList@10371[1] { ResolutionCandidate@5231 }
+    <name not found> = ArrayList@10372[1] { ResolutionCandidate@7388 }
+    <name not found> = ArrayList@10373[1] { ResolutionCandidate@4196 }
+    <name not found> = ArrayList@10374[1] { ResolutionCandidate@3467 }
+    <name not found> = ArrayList@10375[1] { ResolutionCandidate@3770 }
+    <name not found> = ArrayList@10376[1] { ResolutionCandidate@1052 }
+    <name not found> = ArrayList@10377[1] { ResolutionCandidate@5663 }
+    <name not found> = ArrayList@10378[1] { ResolutionCandidate@6083 }
+    <name not found> = ArrayList@10379[1] { ResolutionCandidate@2111 }
+    <name not found> = ArrayList@10380[1] { ResolutionCandidate@2249 }
+    <name not found> = ArrayList@10381[1] { ResolutionCandidate@3704 }
+    <name not found> = ArrayList@10382[1] { ResolutionCandidate@671 }
+    <name not found> = ArrayList@10383[1] { ResolutionCandidate@6749 }
+    <name not found> = ArrayList@10384[1] { ResolutionCandidate@7163 }
+    <name not found> = ArrayList@10385[1] { ResolutionCandidate@4445 }
+    <name not found> = ArrayList@10386[1] { ResolutionCandidate@2279 }
+    <name not found> = ArrayList@10387[1] { ResolutionCandidate@2984 }
+    <name not found> = ArrayList@10388[1] { ResolutionCandidate@887 }
+    <name not found> = ArrayList@10389[1] { ResolutionCandidate@7187 }
+    <name not found> = ArrayList@10390[1] { ResolutionCandidate@7376 }
+    <name not found> = ArrayList@10391[1] { ResolutionCandidate@1715 }
+    <name not found> = ArrayList@10392[1] { ResolutionCandidate@3110 }
+    <name not found> = ArrayList@10393[1] { ResolutionCandidate@2156 }
+    <name not found> = ArrayList@10394[1] { ResolutionCandidate@1415 }
+    <name not found> = ArrayList@10395[1] { ResolutionCandidate@5471 }
+    <name not found> = ArrayList@10396[1] { ResolutionCandidate@4748 }
+    <name not found> = ArrayList@10397[1] { ResolutionCandidate@2723 }
+    <name not found> = ArrayList@10398[1] { ResolutionCandidate@2777 }
+    <name not found> = ArrayList@10399[1] { ResolutionCandidate@4493 }
+    <name not found> = ArrayList@10400[1] { ResolutionCandidate@995 }
+    <name not found> = ArrayList@10401[1] { ResolutionCandidate@7280 }
+    <name not found> = ArrayList@10402[1] { ResolutionCandidate@6014 }
+    <name not found> = ArrayList@10403[1] { ResolutionCandidate@1739 }
+    <name not found> = ArrayList@10404[1] { ResolutionCandidate@4157 }
+    <name not found> = ArrayList@10405[1] { ResolutionCandidate@4094 }
+    <name not found> = ArrayList@10406[1] { ResolutionCandidate@1031 }
+    <name not found> = ArrayList@10407[1] { ResolutionCandidate@5216 }
+    <name not found> = ArrayList@10408[1] { ResolutionCandidate@7442 }
+    <name not found> = ArrayList@10409[1] { ResolutionCandidate@1586 }
+    <name not found> = ArrayList@10410[1] { ResolutionCandidate@4352 }
+    <name not found> = ArrayList@10411[1] { ResolutionCandidate@2084 }
+    <name not found> = ArrayList@10412[1] { ResolutionCandidate@905 }
+    <name not found> = ArrayList@10413[1] { ResolutionCandidate@6461 }
+    <name not found> = ArrayList@10414[1] { ResolutionCandidate@5048 }
+    <name not found> = ArrayList@10415[1] { ResolutionCandidate@3164 }
+    <name not found> = ArrayList@10416[1] { ResolutionCandidate@1712 }
+    <name not found> = ArrayList@10417[1] { ResolutionCandidate@2822 }
+    <name not found> = ArrayList@10418[1] { ResolutionCandidate@845 }
+    <name not found> = ArrayList@10419[1] { ResolutionCandidate@7400 }
+    <name not found> = ArrayList@10420[1] { ResolutionCandidate@5723 }
+    <name not found> = ArrayList@10421[1] { ResolutionCandidate@4301 }
+    <name not found> = ArrayList@10422[1] { ResolutionCandidate@1952 }
+    <name not found> = ArrayList@10423[1] { ResolutionCandidate@3719 }
+    <name not found> = ArrayList@10424[1] { ResolutionCandidate@1091 }
+    <name not found> = ArrayList@10425[1] { ResolutionCandidate@7064 }
+    <name not found> = ArrayList@10426[1] { ResolutionCandidate@4679 }
+    <name not found> = ArrayList@10427[1] { ResolutionCandidate@1730 }
+    <name not found> = ArrayList@10428[1] { ResolutionCandidate@3986 }
+    <name not found> = ArrayList@10429[1] { ResolutionCandidate@1571 }
+    <name not found> = ArrayList@10430[1] { ResolutionCandidate@1478 }
+    <name not found> = ArrayList@10431[1] { ResolutionCandidate@5582 }
+    <name not found> = ArrayList@10432[1] { ResolutionCandidate@7577 }
+    <name not found> = ArrayList@10433[1] { ResolutionCandidate@1748 }
+    <name not found> = ArrayList@10434[1] { ResolutionCandidate@3932 }
+    <name not found> = ArrayList@10435[1] { ResolutionCandidate@2534 }
+    <name not found> = ArrayList@10436[1] { ResolutionCandidate@1367 }
+    <name not found> = ArrayList@10437[1] { ResolutionCandidate@6128 }
+    <name not found> = ArrayList@10438[1] { ResolutionCandidate@7298 }
+    <name not found> = ArrayList@10439[1] { ResolutionCandidate@1922 }
+    <name not found> = ArrayList@10440[1] { ResolutionCandidate@2357 }
+    <name not found> = ArrayList@10441[1] { ResolutionCandidate@3248 }
+    <name not found> = ArrayList@10442[1] { ResolutionCandidate@842 }
+    <name not found> = ArrayList@10443[1] { ResolutionCandidate@6134 }
+    <name not found> = ArrayList@10444[1] { ResolutionCandidate@7196 }
+    <name not found> = ArrayList@10445[1] { ResolutionCandidate@3239 }
+    <name not found> = ArrayList@10446[1] { ResolutionCandidate@2870 }
+    <name not found> = ArrayList@10447[1] { ResolutionCandidate@4319 }
+    <name not found> = ArrayList@10448[1] { ResolutionCandidate@503 }
+    <name not found> = ArrayList@10449[1] { ResolutionCandidate@7445 }
+    <name not found> = ArrayList@10450[1] { ResolutionCandidate@5300 }
+    <name not found> = ArrayList@10451[1] { ResolutionCandidate@6512 }
+    <name not found> = ArrayList@10452[1] { ResolutionCandidate@2483 }
+    <name not found> = ArrayList@10453[1] { ResolutionCandidate@3542 }
+    <name not found> = ArrayList@10454[1] { ResolutionCandidate@3575 }
+    <name not found> = ArrayList@10455[1] { ResolutionCandidate@488 }
+    <name not found> = ArrayList@10456[1] { ResolutionCandidate@4799 }
+    <name not found> = ArrayList@10457[1] { ResolutionCandidate@6794 }
+    <name not found> = ArrayList@10458[1] { ResolutionCandidate@2627 }
+    <name not found> = ArrayList@10459[1] { ResolutionCandidate@2657 }
+    <name not found> = ArrayList@10460[1] { ResolutionCandidate@2648 }
+    <name not found> = ArrayList@10461[1] { ResolutionCandidate@788 }
+    <name not found> = ArrayList@10462[1] { ResolutionCandidate@4952 }
+    <name not found> = ArrayList@10463[1] { ResolutionCandidate@7253 }
+    <name not found> = ArrayList@10464[1] { ResolutionCandidate@1811 }
+    <name not found> = ArrayList@10465[1] { ResolutionCandidate@4100 }
+    <name not found> = ArrayList@10466[1] { ResolutionCandidate@2465 }
+    <name not found> = ArrayList@10467[1] { ResolutionCandidate@1523 }
+    <name not found> = ArrayList@10468[1] { ResolutionCandidate@5657 }
+    <name not found> = ArrayList@10469[1] { ResolutionCandidate@4811 }
+    <name not found> = ArrayList@10470[1] { ResolutionCandidate@2876 }
+    <name not found> = ArrayList@10471[1] { ResolutionCandidate@2066 }
+    <name not found> = ArrayList@10472[1] { ResolutionCandidate@3806 }
+    <name not found> = ArrayList@10473[1] { ResolutionCandidate@944 }
+    <name not found> = ArrayList@10474[1] { ResolutionCandidate@5810 }
+    <name not found> = ArrayList@10475[1] { ResolutionCandidate@4772 }
+    <name not found> = ArrayList@10476[1] { ResolutionCandidate@4379 }
+    <name not found> = ArrayList@10477[1] { ResolutionCandidate@3335 }
+    <name not found> = ArrayList@10478[1] { ResolutionCandidate@4307 }
+    <name not found> = ArrayList@10479[1] { ResolutionCandidate@1364 }
+    <name not found> = ArrayList@10480[1] { ResolutionCandidate@4598 }
+    <name not found> = ArrayList@10481[1] { ResolutionCandidate@6875 }
+    <name not found> = ArrayList@10482[1] { ResolutionCandidate@2525 }
+    <name not found> = ArrayList@10483[1] { ResolutionCandidate@4241 }
+    <name not found> = ArrayList@10484[1] { ResolutionCandidate@1985 }
+    <name not found> = ArrayList@10485[1] { ResolutionCandidate@1112 }
+    <name not found> = ArrayList@10486[1] { ResolutionCandidate@5693 }
+    <name not found> = ArrayList@10487[1] { ResolutionCandidate@6233 }
+    <name not found> = ArrayList@10488[1] { ResolutionCandidate@3065 }
+    <name not found> = ArrayList@10489[1] { ResolutionCandidate@3503 }
+    <name not found> = ArrayList@10490[1] { ResolutionCandidate@2087 }
+    <name not found> = ArrayList@10491[1] { ResolutionCandidate@881 }
+    <name not found> = ArrayList@10492[1] { ResolutionCandidate@5666 }
+    <name not found> = ArrayList@10493[1] { ResolutionCandidate@4790 }
+    <name not found> = ArrayList@10494[1] { ResolutionCandidate@3887 }
+    <name not found> = ArrayList@10495[1] { ResolutionCandidate@1700 }
+    <name not found> = ArrayList@10496[1] { ResolutionCandidate@3938 }
+    <name not found> = ArrayList@10497[1] { ResolutionCandidate@1175 }
+    <name not found> = ArrayList@10498[1] { ResolutionCandidate@7571 }
+    <name not found> = ArrayList@10499[1] { ResolutionCandidate@6893 }
+    <name not found> = ArrayList@10500[1] { ResolutionCandidate@3890 }
+    <name not found> = ArrayList@10501[1] { ResolutionCandidate@2408 }
+    <name not found> = ArrayList@10502[1] { ResolutionCandidate@3689 }
+    <name not found> = ArrayList@10503[1] { ResolutionCandidate@695 }
+    <name not found> = ArrayList@10504[1] { ResolutionCandidate@4550 }
+    <name not found> = ArrayList@10505[1] { ResolutionCandidate@4655 }
+    <name not found> = ArrayList@10506[1] { ResolutionCandidate@2186 }
+    <name not found> = ArrayList@10507[1] { ResolutionCandidate@3203 }
+    <name not found> = ArrayList@10508[1] { ResolutionCandidate@4148 }
+    <name not found> = ArrayList@10509[1] { ResolutionCandidate@1553 }
+    <name not found> = ArrayList@10510[1] { ResolutionCandidate@5402 }
+    <name not found> = ArrayList@10511[1] { ResolutionCandidate@6161 }
+    <name not found> = ArrayList@10512[1] { ResolutionCandidate@2291 }
+    <name not found> = ArrayList@10513[1] { ResolutionCandidate@3422 }
+    <name not found> = ArrayList@10514[1] { ResolutionCandidate@4517 }
+    <name not found> = ArrayList@10515[1] { ResolutionCandidate@920 }
+    <name not found> = ArrayList@10516[1] { ResolutionCandidate@7139 }
+    <name not found> = ArrayList@10517[1] { ResolutionCandidate@4571 }
+    <name not found> = ArrayList@10518[1] { ResolutionCandidate@2471 }
+    <name not found> = ArrayList@10519[1] { ResolutionCandidate@3059 }
+    <name not found> = ArrayList@10520[1] { ResolutionCandidate@1931 }
+    <name not found> = ArrayList@10521[1] { ResolutionCandidate@1082 }
+    <name not found> = ArrayList@10522[1] { ResolutionCandidate@5645 }
+    <name not found> = ArrayList@10523[1] { ResolutionCandidate@6107 }
+    <name not found> = ArrayList@10524[1] { ResolutionCandidate@2924 }
+    <name not found> = ArrayList@10525[1] { ResolutionCandidate@4265 }
+    <name not found> = ArrayList@10526[1] { ResolutionCandidate@2702 }
+    <name not found> = ArrayList@10527[1] { ResolutionCandidate@521 }
+    <name not found> = ArrayList@10528[1] { ResolutionCandidate@6716 }
+    <name not found> = ArrayList@10529[1] { ResolutionCandidate@5258 }
+    <name not found> = ArrayList@10530[1] { ResolutionCandidate@3071 }
+    <name not found> = ArrayList@10531[1] { ResolutionCandidate@3707 }
+    <name not found> = ArrayList@10532[1] { ResolutionCandidate@2828 }
+    <name not found> = ArrayList@10533[1] { ResolutionCandidate@758 }
+    <name not found> = ArrayList@10534[1] { ResolutionCandidate@6173 }
+    <name not found> = ArrayList@10535[1] { ResolutionCandidate@5561 }
+    <name not found> = ArrayList@10536[1] { ResolutionCandidate@4184 }
+    <name not found> = ArrayList@10537[1] { ResolutionCandidate@3647 }
+    <name not found> = ArrayList@10538[1] { ResolutionCandidate@3209 }
+    <name not found> = ArrayList@10539[1] { ResolutionCandidate@473 }
+    <name not found> = ArrayList@10540[1] { ResolutionCandidate@4673 }
+    <name not found> = ArrayList@10541[1] { ResolutionCandidate@6080 }
+    <name not found> = ArrayList@10542[1] { ResolutionCandidate@2696 }
+    <name not found> = ArrayList@10543[1] { ResolutionCandidate@3746 }
+    <name not found> = ArrayList@10544[1] { ResolutionCandidate@2015 }
+    <name not found> = ArrayList@10545[1] { ResolutionCandidate@500 }
+    <name not found> = ArrayList@10546[1] { ResolutionCandidate@7688 }
+    <name not found> = ArrayList@10547[1] { ResolutionCandidate@6302 }
+    <name not found> = ArrayList@10548[1] { ResolutionCandidate@2306 }
+    <name not found> = ArrayList@10549[1] { ResolutionCandidate@3182 }
+    <name not found> = ArrayList@10550[1] { ResolutionCandidate@4001 }
+    <name not found> = ArrayList@10551[1] { ResolutionCandidate@1127 }
+    <name not found> = ArrayList@10552[1] { ResolutionCandidate@4718 }
+    <name not found> = ArrayList@10553[1] { ResolutionCandidate@6497 }
+    <name not found> = ArrayList@10554[1] { ResolutionCandidate@3146 }
+    <name not found> = ArrayList@10555[1] { ResolutionCandidate@3812 }
+    <name not found> = ArrayList@10556[1] { ResolutionCandidate@3299 }
+    <name not found> = ArrayList@10557[1] { ResolutionCandidate@422 }
+    <name not found> = ArrayList@10558[1] { ResolutionCandidate@6419 }
+    <name not found> = ArrayList@10559[1] { ResolutionCandidate@5294 }
+    <name not found> = ArrayList@10560[1] { ResolutionCandidate@1955 }
+    <name not found> = ArrayList@10561[1] { ResolutionCandidate@4397 }
+    <name not found> = ArrayList@10562[1] { ResolutionCandidate@3398 }
+    <name not found> = ArrayList@10563[1] { ResolutionCandidate@653 }
+    <name not found> = ArrayList@10564[1] { ResolutionCandidate@7487 }
+    <name not found> = ArrayList@10565[1] { ResolutionCandidate@5882 }
+    <name not found> = ArrayList@10566[1] { ResolutionCandidate@4361 }
+    <name not found> = ArrayList@10567[1] { ResolutionCandidate@3737 }
+    <name not found> = ArrayList@10568[1] { ResolutionCandidate@2294 }
+    <name not found> = ArrayList@10569[1] { ResolutionCandidate@1397 }
+    <name not found> = ArrayList@10570[1] { ResolutionCandidate@7334 }
+    <name not found> = ArrayList@10571[1] { ResolutionCandidate@6926 }
+    <name not found> = ArrayList@10572[1] { ResolutionCandidate@2057 }
+    <name not found> = ArrayList@10573[1] { ResolutionCandidate@4061 }
+    <name not found> = ArrayList@10574[1] { ResolutionCandidate@2222 }
+    <name not found> = ArrayList@10575[1] { ResolutionCandidate@803 }
+    <name not found> = ArrayList@10576[1] { ResolutionCandidate@4820 }
+    <name not found> = ArrayList@10577[1] { ResolutionCandidate@6359 }
+    <name not found> = ArrayList@10578[1] { ResolutionCandidate@2414 }
+    <name not found> = ArrayList@10579[1] { ResolutionCandidate@3800 }
+    <name not found> = ArrayList@10580[1] { ResolutionCandidate@2864 }
+    <name not found> = ArrayList@10581[1] { ResolutionCandidate@1520 }
+    <name not found> = ArrayList@10582[1] { ResolutionCandidate@5315 }
+    <name not found> = ArrayList@10583[1] { ResolutionCandidate@7349 }
+    <name not found> = ArrayList@10584[1] { ResolutionCandidate@1805 }
+    <name not found> = ArrayList@10585[1] { ResolutionCandidate@4238 }
+    <name not found> = ArrayList@10586[1] { ResolutionCandidate@4220 }
+    <name not found> = ArrayList@10587[1] { ResolutionCandidate@902 }
+    <name not found> = ArrayList@10588[1] { ResolutionCandidate@6479 }
+    <name not found> = ArrayList@10589[1] { ResolutionCandidate@7430 }
+    <name not found> = ArrayList@10590[1] { ResolutionCandidate@4235 }
+    <name not found> = ArrayList@10591[1] { ResolutionCandidate@1568 }
+    <name not found> = ArrayList@10592[1] { ResolutionCandidate@3614 }
+    <name not found> = ArrayList@10593[1] { ResolutionCandidate@1427 }
+    <name not found> = ArrayList@10594[1] { ResolutionCandidate@5687 }
+    <name not found> = ArrayList@10595[1] { ResolutionCandidate@5519 }
+    <name not found> = ArrayList@10596[1] { ResolutionCandidate@2123 }
+    <name not found> = ArrayList@10597[1] { ResolutionCandidate@2096 }
+    <name not found> = ArrayList@10598[1] { ResolutionCandidate@2297 }
+    <name not found> = ArrayList@10599[1] { ResolutionCandidate@446 }
+    <name not found> = ArrayList@10600[1] { ResolutionCandidate@7448 }
+    <name not found> = ArrayList@10601[1] { ResolutionCandidate@7067 }
+    <name not found> = ArrayList@10602[1] { ResolutionCandidate@3620 }
+    <name not found> = ArrayList@10603[1] { ResolutionCandidate@4460 }
+    <name not found> = ArrayList@10604[1] { ResolutionCandidate@1934 }
+    <name not found> = ArrayList@10605[1] { ResolutionCandidate@1463 }
+    <name not found> = ArrayList@10606[1] { ResolutionCandidate@6428 }
+    <name not found> = ArrayList@10607[1] { ResolutionCandidate@4592 }
+    <name not found> = ArrayList@10608[1] { ResolutionCandidate@3617 }
+    <name not found> = ArrayList@10609[1] { ResolutionCandidate@2990 }
+    <name not found> = ArrayList@10610[1] { ResolutionCandidate@1598 }
+    <name not found> = ArrayList@10611[1] { ResolutionCandidate@1040 }
+    <name not found> = ArrayList@10612[1] { ResolutionCandidate@5870 }
+    <name not found> = ArrayList@10613[1] { ResolutionCandidate@5987 }
+    <name not found> = ArrayList@10614[1] { ResolutionCandidate@4475 }
+    <name not found> = ArrayList@10615[1] { ResolutionCandidate@3878 }
+    <name not found> = ArrayList@10616[1] { ResolutionCandidate@2543 }
+    <name not found> = ArrayList@10617[1] { ResolutionCandidate@746 }
+    <name not found> = ArrayList@10618[1] { ResolutionCandidate@5192 }
+    <name not found> = ArrayList@10619[1] { ResolutionCandidate@4721 }
+    <name not found> = ArrayList@10620[1] { ResolutionCandidate@3413 }
+    <name not found> = ArrayList@10621[1] { ResolutionCandidate@1646 }
+    <name not found> = ArrayList@10622[1] { ResolutionCandidate@2981 }
+    <name not found> = ArrayList@10623[1] { ResolutionCandidate@1196 }
+    <name not found> = ArrayList@10624[1] { ResolutionCandidate@4670 }
+    <name not found> = ArrayList@10625[1] { ResolutionCandidate@5801 }
+    <name not found> = ArrayList@10626[1] { ResolutionCandidate@4406 }
+    <name not found> = ArrayList@10627[1] { ResolutionCandidate@3404 }
+    <name not found> = ArrayList@10628[1] { ResolutionCandidate@2585 }
+    <name not found> = ArrayList@10629[1] { ResolutionCandidate@986 }
+    <name not found> = ArrayList@10630[1] { ResolutionCandidate@6041 }
+    <name not found> = ArrayList@10631[1] { ResolutionCandidate@5816 }
+    <name not found> = ArrayList@10632[1] { ResolutionCandidate@4172 }
+    <name not found> = ArrayList@10633[1] { ResolutionCandidate@3593 }
+    <name not found> = ArrayList@10634[1] { ResolutionCandidate@2330 }
+    <name not found> = ArrayList@10635[1] { ResolutionCandidate@443 }
+    <name not found> = ArrayList@10636[1] { ResolutionCandidate@7292 }
+    <name not found> = ArrayList@10637[1] { ResolutionCandidate@6827 }
+    <name not found> = ArrayList@10638[1] { ResolutionCandidate@2459 }
+    <name not found> = ArrayList@10639[1] { ResolutionCandidate@4034 }
+    <name not found> = ArrayList@10640[1] { ResolutionCandidate@4286 }
+    <name not found> = ArrayList@10641[1] { ResolutionCandidate@1379 }
+    <name not found> = ArrayList@10642[1] { ResolutionCandidate@5072 }
+    <name not found> = ArrayList@10643[1] { ResolutionCandidate@7034 }
+    <name not found> = ArrayList@10644[1] { ResolutionCandidate@2645 }
+    <name not found> = ArrayList@10645[1] { ResolutionCandidate@2726 }
+    <name not found> = ArrayList@10646[1] { ResolutionCandidate@2765 }
+    <name not found> = ArrayList@10647[1] { ResolutionCandidate@374 }
+    <name not found> = ArrayList@10648[1] { ResolutionCandidate@6743 }
+    <name not found> = ArrayList@10649[1] { ResolutionCandidate@6026 }
+    <name not found> = ArrayList@10650[1] { ResolutionCandidate@2942 }
+    <name not found> = ArrayList@10651[1] { ResolutionCandidate@1682 }
+    <name not found> = ArrayList@10652[1] { ResolutionCandidate@3221 }
+    <name not found> = ArrayList@10653[1] { ResolutionCandidate@650 }
+    <name not found> = ArrayList@10654[1] { ResolutionCandidate@6815 }
+    <name not found> = ArrayList@10655[1] { ResolutionCandidate@5180 }
+    <name not found> = ArrayList@10656[1] { ResolutionCandidate@3149 }
+    <name not found> = ArrayList@10657[1] { ResolutionCandidate@3734 }
+    <name not found> = ArrayList@10658[1] { ResolutionCandidate@3836 }
+    <name not found> = ArrayList@10659[1] { ResolutionCandidate@1157 }
+    <name not found> = ArrayList@10660[1] { ResolutionCandidate@6899 }
+    <name not found> = ArrayList@10661[1] { ResolutionCandidate@5525 }
+    <name not found> = ArrayList@10662[1] { ResolutionCandidate@2159 }
+    <name not found> = ArrayList@10663[1] { ResolutionCandidate@3035 }
+    <name not found> = ArrayList@10664[1] { ResolutionCandidate@3428 }
+    <name not found> = ArrayList@10665[1] { ResolutionCandidate@1400 }
+    <name not found> = ArrayList@10666[1] { ResolutionCandidate@4667 }
+    <name not found> = ArrayList@10667[1] { ResolutionCandidate@7001 }
+    <name not found> = ArrayList@10668[1] { ResolutionCandidate@3653 }
+    <name not found> = ArrayList@10669[1] { ResolutionCandidate@3512 }
+    <name not found> = ArrayList@10670[1] { ResolutionCandidate@4310 }
+    <name not found> = ArrayList@10671[1] { ResolutionCandidate@413 }
+    <name not found> = ArrayList@10672[1] { ResolutionCandidate@4745 }
+    <name not found> = ArrayList@10673[1] { ResolutionCandidate@6329 }
+    <name not found> = ArrayList@10674[1] { ResolutionCandidate@2699 }
+    <name not found> = ArrayList@10675[1] { ResolutionCandidate@2246 }
+    <name not found> = ArrayList@10676[1] { ResolutionCandidate@3632 }
+    <name not found> = ArrayList@10677[1] { ResolutionCandidate@677 }
+    <name not found> = ArrayList@10678[1] { ResolutionCandidate@5423 }
+    <name not found> = ArrayList@10679[1] { ResolutionCandidate@6170 }
+    <name not found> = ArrayList@10680[1] { ResolutionCandidate@3509 }
+    <name not found> = ArrayList@10681[1] { ResolutionCandidate@2816 }
+    <name not found> = ArrayList@10682[1] { ResolutionCandidate@3929 }
+    <name not found> = ArrayList@10683[1] { ResolutionCandidate@1019 }
+    <name not found> = ArrayList@10684[1] { ResolutionCandidate@6101 }
+    <name not found> = ArrayList@10685[1] { ResolutionCandidate@4883 }
+    <name not found> = ArrayList@10686[1] { ResolutionCandidate@4214 }
+    <name not found> = ArrayList@10687[1] { ResolutionCandidate@4508 }
+    <name not found> = ArrayList@10688[1] { ResolutionCandidate@1562 }
+    <name not found> = ArrayList@10689[1] { ResolutionCandidate@1535 }
+    <name not found> = ArrayList@10690[1] { ResolutionCandidate@5741 }
+    <name not found> = ArrayList@10691[1] { ResolutionCandidate@5813 }
+    <name not found> = ArrayList@10692[1] { ResolutionCandidate@4127 }
+    <name not found> = ArrayList@10693[1] { ResolutionCandidate@1706 }
+    <name not found> = ArrayList@10694[1] { ResolutionCandidate@3470 }
+    <name not found> = ArrayList@10695[1] { ResolutionCandidate@956 }
+    <name not found> = ArrayList@10696[1] { ResolutionCandidate@7100 }
+    <name not found> = ArrayList@10697[1] { ResolutionCandidate@4739 }
+    <name not found> = ArrayList@10698[1] { ResolutionCandidate@3383 }
+    <name not found> = ArrayList@10699[1] { ResolutionCandidate@2567 }
+    <name not found> = ArrayList@10700[1] { ResolutionCandidate@3557 }
+    <name not found> = ArrayList@10701[1] { ResolutionCandidate@1118 }
+    <name not found> = ArrayList@10702[1] { ResolutionCandidate@7724 }
+    <name not found> = ArrayList@10703[1] { ResolutionCandidate@7352 }
+    <name not found> = ArrayList@10704[1] { ResolutionCandidate@3434 }
+    <name not found> = ArrayList@10705[1] { ResolutionCandidate@2321 }
+    <name not found> = ArrayList@10706[1] { ResolutionCandidate@2531 }
+    <name not found> = ArrayList@10707[1] { ResolutionCandidate@632 }
+    <name not found> = ArrayList@10708[1] { ResolutionCandidate@5351 }
+    <name not found> = ArrayList@10709[1] { ResolutionCandidate@6059 }
+    <name not found> = ArrayList@10710[1] { ResolutionCandidate@5141 }
+    <name not found> = ArrayList@10711[1] { ResolutionCandidate@2564 }
+    <name not found> = ArrayList@10712[1] { ResolutionCandidate@1856 }
+    <name not found> = ArrayList@10713[1] { ResolutionCandidate@1823 }
+    <name not found> = ArrayList@10714[1] { ResolutionCandidate@773 }
+    <name not found> = ArrayList@10715[1] { ResolutionCandidate@5453 }
+    <name not found> = ArrayList@10716[1] { ResolutionCandidate@5384 }
+    <name not found> = ArrayList@10717[1] { ResolutionCandidate@2591 }
+    <name not found> = ArrayList@10718[1] { ResolutionCandidate@3320 }
+    <name not found> = ArrayList@10719[1] { ResolutionCandidate@3143 }
+    <name not found> = ArrayList@10720[1] { ResolutionCandidate@1109 }
+    <name not found> = ArrayList@10721[1] { ResolutionCandidate@4865 }
+    <name not found> = ArrayList@10722[1] { ResolutionCandidate@4637 }
+    <name not found> = ArrayList@10723[1] { ResolutionCandidate@2885 }
+    <name not found> = ArrayList@10724[1] { ResolutionCandidate@3062 }
+    <name not found> = ArrayList@10725[1] { ResolutionCandidate@4415 }
+    <name not found> = ArrayList@10726[1] { ResolutionCandidate@710 }
+    <name not found> = ArrayList@10727[1] { ResolutionCandidate@4913 }
+    <name not found> = ArrayList@10728[1] { ResolutionCandidate@7115 }
+    <name not found> = ArrayList@10729[1] { ResolutionCandidate@3302 }
+    <name not found> = ArrayList@10730[1] { ResolutionCandidate@2489 }
+    <name not found> = ArrayList@10731[1] { ResolutionCandidate@2171 }
+    <name not found> = ArrayList@10732[1] { ResolutionCandidate@827 }
+    <name not found> = ArrayList@10733[1] { ResolutionCandidate@5588 }
+    <name not found> = ArrayList@10734[1] { ResolutionCandidate@6446 }
+    <name not found> = ArrayList@10735[1] { ResolutionCandidate@4370 }
+    <name not found> = ArrayList@10736[1] { ResolutionCandidate@4403 }
+    <name not found> = ArrayList@10737[1] { ResolutionCandidate@3026 }
+    <name not found> = ArrayList@10738[1] { ResolutionCandidate@452 }
+    <name not found> = ArrayList@10739[1] { ResolutionCandidate@4907 }
+    <name not found> = ArrayList@10740[1] { ResolutionCandidate@5447 }
+    <name not found> = ArrayList@10741[1] { ResolutionCandidate@2381 }
+    <name not found> = ArrayList@10742[1] { ResolutionCandidate@2108 }
+    <name not found> = ArrayList@10743[1] { ResolutionCandidate@1820 }
+    <name not found> = ArrayList@10744[1] { ResolutionCandidate@548 }
+    <name not found> = ArrayList@10745[1] { ResolutionCandidate@6662 }
+    <name not found> = ArrayList@10746[1] { ResolutionCandidate@5570 }
+    <name not found> = ArrayList@10747[1] { ResolutionCandidate@1595 }
+    <name not found> = ArrayList@10748[1] { ResolutionCandidate@4382 }
+    <name not found> = ArrayList@10749[1] { ResolutionCandidate@4223 }
+    <name not found> = ArrayList@10750[1] { ResolutionCandidate@839 }
+    <name not found> = ArrayList@10751[1] { ResolutionCandidate@4601 }
+    <name not found> = ArrayList@10752[1] { ResolutionCandidate@5624 }
+    <name not found> = ArrayList@10753[1] { ResolutionCandidate@2579 }
+    <name not found> = ArrayList@10754[1] { ResolutionCandidate@2561 }
+    <name not found> = ArrayList@10755[1] { ResolutionCandidate@863 }
+    <name not found> = ArrayList@10756[1] { ResolutionCandidate@7130 }
+    <name not found> = ArrayList@10757[1] { ResolutionCandidate@7646 }
+    <name not found> = ArrayList@10758[1] { ResolutionCandidate@7547 }
+    <name not found> = ArrayList@10759[1] { ResolutionCandidate@6890 }
+    <name not found> = ArrayList@10760[1] { ResolutionCandidate@5717 }
+    <name not found> = ArrayList@10761[1] { ResolutionCandidate@2966 }
+    <name not found> = ArrayList@10762[1] { ResolutionCandidate@2162 }
+    <name not found> = ArrayList@10763[1] { ResolutionCandidate@4484 }
+    <name not found> = ArrayList@10764[1] { ResolutionCandidate@1319 }
+    <name not found> = ArrayList@10765[1] { ResolutionCandidate@6197 }
+    <name not found> = ArrayList@10766[1] { ResolutionCandidate@7169 }
+    <name not found> = ArrayList@10767[1] { ResolutionCandidate@2399 }
+    <name not found> = ArrayList@10768[1] { ResolutionCandidate@3344 }
+    <name not found> = ArrayList@10769[1] { ResolutionCandidate@2888 }
+    <name not found> = ArrayList@10770[1] { ResolutionCandidate@629 }
+    <name not found> = ArrayList@10771[1] { ResolutionCandidate@6464 }
+    <name not found> = ArrayList@10772[1] { ResolutionCandidate@4919 }
+    <name not found> = ArrayList@10773[1] { ResolutionCandidate@3278 }
+    <name not found> = ArrayList@10774[1] { ResolutionCandidate@1868 }
+    <name not found> = ArrayList@10775[1] { ResolutionCandidate@2675 }
+    <name not found> = ArrayList@10776[1] { ResolutionCandidate@1382 }
+    <name not found> = ArrayList@10777[1] { ResolutionCandidate@6938 }
+    <name not found> = ArrayList@10778[1] { ResolutionCandidate@5621 }
+    <name not found> = ArrayList@10779[1] { ResolutionCandidate@2492 }
+    <name not found> = ArrayList@10780[1] { ResolutionCandidate@1904 }
+    <name not found> = ArrayList@10781[1] { ResolutionCandidate@359 }
+    <name not found> = ArrayList@10782[1] { ResolutionCandidate@5153 }
+    <name not found> = ArrayList@10783[1] { ResolutionCandidate@4973 }
+    <name not found> = ArrayList@10784[1] { ResolutionCandidate@5264 }
+    <name not found> = ArrayList@10785[1] { ResolutionCandidate@4622 }
+    <name not found> = ArrayList@10786[1] { ResolutionCandidate@7109 }
+    <name not found> = ArrayList@10787[1] { ResolutionCandidate@1982 }
+    <name not found> = ArrayList@10788[1] { ResolutionCandidate@2039 }
+    <name not found> = ArrayList@10789[1] { ResolutionCandidate@512 }
+    <name not found> = ArrayList@10790[1] { ResolutionCandidate@6089 }
+    <name not found> = ArrayList@10791[1] { ResolutionCandidate@5363 }
+    <name not found> = ArrayList@10792[1] { ResolutionCandidate@7415 }
+    <name not found> = ArrayList@10793[1] { ResolutionCandidate@4874 }
+    <name not found> = ArrayList@10794[1] { ResolutionCandidate@5660 }
+    <name not found> = ArrayList@10795[1] { ResolutionCandidate@2882 }
+    <name not found> = ArrayList@10796[1] { ResolutionCandidate@1949 }
+    <name not found> = ArrayList@10797[1] { ResolutionCandidate@992 }
+    <name not found> = ArrayList@10798[1] { ResolutionCandidate@6779 }
+    <name not found> = ArrayList@10799[1] { ResolutionCandidate@7526 }
+    <name not found> = ArrayList@10800[1] { ResolutionCandidate@6689 }
+    <name not found> = ArrayList@10801[1] { ResolutionCandidate@6593 }
+    <name not found> = ArrayList@10802[1] { ResolutionCandidate@5414 }
+    <name not found> = ArrayList@10803[1] { ResolutionCandidate@3611 }
+    <name not found> = ArrayList@10804[1] { ResolutionCandidate@4283 }
+    <name not found> = ArrayList@10805[1] { ResolutionCandidate@1637 }
+    <name not found> = ArrayList@10806[1] { ResolutionCandidate@1151 }
+    <name not found> = ArrayList@10807[1] { ResolutionCandidate@7157 }
+    <name not found> = ArrayList@10808[1] { ResolutionCandidate@6215 }
+    <name not found> = ArrayList@10809[1] { ResolutionCandidate@5822 }
+    <name not found> = ArrayList@10810[1] { ResolutionCandidate@3176 }
+    <name not found> = ArrayList@10811[1] { ResolutionCandidate@4496 }
+    <name not found> = ArrayList@10812[1] { ResolutionCandidate@2138 }
+    <name not found> = ArrayList@10813[1] { ResolutionCandidate@1403 }
+    <name not found> = ArrayList@10814[1] { ResolutionCandidate@6335 }
+    <name not found> = ArrayList@10815[1] { ResolutionCandidate@4961 }
+    <name not found> = ArrayList@10816[1] { ResolutionCandidate@7481 }
+    <name not found> = ArrayList@10817[1] { ResolutionCandidate@3023 }
+    <name not found> = ArrayList@10818[1] { ResolutionCandidate@3218 }
+    <name not found> = ArrayList@10819[1] { ResolutionCandidate@689 }
+    <name not found> = ArrayList@10820[1] { ResolutionCandidate@7055 }
+    <name not found> = ArrayList@10821[1] { ResolutionCandidate@6542 }
+    <name not found> = ArrayList@10822[1] { ResolutionCandidate@6977 }
+    <name not found> = ArrayList@10823[1] { ResolutionCandidate@7124 }
+    <name not found> = ArrayList@10824[1] { ResolutionCandidate@6563 }
+    <name not found> = ArrayList@10825[1] { ResolutionCandidate@3752 }
+    <name not found> = ArrayList@10826[1] { ResolutionCandidate@3824 }
+    <name not found> = ArrayList@10827[1] { ResolutionCandidate@3017 }
+    <name not found> = ArrayList@10828[1] { ResolutionCandidate@743 }
+    <name not found> = ArrayList@10829[1] { ResolutionCandidate@6809 }
+    <name not found> = ArrayList@10830[1] { ResolutionCandidate@5600 }
+    <name not found> = ArrayList@10831[1] { ResolutionCandidate@4289 }
+    <name not found> = ArrayList@10832[1] { ResolutionCandidate@2447 }
+    <name not found> = ArrayList@10833[1] { ResolutionCandidate@2846 }
+    <name not found> = ArrayList@10834[1] { ResolutionCandidate@1166 }
+    <name not found> = ArrayList@10835[1] { ResolutionCandidate@6020 }
+    <name not found> = ArrayList@10836[1] { ResolutionCandidate@4787 }
+    <name not found> = ArrayList@10837[1] { ResolutionCandidate@1691 }
+    <name not found> = ArrayList@10838[1] { ResolutionCandidate@3104 }
+    <name not found> = ArrayList@10839[1] { ResolutionCandidate@2927 }
+    <name not found> = ArrayList@10840[1] { ResolutionCandidate@434 }
+    <name not found> = ArrayList@10841[1] { ResolutionCandidate@6641 }
+    <name not found> = ArrayList@10842[1] { ResolutionCandidate@6539 }
+    <name not found> = ArrayList@10843[1] { ResolutionCandidate@3518 }
+    <name not found> = ArrayList@10844[1] { ResolutionCandidate@3194 }
+    <name not found> = ArrayList@10845[1] { ResolutionCandidate@389 }
+    <name not found> = ArrayList@10846[1] { ResolutionCandidate@6353 }
+    <name not found> = ArrayList@10847[1] { ResolutionCandidate@5906 }
+    <name not found> = ArrayList@10848[1] { ResolutionCandidate@7583 }
+    <name not found> = ArrayList@10849[1] { ResolutionCandidate@7604 }
+    <name not found> = ArrayList@10850[1] { ResolutionCandidate@7145 }
+    <name not found> = ArrayList@10851[1] { ResolutionCandidate@2342 }
+    <name not found> = ArrayList@10852[1] { ResolutionCandidate@4511 }
+    <name not found> = ArrayList@10853[1] { ResolutionCandidate@395 }
+    <name not found> = ArrayList@10854[1] { ResolutionCandidate@7112 }
+    <name not found> = ArrayList@10855[1] { ResolutionCandidate@7382 }
+    <name not found> = ArrayList@10856[1] { ResolutionCandidate@5210 }
+    <name not found> = ArrayList@10857[1] { ResolutionCandidate@5399 }
+    <name not found> = ArrayList@10858[1] { ResolutionCandidate@6371 }
+    <name not found> = ArrayList@10859[1] { ResolutionCandidate@2189 }
+    <name not found> = ArrayList@10860[1] { ResolutionCandidate@3473 }
+    <name not found> = ArrayList@10861[1] { ResolutionCandidate@602 }
+    <name not found> = ArrayList@10862[1] { ResolutionCandidate@5855 }
+    <name not found> = ArrayList@10863[1] { ResolutionCandidate@7508 }
+    <name not found> = ArrayList@10864[1] { ResolutionCandidate@4544 }
+    <name not found> = ArrayList@10865[1] { ResolutionCandidate@5894 }
+    <name not found> = ArrayList@10866[1] { ResolutionCandidate@6644 }
+    <name not found> = ArrayList@10867[1] { ResolutionCandidate@2858 }
+    <name not found> = ArrayList@10868[1] { ResolutionCandidate@2117 }
+    <name not found> = ArrayList@10869[1] { ResolutionCandidate@1610 }
+    <name not found> = ArrayList@10870[1] { ResolutionCandidate@1202 }
+    <name not found> = ArrayList@10871[1] { ResolutionCandidate@5438 }
+    <name not found> = ArrayList@10872[1] { ResolutionCandidate@7496 }
+    <name not found> = ArrayList@10873[1] { ResolutionCandidate@7241 }
+    <name not found> = ArrayList@10874[1] { ResolutionCandidate@1667 }
+    <name not found> = ArrayList@10875[1] { ResolutionCandidate@4388 }
+    <name not found> = ArrayList@10876[1] { ResolutionCandidate@1268 }
+    <name not found> = ArrayList@10877[1] { ResolutionCandidate@5690 }
+    <name not found> = ArrayList@10878[1] { ResolutionCandidate@4826 }
+    <name not found> = ArrayList@10879[1] { ResolutionCandidate@7394 }
+    <name not found> = ArrayList@10880[1] { ResolutionCandidate@6320 }
+    <name not found> = ArrayList@10881[1] { ResolutionCandidate@5159 }
+    <name not found> = ArrayList@10882[1] { ResolutionCandidate@3935 }
+    <name not found> = ArrayList@10883[1] { ResolutionCandidate@3605 }
+    <name not found> = ArrayList@10884[1] { ResolutionCandidate@2480 }
+    <name not found> = ArrayList@10885[1] { ResolutionCandidate@1271 }
+    <name not found> = ArrayList@10886[1] { ResolutionCandidate@7184 }
+    <name not found> = ArrayList@10887[1] { ResolutionCandidate@7226 }
+    <name not found> = ArrayList@10888[1] { ResolutionCandidate@1592 }
+    <name not found> = ArrayList@10889[1] { ResolutionCandidate@4439 }
+    <name not found> = ArrayList@10890[1] { ResolutionCandidate@4016 }
+    <name not found> = ArrayList@10891[1] { ResolutionCandidate@1025 }
+    <name not found> = ArrayList@10892[1] { ResolutionCandidate@4859 }
+    <name not found> = ArrayList@10893[1] { ResolutionCandidate@4922 }
+    <name not found> = ArrayList@10894[1] { ResolutionCandidate@2630 }
+    <name not found> = ArrayList@10895[1] { ResolutionCandidate@3911 }
+    <name not found> = ArrayList@10896[1] { ResolutionCandidate@3857 }
+    <name not found> = ArrayList@10897[1] { ResolutionCandidate@941 }
+    <name not found> = ArrayList@10898[1] { ResolutionCandidate@5888 }
+    <name not found> = ArrayList@10899[1] { ResolutionCandidate@6989 }
+    <name not found> = ArrayList@10900[1] { ResolutionCandidate@4247 }
+    <name not found> = ArrayList@10901[1] { ResolutionCandidate@1559 }
+    <name not found> = ArrayList@10902[1] { ResolutionCandidate@476 }
+    <name not found> = ArrayList@10903[1] { ResolutionCandidate@4877 }
+    <name not found> = ArrayList@10904[1] { ResolutionCandidate@6866 }
+    <name not found> = ArrayList@10905[1] { ResolutionCandidate@6935 }
+    <name not found> = ArrayList@10906[1] { ResolutionCandidate@4895 }
+    <name not found> = ArrayList@10907[1] { ResolutionCandidate@5495 }
+    <name not found> = ArrayList@10908[1] { ResolutionCandidate@4190 }
+    <name not found> = ArrayList@10909[1] { ResolutionCandidate@1814 }
+    <name not found> = ArrayList@10910[1] { ResolutionCandidate@983 }
+    <name not found> = ArrayList@10911[1] { ResolutionCandidate@5255 }
+    <name not found> = ArrayList@10912[1] { ResolutionCandidate@7529 }
+    <name not found> = ArrayList@10913[1] { ResolutionCandidate@7268 }
+    <name not found> = ArrayList@10914[1] { ResolutionCandidate@6647 }
+    <name not found> = ArrayList@10915[1] { ResolutionCandidate@5609 }
+    <name not found> = ArrayList@10916[1] { ResolutionCandidate@3761 }
+    <name not found> = ArrayList@10917[1] { ResolutionCandidate@1916 }
+    <name not found> = ArrayList@10918[1] { ResolutionCandidate@779 }
+    <name not found> = ArrayList@10919[1] { ResolutionCandidate@7685 }
+    <name not found> = ArrayList@10920[1] { ResolutionCandidate@6365 }
+    <name not found> = ArrayList@10921[1] { ResolutionCandidate@5378 }
+    <name not found> = ArrayList@10922[1] { ResolutionCandidate@5144 }
+    <name not found> = ArrayList@10923[1] { ResolutionCandidate@5045 }
+    <name not found> = ArrayList@10924[1] { ResolutionCandidate@2441 }
+    <name not found> = ArrayList@10925[1] { ResolutionCandidate@2588 }
+    <name not found> = ArrayList@10926[1] { ResolutionCandidate@818 }
+    <name not found> = ArrayList@10927[1] { ResolutionCandidate@7424 }
+    <name not found> = ArrayList@10928[1] { ResolutionCandidate@6665 }
+    <name not found> = ArrayList@10929[1] { ResolutionCandidate@7409 }
+    <name not found> = ArrayList@10930[1] { ResolutionCandidate@6368 }
+    <name not found> = ArrayList@10931[1] { ResolutionCandidate@5015 }
+    <name not found> = ArrayList@10932[1] { ResolutionCandidate@2837 }
+    <name not found> = ArrayList@10933[1] { ResolutionCandidate@2819 }
+    <name not found> = ArrayList@10934[1] { ResolutionCandidate@2570 }
+    <name not found> = ArrayList@10935[1] { ResolutionCandidate@1247 }
+    <name not found> = ArrayList@10936[1] { ResolutionCandidate@5429 }
+    <name not found> = ArrayList@10937[1] { ResolutionCandidate@7283 }
+    <name not found> = ArrayList@10938[1] { ResolutionCandidate@2963 }
+    <name not found> = ArrayList@10939[1] { ResolutionCandidate@1895 }
+    <name not found> = ArrayList@10940[1] { ResolutionCandidate@3872 }
+    <name not found> = ArrayList@10941[1] { ResolutionCandidate@530 }
+    <name not found> = ArrayList@10942[1] { ResolutionCandidate@5483 }
+    <name not found> = ArrayList@10943[1] { ResolutionCandidate@7403 }
+    <name not found> = ArrayList@10944[1] { ResolutionCandidate@3371 }
+    <name not found> = ArrayList@10945[1] { ResolutionCandidate@2417 }
+    <name not found> = ArrayList@10946[1] { ResolutionCandidate@4043 }
+    <name not found> = ArrayList@10947[1] { ResolutionCandidate@662 }
+    <name not found> = ArrayList@10948[1] { ResolutionCandidate@6290 }
+    <name not found> = ArrayList@10949[1] { ResolutionCandidate@6797 }
+    <name not found> = ArrayList@10950[1] { ResolutionCandidate@3050 }
+    <name not found> = ArrayList@10951[1] { ResolutionCandidate@3212 }
+    <name not found> = ArrayList@10952[1] { ResolutionCandidate@1481 }
+    <name not found> = ArrayList@10953[1] { ResolutionCandidate@5051 }
+    <name not found> = ArrayList@10954[1] { ResolutionCandidate@6362 }
+    <name not found> = ArrayList@10955[1] { ResolutionCandidate@6944 }
+    <name not found> = ArrayList@10956[1] { ResolutionCandidate@4553 }
+    <name not found> = ArrayList@10957[1] { ResolutionCandidate@4580 }
+    <name not found> = ArrayList@10958[1] { ResolutionCandidate@1673 }
+    <name not found> = ArrayList@10959[1] { ResolutionCandidate@2354 }
+    <name not found> = ArrayList@10960[1] { ResolutionCandidate@1088 }
+    <name not found> = ArrayList@10961[1] { ResolutionCandidate@4886 }
+    <name not found> = ArrayList@10962[1] { ResolutionCandidate@6836 }
+    <name not found> = ArrayList@10963[1] { ResolutionCandidate@6530 }
+    <name not found> = ArrayList@10964[1] { ResolutionCandidate@5783 }
+    <name not found> = ArrayList@10965[1] { ResolutionCandidate@6113 }
+    <name not found> = ArrayList@10966[1] { ResolutionCandidate@3896 }
+    <name not found> = ArrayList@10967[1] { ResolutionCandidate@4490 }
+    <name not found> = ArrayList@10968[1] { ResolutionCandidate@1172 }
+    <name not found> = ArrayList@10969[1] { ResolutionCandidate@5081 }
+    <name not found> = ArrayList@10970[1] { ResolutionCandidate@7469 }
+    <name not found> = ArrayList@10971[1] { ResolutionCandidate@5432 }
+    <name not found> = ArrayList@10972[1] { ResolutionCandidate@4757 }
+    <name not found> = ArrayList@10973[1] { ResolutionCandidate@6599 }
+    <name not found> = ArrayList@10974[1] { ResolutionCandidate@2573 }
+    <name not found> = ArrayList@10975[1] { ResolutionCandidate@1772 }
+    <name not found> = ArrayList@10976[1] { ResolutionCandidate@1178 }
+    <name not found> = ArrayList@10977[1] { ResolutionCandidate@7202 }
+    <name not found> = ArrayList@10978[1] { ResolutionCandidate@6731 }
+    <name not found> = ArrayList@10979[1] { ResolutionCandidate@6638 }
+    <name not found> = ArrayList@10980[1] { ResolutionCandidate@6887 }
+    <name not found> = ArrayList@10981[1] { ResolutionCandidate@6950 }
+    <name not found> = ArrayList@10982[1] { ResolutionCandidate@5318 }
+    <name not found> = ArrayList@10983[1] { ResolutionCandidate@2204 }
+    <name not found> = ArrayList@10984[1] { ResolutionCandidate@2615 }
+    <name not found> = ArrayList@10985[1] { ResolutionCandidate@1310 }
+    <name not found> = ArrayList@10986[1] { ResolutionCandidate@7286 }
+    <name not found> = ArrayList@10987[1] { ResolutionCandidate@5207 }
+    <name not found> = ArrayList@10988[1] { ResolutionCandidate@6812 }
+    <name not found> = ArrayList@10989[1] { ResolutionCandidate@5891 }
+    <name not found> = ArrayList@10990[1] { ResolutionCandidate@7700 }
+    <name not found> = ArrayList@10991[1] { ResolutionCandidate@2411 }
+    <name not found> = ArrayList@10992[1] { ResolutionCandidate@2786 }
+    <name not found> = ArrayList@10993[1] { ResolutionCandidate@1943 }
+    <name not found> = ArrayList@10994[1] { ResolutionCandidate@1421 }
+    <name not found> = ArrayList@10995[1] { ResolutionCandidate@4610 }
+    <name not found> = ArrayList@10996[1] { ResolutionCandidate@5312 }
+    <name not found> = ArrayList@10997[1] { ResolutionCandidate@3098 }
+    <name not found> = ArrayList@10998[1] { ResolutionCandidate@1724 }
+    <name not found> = ArrayList@10999[1] { ResolutionCandidate@1880 }
+    <name not found> = ArrayList@11000[1] { ResolutionCandidate@1190 }
+    <name not found> = ArrayList@11001[1] { ResolutionCandidate@6548 }
+    <name not found> = ArrayList@11002[1] { ResolutionCandidate@5033 }
+    <name not found> = ArrayList@11003[1] { ResolutionCandidate@3227 }
+    <name not found> = ArrayList@11004[1] { ResolutionCandidate@2738 }
+    <name not found> = ArrayList@11005[1] { ResolutionCandidate@4250 }
+    <name not found> = ArrayList@11006[1] { ResolutionCandidate@1094 }
+    <name not found> = ArrayList@11007[1] { ResolutionCandidate@5678 }
+    <name not found> = ArrayList@11008[1] { ResolutionCandidate@4862 }
+    <name not found> = ArrayList@11009[1] { ResolutionCandidate@3665 }
+    <name not found> = ArrayList@11010[1] { ResolutionCandidate@4112 }
+    <name not found> = ArrayList@11011[1] { ResolutionCandidate@896 }
+    <name not found> = ArrayList@11012[1] { ResolutionCandidate@7142 }
+    <name not found> = ArrayList@11013[1] { ResolutionCandidate@7730 }
+    <name not found> = ArrayList@11014[1] { ResolutionCandidate@5537 }
+    <name not found> = ArrayList@11015[1] { ResolutionCandidate@5324 }
+    <name not found> = ArrayList@11016[1] { ResolutionCandidate@5489 }
+    <name not found> = ArrayList@11017[1] { ResolutionCandidate@1718 }
+    <name not found> = ArrayList@11018[1] { ResolutionCandidate@3038 }
+    <name not found> = ArrayList@11019[1] { ResolutionCandidate@575 }
+    <name not found> = ArrayList@11020[1] { ResolutionCandidate@5777 }
+    <name not found> = ArrayList@11021[1] { ResolutionCandidate@7505 }
+    <name not found> = ArrayList@11022[1] { ResolutionCandidate@5246 }
+    <name not found> = ArrayList@11023[1] { ResolutionCandidate@4991 }
+    <name not found> = ArrayList@11024[1] { ResolutionCandidate@7118 }
+    <name not found> = ArrayList@11025[1] { ResolutionCandidate@4076 }
+    <name not found> = ArrayList@11026[1] { ResolutionCandidate@2684 }
+    <name not found> = ArrayList@11027[1] { ResolutionCandidate@1289 }
+    <name not found> = ArrayList@11028[1] { ResolutionCandidate@6029 }
+    <name not found> = ArrayList@11029[1] { ResolutionCandidate@7670 }
+    <name not found> = ArrayList@11030[1] { ResolutionCandidate@6002 }
+    <name not found> = ArrayList@11031[1] { ResolutionCandidate@5504 }
+    <name not found> = ArrayList@11032[1] { ResolutionCandidate@5594 }
+    <name not found> = ArrayList@11033[1] { ResolutionCandidate@1907 }
+    <name not found> = ArrayList@11034[1] { ResolutionCandidate@3656 }
+    <name not found> = ArrayList@11035[1] { ResolutionCandidate@686 }
+    <name not found> = ArrayList@11036[1] { ResolutionCandidate@7574 }
+    <name not found> = ArrayList@11037[1] { ResolutionCandidate@5516 }
+    <name not found> = ArrayList@11038[1] { ResolutionCandidate@4955 }
+    <name not found> = ArrayList@11039[1] { ResolutionCandidate@4547 }
+    <name not found> = ArrayList@11040[1] { ResolutionCandidate@5786 }
+    <name not found> = ArrayList@11041[1] { ResolutionCandidate@5978 }
+    <name not found> = ArrayList@11042[1] { ResolutionCandidate@4463 }
+    <name not found> = ArrayList@11043[1] { ResolutionCandidate@1793 }
+    <name not found> = ArrayList@11044[1] { ResolutionCandidate@572 }
+    <name not found> = ArrayList@11045[1] { ResolutionCandidate@4898 }
+    <name not found> = ArrayList@11046[1] { ResolutionCandidate@6251 }
+    <name not found> = ArrayList@11047[1] { ResolutionCandidate@5408 }
+    <name not found> = ArrayList@11048[1] { ResolutionCandidate@5030 }
+    <name not found> = ArrayList@11049[1] { ResolutionCandidate@7379 }
+    <name not found> = ArrayList@11050[1] { ResolutionCandidate@6227 }
+    <name not found> = ArrayList@11051[1] { ResolutionCandidate@3137 }
+    <name not found> = ArrayList@11052[1] { ResolutionCandidate@3341 }
+    <name not found> = ArrayList@11053[1] { ResolutionCandidate@2174 }
+    <name not found> = ArrayList@11054[1] { ResolutionCandidate@1466 }
+    <name not found> = ArrayList@11055[1] { ResolutionCandidate@5147 }
+    <name not found> = ArrayList@11056[1] { ResolutionCandidate@5708 }
+    <name not found> = ArrayList@11057[1] { ResolutionCandidate@5720 }
+    <name not found> = ArrayList@11058[1] { ResolutionCandidate@1925 }
+    <name not found> = ArrayList@11059[1] { ResolutionCandidate@3881 }
+    <name not found> = ArrayList@11060[1] { ResolutionCandidate@4367 }
+    <name not found> = ArrayList@11061[1] { ResolutionCandidate@1160 }
+    <name not found> = ArrayList@11062[1] { ResolutionCandidate@6824 }
+    <name not found> = ArrayList@11063[1] { ResolutionCandidate@6584 }
+    <name not found> = ArrayList@11064[1] { ResolutionCandidate@2621 }
+    <name not found> = ArrayList@11065[1] { ResolutionCandidate@1961 }
+    <name not found> = ArrayList@11066[1] { ResolutionCandidate@3497 }
+    <name not found> = ArrayList@11067[1] { ResolutionCandidate@614 }
+    <name not found> = ArrayList@11068[1] { ResolutionCandidate@6692 }
+    <name not found> = ArrayList@11069[1] { ResolutionCandidate@5747 }
+    <name not found> = ArrayList@11070[1] { ResolutionCandidate@2873 }
+    <name not found> = ArrayList@11071[1] { ResolutionCandidate@3788 }
+    <name not found> = ArrayList@11072[1] { ResolutionCandidate@4343 }
+    <name not found> = ArrayList@11073[1] { ResolutionCandidate@599 }
+    <name not found> = ArrayList@11074[1] { ResolutionCandidate@4853 }
+    <name not found> = ArrayList@11075[1] { ResolutionCandidate@5306 }
+    <name not found> = ArrayList@11076[1] { ResolutionCandidate@4244 }
+    <name not found> = ArrayList@11077[1] { ResolutionCandidate@3170 }
+    <name not found> = ArrayList@11078[1] { ResolutionCandidate@4346 }
+    <name not found> = ArrayList@11079[1] { ResolutionCandidate@1388 }
+    <name not found> = ArrayList@11080[1] { ResolutionCandidate@5618 }
+    <name not found> = ArrayList@11081[1] { ResolutionCandidate@5168 }
+    <name not found> = ArrayList@11082[1] { ResolutionCandidate@2231 }
+    <name not found> = ArrayList@11083[1] { ResolutionCandidate@4088 }
+    <name not found> = ArrayList@11084[1] { ResolutionCandidate@2195 }
+    <name not found> = ArrayList@11085[1] { ResolutionCandidate@716 }
+    <name not found> = ArrayList@11086[1] { ResolutionCandidate@5006 }
+    <name not found> = ArrayList@11087[1] { ResolutionCandidate@4850 }
+    <name not found> = ArrayList@11088[1] { ResolutionCandidate@4154 }
+    <name not found> = ArrayList@11089[1] { ResolutionCandidate@4532 }
+    <name not found> = ArrayList@11090[1] { ResolutionCandidate@1940 }
+    <name not found> = ArrayList@11091[1] { ResolutionCandidate@1304 }
+    <name not found> = ArrayList@11092[1] { ResolutionCandidate@6122 }
+    <name not found> = ArrayList@11093[1] { ResolutionCandidate@7217 }
+    <name not found> = ArrayList@11094[1] { ResolutionCandidate@4106 }
+    <name not found> = ArrayList@11095[1] { ResolutionCandidate@3545 }
+    <name not found> = ArrayList@11096[1] { ResolutionCandidate@1892 }
+    <name not found> = ArrayList@11097[1] { ResolutionCandidate@1490 }
+    <name not found> = ArrayList@11098[1] { ResolutionCandidate@7043 }
+    <name not found> = ArrayList@11099[1] { ResolutionCandidate@5648 }
+    <name not found> = ArrayList@11100[1] { ResolutionCandidate@3410 }
+    <name not found> = ArrayList@11101[1] { ResolutionCandidate@1760 }
+    <name not found> = ArrayList@11102[1] { ResolutionCandidate@1517 }
+    <name not found> = ArrayList@11103[1] { ResolutionCandidate@6284 }
+    <name not found> = ArrayList@11104[1] { ResolutionCandidate@6254 }
+    <name not found> = ArrayList@11105[1] { ResolutionCandidate@6248 }
+    <name not found> = ArrayList@11106[1] { ResolutionCandidate@5498 }
+    <name not found> = ArrayList@11107[1] { ResolutionCandidate@7301 }
+    <name not found> = ArrayList@11108[1] { ResolutionCandidate@2462 }
+    <name not found> = ArrayList@11109[1] { ResolutionCandidate@2093 }
+    <name not found> = ArrayList@11110[1] { ResolutionCandidate@3374 }
+    <name not found> = ArrayList@11111[1] { ResolutionCandidate@884 }
+    <name not found> = ArrayList@11112[1] { ResolutionCandidate@7049 }
+    <name not found> = ArrayList@11113[1] { ResolutionCandidate@5543 }
+    <name not found> = ArrayList@11114[1] { ResolutionCandidate@3848 }
+    <name not found> = ArrayList@11115[1] { ResolutionCandidate@2042 }
+    <name not found> = ArrayList@11116[1] { ResolutionCandidate@2438 }
+    <name not found> = ArrayList@11117[1] { ResolutionCandidate@527 }
+    <name not found> = ArrayList@11118[1] { ResolutionCandidate@5075 }
+    <name not found> = ArrayList@11119[1] { ResolutionCandidate@7088 }
+    <name not found> = ArrayList@11120[1] { ResolutionCandidate@2894 }
+    <name not found> = ArrayList@11121[1] { ResolutionCandidate@3998 }
+    <name not found> = ArrayList@11122[1] { ResolutionCandidate@1859 }
+    <name not found> = ArrayList@11123[1] { ResolutionCandidate@782 }
+    <name not found> = ArrayList@11124[1] { ResolutionCandidate@5069 }
+    <name not found> = ArrayList@11125[1] { ResolutionCandidate@5903 }
+    <name not found> = ArrayList@11126[1] { ResolutionCandidate@4472 }
+    <name not found> = ArrayList@11127[1] { ResolutionCandidate@4337 }
+    <name not found> = ArrayList@11128[1] { ResolutionCandidate@407 }
+    <name not found> = ArrayList@11129[1] { ResolutionCandidate@5879 }
+    <name not found> = ArrayList@11130[1] { ResolutionCandidate@7025 }
+    <name not found> = ArrayList@11131[1] { ResolutionCandidate@5369 }
+    <name not found> = ArrayList@11132[1] { ResolutionCandidate@5333 }
+    <name not found> = ArrayList@11133[1] { ResolutionCandidate@5018 }
+    <name not found> = ArrayList@11134[1] { ResolutionCandidate@2582 }
+    <name not found> = ArrayList@11135[1] { ResolutionCandidate@3245 }
+    <name not found> = ArrayList@11136[1] { ResolutionCandidate@1532 }
+    <name not found> = ArrayList@11137[1] { ResolutionCandidate@5036 }
+    <name not found> = ArrayList@11138[1] { ResolutionCandidate@4967 }
+    <name not found> = ArrayList@11139[1] { ResolutionCandidate@6878 }
+    <name not found> = ArrayList@11140[1] { ResolutionCandidate@6929 }
+    <name not found> = ArrayList@11141[1] { ResolutionCandidate@5546 }
+    <name not found> = ArrayList@11142[1] { ResolutionCandidate@2618 }
+    <name not found> = ArrayList@11143[1] { ResolutionCandidate@4166 }
+    <name not found> = ArrayList@11144[1] { ResolutionCandidate@1448 }
+    <name not found> = ArrayList@11145[1] { ResolutionCandidate@6431 }
+    <name not found> = ArrayList@11146[1] { ResolutionCandidate@5087 }
+    <name not found> = ArrayList@11147[1] { ResolutionCandidate@5276 }
+    <name not found> = ArrayList@11148[1] { ResolutionCandidate@7151 }
+    <name not found> = ArrayList@11149[1] { ResolutionCandidate@5996 }
+    <name not found> = ArrayList@11150[1] { ResolutionCandidate@2207 }
+    <name not found> = ArrayList@11151[1] { ResolutionCandidate@2021 }
+    <name not found> = ArrayList@11152[1] { ResolutionCandidate@3899 }
+    <name not found> = ArrayList@11153[1] { ResolutionCandidate@683 }
+    <name not found> = ArrayList@11154[1] { ResolutionCandidate@4682 }
+    <name not found> = ArrayList@11155[1] { ResolutionCandidate@6338 }
+    <name not found> = ArrayList@11156[1] { ResolutionCandidate@7244 }
+    <name not found> = ArrayList@11157[1] { ResolutionCandidate@3818 }
+    <name not found> = ArrayList@11158[1] { ResolutionCandidate@2315 }
+    <name not found> = ArrayList@11159[1] { ResolutionCandidate@3458 }
+    <name not found> = ArrayList@11160[1] { ResolutionCandidate@368 }
+    <name not found> = ArrayList@11161[1] { ResolutionCandidate@6011 }
+    <name not found> = ArrayList@11162[1] { ResolutionCandidate@5345 }
+    <name not found> = ArrayList@11163[1] { ResolutionCandidate@4931 }
+    <name not found> = ArrayList@11164[1] { ResolutionCandidate@3317 }
+    <name not found> = ArrayList@11165[1] { ResolutionCandidate@2003 }
+    <name not found> = ArrayList@11166[1] { ResolutionCandidate@380 }
+    <name not found> = ArrayList@11167[1] { ResolutionCandidate@4640 }
+    <name not found> = ArrayList@11168[1] { ResolutionCandidate@7451 }
+    <name not found> = ArrayList@11169[1] { ResolutionCandidate@6143 }
+    <name not found> = ArrayList@11170[1] { ResolutionCandidate@7259 }
+    <name not found> = ArrayList@11171[1] { ResolutionCandidate@6032 }
+    <name not found> = ArrayList@11172[1] { ResolutionCandidate@2153 }
+    <name not found> = ArrayList@11173[1] { ResolutionCandidate@3581 }
+    <name not found> = ArrayList@11174[1] { ResolutionCandidate@4064 }
+    <name not found> = ArrayList@11175[1] { ResolutionCandidate@1238 }
+    <name not found> = ArrayList@11176[1] { ResolutionCandidate@7592 }
+    <name not found> = ArrayList@11177[1] { ResolutionCandidate@5933 }
+    <name not found> = ArrayList@11178[1] { ResolutionCandidate@2348 }
+    <name not found> = ArrayList@11179[1] { ResolutionCandidate@2987 }
+    <name not found> = ArrayList@11180[1] { ResolutionCandidate@3521 }
+    <name not found> = ArrayList@11181[1] { ResolutionCandidate@1016 }
+    <name not found> = ArrayList@11182[1] { ResolutionCandidate@5828 }
+    <name not found> = ArrayList@11183[1] { ResolutionCandidate@4946 }
+    <name not found> = ArrayList@11184[1] { ResolutionCandidate@3287 }
+    <name not found> = ArrayList@11185[1] { ResolutionCandidate@4535 }
+    <name not found> = ArrayList@11186[1] { ResolutionCandidate@3116 }
+    <name not found> = ArrayList@11187[1] { ResolutionCandidate@458 }
+    <name not found> = ArrayList@11188[1] { ResolutionCandidate@5372 }
+    <name not found> = ArrayList@11189[1] { ResolutionCandidate@5099 }
+    <name not found> = ArrayList@11190[1] { ResolutionCandidate@3563 }
+    <name not found> = ArrayList@11191[1] { ResolutionCandidate@2909 }
+    <name not found> = ArrayList@11192[1] { ResolutionCandidate@605 }
+    <name not found> = ArrayList@11193[1] { ResolutionCandidate@6206 }
+    <name not found> = ArrayList@11194[1] { ResolutionCandidate@4565 }
+    <name not found> = ArrayList@11195[1] { ResolutionCandidate@6737 }
+    <name not found> = ArrayList@11196[1] { ResolutionCandidate@6350 }
+    <name not found> = ArrayList@11197[1] { ResolutionCandidate@5132 }
+    <name not found> = ArrayList@11198[1] { ResolutionCandidate@3128 }
+    <name not found> = ArrayList@11199[1] { ResolutionCandidate@3392 }
+    <name not found> = ArrayList@11200[1] { ResolutionCandidate@761 }
+    <name not found> = ArrayList@11201[1] { ResolutionCandidate@5426 }
+    <name not found> = ArrayList@11202[1] { ResolutionCandidate@6725 }
+    <name not found> = ArrayList@11203[1] { ResolutionCandidate@5477 }
+    <name not found> = ArrayList@11204[1] { ResolutionCandidate@7097 }
+    <name not found> = ArrayList@11205[1] { ResolutionCandidate@7568 }
+    <name not found> = ArrayList@11206[1] { ResolutionCandidate@2912 }
+    <name not found> = ArrayList@11207[1] { ResolutionCandidate@2216 }
+    <name not found> = ArrayList@11208[1] { ResolutionCandidate@1208 }
+    <name not found> = ArrayList@11209[1] { ResolutionCandidate@6299 }
+    <name not found> = ArrayList@11210[1] { ResolutionCandidate@5633 }
+    <name not found> = ArrayList@11211[1] { ResolutionCandidate@6863 }
+    <name not found> = ArrayList@11212[1] { ResolutionCandidate@6773 }
+    <name not found> = ArrayList@11213[1] { ResolutionCandidate@6611 }
+    <name not found> = ArrayList@11214[1] { ResolutionCandidate@1628 }
+    <name not found> = ArrayList@11215[1] { ResolutionCandidate@1964 }
+    <name not found> = ArrayList@11216[1] { ResolutionCandidate@3257 }
+    <name not found> = ArrayList@11217[1] { ResolutionCandidate@1316 }
+    <name not found> = ArrayList@11218[1] { ResolutionCandidate@5651 }
+    <name not found> = ArrayList@11219[1] { ResolutionCandidate@5273 }
+    <name not found> = ArrayList@11220[1] { ResolutionCandidate@4607 }
+    <name not found> = ArrayList@11221[1] { ResolutionCandidate@1589 }
+    <name not found> = ArrayList@11222[1] { ResolutionCandidate@3419 }
+    <name not found> = ArrayList@11223[1] { ResolutionCandidate@1229 }
+    <name not found> = ArrayList@11224[1] { ResolutionCandidate@6521 }
+    <name not found> = ArrayList@11225[1] { ResolutionCandidate@6062 }
+    <name not found> = ArrayList@11226[1] { ResolutionCandidate@7385 }
+    <name not found> = ArrayList@11227[1] { ResolutionCandidate@7586 }
+    <name not found> = ArrayList@11228[1] { ResolutionCandidate@4676 }
+    <name not found> = ArrayList@11229[1] { ResolutionCandidate@2747 }
+    <name not found> = ArrayList@11230[1] { ResolutionCandidate@3167 }
+    <name not found> = ArrayList@11231[1] { ResolutionCandidate@2996 }
+    <name not found> = ArrayList@11232[1] { ResolutionCandidate@1235 }
+    <name not found> = ArrayList@11233[1] { ResolutionCandidate@5639 }
+    <name not found> = ArrayList@11234[1] { ResolutionCandidate@6839 }
+    <name not found> = ArrayList@11235[1] { ResolutionCandidate@2861 }
+    <name not found> = ArrayList@11236[1] { ResolutionCandidate@3539 }
+    <name not found> = ArrayList@11237[1] { ResolutionCandidate@4400 }
+    <name not found> = ArrayList@11238[1] { ResolutionCandidate@698 }
+    <name not found> = ArrayList@11239[1] { ResolutionCandidate@6065 }
+    <name not found> = ArrayList@11240[1] { ResolutionCandidate@7691 }
+    <name not found> = ArrayList@11241[1] { ResolutionCandidate@4082 }
+    <name not found> = ArrayList@11242[1] { ResolutionCandidate@4355 }
+    <name not found> = ArrayList@11243[1] { ResolutionCandidate@4079 }
+    <name not found> = ArrayList@11244[1] { ResolutionCandidate@1322 }
+    <name not found> = ArrayList@11245[1] { ResolutionCandidate@6167 }
+    <name not found> = ArrayList@11246[1] { ResolutionCandidate@4829 }
+    <name not found> = ArrayList@11247[1] { ResolutionCandidate@1901 }
+    <name not found> = ArrayList@11248[1] { ResolutionCandidate@2444 }
+    <name not found> = ArrayList@11249[1] { ResolutionCandidate@797 }
+    <name not found> = ArrayList@11250[1] { ResolutionCandidate@7232 }
+    <name not found> = ArrayList@11251[1] { ResolutionCandidate@6488 }
+    <name not found> = ArrayList@11252[1] { ResolutionCandidate@5039 }
+    <name not found> = ArrayList@11253[1] { ResolutionCandidate@6053 }
+    <name not found> = ArrayList@11254[1] { ResolutionCandidate@5972 }
+    <name not found> = ArrayList@11255[1] { ResolutionCandidate@3122 }
+    <name not found> = ArrayList@11256[1] { ResolutionCandidate@2546 }
+    <name not found> = ArrayList@11257[1] { ResolutionCandidate@647 }
+    <name not found> = ArrayList@11258[1] { ResolutionCandidate@5969 }
+    <name not found> = ArrayList@11259[1] { ResolutionCandidate@5240 }
+    <name not found> = ArrayList@11260[1] { ResolutionCandidate@7667 }
+    <name not found> = ArrayList@11261[1] { ResolutionCandidate@6092 }
+    <name not found> = ArrayList@11262[1] { ResolutionCandidate@7304 }
+    <name not found> = ArrayList@11263[1] { ResolutionCandidate@3722 }
+    <name not found> = ArrayList@11264[1] { ResolutionCandidate@1778 }
+    <name not found> = ArrayList@11265[1] { ResolutionCandidate@794 }
+    <name not found> = ArrayList@11266[1] { ResolutionCandidate@5654 }
+    <name not found> = ArrayList@11267[1] { ResolutionCandidate@6767 }
+    <name not found> = ArrayList@11268[1] { ResolutionCandidate@6704 }
+    <name not found> = ArrayList@11269[1] { ResolutionCandidate@5303 }
+    <name not found> = ArrayList@11270[1] { ResolutionCandidate@6758 }
+    <name not found> = ArrayList@11271[1] { ResolutionCandidate@3854 }
+    <name not found> = ArrayList@11272[1] { ResolutionCandidate@2789 }
+    <name not found> = ArrayList@11273[1] { ResolutionCandidate@1550 }
+    <name not found> = ArrayList@11274[1] { ResolutionCandidate@6905 }
+    <name not found> = ArrayList@11275[1] { ResolutionCandidate@5579 }
+    <name not found> = ArrayList@11276[1] { ResolutionCandidate@6524 }
+    <name not found> = ArrayList@11277[1] { ResolutionCandidate@6494 }
+    <name not found> = ArrayList@11278[1] { ResolutionCandidate@7439 }
+    <name not found> = ArrayList@11279[1] { ResolutionCandidate@2486 }
+    <name not found> = ArrayList@11280[1] { ResolutionCandidate@3809 }
+    <name not found> = ArrayList@11281[1] { ResolutionCandidate@1652 }
+    <name not found> = ArrayList@11282[1] { ResolutionCandidate@1439 }
+    <name not found> = ArrayList@11283[1] { ResolutionCandidate@6953 }
+    <name not found> = ArrayList@11284[1] { ResolutionCandidate@6566 }
+    <name not found> = ArrayList@11285[1] { ResolutionCandidate@2264 }
+    <name not found> = ArrayList@11286[1] { ResolutionCandidate@2369 }
+    <name not found> = ArrayList@11287[1] { ResolutionCandidate@2519 }
+    <name not found> = ArrayList@11288[1] { ResolutionCandidate@1301 }
+    <name not found> = ArrayList@11289[1] { ResolutionCandidate@5219 }
+    <name not found> = ArrayList@11290[1] { ResolutionCandidate@6149 }
+    <name not found> = ArrayList@11291[1] { ResolutionCandidate@3923 }
+    <name not found> = ArrayList@11292[1] { ResolutionCandidate@4478 }
+    <name not found> = ArrayList@11293[1] { ResolutionCandidate@3536 }
+    <name not found> = ArrayList@11294[1] { ResolutionCandidate@1079 }
+    <name not found> = ArrayList@11295[1] { ResolutionCandidate@4988 }
+    <name not found> = ArrayList@11296[1] { ResolutionCandidate@7022 }
+    <name not found> = ArrayList@11297[1] { ResolutionCandidate@4280 }
+    <name not found> = ArrayList@11298[1] { ResolutionCandidate@3695 }
+    <name not found> = ArrayList@11299[1] { ResolutionCandidate@1121 }
+    <name not found> = ArrayList@11300[1] { ResolutionCandidate@6182 }
+    <name not found> = ArrayList@11301[1] { ResolutionCandidate@7082 }
+    <name not found> = ArrayList@11302[1] { ResolutionCandidate@6266 }
+    <name not found> = ArrayList@11303[1] { ResolutionCandidate@5756 }
+    <name not found> = ArrayList@11304[1] { ResolutionCandidate@6224 }
+    <name not found> = ArrayList@11305[1] { ResolutionCandidate@2678 }
+    <name not found> = ArrayList@11306[1] { ResolutionCandidate@1763 }
+    <name not found> = ArrayList@11307[1] { ResolutionCandidate@1007 }
+    <name not found> = ArrayList@11308[1] { ResolutionCandidate@5999 }
+    <name not found> = ArrayList@11309[1] { ResolutionCandidate@6317 }
+    <name not found> = ArrayList@11310[1] { ResolutionCandidate@5981 }
+    <name not found> = ArrayList@11311[1] { ResolutionCandidate@5858 }
+    <name not found> = ArrayList@11312[1] { ResolutionCandidate@6152 }
+    <name not found> = ArrayList@11313[1] { ResolutionCandidate@3191 }
+    <name not found> = ArrayList@11314[1] { ResolutionCandidate@1958 }
+    <name not found> = ArrayList@11315[1] { ResolutionCandidate@713 }
+    <name not found> = ArrayList@11316[1] { ResolutionCandidate@6038 }
+    <name not found> = ArrayList@11317[1] { ResolutionCandidate@4556 }
+    <name not found> = ArrayList@11318[1] { ResolutionCandidate@5696 }
+    <name not found> = ArrayList@11319[1] { ResolutionCandidate@5675 }
+    <name not found> = ArrayList@11320[1] { ResolutionCandidate@5012 }
+    <name not found> = ArrayList@11321[1] { ResolutionCandidate@2930 }
+    <name not found> = ArrayList@11322[1] { ResolutionCandidate@2666 }
+    <name not found> = ArrayList@11323[1] { ResolutionCandidate@1148 }
+    <name not found> = ArrayList@11324[1] { ResolutionCandidate@5420 }
+    <name not found> = ArrayList@11325[1] { ResolutionCandidate@6680 }
+    <name not found> = ArrayList@11326[1] { ResolutionCandidate@5486 }
+    <name not found> = ArrayList@11327[1] { ResolutionCandidate@4733 }
+    <name not found> = ArrayList@11328[1] { ResolutionCandidate@5540 }
+    <name not found> = ArrayList@11329[1] { ResolutionCandidate@5507 }
+    <name not found> = ArrayList@11330[1] { ResolutionCandidate@4019 }
+    <name not found> = ArrayList@11331[1] { ResolutionCandidate@3743 }
+    <name not found> = ArrayList@11332[1] { ResolutionCandidate@353 }
+    <name not found> = ArrayList@11333[1] { ResolutionCandidate@4736 }
+    <name not found> = ArrayList@11334[1] { ResolutionCandidate@4706 }
+    <name not found> = ArrayList@11335[1] { ResolutionCandidate@4709 }
+    <name not found> = ArrayList@11336[1] { ResolutionCandidate@6821 }
+    <name not found> = ArrayList@11337[1] { ResolutionCandidate@5966 }
+    <name not found> = ArrayList@11338[1] { ResolutionCandidate@2558 }
+    <name not found> = ArrayList@11339[1] { ResolutionCandidate@4052 }
+    <name not found> = ArrayList@11340[1] { ResolutionCandidate@3947 }
+    <name not found> = ArrayList@11341[1] { ResolutionCandidate@1067 }
+    <name not found> = ArrayList@11342[1] { ResolutionCandidate@6581 }
+    <name not found> = ArrayList@11343[1] { ResolutionCandidate@7337 }
+    <name not found> = ArrayList@11344[1] { ResolutionCandidate@2345 }
+    <name not found> = ArrayList@11345[1] { ResolutionCandidate@1790 }
+    <name not found> = ArrayList@11346[1] { ResolutionCandidate@2714 }
+    <name not found> = ArrayList@11347[1] { ResolutionCandidate@347 }
+    <name not found> = ArrayList@11348[1] { ResolutionCandidate@5090 }
+    <name not found> = ArrayList@11349[1] { ResolutionCandidate@5405 }
+    <name not found> = ArrayList@11350[1] { ResolutionCandidate@3380 }
+    <name not found> = ArrayList@11351[1] { ResolutionCandidate@2624 }
+    <name not found> = ArrayList@11352[1] { ResolutionCandidate@1844 }
+    <name not found> = ArrayList@11353[1] { ResolutionCandidate@833 }
+    <name not found> = ArrayList@11354[1] { ResolutionCandidate@6086 }
+    <name not found> = ArrayList@11355[1] { ResolutionCandidate@4700 }
+    <name not found> = ArrayList@11356[1] { ResolutionCandidate@4211 }
+    <name not found> = ArrayList@11357[1] { ResolutionCandidate@2219 }
+    <name not found> = ArrayList@11358[1] { ResolutionCandidate@1253 }
+    <name not found> = ArrayList@11359[1] { ResolutionCandidate@7625 }
+    <name not found> = ArrayList@11360[1] { ResolutionCandidate@6293 }
+    <name not found> = ArrayList@11361[1] { ResolutionCandidate@4742 }
+    <name not found> = ArrayList@11362[1] { ResolutionCandidate@6728 }
+    <name not found> = ArrayList@11363[1] { ResolutionCandidate@5957 }
+    <name not found> = ArrayList@11364[1] { ResolutionCandidate@3551 }
+    <name not found> = ArrayList@11365[1] { ResolutionCandidate@3407 }
+    <name not found> = ArrayList@11366[1] { ResolutionCandidate@1385 }
+    <name not found> = ArrayList@11367[1] { ResolutionCandidate@5096 }
+    <name not found> = ArrayList@11368[1] { ResolutionCandidate@5009 }
+    <name not found> = ArrayList@11369[1] { ResolutionCandidate@6119 }
+    <name not found> = ArrayList@11370[1] { ResolutionCandidate@5435 }
+    <name not found> = ArrayList@11371[1] { ResolutionCandidate@5393 }
+    <name not found> = ArrayList@11372[1] { ResolutionCandidate@2972 }
+    <name not found> = ArrayList@11373[1] { ResolutionCandidate@3671 }
+    <name not found> = ArrayList@11374[1] { ResolutionCandidate@707 }
+    <name not found> = ArrayList@11375[1] { ResolutionCandidate@4604 }
+    <name not found> = ArrayList@11376[1] { ResolutionCandidate@5714 }
+    <name not found> = ArrayList@11377[1] { ResolutionCandidate@5945 }
+    <name not found> = ArrayList@11378[1] { ResolutionCandidate@6569 }
+    <name not found> = ArrayList@11379[1] { ResolutionCandidate@4835 }
+    <name not found> = ArrayList@11380[1] { ResolutionCandidate@3443 }
+    <name not found> = ArrayList@11381[1] { ResolutionCandidate@3533 }
+    <name not found> = ArrayList@11382[1] { ResolutionCandidate@1460 }
+    <name not found> = ArrayList@11383[1] { ResolutionCandidate@7103 }
+    <name not found> = ArrayList@11384[1] { ResolutionCandidate@5267 }
+    <name not found> = ArrayList@11385[1] { ResolutionCandidate@4697 }
+    <name not found> = ArrayList@11386[1] { ResolutionCandidate@4562 }
+    <name not found> = ArrayList@11387[1] { ResolutionCandidate@6602 }
+    <name not found> = ArrayList@11388[1] { ResolutionCandidate@5084 }
+    <name not found> = ArrayList@11389[1] { ResolutionCandidate@3353 }
+    <name not found> = ArrayList@11390[1] { ResolutionCandidate@2918 }
+    <name not found> = ArrayList@11391[1] { ResolutionCandidate@1355 }
+    <name not found> = ArrayList@11392[1] { ResolutionCandidate@5114 }
+    <name not found> = ArrayList@11393[1] { ResolutionCandidate@7460 }
+    <name not found> = ArrayList@11394[1] { ResolutionCandidate@5774 }
+    <name not found> = ArrayList@11395[1] { ResolutionCandidate@7361 }
+    <name not found> = ArrayList@11396[1] { ResolutionCandidate@7340 }
+    <name not found> = ArrayList@11397[1] { ResolutionCandidate@7628 }
+    <name not found> = ArrayList@11398[1] { ResolutionCandidate@4469 }
+    <name not found> = ArrayList@11399[1] { ResolutionCandidate@1946 }
+    <name not found> = ArrayList@11400[1] { ResolutionCandidate@1853 }
+    <name not found> = ArrayList@11401[1] { ResolutionCandidate@1412 }
+    <name not found> = ArrayList@11402[1] { ResolutionCandidate@6386 }
+    <name not found> = ArrayList@11403[1] { ResolutionCandidate@7517 }
+    <name not found> = ArrayList@11404[1] { ResolutionCandidate@4646 }
+    <name not found> = ArrayList@11405[1] { ResolutionCandidate@3527 }
+    <name not found> = ArrayList@11406[1] { ResolutionCandidate@4208 }
+    <name not found> = ArrayList@11407[1] { ResolutionCandidate@770 }
+    <name not found> = ArrayList@11408[1] { ResolutionCandidate@4838 }
+    <name not found> = ArrayList@11409[1] { ResolutionCandidate@5165 }
+    <name not found> = ArrayList@11410[1] { ResolutionCandidate@6422 }
+    <name not found> = ArrayList@11411[1] { ResolutionCandidate@6305 }
+    <name not found> = ArrayList@11412[1] { ResolutionCandidate@7631 }
+    <name not found> = ArrayList@11413[1] { ResolutionCandidate@2048 }
+    <name not found> = ArrayList@11414[1] { ResolutionCandidate@2201 }
+    <name not found> = ArrayList@11415[1] { ResolutionCandidate@3641 }
+    <name not found> = ArrayList@11416[1] { ResolutionCandidate@635 }
+    <name not found> = ArrayList@11417[1] { ResolutionCandidate@6923 }
+    <name not found> = ArrayList@11418[1] { ResolutionCandidate@5975 }
+    <name not found> = ArrayList@11419[1] { ResolutionCandidate@2606 }
+    <name not found> = ArrayList@11420[1] { ResolutionCandidate@4253 }
+    <name not found> = ArrayList@11421[1] { ResolutionCandidate@4271 }
+    <name not found> = ArrayList@11422[1] { ResolutionCandidate@815 }
+    <name not found> = ArrayList@11423[1] { ResolutionCandidate@7418 }
+    <name not found> = ArrayList@11424[1] { ResolutionCandidate@5177 }
+    <name not found> = ArrayList@11425[1] { ResolutionCandidate@2099 }
+    <name not found> = ArrayList@11426[1] { ResolutionCandidate@2012 }
+    <name not found> = ArrayList@11427[1] { ResolutionCandidate@3284 }
+    <name not found> = ArrayList@11428[1] { ResolutionCandidate@977 }
+    <name not found> = ArrayList@11429[1] { ResolutionCandidate@6146 }
+    <name not found> = ArrayList@11430[1] { ResolutionCandidate@6557 }
+    <name not found> = ArrayList@11431[1] { ResolutionCandidate@1835 }
+    <name not found> = ArrayList@11432[1] { ResolutionCandidate@2327 }
+    <name not found> = ArrayList@11433[1] { ResolutionCandidate@1487 }
+    <name not found> = ArrayList@11434[1] { ResolutionCandidate@5228 }
+    <name not found> = ArrayList@11435[1] { ResolutionCandidate@4856 }
+    <name not found> = ArrayList@11436[1] { ResolutionCandidate@4616 }
+    <name not found> = ArrayList@11437[1] { ResolutionCandidate@6545 }
+    <name not found> = ArrayList@11438[1] { ResolutionCandidate@5513 }
+    <name not found> = ArrayList@11439[1] { ResolutionCandidate@4175 }
+    <name not found> = ArrayList@11440[1] { ResolutionCandidate@4199 }
+    <name not found> = ArrayList@11441[1] { ResolutionCandidate@1445 }
+    <name not found> = ArrayList@11442[1] { ResolutionCandidate@4595 }
+    <name not found> = ArrayList@11443[1] { ResolutionCandidate@6761 }
+    <name not found> = ArrayList@11444[1] { ResolutionCandidate@5948 }
+    <name not found> = ArrayList@11445[1] { ResolutionCandidate@6281 }
+    <name not found> = ArrayList@11446[1] { ResolutionCandidate@7247 }
+    <name not found> = ArrayList@11447[1] { ResolutionCandidate@2729 }
+    <name not found> = ArrayList@11448[1] { ResolutionCandidate@4046 }
+    <name not found> = ArrayList@11449[1] { ResolutionCandidate@1337 }
+    <name not found> = ArrayList@11450[1] { ResolutionCandidate@4985 }
+    <name not found> = ArrayList@11451[1] { ResolutionCandidate@5222 }
+    <name not found> = ArrayList@11452[1] { ResolutionCandidate@4910 }
+    <name not found> = ArrayList@11453[1] { ResolutionCandidate@5282 }
+    <name not found> = ArrayList@11454[1] { ResolutionCandidate@5921 }
+    <name not found> = ArrayList@11455[1] { ResolutionCandidate@3701 }
+    <name not found> = ArrayList@11456[1] { ResolutionCandidate@1937 }
+    <name not found> = ArrayList@11457[1] { ResolutionCandidate@2456 }
+    <name not found> = ArrayList@11458[1] { ResolutionCandidate@752 }
+    <name not found> = ArrayList@11459[1] { ResolutionCandidate@7058 }
+    <name not found> = ArrayList@11460[1] { ResolutionCandidate@7355 }
+    <name not found> = ArrayList@11461[1] { ResolutionCandidate@2900 }
+    <name not found> = ArrayList@11462[1] { ResolutionCandidate@1694 }
+    <name not found> = ArrayList@11463[1] { ResolutionCandidate@3119 }
+    <name not found> = ArrayList@11464[1] { ResolutionCandidate@872 }
+    <name not found> = ArrayList@11465[1] { ResolutionCandidate@4802 }
+    <name not found> = ArrayList@11466[1] { ResolutionCandidate@6698 }
+    <name not found> = ArrayList@11467[1] { ResolutionCandidate@4202 }
+    <name not found> = ArrayList@11468[1] { ResolutionCandidate@2945 }
+    <name not found> = ArrayList@11469[1] { ResolutionCandidate@3767 }
+    <name not found> = ArrayList@11470[1] { ResolutionCandidate@1325 }
+    <name not found> = ArrayList@11471[1] { ResolutionCandidate@5558 }
+    <name not found> = ArrayList@11472[1] { ResolutionCandidate@6578 }
+    <name not found> = ArrayList@11473[1] { ResolutionCandidate@2009 }
+    <name not found> = ArrayList@11474[1] { ResolutionCandidate@4205 }
+    <name not found> = ArrayList@11475[1] { ResolutionCandidate@4421 }
+    <name not found> = ArrayList@11476[1] { ResolutionCandidate@1214 }
+    <name not found> = ArrayList@11477[1] { ResolutionCandidate@7550 }
+    <name not found> = ArrayList@11478[1] { ResolutionCandidate@5750 }
+    <name not found> = ArrayList@11479[1] { ResolutionCandidate@3659 }
+    <name not found> = ArrayList@11480[1] { ResolutionCandidate@4130 }
+    <name not found> = ArrayList@11481[1] { ResolutionCandidate@1580 }
+    <name not found> = ArrayList@11482[1] { ResolutionCandidate@1340 }
+    <name not found> = ArrayList@11483[1] { ResolutionCandidate@7622 }
+    <name not found> = ArrayList@11484[1] { ResolutionCandidate@6674 }
+    <name not found> = ArrayList@11485[1] { ResolutionCandidate@3779 }
+    <name not found> = ArrayList@11486[1] { ResolutionCandidate@2576 }
+    <name not found> = ArrayList@11487[1] { ResolutionCandidate@2105 }
+    <name not found> = ArrayList@11488[1] { ResolutionCandidate@950 }
+    <name not found> = ArrayList@11489[1] { ResolutionCandidate@6659 }
+    <name not found> = ArrayList@11490[1] { ResolutionCandidate@5348 }
+    <name not found> = ArrayList@11491[1] { ResolutionCandidate@4121 }
+    <name not found> = ArrayList@11492[1] { ResolutionCandidate@3425 }
+    <name not found> = ArrayList@11493[1] { ResolutionCandidate@4109 }
+    <name not found> = ArrayList@11494[1] { ResolutionCandidate@1046 }
+    <name not found> = ArrayList@11495[1] { ResolutionCandidate@4712 }
+    <name not found> = ArrayList@11496[1] { ResolutionCandidate@6272 }
+    <name not found> = ArrayList@11497[1] { ResolutionCandidate@3683 }
+    <name not found> = ArrayList@11498[1] { ResolutionCandidate@2843 }
+    <name not found> = ArrayList@11499[1] { ResolutionCandidate@578 }
+    <name not found> = ArrayList@11500[1] { ResolutionCandidate@5954 }
+    <name not found> = ArrayList@11501[1] { ResolutionCandidate@5366 }
+    <name not found> = ArrayList@11502[1] { ResolutionCandidate@6125 }
+    <name not found> = ArrayList@11503[1] { ResolutionCandidate@4928 }
+    <name not found> = ArrayList@11504[1] { ResolutionCandidate@7019 }
+    <name not found> = ArrayList@11505[1] { ResolutionCandidate@1766 }
+    <name not found> = ArrayList@11506[1] { ResolutionCandidate@3677 }
+    <name not found> = ArrayList@11507[1] { ResolutionCandidate@2855 }
+    <name not found> = ArrayList@11508[1] { ResolutionCandidate@1313 }
+    <name not found> = ArrayList@11509[1] { ResolutionCandidate@5852 }
+    <name not found> = ArrayList@11510[1] { ResolutionCandidate@6587 }
+    <name not found> = ArrayList@11511[1] { ResolutionCandidate@1721 }
+    <name not found> = ArrayList@11512[1] { ResolutionCandidate@1994 }
+    <name not found> = ArrayList@11513[1] { ResolutionCandidate@2339 }
+    <name not found> = ArrayList@11514[1] { ResolutionCandidate@1499 }
+    <name not found> = ArrayList@11515[1] { ResolutionCandidate@5552 }
+    <name not found> = ArrayList@11516[1] { ResolutionCandidate@6140 }
+    <name not found> = ArrayList@11517[1] { ResolutionCandidate@4412 }
+    <name not found> = ArrayList@11518[1] { ResolutionCandidate@4022 }
+    <name not found> = ArrayList@11519[1] { ResolutionCandidate@2939 }
+    <name not found> = ArrayList@11520[1] { ResolutionCandidate@536 }
+    <name not found> = ArrayList@11521[1] { ResolutionCandidate@6275 }
+    <name not found> = ArrayList@11522[1] { ResolutionCandidate@6677 }
+    <name not found> = ArrayList@11523[1] { ResolutionCandidate@3281 }
+    <name not found> = ArrayList@11524[1] { ResolutionCandidate@2780 }
+    <name not found> = ArrayList@11525[1] { ResolutionCandidate@1418 }
+    <name not found> = ArrayList@11526[1] { ResolutionCandidate@5744 }
+    <name not found> = ArrayList@11527[1] { ResolutionCandidate@7136 }
+    <name not found> = ArrayList@11528[1] { ResolutionCandidate@6392 }
+    <name not found> = ArrayList@11529[1] { ResolutionCandidate@7454 }
+    <name not found> = ArrayList@11530[1] { ResolutionCandidate@4889 }
+    <name not found> = ArrayList@11531[1] { ResolutionCandidate@4274 }
+    <name not found> = ArrayList@11532[1] { ResolutionCandidate@2501 }
+    <name not found> = ArrayList@11533[1] { ResolutionCandidate@638 }
+    <name not found> = ArrayList@11534[1] { ResolutionCandidate@5792 }
+    <name not found> = ArrayList@11535[1] { ResolutionCandidate@7277 }
+    <name not found> = ArrayList@11536[1] { ResolutionCandidate@7250 }
+    <name not found> = ArrayList@11537[1] { ResolutionCandidate@5843 }
+    <name not found> = ArrayList@11538[1] { ResolutionCandidate@5876 }
+    <name not found> = ArrayList@11539[1] { ResolutionCandidate@4124 }
+    <name not found> = ArrayList@11540[1] { ResolutionCandidate@4391 }
+    <name not found> = ArrayList@11541[1] { ResolutionCandidate@1505 }
+    <name not found> = ArrayList@11542[1] { ResolutionCandidate@4892 }
+    <name not found> = ArrayList@11543[1] { ResolutionCandidate@5444 }
+    <name not found> = ArrayList@11544[1] { ResolutionCandidate@7076 }
+    <name not found> = ArrayList@11545[1] { ResolutionCandidate@5753 }
+    <name not found> = ArrayList@11546[1] { ResolutionCandidate@5162 }
+    <name not found> = ArrayList@11547[1] { ResolutionCandidate@2975 }
+    <name not found> = ArrayList@11548[1] { ResolutionCandidate@2831 }
+    <name not found> = ArrayList@11549[1] { ResolutionCandidate@1406 }
+    <name not found> = ArrayList@11550[1] { ResolutionCandidate@6653 }
+    <name not found> = ArrayList@11551[1] { ResolutionCandidate@5249 }
+    <name not found> = ArrayList@11552[1] { ResolutionCandidate@6608 }
+    <name not found> = ArrayList@11553[1] { ResolutionCandidate@4724 }
+    <name not found> = ArrayList@11554[1] { ResolutionCandidate@5684 }
+    <name not found> = ArrayList@11555[1] { ResolutionCandidate@2372 }
+    <name not found> = ArrayList@11556[1] { ResolutionCandidate@2969 }
+    <name not found> = ArrayList@11557[1] { ResolutionCandidate@2867 }
+    <name not found> = ArrayList@11558[1] { ResolutionCandidate@665 }
+    <name not found> = ArrayList@11559[1] { ResolutionCandidate@7331 }
+    <name not found> = ArrayList@11560[1] { ResolutionCandidate@4949 }
+    <name not found> = ArrayList@11561[1] { ResolutionCandidate@2450 }
+    <name not found> = ArrayList@11562[1] { ResolutionCandidate@1829 }
+    <name not found> = ArrayList@11563[1] { ResolutionCandidate@3254 }
+    <name not found> = ArrayList@11564[1] { ResolutionCandidate@728 }
+    <name not found> = ArrayList@11565[1] { ResolutionCandidate@7484 }
+    <name not found> = ArrayList@11566[1] { ResolutionCandidate@4832 }
+    <name not found> = ArrayList@11567[1] { ResolutionCandidate@1997 }
+    <name not found> = ArrayList@11568[1] { ResolutionCandidate@3725 }
+    <name not found> = ArrayList@11569[1] { ResolutionCandidate@2114 }
+    <name not found> = ArrayList@11570[1] { ResolutionCandidate@1097 }
+    <name not found> = ArrayList@11571[1] { ResolutionCandidate@5285 }
+    <name not found> = ArrayList@11572[1] { ResolutionCandidate@7178 }
+    <name not found> = ArrayList@11573[1] { ResolutionCandidate@2225 }
+    <name not found> = ArrayList@11574[1] { ResolutionCandidate@1886 }
+    <name not found> = ArrayList@11575[1] { ResolutionCandidate@1241 }
+    <name not found> = ArrayList@11576[1] { ResolutionCandidate@4541 }
+    <name not found> = ArrayList@11577[1] { ResolutionCandidate@7556 }
+    <name not found> = ArrayList@11578[1] { ResolutionCandidate@4643 }
+    <name not found> = ArrayList@11579[1] { ResolutionCandidate@7154 }
+    <name not found> = ArrayList@11580[1] { ResolutionCandidate@4844 }
+    <name not found> = ArrayList@11581[1] { ResolutionCandidate@1643 }
+    <name not found> = ArrayList@11582[1] { ResolutionCandidate@2597 }
+    <name not found> = ArrayList@11583[1] { ResolutionCandidate@854 }
+    <name not found> = ArrayList@11584[1] { ResolutionCandidate@5867 }
+    <name not found> = ArrayList@11585[1] { ResolutionCandidate@5531 }
+    <name not found> = ArrayList@11586[1] { ResolutionCandidate@6713 }
+    <name not found> = ArrayList@11587[1] { ResolutionCandidate@7205 }
+    <name not found> = ArrayList@11588[1] { ResolutionCandidate@4664 }
+    <name not found> = ArrayList@11589[1] { ResolutionCandidate@3785 }
+    <name not found> = ArrayList@11590[1] { ResolutionCandidate@3977 }
+    <name not found> = ArrayList@11591[1] { ResolutionCandidate@971 }
+    <name not found> = ArrayList@11592[1] { ResolutionCandidate@7676 }
+    <name not found> = ArrayList@11593[1] { ResolutionCandidate@7037 }
+    <name not found> = ArrayList@11594[1] { ResolutionCandidate@6614 }
+    <name not found> = ArrayList@11595[1] { ResolutionCandidate@7655 }
+    <name not found> = ArrayList@11596[1] { ResolutionCandidate@5924 }
+    <name not found> = ArrayList@11597[1] { ResolutionCandidate@2312 }
+    <name not found> = ArrayList@11598[1] { ResolutionCandidate@2849 }
+    <name not found> = ArrayList@11599[1] { ResolutionCandidate@509 }
+    <name not found> = ArrayList@11600[1] { ResolutionCandidate@5108 }
+    <name not found> = ArrayList@11601[1] { ResolutionCandidate@5213 }
+    <name not found> = ArrayList@11602[1] { ResolutionCandidate@5411 }
+    <name not found> = ArrayList@11603[1] { ResolutionCandidate@6155 }
+    <name not found> = ArrayList@11604[1] { ResolutionCandidate@7310 }
+    <name not found> = ArrayList@11605[1] { ResolutionCandidate@3599 }
+    <name not found> = ArrayList@11606[1] { ResolutionCandidate@2753 }
+    <name not found> = ArrayList@11607[1] { ResolutionCandidate@3692 }
+    <name not found> = ArrayList@11608[1] { ResolutionCandidate@1409 }
+    <name not found> = ArrayList@11609[1] { ResolutionCandidate@6221 }
+    <name not found> = ArrayList@11610[1] { ResolutionCandidate@4589 }
+    <name not found> = ArrayList@11611[1] { ResolutionCandidate@4037 }
+    <name not found> = ArrayList@11612[1] { ResolutionCandidate@3803 }
+    <name not found> = ArrayList@11613[1] { ResolutionCandidate@3965 }
+    <name not found> = ArrayList@11614[1] { ResolutionCandidate@425 }
+    <name not found> = ArrayList@11615[1] { ResolutionCandidate@5501 }
+    <name not found> = ArrayList@11616[1] { ResolutionCandidate@7565 }
+    <name not found> = ArrayList@11617[1] { ResolutionCandidate@2030 }
+    <name not found> = ArrayList@11618[1] { ResolutionCandidate@2669 }
+    <name not found> = ArrayList@11619[1] { ResolutionCandidate@4103 }
+    <name not found> = ArrayList@11620[1] { ResolutionCandidate@1283 }
+    <name not found> = ArrayList@11621[1] { ResolutionCandidate@7589 }
+    <name not found> = ArrayList@11622[1] { ResolutionCandidate@4763 }
+    <name not found> = ArrayList@11623[1] { ResolutionCandidate@3311 }
+    <name not found> = ArrayList@11624[1] { ResolutionCandidate@2768 }
+    <name not found> = ArrayList@11625[1] { ResolutionCandidate@1454 }
+    <name not found> = ArrayList@11626[1] { ResolutionCandidate@7325 }
+    <name not found> = ArrayList@11627[1] { ResolutionCandidate@6590 }
+    <name not found> = ArrayList@11628[1] { ResolutionCandidate@5375 }
+    <name not found> = ArrayList@11629[1] { ResolutionCandidate@5027 }
+    <name not found> = ArrayList@11630[1] { ResolutionCandidate@4658 }
+    <name not found> = ArrayList@11631[1] { ResolutionCandidate@1622 }
+    <name not found> = ArrayList@11632[1] { ResolutionCandidate@2690 }
+    <name not found> = ArrayList@11633[1] { ResolutionCandidate@932 }
+    <name not found> = ArrayList@11634[1] { ResolutionCandidate@5846 }
+    <name not found> = ArrayList@11635[1] { ResolutionCandidate@4976 }
+    <name not found> = ArrayList@11636[1] { ResolutionCandidate@6440 }
+    <name not found> = ArrayList@11637[1] { ResolutionCandidate@6764 }
+    <name not found> = ArrayList@11638[1] { ResolutionCandidate@6572 }
+    <name not found> = ArrayList@11639[1] { ResolutionCandidate@4505 }
+    <name not found> = ArrayList@11640[1] { ResolutionCandidate@2906 }
+    <name not found> = ArrayList@11641[1] { ResolutionCandidate@1295 }
+    <name not found> = ArrayList@11642[1] { ResolutionCandidate@6005 }
+    <name not found> = ArrayList@11643[1] { ResolutionCandidate@6404 }
+    <name not found> = ArrayList@11644[1] { ResolutionCandidate@6209 }
+    <name not found> = ArrayList@11645[1] { ResolutionCandidate@5111 }
+    <name not found> = ArrayList@11646[1] { ResolutionCandidate@6017 }
+    <name not found> = ArrayList@11647[1] { ResolutionCandidate@4232 }
+    <name not found> = ArrayList@11648[1] { ResolutionCandidate@3293 }
+    <name not found> = ArrayList@11649[1] { ResolutionCandidate@1547 }
+    <name not found> = ArrayList@11650[1] { ResolutionCandidate@7535 }
+    <name not found> = ArrayList@11651[1] { ResolutionCandidate@7694 }
+    <name not found> = ArrayList@11652[1] { ResolutionCandidate@4841 }
+    <name not found> = ArrayList@11653[1] { ResolutionCandidate@6473 }
+    <name not found> = ArrayList@11654[1] { ResolutionCandidate@6830 }
+    <name not found> = ArrayList@11655[1] { ResolutionCandidate@3095 }
+    <name not found> = ArrayList@11656[1] { ResolutionCandidate@3338 }
+    <name not found> = ArrayList@11657[1] { ResolutionCandidate@3389 }
+    <name not found> = ArrayList@11658[1] { ResolutionCandidate@518 }
+    <name not found> = ArrayList@11659[1] { ResolutionCandidate@7364 }
+    <name not found> = ArrayList@11660[1] { ResolutionCandidate@6707 }
+    <name not found> = ArrayList@11661[1] { ResolutionCandidate@3437 }
+    <name not found> = ArrayList@11662[1] { ResolutionCandidate@3962 }
+    <name not found> = ArrayList@11663[1] { ResolutionCandidate@2336 }
+    <name not found> = ArrayList@11664[1] { ResolutionCandidate@1106 }
+    <name not found> = ArrayList@11665[1] { ResolutionCandidate@6203 }
+    <name not found> = ArrayList@11666[1] { ResolutionCandidate@6911 }
+    <name not found> = ArrayList@11667[1] { ResolutionCandidate@3959 }
+    <name not found> = ArrayList@11668[1] { ResolutionCandidate@4322 }
+    <name not found> = ArrayList@11669[1] { ResolutionCandidate@3866 }
+    <name not found> = ArrayList@11670[1] { ResolutionCandidate@497 }
+    <name not found> = ArrayList@11671[1] { ResolutionCandidate@5336 }
+    <name not found> = ArrayList@11672[1] { ResolutionCandidate@6482 }
+    <name not found> = ArrayList@11673[1] { ResolutionCandidate@3014 }
+    <name not found> = ArrayList@11674[1] { ResolutionCandidate@4049 }
+    <name not found> = ArrayList@11675[1] { ResolutionCandidate@1361 }
+    <name not found> = ArrayList@11676[1] { ResolutionCandidate@4817 }
+    <name not found> = ArrayList@11677[1] { ResolutionCandidate@4685 }
+    <name not found> = ArrayList@11678[1] { ResolutionCandidate@5186 }
+    <name not found> = ArrayList@11679[1] { ResolutionCandidate@5993 }
+    <name not found> = ArrayList@11680[1] { ResolutionCandidate@7544 }
+    <name not found> = ArrayList@11681[1] { ResolutionCandidate@2636 }
+    <name not found> = ArrayList@11682[1] { ResolutionCandidate@2612 }
+    <name not found> = ArrayList@11683[1] { ResolutionCandidate@539 }
+    <name not found> = ArrayList@11684[1] { ResolutionCandidate@6932 }
+    <name not found> = ArrayList@11685[1] { ResolutionCandidate@4994 }
+    <name not found> = ArrayList@11686[1] { ResolutionCandidate@7679 }
+    <name not found> = ArrayList@11687[1] { ResolutionCandidate@6308 }
+    <name not found> = ArrayList@11688[1] { ResolutionCandidate@5462 }
+    <name not found> = ArrayList@11689[1] { ResolutionCandidate@2126 }
+    <name not found> = ArrayList@11690[1] { ResolutionCandidate@1817 }
+    <name not found> = ArrayList@11691[1] { ResolutionCandidate@383 }
+    <name not found> = ArrayList@11692[1] { ResolutionCandidate@4613 }
+    <name not found> = ArrayList@11693[1] { ResolutionCandidate@6671 }
+    <name not found> = ArrayList@11694[1] { ResolutionCandidate@5912 }
+    <name not found> = ArrayList@11695[1] { ResolutionCandidate@6230 }
+    <name not found> = ArrayList@11696[1] { ResolutionCandidate@6416 }
+    <name not found> = ArrayList@11697[1] { ResolutionCandidate@2027 }
+    <name not found> = ArrayList@11698[1] { ResolutionCandidate@4226 }
+    <name not found> = ArrayList@11699[1] { ResolutionCandidate@2744 }
+    <name not found> = ArrayList@11700[1] { ResolutionCandidate@980 }
+    <name not found> = ArrayList@11701[1] { ResolutionCandidate@5225 }
+    <name not found> = ArrayList@11702[1] { ResolutionCandidate@5198 }
+    <name not found> = ArrayList@11703[1] { ResolutionCandidate@5459 }
+    <name not found> = ArrayList@11704[1] { ResolutionCandidate@3905 }
+    <name not found> = ArrayList@11705[1] { ResolutionCandidate@2237 }
+    <name not found> = ArrayList@11706[1] { ResolutionCandidate@1613 }
+    <name not found> = ArrayList@11707[1] { ResolutionCandidate@551 }
+    <name not found> = ArrayList@11708[1] { ResolutionCandidate@5681 }
+    <name not found> = ArrayList@11709[1] { ResolutionCandidate@6176 }
+    <name not found> = ArrayList@11710[1] { ResolutionCandidate@5288 }
+    <name not found> = ArrayList@11711[1] { ResolutionCandidate@2825 }
+    <name not found> = ArrayList@11712[1] { ResolutionCandidate@4028 }
+    <name not found> = ArrayList@11713[1] { ResolutionCandidate@3980 }
+    <name not found> = ArrayList@11714[1] { ResolutionCandidate@1331 }
+    <name not found> = ArrayList@11715[1] { ResolutionCandidate@5735 }
+    <name not found> = ArrayList@11716[1] { ResolutionCandidate@5243 }
+    <name not found> = ArrayList@11717[1] { ResolutionCandidate@6848 }
+    <name not found> = ArrayList@11718[1] { ResolutionCandidate@1970 }
+    <name not found> = ArrayList@11719[1] { ResolutionCandidate@3263 }
+    <name not found> = ArrayList@11720[1] { ResolutionCandidate@3452 }
+    <name not found> = ArrayList@11721[1] { ResolutionCandidate@1493 }
+    <name not found> = ArrayList@11722[1] { ResolutionCandidate@6506 }
+    <name not found> = ArrayList@11723[1] { ResolutionCandidate@4652 }
+    <name not found> = ArrayList@11724[1] { ResolutionCandidate@6239 }
+    <name not found> = ArrayList@11725[1] { ResolutionCandidate@1649 }
+    <name not found> = ArrayList@11726[1] { ResolutionCandidate@3296 }
+    <name not found> = ArrayList@11727[1] { ResolutionCandidate@2717 }
+    <name not found> = ArrayList@11728[1] { ResolutionCandidate@1250 }
+    <name not found> = ArrayList@11729[1] { ResolutionCandidate@5120 }
+    <name not found> = ArrayList@11730[1] { ResolutionCandidate@6395 }
+    <name not found> = ArrayList@11731[1] { ResolutionCandidate@4982 }
+    <name not found> = ArrayList@11732[1] { ResolutionCandidate@890 }
+    <name not found> = ArrayList@11733[1] { ResolutionCandidate@5564 }
+    <name not found> = ArrayList@11734[1] { ResolutionCandidate@6629 }
+    <name not found> = ArrayList@11735[1] { ResolutionCandidate@6116 }
+    <name not found> = ArrayList@11736[1] { ResolutionCandidate@7553 }
+    <name not found> = ArrayList@11737[1] { ResolutionCandidate@5951 }
+    <name not found> = ArrayList@11738[1] { ResolutionCandidate@5000 }
+    <name not found> = ArrayList@11739[1] { ResolutionCandidate@7016 }
+    <name not found> = ArrayList@11740[1] { ResolutionCandidate@6695 }
+    <name not found> = ArrayList@11741[1] { ResolutionCandidate@4823 }
+    <name not found> = ArrayList@11742[1] { ResolutionCandidate@6920 }
+    <name not found> = ArrayList@11743[6] { ResolutionCandidate@7848, ResolutionCandidate@7849, ResolutionCandidate@7850, ... }
+    <name not found> = ArrayList@11744[6] { ResolutionCandidate@7833, ResolutionCandidate@7834, ResolutionCandidate@7835, ... }
+    <name not found> = ArrayList@11745[6] { ResolutionCandidate@7733, ResolutionCandidate@7734, ResolutionCandidate@7735, ... }
+    <name not found> = ArrayList@11746[6] { ResolutionCandidate@7778, ResolutionCandidate@7779, ResolutionCandidate@7780, ... }
+    <name not found> = ArrayList@11747[6] { ResolutionCandidate@7828, ResolutionCandidate@7829, ResolutionCandidate@7830, ... }
+    <name not found> = ArrayList@11748[6] { ResolutionCandidate@7793, ResolutionCandidate@7794, ResolutionCandidate@7795, ... }
+    <name not found> = ArrayList@11749[6] { ResolutionCandidate@7758, ResolutionCandidate@7759, ResolutionCandidate@7760, ... }
+    <name not found> = ArrayList@11750[6] { ResolutionCandidate@7743, ResolutionCandidate@7744, ResolutionCandidate@7745, ... }
+    <name not found> = ArrayList@11751[6] { ResolutionCandidate@7803, ResolutionCandidate@7804, ResolutionCandidate@7805, ... }
+    <name not found> = ArrayList@11752[6] { ResolutionCandidate@7843, ResolutionCandidate@7844, ResolutionCandidate@7845, ... }
+    <name not found> = ArrayList@11753[6] { ResolutionCandidate@7818, ResolutionCandidate@7819, ResolutionCandidate@7820, ... }
+    <name not found> = ArrayList@11754[6] { ResolutionCandidate@7838, ResolutionCandidate@7839, ResolutionCandidate@7840, ... }
+    <name not found> = ArrayList@11755[6] { ResolutionCandidate@7813, ResolutionCandidate@7814, ResolutionCandidate@7815, ... }
+    <name not found> = ArrayList@11756[6] { ResolutionCandidate@7768, ResolutionCandidate@7769, ResolutionCandidate@7770, ... }
+    <name not found> = ArrayList@11757[6] { ResolutionCandidate@7823, ResolutionCandidate@7824, ResolutionCandidate@7825, ... }
+    <name not found> = ArrayList@11758[6] { ResolutionCandidate@7808, ResolutionCandidate@7809, ResolutionCandidate@7810, ... }
+    <name not found> = ArrayList@11759[6] { ResolutionCandidate@7763, ResolutionCandidate@7764, ResolutionCandidate@7765, ... }
+    <name not found> = ArrayList@11760[6] { ResolutionCandidate@7753, ResolutionCandidate@7754, ResolutionCandidate@7755, ... }
+    <name not found> = ArrayList@11761[6] { ResolutionCandidate@7773, ResolutionCandidate@7774, ResolutionCandidate@7775, ... }
+    <name not found> = ArrayList@11762[6] { ResolutionCandidate@7738, ResolutionCandidate@7739, ResolutionCandidate@7740, ... }
+    <name not found> = ArrayList@11763[6] { ResolutionCandidate@7788, ResolutionCandidate@7789, ResolutionCandidate@7790, ... }
+    <name not found> = ArrayList@11764[6] { ResolutionCandidate@7798, ResolutionCandidate@7799, ResolutionCandidate@7800, ... }
+    <name not found> = ArrayList@11765[6] { ResolutionCandidate@7748, ResolutionCandidate@7749, ResolutionCandidate@7750, ... }
+    <name not found> = ArrayList@11766[6] { ResolutionCandidate@7783, ResolutionCandidate@7784, ResolutionCandidate@7785, ... }
+    <name not found> = ArrayList@11767[7] { ResolutionCandidate@8253, ResolutionCandidate@8254, ResolutionCandidate@8255, ... }
+    <name not found> = ArrayList@11768[7] { ResolutionCandidate@8538, ResolutionCandidate@8539, ResolutionCandidate@8540, ... }
+    <name not found> = ArrayList@11769[7] { ResolutionCandidate@8723, ResolutionCandidate@8724, ResolutionCandidate@8725, ... }
+    <name not found> = ArrayList@11770[7] { ResolutionCandidate@8143, ResolutionCandidate@8144, ResolutionCandidate@8145, ... }
+    <name not found> = ArrayList@11771[7] { ResolutionCandidate@8168, ResolutionCandidate@8169, ResolutionCandidate@8170, ... }
+    <name not found> = ArrayList@11772[7] { ResolutionCandidate@7853, ResolutionCandidate@7854, ResolutionCandidate@7855, ... }
+    <name not found> = ArrayList@11773[7] { ResolutionCandidate@8363, ResolutionCandidate@8364, ResolutionCandidate@8365, ... }
+    <name not found> = ArrayList@11774[7] { ResolutionCandidate@8558, ResolutionCandidate@8559, ResolutionCandidate@8560, ... }
+    <name not found> = ArrayList@11775[7] { ResolutionCandidate@8383, ResolutionCandidate@8384, ResolutionCandidate@8385, ... }
+    <name not found> = ArrayList@11776[7] { ResolutionCandidate@8413, ResolutionCandidate@8414, ResolutionCandidate@8415, ... }
+    <name not found> = ArrayList@11777[7] { ResolutionCandidate@8328, ResolutionCandidate@8329, ResolutionCandidate@8330, ... }
+    <name not found> = ArrayList@11778[7] { ResolutionCandidate@8283, ResolutionCandidate@8284, ResolutionCandidate@8285, ... }
+    <name not found> = ArrayList@11779[7] { ResolutionCandidate@7983, ResolutionCandidate@7984, ResolutionCandidate@7985, ... }
+    <name not found> = ArrayList@11780[7] { ResolutionCandidate@8408, ResolutionCandidate@8409, ResolutionCandidate@8410, ... }
+    <name not found> = ArrayList@11781[7] { ResolutionCandidate@8263, ResolutionCandidate@8264, ResolutionCandidate@8265, ... }
+    <name not found> = ArrayList@11782[7] { ResolutionCandidate@7958, ResolutionCandidate@7959, ResolutionCandidate@7960, ... }
+    <name not found> = ArrayList@11783[7] { ResolutionCandidate@8078, ResolutionCandidate@8079, ResolutionCandidate@8080, ... }
+    <name not found> = ArrayList@11784[7] { ResolutionCandidate@7993, ResolutionCandidate@7994, ResolutionCandidate@7995, ... }
+    <name not found> = ArrayList@11785[7] { ResolutionCandidate@8678, ResolutionCandidate@8679, ResolutionCandidate@8680, ... }
+    <name not found> = ArrayList@11786[7] { ResolutionCandidate@7953, ResolutionCandidate@7954, ResolutionCandidate@7955, ... }
+    <name not found> = ArrayList@11787[7] { ResolutionCandidate@8288, ResolutionCandidate@8289, ResolutionCandidate@8290, ... }
+    <name not found> = ArrayList@11788[7] { ResolutionCandidate@8233, ResolutionCandidate@8234, ResolutionCandidate@8235, ... }
+    <name not found> = ArrayList@11789[7] { ResolutionCandidate@8533, ResolutionCandidate@8534, ResolutionCandidate@8535, ... }
+    <name not found> = ArrayList@11790[7] { ResolutionCandidate@8493, ResolutionCandidate@8494, ResolutionCandidate@8495, ... }
+    <name not found> = ArrayList@11791[7] { ResolutionCandidate@8228, ResolutionCandidate@8229, ResolutionCandidate@8230, ... }
+    <name not found> = ArrayList@11792[7] { ResolutionCandidate@8158, ResolutionCandidate@8159, ResolutionCandidate@8160, ... }
+    <name not found> = ArrayList@11793[7] { ResolutionCandidate@7923, ResolutionCandidate@7924, ResolutionCandidate@7925, ... }
+    <name not found> = ArrayList@11794[7] { ResolutionCandidate@8638, ResolutionCandidate@8639, ResolutionCandidate@8640, ... }
+    <name not found> = ArrayList@11795[7] { ResolutionCandidate@8238, ResolutionCandidate@8239, ResolutionCandidate@8240, ... }
+    <name not found> = ArrayList@11796[7] { ResolutionCandidate@8028, ResolutionCandidate@8029, ResolutionCandidate@8030, ... }
+    <name not found> = ArrayList@11797[7] { ResolutionCandidate@8038, ResolutionCandidate@8039, ResolutionCandidate@8040, ... }
+    <name not found> = ArrayList@11798[7] { ResolutionCandidate@7913, ResolutionCandidate@7914, ResolutionCandidate@7915, ... }
+    <name not found> = ArrayList@11799[7] { ResolutionCandidate@8573, ResolutionCandidate@8574, ResolutionCandidate@8575, ... }
+    <name not found> = ArrayList@11800[7] { ResolutionCandidate@7918, ResolutionCandidate@7919, ResolutionCandidate@7920, ... }
+    <name not found> = ArrayList@11801[7] { ResolutionCandidate@8343, ResolutionCandidate@8344, ResolutionCandidate@8345, ... }
+    <name not found> = ArrayList@11802[7] { ResolutionCandidate@7973, ResolutionCandidate@7974, ResolutionCandidate@7975, ... }
+    <name not found> = ArrayList@11803[7] { ResolutionCandidate@8073, ResolutionCandidate@8074, ResolutionCandidate@8075, ... }
+    <name not found> = ArrayList@11804[7] { ResolutionCandidate@8113, ResolutionCandidate@8114, ResolutionCandidate@8115, ... }
+    <name not found> = ArrayList@11805[7] { ResolutionCandidate@8003, ResolutionCandidate@8004, ResolutionCandidate@8005, ... }
+    <name not found> = ArrayList@11806[7] { ResolutionCandidate@8448, ResolutionCandidate@8449, ResolutionCandidate@8450, ... }
+    <name not found> = ArrayList@11807[7] { ResolutionCandidate@8103, ResolutionCandidate@8104, ResolutionCandidate@8105, ... }
+    <name not found> = ArrayList@11808[7] { ResolutionCandidate@7988, ResolutionCandidate@7989, ResolutionCandidate@7990, ... }
+    <name not found> = ArrayList@11809[7] { ResolutionCandidate@8198, ResolutionCandidate@8199, ResolutionCandidate@8200, ... }
+    <name not found> = ArrayList@11810[7] { ResolutionCandidate@8338, ResolutionCandidate@8339, ResolutionCandidate@8340, ... }
+    <name not found> = ArrayList@11811[7] { ResolutionCandidate@8138, ResolutionCandidate@8139, ResolutionCandidate@8140, ... }
+    <name not found> = ArrayList@11812[7] { ResolutionCandidate@8423, ResolutionCandidate@8424, ResolutionCandidate@8425, ... }
+    <name not found> = ArrayList@11813[7] { ResolutionCandidate@8008, ResolutionCandidate@8009, ResolutionCandidate@8010, ... }
+    <name not found> = ArrayList@11814[7] { ResolutionCandidate@8478, ResolutionCandidate@8479, ResolutionCandidate@8480, ... }
+    <name not found> = ArrayList@11815[7] { ResolutionCandidate@8688, ResolutionCandidate@8689, ResolutionCandidate@8690, ... }
+    <name not found> = ArrayList@11816[7] { ResolutionCandidate@8323, ResolutionCandidate@8324, ResolutionCandidate@8325, ... }
+    <name not found> = ArrayList@11817[7] { ResolutionCandidate@8373, ResolutionCandidate@8374, ResolutionCandidate@8375, ... }
+    <name not found> = ArrayList@11818[7] { ResolutionCandidate@7868, ResolutionCandidate@7869, ResolutionCandidate@7870, ... }
+    <name not found> = ArrayList@11819[7] { ResolutionCandidate@8523, ResolutionCandidate@8524, ResolutionCandidate@8525, ... }
+    <name not found> = ArrayList@11820[7] { ResolutionCandidate@8543, ResolutionCandidate@8544, ResolutionCandidate@8545, ... }
+    <name not found> = ArrayList@11821[7] { ResolutionCandidate@7858, ResolutionCandidate@7859, ResolutionCandidate@7860, ... }
+    <name not found> = ArrayList@11822[7] { ResolutionCandidate@8683, ResolutionCandidate@8684, ResolutionCandidate@8685, ... }
+    <name not found> = ArrayList@11823[7] { ResolutionCandidate@7943, ResolutionCandidate@7944, ResolutionCandidate@7945, ... }
+    <name not found> = ArrayList@11824[7] { ResolutionCandidate@8473, ResolutionCandidate@8474, ResolutionCandidate@8475, ... }
+    <name not found> = ArrayList@11825[7] { ResolutionCandidate@8053, ResolutionCandidate@8054, ResolutionCandidate@8055, ... }
+    <name not found> = ArrayList@11826[7] { ResolutionCandidate@8153, ResolutionCandidate@8154, ResolutionCandidate@8155, ... }
+    <name not found> = ArrayList@11827[7] { ResolutionCandidate@8463, ResolutionCandidate@8464, ResolutionCandidate@8465, ... }
+    <name not found> = ArrayList@11828[7] { ResolutionCandidate@8708, ResolutionCandidate@8709, ResolutionCandidate@8710, ... }
+    <name not found> = ArrayList@11829[7] { ResolutionCandidate@8668, ResolutionCandidate@8669, ResolutionCandidate@8670, ... }
+    <name not found> = ArrayList@11830[7] { ResolutionCandidate@8183, ResolutionCandidate@8184, ResolutionCandidate@8185, ... }
+    <name not found> = ArrayList@11831[7] { ResolutionCandidate@8553, ResolutionCandidate@8554, ResolutionCandidate@8555, ... }
+    <name not found> = ArrayList@11832[7] { ResolutionCandidate@8518, ResolutionCandidate@8519, ResolutionCandidate@8520, ... }
+    <name not found> = ArrayList@11833[7] { ResolutionCandidate@8083, ResolutionCandidate@8084, ResolutionCandidate@8085, ... }
+    <name not found> = ArrayList@11834[7] { ResolutionCandidate@8403, ResolutionCandidate@8404, ResolutionCandidate@8405, ... }
+    <name not found> = ArrayList@11835[7] { ResolutionCandidate@8023, ResolutionCandidate@8024, ResolutionCandidate@8025, ... }
+    <name not found> = ArrayList@11836[7] { ResolutionCandidate@8248, ResolutionCandidate@8249, ResolutionCandidate@8250, ... }
+    <name not found> = ArrayList@11837[7] { ResolutionCandidate@8508, ResolutionCandidate@8509, ResolutionCandidate@8510, ... }
+    <name not found> = ArrayList@11838[7] { ResolutionCandidate@8393, ResolutionCandidate@8394, ResolutionCandidate@8395, ... }
+    <name not found> = ArrayList@11839[7] { ResolutionCandidate@8203, ResolutionCandidate@8204, ResolutionCandidate@8205, ... }
+    <name not found> = ArrayList@11840[7] { ResolutionCandidate@8693, ResolutionCandidate@8694, ResolutionCandidate@8695, ... }
+    <name not found> = ArrayList@11841[7] { ResolutionCandidate@8268, ResolutionCandidate@8269, ResolutionCandidate@8270, ... }
+    <name not found> = ArrayList@11842[7] { ResolutionCandidate@8618, ResolutionCandidate@8619, ResolutionCandidate@8620, ... }
+    <name not found> = ArrayList@11843[7] { ResolutionCandidate@8703, ResolutionCandidate@8704, ResolutionCandidate@8705, ... }
+    <name not found> = ArrayList@11844[7] { ResolutionCandidate@8528, ResolutionCandidate@8529, ResolutionCandidate@8530, ... }
+    <name not found> = ArrayList@11845[7] { ResolutionCandidate@7893, ResolutionCandidate@7894, ResolutionCandidate@7895, ... }
+    <name not found> = ArrayList@11846[7] { ResolutionCandidate@8658, ResolutionCandidate@8659, ResolutionCandidate@8660, ... }
+    <name not found> = ArrayList@11847[7] { ResolutionCandidate@8613, ResolutionCandidate@8614, ResolutionCandidate@8615, ... }
+    <name not found> = ArrayList@11848[7] { ResolutionCandidate@8628, ResolutionCandidate@8629, ResolutionCandidate@8630, ... }
+    <name not found> = ArrayList@11849[7] { ResolutionCandidate@8058, ResolutionCandidate@8059, ResolutionCandidate@8060, ... }
+    <name not found> = ArrayList@11850[7] { ResolutionCandidate@8568, ResolutionCandidate@8569, ResolutionCandidate@8570, ... }
+    <name not found> = ArrayList@11851[7] { ResolutionCandidate@8388, ResolutionCandidate@8389, ResolutionCandidate@8390, ... }
+    <name not found> = ArrayList@11852[7] { ResolutionCandidate@8128, ResolutionCandidate@8129, ResolutionCandidate@8130, ... }
+    <name not found> = ArrayList@11853[7] { ResolutionCandidate@8603, ResolutionCandidate@8604, ResolutionCandidate@8605, ... }
+    <name not found> = ArrayList@11854[7] { ResolutionCandidate@8488, ResolutionCandidate@8489, ResolutionCandidate@8490, ... }
+    <name not found> = ArrayList@11855[7] { ResolutionCandidate@8713, ResolutionCandidate@8714, ResolutionCandidate@8715, ... }
+    <name not found> = ArrayList@11856[7] { ResolutionCandidate@8208, ResolutionCandidate@8209, ResolutionCandidate@8210, ... }
+    <name not found> = ArrayList@11857[7] { ResolutionCandidate@8428, ResolutionCandidate@8429, ResolutionCandidate@8430, ... }
+    <name not found> = ArrayList@11858[7] { ResolutionCandidate@8318, ResolutionCandidate@8319, ResolutionCandidate@8320, ... }
+    <name not found> = ArrayList@11859[7] { ResolutionCandidate@8358, ResolutionCandidate@8359, ResolutionCandidate@8360, ... }
+    <name not found> = ArrayList@11860[7] { ResolutionCandidate@8418, ResolutionCandidate@8419, ResolutionCandidate@8420, ... }
+    <name not found> = ArrayList@11861[7] { ResolutionCandidate@8513, ResolutionCandidate@8514, ResolutionCandidate@8515, ... }
+    <name not found> = ArrayList@11862[7] { ResolutionCandidate@8633, ResolutionCandidate@8634, ResolutionCandidate@8635, ... }
+    <name not found> = ArrayList@11863[7] { ResolutionCandidate@8043, ResolutionCandidate@8044, ResolutionCandidate@8045, ... }
+    <name not found> = ArrayList@11864[7] { ResolutionCandidate@8178, ResolutionCandidate@8179, ResolutionCandidate@8180, ... }
+    <name not found> = ArrayList@11865[7] { ResolutionCandidate@8433, ResolutionCandidate@8434, ResolutionCandidate@8435, ... }
+    <name not found> = ArrayList@11866[7] { ResolutionCandidate@7948, ResolutionCandidate@7949, ResolutionCandidate@7950, ... }
+    <name not found> = ArrayList@11867[7] { ResolutionCandidate@8068, ResolutionCandidate@8069, ResolutionCandidate@8070, ... }
+    <name not found> = ArrayList@11868[7] { ResolutionCandidate@8548, ResolutionCandidate@8549, ResolutionCandidate@8550, ... }
+    <name not found> = ArrayList@11869[7] { ResolutionCandidate@7903, ResolutionCandidate@7904, ResolutionCandidate@7905, ... }
+    <name not found> = ArrayList@11870[7] { ResolutionCandidate@8163, ResolutionCandidate@8164, ResolutionCandidate@8165, ... }
+    <name not found> = ArrayList@11871[7] { ResolutionCandidate@8088, ResolutionCandidate@8089, ResolutionCandidate@8090, ... }
+    <name not found> = ArrayList@11872[7] { ResolutionCandidate@8673, ResolutionCandidate@8674, ResolutionCandidate@8675, ... }
+    <name not found> = ArrayList@11873[7] { ResolutionCandidate@8093, ResolutionCandidate@8094, ResolutionCandidate@8095, ... }
+    <name not found> = ArrayList@11874[7] { ResolutionCandidate@8643, ResolutionCandidate@8644, ResolutionCandidate@8645, ... }
+    <name not found> = ArrayList@11875[7] { ResolutionCandidate@7928, ResolutionCandidate@7929, ResolutionCandidate@7930, ... }
+    <name not found> = ArrayList@11876[7] { ResolutionCandidate@8123, ResolutionCandidate@8124, ResolutionCandidate@8125, ... }
+    <name not found> = ArrayList@11877[7] { ResolutionCandidate@8218, ResolutionCandidate@8219, ResolutionCandidate@8220, ... }
+    <name not found> = ArrayList@11878[7] { ResolutionCandidate@8193, ResolutionCandidate@8194, ResolutionCandidate@8195, ... }
+    <name not found> = ArrayList@11879[7] { ResolutionCandidate@8133, ResolutionCandidate@8134, ResolutionCandidate@8135, ... }
+    <name not found> = ArrayList@11880[7] { ResolutionCandidate@7888, ResolutionCandidate@7889, ResolutionCandidate@7890, ... }
+    <name not found> = ArrayList@11881[7] { ResolutionCandidate@8648, ResolutionCandidate@8649, ResolutionCandidate@8650, ... }
+    <name not found> = ArrayList@11882[7] { ResolutionCandidate@7933, ResolutionCandidate@7934, ResolutionCandidate@7935, ... }
+    <name not found> = ArrayList@11883[7] { ResolutionCandidate@8453, ResolutionCandidate@8454, ResolutionCandidate@8455, ... }
+    <name not found> = ArrayList@11884[7] { ResolutionCandidate@7898, ResolutionCandidate@7899, ResolutionCandidate@7900, ... }
+    <name not found> = ArrayList@11885[7] { ResolutionCandidate@7978, ResolutionCandidate@7979, ResolutionCandidate@7980, ... }
+    <name not found> = ArrayList@11886[7] { ResolutionCandidate@8608, ResolutionCandidate@8609, ResolutionCandidate@8610, ... }
+    <name not found> = ArrayList@11887[7] { ResolutionCandidate@7998, ResolutionCandidate@7999, ResolutionCandidate@8000, ... }
+    <name not found> = ArrayList@11888[7] { ResolutionCandidate@8118, ResolutionCandidate@8119, ResolutionCandidate@8120, ... }
+    <name not found> = ArrayList@11889[7] { ResolutionCandidate@8258, ResolutionCandidate@8259, ResolutionCandidate@8260, ... }
+    <name not found> = ArrayList@11890[7] { ResolutionCandidate@8583, ResolutionCandidate@8584, ResolutionCandidate@8585, ... }
+    <name not found> = ArrayList@11891[7] { ResolutionCandidate@8348, ResolutionCandidate@8349, ResolutionCandidate@8350, ... }
+    <name not found> = ArrayList@11892[7] { ResolutionCandidate@8503, ResolutionCandidate@8504, ResolutionCandidate@8505, ... }
+    <name not found> = ArrayList@11893[7] { ResolutionCandidate@8188, ResolutionCandidate@8189, ResolutionCandidate@8190, ... }
+    <name not found> = ArrayList@11894[7] { ResolutionCandidate@8048, ResolutionCandidate@8049, ResolutionCandidate@8050, ... }
+    <name not found> = ArrayList@11895[7] { ResolutionCandidate@7968, ResolutionCandidate@7969, ResolutionCandidate@7970, ... }
+    <name not found> = ArrayList@11896[7] { ResolutionCandidate@8578, ResolutionCandidate@8579, ResolutionCandidate@8580, ... }
+    <name not found> = ArrayList@11897[7] { ResolutionCandidate@8378, ResolutionCandidate@8379, ResolutionCandidate@8380, ... }
+    <name not found> = ArrayList@11898[7] { ResolutionCandidate@8278, ResolutionCandidate@8279, ResolutionCandidate@8280, ... }
+    <name not found> = ArrayList@11899[7] { ResolutionCandidate@8213, ResolutionCandidate@8214, ResolutionCandidate@8215, ... }
+    <name not found> = ArrayList@11900[7] { ResolutionCandidate@8598, ResolutionCandidate@8599, ResolutionCandidate@8600, ... }
+    <name not found> = ArrayList@11901[7] { ResolutionCandidate@8588, ResolutionCandidate@8589, ResolutionCandidate@8590, ... }
+    <name not found> = ArrayList@11902[7] { ResolutionCandidate@8353, ResolutionCandidate@8354, ResolutionCandidate@8355, ... }
+    <name not found> = ArrayList@11903[7] { ResolutionCandidate@7873, ResolutionCandidate@7874, ResolutionCandidate@7875, ... }
+    <name not found> = ArrayList@11904[7] { ResolutionCandidate@8653, ResolutionCandidate@8654, ResolutionCandidate@8655, ... }
+    <name not found> = ArrayList@11905[7] { ResolutionCandidate@8148, ResolutionCandidate@8149, ResolutionCandidate@8150, ... }
+    <name not found> = ArrayList@11906[7] { ResolutionCandidate@8593, ResolutionCandidate@8594, ResolutionCandidate@8595, ... }
+    <name not found> = ArrayList@11907[7] { ResolutionCandidate@7878, ResolutionCandidate@7879, ResolutionCandidate@7880, ... }
+    <name not found> = ArrayList@11908[7] { ResolutionCandidate@8173, ResolutionCandidate@8174, ResolutionCandidate@8175, ... }
+    <name not found> = ArrayList@11909[7] { ResolutionCandidate@8368, ResolutionCandidate@8369, ResolutionCandidate@8370, ... }
+    <name not found> = ArrayList@11910[7] { ResolutionCandidate@8293, ResolutionCandidate@8294, ResolutionCandidate@8295, ... }
+    <name not found> = ArrayList@11911[7] { ResolutionCandidate@8458, ResolutionCandidate@8459, ResolutionCandidate@8460, ... }
+    <name not found> = ArrayList@11912[7] { ResolutionCandidate@8298, ResolutionCandidate@8299, ResolutionCandidate@8300, ... }
+    <name not found> = ArrayList@11913[7] { ResolutionCandidate@8663, ResolutionCandidate@8664, ResolutionCandidate@8665, ... }
+    <name not found> = ArrayList@11914[7] { ResolutionCandidate@8273, ResolutionCandidate@8274, ResolutionCandidate@8275, ... }
+    <name not found> = ArrayList@11915[7] { ResolutionCandidate@8498, ResolutionCandidate@8499, ResolutionCandidate@8500, ... }
+    <name not found> = ArrayList@11916[7] { ResolutionCandidate@8108, ResolutionCandidate@8109, ResolutionCandidate@8110, ... }
+    <name not found> = ArrayList@11917[7] { ResolutionCandidate@8223, ResolutionCandidate@8224, ResolutionCandidate@8225, ... }
+    <name not found> = ArrayList@11918[7] { ResolutionCandidate@8333, ResolutionCandidate@8334, ResolutionCandidate@8335, ... }
+    <name not found> = ArrayList@11919[7] { ResolutionCandidate@7908, ResolutionCandidate@7909, ResolutionCandidate@7910, ... }
+    <name not found> = ArrayList@11920[7] { ResolutionCandidate@8308, ResolutionCandidate@8309, ResolutionCandidate@8310, ... }
+    <name not found> = ArrayList@11921[7] { ResolutionCandidate@8063, ResolutionCandidate@8064, ResolutionCandidate@8065, ... }
+    <name not found> = ArrayList@11922[7] { ResolutionCandidate@8468, ResolutionCandidate@8469, ResolutionCandidate@8470, ... }
+    <name not found> = ArrayList@11923[7] { ResolutionCandidate@8313, ResolutionCandidate@8314, ResolutionCandidate@8315, ... }
+    <name not found> = ArrayList@11924[7] { ResolutionCandidate@8623, ResolutionCandidate@8624, ResolutionCandidate@8625, ... }
+    <name not found> = ArrayList@11925[7] { ResolutionCandidate@7938, ResolutionCandidate@7939, ResolutionCandidate@7940, ... }
+    <name not found> = ArrayList@11926[7] { ResolutionCandidate@8243, ResolutionCandidate@8244, ResolutionCandidate@8245, ... }
+    <name not found> = ArrayList@11927[7] { ResolutionCandidate@7863, ResolutionCandidate@7864, ResolutionCandidate@7865, ... }
+    <name not found> = ArrayList@11928[7] { ResolutionCandidate@8018, ResolutionCandidate@8019, ResolutionCandidate@8020, ... }
+    <name not found> = ArrayList@11929[7] { ResolutionCandidate@7963, ResolutionCandidate@7964, ResolutionCandidate@7965, ... }
+    <name not found> = ArrayList@11930[7] { ResolutionCandidate@8563, ResolutionCandidate@8564, ResolutionCandidate@8565, ... }
+    <name not found> = ArrayList@11931[7] { ResolutionCandidate@8483, ResolutionCandidate@8484, ResolutionCandidate@8485, ... }
+    <name not found> = ArrayList@11932[7] { ResolutionCandidate@8033, ResolutionCandidate@8034, ResolutionCandidate@8035, ... }
+    <name not found> = ArrayList@11933[7] { ResolutionCandidate@8443, ResolutionCandidate@8444, ResolutionCandidate@8445, ... }
+    <name not found> = ArrayList@11934[7] { ResolutionCandidate@8718, ResolutionCandidate@8719, ResolutionCandidate@8720, ... }
+    <name not found> = ArrayList@11935[7] { ResolutionCandidate@8303, ResolutionCandidate@8304, ResolutionCandidate@8305, ... }
+    <name not found> = ArrayList@11936[7] { ResolutionCandidate@8698, ResolutionCandidate@8699, ResolutionCandidate@8700, ... }
+    <name not found> = ArrayList@11937[7] { ResolutionCandidate@8398, ResolutionCandidate@8399, ResolutionCandidate@8400, ... }
+    <name not found> = ArrayList@11938[7] { ResolutionCandidate@8438, ResolutionCandidate@8439, ResolutionCandidate@8440, ... }
+    <name not found> = ArrayList@11939[7] { ResolutionCandidate@8013, ResolutionCandidate@8014, ResolutionCandidate@8015, ... }
+    <name not found> = ArrayList@11940[7] { ResolutionCandidate@7883, ResolutionCandidate@7884, ResolutionCandidate@7885, ... }
+    <name not found> = ArrayList@11941[7] { ResolutionCandidate@8098, ResolutionCandidate@8099, ResolutionCandidate@8100, ... }
+    <name not found> = ArrayList@11942[8] { ResolutionCandidate@9238, ResolutionCandidate@9239, ResolutionCandidate@9240, ... }
+    <name not found> = ArrayList@11943[8] { ResolutionCandidate@8848, ResolutionCandidate@8849, ResolutionCandidate@8850, ... }
+    <name not found> = ArrayList@11944[8] { ResolutionCandidate@8908, ResolutionCandidate@8909, ResolutionCandidate@8910, ... }
+    <name not found> = ArrayList@11945[8] { ResolutionCandidate@8943, ResolutionCandidate@8944, ResolutionCandidate@8945, ... }
+    <name not found> = ArrayList@11946[8] { ResolutionCandidate@9068, ResolutionCandidate@9069, ResolutionCandidate@9070, ... }
+    <name not found> = ArrayList@11947[8] { ResolutionCandidate@8798, ResolutionCandidate@8799, ResolutionCandidate@8800, ... }
+    <name not found> = ArrayList@11948[8] { ResolutionCandidate@8763, ResolutionCandidate@8764, ResolutionCandidate@8765, ... }
+    <name not found> = ArrayList@11949[8] { ResolutionCandidate@9163, ResolutionCandidate@9164, ResolutionCandidate@9165, ... }
+    <name not found> = ArrayList@11950[8] { ResolutionCandidate@9078, ResolutionCandidate@9079, ResolutionCandidate@9080, ... }
+    <name not found> = ArrayList@11951[8] { ResolutionCandidate@8963, ResolutionCandidate@8964, ResolutionCandidate@8965, ... }
+    <name not found> = ArrayList@11952[8] { ResolutionCandidate@9158, ResolutionCandidate@9159, ResolutionCandidate@9160, ... }
+    <name not found> = ArrayList@11953[8] { ResolutionCandidate@8833, ResolutionCandidate@8834, ResolutionCandidate@8835, ... }
+    <name not found> = ArrayList@11954[8] { ResolutionCandidate@8863, ResolutionCandidate@8864, ResolutionCandidate@8865, ... }
+    <name not found> = ArrayList@11955[8] { ResolutionCandidate@9188, ResolutionCandidate@9189, ResolutionCandidate@9190, ... }
+    <name not found> = ArrayList@11956[8] { ResolutionCandidate@9153, ResolutionCandidate@9154, ResolutionCandidate@9155, ... }
+    <name not found> = ArrayList@11957[8] { ResolutionCandidate@8778, ResolutionCandidate@8779, ResolutionCandidate@8780, ... }
+    <name not found> = ArrayList@11958[8] { ResolutionCandidate@9058, ResolutionCandidate@9059, ResolutionCandidate@9060, ... }
+    <name not found> = ArrayList@11959[8] { ResolutionCandidate@9178, ResolutionCandidate@9179, ResolutionCandidate@9180, ... }
+    <name not found> = ArrayList@11960[8] { ResolutionCandidate@8983, ResolutionCandidate@8984, ResolutionCandidate@8985, ... }
+    <name not found> = ArrayList@11961[8] { ResolutionCandidate@8748, ResolutionCandidate@8749, ResolutionCandidate@8750, ... }
+    <name not found> = ArrayList@11962[8] { ResolutionCandidate@9148, ResolutionCandidate@9149, ResolutionCandidate@9150, ... }
+    <name not found> = ArrayList@11963[8] { ResolutionCandidate@9193, ResolutionCandidate@9194, ResolutionCandidate@9195, ... }
+    <name not found> = ArrayList@11964[8] { ResolutionCandidate@8913, ResolutionCandidate@8914, ResolutionCandidate@8915, ... }
+    <name not found> = ArrayList@11965[8] { ResolutionCandidate@9023, ResolutionCandidate@9024, ResolutionCandidate@9025, ... }
+    <name not found> = ArrayList@11966[8] { ResolutionCandidate@8893, ResolutionCandidate@8894, ResolutionCandidate@8895, ... }
+    <name not found> = ArrayList@11967[8] { ResolutionCandidate@9263, ResolutionCandidate@9264, ResolutionCandidate@9265, ... }
+    <name not found> = ArrayList@11968[8] { ResolutionCandidate@8903, ResolutionCandidate@8904, ResolutionCandidate@8905, ... }
+    <name not found> = ArrayList@11969[8] { ResolutionCandidate@9173, ResolutionCandidate@9174, ResolutionCandidate@9175, ... }
+    <name not found> = ArrayList@11970[8] { ResolutionCandidate@9053, ResolutionCandidate@9054, ResolutionCandidate@9055, ... }
+    <name not found> = ArrayList@11971[8] { ResolutionCandidate@9033, ResolutionCandidate@9034, ResolutionCandidate@9035, ... }
+    <name not found> = ArrayList@11972[8] { ResolutionCandidate@8773, ResolutionCandidate@8774, ResolutionCandidate@8775, ... }
+    <name not found> = ArrayList@11973[8] { ResolutionCandidate@9118, ResolutionCandidate@9119, ResolutionCandidate@9120, ... }
+    <name not found> = ArrayList@11974[8] { ResolutionCandidate@8948, ResolutionCandidate@8949, ResolutionCandidate@8950, ... }
+    <name not found> = ArrayList@11975[8] { ResolutionCandidate@9258, ResolutionCandidate@9259, ResolutionCandidate@9260, ... }
+    <name not found> = ArrayList@11976[8] { ResolutionCandidate@9253, ResolutionCandidate@9254, ResolutionCandidate@9255, ... }
+    <name not found> = ArrayList@11977[8] { ResolutionCandidate@8838, ResolutionCandidate@8839, ResolutionCandidate@8840, ... }
+    <name not found> = ArrayList@11978[8] { ResolutionCandidate@9018, ResolutionCandidate@9019, ResolutionCandidate@9020, ... }
+    <name not found> = ArrayList@11979[8] { ResolutionCandidate@9088, ResolutionCandidate@9089, ResolutionCandidate@9090, ... }
+    <name not found> = ArrayList@11980[8] { ResolutionCandidate@8793, ResolutionCandidate@8794, ResolutionCandidate@8795, ... }
+    <name not found> = ArrayList@11981[8] { ResolutionCandidate@8873, ResolutionCandidate@8874, ResolutionCandidate@8875, ... }
+    <name not found> = ArrayList@11982[8] { ResolutionCandidate@8938, ResolutionCandidate@8939, ResolutionCandidate@8940, ... }
+    <name not found> = ArrayList@11983[8] { ResolutionCandidate@8803, ResolutionCandidate@8804, ResolutionCandidate@8805, ... }
+    <name not found> = ArrayList@11984[8] { ResolutionCandidate@8878, ResolutionCandidate@8879, ResolutionCandidate@8880, ... }
+    <name not found> = ArrayList@11985[8] { ResolutionCandidate@8898, ResolutionCandidate@8899, ResolutionCandidate@8900, ... }
+    <name not found> = ArrayList@11986[8] { ResolutionCandidate@8808, ResolutionCandidate@8809, ResolutionCandidate@8810, ... }
+    <name not found> = ArrayList@11987[8] { ResolutionCandidate@9218, ResolutionCandidate@9219, ResolutionCandidate@9220, ... }
+    <name not found> = ArrayList@11988[8] { ResolutionCandidate@9103, ResolutionCandidate@9104, ResolutionCandidate@9105, ... }
+    <name not found> = ArrayList@11989[8] { ResolutionCandidate@8728, ResolutionCandidate@8729, ResolutionCandidate@8730, ... }
+    <name not found> = ArrayList@11990[8] { ResolutionCandidate@9213, ResolutionCandidate@9214, ResolutionCandidate@9215, ... }
+    <name not found> = ArrayList@11991[8] { ResolutionCandidate@8988, ResolutionCandidate@8989, ResolutionCandidate@8990, ... }
+    <name not found> = ArrayList@11992[8] { ResolutionCandidate@9128, ResolutionCandidate@9129, ResolutionCandidate@9130, ... }
+    <name not found> = ArrayList@11993[8] { ResolutionCandidate@8858, ResolutionCandidate@8859, ResolutionCandidate@8860, ... }
+    <name not found> = ArrayList@11994[8] { ResolutionCandidate@8828, ResolutionCandidate@8829, ResolutionCandidate@8830, ... }
+    <name not found> = ArrayList@11995[8] { ResolutionCandidate@9168, ResolutionCandidate@9169, ResolutionCandidate@9170, ... }
+    <name not found> = ArrayList@11996[8] { ResolutionCandidate@9133, ResolutionCandidate@9134, ResolutionCandidate@9135, ... }
+    <name not found> = ArrayList@11997[8] { ResolutionCandidate@9198, ResolutionCandidate@9199, ResolutionCandidate@9200, ... }
+    <name not found> = ArrayList@11998[8] { ResolutionCandidate@9138, ResolutionCandidate@9139, ResolutionCandidate@9140, ... }
+    <name not found> = ArrayList@11999[8] { ResolutionCandidate@8813, ResolutionCandidate@8814, ResolutionCandidate@8815, ... }
+    <name not found> = ArrayList@12000[8] { ResolutionCandidate@8998, ResolutionCandidate@8999, ResolutionCandidate@9000, ... }
+    <name not found> = ArrayList@12001[8] { ResolutionCandidate@9203, ResolutionCandidate@9204, ResolutionCandidate@9205, ... }
+    <name not found> = ArrayList@12002[8] { ResolutionCandidate@9008, ResolutionCandidate@9009, ResolutionCandidate@9010, ... }
+    <name not found> = ArrayList@12003[8] { ResolutionCandidate@8888, ResolutionCandidate@8889, ResolutionCandidate@8890, ... }
+    <name not found> = ArrayList@12004[8] { ResolutionCandidate@9243, ResolutionCandidate@9244, ResolutionCandidate@9245, ... }
+    <name not found> = ArrayList@12005[8] { ResolutionCandidate@9048, ResolutionCandidate@9049, ResolutionCandidate@9050, ... }
+    <name not found> = ArrayList@12006[8] { ResolutionCandidate@8883, ResolutionCandidate@8884, ResolutionCandidate@8885, ... }
+    <name not found> = ArrayList@12007[8] { ResolutionCandidate@8918, ResolutionCandidate@8919, ResolutionCandidate@8920, ... }
+    <name not found> = ArrayList@12008[8] { ResolutionCandidate@8768, ResolutionCandidate@8769, ResolutionCandidate@8770, ... }
+    <name not found> = ArrayList@12009[8] { ResolutionCandidate@8818, ResolutionCandidate@8819, ResolutionCandidate@8820, ... }
+    <name not found> = ArrayList@12010[8] { ResolutionCandidate@9113, ResolutionCandidate@9114, ResolutionCandidate@9115, ... }
+    <name not found> = ArrayList@12011[8] { ResolutionCandidate@9143, ResolutionCandidate@9144, ResolutionCandidate@9145, ... }
+    <name not found> = ArrayList@12012[8] { ResolutionCandidate@8853, ResolutionCandidate@8854, ResolutionCandidate@8855, ... }
+    <name not found> = ArrayList@12013[8] { ResolutionCandidate@9043, ResolutionCandidate@9044, ResolutionCandidate@9045, ... }
+    <name not found> = ArrayList@12014[8] { ResolutionCandidate@9093, ResolutionCandidate@9094, ResolutionCandidate@9095, ... }
+    <name not found> = ArrayList@12015[8] { ResolutionCandidate@8953, ResolutionCandidate@8954, ResolutionCandidate@8955, ... }
+    <name not found> = ArrayList@12016[8] { ResolutionCandidate@8928, ResolutionCandidate@8929, ResolutionCandidate@8930, ... }
+    <name not found> = ArrayList@12017[8] { ResolutionCandidate@9228, ResolutionCandidate@9229, ResolutionCandidate@9230, ... }
+    <name not found> = ArrayList@12018[8] { ResolutionCandidate@8978, ResolutionCandidate@8979, ResolutionCandidate@8980, ... }
+    <name not found> = ArrayList@12019[8] { ResolutionCandidate@9038, ResolutionCandidate@9039, ResolutionCandidate@9040, ... }
+    <name not found> = ArrayList@12020[8] { ResolutionCandidate@9233, ResolutionCandidate@9234, ResolutionCandidate@9235, ... }
+    <name not found> = ArrayList@12021[8] { ResolutionCandidate@8973, ResolutionCandidate@8974, ResolutionCandidate@8975, ... }
+    <name not found> = ArrayList@12022[8] { ResolutionCandidate@9208, ResolutionCandidate@9209, ResolutionCandidate@9210, ... }
+    <name not found> = ArrayList@12023[8] { ResolutionCandidate@9123, ResolutionCandidate@9124, ResolutionCandidate@9125, ... }
+    <name not found> = ArrayList@12024[8] { ResolutionCandidate@8958, ResolutionCandidate@8959, ResolutionCandidate@8960, ... }
+    <name not found> = ArrayList@12025[8] { ResolutionCandidate@9003, ResolutionCandidate@9004, ResolutionCandidate@9005, ... }
+    <name not found> = ArrayList@12026[8] { ResolutionCandidate@8753, ResolutionCandidate@8754, ResolutionCandidate@8755, ... }
+    <name not found> = ArrayList@12027[8] { ResolutionCandidate@8923, ResolutionCandidate@8924, ResolutionCandidate@8925, ... }
+    <name not found> = ArrayList@12028[8] { ResolutionCandidate@8823, ResolutionCandidate@8824, ResolutionCandidate@8825, ... }
+    <name not found> = ArrayList@12029[8] { ResolutionCandidate@8758, ResolutionCandidate@8759, ResolutionCandidate@8760, ... }
+    <name not found> = ArrayList@12030[8] { ResolutionCandidate@9108, ResolutionCandidate@9109, ResolutionCandidate@9110, ... }
+    <name not found> = ArrayList@12031[8] { ResolutionCandidate@8843, ResolutionCandidate@8844, ResolutionCandidate@8845, ... }
+    <name not found> = ArrayList@12032[8] { ResolutionCandidate@9028, ResolutionCandidate@9029, ResolutionCandidate@9030, ... }
+    <name not found> = ArrayList@12033[8] { ResolutionCandidate@8743, ResolutionCandidate@8744, ResolutionCandidate@8745, ... }
+    <name not found> = ArrayList@12034[8] { ResolutionCandidate@8783, ResolutionCandidate@8784, ResolutionCandidate@8785, ... }
+    <name not found> = ArrayList@12035[8] { ResolutionCandidate@9083, ResolutionCandidate@9084, ResolutionCandidate@9085, ... }
+    <name not found> = ArrayList@12036[8] { ResolutionCandidate@9063, ResolutionCandidate@9064, ResolutionCandidate@9065, ... }
+    <name not found> = ArrayList@12037[8] { ResolutionCandidate@9223, ResolutionCandidate@9224, ResolutionCandidate@9225, ... }
+    <name not found> = ArrayList@12038[8] { ResolutionCandidate@8738, ResolutionCandidate@8739, ResolutionCandidate@8740, ... }
+    <name not found> = ArrayList@12039[8] { ResolutionCandidate@9013, ResolutionCandidate@9014, ResolutionCandidate@9015, ... }
+    <name not found> = ArrayList@12040[8] { ResolutionCandidate@9183, ResolutionCandidate@9184, ResolutionCandidate@9185, ... }
+    <name not found> = ArrayList@12041[8] { ResolutionCandidate@8933, ResolutionCandidate@8934, ResolutionCandidate@8935, ... }
+    <name not found> = ArrayList@12042[8] { ResolutionCandidate@8993, ResolutionCandidate@8994, ResolutionCandidate@8995, ... }
+    <name not found> = ArrayList@12043[8] { ResolutionCandidate@9098, ResolutionCandidate@9099, ResolutionCandidate@9100, ... }
+    <name not found> = ArrayList@12044[8] { ResolutionCandidate@9248, ResolutionCandidate@9249, ResolutionCandidate@9250, ... }
+    <name not found> = ArrayList@12045[8] { ResolutionCandidate@9073, ResolutionCandidate@9074, ResolutionCandidate@9075, ... }
+    <name not found> = ArrayList@12046[8] { ResolutionCandidate@8733, ResolutionCandidate@8734, ResolutionCandidate@8735, ... }
+    <name not found> = ArrayList@12047[8] { ResolutionCandidate@8868, ResolutionCandidate@8869, ResolutionCandidate@8870, ... }
+    <name not found> = ArrayList@12048[8] { ResolutionCandidate@8968, ResolutionCandidate@8969, ResolutionCandidate@8970, ... }
+    <name not found> = ArrayList@12049[8] { ResolutionCandidate@8788, ResolutionCandidate@8789, ResolutionCandidate@8790, ... }
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/constructorNamedArguments.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/constructorNamedArguments.lazy.log
index f23e909db47..2891ed97167 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/constructorNamedArguments.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/constructorNamedArguments.lazy.log
@@ -96,9 +96,12 @@ LazyJavaPackageFragment@22['lang'] {
 
 ResolutionTaskHolder@56 {
     <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+}
+
+null {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/reified/arrayOfNullsReified.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/reified/arrayOfNullsReified.lazy.log
index 56bc0bf8d7e..672fdfa98f2 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/reified/arrayOfNullsReified.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/reified/arrayOfNullsReified.lazy.log
@@ -126,41 +126,44 @@ LazyJavaPackageFragment@19['lang'] {
 
 ResolutionTaskHolder@70 {
     <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
+}
+
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
 }
 
 ResolutionTaskHolder@82 {
     <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
 }
 
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+null {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@81 }
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/reified/nonCallableReiefied.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/reified/nonCallableReiefied.lazy.log
index 7350f208c55..488e5cd44b2 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/reified/nonCallableReiefied.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/reified/nonCallableReiefied.lazy.log
@@ -96,74 +96,77 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@64 {
     <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@49[empty]
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
     <name not found> = EmptyList@49[empty]
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
+}
+
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
 }
 
 ResolutionTaskHolder@76 {
     <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
 }
 
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
+}
+
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
 }
 
 ResolutionTaskHolder@88 {
     <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
 }
 
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
+}
+
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
 }
 
 ResolutionTaskHolder@100 {
     <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
 }
 
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
+null {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@102 }
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/reified/reifiedNothingSubstitution.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/reified/reifiedNothingSubstitution.lazy.log
index 17cfe04f057..97c28a73e67 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/reified/reifiedNothingSubstitution.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/reified/reifiedNothingSubstitution.lazy.log
@@ -35,11 +35,11 @@ DeserializedType@24['T in kotlin'] {
 }
 
 DeserializedType@25['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@21
+    constructor = AbstractLazyTypeParameterDescriptor$1@17
 }
 
 DeserializedType@26['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@17
+    constructor = AbstractLazyTypeParameterDescriptor$1@21
 }
 
 DeserializedType@27['T in kotlin'] {
@@ -51,12 +51,12 @@ DeserializedType@28['java.lang.Class'] {
     memberScope = SubstitutingScope@30
 }
 
-DeserializedType@19['kotlin.Any'] {
+DeserializedType@23['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@31
     memberScope = DeserializedClassMemberScope@32
 }
 
-DeserializedType@23['kotlin.Any'] {
+DeserializedType@19['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@31
     memberScope = DeserializedClassMemberScope@32
 }
@@ -262,115 +262,118 @@ LazyJavaTypeParameterResolver@129 {
 
 ResolutionTaskHolder@131 {
     <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@133 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
 }
 
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@137 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
+ResolutionTaskHolder@134 {
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
 }
 
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@141 }
+ResolutionTaskHolder@137 {
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
+}
+
+ResolutionTaskHolder@140 {
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
 }
 
 ResolutionTaskHolder@143 {
     <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@145 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
 }
 
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@149 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
+ResolutionTaskHolder@146 {
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
 }
 
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@153 }
-    <name not found> = EmptyList@95[empty]
+ResolutionTaskHolder@149 {
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
     <name not found> = EmptyList@95[empty]
     <name not found> = EmptyList@95[empty]
+}
+
+ResolutionTaskHolder@152 {
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
     <name not found> = EmptyList@95[empty]
 }
 
 ResolutionTaskHolder@155 {
     <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@157 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
 }
 
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@161 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
+ResolutionTaskHolder@158 {
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
 }
 
-ResolutionTaskHolder@163 {
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@165 }
+ResolutionTaskHolder@161 {
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
+}
+
+ResolutionTaskHolder@164 {
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
 }
 
 ResolutionTaskHolder@167 {
     <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@169 }
 }
 
-ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@173 }
+ResolutionTaskHolder@170 {
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
 }
 
-ResolutionTaskHolder@175 {
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@177 }
+ResolutionTaskHolder@173 {
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
 }
 
-ResolutionTaskHolder@179 {
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@181 }
+TypeDeserializer@176 {
+    classDescriptors('34': Integer@177) = LazyJavaClassDescriptor@42['Class']
+    classDescriptors('9': Integer@178) = DeserializedClassDescriptor@179['Any']
 }
 
-ResolutionTaskHolder@183 {
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@185 }
+TypeDeserializer@180 {
+    classDescriptors('8': Integer@181) = DeserializedClassDescriptor@182['Array']
+    classDescriptors('9': Integer@178) = DeserializedClassDescriptor@179['Any']
 }
 
-ResolutionTaskHolder@187 {
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@189 }
-}
-
-TypeDeserializer@191 {
-    classDescriptors('34': Integer@192) = LazyJavaClassDescriptor@42['Class']
-    classDescriptors('9': Integer@193) = DeserializedClassDescriptor@194['Any']
-}
-
-TypeDeserializer@195 {
-    classDescriptors('8': Integer@196) = DeserializedClassDescriptor@197['Array']
-    classDescriptors('9': Integer@193) = DeserializedClassDescriptor@194['Any']
+null {
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@163 }
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@154 }
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@172 }
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@160 }
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@157 }
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@142 }
+    <name not found> = ArrayList@189[1] { ResolutionCandidate@133 }
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@175 }
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@151 }
+    <name not found> = ArrayList@192[1] { ResolutionCandidate@169 }
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@139 }
+    <name not found> = ArrayList@194[1] { ResolutionCandidate@166 }
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@148 }
+    <name not found> = ArrayList@196[1] { ResolutionCandidate@136 }
+    <name not found> = ArrayList@197[1] { ResolutionCandidate@145 }
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/resolve/kt4711.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/resolve/kt4711.lazy.log
index 1574e00cd1a..00eed5e232a 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/resolve/kt4711.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/resolve/kt4711.lazy.log
@@ -11,824 +11,982 @@ ClassDeserializer@0 {
 DescriptorLoadersStorage@15 {
     storage(VirtualFileKotlinClass@16) = Storage@17
     storage(VirtualFileKotlinClass@18) = Storage@19
-    storage(VirtualFileKotlinClass@20) = Storage@21
 }
 
-DescriptorResolver@22 {
-    <name not found> = DoubleValue@23
-    <name not found> = IntValue@24
+DescriptorResolver@20 {
+    <name not found> = DoubleValue@21
+    <name not found> = IntValue@22
     <name not found> = null
     <name not found> = null
 }
 
 DeserializedClassDescriptor@2['Function2'] {
-    containingDeclaration = LazyJavaPackageFragment@25['kotlin']
+    containingDeclaration = LazyJavaPackageFragment@23['kotlin']
 }
 
 DeserializedClassDescriptor@4['InlineOption'] {
-    containingDeclaration = LazyJavaPackageFragment@25['kotlin']
-    defaultType = JetTypeImpl@26['InlineOption']
-    unsubstitutedInnerClassesScope = InnerClassesScopeWrapper@27
+    containingDeclaration = LazyJavaPackageFragment@23['kotlin']
+    defaultType = JetTypeImpl@24['InlineOption']
+    unsubstitutedInnerClassesScope = InnerClassesScopeWrapper@25
 }
 
 DeserializedClassDescriptor@6['Stream'] {
-    containingDeclaration = LazyJavaPackageFragment@25['kotlin']
+    containingDeclaration = LazyJavaPackageFragment@23['kotlin']
 }
 
 DeserializedClassDescriptor@10['deprecated'] {
-    containingDeclaration = LazyJavaPackageFragment@25['kotlin']
-    defaultType = JetTypeImpl@28['deprecated']
-    primaryConstructor = ConstructorDescriptorImpl@29['<init>']
+    containingDeclaration = LazyJavaPackageFragment@23['kotlin']
+    defaultType = JetTypeImpl@26['deprecated']
+    primaryConstructor = ConstructorDescriptorImpl@27['<init>']
 }
 
 DeserializedClassDescriptor@12['inline'] {
-    containingDeclaration = LazyJavaPackageFragment@25['kotlin']
-    defaultType = JetTypeImpl@30['inline']
+    containingDeclaration = LazyJavaPackageFragment@23['kotlin']
+    defaultType = JetTypeImpl@28['inline']
 }
 
 DeserializedClassDescriptor@14['inlineOptions'] {
-    containingDeclaration = LazyJavaPackageFragment@25['kotlin']
-    defaultType = JetTypeImpl@31['inlineOptions']
-    primaryConstructor = ConstructorDescriptorImpl@32['<init>']
+    containingDeclaration = LazyJavaPackageFragment@23['kotlin']
+    defaultType = JetTypeImpl@29['inlineOptions']
+    primaryConstructor = ConstructorDescriptorImpl@30['<init>']
 }
 
-DeserializedTypeParameterDescriptor@33['P1'] {
+DeserializedTypeParameterDescriptor@31['P1'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@32
+}
+
+DeserializedTypeParameterDescriptor@33['P2'] {
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@34
 }
 
-DeserializedTypeParameterDescriptor@35['P2'] {
+DeserializedTypeParameterDescriptor@35['R'] {
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
 }
 
-DeserializedTypeParameterDescriptor@37['R'] {
+DeserializedTypeParameterDescriptor@37['T'] {
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@38
+    upperBounds = LinkedHashSet@39[1] { DeserializedType@40['kotlin.Any'] }
 }
 
-DeserializedTypeParameterDescriptor@39['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@40
-    upperBounds = LinkedHashSet@41[1] { DeserializedType@42['kotlin.Any'] }
+DeserializedTypeParameterDescriptor@41['T'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@42
+    upperBounds = LinkedHashSet@43[1] { DeserializedType@44['kotlin.Any'] }
 }
 
-DeserializedTypeParameterDescriptor@43['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@44
-    upperBounds = LinkedHashSet@45[1] { DeserializedType@46['kotlin.Any'] }
+DeserializedTypeParameterDescriptor@45['T'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@46
+    upperBounds = LinkedHashSet@47[1] { DeserializedType@48['kotlin.Any'] }
 }
 
-DeserializedTypeParameterDescriptor@47['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@48
-    upperBounds = LinkedHashSet@49[1] { DeserializedType@50['kotlin.Any'] }
+DeserializedTypeParameterDescriptor@49['T'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@50
+    upperBounds = LinkedHashSet@51[1] { DeserializedType@52['kotlin.Any'] }
 }
 
-DeserializedTypeParameterDescriptor@51['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@52
-    upperBounds = LinkedHashSet@53[1] { DeserializedType@54['kotlin.Any'] }
+DeserializedTypeParameterDescriptor@53['T'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@54
 }
 
-DeserializedTypeParameterDescriptor@55['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
+DeserializedType@55['T in kotlin'] {
+    constructor = AbstractLazyTypeParameterDescriptor$1@38
+}
+
+DeserializedType@56['T in kotlin'] {
+    constructor = AbstractLazyTypeParameterDescriptor$1@50
 }
 
 DeserializedType@57['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@40
+    constructor = AbstractLazyTypeParameterDescriptor$1@46
 }
 
 DeserializedType@58['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@40
+    constructor = AbstractLazyTypeParameterDescriptor$1@50
 }
 
 DeserializedType@59['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@40
+    constructor = AbstractLazyTypeParameterDescriptor$1@42
 }
 
 DeserializedType@60['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@48
+    constructor = AbstractLazyTypeParameterDescriptor$1@50
 }
 
 DeserializedType@61['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@48
+    constructor = AbstractLazyTypeParameterDescriptor$1@38
 }
 
 DeserializedType@62['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@44
+    constructor = AbstractLazyTypeParameterDescriptor$1@50
 }
 
 DeserializedType@63['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@52
+    constructor = AbstractLazyTypeParameterDescriptor$1@38
 }
 
 DeserializedType@64['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@44
+    constructor = AbstractLazyTypeParameterDescriptor$1@50
 }
 
 DeserializedType@65['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@44
+    constructor = AbstractLazyTypeParameterDescriptor$1@42
 }
 
 DeserializedType@66['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@48
+    constructor = AbstractLazyTypeParameterDescriptor$1@46
 }
 
 DeserializedType@67['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@40
+    constructor = AbstractLazyTypeParameterDescriptor$1@46
 }
 
 DeserializedType@68['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@52
+    constructor = AbstractLazyTypeParameterDescriptor$1@46
 }
 
 DeserializedType@69['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@52
+    constructor = AbstractLazyTypeParameterDescriptor$1@46
 }
 
 DeserializedType@70['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@40
+    constructor = AbstractLazyTypeParameterDescriptor$1@38
 }
 
 DeserializedType@71['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@48
+    constructor = AbstractLazyTypeParameterDescriptor$1@42
 }
 
 DeserializedType@72['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@44
+    constructor = AbstractLazyTypeParameterDescriptor$1@42
 }
 
 DeserializedType@73['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@44
+    constructor = AbstractLazyTypeParameterDescriptor$1@42
 }
 
 DeserializedType@74['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@52
+    constructor = AbstractLazyTypeParameterDescriptor$1@38
 }
 
-DeserializedType@75['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@48
+DeserializedType@44['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@75
+    memberScope = DeserializedClassMemberScope@76
 }
 
-DeserializedType@76['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@52
+DeserializedType@40['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@75
+    memberScope = DeserializedClassMemberScope@76
 }
 
-DeserializedType@54['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@77
-    memberScope = DeserializedClassMemberScope@78
+DeserializedType@48['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@75
+    memberScope = DeserializedClassMemberScope@76
 }
 
-DeserializedType@42['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@77
-    memberScope = DeserializedClassMemberScope@78
+DeserializedType@52['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@75
+    memberScope = DeserializedClassMemberScope@76
 }
 
-DeserializedType@46['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@77
-    memberScope = DeserializedClassMemberScope@78
+DeserializedType@77['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@75
 }
 
-DeserializedType@50['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@77
-    memberScope = DeserializedClassMemberScope@78
+DeserializedType@78['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@75
 }
 
-DeserializedType@79['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@77
+DeserializedType@79['kotlin.Array'] {
+    constructor = DeserializedClassTypeConstructor@80
+    memberScope = SubstitutingScope@81
 }
 
-DeserializedType@80['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@77
-}
-
-DeserializedType@81['kotlin.Array'] {
-    constructor = DeserializedClassTypeConstructor@82
-    memberScope = SubstitutingScope@83
+DeserializedType@82['kotlin.Boolean'] {
+    constructor = DeserializedClassTypeConstructor@83
 }
 
 DeserializedType@84['kotlin.Boolean'] {
-    constructor = DeserializedClassTypeConstructor@85
+    constructor = DeserializedClassTypeConstructor@83
+}
+
+DeserializedType@85['kotlin.Boolean'] {
+    constructor = DeserializedClassTypeConstructor@83
 }
 
 DeserializedType@86['kotlin.Boolean'] {
-    constructor = DeserializedClassTypeConstructor@85
+    constructor = DeserializedClassTypeConstructor@83
 }
 
-DeserializedType@87['kotlin.Boolean'] {
-    constructor = DeserializedClassTypeConstructor@85
+DeserializedType@87['kotlin.BooleanArray'] {
+    constructor = DeserializedClassTypeConstructor@88
 }
 
-DeserializedType@88['kotlin.Boolean'] {
-    constructor = DeserializedClassTypeConstructor@85
-}
-
-DeserializedType@89['kotlin.BooleanArray'] {
+DeserializedType@89['kotlin.Byte'] {
     constructor = DeserializedClassTypeConstructor@90
 }
 
 DeserializedType@91['kotlin.Byte'] {
-    constructor = DeserializedClassTypeConstructor@92
+    constructor = DeserializedClassTypeConstructor@90
+}
+
+DeserializedType@92['kotlin.Byte'] {
+    constructor = DeserializedClassTypeConstructor@90
 }
 
 DeserializedType@93['kotlin.Byte'] {
-    constructor = DeserializedClassTypeConstructor@92
+    constructor = DeserializedClassTypeConstructor@90
 }
 
-DeserializedType@94['kotlin.Byte'] {
-    constructor = DeserializedClassTypeConstructor@92
+DeserializedType@94['kotlin.ByteArray'] {
+    constructor = DeserializedClassTypeConstructor@95
 }
 
-DeserializedType@95['kotlin.Byte'] {
-    constructor = DeserializedClassTypeConstructor@92
-}
-
-DeserializedType@96['kotlin.ByteArray'] {
+DeserializedType@96['kotlin.Char'] {
     constructor = DeserializedClassTypeConstructor@97
 }
 
 DeserializedType@98['kotlin.Char'] {
-    constructor = DeserializedClassTypeConstructor@99
+    constructor = DeserializedClassTypeConstructor@97
+}
+
+DeserializedType@99['kotlin.Char'] {
+    constructor = DeserializedClassTypeConstructor@97
 }
 
 DeserializedType@100['kotlin.Char'] {
-    constructor = DeserializedClassTypeConstructor@99
+    constructor = DeserializedClassTypeConstructor@97
 }
 
 DeserializedType@101['kotlin.Char'] {
-    constructor = DeserializedClassTypeConstructor@99
+    constructor = DeserializedClassTypeConstructor@97
 }
 
 DeserializedType@102['kotlin.Char'] {
-    constructor = DeserializedClassTypeConstructor@99
+    constructor = DeserializedClassTypeConstructor@97
 }
 
 DeserializedType@103['kotlin.Char'] {
-    constructor = DeserializedClassTypeConstructor@99
+    constructor = DeserializedClassTypeConstructor@97
 }
 
-DeserializedType@104['kotlin.Char'] {
-    constructor = DeserializedClassTypeConstructor@99
-}
-
-DeserializedType@105['kotlin.Char'] {
-    constructor = DeserializedClassTypeConstructor@99
+DeserializedType@104['kotlin.CharArray'] {
+    constructor = DeserializedClassTypeConstructor@105
 }
 
 DeserializedType@106['kotlin.CharArray'] {
-    constructor = DeserializedClassTypeConstructor@107
+    constructor = DeserializedClassTypeConstructor@105
 }
 
-DeserializedType@108['kotlin.CharArray'] {
-    constructor = DeserializedClassTypeConstructor@107
+DeserializedType@107['kotlin.Double'] {
+    constructor = DeserializedClassTypeConstructor@108
 }
 
 DeserializedType@109['kotlin.Double'] {
-    constructor = DeserializedClassTypeConstructor@110
+    constructor = DeserializedClassTypeConstructor@108
+}
+
+DeserializedType@110['kotlin.Double'] {
+    constructor = DeserializedClassTypeConstructor@108
 }
 
 DeserializedType@111['kotlin.Double'] {
-    constructor = DeserializedClassTypeConstructor@110
+    constructor = DeserializedClassTypeConstructor@108
 }
 
-DeserializedType@112['kotlin.Double'] {
-    constructor = DeserializedClassTypeConstructor@110
+DeserializedType@112['kotlin.DoubleArray'] {
+    constructor = DeserializedClassTypeConstructor@113
 }
 
-DeserializedType@113['kotlin.Double'] {
-    constructor = DeserializedClassTypeConstructor@110
-}
-
-DeserializedType@114['kotlin.DoubleArray'] {
+DeserializedType@114['kotlin.Float'] {
     constructor = DeserializedClassTypeConstructor@115
 }
 
 DeserializedType@116['kotlin.Float'] {
-    constructor = DeserializedClassTypeConstructor@117
+    constructor = DeserializedClassTypeConstructor@115
+}
+
+DeserializedType@117['kotlin.Float'] {
+    constructor = DeserializedClassTypeConstructor@115
 }
 
 DeserializedType@118['kotlin.Float'] {
-    constructor = DeserializedClassTypeConstructor@117
+    constructor = DeserializedClassTypeConstructor@115
 }
 
-DeserializedType@119['kotlin.Float'] {
-    constructor = DeserializedClassTypeConstructor@117
+DeserializedType@119['kotlin.FloatArray'] {
+    constructor = DeserializedClassTypeConstructor@120
 }
 
-DeserializedType@120['kotlin.Float'] {
-    constructor = DeserializedClassTypeConstructor@117
-}
-
-DeserializedType@121['kotlin.FloatArray'] {
+DeserializedType@121['kotlin.Function2'] {
     constructor = DeserializedClassTypeConstructor@122
+    memberScope = SubstitutingScope@123
 }
 
-DeserializedType@123['kotlin.Function2'] {
-    constructor = DeserializedClassTypeConstructor@124
+DeserializedType@124['kotlin.Function2'] {
+    constructor = DeserializedClassTypeConstructor@122
     memberScope = SubstitutingScope@125
 }
 
 DeserializedType@126['kotlin.Function2'] {
-    constructor = DeserializedClassTypeConstructor@124
+    constructor = DeserializedClassTypeConstructor@122
     memberScope = SubstitutingScope@127
 }
 
 DeserializedType@128['kotlin.Function2'] {
-    constructor = DeserializedClassTypeConstructor@124
+    constructor = DeserializedClassTypeConstructor@122
     memberScope = SubstitutingScope@129
 }
 
 DeserializedType@130['kotlin.Function2'] {
-    constructor = DeserializedClassTypeConstructor@124
-    memberScope = SubstitutingScope@131
+    constructor = DeserializedClassTypeConstructor@122
+}
+
+DeserializedType@131['kotlin.Function2'] {
+    constructor = DeserializedClassTypeConstructor@122
 }
 
 DeserializedType@132['kotlin.Function2'] {
-    constructor = DeserializedClassTypeConstructor@124
+    constructor = DeserializedClassTypeConstructor@122
 }
 
 DeserializedType@133['kotlin.Function2'] {
-    constructor = DeserializedClassTypeConstructor@124
+    constructor = DeserializedClassTypeConstructor@122
 }
 
 DeserializedType@134['kotlin.Function2'] {
-    constructor = DeserializedClassTypeConstructor@124
+    constructor = DeserializedClassTypeConstructor@122
 }
 
 DeserializedType@135['kotlin.Function2'] {
-    constructor = DeserializedClassTypeConstructor@124
+    constructor = DeserializedClassTypeConstructor@122
 }
 
 DeserializedType@136['kotlin.Function2'] {
-    constructor = DeserializedClassTypeConstructor@124
+    constructor = DeserializedClassTypeConstructor@122
 }
 
 DeserializedType@137['kotlin.Function2'] {
-    constructor = DeserializedClassTypeConstructor@124
+    constructor = DeserializedClassTypeConstructor@122
 }
 
 DeserializedType@138['kotlin.Function2'] {
-    constructor = DeserializedClassTypeConstructor@124
+    constructor = DeserializedClassTypeConstructor@122
 }
 
-DeserializedType@139['kotlin.Function2'] {
-    constructor = DeserializedClassTypeConstructor@124
-}
-
-DeserializedType@140['kotlin.Function2'] {
-    constructor = DeserializedClassTypeConstructor@124
+DeserializedType@139['kotlin.Int'] {
+    constructor = DeserializedClassTypeConstructor@140
 }
 
 DeserializedType@141['kotlin.Int'] {
-    constructor = DeserializedClassTypeConstructor@142
+    constructor = DeserializedClassTypeConstructor@140
+}
+
+DeserializedType@142['kotlin.Int'] {
+    constructor = DeserializedClassTypeConstructor@140
 }
 
 DeserializedType@143['kotlin.Int'] {
-    constructor = DeserializedClassTypeConstructor@142
+    constructor = DeserializedClassTypeConstructor@140
 }
 
-DeserializedType@144['kotlin.Int'] {
-    constructor = DeserializedClassTypeConstructor@142
+DeserializedType@144['kotlin.IntArray'] {
+    constructor = DeserializedClassTypeConstructor@145
 }
 
-DeserializedType@145['kotlin.Int'] {
-    constructor = DeserializedClassTypeConstructor@142
-}
-
-DeserializedType@146['kotlin.IntArray'] {
+DeserializedType@146['kotlin.Iterable'] {
     constructor = DeserializedClassTypeConstructor@147
+    memberScope = SubstitutingScope@148
 }
 
-DeserializedType@148['kotlin.Iterable'] {
-    constructor = DeserializedClassTypeConstructor@149
-    memberScope = SubstitutingScope@150
+DeserializedType@149['kotlin.Iterator'] {
+    constructor = DeserializedClassTypeConstructor@150
+    memberScope = SubstitutingScope@151
 }
 
-DeserializedType@151['kotlin.Iterator'] {
-    constructor = DeserializedClassTypeConstructor@152
-    memberScope = SubstitutingScope@153
+DeserializedType@152['kotlin.Long'] {
+    constructor = DeserializedClassTypeConstructor@153
 }
 
 DeserializedType@154['kotlin.Long'] {
-    constructor = DeserializedClassTypeConstructor@155
+    constructor = DeserializedClassTypeConstructor@153
+}
+
+DeserializedType@155['kotlin.Long'] {
+    constructor = DeserializedClassTypeConstructor@153
 }
 
 DeserializedType@156['kotlin.Long'] {
-    constructor = DeserializedClassTypeConstructor@155
+    constructor = DeserializedClassTypeConstructor@153
 }
 
-DeserializedType@157['kotlin.Long'] {
-    constructor = DeserializedClassTypeConstructor@155
+DeserializedType@157['kotlin.LongArray'] {
+    constructor = DeserializedClassTypeConstructor@158
 }
 
-DeserializedType@158['kotlin.Long'] {
-    constructor = DeserializedClassTypeConstructor@155
-}
-
-DeserializedType@159['kotlin.LongArray'] {
+DeserializedType@159['kotlin.Short'] {
     constructor = DeserializedClassTypeConstructor@160
 }
 
 DeserializedType@161['kotlin.Short'] {
-    constructor = DeserializedClassTypeConstructor@162
+    constructor = DeserializedClassTypeConstructor@160
+}
+
+DeserializedType@162['kotlin.Short'] {
+    constructor = DeserializedClassTypeConstructor@160
 }
 
 DeserializedType@163['kotlin.Short'] {
-    constructor = DeserializedClassTypeConstructor@162
+    constructor = DeserializedClassTypeConstructor@160
 }
 
-DeserializedType@164['kotlin.Short'] {
-    constructor = DeserializedClassTypeConstructor@162
+DeserializedType@164['kotlin.ShortArray'] {
+    constructor = DeserializedClassTypeConstructor@165
 }
 
-DeserializedType@165['kotlin.Short'] {
-    constructor = DeserializedClassTypeConstructor@162
-}
-
-DeserializedType@166['kotlin.ShortArray'] {
+DeserializedType@166['kotlin.Stream'] {
     constructor = DeserializedClassTypeConstructor@167
+    memberScope = SubstitutingScope@168
 }
 
-DeserializedType@168['kotlin.Stream'] {
-    constructor = DeserializedClassTypeConstructor@169
-    memberScope = SubstitutingScope@170
+DeserializedType@169['kotlin.String'] {
+    constructor = DeserializedClassTypeConstructor@170
 }
 
-DeserializedType@171['kotlin.String'] {
+DeserializedType@171['kotlin.Unit'] {
     constructor = DeserializedClassTypeConstructor@172
 }
 
-DeserializedType@173['kotlin.Unit'] {
-    constructor = DeserializedClassTypeConstructor@174
+EnumEntryClassDescriptors@173 {
+    findEnumEntry('ONLY_LOCAL_RETURN': Name@174) = EnumEntrySyntheticClassDescriptor@175['ONLY_LOCAL_RETURN']
 }
 
-EnumEntryClassDescriptors@175 {
-    findEnumEntry('ONLY_LOCAL_RETURN': Name@176) = EnumEntrySyntheticClassDescriptor@177['ONLY_LOCAL_RETURN']
+EnumEntrySyntheticClassDescriptor@176['<class-object-for-ONLY_LOCAL_RETURN>'] {
+    defaultType = JetTypeImpl@177['enum entry']
 }
 
-EnumEntrySyntheticClassDescriptor@178['<class-object-for-ONLY_LOCAL_RETURN>'] {
-    defaultType = JetTypeImpl@179['enum entry']
+EnumEntrySyntheticClassDescriptor@175['ONLY_LOCAL_RETURN'] {
+    defaultType = JetTypeImpl@178['enum entry']
 }
 
-EnumEntrySyntheticClassDescriptor@177['ONLY_LOCAL_RETURN'] {
-    defaultType = JetTypeImpl@180['enum entry']
+LazyJavaClassDescriptor@179['System'] {
+    enumEntryIndex = LinkedHashMap@180 // through LazyJavaClassMemberScope@181
+    functions('nanoTime': Name@182) = ArrayList@183[1] { JavaMethodDescriptor@184['nanoTime'] } // through LazyJavaStaticClassScope@185
+    functions('nanoTime': Name@182) = EmptyList@186[empty] // through LazyJavaClassMemberScope@181
+    memberIndex = computeMemberIndex$1@187 // through LazyJavaClassMemberScope@181
+    memberIndex = computeMemberIndex$1@188 // through LazyJavaStaticClassScope@185
+    nestedClassIndex = LinkedHashMap@189 // through LazyJavaClassMemberScope@181
+    nestedClasses('nanoTime': Name@182) = null // through LazyJavaClassMemberScope@181
+    properties('nanoTime': Name@182) = EmptyList@186[empty] // through LazyJavaClassMemberScope@181
+    properties('nanoTime': Name@182) = EmptyList@186[empty] // through LazyJavaStaticClassScope@185
+    typeConstructor = LazyJavaClassTypeConstructor@190['System']
 }
 
-LazyJavaClassDescriptor@181['System'] {
-    enumEntryIndex = LinkedHashMap@182 // through LazyJavaClassMemberScope@183
-    functions('nanoTime': Name@184) = ArrayList@185[1] { JavaMethodDescriptor@186['nanoTime'] } // through LazyJavaStaticClassScope@187
-    functions('nanoTime': Name@184) = EmptyList@188[empty] // through LazyJavaClassMemberScope@183
-    memberIndex = computeMemberIndex$1@189 // through LazyJavaClassMemberScope@183
-    memberIndex = computeMemberIndex$1@190 // through LazyJavaStaticClassScope@187
-    nestedClassIndex = LinkedHashMap@191 // through LazyJavaClassMemberScope@183
-    nestedClasses('nanoTime': Name@184) = null // through LazyJavaClassMemberScope@183
-    properties('nanoTime': Name@184) = EmptyList@188[empty] // through LazyJavaClassMemberScope@183
-    properties('nanoTime': Name@184) = EmptyList@188[empty] // through LazyJavaStaticClassScope@187
-    typeConstructor = LazyJavaClassTypeConstructor@192['System']
+LazyJavaClassTypeConstructor@190['System'] {
+    supertypes = ArrayList@191[1] { JetTypeImpl@192['Any'] }
 }
 
-LazyJavaClassTypeConstructor@192['System'] {
-    supertypes = ArrayList@193[1] { JetTypeImpl@194['Any'] }
+LazyJavaClassifierType@193['Object'] {
+    classifier = JavaClassImpl@194['Object']
+    typeConstructor = DeserializedClassTypeConstructor@75
 }
 
-LazyJavaClassifierType@195['Object'] {
-    classifier = JavaClassImpl@196['Object']
-    typeConstructor = DeserializedClassTypeConstructor@77
+LazyJavaPackageFragmentProvider@195 {
+    packageFragments('<root>': FqName@196) = LazyJavaPackageFragment@197['<root>']
+    packageFragments('Array': FqName@198) = null
+    packageFragments('String': FqName@199) = null
+    packageFragments('System': FqName@200) = null
+    packageFragments('java': FqName@201) = LazyJavaPackageFragment@202['java']
+    packageFragments('java.lang': FqName@203) = LazyJavaPackageFragment@204['lang']
+    packageFragments('java.lang.Array': FqName@205) = null
+    packageFragments('java.lang.String': FqName@206) = null
+    packageFragments('java.lang.System': FqName@207) = null
+    packageFragments('kotlin': FqName@208) = LazyJavaPackageFragment@23['kotlin']
+    packageFragments('kotlin.Array': FqName@209) = null
+    packageFragments('kotlin.String': FqName@210) = null
+    packageFragments('kotlin.System': FqName@211) = null
+    packageFragments('kotlin.io': FqName@212) = LazyJavaPackageFragment@213['io']
+    packageFragments('kotlin.io.Array': FqName@214) = null
+    packageFragments('kotlin.io.String': FqName@215) = null
+    packageFragments('kotlin.io.System': FqName@216) = null
+    packageFragments('kotlin.jvm': FqName@217) = LazyJavaPackageFragment@218['jvm']
+    packageFragments('kotlin.jvm.Array': FqName@219) = null
+    packageFragments('kotlin.jvm.String': FqName@220) = null
+    packageFragments('kotlin.jvm.System': FqName@221) = null
+    topLevelClasses(JavaClassImpl@222['System']) = LazyJavaClassDescriptor@179['System']
 }
 
-LazyJavaPackageFragmentProvider@197 {
-    packageFragments('<root>': FqName@198) = LazyJavaPackageFragment@199['<root>']
-    packageFragments('Array': FqName@200) = null
-    packageFragments('String': FqName@201) = null
-    packageFragments('System': FqName@202) = null
-    packageFragments('java': FqName@203) = LazyJavaPackageFragment@204['java']
-    packageFragments('java.lang': FqName@205) = LazyJavaPackageFragment@206['lang']
-    packageFragments('java.lang.Array': FqName@207) = null
-    packageFragments('java.lang.String': FqName@208) = null
-    packageFragments('java.lang.System': FqName@209) = null
-    packageFragments('kotlin': FqName@210) = LazyJavaPackageFragment@25['kotlin']
-    packageFragments('kotlin.Array': FqName@211) = null
-    packageFragments('kotlin.String': FqName@212) = null
-    packageFragments('kotlin.System': FqName@213) = null
-    packageFragments('kotlin.io': FqName@214) = LazyJavaPackageFragment@215['io']
-    packageFragments('kotlin.io.Array': FqName@216) = null
-    packageFragments('kotlin.io.String': FqName@217) = null
-    packageFragments('kotlin.io.System': FqName@218) = null
-    packageFragments('kotlin.jvm': FqName@219) = LazyJavaPackageFragment@220['jvm']
-    packageFragments('kotlin.jvm.Array': FqName@221) = null
-    packageFragments('kotlin.jvm.String': FqName@222) = null
-    packageFragments('kotlin.jvm.System': FqName@223) = null
-    topLevelClasses(JavaClassImpl@224['System']) = LazyJavaClassDescriptor@181['System']
+LazyJavaPackageFragment@197['<root>'] {
+    classes('Array': Name@223) = null // through LazyPackageFragmentScopeForJavaPackage@224
+    classes('String': Name@225) = null // through LazyPackageFragmentScopeForJavaPackage@224
+    classes('System': Name@226) = null // through LazyPackageFragmentScopeForJavaPackage@224
+    classes('println': Name@227) = null // through LazyPackageFragmentScopeForJavaPackage@224
+    classes('reduce': Name@228) = null // through LazyPackageFragmentScopeForJavaPackage@224
+    deserializedPackageScope = Empty@229 // through LazyPackageFragmentScopeForJavaPackage@224
+    functions('println': Name@227) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@224
+    functions('reduce': Name@228) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@224
+    memberIndex = computeMemberIndex$1@230 // through LazyPackageFragmentScopeForJavaPackage@224
 }
 
-LazyJavaPackageFragment@199['<root>'] {
-    classes('Array': Name@225) = null // through LazyPackageFragmentScopeForJavaPackage@226
-    classes('String': Name@227) = null // through LazyPackageFragmentScopeForJavaPackage@226
-    classes('System': Name@228) = null // through LazyPackageFragmentScopeForJavaPackage@226
-    classes('div': Name@229) = null // through LazyPackageFragmentScopeForJavaPackage@226
-    classes('minus': Name@230) = null // through LazyPackageFragmentScopeForJavaPackage@226
-    classes('plus': Name@231) = null // through LazyPackageFragmentScopeForJavaPackage@226
-    classes('println': Name@232) = null // through LazyPackageFragmentScopeForJavaPackage@226
-    classes('rangeTo': Name@233) = null // through LazyPackageFragmentScopeForJavaPackage@226
-    classes('reduce': Name@234) = null // through LazyPackageFragmentScopeForJavaPackage@226
-    classes('times': Name@235) = null // through LazyPackageFragmentScopeForJavaPackage@226
-    classes('toDouble': Name@236) = null // through LazyPackageFragmentScopeForJavaPackage@226
-    deserializedPackageScope = Empty@237 // through LazyPackageFragmentScopeForJavaPackage@226
-    functions('div': Name@229) = EmptyList@188[empty] // through LazyPackageFragmentScopeForJavaPackage@226
-    functions('minus': Name@230) = EmptyList@188[empty] // through LazyPackageFragmentScopeForJavaPackage@226
-    functions('plus': Name@231) = EmptyList@188[empty] // through LazyPackageFragmentScopeForJavaPackage@226
-    functions('println': Name@232) = EmptyList@188[empty] // through LazyPackageFragmentScopeForJavaPackage@226
-    functions('rangeTo': Name@233) = EmptyList@188[empty] // through LazyPackageFragmentScopeForJavaPackage@226
-    functions('reduce': Name@234) = EmptyList@188[empty] // through LazyPackageFragmentScopeForJavaPackage@226
-    functions('times': Name@235) = EmptyList@188[empty] // through LazyPackageFragmentScopeForJavaPackage@226
-    functions('toDouble': Name@236) = EmptyList@188[empty] // through LazyPackageFragmentScopeForJavaPackage@226
-    memberIndex = computeMemberIndex$1@238 // through LazyPackageFragmentScopeForJavaPackage@226
+LazyJavaPackageFragment@213['io'] {
+    classes('Array': Name@223) = null // through LazyPackageFragmentScopeForJavaPackage@231
+    classes('String': Name@225) = null // through LazyPackageFragmentScopeForJavaPackage@231
+    classes('System': Name@226) = null // through LazyPackageFragmentScopeForJavaPackage@231
+    classes('println': Name@227) = null // through LazyPackageFragmentScopeForJavaPackage@231
+    classes('reduce': Name@228) = null // through LazyPackageFragmentScopeForJavaPackage@231
+    deserializedPackageScope = DeserializedPackageMemberScope@232 // through LazyPackageFragmentScopeForJavaPackage@231
+    functions('println': Name@227) = ArrayList@233[11] { DeserializedSimpleFunctionDescriptor@234['println'], DeserializedSimpleFunctionDescriptor@235['println'], DeserializedSimpleFunctionDescriptor@236['println'], ... } // through DeserializedPackageMemberScope@232
+    functions('println': Name@227) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@231
+    functions('reduce': Name@228) = EmptyList@186[empty] // through DeserializedPackageMemberScope@232
+    functions('reduce': Name@228) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@231
+    memberIndex = computeMemberIndex$1@237 // through LazyPackageFragmentScopeForJavaPackage@231
+    membersProtos = LinkedHashMap@238 // through DeserializedPackageMemberScope@232
+    properties('System': Name@226) = EmptyList@186[empty] // through DeserializedPackageMemberScope@232
+    properties('println': Name@227) = EmptyList@186[empty] // through DeserializedPackageMemberScope@232
 }
 
-LazyJavaPackageFragment@215['io'] {
-    classes('Array': Name@225) = null // through LazyPackageFragmentScopeForJavaPackage@239
-    classes('String': Name@227) = null // through LazyPackageFragmentScopeForJavaPackage@239
-    classes('System': Name@228) = null // through LazyPackageFragmentScopeForJavaPackage@239
-    classes('div': Name@229) = null // through LazyPackageFragmentScopeForJavaPackage@239
-    classes('minus': Name@230) = null // through LazyPackageFragmentScopeForJavaPackage@239
-    classes('plus': Name@231) = null // through LazyPackageFragmentScopeForJavaPackage@239
-    classes('println': Name@232) = null // through LazyPackageFragmentScopeForJavaPackage@239
-    classes('rangeTo': Name@233) = null // through LazyPackageFragmentScopeForJavaPackage@239
-    classes('reduce': Name@234) = null // through LazyPackageFragmentScopeForJavaPackage@239
-    classes('times': Name@235) = null // through LazyPackageFragmentScopeForJavaPackage@239
-    classes('toDouble': Name@236) = null // through LazyPackageFragmentScopeForJavaPackage@239
-    deserializedPackageScope = DeserializedPackageMemberScope@240 // through LazyPackageFragmentScopeForJavaPackage@239
-    functions('div': Name@229) = EmptyList@188[empty] // through DeserializedPackageMemberScope@240
-    functions('div': Name@229) = EmptyList@188[empty] // through LazyPackageFragmentScopeForJavaPackage@239
-    functions('minus': Name@230) = EmptyList@188[empty] // through DeserializedPackageMemberScope@240
-    functions('minus': Name@230) = EmptyList@188[empty] // through LazyPackageFragmentScopeForJavaPackage@239
-    functions('plus': Name@231) = EmptyList@188[empty] // through DeserializedPackageMemberScope@240
-    functions('plus': Name@231) = EmptyList@188[empty] // through LazyPackageFragmentScopeForJavaPackage@239
-    functions('println': Name@232) = ArrayList@241[11] { DeserializedSimpleFunctionDescriptor@242['println'], DeserializedSimpleFunctionDescriptor@243['println'], DeserializedSimpleFunctionDescriptor@244['println'], ... } // through DeserializedPackageMemberScope@240
-    functions('println': Name@232) = EmptyList@188[empty] // through LazyPackageFragmentScopeForJavaPackage@239
-    functions('rangeTo': Name@233) = EmptyList@188[empty] // through DeserializedPackageMemberScope@240
-    functions('rangeTo': Name@233) = EmptyList@188[empty] // through LazyPackageFragmentScopeForJavaPackage@239
-    functions('reduce': Name@234) = EmptyList@188[empty] // through DeserializedPackageMemberScope@240
-    functions('reduce': Name@234) = EmptyList@188[empty] // through LazyPackageFragmentScopeForJavaPackage@239
-    functions('times': Name@235) = EmptyList@188[empty] // through DeserializedPackageMemberScope@240
-    functions('times': Name@235) = EmptyList@188[empty] // through LazyPackageFragmentScopeForJavaPackage@239
-    functions('toDouble': Name@236) = EmptyList@188[empty] // through DeserializedPackageMemberScope@240
-    functions('toDouble': Name@236) = EmptyList@188[empty] // through LazyPackageFragmentScopeForJavaPackage@239
-    memberIndex = computeMemberIndex$1@245 // through LazyPackageFragmentScopeForJavaPackage@239
-    membersProtos = LinkedHashMap@246 // through DeserializedPackageMemberScope@240
-    properties('System': Name@228) = EmptyList@188[empty] // through DeserializedPackageMemberScope@240
-    properties('div': Name@229) = EmptyList@188[empty] // through DeserializedPackageMemberScope@240
-    properties('minus': Name@230) = EmptyList@188[empty] // through DeserializedPackageMemberScope@240
-    properties('plus': Name@231) = EmptyList@188[empty] // through DeserializedPackageMemberScope@240
-    properties('println': Name@232) = EmptyList@188[empty] // through DeserializedPackageMemberScope@240
-    properties('rangeTo': Name@233) = EmptyList@188[empty] // through DeserializedPackageMemberScope@240
-    properties('reduce': Name@234) = EmptyList@188[empty] // through DeserializedPackageMemberScope@240
-    properties('times': Name@235) = EmptyList@188[empty] // through DeserializedPackageMemberScope@240
-    properties('toDouble': Name@236) = EmptyList@188[empty] // through DeserializedPackageMemberScope@240
+LazyJavaPackageFragment@202['java'] {
+    classes('lang': Name@239) = null // through LazyPackageFragmentScopeForJavaPackage@240
+    deserializedPackageScope = Empty@229 // through LazyPackageFragmentScopeForJavaPackage@240
+    functions('lang': Name@241) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@240
+    memberIndex = computeMemberIndex$1@242 // through LazyPackageFragmentScopeForJavaPackage@240
 }
 
-LazyJavaPackageFragment@204['java'] {
-    classes('lang': Name@247) = null // through LazyPackageFragmentScopeForJavaPackage@248
-    deserializedPackageScope = Empty@237 // through LazyPackageFragmentScopeForJavaPackage@248
-    functions('lang': Name@249) = EmptyList@188[empty] // through LazyPackageFragmentScopeForJavaPackage@248
-    memberIndex = computeMemberIndex$1@250 // through LazyPackageFragmentScopeForJavaPackage@248
+LazyJavaPackageFragment@218['jvm'] {
+    classes('Array': Name@223) = null // through LazyPackageFragmentScopeForJavaPackage@243
+    classes('String': Name@225) = null // through LazyPackageFragmentScopeForJavaPackage@243
+    classes('System': Name@226) = null // through LazyPackageFragmentScopeForJavaPackage@243
+    classes('println': Name@227) = null // through LazyPackageFragmentScopeForJavaPackage@243
+    classes('reduce': Name@228) = null // through LazyPackageFragmentScopeForJavaPackage@243
+    deserializedPackageScope = Empty@229 // through LazyPackageFragmentScopeForJavaPackage@243
+    functions('println': Name@227) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@243
+    functions('reduce': Name@228) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@243
+    memberIndex = computeMemberIndex$1@244 // through LazyPackageFragmentScopeForJavaPackage@243
 }
 
-LazyJavaPackageFragment@220['jvm'] {
-    classes('Array': Name@225) = null // through LazyPackageFragmentScopeForJavaPackage@251
-    classes('String': Name@227) = null // through LazyPackageFragmentScopeForJavaPackage@251
-    classes('System': Name@228) = null // through LazyPackageFragmentScopeForJavaPackage@251
-    classes('div': Name@229) = null // through LazyPackageFragmentScopeForJavaPackage@251
-    classes('minus': Name@230) = null // through LazyPackageFragmentScopeForJavaPackage@251
-    classes('plus': Name@231) = null // through LazyPackageFragmentScopeForJavaPackage@251
-    classes('println': Name@232) = null // through LazyPackageFragmentScopeForJavaPackage@251
-    classes('rangeTo': Name@233) = null // through LazyPackageFragmentScopeForJavaPackage@251
-    classes('reduce': Name@234) = null // through LazyPackageFragmentScopeForJavaPackage@251
-    classes('times': Name@235) = null // through LazyPackageFragmentScopeForJavaPackage@251
-    classes('toDouble': Name@236) = null // through LazyPackageFragmentScopeForJavaPackage@251
-    deserializedPackageScope = Empty@237 // through LazyPackageFragmentScopeForJavaPackage@251
-    functions('div': Name@229) = EmptyList@188[empty] // through LazyPackageFragmentScopeForJavaPackage@251
-    functions('minus': Name@230) = EmptyList@188[empty] // through LazyPackageFragmentScopeForJavaPackage@251
-    functions('plus': Name@231) = EmptyList@188[empty] // through LazyPackageFragmentScopeForJavaPackage@251
-    functions('println': Name@232) = EmptyList@188[empty] // through LazyPackageFragmentScopeForJavaPackage@251
-    functions('rangeTo': Name@233) = EmptyList@188[empty] // through LazyPackageFragmentScopeForJavaPackage@251
-    functions('reduce': Name@234) = EmptyList@188[empty] // through LazyPackageFragmentScopeForJavaPackage@251
-    functions('times': Name@235) = EmptyList@188[empty] // through LazyPackageFragmentScopeForJavaPackage@251
-    functions('toDouble': Name@236) = EmptyList@188[empty] // through LazyPackageFragmentScopeForJavaPackage@251
-    memberIndex = computeMemberIndex$1@252 // through LazyPackageFragmentScopeForJavaPackage@251
+LazyJavaPackageFragment@23['kotlin'] {
+    classes('Any': Name@245) = null // through LazyPackageFragmentScopeForJavaPackage@246
+    classes('Array': Name@223) = null // through LazyPackageFragmentScopeForJavaPackage@246
+    classes('Boolean': Name@247) = null // through LazyPackageFragmentScopeForJavaPackage@246
+    classes('BooleanArray': Name@248) = null // through LazyPackageFragmentScopeForJavaPackage@246
+    classes('Byte': Name@249) = null // through LazyPackageFragmentScopeForJavaPackage@246
+    classes('ByteArray': Name@250) = null // through LazyPackageFragmentScopeForJavaPackage@246
+    classes('Char': Name@251) = null // through LazyPackageFragmentScopeForJavaPackage@246
+    classes('CharArray': Name@252) = null // through LazyPackageFragmentScopeForJavaPackage@246
+    classes('Double': Name@253) = null // through LazyPackageFragmentScopeForJavaPackage@246
+    classes('DoubleArray': Name@254) = null // through LazyPackageFragmentScopeForJavaPackage@246
+    classes('Float': Name@255) = null // through LazyPackageFragmentScopeForJavaPackage@246
+    classes('FloatArray': Name@256) = null // through LazyPackageFragmentScopeForJavaPackage@246
+    classes('Function2': Name@257) = DeserializedClassDescriptor@2['Function2'] // through LazyPackageFragmentScopeForJavaPackage@246
+    classes('InlineOption': Name@258) = DeserializedClassDescriptor@4['InlineOption'] // through LazyPackageFragmentScopeForJavaPackage@246
+    classes('Int': Name@259) = null // through LazyPackageFragmentScopeForJavaPackage@246
+    classes('IntArray': Name@260) = null // through LazyPackageFragmentScopeForJavaPackage@246
+    classes('Iterable': Name@261) = null // through LazyPackageFragmentScopeForJavaPackage@246
+    classes('Iterator': Name@262) = null // through LazyPackageFragmentScopeForJavaPackage@246
+    classes('Long': Name@263) = null // through LazyPackageFragmentScopeForJavaPackage@246
+    classes('LongArray': Name@264) = null // through LazyPackageFragmentScopeForJavaPackage@246
+    classes('Short': Name@265) = null // through LazyPackageFragmentScopeForJavaPackage@246
+    classes('ShortArray': Name@266) = null // through LazyPackageFragmentScopeForJavaPackage@246
+    classes('Stream': Name@267) = DeserializedClassDescriptor@6['Stream'] // through LazyPackageFragmentScopeForJavaPackage@246
+    classes('String': Name@225) = null // through LazyPackageFragmentScopeForJavaPackage@246
+    classes('System': Name@226) = null // through LazyPackageFragmentScopeForJavaPackage@246
+    classes('Unit': Name@268) = DeserializedClassDescriptor@8['Unit'] // through LazyPackageFragmentScopeForJavaPackage@246
+    classes('deprecated': Name@269) = DeserializedClassDescriptor@10['deprecated'] // through LazyPackageFragmentScopeForJavaPackage@246
+    classes('inline': Name@270) = DeserializedClassDescriptor@12['inline'] // through LazyPackageFragmentScopeForJavaPackage@246
+    classes('inlineOptions': Name@271) = DeserializedClassDescriptor@14['inlineOptions'] // through LazyPackageFragmentScopeForJavaPackage@246
+    classes('io': Name@272) = null // through LazyPackageFragmentScopeForJavaPackage@246
+    classes('jvm': Name@273) = null // through LazyPackageFragmentScopeForJavaPackage@246
+    classes('println': Name@227) = null // through LazyPackageFragmentScopeForJavaPackage@246
+    classes('reduce': Name@228) = null // through LazyPackageFragmentScopeForJavaPackage@246
+    deserializedPackageScope = DeserializedPackageMemberScope@274 // through LazyPackageFragmentScopeForJavaPackage@246
+    functions('io': Name@275) = EmptyList@186[empty] // through DeserializedPackageMemberScope@274
+    functions('io': Name@275) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@246
+    functions('jvm': Name@276) = EmptyList@186[empty] // through DeserializedPackageMemberScope@274
+    functions('jvm': Name@276) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@246
+    functions('println': Name@227) = EmptyList@186[empty] // through DeserializedPackageMemberScope@274
+    functions('println': Name@227) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@246
+    functions('reduce': Name@228) = ArrayList@277[13] { DeserializedSimpleFunctionDescriptor@278['reduce'], DeserializedSimpleFunctionDescriptor@279['reduce'], DeserializedSimpleFunctionDescriptor@280['reduce'], ... } // through DeserializedPackageMemberScope@274
+    functions('reduce': Name@228) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@246
+    memberIndex = computeMemberIndex$1@281 // through LazyPackageFragmentScopeForJavaPackage@246
+    membersProtos = LinkedHashMap@282 // through DeserializedPackageMemberScope@274
+    properties('System': Name@226) = EmptyList@186[empty] // through DeserializedPackageMemberScope@274
+    properties('io': Name@275) = EmptyList@186[empty] // through DeserializedPackageMemberScope@274
+    properties('jvm': Name@276) = EmptyList@186[empty] // through DeserializedPackageMemberScope@274
+    properties('println': Name@227) = EmptyList@186[empty] // through DeserializedPackageMemberScope@274
 }
 
-LazyJavaPackageFragment@25['kotlin'] {
-    classes('Any': Name@253) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('Array': Name@225) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('Boolean': Name@255) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('BooleanArray': Name@256) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('Byte': Name@257) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('ByteArray': Name@258) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('Char': Name@259) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('CharArray': Name@260) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('Double': Name@261) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('DoubleArray': Name@262) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('Float': Name@263) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('FloatArray': Name@264) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('Function2': Name@265) = DeserializedClassDescriptor@2['Function2'] // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('InlineOption': Name@266) = DeserializedClassDescriptor@4['InlineOption'] // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('Int': Name@267) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('IntArray': Name@268) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('Iterable': Name@269) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('Iterator': Name@270) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('Long': Name@271) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('LongArray': Name@272) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('Short': Name@273) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('ShortArray': Name@274) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('Stream': Name@275) = DeserializedClassDescriptor@6['Stream'] // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('String': Name@227) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('System': Name@228) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('Unit': Name@276) = DeserializedClassDescriptor@8['Unit'] // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('deprecated': Name@277) = DeserializedClassDescriptor@10['deprecated'] // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('div': Name@229) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('inline': Name@278) = DeserializedClassDescriptor@12['inline'] // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('inlineOptions': Name@279) = DeserializedClassDescriptor@14['inlineOptions'] // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('io': Name@280) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('jvm': Name@281) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('minus': Name@230) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('plus': Name@231) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('println': Name@232) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('rangeTo': Name@233) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('reduce': Name@234) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('times': Name@235) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('toDouble': Name@236) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    deserializedPackageScope = DeserializedPackageMemberScope@282 // through LazyPackageFragmentScopeForJavaPackage@254
-    functions('div': Name@229) = EmptyList@188[empty] // through DeserializedPackageMemberScope@282
-    functions('div': Name@229) = EmptyList@188[empty] // through LazyPackageFragmentScopeForJavaPackage@254
-    functions('io': Name@283) = EmptyList@188[empty] // through DeserializedPackageMemberScope@282
-    functions('io': Name@283) = EmptyList@188[empty] // through LazyPackageFragmentScopeForJavaPackage@254
-    functions('jvm': Name@284) = EmptyList@188[empty] // through DeserializedPackageMemberScope@282
-    functions('jvm': Name@284) = EmptyList@188[empty] // through LazyPackageFragmentScopeForJavaPackage@254
-    functions('minus': Name@230) = EmptyList@188[empty] // through DeserializedPackageMemberScope@282
-    functions('minus': Name@230) = EmptyList@188[empty] // through LazyPackageFragmentScopeForJavaPackage@254
-    functions('plus': Name@231) = ArrayList@285[37] { DeserializedSimpleFunctionDescriptor@286['plus'], DeserializedSimpleFunctionDescriptor@287['plus'], DeserializedSimpleFunctionDescriptor@288['plus'], ... } // through DeserializedPackageMemberScope@282
-    functions('plus': Name@231) = EmptyList@188[empty] // through LazyPackageFragmentScopeForJavaPackage@254
-    functions('println': Name@232) = EmptyList@188[empty] // through DeserializedPackageMemberScope@282
-    functions('println': Name@232) = EmptyList@188[empty] // through LazyPackageFragmentScopeForJavaPackage@254
-    functions('rangeTo': Name@233) = ArrayList@289[1] { DeserializedSimpleFunctionDescriptor@290['rangeTo'] } // through DeserializedPackageMemberScope@282
-    functions('rangeTo': Name@233) = EmptyList@188[empty] // through LazyPackageFragmentScopeForJavaPackage@254
-    functions('reduce': Name@234) = ArrayList@291[13] { DeserializedSimpleFunctionDescriptor@292['reduce'], DeserializedSimpleFunctionDescriptor@293['reduce'], DeserializedSimpleFunctionDescriptor@294['reduce'], ... } // through DeserializedPackageMemberScope@282
-    functions('reduce': Name@234) = EmptyList@188[empty] // through LazyPackageFragmentScopeForJavaPackage@254
-    functions('times': Name@235) = ArrayList@295[1] { DeserializedSimpleFunctionDescriptor@296['times'] } // through DeserializedPackageMemberScope@282
-    functions('times': Name@235) = EmptyList@188[empty] // through LazyPackageFragmentScopeForJavaPackage@254
-    functions('toDouble': Name@236) = ArrayList@297[1] { DeserializedSimpleFunctionDescriptor@298['toDouble'] } // through DeserializedPackageMemberScope@282
-    functions('toDouble': Name@236) = EmptyList@188[empty] // through LazyPackageFragmentScopeForJavaPackage@254
-    memberIndex = computeMemberIndex$1@299 // through LazyPackageFragmentScopeForJavaPackage@254
-    membersProtos = LinkedHashMap@300 // through DeserializedPackageMemberScope@282
-    properties('System': Name@228) = EmptyList@188[empty] // through DeserializedPackageMemberScope@282
-    properties('div': Name@229) = EmptyList@188[empty] // through DeserializedPackageMemberScope@282
-    properties('io': Name@283) = EmptyList@188[empty] // through DeserializedPackageMemberScope@282
-    properties('jvm': Name@284) = EmptyList@188[empty] // through DeserializedPackageMemberScope@282
-    properties('minus': Name@230) = EmptyList@188[empty] // through DeserializedPackageMemberScope@282
-    properties('plus': Name@231) = EmptyList@188[empty] // through DeserializedPackageMemberScope@282
-    properties('println': Name@232) = EmptyList@188[empty] // through DeserializedPackageMemberScope@282
-    properties('rangeTo': Name@233) = EmptyList@188[empty] // through DeserializedPackageMemberScope@282
-    properties('reduce': Name@234) = EmptyList@188[empty] // through DeserializedPackageMemberScope@282
-    properties('times': Name@235) = EmptyList@188[empty] // through DeserializedPackageMemberScope@282
-    properties('toDouble': Name@236) = EmptyList@188[empty] // through DeserializedPackageMemberScope@282
+LazyJavaPackageFragment@204['lang'] {
+    classes('System': Name@226) = LazyJavaClassDescriptor@179['System'] // through LazyPackageFragmentScopeForJavaPackage@283
+    classes('println': Name@227) = null // through LazyPackageFragmentScopeForJavaPackage@283
+    classes('reduce': Name@228) = null // through LazyPackageFragmentScopeForJavaPackage@283
+    deserializedPackageScope = Empty@229 // through LazyPackageFragmentScopeForJavaPackage@283
+    functions('println': Name@227) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@283
+    functions('reduce': Name@228) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@283
+    memberIndex = computeMemberIndex$1@284 // through LazyPackageFragmentScopeForJavaPackage@283
 }
 
-LazyJavaPackageFragment@206['lang'] {
-    classes('System': Name@228) = LazyJavaClassDescriptor@181['System'] // through LazyPackageFragmentScopeForJavaPackage@301
-    classes('div': Name@229) = null // through LazyPackageFragmentScopeForJavaPackage@301
-    classes('minus': Name@230) = null // through LazyPackageFragmentScopeForJavaPackage@301
-    classes('plus': Name@231) = null // through LazyPackageFragmentScopeForJavaPackage@301
-    classes('println': Name@232) = null // through LazyPackageFragmentScopeForJavaPackage@301
-    classes('rangeTo': Name@233) = null // through LazyPackageFragmentScopeForJavaPackage@301
-    classes('reduce': Name@234) = null // through LazyPackageFragmentScopeForJavaPackage@301
-    classes('times': Name@235) = null // through LazyPackageFragmentScopeForJavaPackage@301
-    classes('toDouble': Name@236) = null // through LazyPackageFragmentScopeForJavaPackage@301
-    deserializedPackageScope = Empty@237 // through LazyPackageFragmentScopeForJavaPackage@301
-    functions('div': Name@229) = EmptyList@188[empty] // through LazyPackageFragmentScopeForJavaPackage@301
-    functions('minus': Name@230) = EmptyList@188[empty] // through LazyPackageFragmentScopeForJavaPackage@301
-    functions('plus': Name@231) = EmptyList@188[empty] // through LazyPackageFragmentScopeForJavaPackage@301
-    functions('println': Name@232) = EmptyList@188[empty] // through LazyPackageFragmentScopeForJavaPackage@301
-    functions('rangeTo': Name@233) = EmptyList@188[empty] // through LazyPackageFragmentScopeForJavaPackage@301
-    functions('reduce': Name@234) = EmptyList@188[empty] // through LazyPackageFragmentScopeForJavaPackage@301
-    functions('times': Name@235) = EmptyList@188[empty] // through LazyPackageFragmentScopeForJavaPackage@301
-    functions('toDouble': Name@236) = EmptyList@188[empty] // through LazyPackageFragmentScopeForJavaPackage@301
-    memberIndex = computeMemberIndex$1@302 // through LazyPackageFragmentScopeForJavaPackage@301
+ResolutionTaskHolder@285 {
+    <name not found> = ArrayList@286[11] { ResolutionCandidate@287, ResolutionCandidate@288, ResolutionCandidate@289, ... }
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
 }
 
-TypeDeserializer@303 {
-    classDescriptors('1': Integer@304) = DeserializedClassDescriptor@305['Boolean']
-    classDescriptors('31': Integer@306) = DeserializedClassDescriptor@307['BooleanArray']
-    classDescriptors('68': Integer@308) = DeserializedClassDescriptor@2['Function2']
+ResolutionTaskHolder@290 {
+    <name not found> = ArrayList@291[13] { ResolutionCandidate@292, ResolutionCandidate@293, ResolutionCandidate@294, ... }
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
 }
 
-TypeDeserializer@309 {
-    classDescriptors('1': Integer@304) = DeserializedClassDescriptor@310['Int']
+ResolutionTaskHolder@295 {
+    <name not found> = ArrayList@296[1] { ResolutionCandidate@297 }
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
 }
 
-TypeDeserializer@311 {
-    classDescriptors('102': Integer@312) = DeserializedClassDescriptor@6['Stream']
-    classDescriptors('68': Integer@308) = DeserializedClassDescriptor@2['Function2']
-    classDescriptors('9': Integer@313) = DeserializedClassDescriptor@314['Any']
+ResolutionTaskHolder@298 {
+    <name not found> = ArrayList@299[1] { ResolutionCandidate@300 }
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
 }
 
-TypeDeserializer@315 {
-    classDescriptors('107': Integer@316) = DeserializedClassDescriptor@317['Iterable']
-    classDescriptors('68': Integer@308) = DeserializedClassDescriptor@2['Function2']
-    classDescriptors('9': Integer@313) = DeserializedClassDescriptor@314['Any']
+ResolutionTaskHolder@301 {
+    <name not found> = ArrayList@302[1] { ResolutionCandidate@303 }
 }
 
-TypeDeserializer@318 {
-    classDescriptors('11': Integer@319) = DeserializedClassDescriptor@314['Any']
-    classDescriptors('12': Integer@320) = DeserializedClassDescriptor@8['Unit']
+ResolutionTaskHolder@304 {
+    <name not found> = ArrayList@305[1] { ResolutionCandidate@306 }
 }
 
-TypeDeserializer@321 {
-    classDescriptors('14': Integer@322) = DeserializedClassDescriptor@305['Boolean']
+ResolutionTaskHolder@307 {
+    <name not found> = ArrayList@308[1] { ResolutionCandidate@309 }
 }
 
-TypeDeserializer@323 {
-    classDescriptors('15': Integer@324) = DeserializedClassDescriptor@325['Byte']
+ResolutionTaskHolder@310 {
+    <name not found> = ArrayList@311[1] { ResolutionCandidate@312 }
 }
 
-TypeDeserializer@326 {
-    classDescriptors('16': Integer@327) = DeserializedClassDescriptor@328['Char']
+ResolutionTaskHolder@313 {
+    <name not found> = ArrayList@314[1] { ResolutionCandidate@315 }
 }
 
-TypeDeserializer@329 {
-    classDescriptors('17': Integer@330) = DeserializedClassDescriptor@331['CharArray']
+ResolutionTaskHolder@316 {
+    <name not found> = ArrayList@317[1] { ResolutionCandidate@318 }
 }
 
-TypeDeserializer@332 {
-    classDescriptors('18': Integer@333) = DeserializedClassDescriptor@334['Double']
+ResolutionTaskHolder@319 {
+    <name not found> = ArrayList@320[1] { ResolutionCandidate@321 }
 }
 
-TypeDeserializer@335 {
-    classDescriptors('19': Integer@336) = DeserializedClassDescriptor@337['Float']
+ResolutionTaskHolder@322 {
+    <name not found> = ArrayList@323[1] { ResolutionCandidate@324 }
 }
 
-TypeDeserializer@338 {
-    classDescriptors('2': Integer@339) = DeserializedClassDescriptor@314['Any']
+ResolutionTaskHolder@325 {
+    <name not found> = ArrayList@326[1] { ResolutionCandidate@327 }
 }
 
-TypeDeserializer@340 {
-    classDescriptors('2': Integer@339) = DeserializedClassDescriptor@341['String']
-    classDescriptors('65': Integer@342) = DeserializedClassDescriptor@328['Char']
-    classDescriptors('68': Integer@308) = DeserializedClassDescriptor@2['Function2']
+ResolutionTaskHolder@328 {
+    <name not found> = ArrayList@329[1] { ResolutionCandidate@330 }
 }
 
-TypeDeserializer@343 {
-    classDescriptors('20': Integer@344) = DeserializedClassDescriptor@345['Long']
+ResolutionTaskHolder@331 {
+    <name not found> = ArrayList@332[1] { ResolutionCandidate@333 }
 }
 
-TypeDeserializer@346 {
-    classDescriptors('21': Integer@347) = DeserializedClassDescriptor@348['Short']
+ResolutionTaskHolder@334 {
+    <name not found> = ArrayList@335[1] { ResolutionCandidate@336 }
 }
 
-TypeDeserializer@349 {
-    classDescriptors('22': Integer@350) = DeserializedClassDescriptor@310['Int']
-    classDescriptors('35': Integer@351) = DeserializedClassDescriptor@352['IntArray']
-    classDescriptors('68': Integer@308) = DeserializedClassDescriptor@2['Function2']
+ResolutionTaskHolder@337 {
+    <name not found> = ArrayList@338[1] { ResolutionCandidate@339 }
 }
 
-TypeDeserializer@353 {
-    classDescriptors('23': Integer@354) = DeserializedClassDescriptor@355['ByteArray']
-    classDescriptors('61': Integer@356) = DeserializedClassDescriptor@325['Byte']
-    classDescriptors('68': Integer@308) = DeserializedClassDescriptor@2['Function2']
+ResolutionTaskHolder@340 {
+    <name not found> = ArrayList@341[1] { ResolutionCandidate@342 }
 }
 
-TypeDeserializer@357 {
-    classDescriptors('32': Integer@358) = DeserializedClassDescriptor@331['CharArray']
-    classDescriptors('65': Integer@342) = DeserializedClassDescriptor@328['Char']
-    classDescriptors('68': Integer@308) = DeserializedClassDescriptor@2['Function2']
+ResolutionTaskHolder@343 {
+    <name not found> = ArrayList@344[1] { ResolutionCandidate@345 }
 }
 
-TypeDeserializer@359 {
-    classDescriptors('33': Integer@360) = DeserializedClassDescriptor@361['DoubleArray']
-    classDescriptors('68': Integer@308) = DeserializedClassDescriptor@2['Function2']
-    classDescriptors('76': Integer@362) = DeserializedClassDescriptor@334['Double']
+ResolutionTaskHolder@346 {
+    <name not found> = ArrayList@347[1] { ResolutionCandidate@348 }
 }
 
-TypeDeserializer@363 {
-    classDescriptors('34': Integer@364) = DeserializedClassDescriptor@365['FloatArray']
-    classDescriptors('68': Integer@308) = DeserializedClassDescriptor@2['Function2']
-    classDescriptors('79': Integer@366) = DeserializedClassDescriptor@337['Float']
+ResolutionTaskHolder@349 {
+    <name not found> = ArrayList@350[1] { ResolutionCandidate@351 }
 }
 
-TypeDeserializer@367 {
-    classDescriptors('36': Integer@368) = DeserializedClassDescriptor@369['LongArray']
-    classDescriptors('68': Integer@308) = DeserializedClassDescriptor@2['Function2']
-    classDescriptors('92': Integer@370) = DeserializedClassDescriptor@345['Long']
+ResolutionTaskHolder@352 {
+    <name not found> = ArrayList@353[1] { ResolutionCandidate@354 }
 }
 
-TypeDeserializer@371 {
-    classDescriptors('37': Integer@372) = DeserializedClassDescriptor@373['ShortArray']
-    classDescriptors('68': Integer@308) = DeserializedClassDescriptor@2['Function2']
-    classDescriptors('97': Integer@374) = DeserializedClassDescriptor@348['Short']
+ResolutionTaskHolder@355 {
+    <name not found> = ArrayList@356[7] { ResolutionCandidate@357, ResolutionCandidate@358, ResolutionCandidate@359, ... }
 }
 
-TypeDeserializer@375 {
-    classDescriptors('42': Integer@376) = DeserializedClassDescriptor@377['Iterator']
-    classDescriptors('68': Integer@308) = DeserializedClassDescriptor@2['Function2']
-    classDescriptors('9': Integer@313) = DeserializedClassDescriptor@314['Any']
+ResolutionTaskHolder@360 {
+    <name not found> = ArrayList@361[7] { ResolutionCandidate@362, ResolutionCandidate@363, ResolutionCandidate@364, ... }
 }
 
-TypeDeserializer@378 {
-    classDescriptors('68': Integer@308) = DeserializedClassDescriptor@2['Function2']
-    classDescriptors('8': Integer@379) = DeserializedClassDescriptor@380['Array']
-    classDescriptors('9': Integer@313) = DeserializedClassDescriptor@314['Any']
+ResolutionTaskHolder@365 {
+    <name not found> = ArrayList@366[7] { ResolutionCandidate@367, ResolutionCandidate@368, ResolutionCandidate@369, ... }
+}
+
+ResolutionTaskHolder@370 {
+    <name not found> = ArrayList@371[7] { ResolutionCandidate@372, ResolutionCandidate@373, ResolutionCandidate@374, ... }
+}
+
+ResolutionTaskHolder@375 {
+    <name not found> = ArrayList@376[7] { ResolutionCandidate@377, ResolutionCandidate@378, ResolutionCandidate@379, ... }
+}
+
+ResolutionTaskHolder@380 {
+    <name not found> = ArrayList@381[7] { ResolutionCandidate@382, ResolutionCandidate@383, ResolutionCandidate@384, ... }
+}
+
+ResolutionTaskHolder@385 {
+    <name not found> = ArrayList@386[7] { ResolutionCandidate@387, ResolutionCandidate@388, ResolutionCandidate@389, ... }
+}
+
+ResolutionTaskHolder@390 {
+    <name not found> = ArrayList@391[7] { ResolutionCandidate@392, ResolutionCandidate@393, ResolutionCandidate@394, ... }
+}
+
+ResolutionTaskHolder@395 {
+    <name not found> = ArrayList@396[7] { ResolutionCandidate@397, ResolutionCandidate@398, ResolutionCandidate@399, ... }
+}
+
+ResolutionTaskHolder@400 {
+    <name not found> = ArrayList@401[7] { ResolutionCandidate@402, ResolutionCandidate@403, ResolutionCandidate@404, ... }
+}
+
+ResolutionTaskHolder@405 {
+    <name not found> = ArrayList@406[7] { ResolutionCandidate@407, ResolutionCandidate@408, ResolutionCandidate@409, ... }
+}
+
+ResolutionTaskHolder@410 {
+    <name not found> = ArrayList@411[8] { ResolutionCandidate@412, ResolutionCandidate@413, ResolutionCandidate@414, ... }
+}
+
+ResolutionTaskHolder@415 {
+    <name not found> = ArrayList@416[8] { ResolutionCandidate@417, ResolutionCandidate@418, ResolutionCandidate@419, ... }
+}
+
+ResolutionTaskHolder@420 {
+    <name not found> = ArrayList@421[8] { ResolutionCandidate@422, ResolutionCandidate@423, ResolutionCandidate@424, ... }
+}
+
+ResolutionTaskHolder@425 {
+    <name not found> = ArrayList@426[8] { ResolutionCandidate@427, ResolutionCandidate@428, ResolutionCandidate@429, ... }
+}
+
+ResolutionTaskHolder@430 {
+    <name not found> = ArrayList@431[8] { ResolutionCandidate@432, ResolutionCandidate@433, ResolutionCandidate@434, ... }
+}
+
+ResolutionTaskHolder@435 {
+    <name not found> = ArrayList@436[8] { ResolutionCandidate@437, ResolutionCandidate@438, ResolutionCandidate@439, ... }
+}
+
+ResolutionTaskHolder@440 {
+    <name not found> = ArrayList@441[8] { ResolutionCandidate@442, ResolutionCandidate@443, ResolutionCandidate@444, ... }
+}
+
+ResolutionTaskHolder@445 {
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
+}
+
+ResolutionTaskHolder@446 {
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
+}
+
+TypeDeserializer@447 {
+    classDescriptors('1': Integer@448) = DeserializedClassDescriptor@449['Boolean']
+    classDescriptors('22': Integer@450) = DeserializedClassDescriptor@451['BooleanArray']
+    classDescriptors('68': Integer@452) = DeserializedClassDescriptor@2['Function2']
+}
+
+TypeDeserializer@453 {
+    classDescriptors('1': Integer@448) = DeserializedClassDescriptor@454['Int']
+}
+
+TypeDeserializer@455 {
+    classDescriptors('102': Integer@456) = DeserializedClassDescriptor@6['Stream']
+    classDescriptors('68': Integer@452) = DeserializedClassDescriptor@2['Function2']
+    classDescriptors('9': Integer@457) = DeserializedClassDescriptor@458['Any']
+}
+
+TypeDeserializer@459 {
+    classDescriptors('107': Integer@460) = DeserializedClassDescriptor@461['Iterable']
+    classDescriptors('68': Integer@452) = DeserializedClassDescriptor@2['Function2']
+    classDescriptors('9': Integer@457) = DeserializedClassDescriptor@458['Any']
+}
+
+TypeDeserializer@462 {
+    classDescriptors('11': Integer@463) = DeserializedClassDescriptor@458['Any']
+    classDescriptors('12': Integer@464) = DeserializedClassDescriptor@8['Unit']
+}
+
+TypeDeserializer@465 {
+    classDescriptors('14': Integer@466) = DeserializedClassDescriptor@449['Boolean']
+}
+
+TypeDeserializer@467 {
+    classDescriptors('15': Integer@468) = DeserializedClassDescriptor@469['Byte']
+}
+
+TypeDeserializer@470 {
+    classDescriptors('16': Integer@471) = DeserializedClassDescriptor@472['Char']
+}
+
+TypeDeserializer@473 {
+    classDescriptors('17': Integer@474) = DeserializedClassDescriptor@475['CharArray']
+}
+
+TypeDeserializer@476 {
+    classDescriptors('18': Integer@477) = DeserializedClassDescriptor@478['Double']
+}
+
+TypeDeserializer@479 {
+    classDescriptors('19': Integer@480) = DeserializedClassDescriptor@481['Float']
+}
+
+TypeDeserializer@482 {
+    classDescriptors('2': Integer@483) = DeserializedClassDescriptor@458['Any']
+}
+
+TypeDeserializer@484 {
+    classDescriptors('2': Integer@483) = DeserializedClassDescriptor@485['String']
+    classDescriptors('65': Integer@486) = DeserializedClassDescriptor@472['Char']
+    classDescriptors('68': Integer@452) = DeserializedClassDescriptor@2['Function2']
+}
+
+TypeDeserializer@487 {
+    classDescriptors('20': Integer@488) = DeserializedClassDescriptor@489['Long']
+}
+
+TypeDeserializer@490 {
+    classDescriptors('21': Integer@491) = DeserializedClassDescriptor@492['Short']
+}
+
+TypeDeserializer@493 {
+    classDescriptors('23': Integer@494) = DeserializedClassDescriptor@495['ByteArray']
+    classDescriptors('61': Integer@496) = DeserializedClassDescriptor@469['Byte']
+    classDescriptors('68': Integer@452) = DeserializedClassDescriptor@2['Function2']
+}
+
+TypeDeserializer@497 {
+    classDescriptors('24': Integer@498) = DeserializedClassDescriptor@475['CharArray']
+    classDescriptors('65': Integer@486) = DeserializedClassDescriptor@472['Char']
+    classDescriptors('68': Integer@452) = DeserializedClassDescriptor@2['Function2']
+}
+
+TypeDeserializer@499 {
+    classDescriptors('25': Integer@500) = DeserializedClassDescriptor@501['DoubleArray']
+    classDescriptors('68': Integer@452) = DeserializedClassDescriptor@2['Function2']
+    classDescriptors('76': Integer@502) = DeserializedClassDescriptor@478['Double']
+}
+
+TypeDeserializer@503 {
+    classDescriptors('26': Integer@504) = DeserializedClassDescriptor@505['FloatArray']
+    classDescriptors('68': Integer@452) = DeserializedClassDescriptor@2['Function2']
+    classDescriptors('79': Integer@506) = DeserializedClassDescriptor@481['Float']
+}
+
+TypeDeserializer@507 {
+    classDescriptors('27': Integer@508) = DeserializedClassDescriptor@454['Int']
+    classDescriptors('28': Integer@509) = DeserializedClassDescriptor@510['IntArray']
+    classDescriptors('68': Integer@452) = DeserializedClassDescriptor@2['Function2']
+}
+
+TypeDeserializer@511 {
+    classDescriptors('29': Integer@512) = DeserializedClassDescriptor@513['LongArray']
+    classDescriptors('68': Integer@452) = DeserializedClassDescriptor@2['Function2']
+    classDescriptors('92': Integer@514) = DeserializedClassDescriptor@489['Long']
+}
+
+TypeDeserializer@515 {
+    classDescriptors('30': Integer@516) = DeserializedClassDescriptor@517['ShortArray']
+    classDescriptors('68': Integer@452) = DeserializedClassDescriptor@2['Function2']
+    classDescriptors('97': Integer@518) = DeserializedClassDescriptor@492['Short']
+}
+
+TypeDeserializer@519 {
+    classDescriptors('42': Integer@520) = DeserializedClassDescriptor@521['Iterator']
+    classDescriptors('68': Integer@452) = DeserializedClassDescriptor@2['Function2']
+    classDescriptors('9': Integer@457) = DeserializedClassDescriptor@458['Any']
+}
+
+TypeDeserializer@522 {
+    classDescriptors('68': Integer@452) = DeserializedClassDescriptor@2['Function2']
+    classDescriptors('8': Integer@523) = DeserializedClassDescriptor@524['Array']
+    classDescriptors('9': Integer@457) = DeserializedClassDescriptor@458['Any']
+}
+
+null {
+    <name not found> = ArrayList@525[11] { ResolutionCandidate@287, ResolutionCandidate@288, ResolutionCandidate@289, ... }
+    <name not found> = ArrayList@526[13] { ResolutionCandidate@292, ResolutionCandidate@293, ResolutionCandidate@294, ... }
+    <name not found> = ArrayList@527[1] { ResolutionCandidate@309 }
+    <name not found> = ArrayList@528[1] { ResolutionCandidate@300 }
+    <name not found> = ArrayList@529[1] { ResolutionCandidate@339 }
+    <name not found> = ArrayList@530[1] { ResolutionCandidate@327 }
+    <name not found> = ArrayList@531[1] { ResolutionCandidate@315 }
+    <name not found> = ArrayList@532[1] { ResolutionCandidate@303 }
+    <name not found> = ArrayList@533[1] { ResolutionCandidate@333 }
+    <name not found> = ArrayList@534[1] { ResolutionCandidate@306 }
+    <name not found> = ArrayList@535[1] { ResolutionCandidate@312 }
+    <name not found> = ArrayList@536[1] { ResolutionCandidate@348 }
+    <name not found> = ArrayList@537[1] { ResolutionCandidate@324 }
+    <name not found> = ArrayList@538[1] { ResolutionCandidate@351 }
+    <name not found> = ArrayList@539[1] { ResolutionCandidate@342 }
+    <name not found> = ArrayList@540[1] { ResolutionCandidate@318 }
+    <name not found> = ArrayList@541[1] { ResolutionCandidate@345 }
+    <name not found> = ArrayList@542[1] { ResolutionCandidate@297 }
+    <name not found> = ArrayList@543[1] { ResolutionCandidate@336 }
+    <name not found> = ArrayList@544[1] { ResolutionCandidate@321 }
+    <name not found> = ArrayList@545[1] { ResolutionCandidate@354 }
+    <name not found> = ArrayList@546[1] { ResolutionCandidate@330 }
+    <name not found> = ArrayList@547[7] { ResolutionCandidate@387, ResolutionCandidate@388, ResolutionCandidate@389, ... }
+    <name not found> = ArrayList@548[7] { ResolutionCandidate@377, ResolutionCandidate@378, ResolutionCandidate@379, ... }
+    <name not found> = ArrayList@549[7] { ResolutionCandidate@357, ResolutionCandidate@358, ResolutionCandidate@359, ... }
+    <name not found> = ArrayList@550[7] { ResolutionCandidate@372, ResolutionCandidate@373, ResolutionCandidate@374, ... }
+    <name not found> = ArrayList@551[7] { ResolutionCandidate@397, ResolutionCandidate@398, ResolutionCandidate@399, ... }
+    <name not found> = ArrayList@552[7] { ResolutionCandidate@382, ResolutionCandidate@383, ResolutionCandidate@384, ... }
+    <name not found> = ArrayList@553[7] { ResolutionCandidate@407, ResolutionCandidate@408, ResolutionCandidate@409, ... }
+    <name not found> = ArrayList@554[7] { ResolutionCandidate@362, ResolutionCandidate@363, ResolutionCandidate@364, ... }
+    <name not found> = ArrayList@555[7] { ResolutionCandidate@392, ResolutionCandidate@393, ResolutionCandidate@394, ... }
+    <name not found> = ArrayList@556[7] { ResolutionCandidate@367, ResolutionCandidate@368, ResolutionCandidate@369, ... }
+    <name not found> = ArrayList@557[7] { ResolutionCandidate@402, ResolutionCandidate@403, ResolutionCandidate@404, ... }
+    <name not found> = ArrayList@558[8] { ResolutionCandidate@427, ResolutionCandidate@428, ResolutionCandidate@429, ... }
+    <name not found> = ArrayList@559[8] { ResolutionCandidate@442, ResolutionCandidate@443, ResolutionCandidate@444, ... }
+    <name not found> = ArrayList@560[8] { ResolutionCandidate@437, ResolutionCandidate@438, ResolutionCandidate@439, ... }
+    <name not found> = ArrayList@561[8] { ResolutionCandidate@422, ResolutionCandidate@423, ResolutionCandidate@424, ... }
+    <name not found> = ArrayList@562[8] { ResolutionCandidate@417, ResolutionCandidate@418, ResolutionCandidate@419, ... }
+    <name not found> = ArrayList@563[8] { ResolutionCandidate@412, ResolutionCandidate@413, ResolutionCandidate@414, ... }
+    <name not found> = ArrayList@564[8] { ResolutionCandidate@432, ResolutionCandidate@433, ResolutionCandidate@434, ... }
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
 }